830 changed files with 10641 additions and 25400 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,32 +1,12 @@
-root = true
-
-[*]
-charset = utf-8
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{xml,sq,sqm}]
-indent_size = 4
-
-# noinspection EditorConfigKeyCorrectness
 [*.{kt,kts}]
-indent_size = 4
 max_line_length = 120
-
+indent_size = 4
+insert_final_newline = true
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
 ij_kotlin_name_count_to_use_star_import = 2147483647
 ij_kotlin_name_count_to_use_star_import_for_members = 2147483647

-ktlint_code_style = intellij_idea
-ktlint_function_naming_ignore_when_annotated_with = Composable
-ktlint_standard_class-signature = disabled
-ktlint_standard_discouraged-comment-location = disabled
-ktlint_standard_function-expression-body = disabled
-ktlint_standard_function-signature = disabled
-# SY
 ktlint_standard_filename = disabled
 ktlint_standard_argument-list-wrapping = disabled
 ktlint_standard_function-naming = disabled
@ -34,7 +14,3 @@ ktlint_standard_property-naming = disabled
 ktlint_standard_multiline-expression-wrapping = disabled
 ktlint_standard_string-template-indent = disabled
 ktlint_standard_comment-wrapping = disabled
-ktlint_standard_max-line-length = disabled
-ktlint_standard_type-argument-comment = disabled
-ktlint_standard_value-argument-comment = disabled
-ktlint_standard_value-parameter-comment = disabled
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: ❌ Help with Extensions
-    url: https://mihon.app/docs/faq/browse/extensions
-    about: For extension-related questions/issues
  - name: 🖥️ Mihon website
    url: https://mihon.app/
    about: Guides, troubleshooting, and answers to common questions
--- a/.github/ISSUE_TEMPLATE/report_issue.yml
+++ b/.github/ISSUE_TEMPLATE/report_issue.yml
@ -43,9 +43,9 @@ body:
    attributes:
      label: Crash logs
      description: |
-        If you're experiencing crashes, if possible, go to the app's **More → Settings → Advanced** page, press **Dump crash logs** and share the crash logs here.
+        If you're experiencing crashes, share the crash logs from **More → Settings → Advanced** then press **Dump crash logs**.
      placeholder: |
-        You can upload the crash log file as an attachment, or paste the crash logs in plain text if needed.
+        You can paste the crash logs in plain text or upload it as an attachment.

  - type: input
    id: tachiyomisy-version
@ -53,7 +53,7 @@ body:
      label: TachiyomiSY version
      description: You can find your TachiyomiSY version in **More → About**.
      placeholder: |
-        Example: "1.12.0"
+        Example: "1.10.5"
    validations:
      required: true

@ -63,7 +63,7 @@ body:
      label: Android version
      description: You can find this somewhere in your Android settings.
      placeholder: |
-        Example: "Android 14"
+        Example: "Android 11"
    validations:
      required: true

@ -73,7 +73,7 @@ body:
      label: Device
      description: List your device and model.
      placeholder: |
-        Example: "Google Pixel 8"
+        Example: "Google Pixel 5"
    validations:
      required: true

@ -94,11 +94,11 @@ body:
          required: true
        - label: I have written a short but informative title.
          required: true
