Update dependency org.jetbrains.intellij.deps.jcef:jcef to v144.0.15-g72717cf-chromium-144.0.7559.172-api-1.21-262-b37

2026-06-30 17:34:39 -05:00 · 2026-05-23 15:43:39 +00:00
153 changed files with 2078 additions and 6432 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,8 +11,4 @@ ktlint_standard_if-else-wrapping=disabled
 ktlint_standard_no-consecutive-comments=disabled

 [**/generated/**]
-ktlint=disabled
-
-[*.json]
-indent_size=2
-indent_style = space
+ktlint=disabled
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -42,7 +42,7 @@ body:
      label: Suwayomi-Server version
      description: You can find your Suwayomi-Server version in **More → About**.
      placeholder: |
-        Example: "v2.3.2223"
+        Example: "v2.2.2100"
    validations:
      required: true

@@ -143,13 +143,11 @@ body:
      options:
        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
          required: true
-        - label: I have checked the ongoing preview changelog of **[Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md)** and **[Suwayomi-Server](https://github.com/Suwayomi/Suwayomi-Server/blob/master/CHANGELOG.md)** and this bug has **NOT** been listed as fixed
-          required: true
        - label: I have written a short but informative title (ideally less than ~100 characters).
          required: true
        - label: I have tried the troubleshooting guide described in [README.md](https://github.com/Suwayomi/Suwayomi-Server?tab=readme-ov-file#troubleshooting-and-support)
          required: true
-        - label: I have updated the (**[Suwayomi-WebUI](https://github.com/suwayomi/suwayomi-webui/releases/latest)** and **[Suwayomi-Server](https://github.com/suwayomi/suwayomi-server/releases/latest)**) to the latest versions
+        - label: I have updated to the **[latest version](https://github.com/suwayomi/suwayomi-server/releases/latest)**.
          required: true
        - label: I have filled out all of the requested information in this form, including specific version numbers.
          required: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -31,7 +31,7 @@ body:
          required: true
        - label: I have written a short but informative title (ideally less than ~100 characters).
          required: true
-        - label: I have updated the (**[Suwayomi-WebUI](https://github.com/suwayomi/suwayomi-webui/releases/latest)** and **[Suwayomi-Server](https://github.com/suwayomi/suwayomi-server/releases/latest)**) to the latest versions
+        - label: I have updated to the **[latest version](https://github.com/suwayomi/suwayomi-server/releases/latest)**.
          required: true
        - label: I have filled out all of the requested information in this form, including specific version numbers.
          required: true
--- a/.github/workflows/wiki.yml
+++ b/.github/workflows/wiki.yml
@@ -24,8 +24,6 @@ jobs:
        with:
          repository: ${{github.repository}}
          path: ${{github.repository}}
-          fetch-depth: 0 # fetch history & tags to determine stable version
-          fetch-tags: true

      - name: Checkout Wiki
        uses: actions/checkout@v6
@@ -38,13 +36,6 @@ jobs:
          set -e
          cd $GITHUB_WORKSPACE/${{github.repository}}.wiki
          cp -r $GITHUB_WORKSPACE/${{github.repository}}/docs/* .
-          
-          stable="$(git -C $GITHUB_WORKSPACE/${{github.repository}} describe --abbrev=0 --tags)"
-          if ! git -C $GITHUB_WORKSPACE/${{github.repository}} log --exit-code --pretty= "$stable.." -- docs/Configuring-Suwayomi‐Server.md; then
-            echo "Changes to config detected, embedding link to stable"
-            sed -i '1s/^/> [!WARNING]\n> This document describes the settings available in the preview version. Please head to ['$stable'](https:\/\/github.com\/Suwayomi\/Suwayomi-Server\/blob\/'$stable'\/docs\/Configuring-Suwayomi%E2%80%90Server.md) for the current stable version\n\n/' Configuring-Suwayomi‐Server.md
-          fi
-          
          git config --local user.email "action@github.com"
          git config --local user.name "GitHub Action"
          git add .
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CefHelper.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CefHelper.kt
@@ -21,7 +21,7 @@ object CefHelper {
    }

    fun waitForInit() =
-        callbackFlow {
+        callbackFlow<CefApp> {
            val app = cefApp.first { it.isFailure || it.getOrThrow() != null }.getOrThrow()!!
            app.onInitialization {
                logger.debug { "CEF: Initialization state $it" }
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/KcefWebViewProvider.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/KcefWebViewProvider.kt
@@ -68,7 +68,6 @@ import org.cef.handler.CefLoadHandler
 import org.cef.handler.CefLoadHandlerAdapter
 import org.cef.handler.CefMessageRouterHandlerAdapter
 import org.cef.handler.CefPermissionHandler
-import org.cef.handler.CefRenderHandlerAdapter
 import org.cef.handler.CefRequestHandler
 import org.cef.handler.CefRequestHandlerAdapter
 import org.cef.handler.CefResourceHandler
@@ -83,13 +82,10 @@ import org.cef.network.CefPostDataElement
 import org.cef.network.CefRequest
 import org.cef.network.CefResponse
 import org.koin.mp.KoinPlatformTools
-import java.awt.Rectangle
 import java.io.BufferedWriter
 import java.io.File
 import java.io.IOException
-import java.nio.ByteBuffer
 import java.util.concurrent.Executor
-import javax.swing.JPanel
 import kotlin.math.min
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.declaredMemberFunctions
@@ -101,7 +97,6 @@ class KcefWebViewProvider(
    private val settings = KcefWebSettings()
    private var viewClient = WebViewClient()
    private var chromeClient = WebChromeClient()
-    private val renderHandler = RenderHandler()
    private val mappings: MutableList<FunctionMapping> = mutableListOf()
    private val urlHttpMapping: MutableMap<String, String> = mutableMapOf()
    private var initialRequestData: InitialRequestData? = null
@@ -527,21 +522,6 @@ class KcefWebViewProvider(
        }
    }

-    private class RenderHandler : CefRenderHandlerAdapter() {
-        override fun getViewRect(browser: CefBrowser): Rectangle = Rectangle(0, 0, 1280, 2856)
-
-        override fun onPaint(
-            browser: CefBrowser,
-            popup: Boolean,
-            dirtyRects: Array<Rectangle>,
-            buffer: ByteBuffer,
-            width: Int,
-            height: Int,
-        ) {
-            // do nothing
-        }
-    }
-
    override fun init(
        javaScriptInterfaces: Map<String, Any>?,
        privateBrowsing: Boolean,
@@ -637,7 +617,7 @@ class KcefWebViewProvider(
            kcefClient!!
                .createBrowser(
                    loadUrl,
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    CefRendering.OFFSCREEN,
                    false,
                ).apply {
                    // NOTE: Without this, we don't seem to be receiving any events
@@ -662,7 +642,7 @@ class KcefWebViewProvider(
            kcefClient!!
                .createBrowser(
                    url,
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    CefRendering.OFFSCREEN,
                    false,
                ).apply {
                    // NOTE: Without this, we don't seem to be receiving any events
@@ -696,7 +676,7 @@ class KcefWebViewProvider(
            kcefClient!!
                .createBrowser(
                    url,
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    CefRendering.OFFSCREEN,
                    false,
                ).apply {
                    // NOTE: Without this, we don't seem to be receiving any events
@@ -795,23 +775,15 @@ class KcefWebViewProvider(

    override fun getContentWidth(): Int = throw RuntimeException("Stub!")

-    override fun pauseTimers() {
-        Log.v(TAG, "pauseTimers: doing nothing")
-    }
+    override fun pauseTimers(): Unit = throw RuntimeException("Stub!")

-    override fun resumeTimers() {
-        Log.v(TAG, "resumeTimers: doing nothing")
-    }
+    override fun resumeTimers(): Unit = throw RuntimeException("Stub!")

-    override fun onPause() {
-        Log.v(TAG, "onPause: doing nothing")
-    }
+    override fun onPause(): Unit = throw RuntimeException("Stub!")

-    override fun onResume() {
-        Log.v(TAG, "onResume: doing nothing")
-    }
+    override fun onResume(): Unit = throw RuntimeException("Stub!")

-    override fun isPaused(): Boolean = false
+    override fun isPaused(): Boolean = throw RuntimeException("Stub!")

    override fun freeMemory(): Unit = throw RuntimeException("Stub!")

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,33 +9,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ### Added
 - .

-### Changed
- .
-
-### Fixed
- .
-
-## [v2.3.2223] + [WebUI: v20260509.01] - 2026-06-30
-
-### Major Changes
-
-#### Added [SyncYomi](https://github.com/syncyomi/syncyomi) support
-This allows you to sync your server manga with other Mihon-based forks! As long as the fork supports SyncYomi it can be sync with!
-
-#### Support Extension API v1.6
-This update allows Suwayomi to load and use v1.6 extensions, it is a minor improvement over the existing 1.4 extension API that cleans up much of what we had! It is the basis of future extension APIs that will allow for further development.
-
-This also allows us to move to Mihon's Extension Store system and replace our Extension Repo system. Old Extension Repos are still compatible and will be automatically migrated if they move to the Extension Store system.
-
-> [!WARNING]
-> Please back up your Extension Repos, because of the new Extension Stores system you may lose them in the update process and may need to re-add them.
-
-### Added
- (**Sync**) Added [SyncYomi](https://github.com/syncyomi/syncyomi) support
- (**OPDS**) Add option to skip chapter metadata feed providing direct stream/download links
- (**Extension/API**) Support Extensions API v1.6
- (**Tracker/API**) Add mutation to bind existing track record
-
 ### Changed
 - (**Database/H2**) Use the latest H2 database engine
 - (**Startup**) Crash on startup if an unrecoverable error happens
@@ -52,11 +25,9 @@ This also allows us to move to Mihon's Extension Store system and replace our Ex
 - (**Extension**) Do not indicate an update is available when the extension is not installed
 - (**Chapter**) Fix losing chapter data on failed chapter list update
 - (**Chapter**) Fix database error when fetching chapter updates
- (**Manga/API**) Fix "mangas" graphql query with active sorting and using a PostgreSQL database (QUERY "mangas")
+- (**Manga/API**) Fix "mangas" graphql query with active sorting and using a postgresql database (QUERY "mangas")
 - (**API**) Fix GraphQL `Filter` `notAll` and `notAny` being inversed
 - (**API**) Fix GraphQL `Filter` causing an UnsupportedOperationException when passing an empty list as a `Any` filter value
- (**Build**) Fix CURL failing silently in builds
- (**Backup/Database**) Fix backup creation slowdown when mapping chapters

 ## [v2.2.2100] + [WebUI: v20260508.01] - 2026-05-08

@@ -451,7 +422,6 @@ Huge thanks to @martinek who pulled the most of the weight this release!

 <!-- WEBUI LINKS -->

-[WebUI: v20260509.01]: https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md#2026050901-r3147---2026-05-09
 [WebUI: v20260508.01]: https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md#2026050801-r3136---2026-05-08
 [WebUI: v20251230.01]: https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md#2025123001-r2937---2025-12-30
 [WebUI: v20250801.01]: https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md#2025080101-r2717---2025-08-01
@@ -478,8 +448,7 @@ Huge thanks to @martinek who pulled the most of the weight this release!

 <!-- SERVER LINKS -->

-[unreleased]: https://github.com/suwayomi/suwayomi-server/compare/v2.3.2223...HEAD
-[v2.3.2223]: https://github.com/suwayomi/suwayomi-server/compare/v2.1.2100...v2.3.2223
+[unreleased]: https://github.com/suwayomi/suwayomi-server/compare/v2.2.2100...HEAD
 [v2.2.2100]: https://github.com/suwayomi/suwayomi-server/compare/v2.1.1867...v2.2.2100
 [v2.1.1867]: https://github.com/suwayomi/suwayomi-server/compare/v2.0.1727...v2.1.1867
 [v2.0.1727]: https://github.com/suwayomi/suwayomi-server/compare/v1.1.1...v2.0.1727
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
  - [Features](#features)
 - [Suwayomi client projects](#suwayomi-client-projects)
  - [Integrated clients](#integrated-clients)
-  - [Other clients](#other-clients-potentially-inactive-or-abandoned)
+  - [Other clients](#other-clients-potentially-inactive-or-abondend)
 - [Downloading and Running the app](#downloading-and-running-the-app)
  - [Using Operating System Specific Bundles](#using-operating-system-specific-bundles)
    - [Windows](#windows)
@@ -82,7 +82,6 @@ These clients are built-in options, and the server can keep them automatically u
 - [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): Desktop app (windows, linux, mac); can manage its own suwayomi server instance
 - [Tachidesk-Sorayomi](https://github.com/Suwayomi/Tachidesk-Sorayomi): Web app; Desktop app (windows, linux, mac); Android app; requires access to a running server
 - [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): Android app; iOS app Desktop app (linux); requires access to a running server
- [Suwayomi Client for KOReader](https://github.com/LK4D4/suwayomi.koplugin): KOReader plugin; works anywhere KOReader can run (Android, Kindle, Kobo, etc.); requires access to a running server

 # Downloading and Running the app
 ## Using Operating System Specific Bundles
@@ -110,13 +109,18 @@ Download the latest `linux-x64`(x86_64) release from [the releases section](http
 WebView support is implemented via [JCEF](https://github.com/JetBrains/jcef).
 This is optional, and is only necessary to support some extensions.

-To have a functional WebView, some X11 dependencies are required for rendering Chromium.
-These include `libxrender`, `libxcomposite` `libxdamage`, `libxkbcommon` and `libxtst`.
+To have a functional WebView, several dependencies are required; aside from X11 libraries necessary for rendering Chromium, some JNI bindings are necessary: gluegen and jogl (found in Ubuntu as `libgluegen2-jni` and `libjogl2-jni`).
+Note that on some systems (e.g. Ubuntu), the JNI libraries are not automatically found, see below.

 A CEF server is launched on startup, which loads the X11 libraries.
 If those are missing, you should see "Could not load 'jcef' library".
 If so, use `ldd ~/.local/share/Tachidesk/bin/kcef/libjcef.so | grep not` to figure out which libraries are not found on your system.

+The JNI bindings are only loaded when a browser is actually launched.
+This is done by extensions that rely on WebView, not by Suwayomi itself.
+If there is a problem loading the JNI libraries, you should see a message indicating the library and the search path.
+This search path includes the current working directory, if you do not want to modify system directories.
+
 Refer to the [Dockerfile](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/Dockerfile) for more details.

 Note that it is required to have an X session active and available to Suwayomi (i.e. `DISPLAY` is set).
--- a/buildSrc/src/main/kotlin/Constants.kt
+++ b/buildSrc/src/main/kotlin/Constants.kt
@@ -10,11 +10,11 @@ import java.io.BufferedReader
 const val MainClass = "suwayomi.tachidesk.MainKt"

 // should be bumped with each stable release
-val getTachideskVersion = { "v2.3.${getCommitCount()}" }
+val getTachideskVersion = { "v2.2.${getCommitCount()}" }

-val webUIRevisionTag = "r3147"
+val webUIRevisionTag = "r3136"

-val webviewJbrRelease = "jbr-release-25.0.3b508.4"
+val webviewJbrRelease = "jbr-release-25.0.3b475.60"

 private val getCommitCount = {
    runCatching {
--- a/docs/Configuring-Suwayomi‐Server.md
+++ b/docs/Configuring-Suwayomi‐Server.md
@@ -159,20 +159,15 @@ server.systemTrayEnabled = true
 server.maxLogFiles = 31
 server.maxLogFileSize = "10mb"
 server.maxLogFolderSize = "100mb"
-
+server.extensionRepos = []
+server.maxSourcesInParallel = 6
 ```
 - `server.debugLogsEnabled` controls whether if Suwayomi-Server should print more information while being run inside a Terminal/CMD/Powershell window. 
 - `server.systemTrayEnabled = true` whether if Suwayomi-Server should show a System Tray Icon, disabling this on headless servers is recommended.
 - `server.maxLogFiles = 31` sets the maximum number of days to keep files before they get deleted.
 - `server.maxLogFileSize = "10mb"` sets the maximum size of a log file - values are formatted like: 1 (bytes), 1KB (kilobytes), 1MB (megabytes), 1GB (gigabytes)
 - `server.maxLogFolderSize = "100mb"` sets the maximum size of all saved log files - values are formatted like: 1 (bytes), 1KB (kilobytes), 1MB (megabytes), 1GB (gigabytes)
-
-### Extension/Source
-```
-server.extensionStores = []
-server.maxSourcesInParallel = 6
-```
- `server.extensionStores` is a list of extension stores (previously called repositories) for custom sources. Uses the same format as Mihon; each entry is expected to be a string URL pointing to a JSON or PROTOBUF file representing the repository.
+- `server.extensionRepos` is a list of extension repositories for custom sources. Uses the same format as Mihon; each entry is expected to be a string URL pointing to a JSON file representing the repository.
 - `server.maxSourcesInParallel = 6` sets how many sources can do requests (updates, downloads) in parallel. Updates/downloads are grouped by source and all mangas of a source are updated/downloaded synchronously. Range: 1 <= n <= 20.

 ### Backup
@@ -237,7 +232,6 @@ server.opdsShowOnlyUnreadChapters = false
 server.opdsShowOnlyDownloadedChapters = false
 server.opdsChapterSortOrder = "DESC"
 server.opdsCbzMimetype = "MODERN"
-server.opdsSkipChapterMetadataFeed = false
 ```
 - `server.opdsUseBinaryFileSizes = false` controls if Suwayomi should display file sizes in binary units (KiB, MiB, GiB) or decimal (KB, MB, GB) in OPDS listings.
 - `server.opdsItemsPerPage = 50` sets the number of items per page in OPDS listings. Range: 10 <= n <= 5000.
@@ -247,7 +241,6 @@ server.opdsSkipChapterMetadataFeed = false
 - `server.opdsShowOnlyDownloadedChapters = false` controls if OPDS listings should only include downloaded chapters.
 - `server.opdsChapterSortOrder = "DESC"` sets the default chapter sort order in OPDS listings, either `"ASC"` or `"DESC"`
 - `server.opdsCbzMimetype = "MODERN"` controls which mimetype to use for CBZ downloads. This affects the offered link in OPDS, as well as the content type of the CBZ download. Allowed is MODERN (current IANA standard), LEGACY (deprecated mimetype for .cbz) and COMPATIBLE (deprecated mimetype for all comic archives). Use LEGACY or COMPATIBLE if older clients don't offer the chapter download (note that the chapter needs to first be downloaded in Suwayomi, before it is available in OPDS).
- `server.opdsSkipChapterMetadataFeed = false` controls if the metadata feed should be skipped. When enabled, download and streaming links are provided directly in the chapter list. This improves compatibility with automated downloaders (like KOReader). KoSync strategies are applied, but `PROMPT` conflicts are ignored (treating local progress as priority).

 ### KOReader Sync
 ```
@@ -283,28 +276,6 @@ server.useHikariConnectionPool = true
 - `server.databasePassword` the username with which to authenticate at the PostgreSQL instance.
 - `server.useHikariConnectionPool` use Hikari Connection Pool to connect to the database.

-### SyncYomi
-```
-server.syncYomiEnabled = false
-server.syncYomiHost = ""
-server.syncYomiApiKey = ""
-server.syncDataManga = true
-server.syncDataChapters = true
-server.syncDataTracking = true
-server.syncDataHistory = true
-server.syncDataCategories = true
-server.syncInterval = "0s"
-```
- `server.syncYomiEnabled` controls whether SyncYomi is enabled.
- `server.syncYomiHost` base URL of the SyncYomi server instance. e.g. `http://localhost:8282`
- `server.syncYomiApiKey` API key to authenticate with SyncYomi. You must use the same API key in both Suwayomi and SyncYomi.
- `server.syncDataManga` enables syncing manga.
- `server.syncDataChapters` enables syncing chapters.
- `server.syncDataTracking` enables syncing tracking data.
- `server.syncDataHistory` enables syncing reading history.
- `server.syncDataCategories` enables syncing categories.
- `server.syncInterval` interval between automatic sync operations. Use `0s` to disable.
-
 **Note:** The example [docker-compose.yml file](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/docker-compose.yml) contains everything you need to get started with Suwayomi+PostgreSQL. Please be aware that PostgreSQL support is currently still in beta.

 **Note:** These settings are excluded from backups, so a backup can be used to easily switch database installations by setting up the connection first, then restoring the backup.
--- a/docs/Troubleshooting.md
+++ b/docs/Troubleshooting.md
@@ -52,29 +52,6 @@ Solutions:
    - If the WebView still does not work after a restart, your installation is incomplete. On Linux, refer to [the README](https://github.com/Suwayomi/Suwayomi-Server#webview-support-gnulinux).


-## Flaresolverr required
-
- `java.io.IOException: Cloudflare bypass currently disabled`
-
-The source you are using has enabled CloudFlare's bot protection.
-If you open the source's website in your browser, you should see the "Confirm I'm human" page.
-
-Solution:
- Download and set up [Flaresolverr](https://github.com/FlareSolverr/FlareSolverr) or [Byparr](https://github.com/ThePhaseless/Byparr). Make sure to run Flaresolverr/Byparr every time you use this source.
-
-
-## Flaresolverr not running
-
- `java.io.IOException: Failed to connect to localhost/[0:0:0:0:0:0:0:1]:8191`
-
-You have configured Flaresolverr by enabling the `server.flareSolverrEnabled` setting, but Flaresolverr is not installed and/or running.
-
-Solutions:
- Install Flaresolverr if you haven't already (see previous section). Then ensure it is running (Windows: do not close the console window!).
- If it is running, ensure the configured url in `server.flareSolverrUrl` is correct. There is usually no need to change this.
- If it is running and the url is correct, check your firewall settings, your system may be blocking access to Flaresolverr.
-
-
 ## General Troubleshooting
 This guide will try to fix Suwayomi by reseting it to a clean installation state.

--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
-kotlin = "2.4.0"
+kotlin = "2.3.21"
 coroutines = "1.11.0"
 serialization = "1.11.0"
 jvmTarget = "21"
-okhttp = "5.4.0" # Major version is locked by Tachiyomi extensions
+okhttp = "5.3.2" # Major version is locked by Tachiyomi extensions
 javalin = "7.2.2"
 jte = "3.2.4"
-jackson = "3.2.0" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
+jackson = "3.1.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
 exposed = "1.2.0"
-dex2jar = "2.4.37"
+dex2jar = "2.4.36"
 polyglot = "25.0.3"
 settings = "1.3.0"
 twelvemonkeys = "3.13.1"
-graphqlkotlin = "10.0.0"
+graphqlkotlin = "10.0.0-alpha.4"
 xmlserialization = "0.91.3"
 ktlint = "1.8.0"
-koin = "4.2.2"
+koin = "4.2.1"
 moko = "0.26.4"
 jcef = "144.0.15-g72717cf-chromium-144.0.7559.172-api-1.21-262-b37"

@@ -39,15 +39,14 @@ serialization-xml = { module = "io.github.pdvrieze.xmlutil:serialization-jvm", v

 # Logging
 slf4japi = "org.slf4j:slf4j-api:2.0.18"
-logback = "ch.qos.logback:logback-classic:1.5.34"
-kotlinlogging = "io.github.oshai:kotlin-logging-jvm:8.0.4"
+logback = "ch.qos.logback:logback-classic:1.5.32"
+kotlinlogging = "io.github.oshai:kotlin-logging-jvm:8.0.02"

 # OkHttp
 okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp" }
 okhttp-brotli = { module = "com.squareup.okhttp3:okhttp-brotli", version.ref = "okhttp" }
-okhttp-zstd = { module = "com.squareup.okhttp3:okhttp-zstd", version.ref = "okhttp" }
 okio = "com.squareup.okio:okio:3.17.0"

 # Javalin api
@@ -56,7 +55,7 @@ javalin-openapi = { module = "io.javalin:javalin-openapi", version.ref = "javali
 javalin-rendering = { module = "io.javalin:javalin-rendering-jte", version.ref = "javalin" }
 jackson-databind = { module = "tools.jackson.core:jackson-databind", version.ref = "jackson" }
 jackson-kotlin = { module = "tools.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
-jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.22"
+jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.21"
 jte = { module = "gg.jte:jte", version.ref = "jte" }
 kte = { module = "gg.jte:jte-kotlin", version.ref = "jte" }

@@ -71,10 +70,9 @@ exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exp
 exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" }
 exposed-javatime = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
 exposed-kotlintime = { module = "org.jetbrains.exposed:exposed-kotlin-datetime", version.ref = "exposed" }
-exposed-json = { module = "org.jetbrains.exposed:exposed-json ", version.ref = "exposed" }
 postgres = "org.postgresql:postgresql:42.7.11"
 h2 = "com.h2database:h2:2.4.240"
-hikaricp = "com.zaxxer:HikariCP:7.1.0"
+hikaricp = "com.zaxxer:HikariCP:7.0.2"

 # Exposed Migrations
 exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.10.1"
@@ -93,7 +91,7 @@ rxjava = "io.reactivex:rxjava:1.3.8"
 jsoup = "org.jsoup:jsoup:1.22.2"

 # Config
-config = "com.typesafe:config:1.4.9"
+config = "com.typesafe:config:1.4.8"
 config4k = "io.github.config4k:config4k:0.7.0"

 # Sort
@@ -147,10 +145,10 @@ twelvemonkeys-imageio-metadata = { module = "com.twelvemonkeys.imageio:imageio-m
 twelvemonkeys-imageio-jpeg = { module = "com.twelvemonkeys.imageio:imageio-jpeg", version.ref = "twelvemonkeys" }
 twelvemonkeys-imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version.ref = "twelvemonkeys" }

-imageio-webp = "com.github.usefulness:webp-imageio:0.11.0"
+imageio-webp = "com.github.usefulness:webp-imageio:0.10.2"

 # Testing
-mockk = "io.mockk:mockk:1.14.11"
+mockk = "io.mockk:mockk:1.14.9"

 # cron scheduler
 cron4j = "it.sauronsoftware.cron4j:cron4j:2.2.5"
@@ -160,6 +158,8 @@ cronUtils = "com.cronutils:cron-utils:9.2.1"

 # Webview
 jcef = { module = "org.jetbrains.intellij.deps.jcef:jcef", version.ref = "jcef" }
+gluegen = "org.jogamp.gluegen:gluegen-rt:2.5.0"
+jogl = "org.jogamp.jogl:jogl-all:2.5.0"

 # User
 jwt = "com.auth0:java-jwt:4.5.2"
@@ -180,13 +180,13 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "14.2.0"}

 # Build config
-buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.10"}
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.9"}

 # Download
 download = { id = "de.undercouch.download", version = "5.7.0"}

 # ShadowJar
-shadowjar = { id = "com.gradleup.shadow", version = "8.3.11"}
+shadowjar = { id = "com.gradleup.shadow", version = "8.3.10"}

 # Moko
 moko = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko" }
@@ -229,7 +229,6 @@ okhttp = [
    "okhttp-logging",
    "okhttp-dnsoverhttps",
    "okhttp-brotli",
-    "okhttp-zstd",
 ]
 javalin = [
    "javalin-core",
@@ -248,7 +247,6 @@ exposed = [
    "exposed-jdbc",
    "exposed-javatime",
    "exposed-kotlintime",
-    "exposed-json",
 ]
 systemtray = [
    "systemtray-core",
--- a/renovate.json
+++ b/renovate.json
@@ -16,43 +16,14 @@
      "depNameTemplate": "zulu",
      "datasourceTemplate": "custom.zulu",
      "versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+).*$"
-    },
-    {
-      "customType": "regex",
-      "managerFilePatterns": [
-        "/buildSrc/src/main/kotlin/Constants.kt/"
-      ],
-      "matchStrings": [
-        "val\\s+webviewJbrRelease\\s*=\\s*\"(?<currentValue>[^\"]+)\""
-      ],
-      "depNameTemplate": "JetBrainsRuntime",
-      "packageNameTemplate": "JetBrains/JetBrainsRuntime",
-      "datasourceTemplate": "github-releases",
-      "versioningTemplate": "regex:^jbr-release-(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)b(?<build>\\d+)\\.(?<revision>\\d+)$"
    }
  ],
  "customDatasources": {
    "zulu": {
      "defaultRegistryUrlTemplate": "https://api.azul.com/metadata/v1/zulu/packages?availability_types=ca&release_status=both&java_package_type=jre&crac_supported=false&javafx_bundled=false&support_term=lts&arch=x86&os=linux&archive_type=zip&page_size=1000&include_fields=java_package_features,release_status,support_term,os,arch,hw_bitness,abi,java_package_type,javafx_bundled,sha256_hash,cpu_gen,size,archive_type,certifications,lib_c_type,crac_supported&page=1&azul_com=true",
      "transformTemplates": [
-        "{ \"releases\": $map($, function($v) { { \"version\": $join([$string($v.distro_version[0]), \".\", $string($v.distro_version[1]), \".\", $string($v.distro_version[2]), \"_\", $string($v.java_version[0]), \".\", $string($v.java_version[1]), \".\", $string($v.java_version[2])]) } }) }"
+        "{\"releases\": $$.$join([$join($map(distro_version[[0..2]], $string), \".\"), \"_\", $join($map(java_version, $string), \".\")])}"
      ]
    }
-  },
-  "packageRules": [
-    {
-      "matchPackageNames": [
-        "org.jetbrains.intellij.deps.jcef:jcef",
-        "JetBrains/JetBrainsRuntime"
-      ],
-      "groupName": "JCEF + JetBrains Runtime",
-      "groupSlug": "jcef-jbr"
-    },
-    {
-      "matchPackageNames": [
-        "com.github.Suwayomi:android-jar"
-      ],
-      "enabled": false
-    }
-  ]
+  }
 }
--- a/scripts/bundler.sh
+++ b/scripts/bundler.sh
@@ -42,7 +42,7 @@ main() {
    gcc -fPIC -shared scripts/resources/catch_abort.c -lpthread -o scripts/resources/catch_abort.so
  fi

-  JRE_ZULU="25.34.17_25.0.3"
+  JRE_ZULU="25.30.17_25.0.1"
  JRE_RELEASE="jre${JRE_ZULU#*_}" # e.g. jre25.0.1
  ZULU_RELEASE="zulu${JRE_ZULU%_*}" # e.g. zulu25.30.17

@@ -149,15 +149,15 @@ move_release_to_output_dir() {
 }

 download_launcher() {
-  LAUNCHER_URL=$(curl -sf "https://api.github.com/repos/Suwayomi/Suwayomi-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4)
-  curl -fL "$LAUNCHER_URL" -o "Suwayomi-Launcher.jar"
+  LAUNCHER_URL=$(curl -s "https://api.github.com/repos/Suwayomi/Suwayomi-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4)
+  curl -L "$LAUNCHER_URL" -o "Suwayomi-Launcher.jar"
  mv "Suwayomi-Launcher.jar" "$RELEASE_NAME/Suwayomi-Launcher.jar"
 }

 download_jogamp() {
  local platform="$1"
  if [ ! -f jogamp-all-platforms.7z ]; then
-    curl -f "https://jogamp.org/deployment/jogamp-current/archive/jogamp-all-platforms.7z" -o jogamp-all-platforms.7z
+    curl "https://jogamp.org/deployment/jogamp-current/archive/jogamp-all-platforms.7z" -o jogamp-all-platforms.7z
  fi

  7z x jogamp-all-platforms.7z "jogamp-all-platforms/lib/$platform/"
@@ -168,7 +168,7 @@ download_jogamp() {

 download_electron() {
  if [ ! -f "$ELECTRON" ]; then
-    curl -fL "$ELECTRON_URL" -o "$ELECTRON"
+    curl -L "$ELECTRON_URL" -o "$ELECTRON"
  fi

  unzip "$ELECTRON" -d "$RELEASE_NAME/electron/"
@@ -181,7 +181,7 @@ setup_jre() {
    mv "jre" "$RELEASE_NAME/jre"
  else
    if [ ! -f "$JRE" ]; then
-      curl -fL "$JRE_URL" -o "$JRE"
+      curl -L "$JRE_URL" -o "$JRE"
    fi

    local ext="${JRE##*.}"
@@ -273,7 +273,7 @@ make_appimage() {
    sudo apt update
    sudo apt install libfuse2
  fi
-  curl -fL $APPIMAGE_URL -o $APPIMAGE_TOOLNAME
+  curl -L $APPIMAGE_URL -o $APPIMAGE_TOOLNAME
  chmod +x $APPIMAGE_TOOLNAME
  ARCH=x86_64 ./$APPIMAGE_TOOLNAME "$RELEASE_NAME" "$RELEASE"
 }
@@ -300,7 +300,7 @@ make_windows_bundle() {
  #local rcedit_url="https://github.com/electron/rcedit/releases/download/v0.1.1/$rcedit"
  ## change electron's icon
  #if [ ! -f "$rcedit" ]; then
-    #curl -fL "$rcedit_url" -o "$rcedit"
+    #curl -L "$rcedit_url" -o "$rcedit"
  #fi

  #local icon="server/src/main/resources/icon/faviconlogo.ico"
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -37,6 +37,10 @@ dependencies {
    implementation(libs.bundles.shared)
    testImplementation(libs.bundles.sharedTest)

+    // WebView
+    implementation(libs.gluegen)
+    implementation(libs.jogl)
+
    // OkHttp
    implementation(libs.bundles.okhttp)
    implementation(libs.okio)
--- a/server/i18n/src/commonMain/moko-resources/values/base/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/base/strings.xml
@@ -50,7 +50,6 @@
    <!-- OPDS errors -->
    <string name="opds_error_manga_not_found">Series with ID %1$d not found.</string>
    <string name="opds_error_chapter_not_found">Chapter with index %1$d not found.</string>
-    <string name="opds_error_chapters_not_found">No chapters found or the source is unreachable on page %1$d.</string>

    <!-- OPDS facets (Filters and Sorting) -->
    <string name="opds_facetgroup_sort_order">Sort Order</string>
@@ -154,7 +153,4 @@
    <string name="login_label_login">Log In</string>
    <string name="login_placeholder_username">Type username...</string>
    <string name="login_placeholder_password">Secret...</string>
-
-    <string name="opds_chapter_title_oneshot">Oneshot</string>
-    <string name="opds_chapter_title_fallback">Chapter %1$s</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/de/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/de/strings.xml
@@ -8,7 +8,7 @@
    <string name="opds_feeds_root">Suwayomi OPDS Katalog</string>
    <string name="opds_feeds_chapter_details">%1$s | %2$s | Details</string>
    <string name="opds_feeds_sources_title">Alle Quellen</string>
-    <string name="opds_feeds_genres_title">Genren</string>
+    <string name="opds_feeds_genres_title">Genres</string>
    <string name="opds_feeds_genres_entry_content">Durchsuche Serien nach Genre</string>
    <string name="opds_feeds_status_entry_content">Durchsuche Serien nach Publikationsstatus</string>
    <string name="opds_feeds_languages_title">Sprachen</string>
@@ -122,7 +122,4 @@
    <string name="webview_label_login_required">Deine Konfiguration erfordert die Anmeldung. Bitte gib Benutzername und Passwort ein.</string>
    <string name="opds_linktitle_first_page">Erste Seite</string>
    <string name="opds_linktitle_last_page">Letzte Seite</string>
-    <string name="opds_error_chapters_not_found">Keine Kapitel gefunden oder die Quelle ist nicht erreichbar auf Seite %1$d.</string>
-    <string name="opds_chapter_title_fallback">Kapitel %1$s</string>
-    <string name="opds_chapter_title_oneshot">Oneshot</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/el/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/el/strings.xml
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="opds_feeds_root">Suwayomi OPDS Κατάλογος</string>
-    <string name="opds_feeds_manga_chapters">Κεφάλαια %1$s</string>
-    <string name="opds_feeds_chapter_details">%1$s | %2$s | Λεπτομέρειες</string>
-    <string name="opds_feeds_explore_title">Εξερεύνηση</string>
-    <string name="opds_feeds_explore_entry_content">Εξερεύνησε νέες σειρές από τις πηγές σου</string>
-    <string name="opds_feeds_history_title">Ιστορικό</string>
-    <string name="opds_feeds_history_entry_content">Πρόσφατα διαβασμένα κεφάλαια</string>
-    <string name="opds_feeds_all_series_in_library_title">Όλες οι σειρές</string>
-    <string name="opds_feeds_all_series_in_library_entry_content">Περιήγηση σε όλες τις σειρές της βιβλιοθήκης σου</string>
-    <string name="opds_feeds_library_sources_title">Πηγές</string>
-    <string name="opds_feeds_library_sources_entry_content">Περιήγηση σε σειρές της βιβλιοθήκης σου φιλτραρισμένες κατά πηγή</string>
-    <string name="opds_feeds_categories_title">Κατηγορίες</string>
-    <string name="opds_feeds_categories_entry_content">Περιήγηση σε σειρές οργανωμένες κατά κατηγορία</string>
-    <string name="opds_feeds_genres_title">Είδη</string>
-    <string name="opds_feeds_genres_entry_content">Περιήγηση σε σειρές κατά ετικέτες είδους</string>
-    <string name="opds_feeds_status_title">Κατάσταση</string>
-    <string name="opds_feeds_status_entry_content">Περιήγηση σε σειρές κατά κατάσταση δημοσίευσης</string>
-    <string name="opds_feeds_languages_title">Γλώσσες</string>
-    <string name="opds_feeds_languages_entry_content">Περιήγηση σε σειρές κατά γλώσσα περιεχομένου</string>
-    <string name="opds_feeds_library_updates_title">Ιστορικό ενημερώσεων βιβλιοθήκης</string>
-    <string name="opds_feeds_library_updates_entry_content">Πρόσφατα ενημερωμένα κεφάλαια από τη βιβλιοθήκη σου</string>
-    <string name="opds_feeds_search_results_title">Αποτελέσματα αναζήτησης</string>
-    <string name="opds_feeds_sources_title">Όλες οι πηγές</string>
-    <string name="opds_feeds_category_specific_title">Κατηγορία: %1$s</string>
-    <string name="opds_feeds_genre_specific_title">Είδος: %1$s</string>
-    <string name="opds_feeds_status_specific_title">Κατάσταση: %1$s</string>
-    <string name="opds_feeds_language_specific_title">Γλώσσα: %1$s</string>
-    <string name="opds_feeds_source_specific_title">Πηγή: %1$s</string>
-    <string name="opds_feeds_library_source_specific_title">Βιβλιοθήκη - Πηγή: %1$s</string>
-    <string name="opds_feeds_source_specific_popular_title">Πηγή: %1$s - Δημοφιλές</string>
-    <string name="opds_feeds_source_specific_latest_title">Πηγή: %1$s - Τελευταίο</string>
-    <string name="opds_search_shortname">Suwayomi OPDS Αναζήτηση</string>
-    <string name="opds_search_description">Αναζήτηση σειρών στον κατάλογο.</string>
-    <string name="opds_error_manga_not_found">Η σειρά με ID %1$d δεν βρέθηκε.</string>
-    <string name="opds_error_chapter_not_found">Το κεφάλαιο με δείκτη %1$d δεν βρέθηκε.</string>
-    <string name="opds_facetgroup_sort_order">Σειρά ταξινόμησης</string>
-    <string name="opds_facetgroup_filter_read_status">Φίλτρο κατά κατάσταση ανάγνωσης</string>
-    <string name="opds_facetgroup_filter_content">Φίλτρο περιεχομένου</string>
-    <string name="opds_facetgroup_filter_source">Φίλτρο κατά πηγή</string>
-    <string name="opds_facetgroup_filter_category">Φίλτρο κατά κατηγορία</string>
-    <string name="opds_facetgroup_filter_status">Φίλτρο κατά κατάσταση</string>
-    <string name="opds_facetgroup_filter_language">Φίλτρο κατά γλώσσα</string>
-    <string name="opds_facetgroup_filter_genre">Φίλτρο κατά είδος</string>
-    <string name="opds_facet_sort_oldest_first">Παλαιότερα πρώτα</string>
-    <string name="opds_facet_sort_newest_first">Νεότερα πρώτα</string>
-    <string name="opds_facet_sort_date_asc">Ημερομηνία αύξουσα</string>
-    <string name="opds_facet_sort_date_desc">Ημερομηνία φθίνουσα</string>
-    <string name="opds_facet_sort_popular">Δημοφιλές</string>
-    <string name="opds_facet_sort_latest">Τελευταίο</string>
-    <string name="opds_facet_sort_alpha_asc">Αλφαβητικά Α-Ω</string>
-    <string name="opds_facet_sort_alpha_desc">Αλφαβητικά Ω-Α</string>
-    <string name="opds_facet_sort_last_read_desc">Τελευταία ανάγνωση</string>
-    <string name="opds_facet_sort_latest_chapter_desc">Τελευταίο κεφάλαιο</string>
-    <string name="opds_facet_sort_date_added_desc">Ημερομηνία προσθήκης</string>
-    <string name="opds_facet_sort_unread_desc">Αδιάβαστα κεφάλαια</string>
-    <string name="opds_facet_filter_all">Όλα</string>
-    <string name="opds_facet_filter_all_chapters">Όλα τα κεφάλαια</string>
-    <string name="opds_facet_filter_unread_only">Αδιάβαστα</string>
-    <string name="opds_facet_filter_read_only">Διαβασμένα</string>
-    <string name="opds_facet_filter_downloaded">Ληφθέντα</string>
-    <string name="opds_facet_filter_ongoing">Σε εξέλιξη</string>
-    <string name="opds_facet_filter_completed">Ολοκληρωμένα</string>
-    <string name="opds_facet_all_sources">Όλες οι πηγές</string>
-    <string name="opds_facet_all_categories">Όλες οι κατηγορίες</string>
-    <string name="opds_facet_all_statuses">Όλες οι καταστάσεις</string>
-    <string name="opds_facet_all_languages">Όλες οι γλώσσες</string>
-    <string name="opds_facet_all_genres">Όλα τα είδη</string>
-    <string name="opds_linktitle_catalog_root">Ρίζα καταλόγου</string>
-    <string name="opds_linktitle_search_catalog">Αναζήτηση καταλόγου</string>
-    <string name="opds_linktitle_first_page">Πρώτη σελίδα</string>
-    <string name="opds_linktitle_previous_page">Προηγούμενη σελίδα</string>
-    <string name="opds_linktitle_next_page">Επόμενη σελίδα</string>
-    <string name="opds_linktitle_last_page">Τελευταία σελίδα</string>
-    <string name="opds_linktitle_self_feed">Τρέχουσα ροή</string>
-    <string name="opds_linktitle_view_on_web">Προβολή στο Web</string>
-    <string name="opds_linktitle_stream_pages_start">Διάβασε Online</string>
-    <string name="opds_linktitle_stream_pages_continue">Συνέχισε να διαβάζεις Online</string>
-    <string name="opds_linktitle_stream_pages_start_local">Διάβασε Online (Τοπική πρόοδος)</string>
-    <string name="opds_linktitle_stream_pages_continue_local">Συνέχισε να διαβάζεις Online (Τοπική πρόοδος)</string>
-    <string name="opds_linktitle_stream_pages_start_remote">Διάβασε Online (Συγχρονισμένο από %1$s)</string>
-    <string name="opds_linktitle_stream_pages_continue_remote">Συνέχισε να διαβάζεις Online (Συγχρονισμένο από %1$s)</string>
-    <string name="opds_linktitle_download_cbz">Λήψη CBZ</string>
-    <string name="opds_linktitle_chapter_cover">Εξώφυλλο κεφαλαίου</string>
-    <string name="opds_linktitle_view_chapter_details">Λεπτομέρειες κεφαλαίου &amp; Σελίδες</string>
-    <string name="opds_chapter_status_read">✅</string>
-    <string name="opds_chapter_status_in_progress">⌛</string>
-    <string name="opds_chapter_status_unread">⭕</string>
-    <string name="opds_chapter_status_downloaded">⬇️</string>
-    <string name="opds_chapter_status_synced">🌐</string>
-    <string name="opds_chapter_details_base">Σειρά: %1$s | %2$s</string>
-    <string name="opds_chapter_details_scanlator">| Από %1$s</string>
-    <string name="opds_chapter_details_progress">| Πρόοδος: %1$d από %2$d</string>
-    <string name="opds_manga_summary_status">Κατάσταση: %1$s</string>
-    <string name="opds_manga_summary_source">Πηγή: %1$s</string>
-    <string name="opds_manga_summary_language">Γλώσσα: %1$s</string>
-    <string name="manga_status_ongoing">Σε εξέλιξη</string>
-    <string name="manga_status_completed">Ολοκληρωμένο</string>
-    <string name="manga_status_licensed">Υπό άδεια</string>
-    <string name="manga_status_publishing_finished">Δημοσίευση ολοκληρωμένη</string>
-    <string name="manga_status_cancelled">Ακυρωμένο</string>
-    <string name="manga_status_on_hiatus">Σε παύση</string>
-    <string name="manga_status_unknown">Άγνωστο</string>
-    <string name="label_error">Σφάλμα</string>
-    <string name="label_version">Έκδοση <xliff:g id="version" example="v2.0.1833">%1$s</xliff:g></string>
-    <string name="label_close">Κλείσε</string>
-    <string name="webview_label_title">Suwayomi WebView</string>
-    <string name="webview_label_disconnected">Αποσυνδεδεμένο, κάνε ανανέωση</string>
-    <string name="webview_label_reversescroll">Αντίστροφη κύλιση</string>
-    <string name="webview_label_bindingshint">Σημείωση: Όταν η εστίαση είναι στο τμήμα WebView, καμία συντόμευση πληκτρολογίου, συμπεριλαμβανομένης της ανανέωσης, δεν θα αντιμετωπίζεται από το πρόγραμμα περιήγησης.</string>
-    <string name="webview_label_init">Αρχικοποίηση... Παρακαλώ περίμενε</string>
-    <string name="webview_label_getstarted">Εισήγαγε μια διεύθυνση URL για να ξεκινήσεις</string>
-    <string name="webview_label_loading">Φόρτωση σελίδας...</string>
-    <string name="webview_label_copy">Αντιγραφή στο πρόχειρο</string>
-    <string name="webview_label_copy_description">Η αυτόματη αντιγραφή στο πρόχειρο απέτυχε, χρησιμοποίησε το παρακάτω πεδίο για να αντιγράψεις χειροκίνητα την τιμή.</string>
-    <string name="webview_label_login_required">Η διαμόρφωσή σου απαιτεί σύνδεση. Εισήγαγε όνομα χρήστη και κωδικό.</string>
-    <string name="webview_placeholder_url">Εισήγαγε URL...</string>
-    <string name="login_label_title">Suwayomi Σύνδεση</string>
-    <string name="login_label_username">Όνομα χρήστη</string>
-    <string name="login_label_password">Κωδικός</string>
-    <string name="login_label_login">Σύνδεση</string>
-    <string name="login_placeholder_username">Πληκτρολόγησε όνομα χρήστη...</string>
-    <string name="login_placeholder_password">Μυστικό...</string>
-    <string name="opds_error_chapters_not_found">Δεν βρέθηκαν κεφάλαια ή η πηγή είναι μη διαθέσιμη στη σελίδα %1$d.</string>
-    <string name="opds_chapter_title_fallback">Κεφάλαιο %1$s</string>
-</resources>
--- a/server/i18n/src/commonMain/moko-resources/values/es/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/es/strings.xml
@@ -122,6 +122,4 @@
    <string name="webview_label_login_required">Su configuración requiere que inicie sesión. Introduzca su nombre de usuario y contraseña.</string>
    <string name="opds_linktitle_first_page">Primera página</string>
    <string name="opds_linktitle_last_page">Última página</string>
-    <string name="opds_error_chapters_not_found">No se encontraron capítulos o la fuente no está disponible en la página %1$d.</string>
-    <string name="opds_chapter_title_fallback">Capítulo %1$s</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/fr/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/fr/strings.xml
@@ -122,7 +122,4 @@
    <string name="login_label_login">Se connecter</string>
    <string name="login_placeholder_username">Tapez le nom d\'utilisateur…</string>
    <string name="login_placeholder_password">Secret…</string>
-    <string name="opds_error_chapters_not_found">Aucun chapitre trouvé ou la source est inaccessible à la page %1$d.</string>
-    <string name="opds_chapter_title_fallback">Chapitre %1$s</string>
-    <string name="opds_chapter_title_oneshot">One shot</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/it/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/it/strings.xml
@@ -122,6 +122,4 @@
    <string name="login_label_login">Accedi</string>
    <string name="login_placeholder_username">Digita il nome utente...</string>
    <string name="login_placeholder_password">Segreto...</string>
-    <string name="opds_error_chapters_not_found">Nessun capitolo trovato o la fonte non è raggiungibile alla pagina %1$d.</string>
-    <string name="opds_chapter_title_fallback">Capitolo %1$s</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/ja/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/ja/strings.xml
@@ -60,7 +60,4 @@
    <string name="opds_feeds_library_sources_title">ソース</string>
    <string name="opds_feeds_library_sources_entry_content">ソース別にライブラリ内のマンガを閲覧</string>
    <string name="opds_feeds_search_results_title">検索結果</string>
-    <string name="opds_error_chapters_not_found">ページ %1$d で章が見つからないか、ソースに接続できません。</string>
-    <string name="opds_chapter_title_oneshot">読み切り</string>
-    <string name="opds_chapter_title_fallback">第 %1$s 話</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/pl/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/pl/strings.xml
@@ -76,6 +76,4 @@
    <string name="opds_facet_filter_all">Wszystkie</string>
    <string name="opds_facet_filter_downloaded">Pobrane</string>
    <string name="opds_facet_filter_ongoing">Trwające</string>
-    <string name="opds_error_chapters_not_found">Nie znaleziono rozdziałów lub źródło jest nieosiągalne na stronie %1$d.</string>
-    <string name="opds_chapter_title_fallback">Rozdział %1$s</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/pt/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/pt/strings.xml
@@ -122,6 +122,4 @@
    <string name="login_label_login">Entrar</string>
    <string name="login_placeholder_username">Digite o nome de usuário...</string>
    <string name="login_placeholder_password">Segredo...</string>
-    <string name="opds_error_chapters_not_found">Nenhum capítulo encontrado ou a fonte está inacessível na página %1$d.</string>
-    <string name="opds_chapter_title_fallback">Capítulo %1$s</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/ru/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/ru/strings.xml
@@ -122,7 +122,4 @@
    <string name="opds_search_description">Ищите тайтлы в каталоге.</string>
    <string name="opds_error_manga_not_found">Тайтл с ID %1$d не найден.</string>
    <string name="opds_chapter_details_base">Тайтл: %1$s | %2$s</string>
-    <string name="opds_error_chapters_not_found">Главы не найдены или источник недоступен на странице %1$d.</string>
-    <string name="opds_chapter_title_fallback">Глава %1$s</string>
-    <string name="opds_chapter_title_oneshot">Ваншот</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/ta/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/ta/strings.xml
@@ -53,7 +53,4 @@
    <string name="opds_chapter_status_unread">⭕</string>
    <string name="opds_chapter_details_base">%1$s | %2$s</string>
    <string name="opds_feeds_genre_specific_title">இசைவகை: %1$s</string>
-    <string name="opds_error_chapters_not_found">பக்கம் %1$d இல் அத்தியாயங்கள் எதுவும் காணப்படவில்லை அல்லது மூலத்தை அணுக முடியவில்லை.</string>
-    <string name="opds_chapter_title_oneshot">ஒன்-ஷாட்</string>
-    <string name="opds_chapter_title_fallback">அத்தியாயம் %1$s</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/vi/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/vi/strings.xml
@@ -122,6 +122,4 @@
    <string name="webview_label_login_required">Cấu hình của bạn yêu cầu bạn phải đăng nhập. Vui lòng nhập tên người dùng và mật khẩu.</string>
    <string name="opds_linktitle_first_page">Trang đầu</string>
    <string name="opds_linktitle_last_page">Trang cuối</string>
-    <string name="opds_error_chapters_not_found">Không tìm thấy chương nào hoặc nguồn không thể truy cập tại trang %1$d.</string>
-    <string name="opds_chapter_title_fallback">Chương %1$s</string>
 </resources>
--- a/server/i18n/src/commonMain/moko-resources/values/zh-rCN/strings.xml
+++ b/server/i18n/src/commonMain/moko-resources/values/zh-rCN/strings.xml
@@ -122,7 +122,4 @@
    <string name="login_placeholder_username">输入用户名…</string>
    <string name="login_placeholder_password">密匙…</string>
    <string name="label_error">错误</string>
-    <string name="opds_error_chapters_not_found">第 %1$d 页未找到任何章节，或图源无法访问。</string>
-    <string name="opds_chapter_title_fallback">第 %1$s 章</string>
-    <string name="opds_chapter_title_oneshot">单篇</string>
 </resources>
--- a/server/server-config/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
+++ b/server/server-config/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
@@ -15,13 +15,15 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
 import org.jetbrains.exposed.v1.core.SortOrder
 import suwayomi.tachidesk.graphql.types.AuthMode
@@ -71,21 +73,6 @@ val serverConfig: ServerConfig by lazy { GlobalConfigManager.module() }

 private val application: Application by injectLazy()

-@OptIn(ExperimentalCoroutinesApi::class)
-fun <T> subscribeTo(
-    flow: Flow<T>,
-    ignoreInitialValue: Boolean = true,
-    onChange: suspend (value: T) -> Unit,
-) {
-    val actualFlow =
-        if (ignoreInitialValue) {
-            flow.drop(1)
-        } else {
-            flow
-        }
-    actualFlow.distinctUntilChanged().conflate().onEach { onChange(it) }.launchIn(mutableConfigValueScope)
-}
-
 // Settings are ordered by "protoNumber".
 class ServerConfig(
    getConfig: () -> Config,
@@ -276,38 +263,30 @@ class ServerConfig(
        description = "Ignore re-uploaded chapters from auto-download",
    )

-    @Deprecated("Will get removed", replaceWith = ReplaceWith("extensionStores"))
-    val extensionRepos: MutableStateFlow<List<String>> by MigratedConfigValue(
+    val extensionRepos: MutableStateFlow<List<String>> by ListSetting<String>(
        protoNumber = 22,
        group = SettingGroup.EXTENSION,
        privacySafe = false,
        defaultValue = emptyList(),
-        deprecated =
-            SettingsRegistry.SettingDeprecated(
-                message = "Replaced with addExtensionStore and removeExtensionStore mutations",
-                migrateConfigValue = {
-                    @Suppress("UNCHECKED_CAST")
-                    (it.unwrapped() as? List<String>)
-                        ?.map {
-                            if (it.contains("github.com")) {
-                                it.replace(repoMatchRegex) {
-                                    "https://raw.githubusercontent.com/${it.groupValues[2]}/${it.groupValues[3]}/" +
-                                        (it.groupValues.getOrNull(4)?.ifBlank { null } ?: "repo") +
-                                        "/" +
-                                        (it.groupValues.getOrNull(5)?.ifBlank { null } ?: "index.min.json")
-                                }
-                            } else {
-                                it
-                            }
-                        }
-                },
-            ),
-        readMigrated = { extensionStores.value },
-        setMigrated = { extensionStores.value = it.distinct() },
+        itemValidator = { url ->
+            if (url.matches(repoMatchRegex)) {
+                null
+            } else {
+                "Invalid repository URL format"
+            }
+        },
+        itemToValidValue = { url ->
+            if (url.matches(repoMatchRegex)) {
+                url
+            } else {
+                null
+            }
+        },
        typeInfo =
            SettingsRegistry.PartialTypeInfo(
                specificType = "List<String>",
            ),
+        description = "example: [\"https://github.com/MY_ACCOUNT/MY_REPO/tree/repo\"]",
    )

    val maxSourcesInParallel: MutableStateFlow<Int> by IntSetting(
@@ -1043,99 +1022,7 @@ class ServerConfig(
        description = "Enable the WebView via CEF (Chromium)"
    )

-    val syncYomiEnabled: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 87,
-        defaultValue = false,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true
-    )

-    val syncYomiHost: MutableStateFlow<String> by StringSetting(
-        protoNumber = 88,
-        defaultValue = "",
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncYomiApiKey: MutableStateFlow<String> by StringSetting(
-        protoNumber = 89,
-        defaultValue = "",
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = false,
-    )
-
-    val syncDataManga: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 90,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataChapters: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 91,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataTracking: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 92,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataHistory: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 93,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataCategories: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 94,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncInterval: MutableStateFlow<Duration> by DurationSetting(
-        protoNumber = 95,
-        defaultValue = 0.seconds,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val opdsSkipChapterMetadataFeed: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 96,
-        group = SettingGroup.OPDS,
-        privacySafe = true,
-        defaultValue = false,
-        description = "Skips the metadata feed and provides download/stream links directly in the chapter list. Improves compatibility with KOReader auto-downloader. KoSync strategies are applied, but PROMPT conflicts are ignored (treating local progress as priority)."
-    )
-
-    val extensionStores: MutableStateFlow<List<String>> by ListSetting<String>(
-        protoNumber = 97,
-        group = SettingGroup.EXTENSION,
-        privacySafe = true,
-        defaultValue = emptyList(),
-        requiresRestart = true,
-        itemValidator = { url ->
-            if (url.isNotEmpty()) {
-                null
-            } else {
-                "Invalid store URL format"
-            }
-        },
-        itemToValidValue = { url ->
-            url.ifEmpty { null }
-        },
-        typeInfo =
-            SettingsRegistry.PartialTypeInfo(
-                specificType = "List<String>",
-            ),
-        description = "List of extension store index URLs",
-    )

    /** ****************************************************************** **/
    /**                                                                    **/
@@ -1180,7 +1067,18 @@ class ServerConfig(
        flow: Flow<T>,
        onChange: suspend (value: T) -> Unit,
        ignoreInitialValue: Boolean = true,
-    ) = subscribeTo(flow, ignoreInitialValue, onChange)
+    ) {
+        val actualFlow =
+            if (ignoreInitialValue) {
+                flow.drop(1)
+            } else {
+                flow
+            }
+
+        val sharedFlow = MutableSharedFlow<T>(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+        actualFlow.distinctUntilChanged().mapLatest { sharedFlow.emit(it) }.launchIn(mutableConfigValueScope)
+        sharedFlow.onEach { onChange(it) }.launchIn(mutableConfigValueScope)
+    }

    fun <T> subscribeTo(
        flow: Flow<T>,
--- a/server/server-config/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingGroup.kt
+++ b/server/server-config/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingGroup.kt
@@ -18,7 +18,6 @@ enum class SettingGroup(
    OPDS("OPDS"),
    KOREADER_SYNC("KOReader sync"),
    WEB_VIEW("WebView"),
-    SYNCYOMI("SyncYomi")
    ;

    override fun toString(): String = value
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/HttpException.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/HttpException.kt
@@ -1,15 +0,0 @@
-package eu.kanade.tachiyomi.network
-
-import okhttp3.Response
-
-/**
- * Exception that handles HTTP codes considered not successful by OkHttp.
- * Use it to have a standardized error message in the app across the extensions.
- *
- * @see Response.isSuccessful
- * @since tachiyomix 1.6
- * @param code [Int] the HTTP status code
- */
-class HttpException(
-    val code: Int,
-) : IllegalStateException("HTTP error $code")
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt
@@ -2,25 +2,26 @@ package eu.kanade.tachiyomi.network

 import android.content.Context
 import app.cash.quickjs.QuickJs
-import eu.kanade.tachiyomi.util.lang.withIOContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext

 /**
 * Util for evaluating JavaScript in sources.
 */
-@Suppress("UNUSED", "UNCHECKED_CAST")
 class JavaScriptEngine(
-    context: Context,
+    @Suppress("UNUSED_PARAMETER") context: Context,
 ) {
    /**
     * Evaluate arbitrary JavaScript code and get the result as a primitive type
     * (e.g., String, Int).
     *
-     * @since tachiyomix 1.4
+     * @since extensions-lib 1.4
     * @param script JavaScript to execute.
     * @return Result of JavaScript code as a primitive type.
     */
+    @Suppress("UNUSED", "UNCHECKED_CAST")
    suspend fun <T> evaluate(script: String): T =
-        withIOContext {
+        withContext(Dispatchers.IO) {
            QuickJs.create().use {
                it.evaluate(script) as T
            }
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
@@ -9,6 +9,7 @@ package eu.kanade.tachiyomi.network

 import android.content.Context
 import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
+import eu.kanade.tachiyomi.network.interceptor.IgnoreGzipInterceptor
 import eu.kanade.tachiyomi.network.interceptor.UncaughtExceptionInterceptor
 import eu.kanade.tachiyomi.network.interceptor.UserAgentInterceptor
 import io.github.oshai.kotlinlogging.KotlinLogging
@@ -21,8 +22,9 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import okhttp3.Cache
 import okhttp3.OkHttpClient
+import okhttp3.brotli.BrotliInterceptor
 import okhttp3.logging.HttpLoggingInterceptor
-import suwayomi.tachidesk.manga.impl.util.source.GetSource
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource
 import java.net.CookieHandler
 import java.net.CookieManager
 import java.net.CookiePolicy
@@ -62,7 +64,7 @@ class NetworkHelper(
        userAgent
            .drop(1)
            .onEach {
-                GetSource.unregisterAllSources() // need to reset the headers
+                GetCatalogueSource.unregisterAllCatalogueSources() // need to reset the headers
            }.launchIn(GlobalScope)
    }

@@ -82,6 +84,8 @@ class NetworkHelper(
                        ),
                    ).addInterceptor(UncaughtExceptionInterceptor())
                    .addInterceptor(UserAgentInterceptor(::defaultUserAgentProvider))
+                    .addNetworkInterceptor(IgnoreGzipInterceptor())
+                    .addNetworkInterceptor(BrotliInterceptor)

            // if (preferences.verboseLogging().get()) {
            val httpLoggingInterceptor =
@@ -124,7 +128,5 @@ class NetworkHelper(
 //    val client by lazy { baseClientBuilder.cache(Cache(cacheDir, cacheSize)).build() }
    val client by lazy { baseClientBuilder.build() }

-    @Deprecated("The regular client handles Cloudflare by default")
-    @Suppress("UNUSED")
    val cloudflareClient by lazy { client }
 }
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
@@ -15,14 +15,11 @@ import rx.Observable
 import rx.Producer
 import rx.Subscription
 import java.io.IOException
-import kotlin.concurrent.atomics.AtomicBoolean
-import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.coroutines.resumeWithException

 val jsonMime = "application/json; charset=utf-8".toMediaType()

-@OptIn(ExperimentalAtomicApi::class)
-@Deprecated("Use suspend APIs instead")
 fun Call.asObservable(): Observable<Response> {
    return Observable.unsafeCreate { subscriber ->
        // Since Call is a one-shot type, clone it for each new subscriber.
@@ -30,11 +27,9 @@ fun Call.asObservable(): Observable<Response> {

        // Wrap the call in a helper which handles both unsubscription and backpressure.
        val requestArbiter =
-            object : Producer, Subscription {
-                val boolean = AtomicBoolean(false)
-
+            object : AtomicBoolean(), Producer, Subscription {
                override fun request(n: Long) {
-                    if (n == 0L || !boolean.compareAndSet(expectedValue = false, newValue = true)) return
+                    if (n == 0L || !compareAndSet(false, true)) return

                    try {
                        val response = call.execute()
@@ -42,15 +37,15 @@ fun Call.asObservable(): Observable<Response> {
                            subscriber.onNext(response)
                            subscriber.onCompleted()
                        }
-                    } catch (e: Exception) {
+                    } catch (error: Exception) {
                        if (!subscriber.isUnsubscribed) {
-                            subscriber.onError(e)
+                            subscriber.onError(error)
                        }
                    }
                }

                override fun unsubscribe() {
-                    call.cancel()
+                    // call.cancel()
                }

                override fun isUnsubscribed(): Boolean = call.isCanceled()
@@ -61,50 +56,50 @@ fun Call.asObservable(): Observable<Response> {
    }
 }

-@Deprecated("Use suspend APIs instead")
-fun Call.asObservableSuccess(): Observable<Response> {
-    @Suppress("DEPRECATION")
-    return asObservable().doOnNext { response ->
-        if (!response.isSuccessful) {
-            response.close()
-            throw HttpException(response.code)
-        }
-    }
-}
-
-// Based on https://github.com/square/okhttp/blob/master/okhttp-coroutines/src/main/kotlin/okhttp3/coroutines/ExecuteAsync.kt
-// and https://github.com/gildor/kotlin-coroutines-okhttp
-private suspend fun Call.await(callStack: Array<StackTraceElement>): Response {
-    return suspendCancellableCoroutine { continuation ->
-        continuation.invokeOnCancellation {
-            try {
-                this.cancel()
-            } catch (_: Throwable) {
-                // ignore
+fun Call.asObservableSuccess(): Observable<Response> =
+    asObservable()
+        .doOnNext { response ->
+            if (!response.isSuccessful) {
+                response.close()
+                throw HttpException(response.code)
            }
        }

-        this.enqueue(
+// Based on https://github.com/gildor/kotlin-coroutines-okhttp
+private suspend fun Call.await(callStack: Array<StackTraceElement>): Response {
+    return suspendCancellableCoroutine { continuation ->
+        val callback =
            object : Callback {
-                override fun onFailure(
-                    call: Call,
-                    e: IOException,
-                ) {
-                    if (continuation.isCancelled) return
-                    val exception = IOException(e.message, e).apply { stackTrace = callStack }
-                    continuation.resumeWithException(exception)
-                }
-
                override fun onResponse(
                    call: Call,
                    response: Response,
                ) {
-                    continuation.resume(response) { _, value, _ ->
-                        value.close()
+                    continuation.resume(response) { _, resourceToClose, _ ->
+                        response.body.close()
+                        resourceToClose.close()
                    }
                }
-            },
-        )
+
+                override fun onFailure(
+                    call: Call,
+                    e: IOException,
+                ) {
+                    // Don't bother with resuming the continuation if it is already cancelled.
+                    if (continuation.isCancelled) return
+                    val exception = IOException(e.message, e).apply { stackTrace = callStack }
+                    continuation.resumeWithException(exception)
+                }
+            }
+
+        enqueue(callback)
+
+        continuation.invokeOnCancellation {
+            try {
+                cancel()
+            } catch (ex: Throwable) {
+                // Ignore cancel exception
+            }
+        }
    }
 }

@@ -114,7 +109,7 @@ suspend fun Call.await(): Response {
 }

 /**
- * Similar to [await] but throws [HttpException] if [Response.isSuccessful] returns false
+ * @since extensions-lib 1.5
 */
 suspend fun Call.awaitSuccess(): Response {
    val callStack = Exception().stackTrace.run { copyOfRange(1, size) }
@@ -155,3 +150,7 @@ fun <T> decodeFromJsonResponse(
    response.body.source().use {
        json.decodeFromBufferedSource(deserializer, it)
    }
+
+class HttpException(
+    val code: Int,
+) : IllegalStateException("HTTP error $code")
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/ProgressResponseBody.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/ProgressResponseBody.kt
@@ -35,11 +35,7 @@ class ProgressResponseBody(
                val bytesRead = super.read(sink, byteCount)
                // read() returns the number of bytes read, or -1 if this source is exhausted.
                totalBytesRead += if (bytesRead != -1L) bytesRead else 0
-                progressListener.update(
-                    totalBytesRead,
-                    responseBody.contentLength(),
-                    bytesRead == -1L,
-                )
+                progressListener.update(totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
                return bytesRead
            }
        }
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt
@@ -6,7 +6,6 @@ import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.RequestBody
 import java.util.concurrent.TimeUnit.MINUTES
@@ -19,7 +18,13 @@ fun GET(
    url: String,
    headers: Headers = DEFAULT_HEADERS,
    cache: CacheControl = DEFAULT_CACHE_CONTROL,
-): Request = GET(url.toHttpUrl(), headers, cache)
+): Request =
+    Request
+        .Builder()
+        .url(url)
+        .headers(headers)
+        .cacheControl(cache)
+        .build()

 /**
 * @since extensions-lib 1.4
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/IgnoreGzipInterceptor.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/IgnoreGzipInterceptor.kt
@@ -0,0 +1,21 @@
+package eu.kanade.tachiyomi.network.interceptor
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+/**
+ * To use [okhttp3.brotli.BrotliInterceptor] as a network interceptor,
+ * add [IgnoreGzipInterceptor] right before it.
+ *
+ * This nullifies the transparent gzip of [okhttp3.internal.http.BridgeInterceptor]
+ * so gzip and Brotli are explicitly handled by the [okhttp3.brotli.BrotliInterceptor].
+ */
+class IgnoreGzipInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+        if (request.header("Accept-Encoding") == "gzip") {
+            request = request.newBuilder().removeHeader("Accept-Encoding").build()
+        }
+        return chain.proceed(request)
+    }
+}
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt
@@ -2,12 +2,6 @@ package eu.kanade.tachiyomi.source

 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
-import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.source.model.SChapter
-import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.model.SMangaUpdate
-import kotlinx.coroutines.async
-import kotlinx.coroutines.supervisorScope
 import rx.Observable
 import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle

@@ -17,62 +11,68 @@ interface CatalogueSource : Source {
     */
    override val lang: String

-    @Suppress("DEPRECATION")
-    override suspend fun getPopularManga(page: Int): MangasPage = fetchPopularManga(page).awaitSingle()
+    /**
+     * Whether the source has support for latest updates.
+     */
+    val supportsLatest: Boolean

+    /**
+     * Get a page with a list of manga.
+     *
+     * @since extensions-lib 1.5
+     * @param page the page number to retrieve.
+     */
    @Suppress("DEPRECATION")
-    override suspend fun getLatestUpdates(page: Int): MangasPage = fetchLatestUpdates(page).awaitSingle()
+    suspend fun getPopularManga(page: Int): MangasPage = fetchPopularManga(page).awaitSingle()

+    /**
+     * Get a page with a list of manga.
+     *
+     * @since extensions-lib 1.5
+     * @param page the page number to retrieve.
+     * @param query the search query.
+     * @param filters the list of filters to apply.
+     */
    @Suppress("DEPRECATION")
-    override suspend fun getSearchManga(
+    suspend fun getSearchManga(
        page: Int,
        query: String,
        filters: FilterList,
    ): MangasPage = fetchSearchManga(page, query, filters).awaitSingle()

-    @Suppress("DEPRECATION")
-    override suspend fun getMangaUpdate(
-        manga: SManga,
-        chapters: List<SChapter>,
-        fetchDetails: Boolean,
-        fetchChapters: Boolean,
-    ): SMangaUpdate =
-        supervisorScope {
-            val asyncManga = if (fetchDetails) async { fetchMangaDetails(manga).awaitSingle() } else null
-            val asyncChapters = if (fetchChapters) async { fetchChapterList(manga).awaitSingle() } else null
-            SMangaUpdate(asyncManga?.await() ?: manga, asyncChapters?.await() ?: chapters)
-        }
-
-    @Suppress("DEPRECATION")
-    override suspend fun getPageList(chapter: SChapter): List<Page> = fetchPageList(chapter).awaitSingle()
-
    /**
-     * Returns an observable containing a page with a list of manga.
+     * Get a page with a list of latest manga updates.
     *
+     * @since extensions-lib 1.5
     * @param page the page number to retrieve.
     */
-    @Deprecated("Use the suspend API instead", ReplaceWith("getPopularManga"))
-    fun fetchPopularManga(page: Int): Observable<MangasPage> = throw UnsupportedOperationException()
+    @Suppress("DEPRECATION")
+    suspend fun getLatestUpdates(page: Int): MangasPage = fetchLatestUpdates(page).awaitSingle()

    /**
-     * Returns an observable containing a page with a list of manga.
-     *
-     * @param page the page number to retrieve.
-     * @param query the search query.
-     * @param filters the list of filters to apply.
+     * Returns the list of filters for the source.
     */
-    @Deprecated("Use the suspend API instead", ReplaceWith("getSearchManga"))
+    fun getFilterList(): FilterList
+
+    @Deprecated(
+        "Use the non-RxJava API instead",
+        ReplaceWith("getPopularManga"),
+    )
+    fun fetchPopularManga(page: Int): Observable<MangasPage> = throw IllegalStateException("Not used")
+
+    @Deprecated(
+        "Use the non-RxJava API instead",
+        ReplaceWith("getSearchManga"),
+    )
    fun fetchSearchManga(
        page: Int,
        query: String,
        filters: FilterList,
-    ): Observable<MangasPage> = throw UnsupportedOperationException()
+    ): Observable<MangasPage> = throw IllegalStateException("Not used")

-    /**
-     * Returns an observable containing a page with a list of latest manga updates.
-     *
-     * @param page the page number to retrieve.
-     */
-    @Deprecated("Use the suspend API instead", ReplaceWith("getLatestUpdates"))
-    fun fetchLatestUpdates(page: Int): Observable<MangasPage> = throw UnsupportedOperationException()
+    @Deprecated(
+        "Use the non-RxJava API instead",
+        ReplaceWith("getLatestUpdates"),
+    )
+    fun fetchLatestUpdates(page: Int): Observable<MangasPage> = throw IllegalStateException("Not used")
 }
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/PreferenceScreen.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/PreferenceScreen.kt
@@ -1,4 +0,0 @@
-package eu.kanade.tachiyomi.source
-
-@Suppress("unused")
-typealias PreferenceScreen = androidx.preference.PreferenceScreen
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt
@@ -1,12 +1,10 @@
 package eu.kanade.tachiyomi.source

-import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.model.SMangaUpdate
 import rx.Observable
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle

 /**
 * A basic interface for creating a source. It could be an online source, a local source, etc.
@@ -26,86 +24,53 @@ interface Source {
        get() = ""

    /**
-     * Whether the source has support for latest updates.
+     * Get the updated details for a manga.
+     *
+     * @since extensions-lib 1.5
+     * @param manga the manga to update.
+     * @return the updated manga.
     */
-    val supportsLatest: Boolean
+    @Suppress("DEPRECATION")
+    suspend fun getMangaDetails(manga: SManga): SManga = fetchMangaDetails(manga).awaitSingle()

    /**
-     * Returns the list of filters for the source.
+     * Get all the available chapters for a manga.
+     *
+     * @since extensions-lib 1.5
+     * @param manga the manga to update.
+     * @return the chapters for the manga.
     */
-    fun getFilterList(): FilterList = FilterList()
-
-    /**
-     * Get a page with a list of manga.
-     *
-     * @since tachiyomix 1.6
-     * @param page the page number to retrieve.
-     */
-    suspend fun getPopularManga(page: Int): MangasPage
-
-    /**
-     * Get a page with a list of latest manga updates.
-     *
-     * @since tachiyomix 1.6
-     * @param page the page number to retrieve.
-     */
-    suspend fun getLatestUpdates(page: Int): MangasPage
-
-    /**
-     * Get a page with a list of manga.
-     *
-     * @since tachiyomix 1.6
-     * @param page the page number to retrieve.
-     * @param query the search query.
-     * @param filters the list of filters to apply.
-     */
-    suspend fun getSearchManga(
-        page: Int,
-        query: String,
-        filters: FilterList,
-    ): MangasPage
-
-    /**
-     * Fetches updated information for a manga.
-     *
-     * Depending on the provided flags or source availability, this may include
-     * updated manga metadata, available chapters, or both.
-     *
-     * If a value is not requested, the existing provided value can be returned as-is.
-     * The host app may apply any returned updates regardless of the flags,
-     * so care should be taken to only return accurate and intentional changes.
-     *
-     * @since tachiyomix 1.6
-     * @param manga The manga to fetch updates for.
-     * @param chapters Existing chapters of the manga
-     * @param fetchDetails Whether to fetch updated manga details.
-     * @param fetchChapters Whether to fetch available chapters.
-     */
-    suspend fun getMangaUpdate(
-        manga: SManga,
-        chapters: List<SChapter>,
-        fetchDetails: Boolean,
-        fetchChapters: Boolean,
-    ): SMangaUpdate
+    @Suppress("DEPRECATION")
+    suspend fun getChapterList(manga: SManga): List<SChapter> = fetchChapterList(manga).awaitSingle()

    /**
     * Get the list of pages a chapter has. Pages should be returned
     * in the expected order; the index is ignored.
     *
-     * @since tachiyomix 1.6
+     * @since extensions-lib 1.5
     * @param chapter the chapter.
     * @return the pages for the chapter.
     */
-    suspend fun getPageList(chapter: SChapter): List<Page>
+    @Suppress("DEPRECATION")
+    suspend fun getPageList(chapter: SChapter): List<Page> = fetchPageList(chapter).awaitSingle()

-    @Deprecated("Use the combined suspend API instead", ReplaceWith("getMangaUpdate"))
-    fun fetchMangaDetails(manga: SManga): Observable<SManga> = throw UnsupportedOperationException()
+    @Deprecated(
+        "Use the non-RxJava API instead",
+        ReplaceWith("getMangaDetails"),
+    )
+    fun fetchMangaDetails(manga: SManga): Observable<SManga> = throw IllegalStateException("Not used")

-    @Deprecated("Use the combined suspend API instead", ReplaceWith("getMangaUpdate"))
-    fun fetchChapterList(manga: SManga): Observable<List<SChapter>> = throw UnsupportedOperationException()
+    @Deprecated(
+        "Use the non-RxJava API instead",
+        ReplaceWith("getChapterList"),
+    )
+    fun fetchChapterList(manga: SManga): Observable<List<SChapter>> = throw IllegalStateException("Not used")

-    @Deprecated("Use the suspend API instead", ReplaceWith("getPageList"))
-    fun fetchPageList(chapter: SChapter): Observable<List<Page>> = throw UnsupportedOperationException()
+    @Deprecated(
+        "Use the non-RxJava API instead",
+        ReplaceWith("getPageList"),
+    )
+    fun fetchPageList(chapter: SChapter): Observable<List<Page>> = throw IllegalStateException("Not used")
 }

 // fun Source.icon(): Drawable? = Injekt.get<ExtensionManager>().getAppIconForSource(this)
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt
@@ -23,15 +23,12 @@ import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.model.SMangaUpdate
 import eu.kanade.tachiyomi.util.chapter.ChapterRecognition
 import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder
 import eu.kanade.tachiyomi.util.storage.EpubFile
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.supervisorScope
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
@@ -44,7 +41,7 @@ import org.jetbrains.exposed.v1.jdbc.insert
 import org.jetbrains.exposed.v1.jdbc.insertAndGetId
 import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.registerSource
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.registerCatalogueSource
 import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
@@ -170,20 +167,8 @@ class LocalSource(
        return MangasPage(mangas.toList(), false)
    }

-    override suspend fun getMangaUpdate(
-        manga: SManga,
-        chapters: List<SChapter>,
-        fetchDetails: Boolean,
-        fetchChapters: Boolean,
-    ): SMangaUpdate =
-        supervisorScope {
-            val asyncManga = if (fetchDetails) async { getMangaDetails(manga) } else null
-            val asyncChapters = if (fetchChapters) async { getChapterList(manga) } else null
-            SMangaUpdate(asyncManga?.await() ?: manga, asyncChapters?.await() ?: chapters)
-        }
-
    // Manga details related
-    private suspend fun getMangaDetails(manga: SManga): SManga =
+    override suspend fun getMangaDetails(manga: SManga): SManga =
        withContext(Dispatchers.IO) {
            coverManager.find(manga.url)?.let {
                manga.thumbnail_url = it.absolutePath
@@ -304,7 +289,7 @@ class LocalSource(
    }

    // Chapters
-    private suspend fun getChapterList(manga: SManga): List<SChapter> =
+    override suspend fun getChapterList(manga: SManga): List<SChapter> =
        fileSystem
            .getFilesInMangaDirectory(manga.url)
            // Only keep supported formats
@@ -482,8 +467,7 @@ class LocalSource(
                            it[versionName] = "1.2"
                            it[versionCode] = 0
                            it[lang] = LANG
-                            it[extensionLib] = "1.2"
-                            it[contentWarning] = 0
+                            it[isNsfw] = false
                            it[isInstalled] = true
                        }

@@ -492,12 +476,13 @@ class LocalSource(
                        it[name] = NAME
                        it[lang] = LANG
                        it[extension] = extensionId
+                        it[isNsfw] = false
                    }
                }
            }

            val fs = LocalSourceFileSystem(applicationDirs)
-            registerSource(ID to LocalSource(fs, LocalCoverManager(fs)))
+            registerCatalogueSource(ID to LocalSource(fs, LocalCoverManager(fs)))
        }
    }
 }
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt
@@ -1,22 +1,6 @@
 package eu.kanade.tachiyomi.source.model

-class MangasPage(
+data class MangasPage(
    val mangas: List<SManga>,
    val hasNextPage: Boolean,
-) {
-    @Deprecated("MangasPage is now a regular class")
-    operator fun component1(): List<SManga> = mangas
-
-    @Deprecated("MangasPage is now a regular class")
-    operator fun component2(): Boolean = hasNextPage
-
-    @Deprecated("MangasPage is now a regular class")
-    fun copy(
-        mangas: List<SManga> = this.mangas,
-        hasNextPage: Boolean = this.hasNextPage,
-    ): MangasPage =
-        MangasPage(
-            mangas = mangas,
-            hasNextPage = hasNextPage,
-        )
-}
+)
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/Page.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/Page.kt
@@ -27,4 +27,12 @@ open class Page(
                -1
            }
    }
+
+    companion object {
+        const val QUEUE = 0
+        const val LOAD_PAGE = 1
+        const val DOWNLOAD_IMAGE = 2
+        const val READY = 3
+        const val ERROR = 4
+    }
 }
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt
@@ -2,7 +2,6 @@

 package eu.kanade.tachiyomi.source.model

-import kotlinx.serialization.json.JsonObject
 import java.io.Serializable

 interface SChapter : Serializable {
@@ -10,25 +9,12 @@ interface SChapter : Serializable {

    var name: String

+    var date_upload: Long
+
    var chapter_number: Float

    var scanlator: String?

-    var date_upload: Long
-
-    /**
-     * Extra metadata associated with the chapter.
-     *
-     * The JSON object is not visible to users and intended for internal or source-specific
-     * purposes. Apps may define their own namespaced keys (e.g., `"mihon.*"`) for sources to populate.
-     *
-     * This allows apps to attach and ask for custom information without affecting the visible
-     * chapter data.
-     *
-     * @since tachiyomix 1.6
-     */
-    var memo: JsonObject
-
    fun copyFrom(other: SChapter) {
        name = other.name
        url = other.url
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt
@@ -2,19 +2,14 @@

 package eu.kanade.tachiyomi.source.model

-import kotlinx.serialization.json.JsonObject
-import suwayomi.tachidesk.manga.impl.util.lang.EMPTY
-
 class SChapterImpl : SChapter {
    override lateinit var url: String

    override lateinit var name: String

+    override var date_upload: Long = 0
+
    override var chapter_number: Float = -1f

    override var scanlator: String? = null
-
-    override var date_upload: Long = 0
-
-    override var memo: JsonObject = JsonObject.EMPTY
 }
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt
@@ -2,7 +2,6 @@

 package eu.kanade.tachiyomi.source.model

-import kotlinx.serialization.json.JsonObject
 import java.io.Serializable

 interface SManga : Serializable {
@@ -10,58 +9,22 @@ interface SManga : Serializable {

    var title: String

-    var thumbnail_url: String?
-
    var artist: String?

    var author: String?

-    var status: Int
-
    var description: String?

    var genre: String?

+    var status: Int
+
+    var thumbnail_url: String?
+
    var update_strategy: UpdateStrategy

    var initialized: Boolean

-    /**
-     * Extra metadata associated with the manga.
-     *
-     * The JSON object is not visible to users and intended for internal or source-specific
-     * purposes. Apps may define their own namespaced keys (e.g., `"mihon.*"`) for sources to populate.
-     *
-     * This allows apps to attach and ask for custom information without affecting the visible
-     * manga data.
-     *
-     * @since tachiyomix 1.6
-     */
-    var memo: JsonObject
-
-    fun getGenres(): List<String>? {
-        if (genre.isNullOrBlank()) return null
-        return genre
-            ?.split(", ")
-            ?.map { it.trim() }
-            ?.filterNot { it.isBlank() }
-            ?.distinct()
-    }
-
-    fun copy() =
-        create().also {
-            it.url = url
-            it.title = title
-            it.artist = artist
-            it.author = author
-            it.description = description
-            it.genre = genre
-            it.status = status
-            it.thumbnail_url = thumbnail_url
-            it.update_strategy = update_strategy
-            it.initialized = initialized
-        }
-
    companion object {
        const val UNKNOWN = 0
        const val ONGOING = 1
@@ -74,3 +37,30 @@ interface SManga : Serializable {
        fun create(): SManga = SMangaImpl()
    }
 }
+
+// fun SManga.toMangaInfo(): MangaInfo {
+//    return MangaInfo(
+//        key = this.url,
+//        title = this.title,
+//        artist = this.artist ?: "",
+//        author = this.author ?: "",
+//        description = this.description ?: "",
+//        genres = this.genre?.split(", ") ?: emptyList(),
+//        status = this.status,
+//        cover = this.thumbnail_url ?: ""
+//    )
+// }
+//
+// fun MangaInfo.toSManga(): SManga {
+//    val mangaInfo = this
+//    return SManga.create().apply {
+//        url = mangaInfo.key
+//        title = mangaInfo.title
+//        artist = mangaInfo.artist
+//        author = mangaInfo.author
+//        description = mangaInfo.description
+//        genre = mangaInfo.genres.joinToString(", ")
+//        status = mangaInfo.status
+//        thumbnail_url = mangaInfo.cover
+//    }
+// }
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt
@@ -2,29 +2,24 @@

 package eu.kanade.tachiyomi.source.model

-import kotlinx.serialization.json.JsonObject
-import suwayomi.tachidesk.manga.impl.util.lang.EMPTY
-
 class SMangaImpl : SManga {
    override lateinit var url: String

    override lateinit var title: String

-    override var thumbnail_url: String? = null
-
    override var artist: String? = null

    override var author: String? = null

-    override var status: Int = 0
-
    override var description: String? = null

    override var genre: String? = null

+    override var status: Int = 0
+
+    override var thumbnail_url: String? = null
+
    override var update_strategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE

    override var initialized: Boolean = false
-
-    override var memo: JsonObject = JsonObject.EMPTY
 }
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaUpdate.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaUpdate.kt
@@ -1,7 +0,0 @@
-package eu.kanade.tachiyomi.source.model
-
-@Suppress("UNUSED")
-class SMangaUpdate(
-    val manga: SManga,
-    val chapters: List<SChapter>,
-)
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt
@@ -1,22 +1,6 @@
 package eu.kanade.tachiyomi.source.model

-/**
- * Define the update strategy for a single [SManga].
- * The strategy used will only take effect on the library update.
- *
- * @since extensions-lib 1.4
- */
 enum class UpdateStrategy {
-    /**
-     * Series marked as always update will be included in the library
-     * update if they aren't excluded by additional restrictions.
-     */
    ALWAYS_UPDATE,
-
-    /**
-     * Series marked as only fetch once will be automatically skipped
-     * during library updates. Useful for cases where the series is previously
-     * known to be finished and have only a single chapter, for example.
-     */
    ONLY_FETCH_ONCE,
 }
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt
@@ -25,6 +25,7 @@ import java.security.MessageDigest
 /**
 * A simple implementation for sources from a website.
 */
+@Suppress("unused")
 abstract class HttpSource : CatalogueSource {
    /**
     * Network service.
@@ -36,24 +37,11 @@ abstract class HttpSource : CatalogueSource {
     */
    abstract val baseUrl: String

-    /**
-     * Returns the base (home) URL of the website as a string.
-     *
-     * This is typically the root address that serves as the main entry point
-     * to the site's content, such as "https://mihon.tech".
-     *
-     * This method is used in the browse screen to determine the URL
-     * opened when tapping "Open in WebView".
-     *
-     * @return The website’s home page URL. Defaults to [baseUrl].
-     */
-    open fun getHomeUrl(): String = baseUrl
-
    /**
     * Version id used to generate the source id. If the site completely changes and urls are
     * incompatible, you may increase this value and it'll be considered as a new source.
     */
-    open val versionId: Int = 1
+    open val versionId = 1

    /**
     * ID of the source. By default it uses a generated id using the first 16 characters (64 bits)
@@ -65,7 +53,7 @@ abstract class HttpSource : CatalogueSource {
     *
     * Note: the generated ID sets the sign bit to `0`.
     */
-    override val id: Long by lazy { generateId(name, lang, versionId) }
+    override val id by lazy { generateId() }

    /**
     * Headers used for requests.
@@ -75,7 +63,10 @@ abstract class HttpSource : CatalogueSource {
    /**
     * Default network client for doing requests.
     */
-    open val client: OkHttpClient get() = network.client
+    open val client: OkHttpClient
+        get() = network.client
+
+    private fun generateId(): Long = generateId("${name.lowercase()}/$lang/$versionId")

    /**
     * Generates a unique ID for the source based on the provided [name], [lang] and
@@ -100,6 +91,10 @@ abstract class HttpSource : CatalogueSource {
        versionId: Int,
    ): Long {
        val key = "${name.lowercase()}/$lang/$versionId"
+        return generateId(key)
+    }
+
+    private fun generateId(key: String): Long {
        val bytes = MessageDigest.getInstance("MD5").digest(key.toByteArray())
        return (0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) }.reduce(Long::or) and Long.MAX_VALUE
    }
@@ -107,7 +102,7 @@ abstract class HttpSource : CatalogueSource {
    /**
     * Headers builder for requests. Implementations can override this method for custom headers.
     */
-    protected open fun headersBuilder(): Headers.Builder =
+    protected open fun headersBuilder() =
        Headers.Builder().apply {
            add("User-Agent", network.defaultUserAgentProvider())
        }
@@ -115,7 +110,7 @@ abstract class HttpSource : CatalogueSource {
    /**
     * Visible name of the source.
     */
-    override fun toString(): String = "$name (${lang.uppercase()})"
+    override fun toString() = "$name (${lang.uppercase()})"

    /**
     * Returns an observable containing a page with a list of manga. Normally it's not needed to
@@ -123,8 +118,7 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param page the page number to retrieve.
     */
-    @Suppress("DEPRECATION")
-    @Deprecated("Use the suspend API instead", ReplaceWith("getPopularManga"))
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getPopularManga"))
    override fun fetchPopularManga(page: Int): Observable<MangasPage> =
        client
            .newCall(popularMangaRequest(page))
@@ -138,24 +132,14 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param page the page number to retrieve.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun popularMangaRequest(page: Int): Request = throw UnsupportedOperationException()
+    protected abstract fun popularMangaRequest(page: Int): Request

    /**
     * Parses the response from the site and returns a [MangasPage] object.
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun popularMangaParse(response: Response): MangasPage = throw UnsupportedOperationException()
+    protected abstract fun popularMangaParse(response: Response): MangasPage

    /**
     * Returns an observable containing a page with a list of manga. Normally it's not needed to
@@ -165,17 +149,22 @@ abstract class HttpSource : CatalogueSource {
     * @param query the search query.
     * @param filters the list of filters to apply.
     */
-    @Suppress("DEPRECATION")
-    @Deprecated("Use the suspend API instead", ReplaceWith("getSearchManga"))
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getSearchManga"))
    override fun fetchSearchManga(
        page: Int,
        query: String,
        filters: FilterList,
    ): Observable<MangasPage> =
-        client
-            .newCall(searchMangaRequest(page, query, filters))
-            .asObservableSuccess()
-            .map { response ->
+        Observable
+            .defer {
+                try {
+                    client.newCall(searchMangaRequest(page, query, filters)).asObservableSuccess()
+                } catch (e: NoClassDefFoundError) {
+                    // RxJava doesn't handle Errors, which tends to happen during global searches
+                    // if an old extension using non-existent classes is still around
+                    throw RuntimeException(e)
+                }
+            }.map { response ->
                searchMangaParse(response)
            }

@@ -186,36 +175,25 @@ abstract class HttpSource : CatalogueSource {
     * @param query the search query.
     * @param filters the list of filters to apply.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun searchMangaRequest(
+    protected abstract fun searchMangaRequest(
        page: Int,
        query: String,
        filters: FilterList,
-    ): Request = throw UnsupportedOperationException()
+    ): Request

    /**
     * Parses the response from the site and returns a [MangasPage] object.
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun searchMangaParse(response: Response): MangasPage = throw UnsupportedOperationException()
+    protected abstract fun searchMangaParse(response: Response): MangasPage

    /**
     * Returns an observable containing a page with a list of latest manga updates.
     *
     * @param page the page number to retrieve.
     */
-    @Suppress("DEPRECATION")
-    @Deprecated("Use the suspend API instead", ReplaceWith("getLatestUpdates"))
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getLatestUpdates"))
    override fun fetchLatestUpdates(page: Int): Observable<MangasPage> =
        client
            .newCall(latestUpdatesRequest(page))
@@ -229,33 +207,26 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param page the page number to retrieve.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
+    protected abstract fun latestUpdatesRequest(page: Int): Request

    /**
     * Parses the response from the site and returns a [MangasPage] object.
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun latestUpdatesParse(response: Response): MangasPage = throw UnsupportedOperationException()
+    protected abstract fun latestUpdatesParse(response: Response): MangasPage

    /**
-     * Returns an observable with the updated details for a manga. Normally it's not needed to
-     * override this method.
+     * Get the updated details for a manga.
+     * Normally it's not needed to override this method.
     *
-     * @param manga the manga to be updated.
+     * @param manga the manga to update.
+     * @return the updated manga.
     */
    @Suppress("DEPRECATION")
-    @Deprecated("Use the combined suspend API instead", replaceWith = ReplaceWith("getMangaUpdate"))
+    override suspend fun getMangaDetails(manga: SManga): SManga = fetchMangaDetails(manga).awaitSingle()
+
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getMangaDetails"))
    override fun fetchMangaDetails(manga: SManga): Observable<SManga> =
        client
            .newCall(mangaDetailsRequest(manga))
@@ -270,11 +241,6 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param manga the manga to be updated.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
    open fun mangaDetailsRequest(manga: SManga): Request = GET(baseUrl + manga.url, headers)

    /**
@@ -282,28 +248,37 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun mangaDetailsParse(response: Response): SManga = throw UnsupportedOperationException()
+    protected abstract fun mangaDetailsParse(response: Response): SManga

    /**
-     * Returns an observable with the updated chapter list for a manga. Normally it's not needed to
-     * override this method.
+     * Get all the available chapters for a manga.
+     * Normally it's not needed to override this method.
     *
-     * @param manga the manga to look for chapters.
+     * @param manga the manga to update.
+     * @return the chapters for the manga.
+     * @throws LicensedMangaChaptersException if a manga is licensed and therefore no chapters are available.
     */
    @Suppress("DEPRECATION")
-    @Deprecated("Use the combined suspend API instead", replaceWith = ReplaceWith("getMangaUpdate"))
+    override suspend fun getChapterList(manga: SManga): List<SChapter> {
+        if (manga.status == SManga.LICENSED) {
+            throw LicensedMangaChaptersException()
+        }
+
+        return fetchChapterList(manga).awaitSingle()
+    }
+
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getChapterList"))
    override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> =
-        client
-            .newCall(chapterListRequest(manga))
-            .asObservableSuccess()
-            .map { response ->
-                chapterListParse(response)
-            }
+        if (manga.status != SManga.LICENSED) {
+            client
+                .newCall(chapterListRequest(manga))
+                .asObservableSuccess()
+                .map { response ->
+                    chapterListParse(response)
+                }
+        } else {
+            Observable.error(LicensedMangaChaptersException())
+        }

    /**
     * Returns the request for updating the chapter list. Override only if it's needed to override
@@ -311,11 +286,6 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param manga the manga to look for chapters.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
    protected open fun chapterListRequest(manga: SManga): Request = GET(baseUrl + manga.url, headers)

    /**
@@ -323,20 +293,19 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun chapterListParse(response: Response): List<SChapter> = throw UnsupportedOperationException()
+    protected abstract fun chapterListParse(response: Response): List<SChapter>

    /**
-     * Returns an observable with the page list for a chapter.
+     * Get the list of pages a chapter has. Pages should be returned
+     * in the expected order; the index is ignored.
     *
-     * @param chapter the chapter whose page list has to be fetched.
+     * @param chapter the chapter.
+     * @return the pages for the chapter.
     */
    @Suppress("DEPRECATION")
-    @Deprecated("Use the suspend API instead", ReplaceWith("getPageList"))
+    override suspend fun getPageList(chapter: SChapter): List<Page> = fetchPageList(chapter).awaitSingle()
+
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getPageList"))
    override fun fetchPageList(chapter: SChapter): Observable<List<Page>> =
        client
            .newCall(pageListRequest(chapter))
@@ -351,11 +320,6 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param chapter the chapter whose page list has to be fetched.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
    protected open fun pageListRequest(chapter: SChapter): Request = GET(baseUrl + chapter.url, headers)

    /**
@@ -363,47 +327,31 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun pageListParse(response: Response): List<Page> = throw UnsupportedOperationException()
+    protected abstract fun pageListParse(response: Response): List<Page>

    /**
     * Returns an observable with the page containing the source url of the image. If there's any
     * error, it will return null instead of throwing an exception.
     *
+     * @since extensions-lib 1.5
     * @param page the page whose source image has to be fetched.
     */
    @Suppress("DEPRECATION")
-    @Deprecated("Use the suspend API instead", ReplaceWith("getImageUrl"))
+    open suspend fun getImageUrl(page: Page): String = fetchImageUrl(page).awaitSingle()
+
+    @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getImageUrl"))
    open fun fetchImageUrl(page: Page): Observable<String> =
        client
            .newCall(imageUrlRequest(page))
            .asObservableSuccess()
            .map { imageUrlParse(it) }

-    /**
-     * Returns the image url for the provided [page]. The function is only called if [Page.imageUrl] is null.
-     *
-     * @since tachiyomix 1.6
-     * @param page the page whose source image has to be fetched.
-     */
-    @Suppress("DEPRECATION")
-    open suspend fun getImageUrl(page: Page): String = fetchImageUrl(page).awaitSingle()
-
    /**
     * Returns the request for getting the url to the source image. Override only if it's needed to
     * override the url, send different headers or request method like POST.
     *
     * @param page the chapter whose page list has to be fetched
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
    protected open fun imageUrlRequest(page: Page): Request = GET(page.url, headers)

    /**
@@ -411,14 +359,16 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        message =
-            "The helper functions are inherently limiting and hides the underlying implementation. " +
-                "Source developers should make their own implementation according to their needs.",
-    )
-    protected open fun imageUrlParse(response: Response): String = throw UnsupportedOperationException()
+    protected abstract fun imageUrlParse(response: Response): String

-    suspend fun getImage(page: Page): Response =
+    /**
+     * Returns the response of the source image.
+     * Typically does not need to be overridden.
+     *
+     * @since extensions-lib 1.5
+     * @param page the page whose source image has to be downloaded.
+     */
+    open suspend fun getImage(page: Page): Response =
        client
            .newCachelessCallWithProgress(imageRequest(page), page)
            .awaitSuccess()
@@ -437,7 +387,6 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param url the full url to the chapter.
     */
-    @Suppress("Unused")
    fun SChapter.setUrlWithoutDomain(url: String) {
        this.url = getUrlWithoutDomain(url)
    }
@@ -448,7 +397,6 @@ abstract class HttpSource : CatalogueSource {
     *
     * @param url the full url to the manga.
     */
-    @Suppress("Unused")
    fun SManga.setUrlWithoutDomain(url: String) {
        this.url = getUrlWithoutDomain(url)
    }
@@ -469,7 +417,7 @@ abstract class HttpSource : CatalogueSource {
                out += "#" + uri.fragment
            }
            out
-        } catch (_: URISyntaxException) {
+        } catch (e: URISyntaxException) {
            orig
        }

@@ -480,7 +428,6 @@ abstract class HttpSource : CatalogueSource {
     * @param manga the manga
     * @return url of the manga
     */
-    @Suppress("DEPRECATION")
    open fun getMangaUrl(manga: SManga): String = mangaDetailsRequest(manga).url.toString()

    /**
@@ -490,7 +437,6 @@ abstract class HttpSource : CatalogueSource {
     * @param chapter the chapter
     * @return url of the chapter
     */
-    @Suppress("DEPRECATION")
    open fun getChapterUrl(chapter: SChapter): String = pageListRequest(chapter).url.toString()

    /**
@@ -500,9 +446,15 @@ abstract class HttpSource : CatalogueSource {
     * @param chapter the chapter to be added.
     * @param manga the manga of the chapter.
     */
-    @Deprecated("All modifications should be done when constructing the chapter")
    open fun prepareNewChapter(
        chapter: SChapter,
        manga: SManga,
    ) {}
+
+    /**
+     * Returns the list of filters for the source.
+     */
+    override fun getFilterList() = FilterList()
 }
+
+class LicensedMangaChaptersException : Exception("Licensed - No chapters to show")
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt
@@ -12,20 +12,12 @@ import org.jsoup.nodes.Element
 /**
 * A simple implementation for sources from a website using Jsoup, an HTML parser.
 */
-@Deprecated(
-    message =
-        "In most cases sources only require a subset of the methods from this class. " +
-            "Source developers should make their own implementation according to their needs.",
-)
 abstract class ParsedHttpSource : HttpSource() {
    /**
     * Parses the response from the site and returns a [MangasPage] object.
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
    override fun popularMangaParse(response: Response): MangasPage {
        val document = response.asJsoup()

@@ -66,9 +58,6 @@ abstract class ParsedHttpSource : HttpSource() {
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
    override fun searchMangaParse(response: Response): MangasPage {
        val document = response.asJsoup()

@@ -109,9 +98,6 @@ abstract class ParsedHttpSource : HttpSource() {
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
    override fun latestUpdatesParse(response: Response): MangasPage {
        val document = response.asJsoup()

@@ -152,9 +138,6 @@ abstract class ParsedHttpSource : HttpSource() {
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
    override fun mangaDetailsParse(response: Response): SManga = mangaDetailsParse(response.asJsoup())

    /**
@@ -169,9 +152,6 @@ abstract class ParsedHttpSource : HttpSource() {
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
    override fun chapterListParse(response: Response): List<SChapter> {
        val document = response.asJsoup()
        return document.select(chapterListSelector()).map { chapterFromElement(it) }
@@ -194,9 +174,6 @@ abstract class ParsedHttpSource : HttpSource() {
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
    override fun pageListParse(response: Response): List<Page> = pageListParse(response.asJsoup())

    /**
@@ -211,9 +188,6 @@ abstract class ParsedHttpSource : HttpSource() {
     *
     * @param response the response from the site.
     */
-    @Deprecated(
-        "The helper functions are inherently limiting and hides the underlying implementation. Source developers should make their own implementation according to their needs.",
-    )
    override fun imageUrlParse(response: Response): String = imageUrlParse(response.asJsoup())

    /**
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt
@@ -1,44 +1,26 @@
 package eu.kanade.tachiyomi.source.online

 import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga

 /**
- * A source that may handle opening an SManga or SChapter for a given URI.
+ * A source that may handle opening an SManga for a given URI.
 *
 * @since extensions-lib 1.5
 */
+@Suppress("unused")
 interface ResolvableSource : Source {
    /**
-     * Returns what the given URI may open.
-     * Returns [UriType.Unknown] if the source is not able to resolve the URI.
+     * Whether this source may potentially handle the given URI.
     *
     * @since extensions-lib 1.5
     */
-    fun getUriType(uri: String): UriType
+    fun canResolveUri(uri: String): Boolean

    /**
-     * Called if [getUriType] is [UriType.Manga].
-     * Returns the corresponding SManga, if possible.
+     * Called if canHandleUri is true. Returns the corresponding SManga, if possible.
     *
     * @since extensions-lib 1.5
     */
    suspend fun getManga(uri: String): SManga?
-
-    /**
-     * Called if [getUriType] is [UriType.Chapter].
-     * Returns the corresponding SChapter, if possible.
-     *
-     * @since extensions-lib 1.5
-     */
-    suspend fun getChapter(uri: String): SChapter?
-}
-
-sealed interface UriType {
-    data object Manga : UriType
-
-    data object Chapter : UriType
-
-    data object Unknown : UriType
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt
@@ -1,519 +0,0 @@
-package suwayomi.tachidesk.global.impl.sync
-
-import android.app.Application
-import android.content.Context
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.protobuf.ProtoBuf
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
-import suwayomi.tachidesk.graphql.types.StartSyncResult
-import suwayomi.tachidesk.manga.impl.Category
-import suwayomi.tachidesk.manga.impl.Library.handleMangaThumbnail
-import suwayomi.tachidesk.manga.impl.backup.BackupFlags
-import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupImport
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupCategoryHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupMangaHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupSourceHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupChapter
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupManga
-import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
-import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
-import suwayomi.tachidesk.manga.model.table.CategoryTable
-import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.manga.model.table.toDataClass
-import suwayomi.tachidesk.server.serverConfig
-import suwayomi.tachidesk.util.HAScheduler
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import kotlin.time.Clock
-import kotlin.time.Duration.Companion.seconds
-import kotlin.time.Instant
-import kotlin.time.measureTime
-
-@Serializable
-data class SyncData(
-    val backup: Backup? = null,
-)
-
-object SyncManager {
-    private val syncPreferences = Injekt.get<Application>().getSharedPreferences("sync", Context.MODE_PRIVATE)
-    private val logger = KotlinLogging.logger {}
-
-    private var currentTaskId: String? = null
-    private val syncMutex = Mutex()
-
-    private val _lastSyncState: MutableStateFlow<SyncState?> = MutableStateFlow(null)
-    val lastSyncState: StateFlow<SyncState?> = _lastSyncState.asStateFlow()
-
-    @OptIn(DelicateCoroutinesApi::class)
-    fun scheduleSyncTask() {
-        serverConfig.subscribeTo(
-            combine(
-                serverConfig.syncYomiEnabled,
-                serverConfig.syncInterval,
-            ) { enabled, interval -> Pair(enabled, interval) },
-            { (enabled, interval) ->
-                currentTaskId?.let { HAScheduler.deschedule(it) }
-
-                currentTaskId =
-                    if (enabled && interval > 0.seconds) {
-                        val lastSyncDate =
-                            syncPreferences
-                                .getLong("last_scheduled_sync", 0L)
-                                .takeIf { it != 0L }
-                                ?.let { Instant.fromEpochMilliseconds(it) }
-
-                        if (lastSyncDate == null) {
-                            syncPreferences
-                                .edit()
-                                .putLong("last_scheduled_sync", Clock.System.now().toEpochMilliseconds())
-                                .apply()
-                        }
-
-                        val delay =
-                            if (lastSyncDate != null) {
-                                ((interval) - (Clock.System.now() - lastSyncDate)).coerceAtLeast(0.seconds)
-                            } else {
-                                interval
-                            }
-
-                        HAScheduler.schedule(
-                            {
-                                startSync(periodic = true)
-
-                                syncPreferences
-                                    .edit()
-                                    .putLong("last_scheduled_sync", Clock.System.now().toEpochMilliseconds())
-                                    .apply()
-                            },
-                            interval = interval.inWholeMilliseconds,
-                            delay = delay.inWholeMilliseconds,
-                            name = "sync",
-                        )
-                    } else {
-                        syncPreferences
-                            .edit()
-                            .remove("last_scheduled_sync")
-                            .apply()
-                        null
-                    }
-            },
-            ignoreInitialValue = false,
-        )
-    }
-
-    @OptIn(DelicateCoroutinesApi::class)
-    fun startSync(periodic: Boolean = false): StartSyncResult {
-        if (!serverConfig.syncYomiEnabled.value) {
-            return StartSyncResult.SYNC_DISABLED
-        }
-
-        if (!syncMutex.tryLock()) {
-            return StartSyncResult.SYNC_IN_PROGRESS
-        }
-
-        GlobalScope.launch {
-            try {
-                syncData(periodic)
-            } finally {
-                syncMutex.unlock()
-            }
-        }
-
-        return StartSyncResult.SUCCESS
-    }
-
-    suspend fun ensureSync() {
-        if (!serverConfig.syncYomiEnabled.value) {
-            return
-        }
-
-        if (syncMutex.tryLock()) {
-            // there is no ongoing sync, so start one
-            try {
-                syncData()
-            } finally {
-                syncMutex.unlock()
-            }
-        } else {
-            // wait for the ongoing sync to finish
-            syncMutex.withLock {}
-        }
-    }
-
-    private suspend fun syncData(periodic: Boolean = false) {
-        val startInstant = Clock.System.now()
-        _lastSyncState.value = SyncState.Started(startInstant)
-
-        try {
-            logger.info {
-                if (periodic) {
-                    "Starting periodic sync"
-                } else {
-                    "Starting manual sync"
-                }
-            }
-
-            transaction {
-                MangaTable.update({ MangaTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-                ChapterTable.update({ ChapterTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-                CategoryTable.update({ CategoryTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-            }
-
-            val backupFlags =
-                BackupFlags(
-                    includeManga = serverConfig.syncDataManga.value,
-                    includeCategories = serverConfig.syncDataCategories.value,
-                    includeChapters = serverConfig.syncDataChapters.value,
-                    includeTracking = serverConfig.syncDataTracking.value,
-                    includeHistory = serverConfig.syncDataHistory.value,
-                    includeClientData = false,
-                    includeServerSettings = false,
-                )
-
-            _lastSyncState.value = SyncState.CreatingBackup(startInstant)
-            val backupMangas = BackupMangaHandler.backup(backupFlags)
-            val backup =
-                Backup(
-                    backupMangas,
-                    BackupCategoryHandler.backup(backupFlags).filter { it.name != Category.DEFAULT_CATEGORY_NAME },
-                    BackupSourceHandler.backup(backupMangas, backupFlags),
-                    emptyMap(),
-                    null,
-                )
-
-            val syncData =
-                SyncData(
-                    backup = backup,
-                )
-
-            val remoteBackup =
-                SyncYomiSyncService.doSync(syncData, startInstant) {
-                    _lastSyncState.value = it
-                }
-
-            if (remoteBackup == null) {
-                logger.debug { "Skip restore due to network issues" }
-                finishWithError(startInstant, "Network error", periodic)
-                return
-            }
-
-            if (remoteBackup === syncData.backup) {
-                // nothing changed
-                logger.debug { "Skip restore due to remote was overwrite from local" }
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            // Stop the sync early if the remote backup is null or empty
-            if (remoteBackup.backupManga.isEmpty() && remoteBackup.backupCategories.isEmpty() && remoteBackup.backupSources.isEmpty()) {
-                logger.error { "No data found on remote server." }
-                finishWithError(startInstant, "No data found on remote server.", periodic)
-                return
-            }
-
-            val isLibraryEmpty =
-                transaction {
-                    MangaTable
-                        .selectAll()
-                        .where { MangaTable.inLibrary eq true }
-                        .empty()
-                }
-
-            // Check if it's first sync based on lastSyncTimestamp
-            if (syncPreferences.getLong("last_sync_timestamp", 0) == 0L && !isLibraryEmpty) {
-                // It's first sync no need to restore data. (just update remote data)
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            val (filteredFavorites, nonFavorites) = filterFavoritesAndNonFavorites(remoteBackup)
-            updateNonFavorites(nonFavorites)
-
-            val newSyncData =
-                backup.copy(
-                    backupManga = filteredFavorites,
-                    backupCategories = remoteBackup.backupCategories,
-                    backupSources = remoteBackup.backupSources,
-                )
-
-            val hasMangaChanges = filteredFavorites.isNotEmpty()
-            val hasCategoryChanges = remoteBackup.backupCategories != backup.backupCategories
-            val hasSourceChanges = remoteBackup.backupSources != backup.backupSources
-
-            if (!hasMangaChanges && !hasCategoryChanges && !hasSourceChanges) {
-                // update the sync timestamp
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            if (serverConfig.syncDataCategories.value) {
-                val mergedUids = newSyncData.backupCategories.map { it.uid }.toSet()
-                val mergedNames = newSyncData.backupCategories.map { it.name }.toSet()
-                val localCategories = Category.getCategoryList().filterNot { it.default } // Exclude system category
-                val categoriesToDelete =
-                    localCategories.filter {
-                        it.uid !in mergedUids && it.name !in mergedNames
-                    }
-                if (categoriesToDelete.isNotEmpty()) {
-                    transaction {
-                        categoriesToDelete.forEach {
-                            Category.removeCategory(it.id)
-                        }
-                    }
-                }
-            }
-
-            val backupStream = ProtoBuf.encodeToByteArray(Backup.serializer(), newSyncData).inputStream()
-            val restoreId =
-                ProtoBackupImport.restore(
-                    sourceStream = backupStream,
-                    flags = backupFlags,
-                    isSync = true,
-                )
-            _lastSyncState.value = SyncState.Restoring(startInstant, restoreId)
-
-            ProtoBackupImport.notifyFlow.first {
-                val restoreState = ProtoBackupImport.getRestoreState(restoreId)
-
-                restoreState == ProtoBackupImport.BackupRestoreState.Success ||
-                    restoreState == ProtoBackupImport.BackupRestoreState.Failure
-            }
-
-            // update the sync timestamp
-            finishWithSuccess(startInstant, periodic)
-        } catch (e: Throwable) {
-            logger.error { "Error syncing: ${e.message}" }
-            finishWithError(startInstant, "${e::class.qualifiedName}: ${e.message}", periodic)
-        }
-    }
-
-    private fun finishWithSuccess(
-        startInstant: Instant,
-        periodic: Boolean,
-    ) {
-        syncPreferences
-            .edit()
-            .putLong("last_sync_timestamp", Clock.System.now().toEpochMilliseconds())
-            .apply()
-        _lastSyncState.value = SyncState.Success(startInstant)
-
-        logger.info {
-            if (periodic) {
-                "Periodic sync completed successfully"
-            } else {
-                "Manual sync completed successfully"
-            }
-        }
-    }
-
-    private fun finishWithError(
-        startInstant: Instant,
-        message: String,
-        periodic: Boolean,
-    ) {
-        _lastSyncState.value = SyncState.Error(startInstant, message)
-
-        logger.info {
-            if (periodic) {
-                "Periodic sync failed: $message"
-            } else {
-                "Manual sync failed: $message"
-            }
-        }
-    }
-
-    private fun isMangaDifferent(
-        localManga: MangaDataClass,
-        remoteManga: BackupManga,
-    ): Boolean {
-        if (localManga.version != remoteManga.version) {
-            return true
-        }
-
-        val localChapters =
-            transaction {
-                ChapterTable
-                    .selectAll()
-                    .where { ChapterTable.manga eq localManga.id }
-                    .map { ChapterTable.toDataClass(it) }
-            }
-
-        if (areChaptersDifferent(localChapters, remoteManga.chapters)) {
-            return true
-        }
-
-        val localCategories =
-            transaction {
-                CategoryMangaTable
-                    .innerJoin(CategoryTable)
-                    .selectAll()
-                    .where { CategoryMangaTable.manga eq localManga.id }
-                    .map { it[CategoryTable.order] }
-            }
-
-        return localCategories.toSet() != remoteManga.categories.toSet()
-    }
-
-    private fun areChaptersDifferent(
-        localChapters: List<ChapterDataClass>,
-        remoteChapters: List<BackupChapter>,
-    ): Boolean {
-        val localChapterMap = localChapters.associateBy { it.url }
-        val remoteChapterMap = remoteChapters.associateBy { it.url }
-
-        if (localChapterMap.size != remoteChapterMap.size) {
-            return true
-        }
-
-        for ((url, localChapter) in localChapterMap) {
-            val remoteChapter = remoteChapterMap[url]
-
-            // If a matching remote chapter doesn't exist, or the version numbers are different, consider them different
-            if (remoteChapter == null || localChapter.version != remoteChapter.version) {
-                return true
-            }
-        }
-
-        return false
-    }
-
-    private fun filterFavoritesAndNonFavorites(backup: Backup): Pair<List<BackupManga>, List<BackupManga>> {
-        val favorites = mutableListOf<BackupManga>()
-        val nonFavorites = mutableListOf<BackupManga>()
-
-        val elapsedTime =
-            measureTime {
-                logger.debug { "Starting to filter favorites and non-favorites from backup data." }
-
-                backup.backupManga.forEach { remoteManga ->
-                    val localManga =
-                        transaction {
-                            MangaTable
-                                .selectAll()
-                                .where {
-                                    (MangaTable.sourceReference eq remoteManga.source) and
-                                        (MangaTable.url eq remoteManga.url)
-                                }.limit(1)
-                                .map { MangaTable.toDataClass(it) }
-                                .firstOrNull()
-                        }
-
-                    when {
-                        // Checks if the manga is in favorites and needs updating or adding
-                        remoteManga.favorite -> {
-                            if (localManga == null || isMangaDifferent(localManga, remoteManga)) {
-                                logger.debug { "Adding to favorites: ${remoteManga.title}" }
-                                favorites.add(remoteManga)
-                            } else {
-                                logger.debug { "Already up-to-date favorite: ${remoteManga.title}" }
-                            }
-                        }
-
-                        // Handle non-favorites
-                        !remoteManga.favorite -> {
-                            logger.debug { "Adding to non-favorites: ${remoteManga.title}" }
-                            nonFavorites.add(remoteManga)
-                        }
-                    }
-                }
-            }
-
-        logger.debug {
-            "Filtering completed in $elapsedTime. Favorites found: ${favorites.size}, Non-favorites found: ${nonFavorites.size}"
-        }
-
-        return Pair(favorites, nonFavorites)
-    }
-
-    private fun updateNonFavorites(nonFavorites: List<BackupManga>) {
-        nonFavorites.forEach { nonFavorite ->
-            val localManga =
-                transaction {
-                    MangaTable
-                        .selectAll()
-                        .where {
-                            (MangaTable.sourceReference eq nonFavorite.source) and
-                                (MangaTable.url eq nonFavorite.url)
-                        }.limit(1)
-                        .map { MangaTable.toDataClass(it) }
-                        .firstOrNull()
-                }
-
-            if (localManga != null) {
-                if (localManga.inLibrary != nonFavorite.favorite) {
-                    transaction {
-                        MangaTable.update({ MangaTable.id eq localManga.id }) {
-                            it[inLibrary] = nonFavorite.favorite
-                        }
-                    }.apply {
-                        handleMangaThumbnail(localManga.id, nonFavorite.favorite)
-                    }
-                }
-            }
-        }
-    }
-
-    sealed class SyncState(
-        open val startDate: Instant,
-    ) {
-        data class Started(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class CreatingBackup(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Downloading(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Merging(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Uploading(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Restoring(
-            override val startDate: Instant,
-            val restoreId: String,
-        ) : SyncState(startDate)
-
-        data class Success(
-            override val startDate: Instant,
-            val endDate: Instant = Clock.System.now(),
-        ) : SyncState(startDate)
-
-        data class Error(
-            override val startDate: Instant,
-            val message: String,
-            val endDate: Instant = Clock.System.now(),
-        ) : SyncState(startDate)
-    }
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt
@@ -1,596 +0,0 @@
-package suwayomi.tachidesk.global.impl.sync
-
-import android.app.Application
-import android.content.Context
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.PUT
-import eu.kanade.tachiyomi.network.await
-import io.github.oshai.kotlinlogging.KotlinLogging
-import io.javalin.http.HttpStatus
-import kotlinx.coroutines.CancellationException
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.protobuf.ProtoBuf
-import okhttp3.Headers
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody.Companion.toRequestBody
-import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupCategory
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupChapter
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupManga
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupSource
-import suwayomi.tachidesk.server.serverConfig
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.seconds
-import kotlin.time.Instant
-
-object SyncYomiSyncService {
-    private val syncPreferences = Injekt.get<Application>().getSharedPreferences("sync", Context.MODE_PRIVATE)
-
-    private val network: NetworkHelper by injectLazy()
-    private val logger = KotlinLogging.logger {}
-
-    private class SyncYomiException(
-        message: String?,
-    ) : Exception(message)
-
-    @Serializable
-    private data class SyncEvent(
-        val event: SyncEventStatus,
-        val device_Name: String? = null,
-        val message: String? = null,
-    )
-
-    @Serializable
-    private enum class SyncEventStatus {
-        SYNC_STARTED,
-        SYNC_SUCCESS,
-        SYNC_FAILED,
-        SYNC_ERROR,
-        SYNC_CANCELLED,
-    }
-
-    suspend fun doSync(
-        syncData: SyncData,
-        startDate: Instant,
-        setSyncState: (SyncManager.SyncState) -> Unit,
-    ): Backup? {
-        reportSyncEvent(SyncEventStatus.SYNC_STARTED)
-        setSyncState(SyncManager.SyncState.Downloading(startDate))
-
-        return try {
-            val (remoteData, etag) = pullSyncData()
-
-            val finalSyncData =
-                if (remoteData != null) {
-                    require(etag.isNotEmpty()) { "ETag should never be empty if remote data is not null" }
-                    logger.debug { "Try update remote data with ETag($etag)" }
-                    setSyncState(SyncManager.SyncState.Merging(startDate))
-                    mergeSyncData(syncData, remoteData)
-                } else {
-                    // init or overwrite remote data
-                    logger.debug { "Try overwrite remote data with ETag($etag)" }
-                    syncData
-                }
-
-            if (finalSyncData.backup != null) {
-                setSyncState(SyncManager.SyncState.Uploading(startDate))
-            }
-
-            val success = pushSyncData(finalSyncData, etag)
-            if (success) {
-                reportSyncEvent(SyncEventStatus.SYNC_SUCCESS)
-            } else {
-                reportSyncEvent(SyncEventStatus.SYNC_FAILED, "Failed to push sync data")
-            }
-
-            finalSyncData.backup
-        } catch (e: Exception) {
-            if (e is CancellationException) {
-                reportSyncEvent(SyncEventStatus.SYNC_CANCELLED, e.message)
-                throw e
-            }
-            logger.error { "Error syncing: ${e.message}" }
-            reportSyncEvent(SyncEventStatus.SYNC_ERROR, e.message)
-            throw e
-        }
-    }
-
-    private suspend fun pullSyncData(): Pair<SyncData?, String> {
-        val host = serverConfig.syncYomiHost.value
-        val apiKey = serverConfig.syncYomiApiKey.value
-        val downloadUrl = "$host/api/sync/content"
-
-        val headersBuilder = Headers.Builder().add("X-API-Token", apiKey)
-        val lastETag = syncPreferences.getString("last_sync_etag", "") ?: ""
-        if (lastETag != "") {
-            headersBuilder.add("If-None-Match", lastETag)
-        }
-        val headers = headersBuilder.build()
-
-        val downloadRequest =
-            GET(
-                url = downloadUrl,
-                headers = headers,
-            )
-
-        val response = network.client.newCall(downloadRequest).await()
-
-        if (response.code == HttpStatus.NOT_MODIFIED.code) {
-            // not modified
-            require(lastETag.isNotEmpty())
-            logger.info { "Remote server not modified" }
-            return Pair(null, lastETag)
-        } else if (response.code == HttpStatus.NOT_FOUND.code) {
-            // maybe got deleted from remote
-            return Pair(null, "")
-        }
-
-        if (response.isSuccessful) {
-            val newETag =
-                response.headers["ETag"]
-                    ?.takeIf { it.isNotEmpty() } ?: throw SyncYomiException("Missing ETag")
-
-            val byteArray =
-                response.body.byteStream().use {
-                    return@use it.readBytes()
-                }
-
-            return try {
-                val backup = ProtoBuf.decodeFromByteArray(Backup.serializer(), byteArray)
-                return Pair(SyncData(backup = backup), newETag)
-            } catch (_: SerializationException) {
-                logger.info { "Bad content responsed from server" }
-                // the body is invalid
-                // return default value so we can overwrite it
-                Pair(null, "")
-            }
-        } else {
-            val responseBody = response.body.string()
-            logger.error { "SyncError: $responseBody" }
-            throw SyncYomiException("Failed to download sync data: $responseBody")
-        }
-    }
-
-    private suspend fun pushSyncData(
-        syncData: SyncData,
-        eTag: String,
-    ): Boolean {
-        val backup = syncData.backup ?: return true
-
-        val host = serverConfig.syncYomiHost.value
-        val apiKey = serverConfig.syncYomiApiKey.value
-        val uploadUrl = "$host/api/sync/content"
-
-        val headersBuilder = Headers.Builder().add("X-API-Token", apiKey)
-        if (eTag.isNotEmpty()) {
-            headersBuilder.add("If-Match", eTag)
-        }
-        val headers = headersBuilder.build()
-
-        // Set timeout to 30 seconds
-        val timeout = 30.seconds
-        val client =
-            network.client
-                .newBuilder()
-                .connectTimeout(timeout)
-                .readTimeout(timeout)
-                .writeTimeout(timeout)
-                .build()
-
-        val byteArray = ProtoBuf.encodeToByteArray(Backup.serializer(), backup)
-        if (byteArray.isEmpty()) {
-            throw IllegalStateException("Empty backup error")
-        }
-        val body = byteArray.toRequestBody("application/octet-stream".toMediaType())
-
-        val uploadRequest =
-            PUT(
-                url = uploadUrl,
-                headers = headers,
-                body = body,
-            )
-
-        val response = client.newCall(uploadRequest).await()
-
-        return if (response.isSuccessful) {
-            val newETag =
-                response.headers["ETag"]
-                    ?.takeIf { it.isNotEmpty() } ?: throw SyncYomiException("Missing ETag")
-            syncPreferences
-                .edit()
-                .putString("last_sync_etag", newETag)
-                .apply()
-            logger.debug { "SyncYomi sync completed" }
-            true
-        } else if (response.code == HttpStatus.PRECONDITION_FAILED.code) {
-            // other clients updated remote data, will try next time
-            logger.debug { "SyncYomi sync failed with 412" }
-            false
-        } else {
-            val responseBody = response.body.string()
-            logger.error { "SyncError: $responseBody" }
-            false
-        }
-    }
-
-    private suspend fun reportSyncEvent(
-        event: SyncEventStatus,
-        message: String? = null,
-    ) {
-        try {
-            val host = serverConfig.syncYomiHost.value
-            val apiKey = serverConfig.syncYomiApiKey.value
-            val url = "$host/api/sync/event"
-
-            val headers = Headers.Builder().add("X-API-Token", apiKey).build()
-
-            // Use a fixed server name.
-            val bodyObj =
-                SyncEvent(
-                    event = event,
-                    device_Name = "Suwayomi Server",
-                    message = message,
-                )
-
-            val jsonBody = Json.encodeToString(SyncEvent.serializer(), bodyObj)
-            val requestBody = jsonBody.toRequestBody("application/json; charset=utf-8".toMediaType())
-
-            val request =
-                POST(
-                    url = url,
-                    headers = headers,
-                    body = requestBody,
-                )
-
-            network.client
-                .newCall(request)
-                .await()
-                .close()
-        } catch (e: Exception) {
-            logger.error { "Failed to report sync event: ${e.message}" }
-        }
-    }
-
-    fun mergeSyncData(
-        localSyncData: SyncData,
-        remoteSyncData: SyncData,
-    ): SyncData {
-        val mergedCategoriesList =
-            mergeCategoriesLists(localSyncData.backup?.backupCategories, remoteSyncData.backup?.backupCategories)
-
-        val mergedMangaList =
-            mergeMangaLists(
-                localSyncData.backup?.backupManga,
-                remoteSyncData.backup?.backupManga,
-                localSyncData.backup?.backupCategories ?: emptyList(),
-                remoteSyncData.backup?.backupCategories ?: emptyList(),
-                mergedCategoriesList,
-            )
-
-        val mergedSourcesList =
-            mergeSourcesLists(localSyncData.backup?.backupSources, remoteSyncData.backup?.backupSources)
-
-        // Create the merged Backup object
-        val mergedBackup =
-            Backup(
-                backupManga = mergedMangaList,
-                backupCategories = mergedCategoriesList,
-                backupSources = mergedSourcesList,
-                meta = emptyMap(),
-                serverSettings = null,
-            )
-
-        // Create the merged SData object
-        return SyncData(
-            backup = mergedBackup,
-        )
-    }
-
-    private fun mergeMangaLists(
-        localMangaList: List<BackupManga>?,
-        remoteMangaList: List<BackupManga>?,
-        localCategories: List<BackupCategory>,
-        remoteCategories: List<BackupCategory>,
-        mergedCategories: List<BackupCategory>,
-    ): List<BackupManga> {
-        val localMangaListSafe = localMangaList.orEmpty()
-        val remoteMangaListSafe = remoteMangaList.orEmpty()
-
-        logger.debug { "Starting merge. Local list size: ${localMangaListSafe.size}, Remote list size: ${remoteMangaListSafe.size}" }
-
-        fun mangaCompositeKey(manga: BackupManga): String = "${manga.source}|${manga.url}"
-
-        // Create maps using composite keys
-        val localMangaMap = localMangaListSafe.associateBy { mangaCompositeKey(it) }
-        val remoteMangaMap = remoteMangaListSafe.associateBy { mangaCompositeKey(it) }
-
-        val localCategoriesMapByOrder = localCategories.associateBy { it.order }
-        val remoteCategoriesMapByOrder = remoteCategories.associateBy { it.order }
-        val mergedCategoriesMapByName = mergedCategories.associateBy { it.name }
-
-        fun updateCategories(
-            theManga: BackupManga,
-            theMap: Map<Int, BackupCategory>,
-        ): BackupManga =
-            theManga.copy(
-                categories =
-                    theManga.categories.mapNotNull {
-                        theMap[it]?.let { category ->
-                            mergedCategoriesMapByName[category.name]?.order
-                        }
-                    },
-            )
-
-        val lastSyncTime = syncPreferences.getLong("last_sync_timestamp", 0).milliseconds.inWholeSeconds
-
-        val mergedList =
-            (localMangaMap.keys + remoteMangaMap.keys).distinct().mapNotNull { compositeKey ->
-                val local = localMangaMap[compositeKey]
-                val remote = remoteMangaMap[compositeKey]
-
-                // New version comparison logic
-                when {
-                    local != null && remote == null -> {
-                        if (lastSyncTime == 0L || local.lastModifiedAt > lastSyncTime) {
-                            updateCategories(local, localCategoriesMapByOrder)
-                        } else {
-                            logger.debug { "Dropping local manga deleted on remote: ${local.title}." }
-                            null
-                        }
-                    }
-
-                    local == null && remote != null -> {
-                        if (lastSyncTime == 0L || remote.lastModifiedAt > lastSyncTime) {
-                            updateCategories(remote, remoteCategoriesMapByOrder)
-                        } else {
-                            logger.debug { "Dropping deleted remote manga: ${remote.title}." }
-                            null
-                        }
-                    }
-
-                    local != null && remote != null -> {
-                        // Compare versions to decide which manga to keep
-                        if (local.version >= remote.version) {
-                            logger.debug { "Keeping local version of ${local.title} with merged chapters." }
-                            updateCategories(
-                                local.copy(
-                                    chapters =
-                                        mergeChapters(
-                                            local.chapters,
-                                            remote.chapters,
-                                            lastSyncTime,
-                                            serverConfig.syncDataChapters.value,
-                                        ),
-                                ),
-                                localCategoriesMapByOrder,
-                            )
-                        } else {
-                            logger.debug { "Keeping remote version of ${remote.title} with merged chapters." }
-                            updateCategories(
-                                remote.copy(
-                                    chapters =
-                                        mergeChapters(
-                                            local.chapters,
-                                            remote.chapters,
-                                            lastSyncTime,
-                                            serverConfig.syncDataChapters.value,
-                                        ),
-                                ),
-                                remoteCategoriesMapByOrder,
-                            )
-                        }
-                    }
-
-                    else -> {
-                        null
-                    } // No manga found for key
-                }
-            }
-
-        // Counting favorites and non-favorites
-        val (favorites, nonFavorites) = mergedList.partition { it.favorite }
-
-        logger.debug {
-            "Merge completed. Total merged manga: ${mergedList.size}, Favorites: ${favorites.size}, Non-Favorites: ${nonFavorites.size}"
-        }
-
-        return mergedList
-    }
-
-    private fun mergeChapters(
-        localChapters: List<BackupChapter>,
-        remoteChapters: List<BackupChapter>,
-        lastSyncTime: Long,
-        syncingChapters: Boolean,
-    ): List<BackupChapter> {
-        if (!syncingChapters) {
-            return remoteChapters // If not syncing chapters, keep remote untouched
-        }
-
-        fun chapterCompositeKey(chapter: BackupChapter): String = chapter.url
-
-        val localChapterMap = localChapters.associateBy { chapterCompositeKey(it) }
-        val remoteChapterMap = remoteChapters.associateBy { chapterCompositeKey(it) }
-
-        logger.debug { "Starting chapter merge. Local chapters: ${localChapters.size}, Remote chapters: ${remoteChapters.size}" }
-
-        // Merge both chapter maps based on version numbers
-        val mergedChapters =
-            (localChapterMap.keys + remoteChapterMap.keys).distinct().mapNotNull { compositeKey ->
-                val localChapter = localChapterMap[compositeKey]
-                val remoteChapter = remoteChapterMap[compositeKey]
-
-                logger.debug {
-                    "Processing chapter key: $compositeKey. Local chapter: ${localChapter != null}, Remote chapter: ${remoteChapter != null}"
-                }
-
-                when {
-                    localChapter != null && remoteChapter == null -> {
-                        if (lastSyncTime == 0L || localChapter.lastModifiedAt > lastSyncTime) {
-                            logger.debug { "Keeping local chapter: ${localChapter.name}." }
-                            localChapter
-                        } else {
-                            logger.debug { "Dropping local chapter deleted on remote: ${localChapter.name}." }
-                            null
-                        }
-                    }
-
-                    localChapter == null && remoteChapter != null -> {
-                        if (lastSyncTime == 0L || remoteChapter.lastModifiedAt > lastSyncTime) {
-                            logger.debug { "Taking remote chapter: ${remoteChapter.name}." }
-                            remoteChapter
-                        } else {
-                            logger.debug { "Dropping deleted remote chapter: ${remoteChapter.name}." }
-                            null
-                        }
-                    }
-
-                    localChapter != null && remoteChapter != null -> {
-                        // Use version number to decide which chapter to keep
-                        val chosenChapter =
-                            if (localChapter.version >= remoteChapter.version) {
-                                // If there are more chapter on remote, local sourceOrder will need to be updated to maintain correct source order.
-                                if (localChapters.size < remoteChapters.size) {
-                                    localChapter.copy(sourceOrder = remoteChapter.sourceOrder)
-                                } else {
-                                    localChapter
-                                }
-                            } else {
-                                remoteChapter
-                            }
-                        logger.debug {
-                            "Merging chapter: ${chosenChapter.name}. Chosen version from: ${if (localChapter.version >= remoteChapter.version) "Local" else "Remote"}, Local version: ${localChapter.version}, Remote version: ${remoteChapter.version}."
-                        }
-                        chosenChapter
-                    }
-
-                    else -> {
-                        logger.debug { "No chapter found for composite key: $compositeKey. Skipping." }
-                        null
-                    }
-                }
-            }
-
-        logger.debug { "Chapter merge completed. Total merged chapters: ${mergedChapters.size}" }
-
-        return mergedChapters
-    }
-
-    private fun mergeCategoriesLists(
-        localCategoriesList: List<BackupCategory>?,
-        remoteCategoriesList: List<BackupCategory>?,
-    ): List<BackupCategory> {
-        if (localCategoriesList == null) return remoteCategoriesList ?: emptyList()
-        if (remoteCategoriesList == null) return localCategoriesList
-        val result = mutableListOf<BackupCategory>()
-        val processedLocals = mutableSetOf<BackupCategory>()
-
-        val localMapByUid = localCategoriesList.filter { it.uid != 0L }.associateBy { it.uid }
-        val localMapByName = localCategoriesList.associateBy { it.name }
-
-        val lastSyncTime = syncPreferences.getLong("last_sync_timestamp", 0)
-
-        remoteCategoriesList.forEach { remote ->
-            var localMatch: BackupCategory? = null
-
-            // 1. Try match by UID
-            if (remote.uid != 0L) {
-                localMatch = localMapByUid[remote.uid]
-            }
-
-            // 2. Try match by Name (fallback)
-            if (localMatch == null) {
-                localMatch = localMapByName[remote.name]
-            }
-
-            if (localMatch != null) {
-                processedLocals.add(localMatch)
-                // Conflict resolution
-                if (localMatch.version >= remote.version) {
-                    logger.debug { "Keeping local category: ${localMatch.name} (UID: ${localMatch.uid})" }
-                    result.add(localMatch)
-                } else {
-                    logger.debug { "Keeping remote category: ${remote.name} (UID: ${remote.uid})" }
-                    // Preserve Local UID if Remote was 0
-                    if (remote.uid == 0L) {
-                        remote.uid = localMatch.uid
-                    }
-                    result.add(remote)
-                }
-            } else {
-                val remoteModifiedTimeMillis = remote.lastModifiedAt.seconds.inWholeMilliseconds
-                if (lastSyncTime == 0L || remoteModifiedTimeMillis > lastSyncTime) {
-                    logger.debug { "Adding new remote category: ${remote.name} (UID: ${remote.uid})" }
-                    result.add(remote)
-                } else {
-                    logger.debug { "Dropping deleted remote category: ${remote.name} (UID: ${remote.uid})" }
-                }
-            }
-        }
-
-        // Add remaining Local Categories
-        localCategoriesList.forEach { local ->
-            if (local !in processedLocals) {
-                val localModifiedTimeMillis = local.lastModifiedAt.seconds.inWholeMilliseconds
-                if (lastSyncTime == 0L || localModifiedTimeMillis > lastSyncTime) {
-                    logger.debug { "Keeping local only category: ${local.name} (UID: ${local.uid})" }
-                    result.add(local)
-                } else {
-                    logger.debug { "Dropping local category deleted on remote: ${local.name} (UID: ${local.uid})" }
-                }
-            }
-        }
-
-        return result.sortedBy { it.order }
-    }
-
-    private fun mergeSourcesLists(
-        localSources: List<BackupSource>?,
-        remoteSources: List<BackupSource>?,
-    ): List<BackupSource> {
-        // Create maps using sourceId as key
-        val localSourceMap = localSources?.associateBy { it.sourceId } ?: emptyMap()
-        val remoteSourceMap = remoteSources?.associateBy { it.sourceId } ?: emptyMap()
-
-        logger.debug { "Starting source merge. Local sources: ${localSources?.size}, Remote sources: ${remoteSources?.size}" }
-
-        // Merge both source maps
-        val mergedSources =
-            (localSourceMap.keys + remoteSourceMap.keys).distinct().mapNotNull { sourceId ->
-                val localSource = localSourceMap[sourceId]
-                val remoteSource = remoteSourceMap[sourceId]
-
-                logger.debug {
-                    "Processing source ID: $sourceId. Local source: ${localSource != null}, Remote source: ${remoteSource != null}"
-                }
-
-                when {
-                    localSource != null && remoteSource == null -> {
-                        logger.debug { "Using local source: ${localSource.name}." }
-                        localSource
-                    }
-
-                    remoteSource != null && localSource == null -> {
-                        logger.debug { "Using remote source: ${remoteSource.name}." }
-                        remoteSource
-                    }
-
-                    else -> {
-                        logger.debug { "Remote and local have the same source ID: $sourceId. Keeping local." }
-                        localSource
-                    }
-                }
-            }
-
-        logger.debug { "Source merge completed. Total merged sources: ${mergedSources.size}" }
-
-        return mergedSources
-    }
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionStoreDataLoader.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionStoreDataLoader.kt
@@ -1,57 +0,0 @@
-package suwayomi.tachidesk.graphql.dataLoaders
-
-import com.expediagroup.graphql.dataloader.KotlinDataLoader
-import graphql.GraphQLContext
-import org.dataloader.DataLoader
-import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.graphql.types.ExtensionNodeList
-import suwayomi.tachidesk.graphql.types.ExtensionNodeList.Companion.toNodeList
-import suwayomi.tachidesk.graphql.types.ExtensionStoreType
-import suwayomi.tachidesk.graphql.types.ExtensionType
-import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
-import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-
-class ExtensionStoreDataLoader : KotlinDataLoader<String, ExtensionStoreType> {
-    override val dataLoaderName = "ExtensionStoreDataLoader"
-
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionStoreType> =
-        DataLoaderFactory.newDataLoader { ids ->
-            future {
-                transaction {
-                    addLogger(Slf4jSqlDebugLogger)
-                    val extensionStoreByIndexUrl =
-                        ExtensionStoreTable
-                            .selectAll()
-                            .where { ExtensionStoreTable.indexUrl inList ids }
-                            .map { ExtensionStoreType(it) }
-                            .associateBy { it.indexUrl }
-                    ids.map { extensionStoreByIndexUrl[it] }
-                }
-            }
-        }
-}
-
-class ExtensionsForExtensionStore : KotlinDataLoader<String, ExtensionNodeList> {
-    override val dataLoaderName = "ExtensionsForExtensionStore"
-
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionNodeList> =
-        DataLoaderFactory.newDataLoader<String, ExtensionNodeList> { ids ->
-            future {
-                transaction {
-                    addLogger(Slf4jSqlDebugLogger)
-                    val extensionByIndexUrl =
-                        ExtensionTable
-                            .selectAll()
-                            .where { ExtensionTable.storeIndexUrl inList ids }
-                            .map { ExtensionType(it) }
-                            .groupBy { it.storeIndexUrl }
-                    ids.map { (extensionByIndexUrl[it] ?: emptyList()).toNodeList() }
-                }
-            }
-        }
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
@@ -2,7 +2,6 @@

 package suwayomi.tachidesk.graphql.mutations

-import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.jetbrains.exposed.v1.core.LikePattern
@@ -26,7 +25,6 @@ import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.MetaInput
 import suwayomi.tachidesk.graphql.types.SyncConflictInfoType
 import suwayomi.tachidesk.manga.impl.Chapter
-import suwayomi.tachidesk.manga.impl.Manga
 import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReadyById
 import suwayomi.tachidesk.manga.impl.sync.KoreaderSyncService
 import suwayomi.tachidesk.manga.model.table.ChapterMetaTable
@@ -169,12 +167,11 @@ class ChapterMutation {
    )

    @RequireAuth
-    @GraphQLDeprecated("Deprecated in Tachiyomix 1.6", ReplaceWith("fetchMangaAndChapters"))
    fun fetchChapters(input: FetchChaptersInput): CompletableFuture<FetchChaptersPayload?> {
        val (clientMutationId, mangaId) = input

        return future {
-            Manga.updateMangaAndChapters(mangaId, updateManga = false)
+            Chapter.fetchChapterList(mangaId)

            val chapters =
                transaction {
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt
@@ -10,11 +10,9 @@ import org.jetbrains.exposed.v1.core.neq
 import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.ExtensionStoreType
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.impl.extension.Extension
 import suwayomi.tachidesk.manga.impl.extension.ExtensionsList
-import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.server.JavalinSetup.future
 import java.util.concurrent.CompletableFuture
@@ -131,7 +129,6 @@ class ExtensionMutation {
    data class FetchExtensionsPayload(
        val clientMutationId: String?,
        val extensions: List<ExtensionType>,
-        val extensionStores: List<ExtensionStoreType>,
    )

    @RequireAuth
@@ -149,17 +146,9 @@ class ExtensionMutation {
                        .map { ExtensionType(it) }
                }

-            val extensionStores =
-                transaction {
-                    ExtensionStoreTable
-                        .selectAll()
-                        .map { ExtensionStoreType(it) }
-                }
-
            FetchExtensionsPayload(
                clientMutationId = clientMutationId,
                extensions = extensions,
-                extensionStores = extensionStores,
            )
        }
    }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionStoreMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionStoreMutation.kt
@@ -1,104 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.ExtensionStoreType
-import suwayomi.tachidesk.manga.impl.extension.ExtensionStoreService
-import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-import java.util.concurrent.CompletableFuture
-
-class ExtensionStoreMutation {
-    data class AddExtensionStoreInput(
-        val clientMutationId: String? = null,
-        val indexUrl: String,
-    )
-
-    data class AddExtensionStorePayload(
-        val clientMutationId: String?,
-        val extensionStore: ExtensionStoreType,
-    )
-
-    @RequireAuth
-    fun addExtensionStore(input: AddExtensionStoreInput): CompletableFuture<AddExtensionStorePayload?> {
-        val (clientMutationId, indexUrl) = input
-        return future {
-            val store = ExtensionStoreService.fetch(indexUrl)
-
-            ExtensionStoreService.upsert(store)
-            ExtensionStoreService.syncDbToPrefs()
-            val row =
-                transaction {
-                    ExtensionStoreTable
-                        .selectAll()
-                        .where { ExtensionStoreTable.indexUrl eq store.indexUrl }
-                        .first()
-                }
-
-            AddExtensionStorePayload(
-                clientMutationId = clientMutationId,
-                extensionStore = ExtensionStoreType(row),
-            )
-        }
-    }
-
-    data class RemoveExtensionStoreInput(
-        val clientMutationId: String? = null,
-        val indexUrl: String,
-    )
-
-    data class RemoveExtensionStorePayload(
-        val clientMutationId: String?,
-        val extensionStore: ExtensionStoreType?,
-    )
-
-    @RequireAuth
-    fun removeExtensionStore(input: RemoveExtensionStoreInput): CompletableFuture<RemoveExtensionStorePayload?> {
-        val (clientMutationId, indexUrl) = input
-        return future {
-            val store =
-                transaction {
-                    ExtensionStoreTable
-                        .selectAll()
-                        .where { ExtensionStoreTable.indexUrl eq indexUrl }
-                        .firstOrNull()
-                        ?.let { ExtensionStoreType(it) }
-                }
-
-            store?.let {
-                transaction {
-                    ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl eq indexUrl }
-                }
-            }
-
-            ExtensionStoreService.syncDbToPrefs()
-
-            RemoveExtensionStorePayload(
-                clientMutationId = clientMutationId,
-                extensionStore =
-                    store?.let {
-                        ExtensionStoreType(
-                            name = it.name,
-                            badgeLabel = it.badgeLabel,
-                            signingKey = it.signingKey,
-                            contactWebsite = it.contactWebsite,
-                            contactDiscord = it.contactDiscord,
-                            indexUrl = it.indexUrl,
-                            isLegacy = it.isLegacy,
-                            extensionListUrl = it.extensionListUrl,
-                        )
-                    },
-            )
-        }
-    }
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt
@@ -2,7 +2,6 @@

 package suwayomi.tachidesk.graphql.mutations

-import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import org.jetbrains.exposed.v1.core.LikePattern
 import org.jetbrains.exposed.v1.core.Op
 import org.jetbrains.exposed.v1.core.and
@@ -15,14 +14,12 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.MangaMetaType
 import suwayomi.tachidesk.graphql.types.MangaType
 import suwayomi.tachidesk.graphql.types.MetaInput
 import suwayomi.tachidesk.manga.impl.Library
 import suwayomi.tachidesk.manga.impl.Manga
 import suwayomi.tachidesk.manga.impl.update.IUpdater
-import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaMetaTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.toDataClass
@@ -149,12 +146,11 @@ class MangaMutation {
    )

    @RequireAuth
-    @GraphQLDeprecated("Deprecated in Tachiyomix 1.6", ReplaceWith("fetchMangaAndChapters"))
    fun fetchManga(input: FetchMangaInput): CompletableFuture<FetchMangaPayload?> {
        val (clientMutationId, id) = input

        return future {
-            Manga.updateMangaAndChapters(id, updateChapters = false)
+            Manga.fetchManga(id)

            val manga =
                transaction {
@@ -167,49 +163,6 @@ class MangaMutation {
        }
    }

-    data class FetchMangaAndChaptersInput(
-        val clientMutationId: String? = null,
-        val id: Int,
-        val fetchManga: Boolean,
-        val fetchChapters: Boolean,
-    )
-
-    data class FetchMangaAndChaptersPayload(
-        val clientMutationId: String?,
-        val manga: MangaType,
-        val chapters: List<ChapterType>,
-    )
-
-    @RequireAuth
-    fun fetchMangaAndChapters(input: FetchMangaAndChaptersInput): CompletableFuture<FetchMangaAndChaptersPayload?> {
-        val (clientMutationId, id, fetchManga, fetchChapters) = input
-
-        return future {
-            Manga.updateMangaAndChapters(
-                mangaId = id,
-                updateManga = fetchManga,
-                updateChapters = fetchChapters,
-            )
-
-            val (manga, chapters) =
-                transaction {
-                    Pair(
-                        MangaTable.selectAll().where { MangaTable.id eq id }.first(),
-                        ChapterTable
-                            .selectAll()
-                            .where { ChapterTable.manga eq id }
-                            .orderBy(ChapterTable.sourceOrder)
-                            .map { ChapterType(it) },
-                    )
-                }
-            FetchMangaAndChaptersPayload(
-                clientMutationId = clientMutationId,
-                manga = MangaType(manga),
-                chapters = chapters,
-            )
-        }
-    }
-
    data class SetMangaMetaInput(
        val clientMutationId: String? = null,
        val meta: MangaMetaType,
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt
@@ -28,7 +28,7 @@ import suwayomi.tachidesk.graphql.types.preferenceOf
 import suwayomi.tachidesk.graphql.types.updateFilterList
 import suwayomi.tachidesk.manga.impl.MangaList.insertOrUpdate
 import suwayomi.tachidesk.manga.impl.Source
-import suwayomi.tachidesk.manga.impl.util.source.GetSource
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.SourceMetaTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
@@ -256,7 +256,7 @@ class SourceMutation {
        val (clientMutationId, sourceId, type, page, query, filters) = input

        return future {
-            val source = GetSource.getSourceOrNull(sourceId)!!
+            val source = GetCatalogueSource.getCatalogueSourceOrNull(sourceId)!!
            val mangasPage =
                when (type) {
                    FetchSourceMangaType.SEARCH -> {
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SyncMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SyncMutation.kt
@@ -1,28 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.StartSyncResult
-
-class SyncMutation {
-    data class StartSyncInput(
-        val clientMutationId: String? = null,
-    )
-
-    data class StartSyncPayload(
-        val clientMutationId: String? = null,
-        val result: StartSyncResult,
-    )
-
-    @RequireAuth
-    fun startSync(input: StartSyncInput): StartSyncPayload {
-        val (clientMutationId) = input
-
-        val result = SyncManager.startSync()
-
-        return StartSyncPayload(
-            clientMutationId = clientMutationId,
-            result = result,
-        )
-    }
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/TrackMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/TrackMutation.kt
@@ -148,36 +148,6 @@ class TrackMutation {
        }
    }

-    data class BindTrackRecordInput(
-        val clientMutationId: String? = null,
-        val mangaId: Int,
-        val trackRecordId: Int,
-    )
-
-    data class BindTrackRecordPayload(
-        val clientMutationId: String?,
-        val trackRecord: TrackRecordType,
-    )
-
-    @RequireAuth
-    fun bindTrackRecord(input: BindTrackRecordInput): CompletableFuture<BindTrackRecordPayload?> {
-        val (clientMutationId, mangaId, trackRecordId) = input
-
-        return future {
-            val boundTrackRecordId = Track.bindTrackRecord(mangaId, trackRecordId)
-
-            val trackRecord =
-                transaction {
-                    TrackRecordTable.selectAll().where { TrackRecordTable.id eq boundTrackRecordId }.first()
-                }
-
-            BindTrackRecordPayload(
-                clientMutationId,
-                TrackRecordType(trackRecord),
-            )
-        }
-    }
-
    data class FetchTrackInput(
        val clientMutationId: String? = null,
        val recordId: Int,
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
@@ -21,15 +21,12 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
-import suwayomi.tachidesk.graphql.queries.filter.ContentWarningFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
 import suwayomi.tachidesk.graphql.queries.filter.IntFilter
-import suwayomi.tachidesk.graphql.queries.filter.LongFilter
 import suwayomi.tachidesk.graphql.queries.filter.OpAnd
 import suwayomi.tachidesk.graphql.queries.filter.StringFilter
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEnum
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
@@ -43,7 +40,6 @@ import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
 import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
 import suwayomi.tachidesk.graphql.types.ExtensionNodeList
 import suwayomi.tachidesk.graphql.types.ExtensionType
-import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import java.util.concurrent.CompletableFuture

@@ -59,23 +55,21 @@ class ExtensionQuery {
    ) : OrderBy<ExtensionType> {
        PKG_NAME(ExtensionTable.pkgName),
        NAME(ExtensionTable.name),
-
-        @GraphQLDeprecated("")
-        APK_NAME(ExtensionTable.pkgName),
+        APK_NAME(ExtensionTable.apkName),
        ;

        override fun greater(cursor: Cursor): Op<Boolean> =
            when (this) {
                PKG_NAME -> ExtensionTable.pkgName greater cursor.value
                NAME -> greaterNotUnique(ExtensionTable.name, ExtensionTable.pkgName, cursor, String::toString)
-                APK_NAME -> ExtensionTable.pkgName greater cursor.value
+                APK_NAME -> greaterNotUnique(ExtensionTable.apkName, ExtensionTable.pkgName, cursor, String::toString)
            }

        override fun less(cursor: Cursor): Op<Boolean> =
            when (this) {
                PKG_NAME -> ExtensionTable.pkgName less cursor.value
                NAME -> lessNotUnique(ExtensionTable.name, ExtensionTable.pkgName, cursor, String::toString)
-                APK_NAME -> ExtensionTable.pkgName less cursor.value
+                APK_NAME -> lessNotUnique(ExtensionTable.apkName, ExtensionTable.pkgName, cursor, String::toString)
            }

        override fun asCursor(type: ExtensionType): Cursor {
@@ -95,44 +89,29 @@ class ExtensionQuery {
    ) : Order<ExtensionOrderBy>

    data class ExtensionCondition(
-        val storeIndexUrl: String? = null,
-        @GraphQLDeprecated("", ReplaceWith("storeIndexUrl"))
        val repo: String? = null,
        val apkName: String? = null,
        val iconUrl: String? = null,
        val name: String? = null,
        val pkgName: String? = null,
-        val apkUrl: String? = null,
-        val extensionLib: String? = null,
        val versionName: String? = null,
        val versionCode: Int? = null,
-        val versionCodeLong: Long? = null,
        val lang: String? = null,
-        @GraphQLDeprecated("", ReplaceWith("contentWarning"))
        val isNsfw: Boolean? = null,
-        val contentWarning: ContentWarning? = null,
        val isInstalled: Boolean? = null,
        val hasUpdate: Boolean? = null,
        val isObsolete: Boolean? = null,
    ) : HasGetOp {
        override fun getOp(): Op<Boolean>? {
            val opAnd = OpAnd()
-            opAnd.eq(storeIndexUrl, ExtensionTable.storeIndexUrl)
-            opAnd.eq(repo, ExtensionTable.storeIndexUrl)
+            opAnd.eq(repo, ExtensionTable.repo)
            opAnd.eq(apkName, ExtensionTable.apkName)
            opAnd.eq(iconUrl, ExtensionTable.iconUrl)
-            opAnd.eq(apkUrl, ExtensionTable.apkUrl)
            opAnd.eq(name, ExtensionTable.name)
-            opAnd.eq(extensionLib, ExtensionTable.extensionLib)
            opAnd.eq(versionName, ExtensionTable.versionName)
-            opAnd.eq(versionCode?.toLong(), ExtensionTable.versionCode)
-            opAnd.eq(versionCodeLong, ExtensionTable.versionCode)
+            opAnd.eq(versionCode, ExtensionTable.versionCode)
            opAnd.eq(lang, ExtensionTable.lang)
-            opAnd.eq(
-                isNsfw?.let { if (it) ContentWarning.MIXED.ordinal else ContentWarning.SAFE.ordinal },
-                ExtensionTable.contentWarning,
-            )
-            opAnd.eq(contentWarning?.ordinal, ExtensionTable.contentWarning)
+            opAnd.eq(isNsfw, ExtensionTable.isNsfw)
            opAnd.eq(isInstalled, ExtensionTable.isInstalled)
            opAnd.eq(hasUpdate, ExtensionTable.hasUpdate)
            opAnd.eq(isObsolete, ExtensionTable.isObsolete)
@@ -142,23 +121,15 @@ class ExtensionQuery {
    }

    data class ExtensionFilter(
-        val storeIndexUrl: StringFilter? = null,
-        @GraphQLDeprecated("", ReplaceWith("storeIndexUrl"))
        val repo: StringFilter? = null,
        val apkName: StringFilter? = null,
        val iconUrl: StringFilter? = null,
        val name: StringFilter? = null,
        val pkgName: StringFilter? = null,
-        val apkUrl: StringFilter? = null,
        val versionName: StringFilter? = null,
-        val extensionLib: StringFilter? = null,
-        @GraphQLDeprecated("", ReplaceWith("versionCodeLong"))
        val versionCode: IntFilter? = null,
-        val versionCodeLong: LongFilter? = null,
        val lang: StringFilter? = null,
-        @GraphQLDeprecated("", ReplaceWith("contentWarning"))
        val isNsfw: BooleanFilter? = null,
-        val contentWarning: ContentWarningFilter? = null,
        val isInstalled: BooleanFilter? = null,
        val hasUpdate: BooleanFilter? = null,
        val isObsolete: BooleanFilter? = null,
@@ -168,18 +139,15 @@ class ExtensionQuery {
    ) : Filter<ExtensionFilter> {
        override fun getOpList(): List<Op<Boolean>> =
            listOfNotNull(
-                andFilterWithCompareString(ExtensionTable.storeIndexUrl, storeIndexUrl),
-                andFilterWithCompareString(ExtensionTable.storeIndexUrl, repo),
+                andFilterWithCompareString(ExtensionTable.repo, repo),
                andFilterWithCompareString(ExtensionTable.apkName, apkName),
                andFilterWithCompareString(ExtensionTable.iconUrl, iconUrl),
                andFilterWithCompareString(ExtensionTable.name, name),
                andFilterWithCompareString(ExtensionTable.pkgName, pkgName),
-                andFilterWithCompareString(ExtensionTable.apkUrl, apkUrl),
-                andFilterWithCompareString(ExtensionTable.extensionLib, extensionLib),
                andFilterWithCompareString(ExtensionTable.versionName, versionName),
-                andFilterWithCompare(ExtensionTable.versionCode, versionCodeLong),
+                andFilterWithCompare(ExtensionTable.versionCode, versionCode),
                andFilterWithCompareString(ExtensionTable.lang, lang),
-                andFilterWithCompareEnum(ExtensionTable.contentWarning, contentWarning),
+                andFilterWithCompare(ExtensionTable.isNsfw, isNsfw),
                andFilterWithCompare(ExtensionTable.isInstalled, isInstalled),
                andFilterWithCompare(ExtensionTable.hasUpdate, hasUpdate),
                andFilterWithCompare(ExtensionTable.isObsolete, isObsolete),
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionStoreQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionStoreQuery.kt
@@ -1,190 +0,0 @@
-package suwayomi.tachidesk.graphql.queries
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
-import org.jetbrains.exposed.v1.core.Op
-import org.jetbrains.exposed.v1.core.SortOrder
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.queries.filter.Filter
-import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
-import suwayomi.tachidesk.graphql.queries.filter.OpAnd
-import suwayomi.tachidesk.graphql.queries.filter.StringFilter
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
-import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.Order
-import suwayomi.tachidesk.graphql.server.primitives.OrderBy
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.graphql.server.primitives.QueryResults
-import suwayomi.tachidesk.graphql.server.primitives.applyBeforeAfter
-import suwayomi.tachidesk.graphql.server.primitives.greaterNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
-import suwayomi.tachidesk.graphql.types.ExtensionStoreNodeList
-import suwayomi.tachidesk.graphql.types.ExtensionStoreType
-import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
-import java.util.concurrent.CompletableFuture
-
-class ExtensionStoreQuery {
-    @RequireAuth
-    fun extensionStore(
-        dataFetchingEnvironment: DataFetchingEnvironment,
-        indexUrl: String,
-    ): CompletableFuture<ExtensionStoreType> = dataFetchingEnvironment.getValueFromDataLoader("ExtensionStoreDataLoader", indexUrl)
-
-    enum class ExtensionStoreOrderBy(
-        override val column: Column<*>,
-    ) : OrderBy<ExtensionStoreType> {
-        NAME(ExtensionStoreTable.name),
-        INDEX_URL(ExtensionStoreTable.indexUrl),
-        ;
-
-        override fun greater(cursor: Cursor): Op<Boolean> =
-            when (this) {
-                NAME -> greaterNotUnique(ExtensionStoreTable.name, ExtensionStoreTable.id, cursor, String::toString)
-                INDEX_URL -> greaterNotUnique(ExtensionStoreTable.indexUrl, ExtensionStoreTable.id, cursor, String::toString)
-            }
-
-        override fun less(cursor: Cursor): Op<Boolean> =
-            when (this) {
-                NAME -> lessNotUnique(ExtensionStoreTable.name, ExtensionStoreTable.id, cursor, String::toString)
-                INDEX_URL -> lessNotUnique(ExtensionStoreTable.indexUrl, ExtensionStoreTable.id, cursor, String::toString)
-            }
-
-        override fun asCursor(type: ExtensionStoreType): Cursor {
-            val value =
-                when (this) {
-                    INDEX_URL -> type.indexUrl
-                    NAME -> type.indexUrl + "-" + type.name
-                }
-            return Cursor(value)
-        }
-    }
-
-    data class ExtensionStoreOrder(
-        override val by: ExtensionStoreOrderBy,
-        override val byType: SortOrder? = null,
-    ) : Order<ExtensionStoreOrderBy>
-
-    data class ExtensionStoreCondition(
-        val id: Int? = null,
-        val indexUrl: String? = null,
-        val name: String? = null,
-    ) : HasGetOp {
-        override fun getOp(): Op<Boolean>? {
-            val opAnd = OpAnd()
-            opAnd.eq(id, ExtensionStoreTable.id)
-            opAnd.eq(indexUrl, ExtensionStoreTable.indexUrl)
-            opAnd.eq(name, ExtensionStoreTable.name)
-
-            return opAnd.op
-        }
-    }
-
-    data class ExtensionStoreFilter(
-        val indexUrl: StringFilter? = null,
-        val name: StringFilter? = null,
-        override val and: List<ExtensionStoreFilter>? = null,
-        override val or: List<ExtensionStoreFilter>? = null,
-        override val not: ExtensionStoreFilter? = null,
-    ) : Filter<ExtensionStoreFilter> {
-        override fun getOpList(): List<Op<Boolean>> =
-            listOfNotNull(
-                andFilterWithCompareString(ExtensionStoreTable.indexUrl, indexUrl),
-                andFilterWithCompareString(ExtensionStoreTable.name, name),
-            )
-    }
-
-    @RequireAuth
-    fun extensionStores(
-        condition: ExtensionStoreCondition? = null,
-        filter: ExtensionStoreFilter? = null,
-        order: List<ExtensionStoreOrder>? = null,
-        before: Cursor? = null,
-        after: Cursor? = null,
-        first: Int? = null,
-        last: Int? = null,
-        offset: Int? = null,
-    ): ExtensionStoreNodeList {
-        val queryResults =
-            transaction {
-                val res = ExtensionStoreTable.selectAll()
-
-                res.applyOps(condition, filter)
-
-                if (order != null || (last != null || before != null)) {
-                    val baseSort = listOf(ExtensionStoreOrder(ExtensionStoreOrderBy.INDEX_URL, SortOrder.ASC))
-                    val actualSort = (order.orEmpty() + baseSort)
-                    actualSort.forEach { (orderBy, orderByType) ->
-                        val orderByColumn = orderBy.column
-                        val orderType = orderByType.maybeSwap(last ?: before)
-
-                        res.orderBy(orderByColumn to orderType)
-                    }
-                }
-
-                val total = res.count()
-                val firstResult = res.firstOrNull()?.get(ExtensionStoreTable.indexUrl)
-                val lastResult = res.lastOrNull()?.get(ExtensionStoreTable.indexUrl)
-
-                res.applyBeforeAfter(
-                    before = before,
-                    after = after,
-                    orderBy = order?.firstOrNull()?.by ?: ExtensionStoreOrderBy.INDEX_URL,
-                    orderByType = order?.firstOrNull()?.byType,
-                )
-
-                if (first != null) {
-                    res.limit(first).offset(offset?.toLong() ?: 0)
-                } else if (last != null) {
-                    res.limit(last)
-                }
-
-                QueryResults(total, firstResult, lastResult, res.toList())
-            }
-
-        val getAsCursor: (ExtensionStoreType) -> Cursor = (order?.firstOrNull()?.by ?: ExtensionStoreOrderBy.INDEX_URL)::asCursor
-
-        val resultsAsType = queryResults.results.map { ExtensionStoreType(it) }
-
-        return ExtensionStoreNodeList(
-            resultsAsType,
-            if (resultsAsType.isEmpty()) {
-                emptyList()
-            } else {
-                listOfNotNull(
-                    resultsAsType.firstOrNull()?.let {
-                        ExtensionStoreNodeList.ExtensionStoreEdge(
-                            getAsCursor(it),
-                            it,
-                        )
-                    },
-                    resultsAsType.lastOrNull()?.let {
-                        ExtensionStoreNodeList.ExtensionStoreEdge(
-                            getAsCursor(it),
-                            it,
-                        )
-                    },
-                )
-            },
-            pageInfo =
-                PageInfo(
-                    hasNextPage = queryResults.lastKey != resultsAsType.lastOrNull()?.indexUrl,
-                    hasPreviousPage = queryResults.firstKey != resultsAsType.firstOrNull()?.indexUrl,
-                    startCursor = resultsAsType.firstOrNull()?.let { getAsCursor(it) },
-                    endCursor = resultsAsType.lastOrNull()?.let { getAsCursor(it) },
-                ),
-            totalCount = queryResults.total.toInt(),
-        )
-    }
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
@@ -13,22 +13,19 @@ import graphql.schema.DataFetchingEnvironment
 import org.jetbrains.exposed.v1.core.Column
 import org.jetbrains.exposed.v1.core.Op
 import org.jetbrains.exposed.v1.core.SortOrder
-import org.jetbrains.exposed.v1.core.eq
 import org.jetbrains.exposed.v1.core.greater
-import org.jetbrains.exposed.v1.core.greaterEq
 import org.jetbrains.exposed.v1.core.less
 import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
-import suwayomi.tachidesk.graphql.queries.filter.ContentWarningFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
 import suwayomi.tachidesk.graphql.queries.filter.LongFilter
 import suwayomi.tachidesk.graphql.queries.filter.OpAnd
 import suwayomi.tachidesk.graphql.queries.filter.StringFilter
+import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEnum
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
@@ -42,7 +39,6 @@ import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
 import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
 import suwayomi.tachidesk.graphql.types.SourceNodeList
 import suwayomi.tachidesk.graphql.types.SourceType
-import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import java.util.concurrent.CompletableFuture

@@ -95,23 +91,14 @@ class SourceQuery {
        val id: Long? = null,
        val name: String? = null,
        val lang: String? = null,
-        @GraphQLDeprecated("replace with contentWarning == ContentRating.MIXED", ReplaceWith("contentWarning"))
        val isNsfw: Boolean? = null,
-        val contentWarning: ContentWarning? = null,
    ) : HasGetOp {
        override fun getOp(): Op<Boolean>? {
            val opAnd = OpAnd()
            opAnd.eq(id, SourceTable.id)
            opAnd.eq(name, SourceTable.name)
            opAnd.eq(lang, SourceTable.lang)
-            opAnd.andWhere(isNsfw) {
-                if (it) {
-                    SourceTable.contentWarning greaterEq ContentWarning.MIXED.ordinal
-                } else {
-                    SourceTable.contentWarning less ContentWarning.MIXED.ordinal
-                }
-            }
-            opAnd.andWhere(contentWarning) { SourceTable.contentWarning eq it.ordinal }
+            opAnd.eq(isNsfw, SourceTable.isNsfw)

            return opAnd.op
        }
@@ -121,9 +108,7 @@ class SourceQuery {
        val id: LongFilter? = null,
        val name: StringFilter? = null,
        val lang: StringFilter? = null,
-        @GraphQLDeprecated("replace with contentWarning", ReplaceWith("contentWarning"))
        val isNsfw: BooleanFilter? = null,
-        val contentWarning: ContentWarningFilter? = null,
        override val and: List<SourceFilter>? = null,
        override val or: List<SourceFilter>? = null,
        override val not: SourceFilter? = null,
@@ -133,7 +118,7 @@ class SourceQuery {
                andFilterWithCompareEntity(SourceTable.id, id),
                andFilterWithCompareString(SourceTable.name, name),
                andFilterWithCompareString(SourceTable.lang, lang),
-                andFilterWithCompareEnum(SourceTable.contentWarning, contentWarning),
+                andFilterWithCompare(SourceTable.isNsfw, isNsfw),
            )
    }

--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SyncQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SyncQuery.kt
@@ -1,11 +0,0 @@
-package suwayomi.tachidesk.graphql.queries
-
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.SyncStatus
-import suwayomi.tachidesk.graphql.types.toStatus
-
-class SyncQuery {
-    @RequireAuth
-    fun lastSyncStatus(): SyncStatus? = SyncManager.lastSyncState.value?.toStatus()
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/filter/Filter.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/filter/Filter.kt
@@ -28,7 +28,6 @@ import org.jetbrains.exposed.v1.core.upperCase
 import org.jetbrains.exposed.v1.core.wrap
 import org.jetbrains.exposed.v1.jdbc.Query
 import org.jetbrains.exposed.v1.jdbc.andWhere
-import suwayomi.tachidesk.manga.model.dataclass.ContentWarning

 class ILikeEscapeOp(
    expr1: Expression<*>,
@@ -330,24 +329,6 @@ data class DoubleFilter(
        )
 }

-data class ContentWarningFilter(
-    override val isNull: Boolean? = null,
-    override val equalTo: ContentWarning? = null,
-    override val notEqualTo: ContentWarning? = null,
-    override val notEqualToAll: List<ContentWarning>? = null,
-    override val notEqualToAny: List<ContentWarning>? = null,
-    override val distinctFrom: ContentWarning? = null,
-    override val distinctFromAll: List<ContentWarning>? = null,
-    override val distinctFromAny: List<ContentWarning>? = null,
-    override val notDistinctFrom: ContentWarning? = null,
-    override val `in`: List<ContentWarning>? = null,
-    override val notIn: List<ContentWarning>? = null,
-    override val lessThan: ContentWarning? = null,
-    override val lessThanOrEqualTo: ContentWarning? = null,
-    override val greaterThan: ContentWarning? = null,
-    override val greaterThanOrEqualTo: ContentWarning? = null,
-) : ComparableScalarFilter<ContentWarning>
-
 data class StringFilter(
    override val isNull: Boolean? = null,
    override val equalTo: String? = null,
@@ -637,35 +618,6 @@ fun <T : Comparable<T>, S : T?> andFilterWithCompare(
    return opAnd.op
 }

-@Suppress("UNCHECKED_CAST")
-fun <T : Enum<T>> andFilterWithCompareEnum(
-    column: Column<Int>,
-    filter: ComparableScalarFilter<T>?,
-): Op<Boolean>? {
-    filter ?: return null
-    val opAnd = OpAnd()
-
-    opAnd.andWhere(filter.lessThan) { column less it.ordinal }
-    opAnd.andWhere(filter.lessThanOrEqualTo) { column lessEq it.ordinal }
-    opAnd.andWhere(filter.greaterThan) { column greater it.ordinal }
-    opAnd.andWhere(filter.greaterThanOrEqualTo) { column greaterEq it.ordinal }
-
-    opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
-
-    opAnd.andWhere(filter.equalTo) { column eq it.ordinal }
-    opAnd.andNotWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it.ordinal }
-    opAnd.andWhere(filter.distinctFrom, filter.distinctFromAll, filter.distinctFromAny) { DistinctFromOp.distinctFrom(column, it.ordinal) }
-    opAnd.andWhere(filter.notDistinctFrom) { DistinctFromOp.notDistinctFrom(column, it.ordinal) }
-    if (!filter.`in`.isNullOrEmpty()) {
-        opAnd.andWhere(filter.`in`) { column inList it.map { it.ordinal } }
-    }
-    if (!filter.notIn.isNullOrEmpty()) {
-        opAnd.andWhere(filter.notIn) { column notInList it.map { it.ordinal } }
-    }
-
-    return opAnd.op
-}
-
 fun <T : Comparable<T>> andFilterWithCompareEntity(
    column: Column<EntityID<T>>,
    filter: ComparableScalarFilter<T>?,
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskDataLoaderRegistryFactory.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskDataLoaderRegistryFactory.kt
@@ -21,8 +21,6 @@ import suwayomi.tachidesk.graphql.dataLoaders.DisplayScoreForTrackSearchDataLoad
 import suwayomi.tachidesk.graphql.dataLoaders.DownloadedChapterCountForMangaDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.ExtensionDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.ExtensionForSourceDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.ExtensionStoreDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.ExtensionsForExtensionStore
 import suwayomi.tachidesk.graphql.dataLoaders.FirstUnreadChapterForMangaDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.GlobalMetaDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.HasDuplicateChaptersForMangaDataLoader
@@ -80,8 +78,6 @@ class TachideskDataLoaderRegistryFactory {
                SourceMetaDataLoader(),
                ExtensionDataLoader(),
                ExtensionForSourceDataLoader(),
-                ExtensionsForExtensionStore(),
-                ExtensionStoreDataLoader(),
                TrackerDataLoader(),
                TrackerStatusesDataLoader(),
                TrackerScoresDataLoader(),
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLSchema.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLSchema.kt
@@ -20,7 +20,6 @@ import suwayomi.tachidesk.graphql.mutations.CategoryMutation
 import suwayomi.tachidesk.graphql.mutations.ChapterMutation
 import suwayomi.tachidesk.graphql.mutations.DownloadMutation
 import suwayomi.tachidesk.graphql.mutations.ExtensionMutation
-import suwayomi.tachidesk.graphql.mutations.ExtensionStoreMutation
 import suwayomi.tachidesk.graphql.mutations.ImageMutation
 import suwayomi.tachidesk.graphql.mutations.InfoMutation
 import suwayomi.tachidesk.graphql.mutations.KoreaderSyncMutation
@@ -28,7 +27,6 @@ import suwayomi.tachidesk.graphql.mutations.MangaMutation
 import suwayomi.tachidesk.graphql.mutations.MetaMutation
 import suwayomi.tachidesk.graphql.mutations.SettingsMutation
 import suwayomi.tachidesk.graphql.mutations.SourceMutation
-import suwayomi.tachidesk.graphql.mutations.SyncMutation
 import suwayomi.tachidesk.graphql.mutations.TrackMutation
 import suwayomi.tachidesk.graphql.mutations.UpdateMutation
 import suwayomi.tachidesk.graphql.mutations.UserMutation
@@ -37,14 +35,12 @@ import suwayomi.tachidesk.graphql.queries.CategoryQuery
 import suwayomi.tachidesk.graphql.queries.ChapterQuery
 import suwayomi.tachidesk.graphql.queries.DownloadQuery
 import suwayomi.tachidesk.graphql.queries.ExtensionQuery
-import suwayomi.tachidesk.graphql.queries.ExtensionStoreQuery
 import suwayomi.tachidesk.graphql.queries.InfoQuery
 import suwayomi.tachidesk.graphql.queries.KoreaderSyncQuery
 import suwayomi.tachidesk.graphql.queries.MangaQuery
 import suwayomi.tachidesk.graphql.queries.MetaQuery
 import suwayomi.tachidesk.graphql.queries.SettingsQuery
 import suwayomi.tachidesk.graphql.queries.SourceQuery
-import suwayomi.tachidesk.graphql.queries.SyncQuery
 import suwayomi.tachidesk.graphql.queries.TrackQuery
 import suwayomi.tachidesk.graphql.queries.UpdateQuery
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
@@ -54,7 +50,6 @@ import suwayomi.tachidesk.graphql.server.primitives.GraphQLLongAsString
 import suwayomi.tachidesk.graphql.server.primitives.GraphQLUpload
 import suwayomi.tachidesk.graphql.subscriptions.DownloadSubscription
 import suwayomi.tachidesk.graphql.subscriptions.InfoSubscription
-import suwayomi.tachidesk.graphql.subscriptions.SyncSubscription
 import suwayomi.tachidesk.graphql.subscriptions.UpdateSubscription
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
@@ -97,14 +92,12 @@ val schema =
                TopLevelObject(ChapterQuery()),
                TopLevelObject(DownloadQuery()),
                TopLevelObject(ExtensionQuery()),
-                TopLevelObject(ExtensionStoreQuery()),
                TopLevelObject(InfoQuery()),
                TopLevelObject(KoreaderSyncQuery()),
                TopLevelObject(MangaQuery()),
                TopLevelObject(MetaQuery()),
                TopLevelObject(SettingsQuery()),
                TopLevelObject(SourceQuery()),
-                TopLevelObject(SyncQuery()),
                TopLevelObject(TrackQuery()),
                TopLevelObject(UpdateQuery()),
            ),
@@ -115,14 +108,12 @@ val schema =
                TopLevelObject(ChapterMutation()),
                TopLevelObject(DownloadMutation()),
                TopLevelObject(ExtensionMutation()),
-                TopLevelObject(ExtensionStoreMutation()),
                TopLevelObject(ImageMutation()),
                TopLevelObject(InfoMutation()),
                TopLevelObject(KoreaderSyncMutation()),
                TopLevelObject(MangaMutation()),
                TopLevelObject(MetaMutation()),
                TopLevelObject(SettingsMutation()),
-                TopLevelObject(SyncMutation()),
                TopLevelObject(SourceMutation()),
                TopLevelObject(TrackMutation()),
                TopLevelObject(UpdateMutation()),
@@ -132,7 +123,6 @@ val schema =
            listOf(
                TopLevelObject(DownloadSubscription()),
                TopLevelObject(InfoSubscription()),
-                TopLevelObject(SyncSubscription()),
                TopLevelObject(UpdateSubscription()),
            ),
    )
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/subscriptions/SyncSubscription.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/subscriptions/SyncSubscription.kt
@@ -1,17 +0,0 @@
-package suwayomi.tachidesk.graphql.subscriptions
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.map
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.SyncStatus
-import suwayomi.tachidesk.graphql.types.toStatus
-
-class SyncSubscription {
-    @RequireAuth
-    fun syncStatusChanged(): Flow<SyncStatus> =
-        SyncManager.lastSyncState
-            .filterNotNull()
-            .map { it.toStatus() }
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionStoreType.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionStoreType.kt
@@ -1,86 +0,0 @@
-package suwayomi.tachidesk.graphql.types
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.Edge
-import suwayomi.tachidesk.graphql.server.primitives.Node
-import suwayomi.tachidesk.graphql.server.primitives.NodeList
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
-import java.util.concurrent.CompletableFuture
-
-class ExtensionStoreType(
-    val name: String,
-    val badgeLabel: String,
-    val signingKey: String,
-    val contactWebsite: String,
-    val contactDiscord: String?,
-    val indexUrl: String,
-    val isLegacy: Boolean,
-    val extensionListUrl: String?,
-) : Node {
-    constructor(row: ResultRow) : this(
-        name = row[ExtensionStoreTable.name],
-        badgeLabel = row[ExtensionStoreTable.badgeLabel],
-        signingKey = row[ExtensionStoreTable.signingKey],
-        contactWebsite = row[ExtensionStoreTable.contactWebsite],
-        contactDiscord = row[ExtensionStoreTable.contactDiscord],
-        indexUrl = row[ExtensionStoreTable.indexUrl],
-        isLegacy = row[ExtensionStoreTable.isLegacy],
-        extensionListUrl = row[ExtensionStoreTable.extensionListUrl],
-    )
-
-    fun extensions(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ExtensionNodeList> =
-        dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionNodeList>("ExtensionsForExtensionStore", indexUrl)
-}
-
-data class ExtensionStoreNodeList(
-    override val nodes: List<ExtensionStoreType>,
-    override val edges: List<ExtensionStoreEdge>,
-    override val pageInfo: PageInfo,
-    override val totalCount: Int,
-) : NodeList() {
-    data class ExtensionStoreEdge(
-        override val cursor: Cursor,
-        override val node: ExtensionStoreType,
-    ) : Edge()
-
-    companion object {
-        fun List<ExtensionStoreType>.toNodeList(): ExtensionStoreNodeList =
-            ExtensionStoreNodeList(
-                nodes = this,
-                edges = getEdges(),
-                pageInfo =
-                    PageInfo(
-                        hasNextPage = false,
-                        hasPreviousPage = false,
-                        startCursor = Cursor(0.toString()),
-                        endCursor = Cursor(lastIndex.toString()),
-                    ),
-                totalCount = size,
-            )
-
-        private fun List<ExtensionStoreType>.getEdges(): List<ExtensionStoreEdge> {
-            if (isEmpty()) return emptyList()
-            return listOf(
-                ExtensionStoreEdge(
-                    cursor = Cursor("0"),
-                    node = first(),
-                ),
-                ExtensionStoreEdge(
-                    cursor = Cursor(lastIndex.toString()),
-                    node = last(),
-                ),
-            )
-        }
-    }
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionType.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionType.kt
@@ -7,8 +7,6 @@

 package suwayomi.tachidesk.graphql.types

-import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
-import com.expediagroup.graphql.generator.annotations.GraphQLDescription
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
 import org.jetbrains.exposed.v1.core.ResultRow
@@ -18,51 +16,33 @@ import suwayomi.tachidesk.graphql.server.primitives.Node
 import suwayomi.tachidesk.graphql.server.primitives.NodeList
 import suwayomi.tachidesk.graphql.server.primitives.PageInfo
 import suwayomi.tachidesk.manga.impl.extension.Extension
-import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import java.util.concurrent.CompletableFuture

 class ExtensionType(
-    val storeIndexUrl: String?,
-    @GraphQLDeprecated("Removed in extension api v1.6", ReplaceWith("storeIndexUrl"))
    val repo: String?,
-    @GraphQLDescription("This will be nullable in the future")
-    val apkName: String?,
+    val apkName: String,
    val iconUrl: String,
    val name: String,
    val pkgName: String,
-    val apkUrl: String?,
-    val extensionLib: String?,
    val versionName: String,
-    @GraphQLDeprecated(
-        "Type was changed to Long, will be switched back to this variable name in the future.",
-        ReplaceWith("versionCodeLong"),
-    )
    val versionCode: Int,
-    val versionCodeLong: Long,
    val lang: String,
-    @GraphQLDeprecated("Removed in extension api v1.6", ReplaceWith("contentWarning"))
    val isNsfw: Boolean,
-    val contentWarning: ContentWarning,
    val isInstalled: Boolean,
    val hasUpdate: Boolean,
    val isObsolete: Boolean,
 ) : Node {
    constructor(row: ResultRow) : this(
-        storeIndexUrl = row[ExtensionTable.storeIndexUrl],
-        repo = row[ExtensionTable.storeIndexUrl],
-        apkName = row[ExtensionTable.apkName].orEmpty(),
-        iconUrl = Extension.proxyExtensionIconUrl(row[ExtensionTable.pkgName]),
+        repo = row[ExtensionTable.repo],
+        apkName = row[ExtensionTable.apkName],
+        iconUrl = Extension.getExtensionIconUrl(row[ExtensionTable.apkName]),
        name = row[ExtensionTable.name],
        pkgName = row[ExtensionTable.pkgName],
-        apkUrl = row[ExtensionTable.apkUrl],
-        extensionLib = row[ExtensionTable.extensionLib],
        versionName = row[ExtensionTable.versionName],
-        versionCode = row[ExtensionTable.versionCode].toInt(),
-        versionCodeLong = row[ExtensionTable.versionCode],
+        versionCode = row[ExtensionTable.versionCode],
        lang = row[ExtensionTable.lang],
-        isNsfw = row[ExtensionTable.contentWarning] >= ContentWarning.MIXED.ordinal,
-        contentWarning = ContentWarning.valueOf(row[ExtensionTable.contentWarning]),
+        isNsfw = row[ExtensionTable.isNsfw],
        isInstalled = row[ExtensionTable.isInstalled],
        hasUpdate = row[ExtensionTable.hasUpdate],
        isObsolete = row[ExtensionTable.isObsolete],
@@ -70,9 +50,6 @@ class ExtensionType(

    fun source(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<SourceNodeList> =
        dataFetchingEnvironment.getValueFromDataLoader<String, SourceNodeList>("SourcesForExtensionDataLoader", pkgName)
-
-    fun extensionStore(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ExtensionStoreType> =
-        dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionStoreType>("ExtensionStoreDataLoader", storeIndexUrl.orEmpty())
 }

 data class ExtensionNodeList(
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SourceType.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SourceType.kt
@@ -7,10 +7,9 @@

 package suwayomi.tachidesk.graphql.types

-import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
+import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.ConfigurableSource
-import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.online.HttpSource
 import graphql.schema.DataFetchingEnvironment
@@ -24,9 +23,9 @@ import suwayomi.tachidesk.graphql.server.primitives.NodeList
 import suwayomi.tachidesk.graphql.server.primitives.PageInfo
 import suwayomi.tachidesk.manga.impl.Source.getSourcePreferencesRaw
 import suwayomi.tachidesk.manga.impl.extension.Extension
-import suwayomi.tachidesk.manga.impl.util.source.GetSource
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.getSourceOrStub
-import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
+import suwayomi.tachidesk.manga.model.dataclass.SourceDataClass
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import java.util.concurrent.CompletableFuture
@@ -42,29 +41,35 @@ class SourceType(
    val id: Long,
    val name: String,
    val lang: String,
-    val contentWarning: ContentWarning,
    val iconUrl: String,
    val supportsLatest: Boolean,
    val isConfigurable: Boolean,
-    @GraphQLDeprecated("", ReplaceWith("contentWarning"))
    val isNsfw: Boolean,
    val displayName: String,
-    val homeUrl: String?,
-    @GraphQLDeprecated("", ReplaceWith("homeUrl"))
    val baseUrl: String?,
 ) : Node {
-    constructor(row: ResultRow, sourceExtension: ResultRow, source: Source) : this(
+    constructor(source: SourceDataClass) : this(
+        id = source.id.toLong(),
+        name = source.name,
+        lang = source.lang,
+        iconUrl = source.iconUrl,
+        supportsLatest = source.supportsLatest,
+        isConfigurable = source.isConfigurable,
+        isNsfw = source.isNsfw,
+        displayName = source.displayName,
+        baseUrl = source.baseUrl,
+    )
+
+    constructor(row: ResultRow, sourceExtension: ResultRow, catalogueSource: CatalogueSource) : this(
        id = row[SourceTable.id].value,
        name = row[SourceTable.name],
        lang = row[SourceTable.lang],
-        contentWarning = ContentWarning.valueOf(row[SourceTable.contentWarning]),
-        iconUrl = Extension.proxyExtensionIconUrl(sourceExtension[ExtensionTable.pkgName]),
-        supportsLatest = source.supportsLatest,
-        isConfigurable = source is ConfigurableSource,
-        isNsfw = row[SourceTable.contentWarning] >= ContentWarning.MIXED.ordinal,
-        displayName = source.toString(),
-        homeUrl = runCatching { (source as? HttpSource)?.getHomeUrl() }.getOrNull(),
-        baseUrl = runCatching { (source as? HttpSource)?.baseUrl }.getOrNull(),
+        iconUrl = Extension.getExtensionIconUrl(sourceExtension[ExtensionTable.apkName]),
+        supportsLatest = catalogueSource.supportsLatest,
+        isConfigurable = catalogueSource is ConfigurableSource,
+        isNsfw = row[SourceTable.isNsfw],
+        displayName = catalogueSource.toString(),
+        baseUrl = catalogueSource.runCatching { (catalogueSource as? HttpSource)?.baseUrl }.getOrNull(),
    )

    fun manga(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<MangaNodeList> =
@@ -75,7 +80,7 @@ class SourceType(

    fun preferences(): List<Preference> = getSourcePreferencesRaw(id).map { preferenceOf(it) }

-    fun filters(): List<Filter> = getSourceOrStub(id).getFilterList().map { filterOf(it) }
+    fun filters(): List<Filter> = getCatalogueSourceOrStub(id).getFilterList().map { filterOf(it) }

    fun meta(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<List<SourceMetaType>> =
        dataFetchingEnvironment.getValueFromDataLoader<Long, List<SourceMetaType>>("SourceMetaDataLoader", id)
@@ -84,8 +89,8 @@ class SourceType(
@Suppress("ktlint:standard:function-naming")
 fun SourceType(row: ResultRow): SourceType? {
    val catalogueSource =
-        GetSource
-            .getSourceOrNull(row[SourceTable.id].value)
+        GetCatalogueSource
+            .getCatalogueSourceOrNull(row[SourceTable.id].value)
            ?: return null
    val sourceExtension =
        if (row.hasValue(ExtensionTable.id)) {
@@ -296,7 +301,7 @@ data class FilterChange(
 )

 fun updateFilterList(
-    source: Source,
+    source: CatalogueSource,
    changes: List<FilterChange>?,
 ): FilterList {
    val filterList = source.getFilterList()
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SyncType.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SyncType.kt
@@ -1,91 +0,0 @@
-package suwayomi.tachidesk.graphql.types
-
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-
-enum class StartSyncResult {
-    SUCCESS,
-    SYNC_IN_PROGRESS,
-    SYNC_DISABLED,
-}
-
-enum class SyncState {
-    STARTED,
-    CREATING_BACKUP,
-    DOWNLOADING,
-    MERGING,
-    UPLOADING,
-    RESTORING,
-    SUCCESS,
-    ERROR,
-}
-
-data class SyncStatus(
-    val state: SyncState,
-    val startDate: Long,
-    val endDate: Long? = null,
-    val backupRestoreId: String? = null,
-    val errorMessage: String? = null,
-)
-
-fun SyncManager.SyncState.toStatus(): SyncStatus =
-    when (this) {
-        is SyncManager.SyncState.Started -> {
-            SyncStatus(
-                state = SyncState.STARTED,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.CreatingBackup -> {
-            SyncStatus(
-                state = SyncState.CREATING_BACKUP,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Downloading -> {
-            SyncStatus(
-                state = SyncState.DOWNLOADING,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Merging -> {
-            SyncStatus(
-                state = SyncState.MERGING,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Uploading -> {
-            SyncStatus(
-                state = SyncState.UPLOADING,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Restoring -> {
-            SyncStatus(
-                state = SyncState.RESTORING,
-                startDate = startDate.toEpochMilliseconds(),
-                backupRestoreId = restoreId,
-            )
-        }
-
-        is SyncManager.SyncState.Success -> {
-            SyncStatus(
-                state = SyncState.SUCCESS,
-                startDate = startDate.toEpochMilliseconds(),
-                endDate = endDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Error -> {
-            SyncStatus(
-                state = SyncState.ERROR,
-                startDate = startDate.toEpochMilliseconds(),
-                endDate = endDate.toEpochMilliseconds(),
-                errorMessage = message,
-            )
-        }
-    }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/MangaAPI.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/MangaAPI.kt
@@ -34,7 +34,7 @@ object MangaAPI {
            get("update/{pkgName}", ExtensionController.update)
            get("uninstall/{pkgName}", ExtensionController.uninstall)

-            get("icon/{pkgName}", ExtensionController.icon)
+            get("icon/{apkName}", ExtensionController.icon)
        }

        path("source") {
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/ExtensionController.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/ExtensionController.kt
@@ -165,17 +165,17 @@ object ExtensionController {
    /** icon for extension named `apkName` */
    val icon =
        handler(
-            pathParam<String>("pkgName"),
+            pathParam<String>("apkName"),
            documentWith = {
                withOperation {
                    summary("Extension icon")
                    description("Icon for extension named `apkName`")
                }
            },
-            behaviorOf = { ctx, pkgName ->
+            behaviorOf = { ctx, apkName ->
                ctx.getAttribute(Attribute.TachideskUser).requireUser()
                ctx.future {
-                    future { Extension.getExtensionIcon(pkgName) }
+                    future { Extension.getExtensionIcon(apkName) }
                        .thenApply {
                            ctx.header("content-type", it.second)
                            val httpCacheSeconds = 365.days.inWholeSeconds
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/UpdateController.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/UpdateController.kt
@@ -55,7 +55,7 @@ object UpdateController {
        )

    /**
-     * Class made for handling return type in the documentation for [UpdateController.recentChapters],
+     * Class made for handling return type in the documentation for [recentChapters],
     * since OpenApi cannot handle runtime generics.
     */
    private class PagedMangaChapterListDataClass : PaginatedList<MangaChapterDataClass>(emptyList(), false)
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt
@@ -85,12 +85,6 @@ object CategoryManga {
        }
    }

-    fun removeMangaFromAllCategories(mangaId: Int) {
-        transaction {
-            CategoryMangaTable.deleteWhere { CategoryMangaTable.manga eq mangaId }
-        }
-    }
-
    /**
     * list of mangas that belong to a category
     */
@@ -117,14 +111,12 @@ object CategoryManga {

        val transform: (ResultRow) -> MangaDataClass = {
            // Map the data from the result row to the MangaDataClass
-            MangaTable
-                .toDataClass(it)
-                .copy(
-                    lastReadAt = it[lastReadAt],
-                    unreadCount = it[unreadCount],
-                    downloadCount = it[downloadedCount],
-                    chapterCount = it[chapterCount],
-                )
+            val dataClass = MangaTable.toDataClass(it)
+            dataClass.lastReadAt = it[lastReadAt]
+            dataClass.unreadCount = it[unreadCount]
+            dataClass.downloadCount = it[downloadedCount]
+            dataClass.chapterCount = it[chapterCount]
+            dataClass
        }

        return transaction {
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
@@ -7,19 +7,16 @@ package suwayomi.tachidesk.manga.impl
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */

-import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.chapter.ChapterRecognition
 import eu.kanade.tachiyomi.util.chapter.ChapterSanitizer.sanitize
 import io.github.oshai.kotlinlogging.KotlinLogging
+import io.github.reactivecircus.cache4k.Cache
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import org.jetbrains.exposed.v1.core.ResultRow
 import org.jetbrains.exposed.v1.core.SortOrder
 import org.jetbrains.exposed.v1.core.and
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
@@ -35,10 +32,11 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import org.jetbrains.exposed.v1.jdbc.update
+import suwayomi.tachidesk.manga.impl.Manga.getManga
 import suwayomi.tachidesk.manga.impl.download.DownloadManager
 import suwayomi.tachidesk.manga.impl.download.DownloadManager.EnqueueInput
 import suwayomi.tachidesk.manga.impl.track.Track
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.getSourceOrStub
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
 import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
 import suwayomi.tachidesk.manga.model.dataclass.MangaChapterDataClass
 import suwayomi.tachidesk.manga.model.dataclass.PaginatedList
@@ -52,6 +50,7 @@ import suwayomi.tachidesk.server.serverConfig
 import java.time.Instant
 import java.util.TreeSet
 import kotlin.math.max
+import kotlin.time.Duration.Companion.minutes

 private fun List<ChapterDataClass>.removeDuplicates(currentChapter: ChapterDataClass): List<ChapterDataClass> =
    groupBy { it.chapterNumber }
@@ -105,277 +104,259 @@ object Chapter {
                    .associateBy({ it[ChapterTable.url] }, { it })
            }

-        return chapterList.map {
+        val chapterIds = chapterList.map { dbChapterMap.getValue(it.url)[ChapterTable.id] }
+        val chapterMetas = getChaptersMetaMaps(chapterIds.map { it.value })
+
+        return chapterList.mapIndexed { index, it ->
+
            val dbChapter = dbChapterMap.getValue(it.url)
-            ChapterTable.toDataClass(dbChapter)
+
+            ChapterDataClass(
+                id = dbChapter[ChapterTable.id].value,
+                url = it.url,
+                name = it.name,
+                uploadDate = it.date_upload,
+                chapterNumber = it.chapter_number,
+                scanlator = it.scanlator,
+                mangaId = mangaId,
+                read = dbChapter[ChapterTable.isRead],
+                bookmarked = dbChapter[ChapterTable.isBookmarked],
+                lastPageRead = dbChapter[ChapterTable.lastPageRead],
+                lastReadAt = dbChapter[ChapterTable.lastReadAt],
+                index = chapterList.size - index,
+                fetchedAt = dbChapter[ChapterTable.fetchedAt],
+                realUrl = dbChapter[ChapterTable.realUrl],
+                downloaded = dbChapter[ChapterTable.isDownloaded],
+                pageCount = dbChapter[ChapterTable.pageCount],
+                chapterCount = chapterList.size,
+                meta = chapterMetas.getValue(dbChapter[ChapterTable.id].value),
+            )
        }
    }

+    val map: Cache<Int, Mutex> =
+        Cache
+            .Builder<Int, Mutex>()
+            .expireAfterAccess(10.minutes)
+            .build()
+
    suspend fun fetchChapterList(mangaId: Int): List<SChapter> {
-        val mutex = Manga.mangaInfoMutex.get(mangaId) { Mutex() }
+        val mutex = map.get(mangaId) { Mutex() }
        val chapterList =
            mutex.withLock {
-                val mangaEntry =
-                    transaction {
-                        MangaTable.selectAll().where { MangaTable.id eq mangaId }.first()
+                val manga = getManga(mangaId)
+                val source = getCatalogueSourceOrStub(manga.sourceId.toLong())
+
+                val sManga =
+                    SManga.create().apply {
+                        title = manga.title
+                        url = manga.url
+                        description = manga.description
                    }
-                val source = getSourceOrStub(mangaEntry[MangaTable.sourceReference])

-                val chapters =
-                    Manga
-                        .fetchMangaAndChapters(
-                            mangaEntry = mangaEntry,
-                            source = source,
-                            fetchDetails = false,
-                            fetchChapters = true,
-                        ).chapters
+                val currentLatestChapterNumber = Manga.getLatestChapter(mangaId)?.chapterNumber ?: 0f
+                val numberOfCurrentChapters = getCountOfMangaChapters(mangaId)

-                updateChapterListDatabase(mangaEntry, chapters, source)
+                val chapters = source.getChapterList(sManga)
+                // it's possible that the source returns a list containing chapters with the same url
+                // once such duplicated chapters have been added, they aren't being removed anymore as long as there is
+                // a chapter with the same url in the fetched chapter list, even if the duplicated chapter itself
+                // does not exist anymore on the source
+                val uniqueChapters = chapters.distinctBy { it.url }
+
+                if (uniqueChapters.isEmpty()) {
+                    throw Exception("No chapters found")
+                }
+
+                // Recognize number for new chapters.
+                uniqueChapters.forEach { chapter ->
+                    (source as? HttpSource)?.prepareNewChapter(chapter, sManga)
+                    val chapterNumber = ChapterRecognition.parseChapterNumber(manga.title, chapter.name, chapter.chapter_number.toDouble())
+                    chapter.chapter_number = chapterNumber.toFloat()
+                    chapter.name = chapter.name.sanitize(manga.title)
+                    chapter.scanlator = chapter.scanlator?.ifBlank { null }?.trim()
+                }
+
+                val now = Instant.now().epochSecond
+                // Used to not set upload date of older chapters
+                // to a higher value than newer chapters
+                var maxSeenUploadDate = 0L
+
+                val chaptersInDb =
+                    transaction {
+                        ChapterTable
+                            .selectAll()
+                            .where { ChapterTable.manga eq mangaId }
+                            .map { ChapterTable.toDataClass(it) }
+                            .toList()
+                    }
+
+                // new chapters after they have been added to the database for auto downloads
+                val insertedChapters = mutableListOf<ChapterDataClass>()
+
+                val chaptersToInsert = mutableListOf<ChapterDataClass>() // do not yet have an ID from the database
+                val chaptersToUpdate = mutableListOf<ChapterDataClass>()
+
+                uniqueChapters.reversed().forEachIndexed { index, fetchedChapter ->
+                    val chapterEntry = chaptersInDb.find { it.url == fetchedChapter.url }
+
+                    val chapterData =
+                        ChapterDataClass.fromSChapter(
+                            fetchedChapter,
+                            chapterEntry?.id ?: 0,
+                            index + 1,
+                            now,
+                            mangaId,
+                            runCatching {
+                                (source as? HttpSource)?.getChapterUrl(fetchedChapter)
+                            }.getOrNull(),
+                        )
+
+                    if (chapterEntry == null) {
+                        val newChapterData =
+                            if (chapterData.uploadDate == 0L) {
+                                val altDateUpload = if (maxSeenUploadDate == 0L) now else maxSeenUploadDate
+                                chapterData.copy(uploadDate = altDateUpload)
+                            } else {
+                                maxSeenUploadDate = max(maxSeenUploadDate, chapterData.uploadDate)
+                                chapterData
+                            }
+                        chaptersToInsert.add(newChapterData)
+                    } else {
+                        val newChapterData =
+                            if (chapterData.uploadDate == 0L) {
+                                chapterData.copy(uploadDate = chapterEntry.uploadDate)
+                            } else {
+                                chapterData
+                            }
+                        chaptersToUpdate.add(newChapterData)
+                    }
+                }
+
+                val deletedChapterNumbers = TreeSet<Float>()
+                val deletedReadChapterNumbers = TreeSet<Float>()
+                val deletedBookmarkedChapterNumbers = TreeSet<Float>()
+                val deletedDownloadedChapterNumberToChapter = mutableMapOf<Float, ChapterDataClass>()
+                val deletedChapterNumberDateFetchMap = mutableMapOf<Float, Long>()
+
+                // clear any orphaned/duplicate chapters that are in the db but not in `chapterList`
+                val chapterUrls = uniqueChapters.map { it.url }.toSet()
+
+                val chaptersIdsToDelete =
+                    chaptersInDb.mapNotNull { dbChapter ->
+                        if (!chapterUrls.contains(dbChapter.url)) {
+                            if (dbChapter.read) deletedReadChapterNumbers.add(dbChapter.chapterNumber)
+                            if (dbChapter.bookmarked) deletedBookmarkedChapterNumbers.add(dbChapter.chapterNumber)
+                            if (dbChapter.downloaded) deletedDownloadedChapterNumberToChapter[dbChapter.chapterNumber] = dbChapter
+                            deletedChapterNumbers.add(dbChapter.chapterNumber)
+                            deletedChapterNumberDateFetchMap[dbChapter.chapterNumber] = dbChapter.fetchedAt
+                            dbChapter.id
+                        } else {
+                            null
+                        }
+                    }
+
+                transaction {
+                    // we got some clean up due
+                    if (chaptersIdsToDelete.isNotEmpty()) {
+                        DownloadManager.dequeue(chaptersIdsToDelete)
+                        PageTable.deleteWhere { chapter inList chaptersIdsToDelete }
+                        ChapterTable.deleteWhere { id inList chaptersIdsToDelete }
+                    }
+
+                    if (chaptersToInsert.isNotEmpty()) {
+                        ChapterTable
+                            .batchInsert(chaptersToInsert) { chapter ->
+                                this[ChapterTable.url] = chapter.url
+                                this[ChapterTable.name] = chapter.name
+                                this[ChapterTable.date_upload] = chapter.uploadDate
+                                this[ChapterTable.chapter_number] = chapter.chapterNumber
+                                this[ChapterTable.scanlator] = chapter.scanlator
+                                this[ChapterTable.sourceOrder] = chapter.index
+                                this[ChapterTable.fetchedAt] = chapter.fetchedAt
+                                this[ChapterTable.manga] = chapter.mangaId
+                                this[ChapterTable.realUrl] = chapter.realUrl
+                                this[ChapterTable.isRead] = false
+                                this[ChapterTable.isBookmarked] = false
+                                this[ChapterTable.isDownloaded] = false
+                                this[ChapterTable.pageCount] = -1
+
+                                // is recognized chapter number
+                                if (chapter.chapterNumber >= 0f && chapter.chapterNumber in deletedChapterNumbers) {
+                                    this[ChapterTable.isRead] = chapter.chapterNumber in deletedReadChapterNumbers
+                                    this[ChapterTable.isBookmarked] = chapter.chapterNumber in deletedBookmarkedChapterNumbers
+
+                                    // Try to use the fetch date of the original entry to not pollute 'Updates' tab
+                                    deletedChapterNumberDateFetchMap[chapter.chapterNumber]?.let {
+                                        this[ChapterTable.fetchedAt] = it
+                                    }
+
+                                    deletedDownloadedChapterNumberToChapter[chapter.chapterNumber]?.let {
+                                        val hasDownloadedPages = it.pageCount > 0
+                                        val isSameName = it.name == chapter.name
+                                        val isSameScanlator = it.scanlator == chapter.scanlator
+
+                                        // Only preserve download status for chapters with the same name and of the same scanlator; otherwise,
+                                        // the downloaded files won't be found anyway
+                                        val isDownloadPreservable = hasDownloadedPages && isSameName && isSameScanlator
+                                        if (isDownloadPreservable) {
+                                            this[ChapterTable.isDownloaded] = true
+                                            this[ChapterTable.pageCount] = it.pageCount
+                                        }
+                                    }
+                                }
+                            }.forEach { insertedChapters.add(ChapterTable.toDataClass(it)) }
+                    }
+
+                    if (chaptersToUpdate.isNotEmpty()) {
+                        BatchUpdateStatement(ChapterTable)
+                            .apply {
+                                chaptersToUpdate.forEach {
+                                    addBatch(EntityID(it.id, ChapterTable))
+
+                                    val currentChapter = chaptersInDb.find { dbChapter -> dbChapter.id == it.id }!!
+
+                                    this[ChapterTable.name] = it.name
+                                    this[ChapterTable.date_upload] = it.uploadDate
+                                    this[ChapterTable.chapter_number] = it.chapterNumber
+                                    this[ChapterTable.scanlator] = it.scanlator
+                                    this[ChapterTable.sourceOrder] = it.index
+                                    this[ChapterTable.realUrl] = it.realUrl
+                                    this[ChapterTable.isDownloaded] = currentChapter.downloaded
+                                    this[ChapterTable.pageCount] = currentChapter.pageCount
+
+                                    if (!currentChapter.downloaded) {
+                                        return@forEach
+                                    }
+
+                                    val isSameScanlator = currentChapter.scanlator == it.scanlator
+                                    val isSameName = currentChapter.name == it.name
+
+                                    val isDownloadPreservable = isSameName && isSameScanlator
+                                    if (!isDownloadPreservable) {
+                                        this[ChapterTable.isDownloaded] = false
+                                        this[ChapterTable.pageCount] = -1
+                                    }
+                                }
+                            }.toExecutable()
+                            .execute(this@transaction)
+                    }
+
+                    MangaTable.update({ MangaTable.id eq mangaId }) {
+                        it[chaptersLastFetchedAt] = Instant.now().epochSecond
+                    }
+                }
+
+                if (manga.inLibrary) {
+                    downloadNewChapters(mangaId, currentLatestChapterNumber, numberOfCurrentChapters, insertedChapters)
+                }
+
+                uniqueChapters
            }

        return chapterList
    }

-    fun updateChapterListDatabase(
-        mangaEntry: ResultRow,
-        chapters: List<SChapter>,
-        source: Source,
-    ): List<SChapter> {
-        val currentLatestChapterNumber = Manga.getLatestChapter(mangaEntry[MangaTable.id].value)?.chapterNumber ?: 0f
-        val numberOfCurrentChapters = getCountOfMangaChapters(mangaEntry[MangaTable.id].value)
-        // it's possible that the source returns a list containing chapters with the same url
-        // once such duplicated chapters have been added, they aren't being removed anymore as long as there is
-        // a chapter with the same url in the fetched chapter list, even if the duplicated chapter itself
-        // does not exist anymore on the source
-        val uniqueChapters = chapters.distinctBy { it.url }
-
-        if (uniqueChapters.isEmpty()) {
-            throw Exception("No chapters found")
-        }
-
-        // Recognize number for new chapters.
-        val sManga =
-            SManga.create().apply {
-                url = mangaEntry[MangaTable.url]
-                title = mangaEntry[MangaTable.title]
-                thumbnail_url = mangaEntry[MangaTable.thumbnail_url]
-                artist = mangaEntry[MangaTable.artist]
-                author = mangaEntry[MangaTable.author]
-                description = mangaEntry[MangaTable.description]
-                genre = mangaEntry[MangaTable.genre]
-                status = mangaEntry[MangaTable.status]
-                update_strategy = UpdateStrategy.valueOf(mangaEntry[MangaTable.updateStrategy])
-                memo = Json.decodeFromString(mangaEntry[MangaTable.memo])
-                initialized = mangaEntry[MangaTable.initialized]
-            }
-        uniqueChapters.forEach { chapter ->
-            (source as? HttpSource)?.prepareNewChapter(chapter, sManga)
-            val chapterNumber =
-                ChapterRecognition.parseChapterNumber(
-                    mangaEntry[MangaTable.title],
-                    chapter.name,
-                    chapter.chapter_number.toDouble(),
-                )
-            chapter.chapter_number = chapterNumber.toFloat()
-            chapter.name = chapter.name.sanitize(mangaEntry[MangaTable.title])
-            chapter.scanlator = chapter.scanlator?.ifBlank { null }?.trim()
-        }
-
-        val now = Instant.now().epochSecond
-        // Used to not set upload date of older chapters
-        // to a higher value than newer chapters
-        var maxSeenUploadDate = 0L
-
-        val chaptersInDb =
-            transaction {
-                ChapterTable
-                    .selectAll()
-                    .where { ChapterTable.manga eq mangaEntry[MangaTable.id].value }
-                    .map { ChapterTable.toDataClass(it) }
-                    .toList()
-            }
-
-        // new chapters after they have been added to the database for auto downloads
-        val insertedChapterIds = mutableListOf<Int>()
-
-        val chaptersToInsert = mutableListOf<ChapterDataClass>() // do not yet have an ID from the database
-        val chaptersToUpdate = mutableListOf<ChapterDataClass>()
-
-        uniqueChapters.reversed().forEachIndexed { index, fetchedChapter ->
-            val chapterEntry = chaptersInDb.find { it.url == fetchedChapter.url }
-
-            val chapterData =
-                ChapterDataClass.fromSChapter(
-                    fetchedChapter,
-                    chapterEntry?.id ?: 0,
-                    index + 1,
-                    now,
-                    mangaEntry[MangaTable.id].value,
-                    runCatching {
-                        (source as? HttpSource)?.getChapterUrl(fetchedChapter)
-                    }.getOrNull(),
-                )
-
-            if (chapterEntry == null) {
-                val newChapterData =
-                    if (chapterData.uploadDate == 0L) {
-                        val altDateUpload = if (maxSeenUploadDate == 0L) now else maxSeenUploadDate
-                        chapterData.copy(uploadDate = altDateUpload)
-                    } else {
-                        maxSeenUploadDate = max(maxSeenUploadDate, chapterData.uploadDate)
-                        chapterData
-                    }
-                chaptersToInsert.add(newChapterData)
-            } else {
-                val newChapterData =
-                    if (chapterData.uploadDate == 0L) {
-                        chapterData.copy(uploadDate = chapterEntry.uploadDate)
-                    } else {
-                        chapterData
-                    }
-                chaptersToUpdate.add(newChapterData)
-            }
-        }
-
-        val deletedChapterNumbers = TreeSet<Float>()
-        val deletedReadChapterNumbers = TreeSet<Float>()
-        val deletedBookmarkedChapterNumbers = TreeSet<Float>()
-        val deletedDownloadedChapterNumberToChapter = mutableMapOf<Float, ChapterDataClass>()
-        val deletedChapterNumberDateFetchMap = mutableMapOf<Float, Long>()
-
-        // clear any orphaned/duplicate chapters that are in the db but not in `chapterList`
-        val chapterUrls = uniqueChapters.map { it.url }.toSet()
-
-        val chaptersIdsToDelete =
-            chaptersInDb.mapNotNull { dbChapter ->
-                if (!chapterUrls.contains(dbChapter.url)) {
-                    if (dbChapter.read) deletedReadChapterNumbers.add(dbChapter.chapterNumber)
-                    if (dbChapter.bookmarked) deletedBookmarkedChapterNumbers.add(dbChapter.chapterNumber)
-                    if (dbChapter.downloaded) deletedDownloadedChapterNumberToChapter[dbChapter.chapterNumber] = dbChapter
-                    deletedChapterNumbers.add(dbChapter.chapterNumber)
-                    deletedChapterNumberDateFetchMap[dbChapter.chapterNumber] = dbChapter.fetchedAt
-                    dbChapter.id
-                } else {
-                    null
-                }
-            }
-
-        transaction {
-            // we got some clean up due
-            if (chaptersIdsToDelete.isNotEmpty()) {
-                DownloadManager.dequeue(chaptersIdsToDelete)
-                PageTable.deleteWhere { chapter inList chaptersIdsToDelete }
-                ChapterTable.deleteWhere { id inList chaptersIdsToDelete }
-            }
-
-            if (chaptersToInsert.isNotEmpty()) {
-                ChapterTable
-                    .batchInsert(chaptersToInsert) { chapter ->
-                        this[ChapterTable.url] = chapter.url
-                        this[ChapterTable.name] = chapter.name
-                        this[ChapterTable.date_upload] = chapter.uploadDate
-                        this[ChapterTable.chapter_number] = chapter.chapterNumber
-                        this[ChapterTable.scanlator] = chapter.scanlator
-                        this[ChapterTable.sourceOrder] = chapter.index
-                        this[ChapterTable.fetchedAt] = chapter.fetchedAt
-                        this[ChapterTable.manga] = chapter.mangaId
-                        this[ChapterTable.realUrl] = chapter.realUrl
-                        this[ChapterTable.memo] = Json.encodeToString(chapter.memo)
-                        this[ChapterTable.isRead] = false
-                        this[ChapterTable.isBookmarked] = false
-                        this[ChapterTable.isDownloaded] = false
-                        this[ChapterTable.lastModifiedAt] = chapter.lastModifiedAt
-                        this[ChapterTable.version] = chapter.version
-                        this[ChapterTable.pageCount] = -1
-
-                        // is recognized chapter number
-                        if (chapter.chapterNumber >= 0f && chapter.chapterNumber in deletedChapterNumbers) {
-                            this[ChapterTable.isRead] = chapter.chapterNumber in deletedReadChapterNumbers
-                            this[ChapterTable.isBookmarked] = chapter.chapterNumber in deletedBookmarkedChapterNumbers
-
-                            // Try to use the fetch date of the original entry to not pollute 'Updates' tab
-                            deletedChapterNumberDateFetchMap[chapter.chapterNumber]?.let {
-                                this[ChapterTable.fetchedAt] = it
-                            }
-
-                            deletedDownloadedChapterNumberToChapter[chapter.chapterNumber]?.let {
-                                val hasDownloadedPages = it.pageCount > 0
-                                val isSameName = it.name == chapter.name
-                                val isSameScanlator = it.scanlator == chapter.scanlator
-
-                                // Only preserve download status for chapters with the same name and of the same scanlator; otherwise,
-                                // the downloaded files won't be found anyway
-                                val isDownloadPreservable = hasDownloadedPages && isSameName && isSameScanlator
-                                if (isDownloadPreservable) {
-                                    this[ChapterTable.isDownloaded] = true
-                                    this[ChapterTable.pageCount] = it.pageCount
-                                }
-                            }
-                        }
-                    }.forEach { insertedChapterIds.add(it[ChapterTable.id].value) }
-            }
-
-            if (chaptersToUpdate.isNotEmpty()) {
-                BatchUpdateStatement(ChapterTable)
-                    .apply {
-                        chaptersToUpdate.forEach {
-                            addBatch(EntityID(it.id, ChapterTable))
-
-                            val currentChapter = chaptersInDb.find { dbChapter -> dbChapter.id == it.id }!!
-
-                            this[ChapterTable.name] = it.name
-                            this[ChapterTable.date_upload] = it.uploadDate
-                            this[ChapterTable.chapter_number] = it.chapterNumber
-                            this[ChapterTable.scanlator] = it.scanlator
-                            this[ChapterTable.sourceOrder] = it.index
-                            this[ChapterTable.realUrl] = it.realUrl
-                            this[ChapterTable.lastModifiedAt] = it.lastModifiedAt
-                            this[ChapterTable.version] = it.version
-                            this[ChapterTable.memo] = Json.encodeToString(it.memo)
-                            this[ChapterTable.isDownloaded] = currentChapter.downloaded
-                            this[ChapterTable.pageCount] = currentChapter.pageCount
-
-                            if (!currentChapter.downloaded) {
-                                return@forEach
-                            }
-
-                            val isSameScanlator = currentChapter.scanlator == it.scanlator
-                            val isSameName = currentChapter.name == it.name
-
-                            val isDownloadPreservable = isSameName && isSameScanlator
-                            if (!isDownloadPreservable) {
-                                this[ChapterTable.isDownloaded] = false
-                                this[ChapterTable.pageCount] = -1
-                            }
-                        }
-                    }.toExecutable()
-                    .execute(this@transaction)
-            }
-
-            MangaTable.update({ MangaTable.id eq mangaEntry[MangaTable.id].value }) {
-                it[chaptersLastFetchedAt] = Instant.now().epochSecond
-            }
-        }
-
-        if (mangaEntry[MangaTable.inLibrary]) {
-            // We have to query the inserted chapters to get the up-to-date data. I.e. "last_modified_at" is not returned by the insert statement, due to being set by a DB trigger
-            val insertedChapters =
-                transaction {
-                    ChapterTable.selectAll().where { ChapterTable.id inList insertedChapterIds }.map(
-                        ChapterTable::toDataClass,
-                    )
-                }
-            downloadNewChapters(
-                mangaEntry[MangaTable.id].value,
-                currentLatestChapterNumber,
-                numberOfCurrentChapters,
-                insertedChapters,
-            )
-        }
-
-        return uniqueChapters
-    }
-
    private fun downloadNewChapters(
        mangaId: Int,
        prevLatestChapterNumber: Float,
@@ -624,7 +605,7 @@ object Chapter {
                .withDefault { emptyMap() }
        }

-    fun getChapterMetaMap(chapter: Int): Map<String, String> =
+    fun getChapterMetaMap(chapter: EntityID<Int>): Map<String, String> =
        transaction {
            ChapterMetaTable
                .selectAll()
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/ChapterDownloadHelper.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/ChapterDownloadHelper.kt
@@ -16,7 +16,6 @@ import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.toDataClass
 import suwayomi.tachidesk.server.serverConfig
-import xyz.nulldev.androidcompat.util.SafePath
 import java.io.File
 import java.io.InputStream

@@ -65,11 +64,6 @@ object ChapterDownloadHelper {
        chapterId: Int,
    ): Pair<InputStream, Long> = provider(mangaId, chapterId).getAsArchiveStream()

-    fun getChapterArchiveSize(
-        mangaId: Int,
-        chapterId: Int,
-    ): Long = provider(mangaId, chapterId).getArchiveSize()
-
    private fun getChapterWithCbzFileName(chapterId: Int): Pair<ChapterDataClass, String> =
        transaction {
            val row =
@@ -77,46 +71,13 @@ object ChapterDownloadHelper {
                    .select(ChapterTable.columns + MangaTable.columns)
                    .where { ChapterTable.id eq chapterId }
                    .firstOrNull() ?: throw IllegalArgumentException("ChapterId $chapterId not found")
-
            val chapter = ChapterTable.toDataClass(row)
-            val mangaTitle = row[MangaTable.title].trim()
+            val mangaTitle = row[MangaTable.title]

-            val scanlatorName = chapter.scanlator?.trim()?.takeIf { it.isNotEmpty() }
-            val chapterName = chapter.name.trim().takeIf { it.isNotEmpty() }
+            val scanlatorPart = chapter.scanlator?.let { "[$it] " } ?: ""
+            val fileName = "$mangaTitle - $scanlatorPart${chapter.name}.cbz"

-            val fileName =
-                buildString {
-                    append(mangaTitle)
-                    append(" - ")
-
-                    if (chapterName != null) {
-                        append(chapterName)
-                    } else if (chapter.chapterNumber >= 0f) {
-                        // chapterNumber is stored as Float, drop .0 for whole numbers.
-                        val formatNumber =
-                            if (chapter.chapterNumber % 1 == 0f) {
-                                chapter.chapterNumber.toInt().toString()
-                            } else {
-                                chapter.chapterNumber.toString()
-                            }
-                        append("#$formatNumber")
-                    } else {
-                        // Fallback when neither name nor valid chapter number exists
-                        append("#${chapter.index}")
-                    }
-
-                    if (scanlatorName != null) {
-                        append(" [")
-                        append(scanlatorName)
-                        append("]")
-                    }
-                    append(".cbz")
-                }
-
-            // Sanitize filename for OS compatibility
-            val safeFileName = SafePath.buildValidFilename(fileName)
-
-            Pair(chapter, safeFileName)
+            Pair(chapter, fileName)
        }

    fun getCbzForDownload(
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
@@ -11,20 +11,13 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.HttpException
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.awaitSuccess
-import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.local.LocalSource
-import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.model.SMangaUpdate
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.source.online.HttpSource
 import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
-import io.github.reactivecircus.cache4k.Cache
 import io.javalin.http.HttpStatus
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.json.Json
 import okhttp3.CacheControl
 import okhttp3.Response
 import org.jetbrains.exposed.v1.core.ResultRow
@@ -39,10 +32,13 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import org.jetbrains.exposed.v1.jdbc.update
+import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
+import suwayomi.tachidesk.manga.impl.Source.getSource
 import suwayomi.tachidesk.manga.impl.download.fileProvider.impl.MissingThumbnailException
+import suwayomi.tachidesk.manga.impl.track.Track
 import suwayomi.tachidesk.manga.impl.util.network.await
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.getSourceOrNull
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.getSourceOrStub
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrNull
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
 import suwayomi.tachidesk.manga.impl.util.source.StubSource
 import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse.clearCachedImage
 import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse.getImageResponse
@@ -51,8 +47,10 @@ import suwayomi.tachidesk.manga.impl.util.updateMangaDownloadDir
 import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
 import suwayomi.tachidesk.manga.model.dataclass.IncludeOrExclude
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.toGenreList
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaMetaTable
+import suwayomi.tachidesk.manga.model.table.MangaStatus
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.toDataClass
 import suwayomi.tachidesk.server.ApplicationDirs
@@ -61,17 +59,10 @@ import java.io.File
 import java.io.IOException
 import java.io.InputStream
 import java.time.Instant
-import kotlin.time.Duration.Companion.minutes

 private val logger = KotlinLogging.logger { }

 object Manga {
-    val mangaInfoMutex: Cache<Int, Mutex> =
-        Cache
-            .Builder<Int, Mutex>()
-            .expireAfterAccess(10.minutes)
-            .build()
-
    suspend fun getManga(
        mangaId: Int,
        onlineFetch: Boolean = false,
@@ -79,118 +70,62 @@ object Manga {
        var mangaEntry = transaction { MangaTable.selectAll().where { MangaTable.id eq mangaId }.first() }

        return if (!onlineFetch && mangaEntry[MangaTable.initialized]) {
-            MangaTable.toDataClass(mangaEntry)
+            getMangaDataClass(mangaId, mangaEntry)
        } else { // initialize manga
-            updateMangaAndChapters(mangaId, updateChapters = false)
+            val sManga = fetchManga(mangaId) ?: return getMangaDataClass(mangaId, mangaEntry)

            mangaEntry = transaction { MangaTable.selectAll().where { MangaTable.id eq mangaId }.first() }

-            MangaTable.toDataClass(mangaEntry).copy(freshData = true)
+            MangaDataClass(
+                id = mangaId,
+                sourceId = mangaEntry[MangaTable.sourceReference].toString(),
+                url = mangaEntry[MangaTable.url],
+                title = mangaEntry[MangaTable.title],
+                thumbnailUrl = proxyThumbnailUrl(mangaId),
+                thumbnailUrlLastFetched = mangaEntry[MangaTable.thumbnailUrlLastFetched],
+                initialized = true,
+                artist = sManga.artist,
+                author = sManga.author,
+                description = sManga.description,
+                genre = sManga.genre.toGenreList(),
+                status = MangaStatus.valueOf(sManga.status).name,
+                inLibrary = mangaEntry[MangaTable.inLibrary],
+                inLibraryAt = mangaEntry[MangaTable.inLibraryAt],
+                source = getSource(mangaEntry[MangaTable.sourceReference]),
+                meta = getMangaMetaMap(mangaId),
+                realUrl = mangaEntry[MangaTable.realUrl],
+                lastFetchedAt = mangaEntry[MangaTable.lastFetchedAt],
+                chaptersLastFetchedAt = mangaEntry[MangaTable.chaptersLastFetchedAt],
+                updateStrategy = UpdateStrategy.valueOf(mangaEntry[MangaTable.updateStrategy]),
+                freshData = true,
+                trackers = Track.getTrackRecordsByMangaId(mangaId),
+            )
        }
    }

-    suspend fun fetchMangaAndChapters(
-        mangaEntry: ResultRow,
-        source: Source,
-        fetchDetails: Boolean,
-        fetchChapters: Boolean,
-    ): SMangaUpdate {
-        val sManga =
-            SManga.create().apply {
-                url = mangaEntry[MangaTable.url]
-                title = mangaEntry[MangaTable.title]
-                thumbnail_url = mangaEntry[MangaTable.thumbnail_url]
-                artist = mangaEntry[MangaTable.artist]
-                author = mangaEntry[MangaTable.author]
-                description = mangaEntry[MangaTable.description]
-                genre = mangaEntry[MangaTable.genre]
-                status = mangaEntry[MangaTable.status]
-                update_strategy = UpdateStrategy.valueOf(mangaEntry[MangaTable.updateStrategy])
-                memo = Json.decodeFromString(mangaEntry[MangaTable.memo])
-                initialized = mangaEntry[MangaTable.initialized]
-            }
-        val sChapters =
-            transaction {
-                ChapterTable
-                    .selectAll()
-                    .where { ChapterTable.manga eq mangaEntry[MangaTable.id] }
-                    .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
-                    .map {
-                        SChapter.create().apply {
-                            url = it[ChapterTable.url]
-                            name = it[ChapterTable.name]
-                            chapter_number = it[ChapterTable.chapter_number]
-                            scanlator = it[ChapterTable.scanlator]
-                            date_upload = it[ChapterTable.date_upload]
-                            memo = Json.decodeFromString(it[ChapterTable.memo])
-                        }
-                    }
-            }
-
-        return source.getMangaUpdate(
-            sManga,
-            sChapters,
-            fetchDetails = fetchDetails,
-            fetchChapters = fetchChapters,
-        )
-    }
-
    suspend fun fetchManga(mangaId: Int): SManga? {
-        return mangaInfoMutex.get(mangaId) { Mutex() }.withLock {
-            val mangaEntry =
-                transaction { MangaTable.selectAll().where { MangaTable.id eq mangaId }.first() }
-            val source = getSourceOrNull(mangaEntry[MangaTable.sourceReference]) ?: return null
-            val sManga =
-                fetchMangaAndChapters(
-                    mangaEntry,
-                    source,
-                    fetchDetails = true,
-                    fetchChapters = false,
-                ).manga
+        val mangaEntry = transaction { MangaTable.selectAll().where { MangaTable.id eq mangaId }.first() }

-            updateMangaDatabase(mangaEntry, source, sManga)
-        }
-    }
+        val source =
+            getCatalogueSourceOrNull(mangaEntry[MangaTable.sourceReference])
+                ?: return null
+        val sManga =
+            source.getMangaDetails(
+                SManga.create().apply {
+                    url = mangaEntry[MangaTable.url]
+                    title = mangaEntry[MangaTable.title]
+                    thumbnail_url = mangaEntry[MangaTable.thumbnail_url]
+                    artist = mangaEntry[MangaTable.artist]
+                    author = mangaEntry[MangaTable.author]
+                    description = mangaEntry[MangaTable.description]
+                    genre = mangaEntry[MangaTable.genre]
+                    status = mangaEntry[MangaTable.status]
+                    update_strategy = UpdateStrategy.valueOf(mangaEntry[MangaTable.updateStrategy])
+                },
+            )

-    suspend fun updateMangaAndChapters(
-        mangaId: Int,
-        updateManga: Boolean = true,
-        updateChapters: Boolean = true,
-    ) {
-        mangaInfoMutex.get(mangaId) { Mutex() }.withLock {
-            var mangaEntry =
-                transaction { MangaTable.selectAll().where { MangaTable.id eq mangaId }.first() }
-            val source =
-                getSourceOrNull(mangaEntry[MangaTable.sourceReference])
-                    ?: throw NullPointerException("Missing source ${mangaEntry[MangaTable.sourceReference]}")
-            val mangaUpdate =
-                fetchMangaAndChapters(
-                    mangaEntry,
-                    source,
-                    fetchDetails = updateManga,
-                    fetchChapters = updateChapters,
-                )
-
-            if (updateManga) {
-                updateMangaDatabase(mangaEntry, source, mangaUpdate.manga)
-                mangaEntry =
-                    transaction {
-                        MangaTable.selectAll().where { MangaTable.id eq mangaId }.first()
-                    }
-            }
-            if (updateChapters) {
-                Chapter.updateChapterListDatabase(mangaEntry, mangaUpdate.chapters, source)
-            }
-        }
-    }
-
-    fun updateMangaDatabase(
-        mangaEntry: ResultRow,
-        source: Source,
-        sManga: SManga,
-    ): SManga {
        transaction {
-            MangaTable.update({ MangaTable.id eq mangaEntry[MangaTable.id] }) {
+            MangaTable.update({ MangaTable.id eq mangaId }) {
                val remoteTitle =
                    try {
                        sManga.title
@@ -215,7 +150,7 @@ object Manga {
                if (!sManga.thumbnail_url.isNullOrEmpty()) {
                    it[MangaTable.thumbnail_url] = sManga.thumbnail_url
                    it[MangaTable.thumbnailUrlLastFetched] = Instant.now().epochSecond
-                    clearThumbnail(mangaEntry[MangaTable.id].value)
+                    clearThumbnail(mangaId)
                }

                it[MangaTable.realUrl] =
@@ -238,7 +173,6 @@ object Manga {
                it[MangaTable.lastFetchedAt] = Instant.now().epochSecond

                it[MangaTable.updateStrategy] = sManga.update_strategy.name
-                it[MangaTable.memo] = Json.encodeToString(sManga.memo)
            }
        }

@@ -277,15 +211,43 @@ object Manga {
                    .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
                    .firstOrNull { it[ChapterTable.isRead] }

-            mangaDaaClass.copy(
-                unreadCount = unreadCount,
-                downloadCount = downloadCount,
-                chapterCount = chapterCount,
-                lastChapterRead = lastChapterRead?.let { ChapterTable.toDataClass(it) },
-            )
+            mangaDaaClass.unreadCount = unreadCount
+            mangaDaaClass.downloadCount = downloadCount
+            mangaDaaClass.chapterCount = chapterCount
+            mangaDaaClass.lastChapterRead = lastChapterRead?.let { ChapterTable.toDataClass(it) }
+
+            mangaDaaClass
        }
    }

+    private fun getMangaDataClass(
+        mangaId: Int,
+        mangaEntry: ResultRow,
+    ) = MangaDataClass(
+        id = mangaId,
+        sourceId = mangaEntry[MangaTable.sourceReference].toString(),
+        url = mangaEntry[MangaTable.url],
+        title = mangaEntry[MangaTable.title],
+        thumbnailUrl = proxyThumbnailUrl(mangaId),
+        thumbnailUrlLastFetched = mangaEntry[MangaTable.thumbnailUrlLastFetched],
+        initialized = true,
+        artist = mangaEntry[MangaTable.artist],
+        author = mangaEntry[MangaTable.author],
+        description = mangaEntry[MangaTable.description],
+        genre = mangaEntry[MangaTable.genre].toGenreList(),
+        status = MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
+        inLibrary = mangaEntry[MangaTable.inLibrary],
+        inLibraryAt = mangaEntry[MangaTable.inLibraryAt],
+        source = getSource(mangaEntry[MangaTable.sourceReference]),
+        meta = getMangaMetaMap(mangaId),
+        realUrl = mangaEntry[MangaTable.realUrl],
+        lastFetchedAt = mangaEntry[MangaTable.lastFetchedAt],
+        chaptersLastFetchedAt = mangaEntry[MangaTable.chaptersLastFetchedAt],
+        updateStrategy = UpdateStrategy.valueOf(mangaEntry[MangaTable.updateStrategy]),
+        freshData = false,
+        trackers = Track.getTrackRecordsByMangaId(mangaId),
+    )
+
    fun getMangaMetaMap(mangaId: Int): Map<String, String> =
        transaction {
            MangaMetaTable
@@ -413,7 +375,7 @@ object Manga {
        val mangaEntry = transaction { MangaTable.selectAll().where { MangaTable.id eq mangaId }.first() }
        val sourceId = mangaEntry[MangaTable.sourceReference]

-        return when (val source = getSourceOrStub(sourceId)) {
+        return when (val source = getCatalogueSourceOrStub(sourceId)) {
            is HttpSource -> {
                getImageResponse(cacheSaveDir, fileName) {
                    fetchHttpSourceMangaThumbnail(source, mangaEntry)
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/MangaList.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/MangaList.kt
@@ -9,7 +9,6 @@ package suwayomi.tachidesk.manga.impl

 import eu.kanade.tachiyomi.source.local.LocalSource
 import eu.kanade.tachiyomi.source.model.MangasPage
-import kotlinx.serialization.json.Json
 import org.jetbrains.exposed.v1.core.and
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.eq
@@ -19,7 +18,7 @@ import org.jetbrains.exposed.v1.jdbc.batchInsert
 import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.getSourceOrStub
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
 import suwayomi.tachidesk.manga.model.dataclass.PagedMangaListDataClass
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.toDataClass
@@ -36,7 +35,7 @@ object MangaList {
        require(pageNum > 0) {
            "pageNum = $pageNum is not in valid range"
        }
-        val source = getSourceOrStub(sourceId)
+        val source = getCatalogueSourceOrStub(sourceId)
        val mangasPage =
            if (popular) {
                source.getPopularManga(pageNum)
@@ -76,7 +75,6 @@ object MangaList {
                        this[MangaTable.status] = it.status
                        this[MangaTable.thumbnail_url] = it.thumbnail_url
                        this[MangaTable.updateStrategy] = it.update_strategy.name
-                        this[MangaTable.memo] = Json.encodeToString(it.memo)

                        this[MangaTable.sourceReference] = sourceId
                    }.associate { Pair(it[MangaTable.url], it[MangaTable.id].value) }
@@ -105,7 +103,6 @@ object MangaList {
                            this[MangaTable.status] = sManga.status
                            this[MangaTable.thumbnail_url] = sManga.thumbnail_url ?: manga[MangaTable.thumbnail_url]
                            this[MangaTable.updateStrategy] = sManga.update_strategy.name
-                            this[MangaTable.memo] = Json.encodeToString(sManga.memo)
                            if (!sManga.thumbnail_url.isNullOrEmpty() && manga[MangaTable.thumbnail_url] != sManga.thumbnail_url) {
                                this[MangaTable.thumbnailUrlLastFetched] = Instant.now().epochSecond
                                Manga.clearThumbnail(manga[MangaTable.id].value)
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt
@@ -21,7 +21,7 @@ import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.types.DownloadConversion
 import suwayomi.tachidesk.manga.impl.util.getChapterCachePath
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.getSourceOrStub
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
 import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse.getImageResponse
 import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil
 import suwayomi.tachidesk.manga.model.table.ChapterTable
@@ -118,7 +118,7 @@ object Page {
            return imageFile.inputStream() to (ImageUtil.findImageType { imageFile.inputStream() }?.mime ?: "image/jpeg")
        }

-        val source = getSourceOrStub(mangaEntry[MangaTable.sourceReference])
+        val source = getCatalogueSourceOrStub(mangaEntry[MangaTable.sourceReference])
        source as HttpSource

        if (pageEntry[PageTable.imageUrl] == null) {
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Search.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Search.kt
@@ -7,14 +7,14 @@ package suwayomi.tachidesk.manga.impl
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */

-import eu.kanade.tachiyomi.source.Source
+import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.Filter
 import eu.kanade.tachiyomi.source.model.FilterList
 import io.javalin.json.JsonMapper
 import io.javalin.json.fromJsonString
 import kotlinx.serialization.Serializable
 import suwayomi.tachidesk.manga.impl.MangaList.processEntries
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.getSourceOrStub
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
 import suwayomi.tachidesk.manga.model.dataclass.PagedMangaListDataClass
 import uy.kohesive.injekt.injectLazy

@@ -24,7 +24,7 @@ object Search {
        searchTerm: String,
        pageNum: Int,
    ): PagedMangaListDataClass {
-        val source = getSourceOrStub(sourceId)
+        val source = getCatalogueSourceOrStub(sourceId)
        val searchManga = source.getSearchManga(pageNum, searchTerm, getFilterListOf(source))
        return searchManga.processEntries(sourceId)
    }
@@ -34,7 +34,7 @@ object Search {
        pageNum: Int,
        filter: FilterData,
    ): PagedMangaListDataClass {
-        val source = getSourceOrStub(sourceId)
+        val source = getCatalogueSourceOrStub(sourceId)
        val filterList = if (filter.filter != null) buildFilterList(sourceId, filter.filter) else source.getFilterList()
        val searchManga = source.getSearchManga(pageNum, filter.searchTerm ?: "", filterList)
        return searchManga.processEntries(sourceId)
@@ -43,7 +43,7 @@ object Search {
    private val filterListCache = mutableMapOf<Long, FilterList>()

    private fun getFilterListOf(
-        source: Source,
+        source: CatalogueSource,
        reset: Boolean = false,
    ): FilterList {
        if (reset || !filterListCache.containsKey(source.id)) {
@@ -56,7 +56,7 @@ object Search {
        sourceId: Long,
        reset: Boolean,
    ): List<FilterObject> {
-        val source = getSourceOrStub(sourceId)
+        val source = getCatalogueSourceOrStub(sourceId)

        return getFilterListOf(source, reset).list.map {
            FilterObject(
@@ -111,7 +111,7 @@ object Search {
        sourceId: Long,
        changes: List<FilterChange>,
    ) {
-        val source = getSourceOrStub(sourceId)
+        val source = getCatalogueSourceOrStub(sourceId)
        val filterList = getFilterListOf(source, false)
        updateFilterList(filterList, changes)
    }
@@ -169,7 +169,7 @@ object Search {
        sourceId: Long,
        changes: List<FilterChange>,
    ): FilterList {
-        val source = getSourceOrStub(sourceId)
+        val source = getCatalogueSourceOrStub(sourceId)
        val filterList = source.getFilterList()
        return updateFilterList(filterList, changes)
    }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt
@@ -25,11 +25,10 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.Source.preferenceScreenMap
-import suwayomi.tachidesk.manga.impl.extension.Extension.proxyExtensionIconUrl
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.getSourceOrNull
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.getSourceOrStub
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.unregisterSource
-import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
+import suwayomi.tachidesk.manga.impl.extension.Extension.getExtensionIconUrl
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrNull
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.unregisterCatalogueSource
 import suwayomi.tachidesk.manga.model.dataclass.SourceDataClass
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceMetaTable
@@ -43,17 +42,17 @@ object Source {
    fun getSourceList(): List<SourceDataClass> {
        return transaction {
            SourceTable.selectAll().mapNotNull {
-                val catalogueSource = getSourceOrNull(it[SourceTable.id].value) ?: return@mapNotNull null
+                val catalogueSource = getCatalogueSourceOrNull(it[SourceTable.id].value) ?: return@mapNotNull null
                val sourceExtension = ExtensionTable.selectAll().where { ExtensionTable.id eq it[SourceTable.extension] }.first()

                SourceDataClass(
                    id = it[SourceTable.id].value.toString(),
                    name = it[SourceTable.name],
                    lang = it[SourceTable.lang],
-                    iconUrl = proxyExtensionIconUrl(sourceExtension[ExtensionTable.pkgName]),
+                    iconUrl = getExtensionIconUrl(sourceExtension[ExtensionTable.apkName]),
                    supportsLatest = catalogueSource.supportsLatest,
                    isConfigurable = catalogueSource is ConfigurableSource,
-                    isNsfw = it[SourceTable.contentWarning] >= ContentWarning.MIXED.ordinal,
+                    isNsfw = it[SourceTable.isNsfw],
                    displayName = catalogueSource.toString(),
                    baseUrl = runCatching { (catalogueSource as? HttpSource)?.baseUrl }.getOrNull(),
                )
@@ -64,17 +63,20 @@ object Source {
    fun getSource(sourceId: Long): SourceDataClass? { // all the data extracted fresh form the source instance
        return transaction {
            val source = SourceTable.selectAll().where { SourceTable.id eq sourceId }.firstOrNull() ?: return@transaction null
-            val catalogueSource = getSourceOrNull(sourceId) ?: return@transaction null
+            val catalogueSource = getCatalogueSourceOrNull(sourceId) ?: return@transaction null
            val extension = ExtensionTable.selectAll().where { ExtensionTable.id eq source[SourceTable.extension] }.first()

            SourceDataClass(
                id = sourceId.toString(),
                name = source[SourceTable.name],
                lang = source[SourceTable.lang],
-                iconUrl = proxyExtensionIconUrl(extension[ExtensionTable.pkgName]),
+                iconUrl =
+                    getExtensionIconUrl(
+                        extension[ExtensionTable.apkName],
+                    ),
                supportsLatest = catalogueSource.supportsLatest,
                isConfigurable = catalogueSource is ConfigurableSource,
-                isNsfw = source[SourceTable.contentWarning] >= ContentWarning.MIXED.ordinal,
+                isNsfw = source[SourceTable.isNsfw],
                displayName = catalogueSource.toString(),
                baseUrl = runCatching { (catalogueSource as? HttpSource)?.baseUrl }.getOrNull(),
            )
@@ -107,7 +109,7 @@ object Source {
        }

    fun getSourcePreferencesRaw(sourceId: Long): List<Preference> {
-        val source = getSourceOrStub(sourceId)
+        val source = getCatalogueSourceOrStub(sourceId)

        if (source is ConfigurableSource) {
            val sourceShardPreferences = source.sourcePreferences()
@@ -157,7 +159,7 @@ object Source {
        pref.callChangeListener(newValue)

        // must reload the source because a preference was changed
-        unregisterSource(sourceId)
+        unregisterCatalogueSource(sourceId)
    }

    fun getSourcesMetaMaps(ids: List<Long>): Map<Long, Map<String, String>> =
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt
@@ -148,11 +148,13 @@ object ProtoBackupExport : ProtoBackupBase() {

    fun createBackup(flags: BackupFlags): InputStream {
        // Create root object
+
+        val backupMangas = BackupMangaHandler.backup(flags)
+
        val backup: Backup =
            transaction {
-                val backupMangas = BackupMangaHandler.backup(flags)
                Backup(
-                    backupMangas,
+                    BackupMangaHandler.backup(flags),
                    BackupCategoryHandler.backup(flags),
                    BackupSourceHandler.backup(backupMangas, flags),
                    BackupGlobalMetaHandler.backup(flags),
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt
@@ -21,9 +21,6 @@ import kotlinx.coroutines.sync.withLock
 import okio.buffer
 import okio.gzip
 import okio.source
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.types.toStatus
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags
 import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupValidator.ValidationResult
@@ -34,8 +31,6 @@ import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupMangaHandler
 import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupSettingsHandler
 import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupSourceHandler
 import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
-import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.manga.model.table.MangaTable
 import java.io.InputStream
 import java.util.Date
 import java.util.Timer
@@ -114,7 +109,6 @@ object ProtoBackupImport : ProtoBackupBase() {
    fun restore(
        sourceStream: InputStream,
        flags: BackupFlags,
-        isSync: Boolean = false,
    ): String {
        val restoreId = System.currentTimeMillis().toString()

@@ -123,7 +117,7 @@ object ProtoBackupImport : ProtoBackupBase() {
        updateRestoreState(restoreId, BackupRestoreState.Idle)

        GlobalScope.launch {
-            restoreLegacy(sourceStream, restoreId, flags, isSync)
+            restoreLegacy(sourceStream, restoreId, flags)
        }

        return restoreId
@@ -133,12 +127,11 @@ object ProtoBackupImport : ProtoBackupBase() {
        sourceStream: InputStream,
        restoreId: String = "legacy",
        flags: BackupFlags = BackupFlags.DEFAULT,
-        isSync: Boolean = false,
    ): ValidationResult =
        backupMutex.withLock {
            try {
                logger.info { "restore($restoreId): restoring..." }
-                performRestore(restoreId, sourceStream, flags, isSync)
+                performRestore(restoreId, sourceStream, flags)
            } catch (e: Exception) {
                logger.error(e) { "restore($restoreId): failed due to" }

@@ -159,14 +152,12 @@ object ProtoBackupImport : ProtoBackupBase() {
        id: String,
        sourceStream: InputStream,
        flags: BackupFlags,
-        isSync: Boolean,
    ): ValidationResult {
        val backupString =
            sourceStream
                .source()
-                .run {
-                    if (!isSync) gzip() else this
-                }.buffer()
+                .gzip()
+                .buffer()
                .use { it.readByteArray() }
        val backup = parser.decodeFromByteArray(Backup.serializer(), backupString)

@@ -244,17 +235,6 @@ object ProtoBackupImport : ProtoBackupBase() {
            """.trimIndent()
        }

-        if (isSync) {
-            transaction {
-                MangaTable.update({ MangaTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-                ChapterTable.update({ ChapterTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-            }
-        }
-
        updateRestoreState(id, BackupRestoreState.Success)

        return validationResult
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupCategoryHandler.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupCategoryHandler.kt
@@ -8,11 +8,7 @@ package suwayomi.tachidesk.manga.impl.backup.proto.handlers
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */

 import org.jetbrains.exposed.v1.core.SortOrder
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
 import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.Category
 import suwayomi.tachidesk.manga.impl.Category.modifyCategoriesMetas
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags
@@ -42,9 +38,6 @@ object BackupCategoryHandler {
                    it.name,
                    it.order,
                    0, // not supported in Tachidesk
-                    it.version,
-                    it.uid,
-                    it.lastModifiedAt,
                ).apply {
                    this.meta = categoryToMeta[it.id] ?: emptyMap()
                }
@@ -52,56 +45,7 @@ object BackupCategoryHandler {
        }

    fun restore(backupCategories: List<BackupCategory>): Map<Int, Int> {
-        val dbCategories = Category.getCategoryList()
-        val dbCategoriesByName = dbCategories.associateBy { it.name }
-        val dbCategoriesByUid = dbCategories.associateBy { it.uid }
-
-        var nextOrder = dbCategories.maxOfOrNull { it.order }?.plus(1) ?: 0
-
-        val categoryIds =
-            transaction {
-                backupCategories
-                    .map { backupCategory ->
-                        var dbCategory =
-                            if (backupCategory.uid != 0L) {
-                                dbCategoriesByUid[backupCategory.uid]
-                            } else {
-                                null
-                            }
-
-                        if (dbCategory == null) {
-                            dbCategory = dbCategoriesByName[backupCategory.name]
-                        }
-
-                        if (dbCategory != null) {
-                            CategoryTable.update({ CategoryTable.id eq dbCategory.id }) {
-                                it[name] = backupCategory.name
-                                it[order] = backupCategory.order
-                                it[version] = backupCategory.version
-                                it[uid] = if (backupCategory.uid != 0L) backupCategory.uid else dbCategory.uid
-                                it[lastModifiedAt] = backupCategory.lastModifiedAt
-                                it[isSyncing] = true
-                            }
-                            return@map dbCategory.id
-                        }
-
-                        val currentOrder = nextOrder++
-                        CategoryTable
-                            .insertAndGetId {
-                                it[name] = backupCategory.name
-                                it[order] = currentOrder
-                                it[version] = backupCategory.version
-                                it[uid] = backupCategory.uid
-                                it[lastModifiedAt] = backupCategory.lastModifiedAt
-                            }.value
-                    }
-            }
-
-        transaction {
-            CategoryTable.update({ CategoryTable.isSyncing eq true }) {
-                it[isSyncing] = false
-            }
-        }
+        val categoryIds = Category.createCategories(backupCategories.map { it.name })

        val metaEntryByCategoryId =
            categoryIds
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupMangaHandler.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupMangaHandler.kt
@@ -38,6 +38,7 @@ import suwayomi.tachidesk.manga.model.dataclass.TrackRecordDataClass
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaStatus
 import suwayomi.tachidesk.manga.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.toDataClass
 import suwayomi.tachidesk.server.database.dbTransaction
 import java.util.Date
 import kotlin.math.max
@@ -74,10 +75,6 @@ object BackupMangaHandler {
                        dateAdded = mangaRow[MangaTable.inLibraryAt].seconds.inWholeMilliseconds,
                        viewer = 0, // not supported in Tachidesk
                        updateStrategy = UpdateStrategy.valueOf(mangaRow[MangaTable.updateStrategy]),
-                        lastModifiedAt = mangaRow[MangaTable.lastModifiedAt],
-                        version = mangaRow[MangaTable.version],
-                        initialized = mangaRow[MangaTable.initialized],
-                        memo = mangaRow[MangaTable.memo].encodeToByteArray(),
                    )

                val mangaId = mangaRow[MangaTable.id].value
@@ -93,32 +90,29 @@ object BackupMangaHandler {
                                .selectAll()
                                .where { ChapterTable.manga eq mangaId }
                                .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
-                                .toList()
+                                .map {
+                                    ChapterTable.toDataClass(it)
+                                }
                        }
-
                    if (flags.includeChapters) {
-                        val chapterToMeta =
-                            Chapter.getChaptersMetaMaps(chapters.map { it[ChapterTable.id].value })
+                        val chapterToMeta = Chapter.getChaptersMetaMaps(chapters.map { it.id })

                        backupManga.chapters =
                            chapters.map {
                                BackupChapter(
-                                    url = it[ChapterTable.url],
-                                    name = it[ChapterTable.name],
-                                    scanlator = it[ChapterTable.scanlator],
-                                    read = it[ChapterTable.isRead],
-                                    bookmark = it[ChapterTable.isBookmarked],
-                                    lastPageRead = it[ChapterTable.lastPageRead],
-                                    dateFetch = it[ChapterTable.fetchedAt].seconds.inWholeMilliseconds,
-                                    dateUpload = it[ChapterTable.date_upload],
-                                    chapterNumber = it[ChapterTable.chapter_number],
-                                    sourceOrder = chapters.size - it[ChapterTable.sourceOrder],
-                                    lastModifiedAt = it[ChapterTable.lastModifiedAt],
-                                    version = it[ChapterTable.version],
-                                    memo = it[ChapterTable.memo].encodeToByteArray(),
+                                    it.url,
+                                    it.name,
+                                    it.scanlator,
+                                    it.read,
+                                    it.bookmarked,
+                                    it.lastPageRead,
+                                    it.fetchedAt.seconds.inWholeMilliseconds,
+                                    it.uploadDate,
+                                    it.chapterNumber,
+                                    chapters.size - it.index,
                                ).apply {
                                    if (flags.includeClientData) {
-                                        this.meta = chapterToMeta[it[ChapterTable.id].value] ?: emptyMap()
+                                        this.meta = chapterToMeta[it.id] ?: emptyMap()
                                    }
                                }
                            }
@@ -126,10 +120,10 @@ object BackupMangaHandler {
                    if (flags.includeHistory) {
                        backupManga.history =
                            chapters.mapNotNull {
-                                if (it[ChapterTable.lastReadAt] > 0) {
+                                if (it.lastReadAt > 0) {
                                    BackupHistory(
-                                        url = it[ChapterTable.url],
-                                        lastRead = it[ChapterTable.lastReadAt].seconds.inWholeMilliseconds,
+                                        url = it.url,
+                                        lastRead = it.lastReadAt.seconds.inWholeMilliseconds,
                                    )
                                } else {
                                    null
@@ -238,10 +232,6 @@ object BackupMangaHandler {
                                it[inLibrary] = manga.favorite

                                it[inLibraryAt] = manga.dateAdded.milliseconds.inWholeSeconds
-
-                                it[lastModifiedAt] = manga.lastModifiedAt
-                                it[version] = manga.version
-                                it[memo] = manga.memo.decodeToString()
                            }.value
                    } else {
                        val dbMangaId = dbManga[MangaTable.id].value
@@ -261,10 +251,6 @@ object BackupMangaHandler {
                            it[inLibrary] = manga.favorite || dbManga[inLibrary]

                            it[inLibraryAt] = manga.dateAdded.milliseconds.inWholeSeconds
-
-                            it[lastModifiedAt] = manga.lastModifiedAt
-                            it[version] = manga.version
-                            it[memo] = manga.memo.decodeToString()
                        }

                        dbMangaId
@@ -282,7 +268,7 @@ object BackupMangaHandler {
                    restoreMangaChapterData(mangaId, restoreMode, chapters, history, flags)
                }

-                // update categories
+                // merge categories
                if (flags.includeCategories) {
                    restoreMangaCategoryData(mangaId, categoryIds)
                }
@@ -353,10 +339,6 @@ object BackupMangaHandler {
                            this[ChapterTable.lastReadAt] =
                                historyByChapter[chapter.url]?.maxOrNull()?.milliseconds?.inWholeSeconds ?: 0
                        }
-
-                        this[ChapterTable.lastModifiedAt] = chapter.lastModifiedAt
-                        this[ChapterTable.version] = chapter.version
-                        this[ChapterTable.memo] = chapter.memo.decodeToString()
                    }.map { it[ChapterTable.id].value }
            } else {
                emptyList()
@@ -405,7 +387,6 @@ object BackupMangaHandler {
        mangaId: Int,
        categoryIds: List<Int>,
    ) {
-        CategoryManga.removeMangaFromAllCategories(mangaId)
        CategoryManga.addMangaToCategories(mangaId, categoryIds)
    }

--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupCategory.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupCategory.kt
@@ -10,10 +10,6 @@ class BackupCategory(
    // @ProtoNumber(3) val updateInterval: Int = 0, 1.x value not used in 0.x
    // Bump by 100 to specify this is a 0.x value
    @ProtoNumber(100) var flags: Int = 0,
-    // syncyomi
-    @ProtoNumber(601) var version: Long = 0,
-    @ProtoNumber(602) var uid: Long = 0,
-    @ProtoNumber(603) var lastModifiedAt: Long = 0,
    // suwayomi
    @ProtoNumber(9000) var meta: Map<String, String> = emptyMap(),
 )
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupChapter.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupChapter.kt
@@ -2,7 +2,6 @@ package suwayomi.tachidesk.manga.impl.backup.proto.models

 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
-import suwayomi.tachidesk.manga.impl.util.lang.JsonObjectEmptyBytes

@Serializable
 data class BackupChapter(
@@ -20,10 +19,6 @@ data class BackupChapter(
    // chapterNumber is called number is 1.x
    @ProtoNumber(9) var chapterNumber: Float = 0F,
    @ProtoNumber(10) var sourceOrder: Int = 0,
-    // syncyomi
-    @ProtoNumber(11) var lastModifiedAt: Long = 0,
-    @ProtoNumber(12) var version: Long = 0,
-    @ProtoNumber(13) var memo: ByteArray = JsonObjectEmptyBytes,
    // suwayomi
    @ProtoNumber(9000) var meta: Map<String, String> = emptyMap(),
 )
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupManga.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupManga.kt
@@ -3,7 +3,6 @@ package suwayomi.tachidesk.manga.impl.backup.proto.models
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
-import suwayomi.tachidesk.manga.impl.util.lang.JsonObjectEmptyBytes

@Serializable
 data class BackupManga(
@@ -35,11 +34,6 @@ data class BackupManga(
    @ProtoNumber(103) var viewer_flags: Int? = null,
    @ProtoNumber(104) var history: List<BackupHistory> = emptyList(),
    @ProtoNumber(105) var updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE,
-    // syncyomi
-    @ProtoNumber(106) var lastModifiedAt: Long = 0,
-    @ProtoNumber(109) var version: Long = 0,
-    @ProtoNumber(111) var initialized: Boolean = false,
-    @ProtoNumber(112) var memo: ByteArray = JsonObjectEmptyBytes,
    // suwayomi
    @ProtoNumber(9000) var meta: Map<String, String> = emptyMap(),
 )
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt
@@ -23,7 +23,7 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.ChapterDownloadHelper
-import suwayomi.tachidesk.manga.impl.util.source.GetSource.getSourceOrStub
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
 import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
@@ -31,88 +31,6 @@ import suwayomi.tachidesk.manga.model.table.PageTable
 import suwayomi.tachidesk.manga.model.table.toDataClass
 import kotlin.time.Duration.Companion.minutes

-/**
- * Updates chapter download status and page count in the database if they differ from the file system.
- */
-fun updateChapterPersistence(
-    chapterId: Int,
-    isMarkedAsDownloaded: Boolean,
-    dbPageCount: Int,
-    downloadPageCount: Int,
-    lastPageRead: Int,
-    logger: KLogger,
-): Boolean {
-    if (isMarkedAsDownloaded && dbPageCount == downloadPageCount) {
-        return false
-    }
-
-    return transaction {
-        var needsUpdate = false
-        if (!isMarkedAsDownloaded) {
-            logger.debug { "mark as downloaded" }
-            ChapterTable.update({ ChapterTable.id eq chapterId }) {
-                it[isDownloaded] = true
-            }
-            needsUpdate = true
-        }
-
-        if (dbPageCount != downloadPageCount) {
-            logger.debug { "use page count of downloaded chapter" }
-            ChapterTable.update({ ChapterTable.id eq chapterId }) {
-                it[pageCount] = downloadPageCount
-                it[ChapterTable.lastPageRead] = lastPageRead.coerceAtMost(downloadPageCount - 1).coerceAtLeast(0)
-            }
-            needsUpdate = true
-        }
-        needsUpdate
-    }
-}
-
-suspend fun refreshChapterPageList(
-    mangaId: Int,
-    chapterId: Int,
-    existingChapterEntry: ResultRow? = null,
-): Int {
-    val mutex = mutexByChapterId.get(chapterId) { Mutex() }
-    return mutex.withLock {
-        val chapterEntry = existingChapterEntry ?: transaction { ChapterTable.selectAll().where { ChapterTable.id eq chapterId }.first() }
-        val mangaEntry = transaction { MangaTable.selectAll().where { MangaTable.id eq mangaId }.first() }
-        val source = getSourceOrStub(mangaEntry[MangaTable.sourceReference])
-
-        val pageList =
-            source
-                .getPageList(
-                    SChapter.create().apply {
-                        url = chapterEntry[ChapterTable.url]
-                        name = chapterEntry[ChapterTable.name]
-                        scanlator = chapterEntry[ChapterTable.scanlator]
-                        chapter_number = chapterEntry[ChapterTable.chapter_number]
-                        date_upload = chapterEntry[ChapterTable.date_upload]
-                    },
-                ).mapIndexed { index, page -> Page(index, page.url, page.imageUrl, page.uri) }
-
-        transaction {
-            ChapterTable.update({ ChapterTable.id eq chapterId }) {
-                it[isDownloaded] = false
-            }
-
-            PageTable.deleteWhere { PageTable.chapter eq chapterId }
-            PageTable.batchInsert(pageList) { page ->
-                this[PageTable.index] = page.index
-                this[PageTable.url] = page.url
-                this[PageTable.imageUrl] = page.imageUrl
-                this[PageTable.chapter] = chapterId
-            }
-
-            ChapterTable.update({ ChapterTable.id eq chapterId }) {
-                it[pageCount] = pageList.size
-                it[lastPageRead] = chapterEntry[ChapterTable.lastPageRead].coerceAtMost(pageList.size - 1).coerceAtLeast(0)
-            }
-        }
-        pageList.size
-    }
-}
-
 suspend fun getChapterDownloadReady(
    chapterId: Int? = null,
    chapterIndex: Int? = null,
@@ -150,31 +68,56 @@ private class ChapterForDownload(
    suspend fun asDownloadReady(): ChapterDataClass {
        val log = KotlinLogging.logger("${logger.name}::asDownloadReady")

-        val downloadPageCount = runCatching { ChapterDownloadHelper.getImageCount(mangaId, chapterId) }.getOrDefault(0)
+        val downloadPageCount =
+            try {
+                ChapterDownloadHelper.getImageCount(mangaId, chapterId)
+            } catch (_: Exception) {
+                0
+            }
        val isMarkedAsDownloaded = chapterEntry[ChapterTable.isDownloaded]
        val dbPageCount = chapterEntry[ChapterTable.pageCount]
        val doesDownloadExist = downloadPageCount != 0
+        val doPageCountsMatch = dbPageCount == downloadPageCount

        log.debug { "isMarkedAsDownloaded= $isMarkedAsDownloaded, dbPageCount= $dbPageCount, downloadPageCount= $downloadPageCount" }

        return if (!doesDownloadExist) {
            log.debug { "reset download status and fetch page list" }
-            refreshChapterPageList(mangaId, chapterId, chapterEntry)
-            chapterEntry = freshChapterEntry(optChapterId = chapterId)
-            ChapterTable.toDataClass(chapterEntry)
+            updateDownloadStatusAndPageList(false)
        } else {
-            if (updateChapterPersistence(
-                    chapterId,
-                    isMarkedAsDownloaded,
-                    dbPageCount,
-                    downloadPageCount,
-                    chapterEntry[ChapterTable.lastPageRead],
-                    log,
-                )
-            ) {
-                chapterEntry = freshChapterEntry(optChapterId = chapterId)
+            transaction {
+                var needsUpdate = false
+
+                if (!isMarkedAsDownloaded) {
+                    log.debug { "mark as downloaded" }
+                    ChapterTable.update({ ChapterTable.id eq chapterId }) {
+                        it[isDownloaded] = true
+                    }
+                    needsUpdate = true
+                }
+
+                if (!doPageCountsMatch) {
+                    log.debug { "use page count of downloaded chapter" }
+                    ChapterTable.update({ ChapterTable.id eq chapterId }) {
+                        it[pageCount] = downloadPageCount
+                        it[lastPageRead] = chapterEntry[ChapterTable.lastPageRead].coerceAtMost(downloadPageCount - 1).coerceAtLeast(0)
+                    }
+                    needsUpdate = true
+                }
+
+                // Return updated chapter data
+                val updatedRow =
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.id eq chapterId }
+                        .first()
+
+                if (needsUpdate) {
+                    chapterEntry = updatedRow
+                }
+
+                ChapterTable.toDataClass(updatedRow)
            }
-            ChapterTable.toDataClass(chapterEntry)
        }
    }

@@ -207,4 +150,59 @@ private class ChapterForDownload(
                }
            }.first()
    }
+
+    private suspend fun updateDownloadStatusAndPageList(downloaded: Boolean): ChapterDataClass {
+        val mutex = mutexByChapterId.get(chapterId) { Mutex() }
+        return mutex.withLock {
+            val pageList = fetchPageList()
+
+            transaction {
+                // Update download status
+                ChapterTable.update({ ChapterTable.id eq chapterId }) {
+                    it[isDownloaded] = downloaded
+                }
+
+                // Clear existing pages and insert new ones
+                PageTable.deleteWhere { PageTable.chapter eq chapterId }
+                PageTable.batchInsert(pageList) { page ->
+                    this[PageTable.index] = page.index
+                    this[PageTable.url] = page.url
+                    this[PageTable.imageUrl] = page.imageUrl
+                    this[PageTable.chapter] = chapterId
+                }
+
+                // Update page count
+                ChapterTable.update({ ChapterTable.id eq chapterId }) {
+                    it[pageCount] = pageList.size
+                    it[lastPageRead] = chapterEntry[ChapterTable.lastPageRead].coerceAtMost(pageList.size - 1).coerceAtLeast(0)
+                }
+
+                // Get updated chapter data
+                val updatedRow =
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.id eq chapterId }
+                        .first()
+
+                chapterEntry = updatedRow
+                ChapterTable.toDataClass(updatedRow)
+            }
+        }
+    }
+
+    private suspend fun fetchPageList(): List<Page> {
+        val mangaEntry = transaction { MangaTable.selectAll().where { MangaTable.id eq mangaId }.first() }
+        val source = getCatalogueSourceOrStub(mangaEntry[MangaTable.sourceReference])
+
+        return source
+            .getPageList(
+                SChapter.create().apply {
+                    url = chapterEntry[ChapterTable.url]
+                    name = chapterEntry[ChapterTable.name]
+                    scanlator = chapterEntry[ChapterTable.scanlator]
+                    chapter_number = chapterEntry[ChapterTable.chapter_number]
+                    date_upload = chapterEntry[ChapterTable.date_upload]
+                },
+            ).mapIndexed { index, page -> Page(index, page.url, page.imageUrl, page.uri) }
+    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt
@@ -10,9 +10,9 @@ package suwayomi.tachidesk.manga.impl.extension
 import android.net.Uri
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceFactory
-import eu.kanade.tachiyomi.source.local.LocalSource
 import io.github.oshai.kotlinlogging.KotlinLogging
 import net.dongliu.apk.parser.ApkFile
 import net.dongliu.apk.parser.bean.Icon
@@ -23,24 +23,22 @@ import okio.source
 import org.jetbrains.exposed.v1.core.eq
 import org.jetbrains.exposed.v1.jdbc.deleteWhere
 import org.jetbrains.exposed.v1.jdbc.insert
-import org.jetbrains.exposed.v1.jdbc.select
 import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import org.jetbrains.exposed.v1.jdbc.update
+import suwayomi.tachidesk.manga.impl.extension.ExtensionsList.extensionTableAsDataClass
+import suwayomi.tachidesk.manga.impl.extension.github.ExtensionGithubApi
 import suwayomi.tachidesk.manga.impl.util.PackageTools
 import suwayomi.tachidesk.manga.impl.util.PackageTools.EXTENSION_FEATURE
 import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MAX
 import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MIN
-import suwayomi.tachidesk.manga.impl.util.PackageTools.METADATA_CONTENT_WARNING
-import suwayomi.tachidesk.manga.impl.util.PackageTools.METADATA_EXTENSION_LIB
-import suwayomi.tachidesk.manga.impl.util.PackageTools.METADATA_NAME
 import suwayomi.tachidesk.manga.impl.util.PackageTools.METADATA_NSFW
 import suwayomi.tachidesk.manga.impl.util.PackageTools.METADATA_SOURCE_CLASS
 import suwayomi.tachidesk.manga.impl.util.PackageTools.dex2jar
 import suwayomi.tachidesk.manga.impl.util.PackageTools.getPackageInfo
 import suwayomi.tachidesk.manga.impl.util.PackageTools.loadExtensionSources
 import suwayomi.tachidesk.manga.impl.util.network.await
-import suwayomi.tachidesk.manga.impl.util.source.GetSource
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource
 import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse.clearCachedImage
 import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse.getImageResponse
 import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse.saveImage
@@ -64,20 +62,18 @@ object Extension {

    suspend fun installExtension(pkgName: String): Int {
        logger.debug { "Installing $pkgName" }
-        val apkUrl =
-            transaction {
-                ExtensionTable
-                    .select(ExtensionTable.apkUrl)
-                    .where { ExtensionTable.pkgName eq pkgName }
-                    .firstOrNull()
-                    ?.get(ExtensionTable.apkUrl)
-            } ?: throw NullPointerException("Could not find extension $pkgName")
+        val extensionRecord = extensionTableAsDataClass().first { it.pkgName == pkgName }

        return installAPK {
-            val apkName = Uri.parse(apkUrl).lastPathSegment!!
+            val apkURL =
+                ExtensionGithubApi.getApkUrl(
+                    extensionRecord.repo ?: throw NullPointerException("Could not find extension repo"),
+                    extensionRecord.apkName,
+                )
+            val apkName = Uri.parse(apkURL).lastPathSegment!!
            val apkSavePath = "${applicationDirs.extensionsRoot}/$apkName"
            // download apk file
-            downloadAPKFile(apkUrl, apkSavePath)
+            downloadAPKFile(apkURL, apkSavePath)

            apkSavePath
        }
@@ -152,19 +148,7 @@ object Extension {
 //                throw Exception("This apk is not a signed with the official tachiyomi signature")
 //            }

-            var contentWarning = packageInfo.applicationInfo.metaData.getInt(METADATA_CONTENT_WARNING)
-            if (contentWarning == 0) {
-                contentWarning = packageInfo.applicationInfo.metaData
-                    .getString(METADATA_CONTENT_WARNING)
-                    ?.toIntOrNull()
-                    ?: 0
-                if (contentWarning == 0) {
-                    contentWarning = packageInfo.applicationInfo.metaData
-                        .getString(METADATA_NSFW)
-                        ?.toIntOrNull()
-                        ?: 0
-                }
-            }
+            val isNsfw = packageInfo.applicationInfo.metaData.getString(METADATA_NSFW) == "1"

            val className =
                packageInfo.packageName + packageInfo.applicationInfo.metaData.getString(METADATA_SOURCE_CLASS)
@@ -173,7 +157,7 @@ object Extension {

            dex2jar(apkFilePath, jarFilePath, fileNameWithoutType)
            extractAssetsFromApk(apkFilePath, jarFilePath)
-            extractAndCacheApkIcon(apkFilePath, packageInfo.packageName)
+            extractAndCacheApkIcon(apkFilePath, apkName)

            // clean up
            File(apkFilePath).delete()
@@ -181,12 +165,12 @@ object Extension {
            try {
                // collect sources from the extension
                val extensionMainClassInstance = loadExtensionSources(jarFilePath, className)
-                val sources: List<Source> =
+                val sources: List<CatalogueSource> =
                    when (extensionMainClassInstance) {
                        is Source -> listOf(extensionMainClassInstance)
                        is SourceFactory -> extensionMainClassInstance.createSources()
                        else -> throw RuntimeException("Unknown source class type! ${extensionMainClassInstance.javaClass}")
-                    }
+                    }.map { it as CatalogueSource }

                val langs = sources.map { it.lang }.toSet()
                val extensionLang =
@@ -197,16 +181,9 @@ object Extension {
                    }

                val extensionName =
-                    packageInfo.applicationInfo.metaData.getString(METADATA_NAME)
-                        ?: packageInfo.applicationInfo.nonLocalizedLabel
-                            .toString()
-                            .substringAfter("Tachiyomi: ")
-
-                val extensionLibVersion =
-                    packageInfo.applicationInfo.metaData
-                        .getString(METADATA_EXTENSION_LIB)
-                        .takeUnless { it == "0" }
-                        ?: packageInfo.versionName.substringBeforeLast('.')
+                    packageInfo.applicationInfo.nonLocalizedLabel
+                        .toString()
+                        .substringAfter("Tachiyomi: ")

                // update extension info
                transaction {
@@ -216,10 +193,9 @@ object Extension {
                            it[name] = extensionName
                            it[this.pkgName] = packageInfo.packageName
                            it[versionName] = packageInfo.versionName
-                            it[versionCode] = packageInfo.versionCode.toLong()
-                            it[extensionLib] = extensionLibVersion
+                            it[versionCode] = packageInfo.versionCode
                            it[lang] = extensionLang
-                            it[this.contentWarning] = contentWarning
+                            it[this.isNsfw] = isNsfw
                        }
                    }

@@ -228,7 +204,7 @@ object Extension {
                        it[this.isInstalled] = true
                        it[this.classFQName] = className
                        it[versionName] = packageInfo.versionName
-                        it[versionCode] = packageInfo.versionCode.toLong()
+                        it[versionCode] = packageInfo.versionCode
                    }

                    val extensionId =
@@ -244,7 +220,7 @@ object Extension {
                            it[name] = httpSource.name
                            it[lang] = httpSource.lang
                            it[extension] = extensionId
-                            it[this.contentWarning] = contentWarning
+                            it[SourceTable.isNsfw] = isNsfw
                        }
                        logger.debug { "Installed source ${httpSource.name} (${httpSource.lang}) with id:${httpSource.id}" }
                    }
@@ -265,7 +241,7 @@ object Extension {

    private fun extractAndCacheApkIcon(
        apkFilePath: String,
-        pkgName: String,
+        apkName: String,
    ) {
        val iconCacheDir = "${applicationDirs.extensionsRoot}/icon"
        try {
@@ -278,15 +254,15 @@ object Extension {
                        ?.first
                }
            if (iconData == null) {
-                logger.warn { "No icon found in APK $pkgName" }
+                logger.warn { "No icon found in APK $apkName" }
                return
            }

            File(iconCacheDir).mkdirs()
-            clearCachedImage(iconCacheDir, pkgName)
-            saveImage("$iconCacheDir/$pkgName", iconData.inputStream(), null)
+            clearCachedImage(iconCacheDir, apkName)
+            saveImage("$iconCacheDir/$apkName", iconData.inputStream(), null)
        } catch (e: Exception) {
-            logger.warn(e) { "Failed to extract icon from APK $pkgName" }
+            logger.warn(e) { "Failed to extract icon from APK $apkName" }
        }
    }

@@ -367,9 +343,7 @@ object Extension {
        logger.debug { "Uninstalling $pkgName" }

        val extensionRecord = transaction { ExtensionTable.selectAll().where { ExtensionTable.pkgName eq pkgName }.first() }
-        val fileNameWithoutType =
-            extensionRecord[ExtensionTable.apkName]?.substringBefore(".apk")
-                ?: throw NullPointerException("Missing $pkgName apkName")
+        val fileNameWithoutType = extensionRecord[ExtensionTable.apkName].substringBefore(".apk")
        val jarPath = "${applicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
        val sources =
            transaction {
@@ -379,13 +353,12 @@ object Extension {

                SourceTable.deleteWhere { SourceTable.extension eq extensionId }

-                if (extensionRecord[ExtensionTable.isObsolete] || extensionRecord[ExtensionTable.apkUrl] == null) {
+                if (extensionRecord[ExtensionTable.isObsolete]) {
                    ExtensionTable.deleteWhere { ExtensionTable.pkgName eq pkgName }
                } else {
                    ExtensionTable.update({ ExtensionTable.pkgName eq pkgName }) {
                        it[isInstalled] = false
                        it[hasUpdate] = false
-                        it[apkName] = null
                    }
                }

@@ -397,7 +370,7 @@ object Extension {
            PackageTools.jarLoaderMap.remove(jarPath)?.close()

            // clear all loaded sources
-            sources.forEach { GetSource.unregisterSource(it) }
+            sources.forEach { GetCatalogueSource.unregisterCatalogueSource(it) }

            File(jarPath).delete()
        }
@@ -412,7 +385,8 @@ object Extension {
                it[versionName] = targetExtension.versionName
                it[versionCode] = targetExtension.versionCode
                it[lang] = targetExtension.lang
-                it[contentWarning] = targetExtension.contentWarning.ordinal
+                it[isNsfw] = targetExtension.isNsfw
+                it[apkName] = targetExtension.apkName
                it[iconUrl] = targetExtension.iconUrl
                it[hasUpdate] = false
            }
@@ -420,21 +394,17 @@ object Extension {
        return installExtension(pkgName)
    }

-    suspend fun getExtensionIcon(pkgName: String): Pair<InputStream, String> {
+    suspend fun getExtensionIcon(apkName: String): Pair<InputStream, String> {
+        val iconUrl =
+            if (apkName == "localSource") {
+                ""
+            } else {
+                transaction { ExtensionTable.selectAll().where { ExtensionTable.apkName eq apkName }.first() }[ExtensionTable.iconUrl]
+            }
+
        val cacheSaveDir = "${applicationDirs.extensionsRoot}/icon"

-        if (pkgName == LocalSource::class.java.`package`.name) {
-            return getImageResponse(cacheSaveDir, "localSource") {
-                network.client
-                    .newCall(GET("", cache = CacheControl.FORCE_NETWORK))
-                    .await()
-            }
-        }
-
-        val iconUrl =
-            transaction { ExtensionTable.selectAll().where { ExtensionTable.pkgName eq pkgName }.first() }[ExtensionTable.iconUrl]
-
-        return getImageResponse(cacheSaveDir, pkgName) {
+        return getImageResponse(cacheSaveDir, apkName) {
            network.client
                .newCall(
                    GET(iconUrl, cache = CacheControl.FORCE_NETWORK),
@@ -442,5 +412,5 @@ object Extension {
        }
    }

-    fun proxyExtensionIconUrl(pkgName: String): String = "/api/v1/extension/icon/$pkgName"
+    fun getExtensionIconUrl(apkName: String): String = "/api/v1/extension/icon/$apkName"
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionStoreService.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionStoreService.kt
@@ -1,269 +0,0 @@
-package suwayomi.tachidesk.manga.impl.extension
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.network.awaitSuccess
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.serialization.decodeFromByteArray
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.okio.decodeFromBufferedSource
-import kotlinx.serialization.protobuf.ProtoBuf
-import okio.BufferedSource
-import okio.buffer
-import okio.gzip
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.core.inList
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.insert
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
-import suwayomi.tachidesk.manga.impl.extension.github.NetworkExtensionStore
-import suwayomi.tachidesk.manga.impl.extension.github.NetworkLegacyExtension
-import suwayomi.tachidesk.manga.impl.extension.github.NetworkLegacyExtensionRepo
-import suwayomi.tachidesk.manga.impl.extension.github.toExtensionInfo
-import suwayomi.tachidesk.manga.impl.extension.github.toExtensionInfos
-import suwayomi.tachidesk.manga.model.dataclass.ExtensionInfo
-import suwayomi.tachidesk.manga.model.dataclass.ExtensionStore
-import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
-import suwayomi.tachidesk.server.serverConfig
-import uy.kohesive.injekt.injectLazy
-import kotlin.coroutines.cancellation.CancellationException
-
-object ExtensionStoreService {
-    private val logger = KotlinLogging.logger {}
-
-    val network: NetworkHelper by injectLazy()
-    val protoBuf: ProtoBuf by injectLazy()
-    val json: Json by injectLazy()
-
-    suspend fun fetch(indexUrl: String): ExtensionStore {
-        var updatedIndexUrl: String = indexUrl
-        return try {
-            val response = network.client.newCall(GET(updatedIndexUrl)).awaitSuccess()
-            response.body.source().decompressIfGzipped().use { source ->
-                val networkStore =
-                    when (source.peek().readByte()) {
-                        // "[..."
-                        0x5B.toByte() -> {
-                            run {
-                                if (!indexUrl.endsWith("/index.min.json")) {
-                                    throw IllegalArgumentException("Provided legacy store url is not valid")
-                                }
-                                updatedIndexUrl = indexUrl.replace("/index.min.json", "/repo.json")
-                                network.client.newCall(GET(updatedIndexUrl)).awaitSuccess().body.source().use {
-                                    json.decodeFromBufferedSource<NetworkLegacyExtensionRepo>(it)
-                                }
-                            }
-                        }
-
-                        // "{..."
-                        0x7B.toByte() -> {
-                            try {
-                                json.decodeFromBufferedSource<NetworkLegacyExtensionRepo>(source.peek())
-                            } catch (_: IllegalArgumentException) {
-                                json.decodeFromBufferedSource<NetworkExtensionStore>(source)
-                            }
-                        }
-
-                        else -> {
-                            protoBuf.decodeFromByteArray<NetworkExtensionStore>(source.readByteArray())
-                        }
-                    }
-
-                if (networkStore is NetworkLegacyExtensionRepo && networkStore.indexV2 != null) {
-                    return fetch(networkStore.indexV2)
-                }
-
-                networkStore.toExtensionStore(updatedIndexUrl)
-            }
-        } catch (e: Exception) {
-            if (e is CancellationException) throw e
-            logger.error(e) { "Failed to fetch extension store '$indexUrl'" }
-            throw e
-        }
-    }
-
-    fun upsert(store: ExtensionStore) {
-        transaction {
-            val existing =
-                ExtensionStoreTable
-                    .selectAll()
-                    .where { ExtensionStoreTable.indexUrl eq store.indexUrl }
-                    .firstOrNull()
-
-            if (existing == null) {
-                ExtensionStoreTable.insert {
-                    it[name] = store.name
-                    it[badgeLabel] = store.badgeLabel
-                    it[signingKey] = store.signingKey
-                    it[contactWebsite] = store.contact.website
-                    it[contactDiscord] = store.contact.discord
-                    it[indexUrl] = store.indexUrl
-                    it[isLegacy] = store.isLegacy
-                    it[extensionListUrl] = store.extensionListUrl
-                }
-            } else {
-                ExtensionStoreTable.update({ ExtensionStoreTable.indexUrl eq store.indexUrl }) {
-                    it[name] = store.name
-                    it[badgeLabel] = store.badgeLabel
-                    it[signingKey] = store.signingKey
-                    it[contactWebsite] = store.contact.website
-                    it[contactDiscord] = store.contact.discord
-                    it[isLegacy] = store.isLegacy
-                    it[extensionListUrl] = store.extensionListUrl
-                }
-            }
-        }
-    }
-
-    suspend fun getAndRefresh(): List<ExtensionStore> {
-        val stores =
-            transaction {
-                ExtensionStoreTable.selectAll().toList()
-            }
-        var needsPrefUpdate = false
-        val updateStores =
-            stores.mapNotNull { storeRow ->
-                val oldIndexUrl = storeRow[ExtensionStoreTable.indexUrl]
-                val oldName = storeRow[ExtensionStoreTable.name]
-                try {
-                    val store = fetch(oldIndexUrl)
-                    if (store.indexUrl != oldIndexUrl) {
-                        transaction {
-                            ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl eq oldIndexUrl }
-                        }
-                        needsPrefUpdate = true
-                    }
-                    upsert(store)
-                    store
-                } catch (e: Exception) {
-                    logger.warn(e) { "Failed to fetch extension store '$oldName ($oldIndexUrl)'" }
-                    null
-                }
-            }
-        if (needsPrefUpdate) syncDbToPrefs()
-        return updateStores
-    }
-
-    fun syncDbToPrefs() {
-        val dbStores =
-            transaction {
-                ExtensionStoreTable
-                    .selectAll()
-                    .map { it[ExtensionStoreTable.indexUrl] }
-                    .toSet()
-            }
-
-        val currentPrefs = serverConfig.extensionStores.value.toSet()
-        val toAdd = dbStores - currentPrefs
-        val toRemove = currentPrefs - dbStores
-
-        if (toAdd.isNotEmpty()) {
-            serverConfig.extensionStores.value = (serverConfig.extensionStores.value + toAdd).distinct()
-        }
-
-        if (toRemove.isNotEmpty()) {
-            serverConfig.extensionStores.value = serverConfig.extensionStores.value.filterNot { it in toRemove }
-        }
-    }
-
-    suspend fun syncPrefsToDb() {
-        val prefUrls = serverConfig.extensionStores.value.toSet()
-
-        val dbStores =
-            transaction {
-                ExtensionStoreTable.selectAll().associateBy { it[ExtensionStoreTable.indexUrl] }
-            }
-
-        val toAdd = prefUrls - dbStores.keys
-        val toRemove = (dbStores.keys - prefUrls).toMutableSet()
-        var needsPrefUpdate = toRemove.isNotEmpty()
-
-        toAdd.forEach { url ->
-            try {
-                val store = fetch(url)
-                if (store.indexUrl != url) {
-                    transaction {
-                        ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl eq url }
-                    }
-                    needsPrefUpdate = true
-                    toRemove -= store.indexUrl
-                }
-                upsert(store)
-            } catch (e: Exception) {
-                logger.warn(e) { "Failed to sync preference store '$url' to database" }
-            }
-        }
-
-        if (toRemove.isNotEmpty()) {
-            transaction {
-                ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl inList toRemove.toList() }
-            }
-        }
-        if (needsPrefUpdate) {
-            syncDbToPrefs()
-        }
-    }
-
-    suspend fun getExtensions(store: ExtensionStore): List<ExtensionInfo> {
-        val extensions =
-            if (store.extensionListUrl != null) {
-                val response = network.client.newCall(GET(store.extensionListUrl)).awaitSuccess()
-                response.body.source().decompressIfGzipped().use { source ->
-                    when (source.peek().readByte()) {
-                        // "{..."
-                        0x7B.toByte() -> {
-                            json.decodeFromBufferedSource<NetworkExtensionStore.ExtensionList>(source)
-                        }
-
-                        else -> {
-                            protoBuf.decodeFromByteArray<NetworkExtensionStore.ExtensionList>(
-                                source.readByteArray(),
-                            )
-                        }
-                    }.toExtensionInfos(store)
-                }
-            } else if (!store.isLegacy) {
-                val response = network.client.newCall(GET(store.indexUrl)).awaitSuccess()
-                response.body.source().decompressIfGzipped().use { source ->
-                    when (source.peek().readByte()) {
-                        // "{..."
-                        0x7B.toByte() -> json.decodeFromBufferedSource<NetworkExtensionStore>(source)
-
-                        else -> protoBuf.decodeFromByteArray<NetworkExtensionStore>(source.readByteArray())
-                    }.extensionList!!
-                        .toExtensionInfos(store)
-                }
-            } else {
-                val storeBaseUrl = store.indexUrl.removeSuffix("/repo.json")
-                val response = network.client.newCall(GET("$storeBaseUrl/index.min.json")).awaitSuccess()
-                response.body.source().use { source ->
-                    json
-                        .decodeFromBufferedSource<List<NetworkLegacyExtension>>(source)
-                        .map { it.toExtensionInfo(store, storeBaseUrl) }
-                }
-            }
-        return extensions
-    }
-
-    private fun BufferedSource.decompressIfGzipped(): BufferedSource {
-        val isGzip =
-            peek().use { peeked ->
-                try {
-                    peeked.readShort().toInt() == 0x1f8b
-                } catch (_: Exception) {
-                    false
-                }
-            }
-
-        return if (isGzip) gzip().buffer() else this
-    }
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionsList.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionsList.kt
@@ -21,11 +21,12 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import org.jetbrains.exposed.v1.jdbc.update
-import suwayomi.tachidesk.manga.impl.extension.Extension.proxyExtensionIconUrl
-import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
+import suwayomi.tachidesk.manga.impl.extension.Extension.getExtensionIconUrl
+import suwayomi.tachidesk.manga.impl.extension.github.ExtensionGithubApi
+import suwayomi.tachidesk.manga.impl.extension.github.OnlineExtension
 import suwayomi.tachidesk.manga.model.dataclass.ExtensionDataClass
-import suwayomi.tachidesk.manga.model.dataclass.ExtensionInfo
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
+import suwayomi.tachidesk.server.serverConfig
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.time.Duration.Companion.seconds

@@ -33,23 +34,23 @@ object ExtensionsList {
    private val logger = KotlinLogging.logger {}

    var lastUpdateCheck: Long = 0
-    var updateMap = ConcurrentHashMap<String, ExtensionInfo>()
+    var updateMap = ConcurrentHashMap<String, OnlineExtension>()

    suspend fun fetchExtensions() {
-        val allExtensions = mutableListOf<ExtensionInfo>()
-
-        ExtensionStoreService.getAndRefresh().forEach { store ->
-            try {
-                val extensions = ExtensionStoreService.getExtensions(store)
-                allExtensions.addAll(extensions)
-            } catch (e: Exception) {
-                logger.warn(e) {
-                    "Failed to fetch extensions for store: ${store.indexUrl}"
-                }
+        // update if 60 seconds has passed or requested offline and database is empty
+        val extensions =
+            serverConfig.extensionRepos.value.map { repo ->
+                kotlin
+                    .runCatching {
+                        ExtensionGithubApi.findExtensions(repo.repoUrlReplace())
+                    }.onFailure {
+                        logger.warn(it) {
+                            "Failed to fetch extensions for repo: $repo"
+                        }
+                    }
            }
-        }
-
-        updateExtensionDatabase(allExtensions)
+        val foundExtensions = extensions.mapNotNull { it.getOrNull() }.flatten()
+        updateExtensionDatabase(foundExtensions)
    }

    suspend fun fetchExtensionsCached() {
@@ -73,25 +74,25 @@ object ExtensionsList {
        transaction {
            ExtensionTable.selectAll().filter { it[ExtensionTable.name] != LocalSource.EXTENSION_NAME }.map {
                ExtensionDataClass(
-                    repo = it[ExtensionTable.storeIndexUrl],
-                    apkName = it[ExtensionTable.apkName].orEmpty(),
-                    iconUrl = proxyExtensionIconUrl(it[ExtensionTable.pkgName]),
-                    name = it[ExtensionTable.name],
-                    pkgName = it[ExtensionTable.pkgName],
-                    versionName = it[ExtensionTable.versionName],
-                    versionCode = it[ExtensionTable.versionCode].toInt(),
-                    lang = it[ExtensionTable.lang],
-                    isNsfw = it[ExtensionTable.contentWarning] >= ContentWarning.MIXED.ordinal,
-                    installed = it[ExtensionTable.isInstalled],
-                    hasUpdate = it[ExtensionTable.hasUpdate],
-                    obsolete = it[ExtensionTable.isObsolete],
+                    it[ExtensionTable.repo],
+                    it[ExtensionTable.apkName],
+                    getExtensionIconUrl(it[ExtensionTable.apkName]),
+                    it[ExtensionTable.name],
+                    it[ExtensionTable.pkgName],
+                    it[ExtensionTable.versionName],
+                    it[ExtensionTable.versionCode],
+                    it[ExtensionTable.lang],
+                    it[ExtensionTable.isNsfw],
+                    it[ExtensionTable.isInstalled],
+                    it[ExtensionTable.hasUpdate],
+                    it[ExtensionTable.isObsolete],
                )
            }
        }

    private val updateExtensionDatabaseMutex = Mutex()

-    private suspend fun updateExtensionDatabase(foundExtensions: List<ExtensionInfo>) {
+    private suspend fun updateExtensionDatabase(foundExtensions: List<OnlineExtension>) {
        updateExtensionDatabaseMutex.withLock {
            transaction {
                val uniqueExtensions =
@@ -105,10 +106,10 @@ object ExtensionsList {
                        .selectAll()
                        .toList()
                        .associateBy { it[ExtensionTable.pkgName] }
-                val extensionsToUpdate = mutableListOf<Pair<ExtensionInfo, ResultRow>>()
-                val extensionsToInsert = mutableListOf<ExtensionInfo>()
+                val extensionsToUpdate = mutableListOf<Pair<OnlineExtension, ResultRow>>()
+                val extensionsToInsert = mutableListOf<OnlineExtension>()
                val extensionsToDelete =
-                    installedExtensions.filter { it.value[ExtensionTable.storeIndexUrl] != null }.mapNotNull { (pkgName, extension) ->
+                    installedExtensions.filter { it.value[ExtensionTable.repo] != null }.mapNotNull { (pkgName, extension) ->
                        extension.takeUnless { uniqueExtensions.any { it.pkgName == pkgName } }
                    }
                uniqueExtensions.forEach {
@@ -131,7 +132,7 @@ object ExtensionsList {
                                    addBatch(EntityID(extensionRecord[ExtensionTable.id].value, ExtensionTable))
                                    // Always update icon url and repo
                                    this[ExtensionTable.iconUrl] = foundExtension.iconUrl
-                                    this[ExtensionTable.storeIndexUrl] = foundExtension.storeIndexUrl
+                                    this[ExtensionTable.repo] = foundExtension.repo

                                    // add these because batch updates need matching columns
                                    this[ExtensionTable.hasUpdate] = extensionRecord[ExtensionTable.hasUpdate]
@@ -167,14 +168,13 @@ object ExtensionsList {
                                extensionsToFullyUpdate.forEach { (foundExtension, extensionRecord) ->
                                    addBatch(EntityID(extensionRecord[ExtensionTable.id].value, ExtensionTable))
                                    // extension is not installed, so we can overwrite the data without a care
-                                    this[ExtensionTable.storeIndexUrl] = foundExtension.storeIndexUrl
+                                    this[ExtensionTable.repo] = foundExtension.repo
                                    this[ExtensionTable.name] = foundExtension.name
-                                    this[ExtensionTable.extensionLib] = foundExtension.extensionLib
                                    this[ExtensionTable.versionName] = foundExtension.versionName
                                    this[ExtensionTable.versionCode] = foundExtension.versionCode
                                    this[ExtensionTable.lang] = foundExtension.lang
-                                    this[ExtensionTable.contentWarning] = foundExtension.contentWarning.ordinal
-                                    this[ExtensionTable.apkUrl] = foundExtension.apkUrl
+                                    this[ExtensionTable.isNsfw] = foundExtension.isNsfw
+                                    this[ExtensionTable.apkName] = foundExtension.apkName
                                    this[ExtensionTable.iconUrl] = foundExtension.iconUrl
                                }
                            }.toExecutable()
@@ -183,15 +183,14 @@ object ExtensionsList {
                }
                if (extensionsToInsert.isNotEmpty()) {
                    ExtensionTable.batchInsert(extensionsToInsert) { foundExtension ->
-                        this[ExtensionTable.storeIndexUrl] = foundExtension.storeIndexUrl
+                        this[ExtensionTable.repo] = foundExtension.repo
                        this[ExtensionTable.name] = foundExtension.name
                        this[ExtensionTable.pkgName] = foundExtension.pkgName
-                        this[ExtensionTable.extensionLib] = foundExtension.extensionLib
                        this[ExtensionTable.versionName] = foundExtension.versionName
                        this[ExtensionTable.versionCode] = foundExtension.versionCode
                        this[ExtensionTable.lang] = foundExtension.lang
-                        this[ExtensionTable.contentWarning] = foundExtension.contentWarning.ordinal
-                        this[ExtensionTable.apkUrl] = foundExtension.apkUrl
+                        this[ExtensionTable.isNsfw] = foundExtension.isNsfw
+                        this[ExtensionTable.apkName] = foundExtension.apkName
                        this[ExtensionTable.iconUrl] = foundExtension.iconUrl
                    }
                }
@@ -216,4 +215,16 @@ object ExtensionsList {
            }
        }
    }
+
+    private fun String.repoUrlReplace(): String =
+        if (contains("github")) {
+            replace(repoMatchRegex) {
+                "https://raw.githubusercontent.com/${it.groupValues[2]}/${it.groupValues[3]}/" +
+                    (it.groupValues.getOrNull(4)?.ifBlank { null } ?: "repo") +
+                    "/" +
+                    (it.groupValues.getOrNull(5)?.ifBlank { null } ?: "index.min.json")
+            }
+        } else {
+            this
+        }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/BaseNetworkExtensionStore.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/BaseNetworkExtensionStore.kt
@@ -1,14 +0,0 @@
-package suwayomi.tachidesk.manga.impl.extension.github
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import suwayomi.tachidesk.manga.model.dataclass.ExtensionStore
-
-interface BaseNetworkExtensionStore {
-    fun toExtensionStore(indexUrl: String): ExtensionStore
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt
@@ -0,0 +1,107 @@
+package suwayomi.tachidesk.manga.impl.extension.github
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.network.awaitSuccess
+import eu.kanade.tachiyomi.network.parseAs
+import io.github.oshai.kotlinlogging.KotlinLogging
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MAX
+import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MIN
+import uy.kohesive.injekt.injectLazy
+
+object ExtensionGithubApi {
+    private val logger = KotlinLogging.logger {}
+    private val json: Json by injectLazy()
+
+    @Serializable
+    private data class ExtensionJsonObject(
+        val name: String,
+        val pkg: String,
+        val apk: String,
+        val lang: String,
+        val code: Int,
+        val version: String,
+        val nsfw: Int,
+        val hasReadme: Int = 0,
+        val hasChangelog: Int = 0,
+        val sources: List<ExtensionSourceJsonObject>?,
+    )
+
+    @Serializable
+    private data class ExtensionSourceJsonObject(
+        val name: String,
+        val lang: String,
+        val id: Long,
+        val baseUrl: String,
+    )
+
+    suspend fun findExtensions(repo: String): List<OnlineExtension> {
+        val response =
+            client.newCall(GET(repo)).awaitSuccess()
+
+        return with(json) {
+            response
+                .parseAs<List<ExtensionJsonObject>>()
+                .toExtensions(repo.substringBeforeLast('/') + '/')
+        }
+    }
+
+    fun getApkUrl(
+        repo: String,
+        apkName: String,
+    ): String = "${repo}apk/$apkName"
+
+    private val client by lazy {
+        val network: NetworkHelper by injectLazy()
+        network.client
+            .newBuilder()
+            .addNetworkInterceptor { chain ->
+                val originalResponse = chain.proceed(chain.request())
+                originalResponse
+                    .newBuilder()
+                    .header("Content-Type", "application/json")
+                    .build()
+            }.build()
+    }
+
+    private fun List<ExtensionJsonObject>.toExtensions(repo: String): List<OnlineExtension> =
+        this
+            .filter {
+                val libVersion = it.version.substringBeforeLast('.').toDouble()
+                libVersion in LIB_VERSION_MIN..LIB_VERSION_MAX
+            }.map {
+                OnlineExtension(
+                    repo = repo,
+                    name = it.name.substringAfter("Tachiyomi: "),
+                    pkgName = it.pkg,
+                    versionName = it.version,
+                    versionCode = it.code,
+                    lang = it.lang,
+                    isNsfw = it.nsfw == 1,
+                    hasReadme = it.hasReadme == 1,
+                    hasChangelog = it.hasChangelog == 1,
+                    sources = it.sources?.toExtensionSources() ?: emptyList(),
+                    apkName = it.apk,
+                    iconUrl = "${repo}icon/${it.pkg}.png",
+                )
+            }
+
+    private fun List<ExtensionSourceJsonObject>.toExtensionSources(): List<OnlineExtensionSource> =
+        this.map {
+            OnlineExtensionSource(
+                name = it.name,
+                lang = it.lang,
+                id = it.id,
+                baseUrl = it.baseUrl,
+            )
+        }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/NetworkExtensionStore.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/NetworkExtensionStore.kt
@@ -1,148 +0,0 @@
-package suwayomi.tachidesk.manga.impl.extension.github
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
-import kotlinx.serialization.protobuf.ProtoNumber
-import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
-import suwayomi.tachidesk.manga.model.dataclass.ExtensionInfo
-import suwayomi.tachidesk.manga.model.dataclass.ExtensionSource
-import suwayomi.tachidesk.manga.model.dataclass.ExtensionStore
-
-@OptIn(ExperimentalSerializationApi::class)
-@Serializable
-data class NetworkExtensionStore(
-    @ProtoNumber(1) val name: String,
-    @ProtoNumber(2) val badgeLabel: String,
-    @ProtoNumber(3) val signingKey: String,
-    @ProtoNumber(4) val contact: Contact,
-    @ProtoNumber(101) val extensionList: ExtensionList?,
-    @ProtoNumber(102) val extensionListUrl: String?,
-) : BaseNetworkExtensionStore {
-    @Serializable
-    data class Contact(
-        @ProtoNumber(1) val website: String,
-        @ProtoNumber(2) val discord: String?,
-    )
-
-    @Serializable
-    data class ExtensionList(
-        @ProtoNumber(1) val extensions: List<Extension>,
-    )
-
-    @Serializable
-    data class Extension(
-        @ProtoNumber(1) val name: String,
-        @ProtoNumber(2) val packageName: String,
-        @ProtoNumber(3) val resources: Resources,
-        @ProtoNumber(4) val extensionLib: String,
-        @ProtoNumber(5) val versionCode: Long,
-        @ProtoNumber(6) val versionName: String,
-        @ProtoNumber(7) val contentWarning: ContentWarning,
-        @ProtoNumber(8) val sources: List<Source>,
-    )
-
-    @Serializable
-    data class Resources(
-        @ProtoNumber(1) val apkUrl: String,
-        @ProtoNumber(2) val iconUrl: String,
-    )
-
-    @Serializable
-    data class Source(
-        @ProtoNumber(1) val id: Long,
-        @ProtoNumber(2) val name: String,
-        @ProtoNumber(3) val language: String,
-        @ProtoNumber(4) val homeUrl: String = "",
-        @ProtoNumber(5) val mirrorUrls: List<String> = emptyList(),
-        // @ProtoNumber(6) val contentWarning: ContentWarning = ContentWarning.SAFE,
-        @ProtoNumber(7) val message: String? = null,
-    )
-
-    @Serializable
-    enum class ContentWarning {
-        @ProtoNumber(0)
-        @JsonNames("CONTENT_WARNING_UNSPECIFIED")
-        UNSPECIFIED,
-
-        @ProtoNumber(1)
-        @JsonNames("CONTENT_WARNING_SAFE")
-        SAFE,
-
-        @ProtoNumber(2)
-        @JsonNames("CONTENT_WARNING_MIXED")
-        MIXED,
-
-        @ProtoNumber(3)
-        @JsonNames("CONTENT_WARNING_NSFW")
-        NSFW,
-    }
-
-    override fun toExtensionStore(indexUrl: String): ExtensionStore =
-        ExtensionStore(
-            indexUrl = indexUrl,
-            name = name,
-            badgeLabel = badgeLabel,
-            signingKey = signingKey,
-            contact =
-                ExtensionStore.Contact(
-                    website = contact.website,
-                    discord = contact.discord,
-                ),
-            isLegacy = false,
-            extensionListUrl = extensionListUrl,
-        )
-}
-
-fun NetworkExtensionStore.ExtensionList.toExtensionInfos(store: ExtensionStore): List<ExtensionInfo> =
-    extensions.map { extension ->
-        val lang = extension.sources.map { it.language }.toSet()
-        ExtensionInfo(
-            storeIndexUrl = store.indexUrl,
-            name = extension.name,
-            pkgName = extension.packageName,
-            apkUrl = extension.resources.apkUrl,
-            iconUrl = extension.resources.iconUrl,
-            extensionLib = extension.extensionLib,
-            versionCode = extension.versionCode,
-            versionName = extension.versionName,
-            lang = if (lang.size == 1) lang.first() else "all",
-            contentWarning =
-                when (extension.contentWarning) {
-                    NetworkExtensionStore.ContentWarning.SAFE,
-                    NetworkExtensionStore.ContentWarning.UNSPECIFIED,
-                    -> ContentWarning.SAFE
-
-                    NetworkExtensionStore.ContentWarning.MIXED -> ContentWarning.MIXED
-
-                    NetworkExtensionStore.ContentWarning.NSFW -> ContentWarning.NSFW
-                },
-            sources =
-                extension.sources.map { source ->
-                    ExtensionSource(
-                        id = source.id,
-                        name = source.name,
-                        lang = source.language,
-                        homeUrl = source.homeUrl,
-                        message = source.message,
-                        contentWarning =
-                            when (extension.contentWarning) { // todo source.contentWarning
-                                NetworkExtensionStore.ContentWarning.SAFE,
-                                NetworkExtensionStore.ContentWarning.UNSPECIFIED,
-                                -> ContentWarning.SAFE
-
-                                NetworkExtensionStore.ContentWarning.MIXED -> ContentWarning.MIXED
-
-                                NetworkExtensionStore.ContentWarning.NSFW -> ContentWarning.NSFW
-                            },
-                    )
-                },
-        )
-    }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/NetworkLegacyExtension.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/NetworkLegacyExtension.kt
@@ -1,77 +0,0 @@
-package suwayomi.tachidesk.manga.impl.extension.github
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.Serializable
-import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
-import suwayomi.tachidesk.manga.model.dataclass.ExtensionInfo
-import suwayomi.tachidesk.manga.model.dataclass.ExtensionSource
-import suwayomi.tachidesk.manga.model.dataclass.ExtensionStore
-
-@OptIn(ExperimentalSerializationApi::class)
-@Serializable
-data class NetworkLegacyExtension(
-    val name: String,
-    val pkg: String,
-    val apk: String,
-    val lang: String,
-    val version: String,
-    val code: Long,
-    val nsfw: Int,
-    val sources: List<Source>? = null,
-) {
-    @Serializable
-    data class Source(
-        val id: Long,
-        val lang: String,
-        val name: String,
-        val baseUrl: String,
-    )
-}
-
-fun NetworkLegacyExtension.toExtensionInfo(
-    store: ExtensionStore,
-    storeBaseUrl: String,
-): ExtensionInfo =
-    ExtensionInfo(
-        storeIndexUrl = store.indexUrl,
-        name = name.substringAfter("Tachiyomi: "),
-        pkgName = pkg,
-        apkUrl = "$storeBaseUrl/apk/$apk",
-        iconUrl = "$storeBaseUrl/icon/$pkg.png",
-        extensionLib = version.substringBeforeLast('.'),
-        versionCode = code,
-        versionName = version,
-        lang = lang,
-        contentWarning = if (nsfw == 1) ContentWarning.MIXED else ContentWarning.SAFE,
-        sources =
-            if (sources.isNullOrEmpty()) {
-                listOf(
-                    ExtensionSource(
-                        id = 0,
-                        name = name,
-                        lang = lang,
-                        homeUrl = "",
-                        message = null,
-                        contentWarning = if (nsfw == 1) ContentWarning.MIXED else ContentWarning.SAFE,
-                    ),
-                )
-            } else {
-                sources.map { source ->
-                    ExtensionSource(
-                        id = source.id,
-                        name = source.name,
-                        lang = source.lang,
-                        homeUrl = source.baseUrl,
-                        message = null,
-                        contentWarning = if (nsfw == 1) ContentWarning.MIXED else ContentWarning.SAFE,
-                    )
-                }
-            },
-    )
--- a/Show More
+++ b/Show More