-        - label: I have gone through the [FAQ](https://mihon.app/docs/faq/general) and [troubleshooting guide](https://mihon.app/docs/guides/troubleshooting/).
+        - label: I have gone through the [FAQ](https://mihon.app/docs/faq/general) and [troubleshooting guide](https:/mihon.app/docs/guides/troubleshooting/).
          required: true
-        - label: I have updated the app to version **[1.12.0](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
+        - label: I have updated the app to version **[1.10.5](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
          required: true
-        - label: I have filled out all of the requested information in this form, including specific version numbers.
+        - label: I have updated all installed extensions.
          required: true
-        - label: I understand that **Mihon does not have or fix any extensions**, and I **will not receive help** for any issues related to sources or extensions.
+        - label: I will fill out all of the requested information in this form.
          required: true
--- a/.github/ISSUE_TEMPLATE/request_feature.yml
+++ b/.github/ISSUE_TEMPLATE/request_feature.yml
@ -31,7 +31,7 @@ body:
          required: true
        - label: I have written a short but informative title.
          required: true
-        - label: I have updated the app to version **[1.12.0](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
+        - label: I have updated the app to version **[1.10.5](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
          required: true
        - label: I will fill out all of the requested information in this form.
          required: true
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@ -1,7 +1,8 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base"],
+  "extends": [
+    "config:base"
+  ],
  "labels": ["Dependencies"],
  "includePaths": [".github/workflows/*", "gradle/sy.versions.toml"],
-  "semanticCommits": "disabled"
 }
--- a/.github/workflows/build_check.yml
+++ b/.github/workflows/build_check.yml
@ -6,8 +6,20 @@ concurrency:
  cancel-in-progress: true

 jobs:
+  check_wrapper:
+    name: Validate Gradle Wrapper
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v4
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
  build:
    name: Build app
+    needs: check_wrapper
    runs-on: ubuntu-latest

    steps:
@ -18,13 +30,13 @@ jobs:
        uses: actions/setup-java@v4
        with:
          java-version: 17
-          distribution: temurin
+          distribution: adopt

      - name: Set up gradle
        uses: gradle/actions/setup-gradle@v4

      - name: Build app
-        run: ./gradlew spotlessCheck assembleDevDebug
+        run: ./gradlew detekt assembleDevDebug

      - name: Upload APK
        uses: actions/upload-artifact@v4
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@ -17,6 +17,9 @@ jobs:
      - name: Clone repo
        uses: actions/checkout@v4

+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
      - name: Setup Android SDK
        run: |
          ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.3"
@ -25,12 +28,12 @@ jobs:
        uses: actions/setup-java@v4
        with:
          java-version: 17
-          distribution: temurin
+          distribution: adopt

      - name: Set up gradle
        uses: gradle/actions/setup-gradle@v4

-      # SY -->
+      # SY <--
      - name: Write google-services.json
        uses: DamianReeves/write-file-action@v1.3
        with:
@ -44,16 +47,10 @@ jobs:
          path: app/src/main/assets/client_secrets.json
          contents: ${{ secrets.CLIENT_SECRETS_TEXT }}
          write-mode: overwrite
-      # SY <--
+      # SY -->

-      - name: Check code format
-        run: ./gradlew spotlessCheck
-
-      - name: Build app
-        run: ./gradlew assembleStandardRelease
-
-      - name: Run unit tests
-        run: ./gradlew testReleaseUnitTest testStandardReleaseUnitTest
+      - name: Build app and run unit tests
+        run: ./gradlew detekt assembleStandardRelease testStandardReleaseUnitTest --stacktrace

      - name: Sign APK
        uses: r0adkll/sign-android-release@v1
@ -63,8 +60,6 @@ jobs:
          alias: ${{ secrets.ALIAS }}
          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
          keyPassword: ${{ secrets.KEY_PASSWORD }}
-        env:
-          BUILD_TOOLS_VERSION: '35.0.1'

      - name: Clean up build artifacts
        run: |
@ -74,19 +69,19 @@ jobs:
          sha=`sha256sum TachiyomiSY.apk | awk '{ print $1 }'`
          echo "APK_UNIVERSAL_SHA=$sha" >> $GITHUB_ENV

-          mv app/build/outputs/apk/standard/release/app-standard-arm64-v8a-release-unsigned-signed.apk TachiyomiSY-arm64-v8a.apk
+          cp app/build/outputs/apk/standard/release/app-standard-arm64-v8a-release-unsigned-signed.apk TachiyomiSY-arm64-v8a.apk
          sha=`sha256sum TachiyomiSY-arm64-v8a.apk | awk '{ print $1 }'`
          echo "APK_ARM64_V8A_SHA=$sha" >> $GITHUB_ENV

-          mv app/build/outputs/apk/standard/release/app-standard-armeabi-v7a-release-unsigned-signed.apk TachiyomiSY-armeabi-v7a.apk
+          cp app/build/outputs/apk/standard/release/app-standard-armeabi-v7a-release-unsigned-signed.apk TachiyomiSY-armeabi-v7a.apk
          sha=`sha256sum TachiyomiSY-armeabi-v7a.apk | awk '{ print $1 }'`
          echo "APK_ARMEABI_V7A_SHA=$sha" >> $GITHUB_ENV

-          mv app/build/outputs/apk/standard/release/app-standard-x86-release-unsigned-signed.apk TachiyomiSY-x86.apk
+          cp app/build/outputs/apk/standard/release/app-standard-x86-release-unsigned-signed.apk TachiyomiSY-x86.apk
          sha=`sha256sum TachiyomiSY-x86.apk | awk '{ print $1 }'`
          echo "APK_X86_SHA=$sha" >> $GITHUB_ENV
          
-          mv app/build/outputs/apk/standard/release/app-standard-x86_64-release-unsigned-signed.apk TachiyomiSY-x86_64.apk
+          cp app/build/outputs/apk/standard/release/app-standard-x86_64-release-unsigned-signed.apk TachiyomiSY-x86_64.apk
          sha=`sha256sum TachiyomiSY-x86_64.apk | awk '{ print $1 }'`
          echo "APK_X86_64_SHA=$sha" >> $GITHUB_ENV

--- a/.github/workflows/build_push_preview.yml
+++ b/.github/workflows/build_push_preview.yml
@ -1,10 +1,10 @@
 name: Remote Dispatch Action Initiator
-
+ 
 on:
  push:
-   branches:
+   branches: 
    - 'preview'
-
+ 
 jobs:
  trigger_preview_build:
    name: Trigger preview build
@ -14,14 +14,8 @@ jobs:
      - name: Clone repo
        uses: actions/checkout@v4

-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: temurin
-
-      - name: Set up gradle
-        uses: gradle/actions/setup-gradle@v4
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4

      - name: Create Tag
        run: |
@ -34,6 +28,3 @@ jobs:
          -H 'Accept: application/vnd.github.everest-preview+json' \
          -u ${{ secrets.ACCESS_TOKEN }} \
          --data '{"event_type": "ping", "client_payload": { "repository": "'"$GITHUB_REPOSITORY"'" }}'
-
-      - name: Run unit tests
-        run: ./gradlew testDebugUnitTest testDevDebugUnitTest
--- a/.github/workflows/issue_moderator.yml
+++ b/.github/workflows/issue_moderator.yml
@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Moderate issues
-        uses: tachiyomiorg/issue-moderator-action@v2.6.1
+        uses: tachiyomiorg/issue-moderator-action@v2.6.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          duplicate-label: Duplicate
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@ -0,0 +1,19 @@
+name: Lock threads
+
+on:
+  # Daily
+  schedule:
+    - cron: '0 0 * * *'
+  # Manual trigger
+  workflow_dispatch:
+    inputs:
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v5
+        with:
+          github-token: ${{ github.token }}
+          issue-inactive-days: '2'
+          pr-inactive-days: '2'
--- a/.github/workflows/pr_label.yml
+++ b/.github/workflows/pr_label.yml
@ -1,26 +0,0 @@
-name: Label PRs
-
-on:
-  pull_request:
-    types: [opened]
-
-jobs:
-  label_pr:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check PR and Add Label
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const prAuthor = context.payload.pull_request.user.login;
-            
-            if (prAuthor === 'weblate') {
-              const labels = ['Translations'];
-              await github.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.payload.pull_request.number,
-                labels: labels
-              });
-            }
--- a/.gitignore
+++ b/.gitignore
@ -1,24 +1,26 @@
-# Build files
 .gradle
 .kotlin
-build
-
-# IDE files
-*.iml
+/local.properties
+/.idea/workspace.xml
+.DS_Store
 .idea/*
 !.idea/icon.png
-/captures
+*iml
+*.iml
+/mainframer
+/.mainframer

-# Configuration files
-local.properties
-
-# macOS specific files
-.DS_Store
-
-# SY ignores
-google-services.json
-/app/src/main/assets/client_secrets.json
+# Built files
+*/build
+/build
 *.apk
+app/**/output.json

-# Custom ignores
-/keys
+# Unnecessary file
+*.swp
+
+TODO.md
+CHANGELOG.md
+/captures
+build.sh
+/app/src/main/assets/client_secrets.json
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,4 +1,4 @@
-Looking to report an issue/bug or make a feature request? Please refer to the [README file](/README.md#issues-feature-requests-and-contributing).
+Looking to report an issue/bug or make a feature request? Please refer to the [README file](https://github.com/tachiyomiorg/tachiyomi#issues-feature-requests-and-contributing).

 ---

@ -9,7 +9,7 @@ Thanks for your interest in contributing to Tachiyomi!

 Pull requests are welcome!

-If you're interested in taking on [an open issue](https://github.com/jobobby04/TachiyomiSY/issues), please comment on it so others are aware.
+If you're interested in taking on [an open issue](https://github.com/tachiyomiorg/tachiyomi/issues), please comment on it so others are aware.
 You do not need to ask for permission nor an assignment.

 ## Prerequisites
@ -24,27 +24,34 @@ Before you start, please note that the ability to use following technologies is
 - [Android Studio](https://developer.android.com/studio)
 - Emulator or phone with developer options enabled to test changes.

+## Linting
+
+Run the `detekt` gradle task. If the build fails, a report of issues can be found in `app/build/reports/detekt/`. The report is availble in several formats and details each issue that needs attention. 
+
 ## Getting help

- Join [the Discord server](https://discord.gg/mihon) for online help and to ask questions while developing.
+- Join [the Discord server](https://discord.gg/tachiyomi) for online help and to ask questions while developing.

 # Translations

-Translations are done externally via Weblate. See [our website](https://mihon.app/docs/contribute#translation) for more details.
+Translations are done externally via Weblate. See [our website](https://tachiyomi.org/docs/contribute#translation) for more details.


 # Forks

-Forks are allowed so long as they abide by [the project's LICENSE](/LICENSE).
+Forks are allowed so long as they abide by [the project's LICENSE](https://github.com/tachiyomiorg/tachiyomi/blob/master/LICENSE).

 When creating a fork, remember to:

 - To avoid confusion with the main app:
    - Change the app name
    - Change the app icon
-    - Change or disable the [app update checker](/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt)
+    - Change or disable the [app update checker](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt)
 - To avoid installation conflicts:
-    - Change the `applicationId` in [`build.gradle.kts`](/app/build.gradle.kts)
+    - Change the `applicationId` in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts)
+- To avoid having your data polluting the main app's analytics and crash report services:
+    - If you want to use Firebase analytics, replace [`google-services.json`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/src/standard/google-services.json) with your own
+    - If you want to use ACRA crash reporting, replace the `ACRA_URI` endpoint in [`build.gradle.kts`](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle.kts) with your own


 ### Supporting Cloud Sync - Google Drive Implementation
--- a/README.md
+++ b/README.md
@ -82,7 +82,7 @@ Please make sure to read the full guidelines. Your issue may be closed without w

 <details><summary>Issues</summary>

-1. **Before reporting a new issue, take a look at the [FAQ](https://mihon.app/docs/faq/general), the [changelog](https://github.com/jobobby04/tachiyomisy/releases) and the already opened [issues](https://github.com/jobobby04/tachiyomisy/issues).**
+1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/docs/faq/general), the [changelog](https://github.com/jobobby04/tachiyomisy/releases) and the already opened [issues](https://github.com/jobobby04/tachiyomisy/issues).**
 2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/1195734228319617024.svg)](https://discord.gg/mihon)

 </details>
--- a/app/.gitignore
+++ b/app/.gitignore
@ -0,0 +1,4 @@
+/build
+*iml
+*.iml
+google-services.json
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -1,29 +1,27 @@
-@file:Suppress("ChromeOsAbiSupport")
-
 import mihon.buildlogic.getBuildTime
 import mihon.buildlogic.getCommitCount
 import mihon.buildlogic.getGitSha
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

 plugins {
    id("mihon.android.application")
    id("mihon.android.application.compose")
+    id("com.mikepenz.aboutlibraries.plugin")
    kotlin("plugin.parcelize")
    kotlin("plugin.serialization")
    // id("com.github.zellius.shortcut-helper")
-    alias(libs.plugins.aboutLibraries)
    id("com.github.ben-manes.versions")
 }

 if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
-    pluginManager.apply {
-        apply(libs.plugins.google.services.get().pluginId)
-        apply(libs.plugins.firebase.crashlytics.get().pluginId)
-    }
+    apply<com.google.gms.googleservices.GoogleServicesPlugin>()
+    // Firebase Crashlytics
+    apply(plugin = "com.google.firebase.crashlytics")
 }

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

-val supportedAbis = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")

 android {
    namespace = "eu.kanade.tachiyomi"
@ -31,16 +29,16 @@ android {
    defaultConfig {
        applicationId = "eu.kanade.tachiyomi.sy"

-        versionCode = 75
-        versionName = "1.12.0"
+        versionCode = 69
+        versionName = "1.10.5"

        buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
        buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
-        buildConfigField("String", "BUILD_TIME", "\"${getBuildTime(useLastCommitTime = false)}\"")
+        buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"")
        buildConfigField("boolean", "INCLUDE_UPDATER", "false")

        ndk {
-            abiFilters += supportedAbis
+            abiFilters += SUPPORTED_ABIS
        }
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
@ -49,7 +47,7 @@ android {
        abi {
            isEnable = true
            reset()
-            include(*supportedAbis.toTypedArray())
+            include(*SUPPORTED_ABIS.toTypedArray())
            isUniversalApk = true
        }
    }
@ -71,8 +69,6 @@ android {
            isMinifyEnabled = true
            isShrinkResources = true
            setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"))
-
-            buildConfigField("String", "BUILD_TIME", "\"${getBuildTime(useLastCommitTime = true)}\"")
        }
        create("benchmark") {
            initWith(getByName("release"))
@ -101,6 +97,8 @@ android {
            dimension = "default"
        }
        create("dev") {
+            // Include pseudolocales: https://developer.android.com/guide/topics/resources/pseudolocales
+            resourceConfigurations.addAll(listOf("en", "en_XA", "ar_XB", "xxhdpi"))
            dimension = "default"
        }
    }
@ -108,16 +106,13 @@ android {
    packaging {
        resources.excludes.addAll(
            listOf(
-                "kotlin-tooling-metadata.json",
                "META-INF/DEPENDENCIES",
                "LICENSE.txt",
                "META-INF/LICENSE",
-                "META-INF/**/LICENSE.txt",
-                "META-INF/*.properties",
-                "META-INF/**/*.properties",
+                "META-INF/LICENSE.txt",
                "META-INF/README.md",
                "META-INF/NOTICE",
-                "META-INF/*.version",
+                "META-INF/*.kotlin_module",
            ),
        )
    }
@ -142,24 +137,6 @@ android {
    }
 }

-kotlin {
-    compilerOptions {
-        freeCompilerArgs.addAll(
-            "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
-            "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
-            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-            "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-            "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
-            "-opt-in=coil3.annotation.ExperimentalCoilApi",
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=kotlinx.coroutines.FlowPreview",
-            "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
-            "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
-        )
-    }
-}
-
 dependencies {
    implementation(projects.i18n)
    // SY -->
@ -184,7 +161,8 @@ dependencies {
    debugImplementation(compose.ui.tooling)
    implementation(compose.ui.tooling.preview)
    implementation(compose.ui.util)
-
+    implementation(compose.accompanist.systemuicontroller)
+    
    implementation(androidx.interpolator)

    implementation(androidx.paging.runtime)
@ -239,7 +217,7 @@ dependencies {
    implementation(libs.preferencektx)

    // Dependency injection
-    implementation(libs.injekt)
+    implementation(libs.injekt.core)

    // Image loading
    implementation(platform(libs.coil.bom))
@ -257,23 +235,20 @@ dependencies {
        exclude(group = "androidx.viewpager", module = "viewpager")
    }
    implementation(libs.insetter)
-    implementation(libs.richeditor.compose)
+    implementation(libs.bundles.richtext)
    implementation(libs.aboutLibraries.compose)
    implementation(libs.bundles.voyager)
    implementation(libs.compose.materialmotion)
    implementation(libs.swipe)
    implementation(libs.compose.webview)
    implementation(libs.compose.grid)
-    implementation(libs.reorderable)
-    implementation(libs.bundles.markdown)
+

    // Logging
    implementation(libs.logcat)

    // Crash reports/analytics
-//    "standardImplementation"(platform(libs.firebase.bom))
-//    "standardImplementation"(libs.firebase.analytics)
-//    "standardImplementation"(libs.firebase.crashlytics)
+    // "standardImplementation"(libs.firebase.analytics)

    // Shizuku
    implementation(libs.bundles.shizuku)
@ -292,9 +267,8 @@ dependencies {
    implementation(sylibs.simularity)

    // Firebase (EH)
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.analytics)
-    implementation(libs.firebase.crashlytics)
+    implementation(sylibs.firebase.analytics)
+    implementation(sylibs.firebase.crashlytics.ktx)

    // Better logging (EH)
    implementation(sylibs.xlog)
@ -306,16 +280,17 @@ dependencies {
    // Google drive
    implementation(sylibs.google.api.services.drive)
    implementation(sylibs.google.api.client.oauth)
-
-    // Koin
-    implementation(sylibs.koin.core)
-    implementation(sylibs.koin.android)
-
-    // ZXing Android Embedded
-    implementation(sylibs.zxing.android.embedded)
 }

 androidComponents {
+    beforeVariants { variantBuilder ->
+        // Disables standardBenchmark
+        if (variantBuilder.buildType == "benchmark") {
+            variantBuilder.enable = variantBuilder.productFlavors.containsAll(
+                listOf("default" to "dev"),
+            )
+        }
+    }
    onVariants(selector().withFlavor("default" to "standard")) {
        // Only excluding in standard flavor because this breaks
        // Layout Inspector's Compose tree
@ -323,6 +298,28 @@ androidComponents {
    }
 }

+tasks {
+    // See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api(-markers)
+    withType<KotlinCompile> {
+        compilerOptions.freeCompilerArgs.addAll(
+            "-Xcontext-receivers",
+            "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
+            "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
+            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
+            "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
+            "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
+            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
+            "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
+            "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
+            "-opt-in=coil3.annotation.ExperimentalCoilApi",
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-opt-in=kotlinx.coroutines.FlowPreview",
+            "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
+            "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
+        )
+    }
+}
+
 buildscript {
    dependencies {
        classpath(kotlinx.gradle)
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@ -3,4 +3,4 @@
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    <monochrome android:drawable="@drawable/ic_tachi_monochrome_launcher" />
-</adaptive-icon>
+</adaptive-icon>
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -3,4 +3,4 @@
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    <monochrome android:drawable="@drawable/ic_tachi_monochrome_launcher" />
-</adaptive-icon>
+</adaptive-icon>
--- a/app/src/dev/java/mihon/core/firebase/FirebaseConfig.kt
+++ b/app/src/dev/java/mihon/core/firebase/FirebaseConfig.kt
@ -1,11 +0,0 @@
-package mihon.core.firebase
-
-import android.content.Context
-
-object FirebaseConfig {
-    fun init(context: Context) = Unit
-
-    fun setAnalyticsEnabled(enabled: Boolean) = Unit
-
-    fun setCrashlyticsEnabled(enabled: Boolean) = Unit
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -34,23 +34,11 @@

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />

-    <!-- Remove unnecessary permissions from Firebase dependency -->
-    <uses-permission
-        android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"
-        tools:node="remove" />
-
+    <!-- Remove permission from Firebase dependency -->
    <uses-permission
        android:name="com.google.android.gms.permission.AD_ID"
        tools:node="remove" />

-    <uses-permission
-        android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION"
-        tools:node="remove" />
-
-    <uses-permission
-        android:name="android.permission.ACCESS_ADSERVICES_AD_ID"
-        tools:node="remove" />
-
    <application
        android:name=".App"
        android:allowBackup="false"
@ -268,14 +256,6 @@
            android:name="android.webkit.WebView.MetricsOptOut"
            android:value="true" />

-        <!-- Disable for manual opt-in -->
-        <meta-data
-            android:name="firebase_analytics_collection_enabled"
-            android:value="false" />
-        <meta-data
-            android:name="firebase_crashlytics_collection_enabled"
-            android:value="false" />
-
        <!-- Disable advertising ID collection for Firebase -->
        <meta-data
            android:name="google_analytics_adid_collection_enabled"
@ -359,7 +339,7 @@
                <data android:scheme="https" />
                <data android:scheme="http" />

-                <data android:host="pururin.me" />
+                <data android:host="pururin.io" />

                <data android:pathPattern="/gallery/..*" />
            </intent-filter>
@ -413,13 +393,6 @@
                    android:scheme="tachiyomisy" />
            </intent-filter>
        </activity>
-
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            tools:remove="screenOrientation" />
    </application>

-    <uses-sdk tools:overrideLibrary="rikka.shizuku.api"
-        tools:ignore="ManifestOrder" />
-
 </manifest>
--- a/app/src/main/java/eu/kanade/core/util/CollectionUtils.kt
+++ b/app/src/main/java/eu/kanade/core/util/CollectionUtils.kt
@ -1,12 +1,11 @@
 package eu.kanade.core.util

-import androidx.compose.ui.util.fastFilter
 import androidx.compose.ui.util.fastForEach
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract

 fun <T : R, R : Any> List<T>.insertSeparators(
-    generator: (before: T?, after: T?) -> R?,
+    generator: (T?, T?) -> R?,
 ): List<R> {
    if (isEmpty()) return emptyList()
    val newList = mutableListOf<R>()
@ -20,24 +19,6 @@ fun <T : R, R : Any> List<T>.insertSeparators(
    return newList
 }

-/**
- * Similar to [eu.kanade.core.util.insertSeparators] but iterates from last to first element
- */
-fun <T : R, R : Any> List<T>.insertSeparatorsReversed(
-    generator: (before: T?, after: T?) -> R?,
-): List<R> {
-    if (isEmpty()) return emptyList()
-    val newList = mutableListOf<R>()
-    for (i in size downTo 0) {
-        val after = getOrNull(i)
-        after?.let(newList::add)
-        val before = getOrNull(i - 1)
-        val separator = generator.invoke(before, after)
-        separator?.let(newList::add)
-    }
-    return newList.asReversed()
-}
-
 fun <E> HashSet<E>.addOrRemove(value: E, shouldAdd: Boolean) {
    if (shouldAdd) {
        add(value)
@ -46,6 +27,21 @@ fun <E> HashSet<E>.addOrRemove(value: E, shouldAdd: Boolean) {
    }
 }

+/**
+ * Returns a list containing only elements matching the given [predicate].
+ *
+ * **Do not use for collections that come from public APIs**, since they may not support random
+ * access in an efficient way, and this method may actually be a lot slower. Only use for
+ * collections that are created by code we control and are known to support random access.
+ */
+@OptIn(ExperimentalContracts::class)
+inline fun <T> List<T>.fastFilter(predicate: (T) -> Boolean): List<T> {
+    contract { callsInPlace(predicate) }
+    val destination = ArrayList<T>()
+    fastForEach { if (predicate(it)) destination.add(it) }
+    return destination
+}
+
 /**
 * Returns a list containing all elements not matching the given [predicate].
 *
@ -56,7 +52,27 @@ fun <E> HashSet<E>.addOrRemove(value: E, shouldAdd: Boolean) {
@OptIn(ExperimentalContracts::class)
 inline fun <T> List<T>.fastFilterNot(predicate: (T) -> Boolean): List<T> {
    contract { callsInPlace(predicate) }
-    return fastFilter { !predicate(it) }
+    val destination = ArrayList<T>()
+    fastForEach { if (!predicate(it)) destination.add(it) }
+    return destination
+}
+
+/**
+ * Returns a list containing only the non-null results of applying the
+ * given [transform] function to each element in the original collection.
+ *
+ * **Do not use for collections that come from public APIs**, since they may not support random
+ * access in an efficient way, and this method may actually be a lot slower. Only use for
+ * collections that are created by code we control and are known to support random access.
+ */
+@OptIn(ExperimentalContracts::class)
+inline fun <T, R> List<T>.fastMapNotNull(transform: (T) -> R?): List<R> {
+    contract { callsInPlace(transform) }
+    val destination = ArrayList<R>()
+    fastForEach { element ->
+        transform(element)?.let(destination::add)
+    }
+    return destination
 }

 /**
@ -97,3 +113,26 @@ inline fun <T> List<T>.fastCountNot(predicate: (T) -> Boolean): Int {
    fastForEach { if (predicate(it)) --count }
    return count
 }
+
+/**
+ * Returns a list containing only elements from the given collection
+ * having distinct keys returned by the given [selector] function.
+ *
+ * Among elements of the given collection with equal keys, only the first one will be present in the resulting list.
+ * The elements in the resulting list are in the same order as they were in the source collection.
+ *
+ * **Do not use for collections that come from public APIs**, since they may not support random
+ * access in an efficient way, and this method may actually be a lot slower. Only use for
+ * collections that are created by code we control and are known to support random access.
+ */
+@OptIn(ExperimentalContracts::class)
+inline fun <T, K> List<T>.fastDistinctBy(selector: (T) -> K): List<T> {
+    contract { callsInPlace(selector) }
+    val set = HashSet<K>()
+    val list = ArrayList<T>()
+    fastForEach {
+        val key = selector(it)
+        if (set.add(key)) list.add(it)
+    }
+    return list
+}
--- a/app/src/main/java/eu/kanade/domain/DomainModule.kt
+++ b/app/src/main/java/eu/kanade/domain/DomainModule.kt
@ -13,11 +13,9 @@ import eu.kanade.domain.manga.interactor.SetExcludedScanlators
 import eu.kanade.domain.manga.interactor.SetMangaViewerFlags
 import eu.kanade.domain.manga.interactor.UpdateManga
 import eu.kanade.domain.source.interactor.GetEnabledSources
-import eu.kanade.domain.source.interactor.GetIncognitoState
 import eu.kanade.domain.source.interactor.GetLanguagesWithSources
 import eu.kanade.domain.source.interactor.GetSourcesWithFavoriteCount
 import eu.kanade.domain.source.interactor.SetMigrateSorting
-import eu.kanade.domain.source.interactor.ToggleIncognito
 import eu.kanade.domain.source.interactor.ToggleLanguage
 import eu.kanade.domain.source.interactor.ToggleSource
 import eu.kanade.domain.source.interactor.ToggleSourcePin
@ -25,11 +23,7 @@ import eu.kanade.domain.track.interactor.AddTracks
 import eu.kanade.domain.track.interactor.RefreshTracks
 import eu.kanade.domain.track.interactor.SyncChapterProgressWithTrack
 import eu.kanade.domain.track.interactor.TrackChapter
-import eu.kanade.tachiyomi.di.InjektModule
-import eu.kanade.tachiyomi.di.addFactory
-import eu.kanade.tachiyomi.di.addSingletonFactory
 import mihon.data.repository.ExtensionRepoRepositoryImpl
-import mihon.domain.chapter.interactor.FilterChaptersForDownload
 import mihon.domain.extensionrepo.interactor.CreateExtensionRepo
 import mihon.domain.extensionrepo.interactor.DeleteExtensionRepo
 import mihon.domain.extensionrepo.interactor.GetExtensionRepo
@ -82,7 +76,6 @@ import tachiyomi.domain.manga.interactor.GetMangaWithChapters
 import tachiyomi.domain.manga.interactor.NetworkToLocalManga
 import tachiyomi.domain.manga.interactor.ResetViewerFlags
 import tachiyomi.domain.manga.interactor.SetMangaChapterFlags
-import tachiyomi.domain.manga.interactor.UpdateMangaNotes
 import tachiyomi.domain.manga.repository.MangaRepository
 import tachiyomi.domain.release.interactor.GetApplicationRelease
 import tachiyomi.domain.release.service.ReleaseService
@ -97,7 +90,11 @@ import tachiyomi.domain.track.interactor.InsertTrack
 import tachiyomi.domain.track.repository.TrackRepository
 import tachiyomi.domain.updates.interactor.GetUpdates
 import tachiyomi.domain.updates.repository.UpdatesRepository
+import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
+import uy.kohesive.injekt.api.addFactory
+import uy.kohesive.injekt.api.addSingletonFactory
+import uy.kohesive.injekt.api.get

 class DomainModule : InjektModule {

@ -111,7 +108,7 @@ class DomainModule : InjektModule {
        addFactory { RenameCategory(get()) }
        addFactory { ReorderCategory(get()) }
        addFactory { UpdateCategory(get()) }
-        addFactory { DeleteCategory(get(), get(), get()) }
+        addFactory { DeleteCategory(get()) }

        addSingletonFactory<MangaRepository> { MangaRepositoryImpl(get()) }
        addFactory { GetDuplicateLibraryManga(get()) }
@ -129,7 +126,6 @@ class DomainModule : InjektModule {
        addFactory { SetMangaViewerFlags(get()) }
        addFactory { NetworkToLocalManga(get()) }
        addFactory { UpdateManga(get(), get()) }
-        addFactory { UpdateMangaNotes(get()) }
        addFactory { SetMangaCategories(get()) }
        addFactory { GetExcludedScanlators(get()) }
        addFactory { SetExcludedScanlators(get()) }
@ -154,9 +150,8 @@ class DomainModule : InjektModule {
        addFactory { UpdateChapter(get()) }
        addFactory { SetReadStatus(get(), get(), get(), get(), get()) }
        addFactory { ShouldUpdateDbChapter() }
-        addFactory { SyncChaptersWithSource(get(), get(), get(), get(), get(), get(), get(), get(), get()) }
+        addFactory { SyncChaptersWithSource(get(), get(), get(), get(), get(), get(), get(), get()) }
        addFactory { GetAvailableScanlators(get()) }
-        addFactory { FilterChaptersForDownload(get(), get(), get(), get()) }

        addSingletonFactory<HistoryRepository> { HistoryRepositoryImpl(get()) }
        addFactory { GetHistory(get()) }
@ -194,7 +189,5 @@ class DomainModule : InjektModule {
        addFactory { DeleteExtensionRepo(get()) }
        addFactory { ReplaceExtensionRepo(get()) }
        addFactory { UpdateExtensionRepo(get(), get()) }
-        addFactory { ToggleIncognito(get()) }
-        addFactory { GetIncognitoState(get(), get(), get()) }
    }
 }
--- a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt
+++ b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt
@ -14,9 +14,6 @@ import eu.kanade.domain.source.interactor.GetSourceCategories
 import eu.kanade.domain.source.interactor.RenameSourceCategory
 import eu.kanade.domain.source.interactor.SetSourceCategories
 import eu.kanade.domain.source.interactor.ToggleExcludeFromDataSaver
-import eu.kanade.tachiyomi.di.InjektModule
-import eu.kanade.tachiyomi.di.addFactory
-import eu.kanade.tachiyomi.di.addSingletonFactory
 import eu.kanade.tachiyomi.source.online.MetadataSource
 import exh.search.SearchEngine
 import tachiyomi.data.manga.CustomMangaRepositoryImpl
@ -28,6 +25,7 @@ import tachiyomi.data.source.SavedSearchRepositoryImpl
 import tachiyomi.domain.chapter.interactor.DeleteChapters
 import tachiyomi.domain.chapter.interactor.GetChapterByUrl
 import tachiyomi.domain.chapter.interactor.GetMergedChaptersByMangaId
+import tachiyomi.domain.history.interactor.GetHistoryByMangaId
 import tachiyomi.domain.manga.interactor.DeleteByMergeId
 import tachiyomi.domain.manga.interactor.DeleteFavoriteEntries
 import tachiyomi.domain.manga.interactor.DeleteMangaById
@ -44,7 +42,7 @@ import tachiyomi.domain.manga.interactor.GetMergedManga
 import tachiyomi.domain.manga.interactor.GetMergedMangaById
 import tachiyomi.domain.manga.interactor.GetMergedMangaForDownloading
 import tachiyomi.domain.manga.interactor.GetMergedReferencesById
-import tachiyomi.domain.manga.interactor.GetReadMangaNotInLibraryView
+import tachiyomi.domain.manga.interactor.GetReadMangaNotInLibrary
 import tachiyomi.domain.manga.interactor.GetSearchMetadata
 import tachiyomi.domain.manga.interactor.GetSearchTags
 import tachiyomi.domain.manga.interactor.GetSearchTitles
@ -73,7 +71,11 @@ import tachiyomi.domain.source.interactor.InsertSavedSearch
 import tachiyomi.domain.source.repository.FeedSavedSearchRepository
 import tachiyomi.domain.source.repository.SavedSearchRepository
 import tachiyomi.domain.track.interactor.IsTrackUnfollowed
+import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
+import uy.kohesive.injekt.api.addFactory
+import uy.kohesive.injekt.api.addSingletonFactory
+import uy.kohesive.injekt.api.get
 import xyz.nulldev.ts.api.http.serializer.FilterSerializer

 class SYDomainModule : InjektModule {
@ -87,6 +89,7 @@ class SYDomainModule : InjektModule {
        addFactory { DeleteChapters(get()) }
        addFactory { DeleteMangaById(get()) }
        addFactory { FilterSerializer() }
+        addFactory { GetHistoryByMangaId(get()) }
        addFactory { GetChapterByUrl(get()) }
        addFactory { GetSourceCategories(get()) }
        addFactory { CreateSourceCategory(get()) }
@ -99,7 +102,7 @@ class SYDomainModule : InjektModule {
        addFactory { GetPagePreviews(get(), get()) }
        addFactory { SearchEngine() }
        addFactory { IsTrackUnfollowed() }
-        addFactory { GetReadMangaNotInLibraryView(get()) }
+        addFactory { GetReadMangaNotInLibrary(get()) }

        // Required for [MetadataSource]
        addFactory<MetadataSource.GetMangaId> { GetManga(get()) }
--- a/app/src/main/java/eu/kanade/domain/base/BasePreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/base/BasePreferences.kt
@ -2,7 +2,6 @@ package eu.kanade.domain.base

 import android.content.Context
 import dev.icerock.moko.resources.StringResource
-import eu.kanade.tachiyomi.util.system.GLUtil
 import tachiyomi.core.common.preference.Preference
 import tachiyomi.core.common.preference.PreferenceStore
 import tachiyomi.i18n.MR
@ -31,8 +30,4 @@ class BasePreferences(
    }

    fun displayProfile() = preferenceStore.getString("pref_display_profile_key", "")
-
-    fun hardwareBitmapThreshold() = preferenceStore.getInt("pref_hardware_bitmap_threshold", GLUtil.SAFE_TEXTURE_LIMIT)
-
-    fun alwaysDecodeLongStripWithSSIV() = preferenceStore.getBoolean("pref_always_decode_long_strip_with_ssiv", false)
 }
--- a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
+++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
@ -20,7 +20,6 @@ import tachiyomi.domain.chapter.model.NoChaptersException
 import tachiyomi.domain.chapter.model.toChapterUpdate
 import tachiyomi.domain.chapter.repository.ChapterRepository
 import tachiyomi.domain.chapter.service.ChapterRecognition
-import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.source.local.isLocal
 import java.lang.Long.max
@ -36,7 +35,6 @@ class SyncChaptersWithSource(
    private val updateChapter: UpdateChapter,
    private val getChaptersByMangaId: GetChaptersByMangaId,
    private val getExcludedScanlators: GetExcludedScanlators,
-    private val libraryPreferences: LibraryPreferences,
 ) {

    /**
@ -152,18 +150,12 @@ class SyncChaptersWithSource(
            return emptyList()
        }

-        val changedOrDuplicateReadUrls = mutableSetOf<String>()
+        val reAdded = mutableListOf<Chapter>()

        val deletedChapterNumbers = TreeSet<Double>()
        val deletedReadChapterNumbers = TreeSet<Double>()
        val deletedBookmarkedChapterNumbers = TreeSet<Double>()

-        val readChapterNumbers = dbChapters
-            .asSequence()
-            .filter { it.read && it.isRecognizedNumber }
-            .map { it.chapterNumber }
-            .toSet()
-
        removedChapters.forEach { chapter ->
            if (chapter.read) deletedReadChapterNumbers.add(chapter.chapterNumber)
            if (chapter.bookmark) deletedBookmarkedChapterNumbers.add(chapter.chapterNumber)
@ -173,20 +165,12 @@ class SyncChaptersWithSource(
        val deletedChapterNumberDateFetchMap = removedChapters.sortedByDescending { it.dateFetch }
            .associate { it.chapterNumber to it.dateFetch }

-        val markDuplicateAsRead = libraryPreferences.markDuplicateReadChapterAsRead().get()
-            .contains(LibraryPreferences.MARK_DUPLICATE_CHAPTER_READ_NEW)
-
        // Date fetch is set in such a way that the upper ones will have bigger value than the lower ones
        // Sources MUST return the chapters from most to less recent, which is common.
        var itemCount = newChapters.size
        var updatedToAdd = newChapters.map { toAddItem ->
            var chapter = toAddItem.copy(dateFetch = nowMillis + itemCount--)

-            if (chapter.chapterNumber in readChapterNumbers && markDuplicateAsRead) {
-                changedOrDuplicateReadUrls.add(chapter.url)
-                chapter = chapter.copy(read = true)
-            }
-
            if (!chapter.isRecognizedNumber || chapter.chapterNumber !in deletedChapterNumbers) return@map chapter

            chapter = chapter.copy(
@ -199,19 +183,19 @@ class SyncChaptersWithSource(
                chapter = chapter.copy(dateFetch = it)
            }

-            changedOrDuplicateReadUrls.add(chapter.url)
+            reAdded.add(chapter)

            chapter
        }

        // --> EXH (carry over reading progress)
        if (manga.isEhBasedManga()) {
-            val finalAdded = updatedToAdd.filterNot { it.url in changedOrDuplicateReadUrls }
+            val finalAdded = updatedToAdd.subtract(reAdded)
            if (finalAdded.isNotEmpty()) {
                val max = dbChapters.maxOfOrNull { it.lastPageRead }
                if (max != null && max > 0) {
                    updatedToAdd = updatedToAdd.map {
-                        if (it.url !in changedOrDuplicateReadUrls) {
+                        if (it !in reAdded) {
                            it.copy(lastPageRead = max)
                        } else {
                            it
@ -241,8 +225,12 @@ class SyncChaptersWithSource(
        // Note that last_update actually represents last time the chapter list changed at all
        updateManga.awaitUpdateLastUpdate(manga.id)

+        val reAddedUrls = reAdded.map { it.url }.toHashSet()
+
        val excludedScanlators = getExcludedScanlators.await(manga.id).toHashSet()

-        return updatedToAdd.filterNot { it.url in changedOrDuplicateReadUrls || it.scanlator in excludedScanlators }
+        return updatedToAdd.filterNot {
+            it.url in reAddedUrls || it.scanlator in excludedScanlators
+        }
    }
 }
--- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetPagePreviews.kt
+++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetPagePreviews.kt
@ -23,7 +23,7 @@ class GetPagePreviews(
        return try {
            val pagePreviews = try {
                pagePreviewCache.getPageListFromCache(manga, chapterIds, page)
-            } catch (_: Exception) {
+            } catch (e: Exception) {
                source.getPagePreviewList(manga.toSManga(), chapters.map { it.toSChapter() }, page).also {
                    pagePreviewCache.putPageListToCache(manga, chapterIds, it)
                }
--- a/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt
+++ b/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt
@ -4,7 +4,6 @@ import eu.kanade.domain.manga.model.hasCustomCover
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.source.model.SManga
-import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.domain.manga.interactor.FetchInterval
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.manga.model.MangaUpdate
@ -33,8 +32,9 @@ class UpdateManga(
        remoteManga: SManga,
        manualFetch: Boolean,
        coverCache: CoverCache = Injekt.get(),
-        libraryPreferences: LibraryPreferences = Injekt.get(),
+        // SY -->
        downloadManager: DownloadManager = Injekt.get(),
+        // SY <--
    ): Boolean {
        val remoteTitle = try {
            remoteManga.title
@ -42,13 +42,14 @@ class UpdateManga(
            ""
        }

-        // if the manga isn't a favorite (or 'update titles' preference is enabled), set its title from source and update in db
-        val title =
-            if (remoteTitle.isNotEmpty() && (!localManga.favorite || libraryPreferences.updateMangaTitles().get())) {
-                remoteTitle
-            } else {
-                null
-            }
+        // SY -->
+        val title = if (remoteTitle.isNotBlank() && localManga.ogTitle != remoteTitle) {
+            downloadManager.renameMangaDir(localManga.ogTitle, remoteTitle, localManga.source)
+            remoteTitle
+        } else {
+            null
+        }
+        // SY <--

        val coverLastModified =
            when {
@ -68,7 +69,7 @@ class UpdateManga(

        val thumbnailUrl = remoteManga.thumbnail_url?.takeIf { it.isNotEmpty() }

-        val success = mangaRepository.update(
+        return mangaRepository.update(
            MangaUpdate(
                id = localManga.id,
                title = title,
@ -83,10 +84,6 @@ class UpdateManga(
                initialized = true,
            ),
        )
-        if (success && title != null) {
-            downloadManager.renameManga(localManga, title)
-        }
-        return success
    }

    suspend fun awaitUpdateFetchInterval(
--- a/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
+++ b/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
@ -23,7 +23,7 @@ val Manga.readerOrientation: Long

 val Manga.downloadedFilter: TriState
    get() {
-        if (Injekt.get<BasePreferences>().downloadedOnly().get()) return TriState.ENABLED_IS
+        if (forceDownloaded()) return TriState.ENABLED_IS
        return when (downloadedFilterRaw) {
            Manga.CHAPTER_SHOW_DOWNLOADED -> TriState.ENABLED_IS
            Manga.CHAPTER_SHOW_NOT_DOWNLOADED -> TriState.ENABLED_NOT
@ -35,17 +35,18 @@ fun Manga.chaptersFiltered(): Boolean {
        downloadedFilter != TriState.DISABLED ||
        bookmarkedFilter != TriState.DISABLED
 }
+fun Manga.forceDownloaded(): Boolean {
+    return favorite && Injekt.get<BasePreferences>().downloadedOnly().get()
+}

 fun Manga.toSManga(): SManga = SManga.create().also {
    it.url = url
-    // SY -->
-    it.title = ogTitle
-    it.artist = ogArtist
-    it.author = ogAuthor
-    it.description = ogDescription
-    it.genre = ogGenre.orEmpty().joinToString()
-    it.status = ogStatus.toInt()
-    // SY <--
+    it.title = title
+    it.artist = artist
+    it.author = author
+    it.description = description
+    it.genre = genre.orEmpty().joinToString()
+    it.status = status.toInt()
    it.thumbnail_url = thumbnailUrl
    it.initialized = initialized
 }
@ -78,6 +79,24 @@ fun Manga.copyFrom(other: SManga): Manga {
    )
 }

+fun SManga.toDomainManga(sourceId: Long): Manga {
+    return Manga.create().copy(
+        url = url,
+        // SY -->
+        ogTitle = title,
+        ogArtist = artist,
+        ogAuthor = author,
+        ogThumbnailUrl = thumbnail_url,
+        ogDescription = description,
+        ogGenre = getGenres(),
+        ogStatus = status.toLong(),
+        // SY <--
+        updateStrategy = update_strategy,
+        initialized = initialized,
+        source = sourceId,
+    )
+}
+
 fun Manga.hasCustomCover(coverCache: CoverCache = Injekt.get()): Boolean {
    return coverCache.getCustomCoverFile(id).exists()
 }
--- a/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
+++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
@ -32,11 +32,10 @@ class GetEnabledSources(
            ) { a, b, c -> Triple(a, b, c) },
            // SY <--
            repository.getSources(),
-        ) {
-                pinnedSourceIds,
-                (enabledLanguages, disabledSources, lastUsedSource),
-                (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter),
-                sources,
+        ) { pinnedSourceIds,
+            (enabledLanguages, disabledSources, lastUsedSource),
+            (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter),
+            sources,
            ->

            val sourcesAndCategories = sourcesInCategories.map {
--- a/app/src/main/java/eu/kanade/domain/source/interactor/GetIncognitoState.kt
+++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetIncognitoState.kt
@ -1,35 +0,0 @@
-package eu.kanade.domain.source.interactor
-
-import eu.kanade.domain.base.BasePreferences
-import eu.kanade.domain.source.service.SourcePreferences
-import eu.kanade.tachiyomi.extension.ExtensionManager
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
-
-class GetIncognitoState(
-    private val basePreferences: BasePreferences,
-    private val sourcePreferences: SourcePreferences,
-    private val extensionManager: ExtensionManager,
-) {
-    fun await(sourceId: Long?): Boolean {
-        if (basePreferences.incognitoMode().get()) return true
-        if (sourceId == null) return false
-        val extensionPackage = extensionManager.getExtensionPackage(sourceId) ?: return false
-
-        return extensionPackage in sourcePreferences.incognitoExtensions().get()
-    }
-
-    fun subscribe(sourceId: Long?): Flow<Boolean> {
-        if (sourceId == null) return basePreferences.incognitoMode().changes()
-
-        return combine(
-            basePreferences.incognitoMode().changes(),
-            sourcePreferences.incognitoExtensions().changes(),
-            extensionManager.getExtensionPackageAsFlow(sourceId),
-        ) { incognito, incognitoExtensions, extensionPackage ->
-            incognito || (extensionPackage in incognitoExtensions)
-        }
-            .distinctUntilChanged()
-    }
-}
--- a/app/src/main/java/eu/kanade/domain/source/interactor/ToggleIncognito.kt
+++ b/app/src/main/java/eu/kanade/domain/source/interactor/ToggleIncognito.kt
@ -1,14 +0,0 @@
-package eu.kanade.domain.source.interactor
-
-import eu.kanade.domain.source.service.SourcePreferences
-import tachiyomi.core.common.preference.getAndSet
-
-class ToggleIncognito(
-    private val preferences: SourcePreferences,
-) {
-    fun await(extensions: String, enable: Boolean) {
-        preferences.incognitoExtensions().getAndSet {
-            if (enable) it.plus(extensions) else it.minus(extensions)
-        }
-    }
-}
--- a/app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt
@ -22,8 +22,6 @@ class SourcePreferences(

    fun disabledSources() = preferenceStore.getStringSet("hidden_catalogues", emptySet())

-    fun incognitoExtensions() = preferenceStore.getStringSet("incognito_extensions", emptySet())
-
    fun pinnedSources() = preferenceStore.getStringSet("pinned_catalogues", emptySet())

    fun lastUsedSource() = preferenceStore.getLong(
@ -88,32 +86,5 @@ class SourcePreferences(
        BANDWIDTH_HERO,
        WSRV_NL,
    }
-
-    fun migrateFlags() = preferenceStore.getInt("migrate_flags", Int.MAX_VALUE)
-
-    fun defaultMangaOrder() = preferenceStore.getString("default_manga_order", "")
-
-    fun migrationSources() = preferenceStore.getString("migrate_sources", "")
-
-    fun smartMigration() = preferenceStore.getBoolean("smart_migrate", false)
-
-    fun useSourceWithMost() = preferenceStore.getBoolean("use_source_with_most", false)
-
-    fun skipPreMigration() = preferenceStore.getBoolean(Preference.appStateKey("skip_pre_migration"), false)
-
-    fun hideNotFoundMigration() = preferenceStore.getBoolean("hide_not_found_migration", false)
-
-    fun showOnlyUpdatesMigration() = preferenceStore.getBoolean("show_only_updates_migration", false)
-
-    fun allowLocalSourceHiddenFolders() = preferenceStore.getBoolean("allow_local_source_hidden_folders", false)
-
-    fun preferredMangaDexId() = preferenceStore.getString("preferred_mangaDex_id", "0")
-
-    fun mangadexSyncToLibraryIndexes() = preferenceStore.getStringSet(
-        "pref_mangadex_sync_to_library_indexes",
-        emptySet(),
-    )
-
-    fun recommendationSearchFlags() = preferenceStore.getInt("rec_search_flags", Int.MAX_VALUE)
    // SY <--
 }
--- a/app/src/main/java/eu/kanade/domain/sync/SyncPreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/sync/SyncPreferences.kt
@ -13,7 +13,7 @@ class SyncPreferences(
    fun clientAPIKey() = preferenceStore.getString("sync_client_api_key", "")
    fun lastSyncTimestamp() = preferenceStore.getLong(Preference.appStateKey("last_sync_timestamp"), 0L)

-    fun lastSyncEtag() = preferenceStore.getString("sync_etag", "")
+    fun lastSyncEtag() =  preferenceStore.getString("sync_etag", "")

    fun syncInterval() = preferenceStore.getInt("sync_interval", 0)
    fun syncService() = preferenceStore.getInt("sync_service", 0)
--- a/app/src/main/java/eu/kanade/domain/track/interactor/AddTracks.kt
+++ b/app/src/main/java/eu/kanade/domain/track/interactor/AddTracks.kt
@ -5,7 +5,6 @@ import eu.kanade.domain.track.model.toDomainTrack
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.EnhancedTracker
 import eu.kanade.tachiyomi.data.track.Tracker
-import eu.kanade.tachiyomi.data.track.TrackerManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.util.lang.convertEpochMillisZone
 import logcat.LogPriority
@ -15,16 +14,17 @@ import tachiyomi.core.common.util.system.logcat
 import tachiyomi.domain.chapter.interactor.GetChaptersByMangaId
 import tachiyomi.domain.history.interactor.GetHistory
 import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.track.interactor.GetTracks
 import tachiyomi.domain.track.interactor.InsertTrack
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.time.ZoneOffset

 class AddTracks(
+    private val getTracks: GetTracks,
    private val insertTrack: InsertTrack,
    private val syncChapterProgressWithTrack: SyncChapterProgressWithTrack,
    private val getChaptersByMangaId: GetChaptersByMangaId,
-    private val trackerManager: TrackerManager,
 ) {

    // TODO: update all trackers based on common data
@ -79,7 +79,7 @@ class AddTracks(

    suspend fun bindEnhancedTrackers(manga: Manga, source: Source) = withNonCancellableContext {
        withIOContext {
-            trackerManager.loggedInTrackers()
+            getTracks.await(manga.id)
                .filterIsInstance<EnhancedTracker>()
                .filter { it.accept(source) }
                .forEach { service ->
@ -87,11 +87,11 @@ class AddTracks(
                        service.match(manga)?.let { track ->
                            track.manga_id = manga.id
                            (service as Tracker).bind(track)
-                            insertTrack.await(track.toDomainTrack(idRequired = false)!!)
+                            insertTrack.await(track.toDomainTrack()!!)

                            syncChapterProgressWithTrack.await(
                                manga.id,
-                                track.toDomainTrack(idRequired = false)!!,
+                                track.toDomainTrack()!!,
                                service,
                            )
                        }
--- a/app/src/main/java/eu/kanade/domain/track/interactor/SyncChapterProgressWithTrack.kt
+++ b/app/src/main/java/eu/kanade/domain/track/interactor/SyncChapterProgressWithTrack.kt
@ -10,7 +10,6 @@ import tachiyomi.domain.chapter.interactor.UpdateChapter
 import tachiyomi.domain.chapter.model.toChapterUpdate
 import tachiyomi.domain.track.interactor.InsertTrack
 import tachiyomi.domain.track.model.Track
-import kotlin.math.max

 class SyncChapterProgressWithTrack(
    private val updateChapter: UpdateChapter,
@ -37,8 +36,7 @@ class SyncChapterProgressWithTrack(

        // only take into account continuous reading
        val localLastRead = sortedChapters.takeWhile { it.read }.lastOrNull()?.chapterNumber ?: 0F
-        val lastRead = max(remoteTrack.lastChapterRead, localLastRead.toDouble())
-        val updatedTrack = remoteTrack.copy(lastChapterRead = lastRead)
+        val updatedTrack = remoteTrack.copy(lastChapterRead = localLastRead.toDouble())

        try {
            tracker.update(updatedTrack.toDbTrack())
--- a/app/src/main/java/eu/kanade/domain/track/model/AutoTrackState.kt
+++ b/app/src/main/java/eu/kanade/domain/track/model/AutoTrackState.kt
@ -1,10 +0,0 @@
-package eu.kanade.domain.track.model
-
-import dev.icerock.moko.resources.StringResource
-import tachiyomi.i18n.MR
-
-enum class AutoTrackState(val titleRes: StringResource) {
-    ALWAYS(MR.strings.lock_always),
-    ASK(MR.strings.default_category_summary),
-    NEVER(MR.strings.lock_never),
-}
--- a/app/src/main/java/eu/kanade/domain/track/model/Track.kt
+++ b/app/src/main/java/eu/kanade/domain/track/model/Track.kt
@ -10,7 +10,6 @@ fun Track.copyPersonalFrom(other: Track): Track {
        status = other.status,
        startDate = other.startDate,
        finishDate = other.finishDate,
-        private = other.private,
    )
 }

@ -27,7 +26,6 @@ fun Track.toDbTrack(): DbTrack = DbTrack.create(trackerId).also {
    it.tracking_url = remoteUrl
    it.started_reading_date = startDate
    it.finished_reading_date = finishDate
-    it.private = private
 }

 fun DbTrack.toDomainTrack(idRequired: Boolean = true): Track? {
@ -46,6 +44,5 @@ fun DbTrack.toDomainTrack(idRequired: Boolean = true): Track? {
        remoteUrl = tracking_url,
        startDate = started_reading_date,
        finishDate = finished_reading_date,
-        private = private,
    )
 }
--- a/app/src/main/java/eu/kanade/domain/track/service/TrackPreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/track/service/TrackPreferences.kt
@ -1,11 +1,9 @@
 package eu.kanade.domain.track.service

-import eu.kanade.domain.track.model.AutoTrackState
 import eu.kanade.tachiyomi.data.track.Tracker
 import eu.kanade.tachiyomi.data.track.anilist.Anilist
 import tachiyomi.core.common.preference.Preference
 import tachiyomi.core.common.preference.PreferenceStore
-import tachiyomi.core.common.preference.getEnum

 class TrackPreferences(
    private val preferenceStore: PreferenceStore,
@ -37,16 +35,4 @@ class TrackPreferences(
    fun anilistScoreType() = preferenceStore.getString("anilist_score_type", Anilist.POINT_10)

    fun autoUpdateTrack() = preferenceStore.getBoolean("pref_auto_update_manga_sync_key", true)
-
-    fun autoUpdateTrackOnMarkRead() = preferenceStore.getEnum(
-        "pref_auto_update_manga_on_mark_read",
-        AutoTrackState.ALWAYS,
-    )
-
-    // SY -->
-    fun resolveUsingSourceMetadata() = preferenceStore.getBoolean(
-        "pref_resolve_using_source_metadata_key",
-        true,
-    )
-    // SY <--
 }
--- a/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt
@ -18,20 +18,12 @@ class UiPreferences(

    fun themeMode() = preferenceStore.getEnum(
        "pref_theme_mode_key",
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            ThemeMode.SYSTEM
-        } else {
-            ThemeMode.LIGHT
-        },
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { ThemeMode.SYSTEM } else { ThemeMode.LIGHT },
    )

    fun appTheme() = preferenceStore.getEnum(
        "pref_app_theme",
-        if (DeviceUtil.isDynamicColorAvailable) {
-            AppTheme.MONET
-        } else {
-            AppTheme.DEFAULT
-        },
+        if (DeviceUtil.isDynamicColorAvailable) { AppTheme.MONET } else { AppTheme.DEFAULT },
    )

    fun themeDarkAmoled() = preferenceStore.getBoolean("pref_theme_dark_amoled_key", false)
--- a/app/src/main/java/eu/kanade/domain/ui/model/AppTheme.kt
+++ b/app/src/main/java/eu/kanade/domain/ui/model/AppTheme.kt
@ -1,6 +1,8 @@
 package eu.kanade.domain.ui.model

 import dev.icerock.moko.resources.StringResource
+import eu.kanade.tachiyomi.util.system.isDevFlavor
+import eu.kanade.tachiyomi.util.system.isPreviewBuildType
 import tachiyomi.i18n.MR

 enum class AppTheme(val titleRes: StringResource?) {
@ -9,14 +11,15 @@ enum class AppTheme(val titleRes: StringResource?) {
    GREEN_APPLE(MR.strings.theme_greenapple),
    LAVENDER(MR.strings.theme_lavender),
    MIDNIGHT_DUSK(MR.strings.theme_midnightdusk),
-    NORD(MR.strings.theme_nord),
+
+    // TODO: re-enable for preview
+    NORD(MR.strings.theme_nord.takeIf { isDevFlavor || isPreviewBuildType }),
    STRAWBERRY_DAIQUIRI(MR.strings.theme_strawberrydaiquiri),
    TAKO(MR.strings.theme_tako),
    TEALTURQUOISE(MR.strings.theme_tealturquoise),
    TIDAL_WAVE(MR.strings.theme_tidalwave),
    YINYANG(MR.strings.theme_yinyang),
    YOTSUBA(MR.strings.theme_yotsuba),
-    MONOCHROME(MR.strings.theme_monochrome),

    // Deprecated
    DARK_BLUE(null),
--- a/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
@ -82,18 +82,10 @@ fun BrowseSourceContent(
        }
    }

-    if (mangaList.itemCount == 0 && mangaList.loadState.refresh is LoadState.Loading) {
-        LoadingScreen(Modifier.padding(contentPadding))
-        return
-    }
-
-    if (mangaList.itemCount == 0) {
+    if (mangaList.itemCount <= 0 && errorState != null && errorState is LoadState.Error) {
        EmptyScreen(
            modifier = Modifier.padding(contentPadding),
-            message = when (errorState) {
-                is LoadState.Error -> getErrorMessage(errorState)
-                else -> stringResource(MR.strings.no_results_found)
-            },
+            message = getErrorMessage(errorState),
            actions = if (source is LocalSource /* SY --> */ && onLocalSourceHelpClick != null /* SY <-- */) {
                persistentListOf(
                    EmptyScreenAction(
@ -112,7 +104,7 @@ fun BrowseSourceContent(
                    // SY -->
                    if (onWebViewClick != null) {
                        EmptyScreenAction(
-                            stringRes = MR.strings.action_open_in_web_view,
+                            MR.strings.action_open_in_web_view,
                            icon = Icons.Outlined.Public,
                            onClick = onWebViewClick,
                        )
@ -121,7 +113,7 @@ fun BrowseSourceContent(
                    },
                    if (onHelpClick != null) {
                        EmptyScreenAction(
-                            stringRes = MR.strings.label_help,
+                            MR.strings.label_help,
                            icon = Icons.AutoMirrored.Outlined.HelpOutline,
                            onClick = onHelpClick,
                        )
@ -136,6 +128,13 @@ fun BrowseSourceContent(
        return
    }

+    if (mangaList.itemCount == 0 && mangaList.loadState.refresh is LoadState.Loading) {
+        LoadingScreen(
+            modifier = Modifier.padding(contentPadding),
+        )
+        return
+    }
+
    // SY -->
    if (source?.isEhBasedSource() == true && ehentaiBrowseDisplayMode) {
        BrowseSourceEHentaiList(
--- a/app/src/main/java/eu/kanade/presentation/browse/BrowseTabWrapper.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/BrowseTabWrapper.kt
@ -11,7 +11,7 @@ import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.i18n.stringResource

@Composable
-fun BrowseTabWrapper(tab: TabContent, onBackPressed: (() -> Unit)? = null) {
+fun BrowseTabWrapper(tab: TabContent) {
    val snackbarHostState = remember { SnackbarHostState() }
    Scaffold(
        topBar = { scrollBehavior ->
@ -20,7 +20,6 @@ fun BrowseTabWrapper(tab: TabContent, onBackPressed: (() -> Unit)? = null) {
                actions = {
                    AppBarActions(tab.actions)
                },
-                navigateUp = onBackPressed,
                scrollBehavior = scrollBehavior,
            )
        },
--- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
@ -35,10 +35,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@ -50,7 +48,6 @@ import eu.kanade.presentation.components.AppBarActions
 import eu.kanade.presentation.components.WarningBanner
 import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
 import eu.kanade.presentation.more.settings.widget.TrailingWidgetBuffer
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.ui.browse.extension.details.ExtensionDetailsScreenModel
@ -76,7 +73,6 @@ fun ExtensionDetailsScreen(
    onClickClearCookies: () -> Unit,
    onClickUninstall: () -> Unit,
    onClickSource: (sourceId: Long) -> Unit,
-    onClickIncognito: (Boolean) -> Unit,
 ) {
    val uriHandler = LocalUriHandler.current
    val url = remember(state.extension) {
@ -145,11 +141,9 @@ fun ExtensionDetailsScreen(
            contentPadding = paddingValues,
            extension = state.extension,
            sources = state.sources,
-            incognitoMode = state.isIncognito,
            onClickSourcePreferences = onClickSourcePreferences,
            onClickUninstall = onClickUninstall,
            onClickSource = onClickSource,
-            onClickIncognito = onClickIncognito,
        )
    }
 }
@ -159,11 +153,9 @@ private fun ExtensionDetails(
    contentPadding: PaddingValues,
    extension: Extension.Installed,
    sources: ImmutableList<ExtensionSourceItem>,
-    incognitoMode: Boolean,
    onClickSourcePreferences: (sourceId: Long) -> Unit,
    onClickUninstall: () -> Unit,
    onClickSource: (sourceId: Long) -> Unit,
-    onClickIncognito: (Boolean) -> Unit,
 ) {
    val context = LocalContext.current
    var showNsfwWarning by remember { mutableStateOf(false) }
@ -187,7 +179,6 @@ private fun ExtensionDetails(
        item {
            DetailsHeader(
                extension = extension,
-                extIncognitoMode = incognitoMode,
                onClickUninstall = onClickUninstall,
                onClickAppInfo = {
                    Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
@ -199,7 +190,6 @@ private fun ExtensionDetails(
                onClickAgeRating = {
                    showNsfwWarning = true
                },
-                onExtIncognitoChange = onClickIncognito,
            )
        }

@ -208,7 +198,7 @@ private fun ExtensionDetails(
            key = { it.source.id },
        ) { source ->
            SourceSwitchPreference(
-                modifier = Modifier.animateItem(),
+                modifier = Modifier.animateItemPlacement(),
                source = source,
                onClickSourcePreferences = onClickSourcePreferences,
                onClickSource = onClickSource,
@ -227,11 +217,9 @@ private fun ExtensionDetails(
@Composable
 private fun DetailsHeader(
    extension: Extension,
-    extIncognitoMode: Boolean,
    onClickAgeRating: () -> Unit,
    onClickUninstall: () -> Unit,
    onClickAppInfo: (() -> Unit)?,
-    onExtIncognitoChange: (Boolean) -> Unit,
 ) {
    val context = LocalContext.current

@ -239,8 +227,9 @@ private fun DetailsHeader(
        Column(
            modifier = Modifier
                .fillMaxWidth()
-                .padding(horizontal = MaterialTheme.padding.medium)
                .padding(
+                    start = MaterialTheme.padding.medium,
+                    end = MaterialTheme.padding.medium,
                    top = MaterialTheme.padding.medium,
                    bottom = MaterialTheme.padding.small,
                )
@ -251,7 +240,7 @@ private fun DetailsHeader(
                            Extension name: ${extension.name} (lang: ${extension.lang}; package: ${extension.pkgName})
                            Extension version: ${extension.versionName} (lib: ${extension.libVersion}; version code: ${extension.versionCode})
                            NSFW: ${extension.isNsfw}
-                            """.trimIndent(),
+                            """.trimIndent()
                        )

                        if (extension is Extension.Installed) {
@ -261,8 +250,8 @@ private fun DetailsHeader(
                                Update available: ${extension.hasUpdate}
                                Obsolete: ${extension.isObsolete}
                                Shared: ${extension.isShared}
-                                Repository: ${extension.repoUrl}
-                                """.trimIndent(),
+                                Repository: ${extension.repoUrl} 
+                                """.trimIndent()
                            )
                        }
                    }
@ -332,9 +321,12 @@ private fun DetailsHeader(
        }

        Row(
-            modifier = Modifier
-                .padding(horizontal = MaterialTheme.padding.medium)
-                .padding(top = MaterialTheme.padding.small),
+            modifier = Modifier.padding(
+                start = MaterialTheme.padding.medium,
+                end = MaterialTheme.padding.medium,
+                top = MaterialTheme.padding.small,
+                bottom = MaterialTheme.padding.medium,
+            ),
            horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.medium),
        ) {
            OutlinedButton(
@ -357,24 +349,6 @@ private fun DetailsHeader(
            }
        }

-        TextPreferenceWidget(
-            modifier = Modifier.padding(horizontal = MaterialTheme.padding.small),
-            title = stringResource(MR.strings.pref_incognito_mode),
-            subtitle = stringResource(MR.strings.pref_incognito_mode_extension_summary),
-            icon = ImageVector.vectorResource(R.drawable.ic_glasses_24dp),
-            widget = {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    Switch(
-                        checked = extIncognitoMode,
-                        onCheckedChange = onExtIncognitoChange,
-                        modifier = Modifier.padding(start = TrailingWidgetBuffer),
-                    )
-                }
-            },
-        )
-
        HorizontalDivider()
    }
 }
--- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt
@ -58,7 +58,7 @@ private fun ExtensionFilterContent(
    ) {
        items(state.languages) { language ->
            SwitchPreferenceWidget(
-                modifier = Modifier.animateItem(),
+                modifier = Modifier.animateItemPlacement(),
                title = LocaleHelper.getSourceDisplayName(language, context),
                checked = language in state.enabledLanguages,
                onCheckedChanged = { onClickLang(language) },
--- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
@ -48,7 +48,6 @@ import eu.kanade.presentation.browse.components.ExtensionIcon
 import eu.kanade.presentation.components.WarningBanner
 import eu.kanade.presentation.manga.components.DotSeparatorNoSpaceText
 import eu.kanade.presentation.more.settings.screen.browse.ExtensionReposScreen
-import eu.kanade.presentation.util.animateItemFastScroll
 import eu.kanade.presentation.util.rememberRequestPackageInstallsPermissionState
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.InstallStep
@ -92,7 +91,7 @@ fun ExtensionScreen(
    PullRefresh(
        refreshing = state.isRefreshing,
        onRefresh = onRefresh,
-        enabled = !state.isLoading,
+        enabled = { !state.isLoading },
    ) {
        when {
            state.isLoading -> LoadingScreen(Modifier.padding(contentPadding))
@ -189,14 +188,14 @@ private fun ExtensionContent(
                            }
                        ExtensionHeader(
                            textRes = header.textRes,
-                            modifier = Modifier.animateItemFastScroll(),
+                            modifier = Modifier.animateItemPlacement(),
                            action = action,
                        )
                    }
                    is ExtensionUiModel.Header.Text -> {
                        ExtensionHeader(
                            text = header.text,
-                            modifier = Modifier.animateItemFastScroll(),
+                            modifier = Modifier.animateItemPlacement(),
                        )
                    }
                }
@ -214,15 +213,13 @@ private fun ExtensionContent(
                },
            ) { item ->
                ExtensionItem(
-                    modifier = Modifier.animateItemFastScroll(),
+                    modifier = Modifier.animateItemPlacement(),
                    item = item,
                    onClickItem = {
                        when (it) {
                            is Extension.Available -> onInstallExtension(it)
                            is Extension.Installed -> onOpenExtension(it)
-                            is Extension.Untrusted -> {
-                                trustState = it
-                            }
+                            is Extension.Untrusted -> { trustState = it }
                        }
                    },
                    onLongClickItem = onLongClickItem,
@ -244,9 +241,7 @@ private fun ExtensionContent(
                                    onOpenExtension(it)
                                }
                            }
-                            is Extension.Untrusted -> {
-                                trustState = it
-                            }
+                            is Extension.Untrusted -> { trustState = it }
                        }
                    },
                )
--- a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt
@ -92,7 +92,7 @@ fun FeedScreen(
                    refreshing = true
                    onRefresh()
                },
-                enabled = !state.isLoadingItems,
+                enabled = { !state.isLoadingItems },
            ) {
                ScrollbarLazyColumn(
                    contentPadding = contentPadding + topSmallPaddingValues,
@ -103,6 +103,7 @@ fun FeedScreen(
                        key = { it.feed.id },
                    ) { item ->
                        GlobalSearchResultItem(
+                            modifier = Modifier.animateItemPlacement(),
                            title = item.title,
                            subtitle = item.subtitle,
                            onLongClick = {
@ -115,7 +116,6 @@ fun FeedScreen(
                                    onClickSource(item.source)
                                }
                            },
-                            modifier = Modifier.animateItem(),
                        ) {
                            FeedItem(
                                item = item,
--- a/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt
@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
-import androidx.compose.ui.Modifier
 import eu.kanade.presentation.browse.components.GlobalSearchCardRow
 import eu.kanade.presentation.browse.components.GlobalSearchErrorResultItem
 import eu.kanade.presentation.browse.components.GlobalSearchLoadingResultItem
@ -81,7 +80,6 @@ internal fun GlobalSearchContent(
                    } ?: source.name,
                    subtitle = LocaleHelper.getLocalizedDisplayName(source.lang),
                    onClick = { onClickSource(source) },
-                    modifier = Modifier.animateItem(),
                ) {
                    when (result) {
                        SearchItemResult.Loading -> {
--- a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
@ -144,7 +144,7 @@ private fun MigrateSourceList(
            key = { (source, _) -> "migrate-${source.id}" },
        ) { (source, count) ->
            MigrateSourceItem(
-                modifier = Modifier.animateItem(),
+                modifier = Modifier.animateItemPlacement(),
                source = source,
                count = count,
                onClickItem = { onClickItem(source) },
--- a/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt
@ -28,7 +28,6 @@ import eu.kanade.presentation.browse.components.MigrationItem
 import eu.kanade.presentation.browse.components.MigrationItemResult
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarActions
-import eu.kanade.presentation.util.animateItemFastScroll
 import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@ -96,7 +95,7 @@ fun MigrationListScreen(
                Row(
                    Modifier
                        .fillMaxWidth()
-                        .animateItemFastScroll()
+                        .animateItemPlacement()
                        .padding(horizontal = 16.dp)
                        .height(IntrinsicSize.Min),
                    horizontalArrangement = Arrangement.SpaceBetween,
--- a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt
@ -15,7 +15,6 @@ import eu.kanade.presentation.browse.components.GlobalSearchLoadingResultItem
 import eu.kanade.presentation.browse.components.GlobalSearchResultItem
 import eu.kanade.presentation.components.AppBarTitle
 import eu.kanade.presentation.components.SearchToolbar
-import eu.kanade.presentation.util.animateItemFastScroll
 import kotlinx.collections.immutable.ImmutableList
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.source.model.FeedSavedSearch
@ -154,7 +153,7 @@ fun SourceFeedList(
            key = { it.id },
        ) { item ->
            GlobalSearchResultItem(
-                modifier = Modifier.animateItemFastScroll(),
+                modifier = Modifier.animateItemPlacement(),
                title = item.title,
                subtitle = null,
                onLongClick = if (item is SourceFeedUI.SourceSavedSearch) {
--- a/app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt
@ -11,7 +11,6 @@ import androidx.compose.ui.platform.LocalContext
 import eu.kanade.presentation.browse.components.BaseSourceItem
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget
-import eu.kanade.presentation.util.animateItemFastScroll
 import eu.kanade.tachiyomi.ui.browse.source.SourcesFilterScreenModel
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import tachiyomi.domain.source.model.Source
@ -80,7 +79,7 @@ private fun SourcesFilterContent(
                contentType = "source-filter-header",
            ) {
                SourcesFilterHeader(
-                    modifier = Modifier.animateItemFastScroll(),
+                    modifier = Modifier.animateItemPlacement(),
                    language = language,
                    enabled = enabled,
                    onClickItem = onClickLanguage,
@ -96,7 +95,7 @@ private fun SourcesFilterContent(
                        sources.none { it.id.toString() in state.disabledSources }
                    }
                    SourcesFilterToggle(
-                        modifier = Modifier.animateItem(),
+                        modifier = Modifier.animateItemPlacement(),
                        isEnabled = toggleEnabled,
                        onClickItem = {
                            onClickSources(!toggleEnabled, sources)
@ -110,7 +109,7 @@ private fun SourcesFilterContent(
                    contentType = { "source-filter-item" },
                ) { source ->
                    SourcesFilterItem(
-                        modifier = Modifier.animateItemFastScroll(),
+                        modifier = Modifier.animateItemPlacement(),
                        source = source,
                        enabled = "${source.id}" !in state.disabledSources,
                        onClickItem = onClickSource,
--- a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
@ -35,7 +35,7 @@ import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.components.LabeledCheckbox
 import tachiyomi.presentation.core.components.ScrollbarLazyColumn
-import tachiyomi.presentation.core.components.material.SECONDARY_ALPHA
+import tachiyomi.presentation.core.components.material.SecondaryItemAlpha
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.components.material.topSmallPaddingValues
 import tachiyomi.presentation.core.i18n.stringResource
@ -81,7 +81,7 @@ fun SourcesScreen(
                    when (model) {
                        is SourceUiModel.Header -> {
                            SourceHeader(
-                                modifier = Modifier.animateItem(),
+                                modifier = Modifier.animateItemPlacement(),
                                language = model.language,
                                // SY -->
                                isCategory = model.isCategory,
@ -89,7 +89,7 @@ fun SourcesScreen(
                            )
                        }
                        is SourceUiModel.Item -> SourceItem(
-                            modifier = Modifier.animateItem(),
+                            modifier = Modifier.animateItemPlacement(),
                            source = model.source,
                            // SY -->
                            showLatest = state.showLatest,
@ -179,7 +179,7 @@ private fun SourcePinButton(
        MaterialTheme.colorScheme.primary
    } else {
        MaterialTheme.colorScheme.onBackground.copy(
-            alpha = SECONDARY_ALPHA,
+            alpha = SecondaryItemAlpha,
        )
    }
    val description = if (isPinned) MR.strings.action_unpin else MR.strings.action_pin
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt
@ -127,7 +127,7 @@ private fun Extension.getIcon(density: Int = DisplayMetrics.DENSITY_DEFAULT): St
    return produceState<Result<ImageBitmap>>(initialValue = Result.Loading, this) {
        withIOContext {
            value = try {
-                val appInfo = ExtensionLoader.getExtensionPackageInfoFromPkgName(context, pkgName)!!.applicationInfo!!
+                val appInfo = ExtensionLoader.getExtensionPackageInfoFromPkgName(context, pkgName)!!.applicationInfo
                val appResources = context.packageManager.getResourcesForApplication(appInfo)
                Result.Success(
                    appResources.getDrawableForDensity(appInfo.icon, density, null)!!
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
@ -19,7 +19,6 @@ import eu.kanade.presentation.library.components.MangaComfortableGridItem
 import eu.kanade.tachiyomi.R
 import exh.metadata.metadata.MangaDexSearchMetadata
 import exh.metadata.metadata.RaisedSearchMetadata
-import exh.metadata.metadata.RankedSearchMetadata
 import kotlinx.coroutines.flow.StateFlow
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.manga.model.MangaCover
@ -120,14 +119,6 @@ private fun BrowseSourceComfortableGridItem(
                        textColor = MaterialTheme.colorScheme.onTertiary,
                    )
                }
-            } else if (metadata is RankedSearchMetadata) {
-                metadata.rank?.let {
-                    Badge(
-                        text = "+$it",
-                        color = MaterialTheme.colorScheme.tertiary,
-                        textColor = MaterialTheme.colorScheme.onTertiary,
-                    )
-                }
            }
        },
        // SY <--
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt
@ -19,7 +19,6 @@ import eu.kanade.presentation.library.components.MangaCompactGridItem
 import eu.kanade.tachiyomi.R
 import exh.metadata.metadata.MangaDexSearchMetadata
 import exh.metadata.metadata.RaisedSearchMetadata
-import exh.metadata.metadata.RankedSearchMetadata
 import kotlinx.coroutines.flow.StateFlow
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.manga.model.MangaCover
@ -120,14 +119,6 @@ private fun BrowseSourceCompactGridItem(
                        textColor = MaterialTheme.colorScheme.onTertiary,
                    )
                }
-            } else if (metadata is RankedSearchMetadata) {
-                metadata.rank?.let {
-                    Badge(
-                        text = "+$it",
-                        color = MaterialTheme.colorScheme.tertiary,
-                        textColor = MaterialTheme.colorScheme.onTertiary,
-                    )
-                }
            }
        },
        // SY <--
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt
@ -16,7 +16,6 @@ import eu.kanade.presentation.library.components.MangaListItem
 import eu.kanade.tachiyomi.R
 import exh.metadata.metadata.MangaDexSearchMetadata
 import exh.metadata.metadata.RaisedSearchMetadata
-import exh.metadata.metadata.RankedSearchMetadata
 import kotlinx.coroutines.flow.StateFlow
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.manga.model.MangaCover
@ -111,14 +110,6 @@ private fun BrowseSourceListItem(
                        textColor = MaterialTheme.colorScheme.onTertiary,
                    )
                }
-            } else if (metadata is RankedSearchMetadata) {
-                metadata.rank?.let {
-                    Badge(
-                        text = "+$it",
-                        color = MaterialTheme.colorScheme.tertiary,
-                        textColor = MaterialTheme.colorScheme.onTertiary,
-                    )
-                }
            }
            // SY <--
        },
--- a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchResultItems.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchResultItems.kt
@ -30,6 +30,9 @@ import tachiyomi.presentation.core.i18n.stringResource

@Composable
 fun GlobalSearchResultItem(
+    // SY -->
+    modifier: Modifier = Modifier,
+    // SY <--
    title: String,
    // SY -->
    subtitle: String?,
@ -38,10 +41,9 @@ fun GlobalSearchResultItem(
    // SY -->
    onLongClick: (() -> Unit)? = null,
    // SY <--
-    modifier: Modifier = Modifier,
    content: @Composable () -> Unit,
 ) {
-    Column(modifier = modifier) {
+    Column(modifier) {
        Row(
            modifier = Modifier
                .padding(
--- a/app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt
@ -2,25 +2,23 @@ package eu.kanade.presentation.category

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.SortByAlpha
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.toMutableStateList
 import androidx.compose.ui.Modifier
 import eu.kanade.presentation.category.components.CategoryFloatingActionButton
 import eu.kanade.presentation.category.components.CategoryListItem
 import eu.kanade.presentation.components.AppBar
+import eu.kanade.presentation.components.AppBarActions
 import eu.kanade.tachiyomi.ui.category.CategoryScreenState
 import kotlinx.collections.immutable.ImmutableList
-import sh.calvin.reorderable.ReorderableItem
-import sh.calvin.reorderable.rememberReorderableLazyListState
+import kotlinx.collections.immutable.persistentListOf
 import tachiyomi.domain.category.model.Category
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.Scaffold
@ -34,9 +32,11 @@ import tachiyomi.presentation.core.util.plus
 fun CategoryScreen(
    state: CategoryScreenState.Success,
    onClickCreate: () -> Unit,
+    onClickSortAlphabetically: () -> Unit,
    onClickRename: (Category) -> Unit,
    onClickDelete: (Category) -> Unit,
-    onChangeOrder: (Category, Int) -> Unit,
+    onClickMoveUp: (Category) -> Unit,
+    onClickMoveDown: (Category) -> Unit,
    navigateUp: () -> Unit,
 ) {
    val lazyListState = rememberLazyListState()
@ -45,6 +45,17 @@ fun CategoryScreen(
            AppBar(
                title = stringResource(MR.strings.action_edit_categories),
                navigateUp = navigateUp,
+                actions = {
+                    AppBarActions(
+                        persistentListOf(
+                            AppBar.Action(
+                                title = stringResource(MR.strings.action_sort),
+                                icon = Icons.Outlined.SortByAlpha,
+                                onClick = onClickSortAlphabetically,
+                            ),
+                        ),
+                    )
+                },
                scrollBehavior = scrollBehavior,
            )
        },
@ -66,10 +77,12 @@ fun CategoryScreen(
        CategoryContent(
            categories = state.categories,
            lazyListState = lazyListState,
-            paddingValues = paddingValues,
+            paddingValues = paddingValues + topSmallPaddingValues +
+                PaddingValues(horizontal = MaterialTheme.padding.medium),
            onClickRename = onClickRename,
            onClickDelete = onClickDelete,
-            onChangeOrder = onChangeOrder,
+            onMoveUp = onClickMoveUp,
+            onMoveDown = onClickMoveDown,
        )
    }
 }
@ -81,44 +94,28 @@ private fun CategoryContent(
    paddingValues: PaddingValues,
    onClickRename: (Category) -> Unit,
    onClickDelete: (Category) -> Unit,
-    onChangeOrder: (Category, Int) -> Unit,
+    onMoveUp: (Category) -> Unit,
+    onMoveDown: (Category) -> Unit,
 ) {
-    val categoriesState = remember { categories.toMutableStateList() }
-    val reorderableState = rememberReorderableLazyListState(lazyListState, paddingValues) { from, to ->
-        val item = categoriesState.removeAt(from.index)
-        categoriesState.add(to.index, item)
-        onChangeOrder(item, to.index)
-    }
-
-    LaunchedEffect(categories) {
-        if (!reorderableState.isAnyItemDragging) {
-            categoriesState.clear()
-            categoriesState.addAll(categories)
-        }
-    }
-
    LazyColumn(
-        modifier = Modifier.fillMaxSize(),
        state = lazyListState,
-        contentPadding = paddingValues +
-            topSmallPaddingValues +
-            PaddingValues(horizontal = MaterialTheme.padding.medium),
+        contentPadding = paddingValues,
        verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
    ) {
-        items(
-            items = categoriesState,
-            key = { category -> category.key },
-        ) { category ->
-            ReorderableItem(reorderableState, category.key) {
-                CategoryListItem(
-                    modifier = Modifier.animateItem(),
-                    category = category,
-                    onRename = { onClickRename(category) },
-                    onDelete = { onClickDelete(category) },
-                )
-            }
+        itemsIndexed(
+            items = categories,
+            key = { _, category -> "category-${category.id}" },
+        ) { index, category ->
+            CategoryListItem(
+                modifier = Modifier.animateItemPlacement(),
+                category = category,
+                canMoveUp = index != 0,
+                canMoveDown = index != categories.lastIndex,
+                onMoveUp = onMoveUp,
+                onMoveDown = onMoveDown,
+                onRename = { onClickRename(category) },
+                onDelete = { onClickDelete(category) },
+            )
        }
    }
 }
-
-private val Category.key inline get() = "category-$id"
--- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
+++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
@ -219,6 +219,35 @@ fun CategoryDeleteDialog(
    )
 }

+@Composable
+fun CategorySortAlphabeticallyDialog(
+    onDismissRequest: () -> Unit,
+    onSort: () -> Unit,
+) {
+    AlertDialog(
+        onDismissRequest = onDismissRequest,
+        confirmButton = {
+            TextButton(onClick = {
+                onSort()
+                onDismissRequest()
+            }) {
+                Text(text = stringResource(MR.strings.action_ok))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismissRequest) {
+                Text(text = stringResource(MR.strings.action_cancel))
+            }
+        },
+        title = {
+            Text(text = stringResource(MR.strings.action_sort_category))
+        },
+        text = {
+            Text(text = stringResource(MR.strings.sort_category_confirmation))
+        },
+    )
+}
+
@Composable
 fun ChangeCategoryDialog(
    initialSelection: ImmutableList<CheckboxState<Category>>,
--- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt
+++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt
@ -10,7 +10,8 @@ import androidx.compose.ui.Modifier
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.shouldExpandFAB
+import tachiyomi.presentation.core.util.isScrolledToEnd
+import tachiyomi.presentation.core.util.isScrollingUp

@Composable
 fun CategoryFloatingActionButton(
@ -22,7 +23,7 @@ fun CategoryFloatingActionButton(
        text = { Text(text = stringResource(MR.strings.action_add)) },
        icon = { Icon(imageVector = Icons.Outlined.Add, contentDescription = null) },
        onClick = onCreate,
-        expanded = lazyListState.shouldExpandFAB(),
+        expanded = lazyListState.isScrollingUp() || lazyListState.isScrolledToEnd(),
        modifier = modifier,
    )
 }
--- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryListItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryListItem.kt
@ -2,11 +2,14 @@ package eu.kanade.presentation.category.components

 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.Label
+import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material.icons.outlined.ArrowDropUp
 import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material.icons.outlined.DragHandle
 import androidx.compose.material.icons.outlined.Edit
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.Icon
@ -16,42 +19,57 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import sh.calvin.reorderable.ReorderableCollectionItemScope
 import tachiyomi.domain.category.model.Category
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource

@Composable
-fun ReorderableCollectionItemScope.CategoryListItem(
+fun CategoryListItem(
    category: Category,
+    canMoveUp: Boolean,
+    canMoveDown: Boolean,
+    onMoveUp: (Category) -> Unit,
+    onMoveDown: (Category) -> Unit,
    onRename: () -> Unit,
    onDelete: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
-    ElevatedCard(modifier = modifier) {
+    ElevatedCard(
+        modifier = modifier,
+    ) {
        Row(
            modifier = Modifier
                .fillMaxWidth()
-                .clickable(onClick = onRename)
-                .padding(vertical = MaterialTheme.padding.small)
+                .clickable { onRename() }
                .padding(
-                    start = MaterialTheme.padding.small,
+                    start = MaterialTheme.padding.medium,
+                    top = MaterialTheme.padding.medium,
                    end = MaterialTheme.padding.medium,
                ),
            verticalAlignment = Alignment.CenterVertically,
        ) {
-            Icon(
-                imageVector = Icons.Outlined.DragHandle,
-                contentDescription = null,
-                modifier = Modifier
-                    .padding(MaterialTheme.padding.medium)
-                    .draggableHandle(),
-            )
+            Icon(imageVector = Icons.AutoMirrored.Outlined.Label, contentDescription = null)
            Text(
                text = category.name,
-                modifier = Modifier.weight(1f),
+                modifier = Modifier
+                    .padding(start = MaterialTheme.padding.medium),
            )
+        }
+        Row {
+            IconButton(
+                onClick = { onMoveUp(category) },
+                enabled = canMoveUp,
+            ) {
+                Icon(imageVector = Icons.Outlined.ArrowDropUp, contentDescription = null)
+            }
+            IconButton(
+                onClick = { onMoveDown(category) },
+                enabled = canMoveDown,
+            ) {
+                Icon(imageVector = Icons.Outlined.ArrowDropDown, contentDescription = null)
+            }
+            Spacer(modifier = Modifier.weight(1f))
            IconButton(onClick = onRename) {
                Icon(
                    imageVector = Icons.Outlined.Edit,
@ -59,10 +77,7 @@ fun ReorderableCollectionItemScope.CategoryListItem(
                )
            }
            IconButton(onClick = onDelete) {
-                Icon(
-                    imageVector = Icons.Outlined.Delete,
-                    contentDescription = stringResource(MR.strings.action_delete),
-                )
+                Icon(imageVector = Icons.Outlined.Delete, contentDescription = stringResource(MR.strings.action_delete))
            }
        }
    }
--- a/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesContent.kt
+++ b/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesContent.kt
@ -26,7 +26,7 @@ fun BiometricTimesContent(
    ) {
        items(timeRanges, key = { it.formattedString }) { timeRange ->
            BiometricTimesListItem(
-                modifier = Modifier.animateItem(),
+                modifier = Modifier.animateItemPlacement(),
                timeRange = timeRange,
                onDelete = { onClickDelete(timeRange) },
            )
--- a/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagContent.kt
+++ b/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagContent.kt
@ -27,7 +27,7 @@ fun SortTagContent(
    ) {
        itemsIndexed(tags, key = { _, tag -> tag }) { index, tag ->
            SortTagListItem(
-                modifier = Modifier.animateItem(),
+                modifier = Modifier.animateItemPlacement(),
                tag = tag,
                canMoveUp = index != 0,
                canMoveDown = index != tags.lastIndex,
--- a/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryContent.kt
+++ b/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryContent.kt
@ -26,7 +26,7 @@ fun SourceCategoryContent(
    ) {
        items(categories, key = { it }) { category ->
            SourceCategoryListItem(
-                modifier = Modifier.animateItem(),
+                modifier = Modifier.animateItemPlacement(),
                category = category,
                onRename = { onClickRename(category) },
                onDelete = { onClickDelete(category) },
--- a/app/src/main/java/eu/kanade/presentation/components/AdaptiveSheet.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/AdaptiveSheet.kt
@ -1,9 +1,10 @@
 package eu.kanade.presentation.components

-import androidx.compose.animation.SizeTransform
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.window.Dialog
@ -27,14 +28,20 @@ fun NavigatorAdaptiveSheet(
        screen = screen,
        content = { sheetNavigator ->
            AdaptiveSheet(
-                onDismissRequest = onDismissRequest,
                enableSwipeDismiss = enableSwipeDismiss(sheetNavigator),
+                onDismissRequest = onDismissRequest,
            ) {
                ScreenTransition(
                    navigator = sheetNavigator,
-                    enterTransition = { fadeIn(animationSpec = tween(220, delayMillis = 90)) },
-                    exitTransition = { fadeOut(animationSpec = tween(90)) },
-                    sizeTransform = { SizeTransform() },
+                    transition = {
+                        fadeIn(animationSpec = tween(220, delayMillis = 90)) togetherWith
+                            fadeOut(animationSpec = tween(90))
+                    },
+                )
+
+                BackHandler(
+                    enabled = sheetNavigator.size > 1,
+                    onBack = sheetNavigator::pop,
                )
            }

@ -72,10 +79,10 @@ fun AdaptiveSheet(
        properties = dialogProperties,
    ) {
        AdaptiveSheetImpl(
+            modifier = modifier,
            isTabletUi = isTabletUi,
            enableSwipeDismiss = enableSwipeDismiss,
            onDismissRequest = onDismissRequest,
-            modifier = modifier,
        ) {
            content()
        }
--- a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt
@ -36,7 +36,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
@ -180,7 +179,7 @@ fun AppBarTitle(
                maxLines = 1,
                overflow = TextOverflow.Ellipsis,
                modifier = Modifier.basicMarquee(
-                    repeatDelayMillis = 2_000,
+                    delayMillis = 2_000,
                ),
            )
        }
@ -202,7 +201,6 @@ fun AppBarActions(
                }
            },
            state = rememberTooltipState(),
-            focusable = false,
        ) {
            IconButton(
                onClick = it.onClick,
@ -227,7 +225,6 @@ fun AppBarActions(
                }
            },
            state = rememberTooltipState(),
-            focusable = false,
        ) {
            IconButton(
                onClick = { showMenu = !showMenu },
@ -292,7 +289,6 @@ fun SearchToolbar(
                onSearch(searchQuery)
                focusManager.clearFocus()
                keyboardController?.hide()
-                focusManager.moveFocus(FocusDirection.Next)
            }

            BasicTextField(
@ -356,7 +352,6 @@ fun SearchToolbar(
                            }
                        },
                        state = rememberTooltipState(),
-                        focusable = false,
                    ) {
                        IconButton(
                            onClick = onClick,
@ -376,7 +371,6 @@ fun SearchToolbar(
                            }
                        },
                        state = rememberTooltipState(),
-                        focusable = false,
                    ) {
                        IconButton(
                            onClick = {
--- a/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt
@ -79,7 +79,7 @@ fun TabbedDialog(
                modifier = Modifier.animateContentSize(),
                state = pagerState,
                verticalAlignment = Alignment.Top,
-                pageContent = { page -> content(page) },
+                pageContent = { page -> content(page) }
            )
        }
    }
--- a/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt
@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.PrimaryTabRow
@ -15,6 +14,7 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Tab
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
@ -33,13 +33,20 @@ import tachiyomi.presentation.core.i18n.stringResource
 fun TabbedScreen(
    titleRes: StringResource,
    tabs: ImmutableList<TabContent>,
-    state: PagerState = rememberPagerState { tabs.size },
+    startIndex: Int? = null,
    searchQuery: String? = null,
    onChangeSearchQuery: (String?) -> Unit = {},
 ) {
    val scope = rememberCoroutineScope()
+    val state = rememberPagerState { tabs.size }
    val snackbarHostState = remember { SnackbarHostState() }

+    LaunchedEffect(startIndex) {
+        if (startIndex != null) {
+            state.scrollToPage(startIndex)
+        }
+    }
+
    Scaffold(
        topBar = {
            val tab = tabs[state.currentPage]
--- a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
@ -18,7 +18,6 @@ import eu.kanade.presentation.components.SearchToolbar
 import eu.kanade.presentation.components.relativeDateText
 import eu.kanade.presentation.history.components.HistoryItem
 import eu.kanade.presentation.theme.TachiyomiPreviewTheme
-import eu.kanade.presentation.util.animateItemFastScroll
 import eu.kanade.tachiyomi.ui.history.HistoryScreenModel
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@ -39,7 +38,6 @@ fun HistoryScreen(
    onSearchQueryChange: (String?) -> Unit,
    onClickCover: (mangaId: Long) -> Unit,
    onClickResume: (mangaId: Long, chapterId: Long) -> Unit,
-    onClickFavorite: (mangaId: Long) -> Unit,
    onDialogChange: (HistoryScreenModel.Dialog?) -> Unit,
 ) {
    Scaffold(
@ -86,7 +84,6 @@ fun HistoryScreen(
                    onClickCover = { history -> onClickCover(history.mangaId) },
                    onClickResume = { history -> onClickResume(history.mangaId, history.chapterId) },
                    onClickDelete = { item -> onDialogChange(HistoryScreenModel.Dialog.Delete(item)) },
-                    onClickFavorite = { history -> onClickFavorite(history.mangaId) },
                )
            }
        }
@ -100,7 +97,6 @@ private fun HistoryScreenContent(
    onClickCover: (HistoryWithRelations) -> Unit,
    onClickResume: (HistoryWithRelations) -> Unit,
    onClickDelete: (HistoryWithRelations) -> Unit,
-    onClickFavorite: (HistoryWithRelations) -> Unit,
 ) {
    FastScrollLazyColumn(
        contentPadding = contentPadding,
@ -118,19 +114,18 @@ private fun HistoryScreenContent(
            when (item) {
                is HistoryUiModel.Header -> {
                    ListGroupHeader(
-                        modifier = Modifier.animateItemFastScroll(),
+                        modifier = Modifier.animateItemPlacement(),
                        text = relativeDateText(item.date),
                    )
                }
                is HistoryUiModel.Item -> {
                    val value = item.item
                    HistoryItem(
-                        modifier = Modifier.animateItemFastScroll(),
+                        modifier = Modifier.animateItemPlacement(),
                        history = value,
                        onClickCover = { onClickCover(value) },
                        onClickResume = { onClickResume(value) },
                        onClickDelete = { onClickDelete(value) },
-                        onClickFavorite = { onClickFavorite(value) },
                    )
                }
            }
@ -157,7 +152,6 @@ internal fun HistoryScreenPreviews(
            onClickCover = {},
            onClickResume = { _, _ -> run {} },
            onDialogChange = {},
-            onClickFavorite = {},
        )
    }
 }
--- a/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt
@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material.icons.outlined.FavoriteBorder
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@ -40,7 +39,6 @@ fun HistoryItem(
    onClickCover: () -> Unit,
    onClickResume: () -> Unit,
    onClickDelete: () -> Unit,
-    onClickFavorite: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
    Row(
@ -84,16 +82,6 @@ fun HistoryItem(
            )
        }

-        if (!history.coverData.isMangaFavorite) {
-            IconButton(onClick = onClickFavorite) {
-                Icon(
-                    imageVector = Icons.Outlined.FavoriteBorder,
-                    contentDescription = stringResource(MR.strings.add_to_library),
-                    tint = MaterialTheme.colorScheme.onSurface,
-                )
-            }
-        }
-
        IconButton(onClick = onClickDelete) {
            Icon(
                imageVector = Icons.Outlined.Delete,
@ -117,7 +105,6 @@ private fun HistoryItemPreviews(
                onClickCover = {},
                onClickResume = {},
                onClickDelete = {},
-                onClickFavorite = {},
            )
        }
    }
--- a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
@ -6,10 +6,7 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material3.FilterChip
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@ -38,7 +35,6 @@ import tachiyomi.domain.library.model.sort
 import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
-import tachiyomi.presentation.core.components.BaseSortItem
 import tachiyomi.presentation.core.components.CheckboxItem
 import tachiyomi.presentation.core.components.HeadingItem
 import tachiyomi.presentation.core.components.IconItem
@ -201,58 +197,40 @@ private fun ColumnScope.SortPage(
        globalSortMode.type
    }
    val sortDescending = if (screenModel.grouping == LibraryGroup.BY_DEFAULT) {
-        !category.sort.isAscending
+        category.sort.isAscending
    } else {
-        !globalSortMode.isAscending
-    }
+        globalSortMode.isAscending
+    }.not()
    val hasSortTags by remember {
        screenModel.libraryPreferences.sortTagsForLibrary().changes()
            .map { it.isNotEmpty() }
    }.collectAsState(initial = screenModel.libraryPreferences.sortTagsForLibrary().get().isNotEmpty())
    // SY <--

-    val options = remember(trackers.isEmpty()/* SY --> */, hasSortTags/* SY <-- */) {
-        val trackerMeanPair = if (trackers.isNotEmpty()) {
-            MR.strings.action_sort_tracker_score to LibrarySort.Type.TrackerMean
-        } else {
-            null
-        }
+
+    val trackerSortOption = if (trackers.isEmpty()) {
+        emptyList()
+    } else {
+        listOf(MR.strings.action_sort_tracker_score to LibrarySort.Type.TrackerMean)
+    }
+
+    listOfNotNull(
+        MR.strings.action_sort_alpha to LibrarySort.Type.Alphabetical,
+        MR.strings.action_sort_total to LibrarySort.Type.TotalChapters,
+        MR.strings.action_sort_last_read to LibrarySort.Type.LastRead,
+        MR.strings.action_sort_last_manga_update to LibrarySort.Type.LastUpdate,
+        MR.strings.action_sort_unread_count to LibrarySort.Type.UnreadCount,
+        MR.strings.action_sort_latest_chapter to LibrarySort.Type.LatestChapter,
+        MR.strings.action_sort_chapter_fetch_date to LibrarySort.Type.ChapterFetchDate,
+        MR.strings.action_sort_date_added to LibrarySort.Type.DateAdded,
        // SY -->
-        val tagSortPair = if (hasSortTags) {
+        if (hasSortTags) {
            SYMR.strings.tag_sorting to LibrarySort.Type.TagList
        } else {
            null
-        }
+        },
        // SY <--
-        listOfNotNull(
-            MR.strings.action_sort_alpha to LibrarySort.Type.Alphabetical,
-            MR.strings.action_sort_total to LibrarySort.Type.TotalChapters,
-            MR.strings.action_sort_last_read to LibrarySort.Type.LastRead,
-            MR.strings.action_sort_last_manga_update to LibrarySort.Type.LastUpdate,
-            MR.strings.action_sort_unread_count to LibrarySort.Type.UnreadCount,
-            MR.strings.action_sort_latest_chapter to LibrarySort.Type.LatestChapter,
-            MR.strings.action_sort_chapter_fetch_date to LibrarySort.Type.ChapterFetchDate,
-            MR.strings.action_sort_date_added to LibrarySort.Type.DateAdded,
-            trackerMeanPair,
-            // SY -->
-            tagSortPair,
-            // SY <--
-            MR.strings.action_sort_random to LibrarySort.Type.Random,
-        )
-    }
-
-    options.map { (titleRes, mode) ->
-        if (mode == LibrarySort.Type.Random) {
-            BaseSortItem(
-                label = stringResource(titleRes),
-                icon = Icons.Default.Refresh
-                    .takeIf { sortingMode == LibrarySort.Type.Random },
-                onClick = {
-                    screenModel.setSort(category, mode, LibrarySort.Direction.Ascending)
-                },
-            )
-            return@map
-        }
+    ).plus(trackerSortOption).map { (titleRes, mode) ->
        SortItem(
            label = stringResource(titleRes),
            sortDescending = sortDescending.takeIf { sortingMode == mode },
@ -264,11 +242,7 @@ private fun ColumnScope.SortPage(
                    } else {
                        LibrarySort.Direction.Descending
                    }
-                    else -> if (sortDescending) {
-                        LibrarySort.Direction.Descending
-                    } else {
-                        LibrarySort.Direction.Ascending
-                    }
+                    else -> if (sortDescending) LibrarySort.Direction.Descending else LibrarySort.Direction.Ascending
                }
                screenModel.setSort(category, mode, direction)
            },
@ -310,16 +284,15 @@ private fun ColumnScope.DisplayPage(

        val columns by columnPreference.collectAsState()
        SliderItem(
-            value = columns,
-            valueRange = 0..10,
            label = stringResource(MR.strings.pref_library_columns),
+            max = 10,
+            value = columns,
            valueText = if (columns > 0) {
-                columns.toString()
+                stringResource(MR.strings.pref_library_columns_per_row, columns)
            } else {
-                stringResource(MR.strings.label_auto)
+                stringResource(MR.strings.label_default)
            },
            onChange = columnPreference::set,
-            pillColor = MaterialTheme.colorScheme.surfaceContainerHighest,
        )
    }

@ -328,10 +301,6 @@ private fun ColumnScope.DisplayPage(
        label = stringResource(MR.strings.action_display_download_badge),
        pref = screenModel.libraryPreferences.downloadBadge(),
    )
-    CheckboxItem(
-        label = stringResource(MR.strings.action_display_unread_badge),
-        pref = screenModel.libraryPreferences.unreadBadge(),
-    )
    CheckboxItem(
        label = stringResource(MR.strings.action_display_local_badge),
        pref = screenModel.libraryPreferences.localBadge(),
--- a/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt
@ -62,7 +62,7 @@ private val ContinueReadingButtonIconSizeLarge = 20.dp
 private val ContinueReadingButtonGridPadding = 6.dp
 private val ContinueReadingButtonListSpacing = 8.dp

-private const val GRID_SELECTED_COVER_ALPHA = 0.76f
+private const val GridSelectedCoverAlpha = 0.76f

 /**
 * Layout of grid list item with title overlaying the cover.
@ -90,7 +90,7 @@ fun MangaCompactGridItem(
                MangaCover.Book(
                    modifier = Modifier
                        .fillMaxWidth()
-                        .alpha(if (isSelected) GRID_SELECTED_COVER_ALPHA else coverAlpha),
+                        .alpha(if (isSelected) GridSelectedCoverAlpha else coverAlpha),
                    data = coverData,
                )
            },
@ -197,7 +197,7 @@ fun MangaComfortableGridItem(
                    MangaCover.Book(
                        modifier = Modifier
                            .fillMaxWidth()
-                            .alpha(if (isSelected) GRID_SELECTED_COVER_ALPHA else coverAlpha),
+                            .alpha(if (isSelected) GridSelectedCoverAlpha else coverAlpha),
                        data = coverData,
                    )
                },
@ -371,7 +371,7 @@ fun MangaListItem(
                size = ContinueReadingButtonSizeSmall,
                iconSize = ContinueReadingButtonIconSizeSmall,
                onClick = onClickContinueReading,
-                modifier = Modifier.padding(start = ContinueReadingButtonListSpacing),
+                modifier = Modifier.padding(start = ContinueReadingButtonListSpacing)
            )
        }
    }
@ -392,7 +392,7 @@ private fun ContinueReadingButton(
                containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.9f),
                contentColor = contentColorFor(MaterialTheme.colorScheme.primaryContainer),
            ),
-            modifier = Modifier.size(size),
+            modifier = Modifier.size(size)
        ) {
            Icon(
                imageVector = Icons.Filled.PlayArrow,
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
@ -95,7 +95,7 @@ fun LibraryContent(
                    isRefreshing = false
                }
            },
-            enabled = notSelectionMode,
+            enabled = { notSelectionMode },
        ) {
            LibraryPager(
                state = pagerState,
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
@ -21,7 +21,9 @@ internal fun LibraryTabs(
    getNumberOfMangaForCategory: (Category) -> Int?,
    onTabItemClick: (Int) -> Unit,
 ) {
+    // SY -->
    val currentPageIndex = pagerState.currentPage.coerceAtMost(categories.lastIndex)
+    // SY <--
    Column(
        modifier = Modifier.zIndex(1f),
    ) {
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
@ -41,7 +41,6 @@ fun LibraryToolbar(
    onClickSyncNow: () -> Unit,
    // SY -->
    onClickSyncExh: (() -> Unit)?,
-    isSyncEnabled: Boolean,
    // SY <--
    searchQuery: String?,
    onSearchQueryChange: (String?) -> Unit,
@ -65,7 +64,6 @@ fun LibraryToolbar(
        onClickSyncNow = onClickSyncNow,
        // SY -->
        onClickSyncExh = onClickSyncExh,
-        isSyncEnabled = isSyncEnabled,
        // SY <--
        scrollBehavior = scrollBehavior,
    )
@ -84,7 +82,6 @@ private fun LibraryRegularToolbar(
    onClickSyncNow: () -> Unit,
    // SY -->
    onClickSyncExh: (() -> Unit)?,
-    isSyncEnabled: Boolean,
    // SY <--
    scrollBehavior: TopAppBarScrollBehavior?,
 ) {
@ -131,6 +128,10 @@ private fun LibraryRegularToolbar(
                        title = stringResource(MR.strings.action_open_random_manga),
                        onClick = onClickOpenRandomManga,
                    ),
+                    AppBar.OverflowAction(
+                        title = stringResource(SYMR.strings.sync_library),
+                        onClick = onClickSyncNow,
+                    ),
                ).builder().apply {
                    // SY -->
                    if (onClickSyncExh != null) {
@ -141,14 +142,6 @@ private fun LibraryRegularToolbar(
                            ),
                        )
                    }
-                    if (isSyncEnabled) {
-                        add(
-                            AppBar.OverflowAction(
-                                title = stringResource(SYMR.strings.sync_library),
-                                onClick = onClickSyncNow,
-                            ),
-                        )
-                    }
                    // SY <--
                }.build(),
            )
--- a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt
@ -15,6 +15,7 @@ import androidx.compose.ui.window.DialogProperties
 import exh.favorites.FavoritesSyncStatus
 import kotlinx.coroutines.delay
 import tachiyomi.core.common.i18n.stringResource
+import tachiyomi.domain.manga.model.Manga
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import kotlin.time.Duration.Companion.seconds
@ -22,6 +23,7 @@ import kotlin.time.Duration.Companion.seconds
 data class SyncFavoritesProgressProperties(
    val title: String,
    val text: String,
+    val canDismiss: Boolean,
    val positiveButtonText: String? = null,
    val positiveButton: (() -> Unit)? = null,
    val negativeButtonText: String? = null,
@ -32,23 +34,18 @@ data class SyncFavoritesProgressProperties(
 fun SyncFavoritesProgressDialog(
    status: FavoritesSyncStatus,
    setStatusIdle: () -> Unit,
-    openManga: (Long) -> Unit,
+    openManga: (Manga) -> Unit,
 ) {
    val context = LocalContext.current
    val properties by produceState<SyncFavoritesProgressProperties?>(initialValue = null, status) {
        when (status) {
            is FavoritesSyncStatus.BadLibraryState.MangaInMultipleCategories -> value = SyncFavoritesProgressProperties(
                title = context.stringResource(SYMR.strings.favorites_sync_error),
-                text = context.stringResource(
-                    SYMR.strings.favorites_sync_bad_library_state,
-                    context.stringResource(
-                        SYMR.strings.favorites_sync_gallery_in_multiple_categories, status.mangaTitle,
-                        status.categories.joinToString(),
-                    ),
-                ),
+                text = context.stringResource(SYMR.strings.favorites_sync_bad_library_state, status.message),
+                canDismiss = false,
                positiveButtonText = context.stringResource(SYMR.strings.show_gallery),
                positiveButton = {
-                    openManga(status.mangaId)
+                    openManga(status.manga)
                    setStatusIdle()
                },
                negativeButtonText = context.stringResource(MR.strings.action_ok),
@ -56,122 +53,31 @@ fun SyncFavoritesProgressDialog(
            )
            is FavoritesSyncStatus.CompleteWithErrors -> value = SyncFavoritesProgressProperties(
                title = context.stringResource(SYMR.strings.favorites_sync_done_errors),
-                text = context.stringResource(
-                    SYMR.strings.favorites_sync_done_errors_message,
-                    status.messages.joinToString(separator = "\n") {
-                        when (it) {
-                            is FavoritesSyncStatus.SyncError.GallerySyncError.GalleryAddFail ->
-                                context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local) +
-                                    context.stringResource(
-                                        SYMR.strings.favorites_sync_failed_to_add_to_local_error, it.title, it.reason,
-                                    )
-                            is FavoritesSyncStatus.SyncError.GallerySyncError.InvalidGalleryFail ->
-                                context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local) +
-                                    context.stringResource(
-                                        SYMR.strings.favorites_sync_failed_to_add_to_local_unknown_type, it.title, it.url,
-                                    )
-                            is FavoritesSyncStatus.SyncError.GallerySyncError.UnableToAddGalleryToRemote ->
-                                context.stringResource(SYMR.strings.favorites_sync_unable_to_add_to_remote, it.title, it.gid)
-                            FavoritesSyncStatus.SyncError.GallerySyncError.UnableToDeleteFromRemote ->
-                                context.stringResource(SYMR.strings.favorites_sync_unable_to_delete)
-                        }
-                    },
-                ),
+                text = context.stringResource(SYMR.strings.favorites_sync_done_errors_message, status.message),
+                canDismiss = false,
+                positiveButtonText = context.stringResource(MR.strings.action_ok),
+                positiveButton = setStatusIdle,
+            )
+            is FavoritesSyncStatus.Error -> value = SyncFavoritesProgressProperties(
+                title = context.stringResource(SYMR.strings.favorites_sync_error),
+                text = context.stringResource(SYMR.strings.favorites_sync_error_string, status.message),
+                canDismiss = false,
                positiveButtonText = context.stringResource(MR.strings.action_ok),
                positiveButton = setStatusIdle,
            )
            is FavoritesSyncStatus.Idle -> value = null
-            is FavoritesSyncStatus.Initializing -> {
+            is FavoritesSyncStatus.Initializing, is FavoritesSyncStatus.Processing -> {
                value = SyncFavoritesProgressProperties(
                    title = context.stringResource(SYMR.strings.favorites_syncing),
-                    text = context.stringResource(SYMR.strings.favorites_sync_initializing),
+                    text = status.message,
+                    canDismiss = false,
                )
-            }
-
-            is FavoritesSyncStatus.SyncError -> value = SyncFavoritesProgressProperties(
-                title = context.stringResource(SYMR.strings.favorites_sync_error),
-                text = context.stringResource(
-                    SYMR.strings.favorites_sync_error_string,
-                    when (status) {
-                        FavoritesSyncStatus.SyncError.NotLoggedInSyncError -> context.stringResource(SYMR.strings.please_login)
-                        FavoritesSyncStatus.SyncError.FailedToFetchFavorites ->
-                            context.stringResource(SYMR.strings.favorites_sync_failed_to_featch)
-                        is FavoritesSyncStatus.SyncError.UnknownSyncError ->
-                            context.stringResource(SYMR.strings.favorites_sync_unknown_error, status.message)
-                        is FavoritesSyncStatus.SyncError.GallerySyncError.GalleryAddFail ->
-                            context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local) +
-                                context.stringResource(
-                                    SYMR.strings.favorites_sync_failed_to_add_to_local_error, status.title, status.reason,
-                                )
-                        is FavoritesSyncStatus.SyncError.GallerySyncError.InvalidGalleryFail ->
-                            context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local) +
-                                context.stringResource(
-                                    SYMR.strings.favorites_sync_failed_to_add_to_local_unknown_type, status.title, status.url,
-                                )
-                        is FavoritesSyncStatus.SyncError.GallerySyncError.UnableToAddGalleryToRemote ->
-                            context.stringResource(SYMR.strings.favorites_sync_unable_to_add_to_remote, status.title, status.gid)
-                        FavoritesSyncStatus.SyncError.GallerySyncError.UnableToDeleteFromRemote ->
-                            context.stringResource(SYMR.strings.favorites_sync_unable_to_delete)
-                    },
-                ),
-                positiveButtonText = context.stringResource(MR.strings.action_ok),
-                positiveButton = setStatusIdle,
-            )
-            is FavoritesSyncStatus.Processing -> {
-                val properties = SyncFavoritesProgressProperties(
-                    title = context.stringResource(SYMR.strings.favorites_syncing),
-                    text = when (status) {
-                        FavoritesSyncStatus.Processing.VerifyingLibrary ->
-                            context.stringResource(SYMR.strings.favorites_sync_verifying_library)
-                        FavoritesSyncStatus.Processing.DownloadingFavorites ->
-                            context.stringResource(SYMR.strings.favorites_sync_downloading)
-                        FavoritesSyncStatus.Processing.CalculatingRemoteChanges ->
-                            context.stringResource(SYMR.strings.favorites_sync_calculating_remote_changes)
-                        FavoritesSyncStatus.Processing.CalculatingLocalChanges ->
-                            context.stringResource(SYMR.strings.favorites_sync_calculating_local_changes)
-                        FavoritesSyncStatus.Processing.SyncingCategoryNames ->
-                            context.stringResource(SYMR.strings.favorites_sync_syncing_category_names)
-                        is FavoritesSyncStatus.Processing.RemovingRemoteGalleries ->
-                            context.stringResource(SYMR.strings.favorites_sync_removing_galleries, status.galleryCount)
-                        is FavoritesSyncStatus.Processing.AddingGalleryToRemote ->
-                            if (status.isThrottling) {
-                                context.stringResource(
-                                    SYMR.strings.favorites_sync_processing_throttle,
-                                    context.stringResource(SYMR.strings.favorites_sync_adding_to_remote, status.index, status.total),
-                                )
-                            } else {
-                                context.stringResource(SYMR.strings.favorites_sync_adding_to_remote, status.index, status.total)
-                            }
-                        is FavoritesSyncStatus.Processing.RemovingGalleryFromLocal ->
-                            context.stringResource(SYMR.strings.favorites_sync_remove_from_local, status.index, status.total)
-                        is FavoritesSyncStatus.Processing.AddingGalleryToLocal ->
-                            if (status.isThrottling) {
-                                context.stringResource(
-                                    SYMR.strings.favorites_sync_processing_throttle,
-                                    context.stringResource(SYMR.strings.favorites_sync_add_to_local, status.index, status.total),
-                                )
-                            } else {
-                                context.stringResource(SYMR.strings.favorites_sync_add_to_local, status.index, status.total)
-                            }
-
-                        FavoritesSyncStatus.Processing.CleaningUp ->
-                            context.stringResource(SYMR.strings.favorites_sync_cleaning_up)
-                    },
-                )
-                value = properties
-                if (
-                    status is FavoritesSyncStatus.Processing.AddingGalleryToRemote ||
-                    status is FavoritesSyncStatus.Processing.AddingGalleryToLocal
-                ) {
+                if (status is FavoritesSyncStatus.Processing && status.title != null) {
                    delay(5.seconds)
-                    value = properties.copy(
-                        text = when (status) {
-                            is FavoritesSyncStatus.Processing.AddingGalleryToRemote ->
-                                properties.text + "\n\n" + status.title
-                            is FavoritesSyncStatus.Processing.AddingGalleryToLocal ->
-                                properties.text + "\n\n" + status.title
-                            else -> properties.text
-                        },
+                    value = SyncFavoritesProgressProperties(
+                        title = context.stringResource(SYMR.strings.favorites_syncing),
+                        text = status.delayedMessage ?: status.message,
+                        canDismiss = false,
                    )
                }
            }
@ -206,8 +112,8 @@ fun SyncFavoritesProgressDialog(
                }
            },
            properties = DialogProperties(
-                dismissOnClickOutside = false,
-                dismissOnBackPress = false,
+                dismissOnClickOutside = dialog.canDismiss,
+                dismissOnBackPress = dialog.canDismiss,
            ),
        )
    }
--- a/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
@ -21,14 +21,13 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import eu.kanade.domain.base.BasePreferences
 import eu.kanade.domain.manga.model.downloadedFilter
+import eu.kanade.domain.manga.model.forceDownloaded
 import eu.kanade.presentation.components.TabbedDialog
 import eu.kanade.presentation.components.TabbedDialogPaddings
 import kotlinx.collections.immutable.persistentListOf
@ -41,8 +40,6 @@ import tachiyomi.presentation.core.components.SortItem
 import tachiyomi.presentation.core.components.TriStateItem
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.theme.active
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get

@Composable
 fun ChapterSettingsDialog(
@ -66,8 +63,6 @@ fun ChapterSettingsDialog(
        )
    }

-    val downloadedOnly = remember { Injekt.get<BasePreferences>().downloadedOnly().get() }
-
    TabbedDialog(
        onDismissRequest = onDismissRequest,
        tabTitles = persistentListOf(
@ -102,7 +97,7 @@ fun ChapterSettingsDialog(
                    FilterPage(
                        downloadFilter = manga?.downloadedFilter ?: TriState.DISABLED,
                        onDownloadFilterChanged = onDownloadFilterChanged
-                            .takeUnless { downloadedOnly },
+                            .takeUnless { manga?.forceDownloaded() == true },
                        unreadFilter = manga?.unreadFilter ?: TriState.DISABLED,
                        onUnreadFilterChanged = onUnreadFilterChanged,
                        bookmarkedFilter = manga?.bookmarkedFilter ?: TriState.DISABLED,
--- a/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt
@ -1,95 +1,44 @@
 package eu.kanade.presentation.manga

-import androidx.compose.foundation.background
-import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Brush
-import androidx.compose.material.icons.filled.PersonOutline
-import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material.icons.outlined.Add
-import androidx.compose.material.icons.outlined.AttachMoney
-import androidx.compose.material.icons.outlined.Block
-import androidx.compose.material.icons.outlined.Close
-import androidx.compose.material.icons.outlined.Done
-import androidx.compose.material.icons.outlined.DoneAll
-import androidx.compose.material.icons.outlined.Pause
-import androidx.compose.material.icons.outlined.Schedule
+import androidx.compose.material.icons.outlined.Book
+import androidx.compose.material.icons.outlined.SwapVert
 import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
-import androidx.compose.material3.Typography
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.text.TextMeasurer
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.rememberTextMeasurer
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.util.fastMaxOfOrNull
-import coil3.request.ImageRequest
-import coil3.request.crossfade
+import androidx.compose.ui.unit.sp
 import eu.kanade.presentation.components.AdaptiveSheet
 import eu.kanade.presentation.components.TabbedDialogPaddings
-import eu.kanade.presentation.manga.components.MangaCover
 import eu.kanade.presentation.more.settings.LocalPreferenceMinHeight
 import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
-import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.model.SManga
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.model.MangaWithChapterCount
-import tachiyomi.domain.source.model.StubSource
-import tachiyomi.domain.source.service.SourceManager
 import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.Badge
-import tachiyomi.presentation.core.components.BadgeGroup
-import tachiyomi.presentation.core.components.material.padding
-import tachiyomi.presentation.core.i18n.pluralStringResource
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.secondaryItemAlpha
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get

@Composable
 fun DuplicateMangaDialog(
-    duplicates: List<MangaWithChapterCount>,
    onDismissRequest: () -> Unit,
    onConfirm: () -> Unit,
-    onOpenManga: (manga: Manga) -> Unit,
-    onMigrate: (manga: Manga) -> Unit,
+    onOpenManga: () -> Unit,
+    onMigrate: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
-    val sourceManager = remember { Injekt.get<SourceManager>() }
    val minHeight = LocalPreferenceMinHeight.current
-    val horizontalPadding = PaddingValues(horizontal = TabbedDialogPaddings.Horizontal)
-    val horizontalPaddingModifier = Modifier.padding(horizontalPadding)

    AdaptiveSheet(
        modifier = modifier,
@ -97,310 +46,81 @@ fun DuplicateMangaDialog(
    ) {
        Column(
            modifier = Modifier
-                .padding(vertical = TabbedDialogPaddings.Vertical)
-                .verticalScroll(rememberScrollState())
+                .padding(
+                    vertical = TabbedDialogPaddings.Vertical,
+                    horizontal = TabbedDialogPaddings.Horizontal,
+                )
                .fillMaxWidth(),
-            verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.medium),
        ) {
            Text(
-                text = stringResource(MR.strings.possible_duplicates_title),
+                modifier = Modifier.padding(TitlePadding),
+                text = stringResource(MR.strings.are_you_sure),
                style = MaterialTheme.typography.headlineMedium,
-                modifier = Modifier
-                    .then(horizontalPaddingModifier)
-                    .padding(top = MaterialTheme.padding.small),
            )

            Text(
-                text = stringResource(MR.strings.possible_duplicates_summary),
+                text = stringResource(MR.strings.confirm_add_duplicate_manga),
                style = MaterialTheme.typography.bodyMedium,
-                modifier = Modifier.then(horizontalPaddingModifier),
            )

-            LazyRow(
-                horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
-                modifier = Modifier.height(getMaximumMangaCardHeight(duplicates)),
-                contentPadding = horizontalPadding,
-            ) {
-                items(
-                    items = duplicates,
-                    key = { it.manga.id },
-                ) {
-                    DuplicateMangaListItem(
-                        duplicate = it,
-                        getSource = { sourceManager.getOrStub(it.manga.source) },
-                        onMigrate = { onMigrate(it.manga) },
-                        onDismissRequest = onDismissRequest,
-                        onOpenManga = { onOpenManga(it.manga) },
-                    )
-                }
-            }
+            Spacer(Modifier.height(PaddingSize))

-            Column(modifier = horizontalPaddingModifier) {
-                HorizontalDivider()
+            TextPreferenceWidget(
+                title = stringResource(MR.strings.action_show_manga),
+                icon = Icons.Outlined.Book,
+                onPreferenceClick = {
+                    onDismissRequest()
+                    onOpenManga()
+                },
+            )

-                TextPreferenceWidget(
-                    title = stringResource(MR.strings.action_add_anyway),
-                    icon = Icons.Outlined.Add,
-                    onPreferenceClick = {
-                        onDismissRequest()
-                        onConfirm()
-                    },
-                    modifier = Modifier.clip(CircleShape),
-                )
-            }
+            HorizontalDivider()

-            OutlinedButton(
-                onClick = onDismissRequest,
-                modifier = Modifier
-                    .then(horizontalPaddingModifier)
-                    .padding(bottom = MaterialTheme.padding.medium)
-                    .heightIn(min = minHeight)
-                    .fillMaxWidth(),
-            ) {
-                Text(
-                    modifier = Modifier.padding(vertical = MaterialTheme.padding.extraSmall),
-                    text = stringResource(MR.strings.action_cancel),
-                    color = MaterialTheme.colorScheme.primary,
-                    style = MaterialTheme.typography.bodyLarge,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun DuplicateMangaListItem(
-    duplicate: MangaWithChapterCount,
-    getSource: () -> Source,
-    onDismissRequest: () -> Unit,
-    onOpenManga: () -> Unit,
-    onMigrate: () -> Unit,
-) {
-    val source = getSource()
-    val manga = duplicate.manga
-    Column(
-        modifier = Modifier
-            .width(MangaCardWidth)
-            .clip(MaterialTheme.shapes.medium)
-            .background(MaterialTheme.colorScheme.surface)
-            .combinedClickable(
-                onLongClick = { onOpenManga() },
-                onClick = {
+            TextPreferenceWidget(
+                title = stringResource(MR.strings.action_migrate_duplicate),
+                icon = Icons.Outlined.SwapVert,
+                onPreferenceClick = {
                    onDismissRequest()
                    onMigrate()
                },
            )
-            .padding(MaterialTheme.padding.small),
-    ) {
-        Box {
-            MangaCover.Book(
-                data = ImageRequest.Builder(LocalContext.current)
-                    .data(manga)
-                    .crossfade(true)
-                    .build(),
-                modifier = Modifier.fillMaxWidth(),
+
+            HorizontalDivider()
+
+            TextPreferenceWidget(
+                title = stringResource(MR.strings.action_add_anyway),
+                icon = Icons.Outlined.Add,
+                onPreferenceClick = {
+                    onDismissRequest()
+                    onConfirm()
+                },
            )
-            BadgeGroup(
+
+            Row(
                modifier = Modifier
-                    .padding(4.dp)
-                    .align(Alignment.TopStart),
+                    .sizeIn(minHeight = minHeight)
+                    .clickable { onDismissRequest.invoke() }
+                    .padding(ButtonPadding)
+                    .fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Center,
            ) {
-                Badge(
-                    color = MaterialTheme.colorScheme.secondary,
-                    textColor = MaterialTheme.colorScheme.onSecondary,
-                    text = pluralStringResource(
-                        MR.plurals.manga_num_chapters,
-                        duplicate.chapterCount.toInt(),
-                        duplicate.chapterCount,
-                    ),
-                )
+                OutlinedButton(onClick = onDismissRequest, modifier = Modifier.fillMaxWidth()) {
+                    Text(
+                        modifier = Modifier
+                            .padding(vertical = 8.dp),
+                        text = stringResource(MR.strings.action_cancel),
+                        color = MaterialTheme.colorScheme.primary,
+                        style = MaterialTheme.typography.titleLarge,
+                        fontSize = 16.sp,
+                    )
+                }
            }
        }
-
-        Spacer(modifier = Modifier.height(MaterialTheme.padding.extraSmall))
-
-        Text(
-            text = manga.title,
-            style = MaterialTheme.typography.titleSmall,
-            overflow = TextOverflow.Ellipsis,
-            maxLines = 2,
-        )
-
-        if (!manga.author.isNullOrBlank()) {
-            MangaDetailRow(
-                text = manga.author!!,
-                iconImageVector = Icons.Filled.PersonOutline,
-                maxLines = 2,
-            )
-        }
-
-        if (!manga.artist.isNullOrBlank() && manga.author != manga.artist) {
-            MangaDetailRow(
-                text = manga.artist!!,
-                iconImageVector = Icons.Filled.Brush,
-                maxLines = 2,
-            )
-        }
-
-        MangaDetailRow(
-            text = when (manga.status) {
-                SManga.ONGOING.toLong() -> stringResource(MR.strings.ongoing)
-                SManga.COMPLETED.toLong() -> stringResource(MR.strings.completed)
-                SManga.LICENSED.toLong() -> stringResource(MR.strings.licensed)
-                SManga.PUBLISHING_FINISHED.toLong() -> stringResource(MR.strings.publishing_finished)
-                SManga.CANCELLED.toLong() -> stringResource(MR.strings.cancelled)
-                SManga.ON_HIATUS.toLong() -> stringResource(MR.strings.on_hiatus)
-                else -> stringResource(MR.strings.unknown)
-            },
-            iconImageVector = when (manga.status) {
-                SManga.ONGOING.toLong() -> Icons.Outlined.Schedule
-                SManga.COMPLETED.toLong() -> Icons.Outlined.DoneAll
-                SManga.LICENSED.toLong() -> Icons.Outlined.AttachMoney
-                SManga.PUBLISHING_FINISHED.toLong() -> Icons.Outlined.Done
-                SManga.CANCELLED.toLong() -> Icons.Outlined.Close
-                SManga.ON_HIATUS.toLong() -> Icons.Outlined.Pause
-                else -> Icons.Outlined.Block
-            },
-        )
-
-        Spacer(modifier = Modifier.weight(1f))
-
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.Center,
-        ) {
-            if (source is StubSource) {
-                Icon(
-                    imageVector = Icons.Filled.Warning,
-                    contentDescription = null,
-                    modifier = Modifier.size(16.dp),
-                    tint = MaterialTheme.colorScheme.error,
-                )
-            }
-            Text(
-                text = source.name,
-                style = MaterialTheme.typography.labelSmall,
-                overflow = TextOverflow.Ellipsis,
-                maxLines = 1,
-            )
-        }
    }
 }

-@Composable
-private fun MangaDetailRow(
-    text: String,
-    iconImageVector: ImageVector,
-    maxLines: Int = 1,
-) {
-    Row(
-        modifier = Modifier
-            .secondaryItemAlpha()
-            .padding(top = MaterialTheme.padding.extraSmall),
-        horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Icon(
-            imageVector = iconImageVector,
-            contentDescription = null,
-            modifier = Modifier.size(MangaDetailsIconWidth),
-        )
-        Text(
-            text = text,
-            style = MaterialTheme.typography.bodySmall,
-            overflow = TextOverflow.Ellipsis,
-            maxLines = maxLines,
-        )
-    }
-}
+private val PaddingSize = 16.dp

-@Composable
-private fun getMaximumMangaCardHeight(duplicates: List<MangaWithChapterCount>): Dp {
-    val density = LocalDensity.current
-    val typography = MaterialTheme.typography
-    val textMeasurer = rememberTextMeasurer()
-
-    val smallPadding = with(density) { MaterialTheme.padding.small.roundToPx() }
-    val extraSmallPadding = with(density) { MaterialTheme.padding.extraSmall.roundToPx() }
-
-    val width = with(density) { MangaCardWidth.roundToPx() - (2 * smallPadding) }
-    val iconWidth = with(density) { MangaDetailsIconWidth.roundToPx() }
-
-    val coverHeight = width / MangaCover.Book.ratio
-    val constraints = Constraints(maxWidth = width)
-    val detailsConstraints = Constraints(maxWidth = width - iconWidth - extraSmallPadding)
-
-    return remember(
-        duplicates,
-        density,
-        typography,
-        textMeasurer,
-        smallPadding,
-        extraSmallPadding,
-        coverHeight,
-        constraints,
-        detailsConstraints,
-    ) {
-        duplicates.fastMaxOfOrNull {
-            calculateMangaCardHeight(
-                manga = it.manga,
-                density = density,
-                typography = typography,
-                textMeasurer = textMeasurer,
-                smallPadding = smallPadding,
-                extraSmallPadding = extraSmallPadding,
-                coverHeight = coverHeight,
-                constraints = constraints,
-                detailsConstraints = detailsConstraints,
-            )
-        }
-            ?: 0.dp
-    }
-}
-
-private fun calculateMangaCardHeight(
-    manga: Manga,
-    density: Density,
-    typography: Typography,
-    textMeasurer: TextMeasurer,
-    smallPadding: Int,
-    extraSmallPadding: Int,
-    coverHeight: Float,
-    constraints: Constraints,
-    detailsConstraints: Constraints,
-): Dp {
-    val titleHeight = textMeasurer.measureHeight(manga.title, typography.titleSmall, 2, constraints)
-    val authorHeight = if (!manga.author.isNullOrBlank()) {
-        textMeasurer.measureHeight(manga.author!!, typography.bodySmall, 2, detailsConstraints)
-    } else {
-        0
-    }
-    val artistHeight = if (!manga.artist.isNullOrBlank() && manga.author != manga.artist) {
-        textMeasurer.measureHeight(manga.artist!!, typography.bodySmall, 2, detailsConstraints)
-    } else {
-        0
-    }
-    val statusHeight = textMeasurer.measureHeight("", typography.bodySmall, 2, detailsConstraints)
-    val sourceHeight = textMeasurer.measureHeight("", typography.labelSmall, 1, constraints)
-
-    val totalHeight = coverHeight + titleHeight + authorHeight + artistHeight + statusHeight + sourceHeight
-    return with(density) { ((2 * smallPadding) + totalHeight + (5 * extraSmallPadding)).toDp() }
-}
-
-private fun TextMeasurer.measureHeight(
-    text: String,
-    style: TextStyle,
-    maxLines: Int,
-    constraints: Constraints,
-): Int = measure(
-    text = text,
-    style = style,
-    overflow = TextOverflow.Ellipsis,
-    maxLines = maxLines,
-    constraints = constraints,
-)
-    .size
-    .height
-
-private val MangaCardWidth = 150.dp
-private val MangaDetailsIconWidth = 16.dp
+private val ButtonPadding = PaddingValues(top = 16.dp, bottom = 16.dp)
+private val TitlePadding = PaddingValues(bottom = 16.dp, top = 8.dp)
--- a/app/src/main/java/eu/kanade/presentation/manga/MangaNotesScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/MangaNotesScreen.kt
@ -1,45 +0,0 @@
-package eu.kanade.presentation.manga
-
-import androidx.compose.foundation.layout.consumeWindowInsets
-import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import eu.kanade.presentation.components.AppBar
-import eu.kanade.presentation.components.AppBarTitle
-import eu.kanade.presentation.manga.components.MangaNotesTextArea
-import eu.kanade.tachiyomi.ui.manga.notes.MangaNotesScreen
-import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.material.Scaffold
-import tachiyomi.presentation.core.i18n.stringResource
-
-@Composable
-fun MangaNotesScreen(
-    state: MangaNotesScreen.State,
-    navigateUp: () -> Unit,
-    onUpdate: (String) -> Unit,
-) {
-    Scaffold(
-        topBar = { topBarScrollBehavior ->
-            AppBar(
-                titleContent = {
-                    AppBarTitle(
-                        title = stringResource(MR.strings.action_edit_notes),
-                        subtitle = state.manga.title,
-                    )
-                },
-                navigateUp = navigateUp,
-                scrollBehavior = topBarScrollBehavior,
-            )
-        },
-    ) { contentPadding ->
-        MangaNotesTextArea(
-            state = state,
-            onUpdate = onUpdate,
-            modifier = Modifier
-                .padding(contentPadding)
-                .consumeWindowInsets(contentPadding)
-                .imePadding(),
-        )
-    }
-}
--- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
@ -77,7 +77,6 @@ import eu.kanade.tachiyomi.source.online.english.Pururin
 import eu.kanade.tachiyomi.source.online.english.Tsumino
 import eu.kanade.tachiyomi.ui.manga.ChapterList
 import eu.kanade.tachiyomi.ui.manga.MangaScreenModel
-import eu.kanade.tachiyomi.ui.manga.MergedMangaData
 import eu.kanade.tachiyomi.ui.manga.PagePreviewState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import exh.metadata.MetadataUtil
@ -103,7 +102,8 @@ import tachiyomi.presentation.core.components.material.ExtendedFloatingActionBut
 import tachiyomi.presentation.core.components.material.PullRefresh
 import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.shouldExpandFAB
+import tachiyomi.presentation.core.util.isScrolledToEnd
+import tachiyomi.presentation.core.util.isScrollingUp
 import tachiyomi.source.local.isLocal
 import java.time.Instant
 import java.time.ZoneId
@ -117,7 +117,7 @@ fun MangaScreen(
    isTabletUi: Boolean,
    chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
    chapterSwipeEndAction: LibraryPreferences.ChapterSwipeAction,
-    navigateUp: () -> Unit,
+    onBackClicked: () -> Unit,
    onChapterClicked: (Chapter) -> Unit,
    onDownloadChapter: ((List<ChapterList.Item>, ChapterDownloadAction) -> Unit)?,
    onAddToLibraryClicked: () -> Unit,
@ -142,7 +142,6 @@ fun MangaScreen(
    onEditCategoryClicked: (() -> Unit)?,
    onEditFetchIntervalClicked: (() -> Unit)?,
    onMigrateClicked: (() -> Unit)?,
-    onEditNotesClicked: () -> Unit,
    // SY -->
    onMetadataViewerClicked: () -> Unit,
    onEditInfoClicked: () -> Unit,
@ -183,7 +182,7 @@ fun MangaScreen(
            nextUpdate = nextUpdate,
            chapterSwipeStartAction = chapterSwipeStartAction,
            chapterSwipeEndAction = chapterSwipeEndAction,
-            navigateUp = navigateUp,
+            onBackClicked = onBackClicked,
            onChapterClicked = onChapterClicked,
            onDownloadChapter = onDownloadChapter,
            onAddToLibraryClicked = onAddToLibraryClicked,
@ -202,7 +201,6 @@ fun MangaScreen(
            onEditCategoryClicked = onEditCategoryClicked,
            onEditIntervalClicked = onEditFetchIntervalClicked,
            onMigrateClicked = onMigrateClicked,
-            onEditNotesClicked = onEditNotesClicked,
            // SY -->
            onMetadataViewerClicked = onMetadataViewerClicked,
            onEditInfoClicked = onEditInfoClicked,
@ -230,7 +228,7 @@ fun MangaScreen(
            chapterSwipeStartAction = chapterSwipeStartAction,
            chapterSwipeEndAction = chapterSwipeEndAction,
            nextUpdate = nextUpdate,
-            navigateUp = navigateUp,
+            onBackClicked = onBackClicked,
            onChapterClicked = onChapterClicked,
            onDownloadChapter = onDownloadChapter,
            onAddToLibraryClicked = onAddToLibraryClicked,
@ -249,7 +247,6 @@ fun MangaScreen(
            onEditCategoryClicked = onEditCategoryClicked,
            onEditIntervalClicked = onEditFetchIntervalClicked,
            onMigrateClicked = onMigrateClicked,
-            onEditNotesClicked = onEditNotesClicked,
            // SY -->
            onMetadataViewerClicked = onMetadataViewerClicked,
            onEditInfoClicked = onEditInfoClicked,
@ -280,7 +277,7 @@ private fun MangaScreenSmallImpl(
    nextUpdate: Instant?,
    chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
    chapterSwipeEndAction: LibraryPreferences.ChapterSwipeAction,
-    navigateUp: () -> Unit,
+    onBackClicked: () -> Unit,
    onChapterClicked: (Chapter) -> Unit,
    onDownloadChapter: ((List<ChapterList.Item>, ChapterDownloadAction) -> Unit)?,
    onAddToLibraryClicked: () -> Unit,
@ -306,7 +303,6 @@ private fun MangaScreenSmallImpl(
    onEditCategoryClicked: (() -> Unit)?,
    onEditIntervalClicked: (() -> Unit)?,
    onMigrateClicked: (() -> Unit)?,
-    onEditNotesClicked: () -> Unit,
    // SY -->
    onMetadataViewerClicked: () -> Unit,
    onEditInfoClicked: () -> Unit,
@ -349,9 +345,14 @@ private fun MangaScreenSmallImpl(
    }
    // SY <--

-    BackHandler(enabled = isAnySelected) {
-        onAllChapterSelected(false)
+    val internalOnBackPressed = {
+        if (isAnySelected) {
+            onAllChapterSelected(false)
+        } else {
+            onBackClicked()
+        }
    }
+    BackHandler(onBack = internalOnBackPressed)

    Scaffold(
        topBar = {
@ -364,25 +365,26 @@ private fun MangaScreenSmallImpl(
            val isFirstItemScrolled by remember {
                derivedStateOf { chapterListState.firstVisibleItemScrollOffset > 0 }
            }
-            val titleAlpha by animateFloatAsState(
+            val animatedTitleAlpha by animateFloatAsState(
                if (!isFirstItemVisible) 1f else 0f,
                label = "Top Bar Title",
            )
-            val backgroundAlpha by animateFloatAsState(
+            val animatedBgAlpha by animateFloatAsState(
                if (!isFirstItemVisible || isFirstItemScrolled) 1f else 0f,
                label = "Top Bar Background",
            )
            MangaToolbar(
                title = state.manga.title,
+                titleAlphaProvider = { animatedTitleAlpha },
+                backgroundAlphaProvider = { animatedBgAlpha },
                hasFilters = state.filterActive,
-                navigateUp = navigateUp,
+                onBackClicked = internalOnBackPressed,
                onClickFilter = onFilterClicked,
                onClickShare = onShareClicked,
                onClickDownload = onDownloadActionClicked,
                onClickEditCategory = onEditCategoryClicked,
                onClickRefresh = onRefresh,
                onClickMigrate = onMigrateClicked,
-                onClickEditNotes = onEditNotesClicked,
                // SY -->
                onClickEditInfo = onEditInfoClicked.takeIf { state.manga.favorite },
                onClickRecommend = onRecommendClicked.takeIf { state.showRecommendationsInOverflow },
@ -390,11 +392,8 @@ private fun MangaScreenSmallImpl(
                onClickMerge = onMergeClicked.takeIf { state.showMergeInOverflow },
                // SY <--
                actionModeCounter = selectedChapterCount,
-                onCancelActionMode = { onAllChapterSelected(false) },
                onSelectAll = { onAllChapterSelected(true) },
                onInvertSelection = { onInvertSelection() },
-                titleAlphaProvider = { titleAlpha },
-                backgroundAlphaProvider = { backgroundAlpha },
            )
        },
        bottomBar = {
@ -432,7 +431,7 @@ private fun MangaScreenSmallImpl(
                    },
                    icon = { Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) },
                    onClick = onContinueReading,
-                    expanded = chapterListState.shouldExpandFAB(),
+                    expanded = chapterListState.isScrollingUp() || chapterListState.isScrolledToEnd(),
                )
            }
        },
@ -442,7 +441,7 @@ private fun MangaScreenSmallImpl(
        PullRefresh(
            refreshing = state.isRefreshingData,
            onRefresh = onRefresh,
-            enabled = !isAnySelected,
+            enabled = { !isAnySelected },
            indicatorPadding = PaddingValues(top = topPadding),
        ) {
            val layoutDirection = LocalLayoutDirection.current
@ -467,9 +466,13 @@ private fun MangaScreenSmallImpl(
                        MangaInfoBox(
                            isTabletUi = false,
                            appBarPadding = topPadding,
-                            manga = state.manga,
+                            title = state.manga.title,
+                            author = state.manga.author,
+                            artist = state.manga.artist,
                            sourceName = remember { state.source.getNameForMangaInfo(state.mergedData?.sources) },
                            isStubSource = remember { state.source is StubSource },
+                            coverDataProvider = { state.manga },
+                            status = state.manga.status,
                            onCoverClick = onCoverClicked,
                            doSearch = onSearch,
                        )
@ -520,10 +523,8 @@ private fun MangaScreenSmallImpl(
                            defaultExpandState = state.isFromSource,
                            description = state.manga.description,
                            tagsProvider = { state.manga.genre },
-                            notes = state.manga.notes,
                            onTagSearch = onTagSearch,
                            onCopyTagToClipboard = onCopyTagToClipboard,
-                            onEditNotes = onEditNotesClicked,
                            // SY -->
                            doSearch = onSearch,
                            searchMetadataChips = remember(state.meta, state.source.id, state.manga.genre) {
@ -577,7 +578,6 @@ private fun MangaScreenSmallImpl(

                    sharedChapterItems(
                        manga = state.manga,
-                        mergedData = state.mergedData,
                        chapters = listItem,
                        isAnyChapterSelected = chapters.fastAny { it.selected },
                        chapterSwipeStartAction = chapterSwipeStartAction,
@ -603,7 +603,7 @@ fun MangaScreenLargeImpl(
    nextUpdate: Instant?,
    chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
    chapterSwipeEndAction: LibraryPreferences.ChapterSwipeAction,
-    navigateUp: () -> Unit,
+    onBackClicked: () -> Unit,
    onChapterClicked: (Chapter) -> Unit,
    onDownloadChapter: ((List<ChapterList.Item>, ChapterDownloadAction) -> Unit)?,
    onAddToLibraryClicked: () -> Unit,
@ -629,7 +629,6 @@ fun MangaScreenLargeImpl(
    onEditCategoryClicked: (() -> Unit)?,
    onEditIntervalClicked: (() -> Unit)?,
    onMigrateClicked: (() -> Unit)?,
-    onEditNotesClicked: () -> Unit,
    // SY -->
    onMetadataViewerClicked: () -> Unit,
    onEditInfoClicked: () -> Unit,
@ -676,9 +675,14 @@ fun MangaScreenLargeImpl(

    val chapterListState = rememberLazyListState()

-    BackHandler(enabled = isAnySelected) {
-        onAllChapterSelected(false)
+    val internalOnBackPressed = {
+        if (isAnySelected) {
+            onAllChapterSelected(false)
+        } else {
+            onBackClicked()
+        }
    }
+    BackHandler(onBack = internalOnBackPressed)

    Scaffold(
        topBar = {
@ -688,27 +692,25 @@ fun MangaScreenLargeImpl(
            MangaToolbar(
                modifier = Modifier.onSizeChanged { topBarHeight = it.height },
                title = state.manga.title,
+                titleAlphaProvider = { if (isAnySelected) 1f else 0f },
+                backgroundAlphaProvider = { 1f },
                hasFilters = state.filterActive,
-                navigateUp = navigateUp,
+                onBackClicked = internalOnBackPressed,
                onClickFilter = onFilterButtonClicked,
                onClickShare = onShareClicked,
                onClickDownload = onDownloadActionClicked,
                onClickEditCategory = onEditCategoryClicked,
                onClickRefresh = onRefresh,
                onClickMigrate = onMigrateClicked,
-                onClickEditNotes = onEditNotesClicked,
                // SY -->
                onClickEditInfo = onEditInfoClicked.takeIf { state.manga.favorite },
                onClickRecommend = onRecommendClicked.takeIf { state.showRecommendationsInOverflow },
                onClickMergedSettings = onMergedSettingsClicked.takeIf { state.manga.source == MERGED_SOURCE_ID },
                onClickMerge = onMergeClicked.takeIf { state.showMergeInOverflow },
                // SY <--
-                onCancelActionMode = { onAllChapterSelected(false) },
                actionModeCounter = selectedChapterCount,
                onSelectAll = { onAllChapterSelected(true) },
                onInvertSelection = { onInvertSelection() },
-                titleAlphaProvider = { 1f },
-                backgroundAlphaProvider = { 1f },
            )
        },
        bottomBar = {
@ -753,7 +755,7 @@ fun MangaScreenLargeImpl(
                    },
                    icon = { Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) },
                    onClick = onContinueReading,
-                    expanded = chapterListState.shouldExpandFAB(),
+                    expanded = chapterListState.isScrollingUp() || chapterListState.isScrolledToEnd(),
                )
            }
        },
@ -761,7 +763,7 @@ fun MangaScreenLargeImpl(
        PullRefresh(
            refreshing = state.isRefreshingData,
            onRefresh = onRefresh,
-            enabled = !isAnySelected,
+            enabled = { !isAnySelected },
            indicatorPadding = PaddingValues(
                start = insetPadding.calculateStartPadding(layoutDirection),
                top = with(density) { topBarHeight.toDp() },
@ -782,9 +784,13 @@ fun MangaScreenLargeImpl(
                        MangaInfoBox(
                            isTabletUi = true,
                            appBarPadding = contentPadding.calculateTopPadding(),
-                            manga = state.manga,
+                            title = state.manga.title,
+                            author = state.manga.author,
+                            artist = state.manga.artist,
                            sourceName = remember { state.source.getNameForMangaInfo(state.mergedData?.sources) },
                            isStubSource = remember { state.source is StubSource },
+                            coverDataProvider = { state.manga },
+                            status = state.manga.status,
                            onCoverClick = onCoverClicked,
                            doSearch = onSearch,
                        )
@ -815,10 +821,8 @@ fun MangaScreenLargeImpl(
                            defaultExpandState = true,
                            description = state.manga.description,
                            tagsProvider = { state.manga.genre },
-                            notes = state.manga.notes,
                            onTagSearch = onTagSearch,
                            onCopyTagToClipboard = onCopyTagToClipboard,
-                            onEditNotes = onEditNotesClicked,
                            // SY -->
                            doSearch = onSearch,
                            searchMetadataChips = remember(state.meta, state.source.id, state.manga.genre) {
@ -876,7 +880,6 @@ fun MangaScreenLargeImpl(

                            sharedChapterItems(
                                manga = state.manga,
-                                mergedData = state.mergedData,
                                chapters = listItem,
                                isAnyChapterSelected = chapters.fastAny { it.selected },
                                chapterSwipeStartAction = chapterSwipeStartAction,
@ -941,7 +944,6 @@ private fun SharedMangaBottomActionMenu(

 private fun LazyListScope.sharedChapterItems(
    manga: Manga,
-    mergedData: MergedMangaData?,
    chapters: List<ChapterList>,
    isAnyChapterSelected: Boolean,
    chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
@ -993,9 +995,7 @@ private fun LazyListScope.sharedChapterItems(
                            // SY <--
                        },
                    readProgress = item.chapter.lastPageRead
-                        .takeIf {
-                            /* SY --> */(!item.chapter.read || alwaysShowReadingProgress)/* SY <-- */ && it > 0L
-                        }
+                        .takeIf { /* SY --> */(!item.chapter.read || alwaysShowReadingProgress)/* SY <-- */ && it > 0L }
                        ?.let {
                            stringResource(
                                MR.strings.chapter_progress,
@ -1011,8 +1011,7 @@ private fun LazyListScope.sharedChapterItems(
                    read = item.chapter.read,
                    bookmark = item.chapter.bookmark,
                    selected = item.selected,
-                    downloadIndicatorEnabled =
-                    !isAnyChapterSelected && !(mergedData?.manga?.get(item.chapter.mangaId) ?: manga).isLocal(),
+                    downloadIndicatorEnabled = !isAnyChapterSelected && !manga.isLocal(),
                    downloadStateProvider = { item.downloadState },
                    downloadProgressProvider = { item.downloadProgress },
                    chapterSwipeStartAction = chapterSwipeStartAction,
--- a/app/src/main/java/eu/kanade/presentation/manga/components/ChapterHeader.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/ChapterHeader.kt
@ -12,7 +12,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.material.SECONDARY_ALPHA
+import tachiyomi.presentation.core.components.material.SecondaryItemAlpha
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.pluralStringResource
 import tachiyomi.presentation.core.i18n.stringResource
@ -60,6 +60,6 @@ private fun MissingChaptersWarning(count: Int) {
        maxLines = 1,
        overflow = TextOverflow.Ellipsis,
        style = MaterialTheme.typography.bodySmall,
-        color = MaterialTheme.colorScheme.error.copy(alpha = SECONDARY_ALPHA),
+        color = MaterialTheme.colorScheme.error.copy(alpha = SecondaryItemAlpha),
    )
 }
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
@ -28,6 +28,7 @@ import androidx.compose.material.icons.outlined.BookmarkRemove
 import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.DoneAll
 import androidx.compose.material.icons.outlined.Download
+import androidx.compose.material.icons.outlined.Label
 import androidx.compose.material.icons.outlined.MoreVert
 import androidx.compose.material.icons.outlined.RemoveDone
 import androidx.compose.material.icons.outlined.SwapCalls
@ -236,7 +237,6 @@ fun LibraryBottomActionMenu(
    // SY -->
    onClickCleanTitles: (() -> Unit)?,
    onClickMigrate: (() -> Unit)?,
-    onClickCollectRecommendations: (() -> Unit)?,
    onClickAddToMangaDex: (() -> Unit)?,
    onClickResetInfo: (() -> Unit)?,
    // SY <--
@ -267,10 +267,7 @@ fun LibraryBottomActionMenu(
                }
            }
            // SY -->
-            val showOverflow = onClickCleanTitles != null ||
-                onClickAddToMangaDex != null ||
-                onClickResetInfo != null ||
-                onClickCollectRecommendations != null
+            val showOverflow = onClickCleanTitles != null || onClickAddToMangaDex != null || onClickResetInfo != null
            val configuration = LocalConfiguration.current
            val moveMarkPrev = remember { !configuration.isTabletUi() }
            var overFlowOpen by remember { mutableStateOf(false) }
@ -361,12 +358,6 @@ fun LibraryBottomActionMenu(
                                onClick = onClickMigrate,
                            )
                        }
-                        if (onClickCollectRecommendations != null) {
-                            DropdownMenuItem(
-                                text = { Text(stringResource(SYMR.strings.rec_search_short)) },
-                                onClick = onClickCollectRecommendations,
-                            )
-                        }
                        if (onClickAddToMangaDex != null) {
                            DropdownMenuItem(
                                text = { Text(stringResource(SYMR.strings.mangadex_add_to_follows)) },
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt
@ -40,8 +40,8 @@ import eu.kanade.tachiyomi.data.download.model.Download
 import me.saket.swipe.SwipeableActionsBox
 import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.material.DISABLED_ALPHA
-import tachiyomi.presentation.core.components.material.SECONDARY_ALPHA
+import tachiyomi.presentation.core.components.material.ReadItemAlpha
+import tachiyomi.presentation.core.components.material.SecondaryItemAlpha
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.selectedBackground

@ -135,7 +135,7 @@ fun MangaChapterListItem(
                        maxLines = 1,
                        overflow = TextOverflow.Ellipsis,
                        onTextLayout = { textHeight = it.size.height },
-                        color = LocalContentColor.current.copy(alpha = if (read) DISABLED_ALPHA else 1f),
+                        color = LocalContentColor.current.copy(alpha = if (read) ReadItemAlpha else 1f),
                    )
                }

@ -143,7 +143,7 @@ fun MangaChapterListItem(
                    val subtitleStyle = MaterialTheme.typography.bodySmall
                        .merge(
                            color = LocalContentColor.current
-                                .copy(alpha = if (read) DISABLED_ALPHA else SECONDARY_ALPHA),
+                                .copy(alpha = if (read) ReadItemAlpha else SecondaryItemAlpha)
                        )
                    ProvideTextStyle(value = subtitleStyle) {
                        if (date != null) {
@ -152,19 +152,14 @@ fun MangaChapterListItem(
                                maxLines = 1,
                                overflow = TextOverflow.Ellipsis,
                            )
-                            if (readProgress != null ||
-                                scanlator != null/* SY --> */ ||
-                                sourceName != null/* SY <-- */
-                            ) {
-                                DotSeparatorText()
-                            }
+                            if (readProgress != null || scanlator != null/* SY --> */ || sourceName != null/* SY <-- */) DotSeparatorText()
                        }
                        if (readProgress != null) {
                            Text(
                                text = readProgress,
                                maxLines = 1,
                                overflow = TextOverflow.Ellipsis,
-                                color = LocalContentColor.current.copy(alpha = DISABLED_ALPHA),
+                                color = LocalContentColor.current.copy(alpha = ReadItemAlpha),
                            )
                            if (scanlator != null/* SY --> */ || sourceName != null/* SY <-- */) DotSeparatorText()
                        }
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt
@ -3,9 +3,6 @@ package eu.kanade.presentation.manga.components
 import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import android.os.Build
-import androidx.activity.compose.PredictiveBackHandler
-import androidx.compose.animation.core.animate
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
@ -28,22 +25,18 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.util.lerp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
-import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.updatePadding
 import coil3.asDrawable
 import coil3.imageLoader
@ -56,18 +49,15 @@ import eu.kanade.presentation.components.DropdownMenu
 import eu.kanade.presentation.manga.EditCoverAction
 import eu.kanade.tachiyomi.ui.reader.viewer.ReaderPageImageView
 import kotlinx.collections.immutable.persistentListOf
-import soup.compose.material.motion.MotionConstants
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.PredictiveBack
 import tachiyomi.presentation.core.util.clickableNoIndication
-import kotlin.coroutines.cancellation.CancellationException

@Composable
 fun MangaCoverDialog(
-    manga: Manga,
+    coverDataProvider: () -> Manga,
    isCustomCover: Boolean,
    snackbarHostState: SnackbarHostState,
    onShareClick: () -> Unit,
@ -162,32 +152,10 @@ fun MangaCoverDialog(
            val statusBarPaddingPx = with(LocalDensity.current) { contentPadding.calculateTopPadding().roundToPx() }
            val bottomPaddingPx = with(LocalDensity.current) { contentPadding.calculateBottomPadding().roundToPx() }

-            var scale by remember { mutableFloatStateOf(1f) }
-            PredictiveBackHandler { progress ->
-                try {
-                    progress.collect { backEvent ->
-                        scale = lerp(1f, 0.8f, PredictiveBack.transform(backEvent.progress))
-                    }
-                    onDismissRequest()
-                } catch (e: CancellationException) {
-                    animate(
-                        initialValue = scale,
-                        targetValue = 1f,
-                        animationSpec = tween(durationMillis = MotionConstants.DefaultMotionDuration),
-                    ) { value, _ ->
-                        scale = value
-                    }
-                }
-            }
-
            Box(
                modifier = Modifier
                    .fillMaxSize()
-                    .clickableNoIndication(onClick = onDismissRequest)
-                    .graphicsLayer {
-                        scaleX = scale
-                        scaleY = scale
-                    },
+                    .clickableNoIndication(onClick = onDismissRequest),
            ) {
                AndroidView(
                    factory = {
@ -199,25 +167,25 @@ fun MangaCoverDialog(
                    },
                    update = { view ->
                        val request = ImageRequest.Builder(view.context)
-                            .data(manga)
+                            .data(coverDataProvider())
                            .size(Size.ORIGINAL)
                            .memoryCachePolicy(CachePolicy.DISABLED)
                            .target { image ->
                                val drawable = image.asDrawable(view.context.resources)
+
                                // Copy bitmap in case it came from memory cache
                                // Because SSIV needs to thoroughly read the image
-                                val copy = (drawable as? BitmapDrawable)
-                                    ?.bitmap
-                                    ?.copy(
-                                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                            Bitmap.Config.HARDWARE
-                                        } else {
-                                            Bitmap.Config.ARGB_8888
-                                        },
-                                        false,
+                                val copy = (drawable as? BitmapDrawable)?.let {
+                                    val config = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                        Bitmap.Config.HARDWARE
+                                    } else {
+                                        Bitmap.Config.ARGB_8888
+                                    }
+                                    BitmapDrawable(
+                                        view.context.resources,
+                                        it.bitmap.copy(config, false),
                                    )
-                                    ?.toDrawable(view.context.resources)
-                                    ?: drawable
+                                } ?: drawable
                                view.setImage(copy, ReaderPageImageView.Config(zoomDuration = 500))
                            }
                            .build()
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
@ -75,10 +75,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil3.compose.AsyncImage
-import coil3.request.ImageRequest
-import coil3.request.crossfade
-import com.mikepenz.markdown.model.markdownAnnotator
-import com.mikepenz.markdown.model.markdownAnnotatorConfig
 import eu.kanade.presentation.components.DropdownMenu
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.model.SManga
@ -86,7 +82,6 @@ import eu.kanade.tachiyomi.util.system.copyToClipboard
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
-import tachiyomi.presentation.core.components.material.DISABLED_ALPHA
 import tachiyomi.presentation.core.components.material.TextButton
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.pluralStringResource
@ -97,13 +92,19 @@ import java.time.Instant
 import java.time.temporal.ChronoUnit
 import kotlin.math.roundToInt

+private val whitespaceLineRegex = Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTILINE))
+
@Composable
 fun MangaInfoBox(
    isTabletUi: Boolean,
    appBarPadding: Dp,
-    manga: Manga,
+    title: String,
+    author: String?,
+    artist: String?,
    sourceName: String,
    isStubSource: Boolean,
+    coverDataProvider: () -> Manga,
+    status: Long,
    onCoverClick: () -> Unit,
    doSearch: (query: String, global: Boolean) -> Unit,
    modifier: Modifier = Modifier,
@ -115,10 +116,7 @@ fun MangaInfoBox(
            MaterialTheme.colorScheme.background,
        )
        AsyncImage(
-            model = ImageRequest.Builder(LocalContext.current)
-                .data(manga)
-                .crossfade(true)
-                .build(),
+            model = coverDataProvider(),
            contentDescription = null,
            contentScale = ContentScale.Crop,
            modifier = Modifier
@ -138,20 +136,28 @@ fun MangaInfoBox(
            if (!isTabletUi) {
                MangaAndSourceTitlesSmall(
                    appBarPadding = appBarPadding,
-                    manga = manga,
+                    coverDataProvider = coverDataProvider,
+                    onCoverClick = onCoverClick,
+                    title = title,
+                    doSearch = doSearch,
+                    author = author,
+                    artist = artist,
+                    status = status,
                    sourceName = sourceName,
                    isStubSource = isStubSource,
-                    onCoverClick = onCoverClick,
-                    doSearch = doSearch,
                )
            } else {
                MangaAndSourceTitlesLarge(
                    appBarPadding = appBarPadding,
-                    manga = manga,
+                    coverDataProvider = coverDataProvider,
+                    onCoverClick = onCoverClick,
+                    title = title,
+                    doSearch = doSearch,
+                    author = author,
+                    artist = artist,
+                    status = status,
                    sourceName = sourceName,
                    isStubSource = isStubSource,
-                    onCoverClick = onCoverClick,
-                    doSearch = doSearch,
                )
            }
        }
@ -175,7 +181,7 @@ fun MangaActionRow(
    // SY <--
    modifier: Modifier = Modifier,
 ) {
-    val defaultActionButtonColor = MaterialTheme.colorScheme.onSurface.copy(alpha = DISABLED_ALPHA)
+    val defaultActionButtonColor = MaterialTheme.colorScheme.onSurface.copy(alpha = .38f)

    // TODO: show something better when using custom interval
    val nextUpdateDays = remember(nextUpdate) {
@ -250,10 +256,8 @@ fun ExpandableMangaDescription(
    defaultExpandState: Boolean,
    description: String?,
    tagsProvider: () -> List<String>?,
-    notes: String,
    onTagSearch: (String) -> Unit,
    onCopyTagToClipboard: (tag: String) -> Unit,
-    onEditNotes: () -> Unit,
    // SY -->
    searchMetadataChips: SearchMetadataChips?,
    doSearch: (query: String, global: Boolean) -> Unit,
@ -266,12 +270,15 @@ fun ExpandableMangaDescription(
        }
        val desc =
            description.takeIf { !it.isNullOrBlank() } ?: stringResource(MR.strings.description_placeholder)
-
+        val trimmedDescription = remember(desc) {
+            desc
+                .replace(whitespaceLineRegex, "\n")
+                .trimEnd()
+        }
        MangaSummary(
-            description = desc,
+            expandedDescription = desc,
+            shrunkDescription = trimmedDescription,
            expanded = expanded,
-            notes = notes,
-            onEditNotesClicked = onEditNotes,
            modifier = Modifier
                .padding(top = 8.dp)
                .padding(horizontal = 16.dp)
@ -369,11 +376,15 @@ fun ExpandableMangaDescription(
@Composable
 private fun MangaAndSourceTitlesLarge(
    appBarPadding: Dp,
-    manga: Manga,
+    coverDataProvider: () -> Manga,
+    onCoverClick: () -> Unit,
+    title: String,
+    doSearch: (query: String, global: Boolean) -> Unit,
+    author: String?,
+    artist: String?,
+    status: Long,
    sourceName: String,
    isStubSource: Boolean,
-    onCoverClick: () -> Unit,
-    doSearch: (query: String, global: Boolean) -> Unit,
 ) {
    Column(
        modifier = Modifier
@ -383,22 +394,19 @@ private fun MangaAndSourceTitlesLarge(
    ) {
        MangaCover.Book(
            modifier = Modifier.fillMaxWidth(0.65f),
-            data = ImageRequest.Builder(LocalContext.current)
-                .data(manga)
-                .crossfade(true)
-                .build(),
+            data = coverDataProvider(),
            contentDescription = stringResource(MR.strings.manga_cover),
            onClick = onCoverClick,
        )
        Spacer(modifier = Modifier.height(16.dp))
        MangaContentInfo(
-            title = manga.title,
-            author = manga.author,
-            artist = manga.artist,
-            status = manga.status,
+            title = title,
+            doSearch = doSearch,
+            author = author,
+            artist = artist,
+            status = status,
            sourceName = sourceName,
            isStubSource = isStubSource,
-            doSearch = doSearch,
            textAlign = TextAlign.Center,
        )
    }
@ -407,11 +415,15 @@ private fun MangaAndSourceTitlesLarge(
@Composable
 private fun MangaAndSourceTitlesSmall(
    appBarPadding: Dp,
-    manga: Manga,
+    coverDataProvider: () -> Manga,
+    onCoverClick: () -> Unit,
+    title: String,
+    doSearch: (query: String, global: Boolean) -> Unit,
+    author: String?,
+    artist: String?,
+    status: Long,
    sourceName: String,
    isStubSource: Boolean,
-    onCoverClick: () -> Unit,
-    doSearch: (query: String, global: Boolean) -> Unit,
 ) {
    Row(
        modifier = Modifier
@ -424,10 +436,7 @@ private fun MangaAndSourceTitlesSmall(
            modifier = Modifier
                .sizeIn(maxWidth = 100.dp)
                .align(Alignment.Top),
-            data = ImageRequest.Builder(LocalContext.current)
-                .data(manga)
-                .crossfade(true)
-                .build(),
+            data = coverDataProvider(),
            contentDescription = stringResource(MR.strings.manga_cover),
            onClick = onCoverClick,
        )
@ -435,13 +444,13 @@ private fun MangaAndSourceTitlesSmall(
            verticalArrangement = Arrangement.spacedBy(2.dp),
        ) {
            MangaContentInfo(
-                title = manga.title,
-                author = manga.author,
-                artist = manga.artist,
-                status = manga.status,
+                title = title,
+                doSearch = doSearch,
+                author = author,
+                artist = artist,
+                status = status,
                sourceName = sourceName,
                isStubSource = isStubSource,
-                doSearch = doSearch,
            )
        }
    }
@ -450,12 +459,12 @@ private fun MangaAndSourceTitlesSmall(
@Composable
 private fun ColumnScope.MangaContentInfo(
    title: String,
+    doSearch: (query: String, global: Boolean) -> Unit,
    author: String?,
    artist: String?,
    status: Long,
    sourceName: String,
    isStubSource: Boolean,
-    doSearch: (query: String, global: Boolean) -> Unit,
    textAlign: TextAlign? = LocalTextStyle.current.textAlign,
 ) {
    val context = LocalContext.current
@ -593,26 +602,11 @@ private fun ColumnScope.MangaContentInfo(
    }
 }

-private val descriptionAnnotator = markdownAnnotator(
-    annotate = { content, child ->
-        if (child.type in DISALLOWED_MARKDOWN_TYPES) {
-            append(content.substring(child.startOffset, child.endOffset))
-            return@markdownAnnotator true
-        }
-
-        false
-    },
-    config = markdownAnnotatorConfig(
-        eolAsNewLine = true,
-    ),
-)
-
@Composable
 private fun MangaSummary(
-    description: String,
-    notes: String,
+    expandedDescription: String,
+    shrunkDescription: String,
    expanded: Boolean,
-    onEditNotesClicked: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
    val animProgress by animateFloatAsState(
@ -624,40 +618,25 @@ private fun MangaSummary(
        contents = listOf(
            {
                Text(
-                    // Shows at least 3 lines if no notes
-                    // when there are notes show 6
-                    text = if (notes.isBlank()) "\n\n" else "\n\n\n\n\n",
+                    text = "\n\n", // Shows at least 3 lines
                    style = MaterialTheme.typography.bodyMedium,
                )
            },
            {
-                Column {
-                    MangaNotesSection(
-                        content = notes,
-                        expanded = true,
-                        onEditNotes = onEditNotesClicked,
-                    )
-                    MarkdownRender(
-                        content = description,
-                        modifier = Modifier.secondaryItemAlpha(),
-                        annotator = descriptionAnnotator,
-                    )
-                }
+                Text(
+                    text = expandedDescription,
+                    style = MaterialTheme.typography.bodyMedium,
+                )
            },
            {
-                Column {
-                    MangaNotesSection(
-                        content = notes,
-                        expanded = expanded,
-                        onEditNotes = onEditNotesClicked,
+                SelectionContainer {
+                    Text(
+                        text = if (expanded) expandedDescription else shrunkDescription,
+                        maxLines = Int.MAX_VALUE,
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onBackground,
+                        modifier = Modifier.secondaryItemAlpha(),
                    )
-                    SelectionContainer {
-                        MarkdownRender(
-                            content = description,
-                            modifier = Modifier.secondaryItemAlpha(),
-                            annotator = descriptionAnnotator,
-                        )
-                    }
                }
            },
            {
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesDisplay.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesDisplay.kt
@ -1,60 +0,0 @@
-package eu.kanade.presentation.manga.components
-
-import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.core.Animatable
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import com.mohamedrejeb.richeditor.model.rememberRichTextState
-import com.mohamedrejeb.richeditor.ui.material3.RichText
-
-private val FADE_TIME = tween<Float>(500)
-
-@Composable
-fun MangaNotesDisplay(
-    content: String,
-    modifier: Modifier,
-) {
-    val alpha = remember { Animatable(1f) }
-    var contentUpdatedOnce by remember { mutableStateOf(false) }
-
-    val richTextState = rememberRichTextState()
-    val primaryColor = MaterialTheme.colorScheme.primary
-    LaunchedEffect(content) {
-        richTextState.setMarkdown(content)
-
-        if (!contentUpdatedOnce) {
-            contentUpdatedOnce = true
-            return@LaunchedEffect
-        }
-
-        alpha.snapTo(targetValue = 0f)
-        alpha.animateTo(targetValue = 1f, animationSpec = FADE_TIME)
-    }
-    LaunchedEffect(Unit) {
-        richTextState.config.unorderedListIndent = 4
-        richTextState.config.orderedListIndent = 20
-    }
-    LaunchedEffect(primaryColor) {
-        richTextState.config.linkColor = primaryColor
-    }
-
-    SelectionContainer {
-        RichText(
-            modifier = modifier
-                // Only animate size if the notes changes
-                .then(if (contentUpdatedOnce) Modifier.animateContentSize() else Modifier)
-                .alpha(alpha.value),
-            style = MaterialTheme.typography.bodyMedium,
-            state = richTextState,
-        )
-    }
-}
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesSection.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesSection.kt
@ -1,90 +0,0 @@
-package eu.kanade.presentation.manga.components
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.EditNote
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.tooling.preview.PreviewLightDark
-import androidx.compose.ui.unit.dp
-import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.material.Button
-import tachiyomi.presentation.core.components.material.ButtonDefaults
-import tachiyomi.presentation.core.components.material.padding
-import tachiyomi.presentation.core.i18n.stringResource
-
-@Composable
-fun MangaNotesSection(
-    content: String,
-    expanded: Boolean,
-    onEditNotes: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    if (content.isBlank()) return
-    Column(
-        modifier = modifier.fillMaxWidth(),
-        horizontalAlignment = Alignment.CenterHorizontally,
-    ) {
-        MangaNotesDisplay(
-            content = content,
-            modifier = modifier.fillMaxWidth(),
-        )
-        if (expanded) {
-            Button(
-                onClick = onEditNotes,
-                colors = ButtonDefaults.buttonColors(
-                    containerColor = Color.Transparent,
-                    contentColor = MaterialTheme.colorScheme.primary,
-                ),
-                shape = RoundedCornerShape(8.dp),
-                modifier = Modifier
-                    .padding(horizontal = 16.dp, vertical = 4.dp),
-            ) {
-                Row(
-                    horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall),
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    Icon(
-                        imageVector = Icons.Filled.EditNote,
-                        contentDescription = null,
-                        modifier = Modifier
-                            .size(16.dp),
-                    )
-                    Text(
-                        stringResource(MR.strings.action_edit_notes),
-                    )
-                }
-            }
-        }
-
-        HorizontalDivider(
-            modifier = Modifier
-                .padding(
-                    top = if (expanded) 0.dp else 12.dp,
-                    bottom = if (expanded) 16.dp else 12.dp,
-                ),
-        )
-    }
-}
-
-@PreviewLightDark
-@Composable
-private fun MangaNotesSectionPreview() {
-    MangaNotesSection(
-        onEditNotes = {},
-        expanded = true,
-        content = "# Hello world\ntest1234 hi there!",
-    )
-}
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesTextArea.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesTextArea.kt
@ -1,224 +0,0 @@
-package eu.kanade.presentation.manga.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.FormatListBulleted
-import androidx.compose.material.icons.outlined.FormatBold
-import androidx.compose.material.icons.outlined.FormatItalic
-import androidx.compose.material.icons.outlined.FormatListNumbered
-import androidx.compose.material.icons.outlined.FormatUnderlined
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.VerticalDivider
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.snapshotFlow
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.dp
-import com.mohamedrejeb.richeditor.model.rememberRichTextState
-import com.mohamedrejeb.richeditor.ui.material3.RichTextEditor
-import com.mohamedrejeb.richeditor.ui.material3.RichTextEditorDefaults.richTextEditorColors
-import eu.kanade.tachiyomi.ui.manga.notes.MangaNotesScreen
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.material.padding
-import tachiyomi.presentation.core.i18n.stringResource
-import kotlin.time.Duration.Companion.seconds
-
-private const val MAX_LENGTH = 250
-private const val MAX_LENGTH_WARN = MAX_LENGTH * 0.9
-
-@Composable
-fun MangaNotesTextArea(
-    state: MangaNotesScreen.State,
-    onUpdate: (String) -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    val scope = rememberCoroutineScope()
-    val richTextState = rememberRichTextState()
-    val primaryColor = MaterialTheme.colorScheme.primary
-
-    DisposableEffect(scope, richTextState) {
-        snapshotFlow { richTextState.annotatedString }
-            .debounce(0.25.seconds)
-            .distinctUntilChanged()
-            .map { richTextState.toMarkdown() }
-            .onEach { onUpdate(it) }
-            .launchIn(scope)
-
-        onDispose {
-            onUpdate(richTextState.toMarkdown())
-        }
-    }
-    LaunchedEffect(Unit) {
-        richTextState.setMarkdown(state.notes)
-        richTextState.config.unorderedListIndent = 4
-        richTextState.config.orderedListIndent = 20
-    }
-    LaunchedEffect(primaryColor) {
-        richTextState.config.linkColor = primaryColor
-    }
-    val focusRequester = remember { FocusRequester() }
-    LaunchedEffect(focusRequester) {
-        focusRequester.requestFocus()
-    }
-    val textLength = remember(richTextState.annotatedString) { richTextState.toText().length }
-
-    Column(
-        modifier = modifier
-            .padding(horizontal = MaterialTheme.padding.small)
-            .fillMaxSize(),
-    ) {
-        RichTextEditor(
-            state = richTextState,
-            textStyle = MaterialTheme.typography.bodyLarge,
-            maxLength = MAX_LENGTH,
-            placeholder = {
-                Text(text = stringResource(MR.strings.notes_placeholder))
-            },
-            colors = richTextEditorColors(
-                containerColor = Color.Transparent,
-                focusedIndicatorColor = Color.Transparent,
-                unfocusedIndicatorColor = Color.Transparent,
-            ),
-            contentPadding = PaddingValues(
-                horizontal = MaterialTheme.padding.medium,
-            ),
-            modifier = Modifier
-                .weight(1f)
-                .fillMaxWidth()
-                .focusRequester(focusRequester),
-        )
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween,
-            modifier = Modifier
-                .padding(vertical = MaterialTheme.padding.small)
-                .fillMaxWidth(),
-        ) {
-            LazyRow(
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(2.dp),
-            ) {
-                item {
-                    MangaNotesTextAreaButton(
-                        onClick = { richTextState.toggleSpanStyle(SpanStyle(fontWeight = FontWeight.Bold)) },
-                        isSelected = richTextState.currentSpanStyle.fontWeight == FontWeight.Bold,
-                        icon = Icons.Outlined.FormatBold,
-                    )
-                }
-                item {
-                    MangaNotesTextAreaButton(
-                        onClick = { richTextState.toggleSpanStyle(SpanStyle(fontStyle = FontStyle.Italic)) },
-                        isSelected = richTextState.currentSpanStyle.fontStyle == FontStyle.Italic,
-                        icon = Icons.Outlined.FormatItalic,
-                    )
-                }
-                item {
-                    MangaNotesTextAreaButton(
-                        onClick = {
-                            richTextState.toggleSpanStyle(SpanStyle(textDecoration = TextDecoration.Underline))
-                        },
-                        isSelected = richTextState.currentSpanStyle.textDecoration
-                            ?.contains(TextDecoration.Underline)
-                            ?: false,
-                        icon = Icons.Outlined.FormatUnderlined,
-                    )
-                }
-                item {
-                    VerticalDivider(
-                        modifier = Modifier
-                            .padding(horizontal = MaterialTheme.padding.extraSmall)
-                            .height(MaterialTheme.padding.large),
-                    )
-                }
-                item {
-                    MangaNotesTextAreaButton(
-                        onClick = { richTextState.toggleUnorderedList() },
-                        isSelected = richTextState.isUnorderedList,
-                        icon = Icons.AutoMirrored.Outlined.FormatListBulleted,
-                    )
-                }
-                item {
-                    MangaNotesTextAreaButton(
-                        onClick = { richTextState.toggleOrderedList() },
-                        isSelected = richTextState.isOrderedList,
-                        icon = Icons.Outlined.FormatListNumbered,
-                    )
-                }
-            }
-
-            Box(
-                contentAlignment = Alignment.Center,
-            ) {
-                Text(
-                    text = (MAX_LENGTH - textLength).toString(),
-                    color = if (textLength > MAX_LENGTH_WARN) {
-                        MaterialTheme.colorScheme.error
-                    } else {
-                        Color.Unspecified
-                    },
-                    modifier = Modifier.padding(MaterialTheme.padding.extraSmall),
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun MangaNotesTextAreaButton(
-    onClick: () -> Unit,
-    icon: ImageVector,
-    isSelected: Boolean,
-    modifier: Modifier = Modifier,
-) {
-    Box(
-        modifier = modifier
-            .clip(MaterialTheme.shapes.small)
-            .clickable(
-                onClick = onClick,
-                enabled = true,
-                role = Role.Button,
-            ),
-        contentAlignment = Alignment.Center,
-    ) {
-        Icon(
-            imageVector = icon,
-            contentDescription = icon.name,
-            tint = if (isSelected) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.primary,
-            modifier = Modifier
-                .background(color = if (isSelected) MaterialTheme.colorScheme.onBackground else Color.Transparent)
-                .padding(MaterialTheme.padding.extraSmall),
-        )
-    }
-}
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
@ -1,12 +1,18 @@
 package eu.kanade.presentation.manga.components

+import androidx.compose.foundation.layout.Column
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material.icons.outlined.Download
 import androidx.compose.material.icons.outlined.FilterList
 import androidx.compose.material.icons.outlined.FlipToBack
 import androidx.compose.material.icons.outlined.SelectAll
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@ -14,12 +20,12 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarActions
-import eu.kanade.presentation.components.AppBarTitle
 import eu.kanade.presentation.components.DownloadDropdownMenu
+import eu.kanade.presentation.components.UpIcon
 import eu.kanade.presentation.manga.DownloadAction
 import kotlinx.collections.immutable.persistentListOf
 import tachiyomi.i18n.MR
@ -30,15 +36,15 @@ import tachiyomi.presentation.core.theme.active
@Composable
 fun MangaToolbar(
    title: String,
+    titleAlphaProvider: () -> Float,
    hasFilters: Boolean,
-    navigateUp: () -> Unit,
+    onBackClicked: () -> Unit,
    onClickFilter: () -> Unit,
    onClickShare: (() -> Unit)?,
    onClickDownload: ((DownloadAction) -> Unit)?,
    onClickEditCategory: (() -> Unit)?,
    onClickRefresh: () -> Unit,
    onClickMigrate: (() -> Unit)?,
-    onClickEditNotes: () -> Unit,
    // SY -->
    onClickEditInfo: (() -> Unit)?,
    onClickRecommend: (() -> Unit)?,
@ -48,151 +54,152 @@ fun MangaToolbar(

    // For action mode
    actionModeCounter: Int,
-    onCancelActionMode: () -> Unit,
    onSelectAll: () -> Unit,
    onInvertSelection: () -> Unit,

-    titleAlphaProvider: () -> Float,
-    backgroundAlphaProvider: () -> Float,
    modifier: Modifier = Modifier,
+    backgroundAlphaProvider: () -> Float = titleAlphaProvider,
 ) {
-    val isActionMode = actionModeCounter > 0
-    AppBar(
-        titleContent = {
-            if (isActionMode) {
-                AppBarTitle(actionModeCounter.toString())
-            } else {
-                AppBarTitle(title, modifier = Modifier.alpha(titleAlphaProvider()))
-            }
-        },
+    Column(
        modifier = modifier,
-        backgroundColor = MaterialTheme.colorScheme
-            .surfaceColorAtElevation(3.dp)
-            .copy(alpha = if (isActionMode) 1f else backgroundAlphaProvider()),
-        navigateUp = navigateUp,
-        actions = {
-            var downloadExpanded by remember { mutableStateOf(false) }
-            if (onClickDownload != null) {
-                val onDismissRequest = { downloadExpanded = false }
-                DownloadDropdownMenu(
-                    expanded = downloadExpanded,
-                    onDismissRequest = onDismissRequest,
-                    onDownloadClicked = onClickDownload,
+    ) {
+        val isActionMode = actionModeCounter > 0
+        TopAppBar(
+            title = {
+                Text(
+                    text = if (isActionMode) actionModeCounter.toString() else title,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    color = LocalContentColor.current.copy(alpha = if (isActionMode) 1f else titleAlphaProvider()),
                )
-            }
-
-            val filterTint = if (hasFilters) MaterialTheme.colorScheme.active else LocalContentColor.current
-            AppBarActions(
-                actions = persistentListOf<AppBar.AppBarAction>().builder().apply {
-                    if (isActionMode) {
-                        add(
+            },
+            navigationIcon = {
+                IconButton(onClick = onBackClicked) {
+                    UpIcon(navigationIcon = Icons.Outlined.Close.takeIf { isActionMode })
+                }
+            },
+            actions = {
+                if (isActionMode) {
+                    AppBarActions(
+                        persistentListOf(
                            AppBar.Action(
                                title = stringResource(MR.strings.action_select_all),
                                icon = Icons.Outlined.SelectAll,
                                onClick = onSelectAll,
                            ),
-                        )
-                        add(
                            AppBar.Action(
                                title = stringResource(MR.strings.action_select_inverse),
                                icon = Icons.Outlined.FlipToBack,
                                onClick = onInvertSelection,
                            ),
-                        )
-                        return@apply
-                    }
+                        ),
+                    )
+                } else {
+                    var downloadExpanded by remember { mutableStateOf(false) }
                    if (onClickDownload != null) {
-                        add(
-                            AppBar.Action(
-                                title = stringResource(MR.strings.manga_download),
-                                icon = Icons.Outlined.Download,
-                                onClick = { downloadExpanded = !downloadExpanded },
-                            ),
+                        val onDismissRequest = { downloadExpanded = false }
+                        DownloadDropdownMenu(
+                            expanded = downloadExpanded,
+                            onDismissRequest = onDismissRequest,
+                            onDownloadClicked = onClickDownload,
                        )
                    }
-                    add(
-                        AppBar.Action(
-                            title = stringResource(MR.strings.action_filter),
-                            icon = Icons.Outlined.FilterList,
-                            iconTint = filterTint,
-                            onClick = onClickFilter,
-                        ),
+
+                    val filterTint = if (hasFilters) MaterialTheme.colorScheme.active else LocalContentColor.current
+                    AppBarActions(
+                        actions = persistentListOf<AppBar.AppBarAction>().builder()
+                            .apply {
+                                if (onClickDownload != null) {
+                                    add(
+                                        AppBar.Action(
+                                            title = stringResource(MR.strings.manga_download),
+                                            icon = Icons.Outlined.Download,
+                                            onClick = { downloadExpanded = !downloadExpanded },
+                                        ),
+                                    )
+                                }
+                                add(
+                                    AppBar.Action(
+                                        title = stringResource(MR.strings.action_filter),
+                                        icon = Icons.Outlined.FilterList,
+                                        iconTint = filterTint,
+                                        onClick = onClickFilter,
+                                    ),
+                                )
+                                add(
+                                    AppBar.OverflowAction(
+                                        title = stringResource(MR.strings.action_webview_refresh),
+                                        onClick = onClickRefresh,
+                                    ),
+                                )
+                                if (onClickEditCategory != null) {
+                                    add(
+                                        AppBar.OverflowAction(
+                                            title = stringResource(MR.strings.action_edit_categories),
+                                            onClick = onClickEditCategory,
+                                        ),
+                                    )
+                                }
+                                if (onClickMigrate != null) {
+                                    add(
+                                        AppBar.OverflowAction(
+                                            title = stringResource(MR.strings.action_migrate),
+                                            onClick = onClickMigrate,
+                                        ),
+                                    )
+                                }
+                                if (onClickShare != null) {
+                                    add(
+                                        AppBar.OverflowAction(
+                                            title = stringResource(MR.strings.action_share),
+                                            onClick = onClickShare,
+                                        ),
+                                    )
+                                }
+                                // SY -->
+                                if (onClickMerge != null) {
+                                    add(
+                                        AppBar.OverflowAction(
+                                            title = stringResource(SYMR.strings.merge),
+                                            onClick = onClickMerge,
+                                        ),
+                                    )
+                                }
+                                if (onClickEditInfo != null) {
+                                    add(
+                                        AppBar.OverflowAction(
+                                            title = stringResource(SYMR.strings.action_edit_info),
+                                            onClick = onClickEditInfo,
+                                        ),
+                                    )
+                                }
+                                if (onClickRecommend != null) {
+                                    add(
+                                        AppBar.OverflowAction(
+                                            title = stringResource(SYMR.strings.az_recommends),
+                                            onClick = onClickRecommend,
+                                        ),
+                                    )
+                                }
+                                if (onClickMergedSettings != null) {
+                                    add(
+                                        AppBar.OverflowAction(
+                                            title = stringResource(SYMR.strings.merge_settings),
+                                            onClick = onClickMergedSettings,
+                                        ),
+                                    )
+                                }
+                                // SY <--
+                            }
+                            .build(),
                    )
-                    add(
-                        AppBar.OverflowAction(
-                            title = stringResource(MR.strings.action_webview_refresh),
-                            onClick = onClickRefresh,
-                        ),
-                    )
-                    if (onClickEditCategory != null) {
-                        add(
-                            AppBar.OverflowAction(
-                                title = stringResource(MR.strings.action_edit_categories),
-                                onClick = onClickEditCategory,
-                            ),
-                        )
-                    }
-                    if (onClickMigrate != null) {
-                        add(
-                            AppBar.OverflowAction(
-                                title = stringResource(MR.strings.action_migrate),
-                                onClick = onClickMigrate,
-                            ),
-                        )
-                    }
-                    if (onClickShare != null) {
-                        add(
-                            AppBar.OverflowAction(
-                                title = stringResource(MR.strings.action_share),
-                                onClick = onClickShare,
-                            ),
-                        )
-                    }
-                    add(
-                        AppBar.OverflowAction(
-                            title = stringResource(MR.strings.action_notes),
-                            onClick = onClickEditNotes,
-                        ),
-                    )
-                    // SY -->
-                    if (onClickMerge != null) {
-                        add(
-                            AppBar.OverflowAction(
-                                title = stringResource(SYMR.strings.merge),
-                                onClick = onClickMerge,
-                            ),
-                        )
-                    }
-                    if (onClickEditInfo != null) {
-                        add(
-                            AppBar.OverflowAction(
-                                title = stringResource(SYMR.strings.action_edit_info),
-                                onClick = onClickEditInfo,
-                            ),
-                        )
-                    }
-                    if (onClickRecommend != null) {
-                        add(
-                            AppBar.OverflowAction(
-                                title = stringResource(SYMR.strings.az_recommends),
-                                onClick = onClickRecommend,
-                            ),
-                        )
-                    }
-                    if (onClickMergedSettings != null) {
-                        add(
-                            AppBar.OverflowAction(
-                                title = stringResource(SYMR.strings.merge_settings),
-                                onClick = onClickMergedSettings,
-                            ),
-                        )
-                    }
-                    // SY <--
                }
-                    .build(),
-            )
-        },
-        isActionMode = isActionMode,
-        onCancelActionMode = onCancelActionMode,
-    )
+            },
+            colors = TopAppBarDefaults.topAppBarColors(
+                containerColor = MaterialTheme.colorScheme
+                    .surfaceColorAtElevation(3.dp)
+                    .copy(alpha = if (isActionMode) 1f else backgroundAlphaProvider()),
+            ),
+        )
+    }
 }
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MarkdownRender.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MarkdownRender.kt
@ -1,253 +0,0 @@
-package eu.kanade.presentation.manga.components
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.FirstBaseline
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.TextLinkStyles
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import com.mikepenz.markdown.coil3.Coil3ImageTransformerImpl
-import com.mikepenz.markdown.compose.LocalBulletListHandler
-import com.mikepenz.markdown.compose.Markdown
-import com.mikepenz.markdown.compose.components.markdownComponents
-import com.mikepenz.markdown.compose.elements.MarkdownBulletList
-import com.mikepenz.markdown.compose.elements.MarkdownDivider
-import com.mikepenz.markdown.compose.elements.MarkdownOrderedList
-import com.mikepenz.markdown.compose.elements.MarkdownTable
-import com.mikepenz.markdown.compose.elements.MarkdownTableHeader
-import com.mikepenz.markdown.compose.elements.MarkdownTableRow
-import com.mikepenz.markdown.compose.elements.MarkdownText
-import com.mikepenz.markdown.compose.elements.listDepth
-import com.mikepenz.markdown.model.DefaultMarkdownColors
-import com.mikepenz.markdown.model.DefaultMarkdownTypography
-import com.mikepenz.markdown.model.MarkdownAnnotator
-import com.mikepenz.markdown.model.MarkdownColors
-import com.mikepenz.markdown.model.MarkdownPadding
-import com.mikepenz.markdown.model.MarkdownTypography
-import com.mikepenz.markdown.model.markdownAnnotator
-import com.mikepenz.markdown.model.rememberMarkdownState
-import org.intellij.markdown.MarkdownTokenTypes.Companion.HTML_TAG
-import org.intellij.markdown.flavours.MarkdownFlavourDescriptor
-import org.intellij.markdown.flavours.commonmark.CommonMarkFlavourDescriptor
-import org.intellij.markdown.flavours.commonmark.CommonMarkMarkerProcessor
-import org.intellij.markdown.flavours.gfm.table.GitHubTableMarkerProvider
-import org.intellij.markdown.parser.MarkerProcessor
-import org.intellij.markdown.parser.MarkerProcessorFactory
-import org.intellij.markdown.parser.ProductionHolder
-import org.intellij.markdown.parser.constraints.CommonMarkdownConstraints
-import org.intellij.markdown.parser.constraints.MarkdownConstraints
-import org.intellij.markdown.parser.markerblocks.MarkerBlockProvider
-import org.intellij.markdown.parser.markerblocks.providers.AtxHeaderProvider
-import org.intellij.markdown.parser.markerblocks.providers.BlockQuoteProvider
-import org.intellij.markdown.parser.markerblocks.providers.CodeBlockProvider
-import org.intellij.markdown.parser.markerblocks.providers.CodeFenceProvider
-import org.intellij.markdown.parser.markerblocks.providers.HorizontalRuleProvider
-import org.intellij.markdown.parser.markerblocks.providers.ListMarkerProvider
-import org.intellij.markdown.parser.markerblocks.providers.SetextHeaderProvider
-import tachiyomi.presentation.core.components.material.padding
-
-@Composable
-fun MarkdownRender(
-    content: String,
-    modifier: Modifier = Modifier,
-    flavour: MarkdownFlavourDescriptor = SimpleMarkdownFlavourDescriptor,
-    annotator: MarkdownAnnotator = remember { markdownAnnotator() },
-) {
-    Markdown(
-        markdownState = rememberMarkdownState(
-            content = content,
-            flavour = flavour,
-            immediate = true,
-        ),
-        annotator = annotator,
-        colors = getMarkdownColors(),
-        typography = getMarkdownTypography(),
-        padding = markdownPadding,
-        components = markdownComponents,
-        imageTransformer = Coil3ImageTransformerImpl,
-        modifier = modifier,
-    )
-}
-
-@Composable
-@ReadOnlyComposable
-private fun getMarkdownColors(): MarkdownColors {
-    val codeBackground = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.1f)
-    return DefaultMarkdownColors(
-        text = MaterialTheme.colorScheme.onSurface,
-        codeText = Color.Unspecified,
-        inlineCodeText = Color.Unspecified,
-        linkText = Color.Unspecified,
-        codeBackground = codeBackground,
-        inlineCodeBackground = codeBackground,
-        dividerColor = MaterialTheme.colorScheme.outlineVariant,
-        tableText = Color.Unspecified,
-        tableBackground = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.05f),
-    )
-}
-
-@Composable
-@ReadOnlyComposable
-private fun getMarkdownTypography(): MarkdownTypography {
-    val link = MaterialTheme.typography.bodyMedium.copy(
-        color = MaterialTheme.colorScheme.primary,
-        fontWeight = FontWeight.Bold,
-    )
-    return DefaultMarkdownTypography(
-        h1 = MaterialTheme.typography.headlineMedium,
-        h2 = MaterialTheme.typography.headlineSmall,
-        h3 = MaterialTheme.typography.titleLarge,
-        h4 = MaterialTheme.typography.titleMedium,
-        h5 = MaterialTheme.typography.titleSmall,
-        h6 = MaterialTheme.typography.bodyLarge,
-        text = MaterialTheme.typography.bodyMedium,
-        code = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace),
-        inlineCode = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace),
-        quote = MaterialTheme.typography.bodyMedium.plus(SpanStyle(fontStyle = FontStyle.Italic)),
-        paragraph = MaterialTheme.typography.bodyMedium,
-        ordered = MaterialTheme.typography.bodyMedium,
-        bullet = MaterialTheme.typography.bodyMedium,
-        list = MaterialTheme.typography.bodyMedium,
-        link = link,
-        textLink = TextLinkStyles(style = link.toSpanStyle()),
-        table = MaterialTheme.typography.bodyMedium,
-    )
-}
-
-private val markdownPadding = object : MarkdownPadding {
-    override val block: Dp = 2.dp
-    override val blockQuote: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 0.dp)
-    override val blockQuoteBar: PaddingValues.Absolute = PaddingValues.Absolute(
-        left = 4.dp,
-        top = 2.dp,
-        right = 4.dp,
-        bottom = 2.dp,
-    )
-    override val blockQuoteText: PaddingValues = PaddingValues(vertical = 4.dp)
-    override val codeBlock: PaddingValues = PaddingValues(8.dp)
-    override val list: Dp = 0.dp
-    override val listIndent: Dp = 8.dp
-    override val listItemBottom: Dp = 0.dp
-    override val listItemTop: Dp = 0.dp
-}
-
-private val markdownComponents = markdownComponents(
-    horizontalRule = {
-        MarkdownDivider(
-            modifier = Modifier
-                .padding(vertical = MaterialTheme.padding.extraSmall)
-                .fillMaxWidth(),
-        )
-    },
-    orderedList = { ol ->
-        Column(modifier = Modifier.padding(start = MaterialTheme.padding.small)) {
-            MarkdownOrderedList(
-                content = ol.content,
-                node = ol.node,
-                style = ol.typography.ordered,
-                depth = ol.listDepth,
-                markerModifier = { Modifier.alignBy(FirstBaseline) },
-                listModifier = { Modifier.alignBy(FirstBaseline) },
-            )
-        }
-    },
-    unorderedList = { ul ->
-        val markers = listOf("•", "◦", "▸", "▹")
-
-        CompositionLocalProvider(
-            LocalBulletListHandler provides { _, _, _, _, _ -> "${markers[ul.listDepth % markers.size]} " },
-        ) {
-            Column(modifier = Modifier.padding(start = MaterialTheme.padding.small)) {
-                MarkdownBulletList(
-                    content = ul.content,
-                    node = ul.node,
-                    style = ul.typography.bullet,
-                    markerModifier = { Modifier.alignBy(FirstBaseline) },
-                    listModifier = { Modifier.alignBy(FirstBaseline) },
-                )
-            }
-        }
-    },
-    table = { t ->
-        MarkdownTable(
-            content = t.content,
-            node = t.node,
-            style = t.typography.text,
-            headerBlock = { content, header, tableWidth, style ->
-                MarkdownTableHeader(
-                    content = content,
-                    header = header,
-                    tableWidth = tableWidth,
-                    style = style,
-                    maxLines = Int.MAX_VALUE,
-                )
-            },
-            rowBlock = { content, header, tableWidth, style ->
-                MarkdownTableRow(
-                    content = content,
-                    header = header,
-                    tableWidth = tableWidth,
-                    style = style,
-                    maxLines = Int.MAX_VALUE,
-                )
-            },
-        )
-    },
-    custom = { type, model ->
-        if (type in DISALLOWED_MARKDOWN_TYPES) {
-            MarkdownText(
-                content = model.content.substring(model.node.startOffset, model.node.endOffset),
-                style = model.typography.text,
-            )
-        }
-    },
-)
-
-private object SimpleMarkdownFlavourDescriptor : CommonMarkFlavourDescriptor() {
-    override val markerProcessorFactory: MarkerProcessorFactory = SimpleMarkdownProcessFactory
-}
-
-private object SimpleMarkdownProcessFactory : MarkerProcessorFactory {
-    override fun createMarkerProcessor(productionHolder: ProductionHolder): MarkerProcessor<*> {
-        return SimpleMarkdownMarkerProcessor(productionHolder, CommonMarkdownConstraints.BASE)
-    }
-}
-
-/**
- * Like `CommonMarkFlavour`, but with html blocks and reference links removed and
- * table support added
- */
-private class SimpleMarkdownMarkerProcessor(
-    productionHolder: ProductionHolder,
-    constraints: MarkdownConstraints,
-) : CommonMarkMarkerProcessor(productionHolder, constraints) {
-    private val markerBlockProviders = listOf(
-        CodeBlockProvider(),
-        HorizontalRuleProvider(),
-        CodeFenceProvider(),
-        SetextHeaderProvider(),
-        BlockQuoteProvider(),
-        ListMarkerProvider(),
-        AtxHeaderProvider(),
-        GitHubTableMarkerProvider(),
-    )
-
-    override fun getMarkerBlockProviders(): List<MarkerBlockProvider<StateInfo>> {
-        return markerBlockProviders
-    }
-}
-
-val DISALLOWED_MARKDOWN_TYPES = arrayOf(HTML_TAG)
--- a/app/src/main/java/eu/kanade/presentation/manga/components/NamespaceTags.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/NamespaceTags.kt
@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.LocalMinimumInteractiveComponentEnforcement
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SuggestionChip
 import androidx.compose.material3.Surface
@ -141,7 +141,7 @@ fun TagsChip(
    border: ChipBorder? = SuggestionChipDefaults.suggestionChipBorder(),
    borderM3: BorderStroke? = SuggestionChipDefaultsM3.suggestionChipBorder(enabled = true),
 ) {
-    CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides 0.dp) {
+    CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) {
        if (onClick != null) {
            SuggestionChip(
                modifier = modifier,
--- a/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt
@ -44,7 +44,7 @@ import tachiyomi.presentation.core.i18n.stringResource

@Composable
 private fun PagePreviewLoading(
-    setMaxWidth: (Dp) -> Unit,
+    setMaxWidth: (Dp) -> Unit
 ) {
    val density = LocalDensity.current
    Box(
@ -63,7 +63,7 @@ private fun PagePreviewLoading(
@Composable
 private fun PagePreviewRow(
    onOpenPage: (Int) -> Unit,
-    items: ImmutableList<PagePreview>,
+    items: ImmutableList<PagePreview>
 ) {
    Row(
        modifier = Modifier
@ -88,7 +88,7 @@ private fun PagePreviewMore(
 ) {
    Box(
        modifier = Modifier.fillMaxWidth(),
-        contentAlignment = Alignment.Center,
+        contentAlignment = Alignment.Center
    ) {
        TextButton(onClick = onMorePreviewsClicked) {
            Text(stringResource(SYMR.strings.more_previews))
@ -116,7 +116,7 @@ fun PagePreviews(
                pagePreviewState.pagePreviews.take(rowCount * itemPerRowCount).chunked(itemPerRowCount).forEach {
                    PagePreviewRow(
                        onOpenPage = onOpenPage,
-                        items = remember(it) { it.toImmutableList() },
+                        items = remember(it) { it.toImmutableList() }
                    )
                }

@ -153,7 +153,7 @@ fun LazyListScope.PagePreviewItems(
            ) {
                PagePreviewRow(
                    onOpenPage = onOpenPage,
-                    items = remember(it) { it.toImmutableList() },
+                    items = remember(it) { it.toImmutableList() }
                )
            }
            item(
--- a/app/src/main/java/eu/kanade/presentation/manga/components/ScanlatorFilterDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/ScanlatorFilterDialog.kt
@ -32,6 +32,8 @@ import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.TextButton
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
+import tachiyomi.presentation.core.util.isScrolledToEnd
+import tachiyomi.presentation.core.util.isScrolledToStart

@Composable
 fun ScanlatorFilterDialog(
@ -95,8 +97,8 @@ fun ScanlatorFilterDialog(
                        }
                    }
                }
-                if (state.canScrollBackward) HorizontalDivider(modifier = Modifier.align(Alignment.TopCenter))
-                if (state.canScrollForward) HorizontalDivider(modifier = Modifier.align(Alignment.BottomCenter))
+                if (!state.isScrolledToStart()) HorizontalDivider(modifier = Modifier.align(Alignment.TopCenter))
+                if (!state.isScrolledToEnd()) HorizontalDivider(modifier = Modifier.align(Alignment.BottomCenter))
            }
        },
        properties = DialogProperties(
--- a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
@ -1,6 +1,13 @@
 package eu.kanade.presentation.more

+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
 import androidx.compose.material.icons.automirrored.outlined.Label
@ -22,6 +29,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.vectorResource
+import eu.kanade.presentation.components.WarningBanner
 import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget
 import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
 import eu.kanade.tachiyomi.R
@ -41,6 +49,7 @@ fun MoreScreen(
    onDownloadedOnlyChange: (Boolean) -> Unit,
    incognitoMode: Boolean,
    onIncognitoModeChange: (Boolean) -> Unit,
+    isFDroid: Boolean,
    // SY -->
    showNavUpdates: Boolean,
    showNavHistory: Boolean,
@ -57,7 +66,26 @@ fun MoreScreen(
 ) {
    val uriHandler = LocalUriHandler.current

-    Scaffold { contentPadding ->
+    Scaffold(
+        topBar = {
+            Column(
+                modifier = Modifier.windowInsetsPadding(
+                    WindowInsets.systemBars.only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal),
+                ),
+            ) {
+                if (isFDroid) {
+                    WarningBanner(
+                        textRes = MR.strings.fdroid_warning,
+                        modifier = Modifier.clickable {
+                            uriHandler.openUri(
+                                "https://mihon.app/docs/faq/general#how-do-i-update-from-the-f-droid-builds",
+                            )
+                        },
+                    )
+                }
+            }
+        },
+    ) { contentPadding ->
        ScrollbarLazyColumn(
            modifier = Modifier.padding(contentPadding),
        ) {
--- a/app/src/main/java/eu/kanade/presentation/more/NewUpdateScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/NewUpdateScreen.kt
@ -1,6 +1,5 @@
 package eu.kanade.presentation.more

-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@ -14,10 +13,13 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.tooling.preview.PreviewLightDark
-import eu.kanade.presentation.manga.components.MarkdownRender
+import com.halilibo.richtext.markdown.Markdown
+import com.halilibo.richtext.ui.RichTextStyle
+import com.halilibo.richtext.ui.material3.RichText
+import com.halilibo.richtext.ui.string.RichTextStringStyle
 import eu.kanade.presentation.theme.TachiyomiPreviewTheme
-import org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
@ -40,15 +42,17 @@ fun NewUpdateScreen(
        rejectText = stringResource(MR.strings.action_not_now),
        onRejectClick = onRejectUpdate,
    ) {
-        Column(
+        RichText(
            modifier = Modifier
                .fillMaxWidth()
                .padding(vertical = MaterialTheme.padding.large),
+            style = RichTextStyle(
+                stringStyle = RichTextStringStyle(
+                    linkStyle = SpanStyle(color = MaterialTheme.colorScheme.primary),
+                ),
+            ),
        ) {
-            MarkdownRender(
-                content = changelogInfo,
-                flavour = GFMFlavourDescriptor(),
-            )
+            Markdown(content = changelogInfo)

            TextButton(
                onClick = onOpenInBrowser,
@ -71,7 +75,7 @@ private fun NewUpdateScreenPreview() {
            changelogInfo = """
                ## Yay
                Foobar
-
+                
                ### More info
                - Hello
                - World
--- a/app/src/main/java/eu/kanade/presentation/more/onboarding/OnboardingScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/onboarding/OnboardingScreen.kt
@ -42,9 +42,7 @@ fun OnboardingScreen(
    }
    val isLastStep = currentStep == steps.lastIndex

-    BackHandler(enabled = currentStep != 0) {
-        currentStep--
-    }
+    BackHandler(enabled = currentStep != 0, onBack = { currentStep-- })

    InfoScreen(
        icon = Icons.Outlined.RocketLaunch,
--- a/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt
@ -4,6 +4,7 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Build
 import android.os.PowerManager
 import android.provider.Settings
@ -13,13 +14,11 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@ -29,25 +28,19 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.dp
 import androidx.core.content.getSystemService
-import androidx.core.net.toUri
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.compose.LocalLifecycleOwner
 import eu.kanade.presentation.util.rememberRequestPackageInstallsPermissionState
-import eu.kanade.tachiyomi.core.security.PrivacyPreferences
 import eu.kanade.tachiyomi.util.system.launchRequestPackageInstallsPermission
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.collectAsState
 import tachiyomi.presentation.core.util.secondaryItemAlpha
-import uy.kohesive.injekt.injectLazy

 internal class PermissionStep : OnboardingStep {

-    private val privacyPreferences: PrivacyPreferences by injectLazy()
-
    private var notificationGranted by mutableStateOf(false)
    private var batteryGranted by mutableStateOf(false)

@ -80,7 +73,7 @@ internal class PermissionStep : OnboardingStep {
        }

        Column {
-            PermissionCheckbox(
+            PermissionItem(
                title = stringResource(MR.strings.onboarding_permission_install_apps),
                subtitle = stringResource(MR.strings.onboarding_permission_install_apps_description),
                granted = installGranted,
@ -96,7 +89,7 @@ internal class PermissionStep : OnboardingStep {
                        // no-op. resulting checks is being done on resume
                    },
                )
-                PermissionCheckbox(
+                PermissionItem(
                    title = stringResource(MR.strings.onboarding_permission_notifications),
                    subtitle = stringResource(MR.strings.onboarding_permission_notifications_description),
                    granted = notificationGranted,
@ -104,41 +97,18 @@ internal class PermissionStep : OnboardingStep {
                )
            }

-            PermissionCheckbox(
+            PermissionItem(
                title = stringResource(MR.strings.onboarding_permission_ignore_battery_opts),
                subtitle = stringResource(MR.strings.onboarding_permission_ignore_battery_opts_description),
                granted = batteryGranted,
                onButtonClick = {
                    @SuppressLint("BatteryLife")
                    val intent = Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS).apply {
-                        data = "package:${context.packageName}".toUri()
+                        data = Uri.parse("package:${context.packageName}")
                    }
                    context.startActivity(intent)
                },
            )
-
-            HorizontalDivider(
-                modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp),
-                color = MaterialTheme.colorScheme.onPrimaryContainer,
-            )
-
-            val crashlyticsPref = privacyPreferences.crashlytics()
-            val crashlytics by crashlyticsPref.collectAsState()
-            PermissionSwitch(
-                title = stringResource(MR.strings.onboarding_permission_crashlytics),
-                subtitle = stringResource(MR.strings.onboarding_permission_crashlytics_description),
-                granted = crashlytics,
-                onToggleChange = crashlyticsPref::set,
-            )
-
-            val analyticsPref = privacyPreferences.analytics()
-            val analytics by analyticsPref.collectAsState()
-            PermissionSwitch(
-                title = stringResource(MR.strings.onboarding_permission_analytics),
-                subtitle = stringResource(MR.strings.onboarding_permission_analytics_description),
-                granted = analytics,
-                onToggleChange = analyticsPref::set,
-            )
        }
    }

@ -157,7 +127,7 @@ internal class PermissionStep : OnboardingStep {
    }

    @Composable
-    private fun PermissionCheckbox(
+    private fun PermissionItem(
        title: String,
        subtitle: String,
        granted: Boolean,
@ -187,26 +157,4 @@ internal class PermissionStep : OnboardingStep {
            colors = ListItemDefaults.colors(containerColor = Color.Transparent),
        )
    }
-
-    @Composable
-    private fun PermissionSwitch(
-        title: String,
-        subtitle: String,
-        granted: Boolean,
-        modifier: Modifier = Modifier,
-        onToggleChange: (Boolean) -> Unit,
-    ) {
-        ListItem(
-            modifier = modifier,
-            headlineContent = { Text(text = title) },
-            supportingContent = { Text(text = subtitle) },
-            trailingContent = {
-                Switch(
-                    checked = granted,
-                    onCheckedChange = onToggleChange,
-                )
-            },
-            colors = ListItemDefaults.colors(containerColor = Color.Transparent),
-        )
-    }
 }
--- a/app/src/main/java/eu/kanade/presentation/more/settings/Preference.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/Preference.kt
@ -1,6 +1,5 @@
 package eu.kanade.presentation.more.settings

-import androidx.annotation.IntRange
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.vector.ImageVector
@ -21,7 +20,7 @@ sealed class Preference {

        // SY <--
        abstract val icon: ImageVector?
-        abstract val onValueChanged: suspend (value: T) -> Boolean
+        abstract val onValueChanged: suspend (newValue: T) -> Boolean

        /**
         * A basic [PreferenceItem] that only displays texts.
@ -29,58 +28,57 @@ sealed class Preference {
        data class TextPreference(
            override val title: String,
            override val subtitle: CharSequence? = null,
+            override val icon: ImageVector? = null,
            override val enabled: Boolean = true,
+            override val onValueChanged: suspend (newValue: String) -> Boolean = { true },
+
            val onClick: (() -> Unit)? = null,
-        ) : PreferenceItem<String>() {
-            override val icon: ImageVector? = null
-            override val onValueChanged: suspend (value: String) -> Boolean = { true }
-        }
+        ) : PreferenceItem<String>()

        /**
         * A [PreferenceItem] that provides a two-state toggleable option.
         */
        data class SwitchPreference(
-            val preference: PreferenceData<Boolean>,
+            val pref: PreferenceData<Boolean>,
            override val title: String,
            override val subtitle: CharSequence? = null,
+            override val icon: ImageVector? = null,
            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: Boolean) -> Boolean = { true },
-        ) : PreferenceItem<Boolean>() {
-            override val icon: ImageVector? = null
-        }
+            override val onValueChanged: suspend (newValue: Boolean) -> Boolean = { true },
+        ) : PreferenceItem<Boolean>()

        /**
         * A [PreferenceItem] that provides a slider to select an integer number.
         */
        data class SliderPreference(
            val value: Int,
-            override val title: String,
-            val valueRange: IntProgression = 0..1,
-            @IntRange(from = 0) val steps: Int = with(valueRange) { (last - first) - 1 },
+            val min: Int = 0,
+            val max: Int,
+            override val title: String = "",
            override val subtitle: String? = null,
+            override val icon: ImageVector? = null,
            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: Int) -> Boolean = { true },
-        ) : PreferenceItem<Int>() {
-            override val icon: ImageVector? = null
-        }
+            override val onValueChanged: suspend (newValue: Int) -> Boolean = { true },
+        ) : PreferenceItem<Int>()

        /**
         * A [PreferenceItem] that displays a list of entries as a dialog.
         */
        @Suppress("UNCHECKED_CAST")
        data class ListPreference<T>(
-            val preference: PreferenceData<T>,
-            val entries: ImmutableMap<T, String>,
+            val pref: PreferenceData<T>,
            override val title: String,
            override val subtitle: String? = "%s",
            val subtitleProvider: @Composable (value: T, entries: ImmutableMap<T, String>) -> String? =
                { v, e -> subtitle?.format(e[v]) },
            override val icon: ImageVector? = null,
            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: T) -> Boolean = { true },
+            override val onValueChanged: suspend (newValue: T) -> Boolean = { true },
+
+            val entries: ImmutableMap<T, String>,
        ) : PreferenceItem<T>() {
-            internal fun internalSet(value: Any) = preference.set(value as T)
-            internal suspend fun internalOnValueChanged(value: Any) = onValueChanged(value as T)
+            internal fun internalSet(newValue: Any) = pref.set(newValue as T)
+            internal suspend fun internalOnValueChanged(newValue: Any) = onValueChanged(newValue as T)

            @Composable
            internal fun internalSubtitleProvider(value: Any?, entries: ImmutableMap<out Any?, String>) =
@ -92,14 +90,15 @@ sealed class Preference {
         */
        data class BasicListPreference(
            val value: String,
-            val entries: ImmutableMap<String, String>,
            override val title: String,
            override val subtitle: String? = "%s",
            val subtitleProvider: @Composable (value: String, entries: ImmutableMap<String, String>) -> String? =
                { v, e -> subtitle?.format(e[v]) },
            override val icon: ImageVector? = null,
            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: String) -> Boolean = { true },
+            override val onValueChanged: suspend (newValue: String) -> Boolean = { true },
+
+            val entries: ImmutableMap<String, String>,
        ) : PreferenceItem<String>()

        /**
@ -107,51 +106,52 @@ sealed class Preference {
         * Multiple entries can be selected at the same time.
         */
        data class MultiSelectListPreference(
-            val preference: PreferenceData<Set<String>>,
-            val entries: ImmutableMap<String, String>,
+            val pref: PreferenceData<Set<String>>,
            override val title: String,
            override val subtitle: String? = "%s",
-            val subtitleProvider: @Composable (value: Set<String>, entries: ImmutableMap<String, String>) -> String? =
-                { v, e ->
-                    val combined = remember(v, e) {
-                        v.mapNotNull { e[it] }
-                            .joinToString()
-                            .takeUnless { it.isBlank() }
-                    }
-                        ?: stringResource(MR.strings.none)
-                    subtitle?.format(combined)
-                },
+            val subtitleProvider: @Composable (
+                value: Set<String>,
+                entries: ImmutableMap<String, String>,
+            ) -> String? = { v, e ->
+                val combined = remember(v) {
+                    v.map { e[it] }
+                        .takeIf { it.isNotEmpty() }
+                        ?.joinToString()
+                } ?: stringResource(MR.strings.none)
+                subtitle?.format(combined)
+            },
            override val icon: ImageVector? = null,
            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: Set<String>) -> Boolean = { true },
+            override val onValueChanged: suspend (newValue: Set<String>) -> Boolean = { true },
+
+            val entries: ImmutableMap<String, String>,
        ) : PreferenceItem<Set<String>>()

        /**
         * A [PreferenceItem] that shows a EditText in the dialog.
         */
        data class EditTextPreference(
-            val preference: PreferenceData<String>,
+            val pref: PreferenceData<String>,
            override val title: String,
            override val subtitle: String? = "%s",
+            override val icon: ImageVector? = null,
            override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: String) -> Boolean = { true },
-        ) : PreferenceItem<String>() {
-            override val icon: ImageVector? = null
-        }
+            override val onValueChanged: suspend (newValue: String) -> Boolean = { true },
+        ) : PreferenceItem<String>()

        /**
         * A [PreferenceItem] for individual tracker.
         */
        data class TrackerPreference(
            val tracker: Tracker,
+            override val title: String,
            val login: () -> Unit,
            val logout: () -> Unit,
        ) : PreferenceItem<String>() {
-            override val title: String = ""
            override val enabled: Boolean = true
            override val subtitle: String? = null
            override val icon: ImageVector? = null
-            override val onValueChanged: suspend (value: String) -> Boolean = { true }
+            override val onValueChanged: suspend (newValue: String) -> Boolean = { true }
        }

        data class InfoPreference(
@ -160,17 +160,17 @@ sealed class Preference {
            override val enabled: Boolean = true
            override val subtitle: String? = null
            override val icon: ImageVector? = null
-            override val onValueChanged: suspend (value: String) -> Boolean = { true }
+            override val onValueChanged: suspend (newValue: String) -> Boolean = { true }
        }

        data class CustomPreference(
            override val title: String,
-            val content: @Composable () -> Unit,
-        ) : PreferenceItem<Unit>() {
+            val content: @Composable (PreferenceItem<String>) -> Unit,
+        ) : PreferenceItem<String>() {
            override val enabled: Boolean = true
            override val subtitle: String? = null
            override val icon: ImageVector? = null
-            override val onValueChanged: suspend (value: Unit) -> Boolean = { true }
+            override val onValueChanged: suspend (newValue: String) -> Boolean = { true }
        }
    }

--- a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt
@ -5,8 +5,6 @@ import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.collectAsState
@ -14,20 +12,16 @@ import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.structuralEqualityPolicy
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.more.settings.widget.EditTextPreferenceWidget
 import eu.kanade.presentation.more.settings.widget.InfoWidget
 import eu.kanade.presentation.more.settings.widget.ListPreferenceWidget
 import eu.kanade.presentation.more.settings.widget.MultiSelectListPreferenceWidget
-import eu.kanade.presentation.more.settings.widget.PrefsHorizontalPadding
-import eu.kanade.presentation.more.settings.widget.PrefsVerticalPadding
 import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget
 import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
-import eu.kanade.presentation.more.settings.widget.TitleFontSize
 import eu.kanade.presentation.more.settings.widget.TrackingPreferenceWidget
 import kotlinx.coroutines.launch
-import tachiyomi.presentation.core.components.BaseSliderItem
+import tachiyomi.presentation.core.components.SliderItem
 import tachiyomi.presentation.core.util.collectAsState

 val LocalPreferenceHighlighted = compositionLocalOf(structuralEqualityPolicy()) { false }
@ -66,7 +60,7 @@ internal fun PreferenceItem(
    ) {
        when (item) {
            is Preference.PreferenceItem.SwitchPreference -> {
-                val value by item.preference.collectAsState()
+                val value by item.pref.collectAsState()
                SwitchPreferenceWidget(
                    title = item.title,
                    subtitle = item.subtitle,
@ -75,33 +69,29 @@ internal fun PreferenceItem(
                    onCheckedChanged = { newValue ->
                        scope.launch {
                            if (item.onValueChanged(newValue)) {
-                                item.preference.set(newValue)
+                                item.pref.set(newValue)
                            }
                        }
                    },
                )
            }
            is Preference.PreferenceItem.SliderPreference -> {
-                BaseSliderItem(
+                // TODO: use different composable?
+                SliderItem(
                    label = item.title,
+                    min = item.min,
+                    max = item.max,
                    value = item.value,
-                    valueRange = item.valueRange,
                    valueText = item.subtitle.takeUnless { it.isNullOrEmpty() } ?: item.value.toString(),
-                    steps = item.steps,
-                    labelStyle = MaterialTheme.typography.titleLarge.copy(fontSize = TitleFontSize),
                    onChange = {
                        scope.launch {
                            item.onValueChanged(it)
                        }
                    },
-                    modifier = Modifier.padding(
-                        horizontal = PrefsHorizontalPadding,
-                        vertical = PrefsVerticalPadding,
-                    ),
                )
            }
            is Preference.PreferenceItem.ListPreference<*> -> {
-                val value by item.preference.collectAsState()
+                val value by item.pref.collectAsState()
                ListPreferenceWidget(
                    value = value,
                    title = item.title,
@ -128,14 +118,14 @@ internal fun PreferenceItem(
                )
            }
            is Preference.PreferenceItem.MultiSelectListPreference -> {
-                val values by item.preference.collectAsState()
+                val values by item.pref.collectAsState()
                MultiSelectListPreferenceWidget(
                    preference = item,
                    values = values,
                    onValuesChange = { newValues ->
                        scope.launch {
                            if (item.onValueChanged(newValues)) {
-                                item.preference.set(newValues.toMutableSet())
+                                item.pref.set(newValues.toMutableSet())
                            }
                        }
                    },
@ -150,7 +140,7 @@ internal fun PreferenceItem(
                )
            }
            is Preference.PreferenceItem.EditTextPreference -> {
-                val values by item.preference.collectAsState()
+                val values by item.pref.collectAsState()
                EditTextPreferenceWidget(
                    title = item.title,
                    subtitle = item.subtitle,
@ -158,7 +148,7 @@ internal fun PreferenceItem(
                    value = values,
                    onConfirm = {
                        val accepted = item.onValueChanged(it)
-                        if (accepted) item.preference.set(it)
+                        if (accepted) item.pref.set(it)
                        accepted
                    },
                )
@ -177,7 +167,7 @@ internal fun PreferenceItem(
                InfoWidget(text = item.title)
            }
            is Preference.PreferenceItem.CustomPreference -> {
-                item.content()
+                item.content(item)
            }
        }
    }
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt
@ -13,13 +13,13 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.window.DialogProperties
 import eu.kanade.tachiyomi.util.system.toast
 import exh.log.xLogE
-import exh.source.ExhPreferences
 import exh.uconfig.EHConfigurator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 import tachiyomi.core.common.util.lang.launchUI
+import tachiyomi.domain.UnsortedPreferences
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.i18n.stringResource
@ -29,8 +29,8 @@ import kotlin.time.Duration.Companion.seconds

@Composable
 fun ConfigureExhDialog(run: Boolean, onRunning: () -> Unit) {
-    val exhPreferences = remember {
-        Injekt.get<ExhPreferences>()
+    val unsortedPreferences = remember {
+        Injekt.get<UnsortedPreferences>()
    }
    var warnDialogOpen by remember { mutableStateOf(false) }
    var configureDialogOpen by remember { mutableStateOf(false) }
@ -38,7 +38,7 @@ fun ConfigureExhDialog(run: Boolean, onRunning: () -> Unit) {

    LaunchedEffect(run) {
        if (run) {
-            if (exhPreferences.exhShowSettingsUploadWarning().get()) {
+            if (unsortedPreferences.exhShowSettingsUploadWarning().get()) {
                warnDialogOpen = true
            } else {
                configureDialogOpen = true
@ -57,7 +57,7 @@ fun ConfigureExhDialog(run: Boolean, onRunning: () -> Unit) {
            confirmButton = {
                TextButton(
                    onClick = {
-                        exhPreferences.exhShowSettingsUploadWarning().set(false)
+                        unsortedPreferences.exhShowSettingsUploadWarning().set(false)
                        configureDialogOpen = true
                        warnDialogOpen = false
                    },
--- a/Show More
+++ b/Show More