diff --git a/app/src/main/java/eu/kanade/data/chapter/NoChaptersException.kt b/app/src/main/java/eu/kanade/data/chapter/NoChaptersException.kt
new file mode 100644
index 000000000..f532f650a
--- /dev/null
+++ b/app/src/main/java/eu/kanade/data/chapter/NoChaptersException.kt
@@ -0,0 +1,3 @@
+package eu.kanade.data.chapter
+
+class NoChaptersException : Exception()
diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt
index bd333228b..59457aadd 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.unit.dp
 import androidx.core.graphics.drawable.toBitmap
 import coil.compose.AsyncImage
 import eu.kanade.domain.source.model.Source
-import eu.kanade.presentation.util.bitmapPainterResource
+import eu.kanade.presentation.util.rememberResourceBitmapPainter
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.util.lang.withIOContext
@@ -67,7 +67,7 @@ fun ExtensionIcon(
                 model = extension.iconUrl,
                 contentDescription = "",
                 placeholder = ColorPainter(Color(0x1F888888)),
-                error = bitmapPainterResource(id = R.drawable.cover_error),
+                error = rememberResourceBitmapPainter(id = R.drawable.cover_error),
                 modifier = modifier
                     .clip(RoundedCornerShape(4.dp))
                     .then(defaultModifier),
diff --git a/app/src/main/java/eu/kanade/presentation/components/MangaCover.kt b/app/src/main/java/eu/kanade/presentation/components/MangaCover.kt
index 3b2504d99..2d47b9a9c 100644
--- a/app/src/main/java/eu/kanade/presentation/components/MangaCover.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/MangaCover.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.graphics.painter.ColorPainter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
-import eu.kanade.presentation.util.bitmapPainterResource
+import eu.kanade.presentation.util.rememberResourceBitmapPainter
 import eu.kanade.tachiyomi.R
 
 enum class MangaCover(private val ratio: Float) {
@@ -28,7 +28,7 @@ enum class MangaCover(private val ratio: Float) {
         AsyncImage(
             model = data,
             placeholder = ColorPainter(CoverPlaceholderColor),
-            error = bitmapPainterResource(id = R.drawable.cover_error),
+            error = rememberResourceBitmapPainter(id = R.drawable.cover_error),
             contentDescription = contentDescription,
             modifier = modifier
                 .aspectRatio(ratio)
diff --git a/app/src/main/java/eu/kanade/presentation/components/SwipeRefresh.kt b/app/src/main/java/eu/kanade/presentation/components/SwipeRefresh.kt
index b9a1bc2a9..6767835b6 100644
--- a/app/src/main/java/eu/kanade/presentation/components/SwipeRefresh.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/SwipeRefresh.kt
@@ -3,15 +3,21 @@ package eu.kanade.presentation.components
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import com.google.accompanist.swiperefresh.SwipeRefreshState
 import com.google.accompanist.swiperefresh.SwipeRefreshIndicator as AccompanistSwipeRefreshIndicator
 
 @Composable
-fun SwipeRefreshIndicator(state: SwipeRefreshState, refreshTrigger: Dp) {
+fun SwipeRefreshIndicator(
+    state: SwipeRefreshState,
+    refreshTriggerDistance: Dp,
+    refreshingOffset: Dp = 16.dp,
+) {
     AccompanistSwipeRefreshIndicator(
         state = state,
-        refreshTriggerDistance = refreshTrigger,
+        refreshTriggerDistance = refreshTriggerDistance,
         backgroundColor = MaterialTheme.colorScheme.primary,
         contentColor = MaterialTheme.colorScheme.onPrimary,
+        refreshingOffset = refreshingOffset,
     )
 }
diff --git a/app/src/main/java/eu/kanade/presentation/util/PaddingValues.kt b/app/src/main/java/eu/kanade/presentation/util/PaddingValues.kt
index b1a2a9784..039883ce8 100644
--- a/app/src/main/java/eu/kanade/presentation/util/PaddingValues.kt
+++ b/app/src/main/java/eu/kanade/presentation/util/PaddingValues.kt
@@ -4,9 +4,11 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.platform.LocalLayoutDirection
 
 @Composable
+@ReadOnlyComposable
 operator fun PaddingValues.plus(other: PaddingValues): PaddingValues {
     val layoutDirection = LocalLayoutDirection.current
     return PaddingValues(
diff --git a/app/src/main/java/eu/kanade/presentation/util/Resources.kt b/app/src/main/java/eu/kanade/presentation/util/Resources.kt
index b22e6d02b..6f3f11a39 100644
--- a/app/src/main/java/eu/kanade/presentation/util/Resources.kt
+++ b/app/src/main/java/eu/kanade/presentation/util/Resources.kt
@@ -4,6 +4,8 @@ import android.content.res.Resources
 import androidx.annotation.DrawableRes
 import androidx.annotation.PluralsRes
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.platform.LocalContext
@@ -18,6 +20,7 @@ import androidx.core.graphics.drawable.toBitmap
  * @return the string data associated with the resource
  */
 @Composable
+@ReadOnlyComposable
 fun quantityStringResource(@PluralsRes id: Int, quantity: Int): String {
     val context = LocalContext.current
     return context.resources.getQuantityString(id, quantity, quantity)
@@ -32,6 +35,7 @@ fun quantityStringResource(@PluralsRes id: Int, quantity: Int): String {
  * @return the string data associated with the resource
  */
 @Composable
+@ReadOnlyComposable
 fun quantityStringResource(@PluralsRes id: Int, quantity: Int, vararg formatArgs: Any): String {
     val context = LocalContext.current
     return context.resources.getQuantityString(id, quantity, *formatArgs)
@@ -46,9 +50,11 @@ fun quantityStringResource(@PluralsRes id: Int, quantity: Int, vararg formatArgs
  * @return the bitmap associated with the resource
  */
 @Composable
-fun bitmapPainterResource(@DrawableRes id: Int): BitmapPainter {
+fun rememberResourceBitmapPainter(@DrawableRes id: Int): BitmapPainter {
     val context = LocalContext.current
-    val drawable = ContextCompat.getDrawable(context, id)
-        ?: throw Resources.NotFoundException()
-    return BitmapPainter(drawable.toBitmap().asImageBitmap())
+    return remember(id) {
+        val drawable = ContextCompat.getDrawable(context, id)
+            ?: throw Resources.NotFoundException()
+        BitmapPainter(drawable.toBitmap().asImageBitmap())
+    }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
index 9bdbdc184..3738bc7c5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.data.backup
 
 import android.content.Context
 import android.net.Uri
+import eu.kanade.data.chapter.NoChaptersException
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Chapter
@@ -10,7 +11,6 @@ import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.library.CustomMangaManager
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.util.chapter.NoChaptersException
 import eu.kanade.tachiyomi.util.system.createFileInCacheDir
 import exh.eh.EHentaiThrottleManager
 import kotlinx.coroutines.Job
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
index f2641c38c..0b8d58728 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
@@ -237,7 +237,7 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
 
         // Check if user wants track information in backup
         if (options and BACKUP_TRACK_MASK == BACKUP_TRACK) {
-            val tracks = db.getTracks(manga).executeAsBlocking()
+            val tracks = db.getTracks(manga.id).executeAsBlocking()
             if (tracks.isNotEmpty()) {
                 mangaObject.tracking = tracks.map { BackupTracking.copyFrom(it) }
             }
@@ -380,7 +380,7 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
         tracks.map { it.manga_id = manga.id!! }
 
         // Get tracks from database
-        val dbTracks = db.getTracks(manga).executeAsBlocking()
+        val dbTracks = db.getTracks(manga.id).executeAsBlocking()
         val trackToUpdate = mutableListOf<Track>()
 
         tracks.forEach { track ->
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt
index 123d697a7..0788ef37d 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt
@@ -34,11 +34,11 @@ class CoverCache(private val context: Context) {
     /**
      * Returns the cover from cache.
      *
-     * @param manga the manga.
+     * @param mangaThumbnailUrl thumbnail url for the manga.
      * @return cover image.
      */
-    fun getCoverFile(manga: Manga): File? {
-        return manga.thumbnail_url?.let {
+    fun getCoverFile(mangaThumbnailUrl: String?): File? {
+        return mangaThumbnailUrl?.let {
             File(cacheDir, DiskUtil.hashKeyForDisk(it))
         }
     }
@@ -46,11 +46,11 @@ class CoverCache(private val context: Context) {
     /**
      * Returns the custom cover from cache.
      *
-     * @param manga the manga.
+     * @param mangaId the manga id.
      * @return cover image.
      */
-    fun getCustomCoverFile(manga: Manga): File {
-        return File(customCoverCacheDir, DiskUtil.hashKeyForDisk(manga.id.toString()))
+    fun getCustomCoverFile(mangaId: Long?): File {
+        return File(customCoverCacheDir, DiskUtil.hashKeyForDisk(mangaId.toString()))
     }
 
     /**
@@ -62,7 +62,7 @@ class CoverCache(private val context: Context) {
      */
     @Throws(IOException::class)
     fun setCustomCoverToCache(manga: Manga, inputStream: InputStream) {
-        getCustomCoverFile(manga).outputStream().use {
+        getCustomCoverFile(manga.id).outputStream().use {
             inputStream.copyTo(it)
         }
     }
@@ -77,12 +77,12 @@ class CoverCache(private val context: Context) {
     fun deleteFromCache(manga: Manga, deleteCustomCover: Boolean = false): Int {
         var deleted = 0
 
-        getCoverFile(manga)?.let {
+        getCoverFile(manga.thumbnail_url)?.let {
             if (it.exists() && it.delete()) ++deleted
         }
 
         if (deleteCustomCover) {
-            if (deleteCustomCover(manga)) ++deleted
+            if (deleteCustomCover(manga.id)) ++deleted
         }
 
         return deleted
@@ -91,11 +91,11 @@ class CoverCache(private val context: Context) {
     /**
      * Delete custom cover of the manga from the cache
      *
-     * @param manga the manga.
+     * @param mangaId the manga id.
      * @return whether the cover was deleted.
      */
-    fun deleteCustomCover(manga: Manga): Boolean {
-        return getCustomCoverFile(manga).let {
+    fun deleteCustomCover(mangaId: Long?): Boolean {
+        return getCustomCoverFile(mangaId).let {
             it.exists() && it.delete()
         }
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt b/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt
index 978765c43..870ced03e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt
@@ -57,7 +57,7 @@ class MangaCoverFetcher(
     override suspend fun fetch(): FetchResult {
         // Use custom cover if exists
         val useCustomCover = options.parameters.value(USE_CUSTOM_COVER) ?: true
-        val customCoverFile = coverCache.getCustomCoverFile(manga)
+        val customCoverFile = coverCache.getCustomCoverFile(manga.id)
         if (useCustomCover && customCoverFile.exists()) {
             return fileLoader(customCoverFile)
         }
@@ -82,7 +82,7 @@ class MangaCoverFetcher(
     private suspend fun httpLoader(): FetchResult {
         // Only cache separately if it's a library item
         val libraryCoverCacheFile = if (manga.favorite) {
-            coverCache.getCoverFile(manga) ?: error("No cover specified")
+            coverCache.getCoverFile(manga.thumbnail_url) ?: error("No cover specified")
         } else {
             null
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt
index cd1fe8582..bb692d387 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt
@@ -19,13 +19,13 @@ interface TrackQueries : DbProvider {
         )
         .prepare()
 
-    fun getTracks(manga: Manga) = db.get()
+    fun getTracks(mangaId: Long?) = db.get()
         .listOfObjects(Track::class.java)
         .withQuery(
             Query.builder()
                 .table(TrackTable.TABLE)
                 .where("${TrackTable.COL_MANGA_ID} = ?")
-                .whereArgs(manga.id)
+                .whereArgs(mangaId)
                 .build(),
         )
         .prepare()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
index 8810c1f1d..3bc82e330 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
@@ -104,8 +104,9 @@ class DownloadManager(
         downloader.clearQueue(isNotification)
     }
 
-    fun startDownloadNow(chapter: Chapter) {
-        val download = downloader.queue.find { it.chapter.id == chapter.id } ?: return
+    fun startDownloadNow(chapterId: Long?) {
+        if (chapterId == null) return
+        val download = downloader.queue.find { it.chapter.id == chapterId } ?: return
         val queue = downloader.queue.toMutableList()
         queue.remove(download)
         queue.add(0, download)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.kt
index 7ebd7a9a5..a1438b994 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/model/Download.kt
@@ -6,9 +6,12 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
 import rx.subjects.PublishSubject
 
-class Download(val source: HttpSource, val manga: Manga, val chapter: Chapter) {
-
-    var pages: List<Page>? = null
+data class Download(
+    val source: HttpSource,
+    val manga: Manga,
+    val chapter: Chapter,
+    var pages: List<Page>? = null,
+) {
 
     @Volatile
     @Transient
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
index 6fea8d9fc..ee2f0e945 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.IBinder
 import android.os.PowerManager
 import androidx.core.content.ContextCompat
+import eu.kanade.data.chapter.NoChaptersException
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
@@ -35,7 +36,6 @@ import eu.kanade.tachiyomi.source.model.toSManga
 import eu.kanade.tachiyomi.source.online.all.MergedSource
 import eu.kanade.tachiyomi.ui.library.LibraryGroup
 import eu.kanade.tachiyomi.ui.manga.track.TrackItem
-import eu.kanade.tachiyomi.util.chapter.NoChaptersException
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithTrackServiceTwoWay
 import eu.kanade.tachiyomi.util.lang.withIOContext
@@ -519,7 +519,7 @@ class LibraryUpdateService(
                 xLogE("Error adding initial track for ${manga.title}", exception)
             }
             ioScope?.launch(handler) {
-                val tracks = db.getTracks(manga).executeAsBlocking()
+                val tracks = db.getTracks(manga.id).executeAsBlocking()
                 if (tracks.isEmpty() || tracks.none { it.sync_id == TrackManager.MDLIST }) {
                     val track = trackManager.mdList.createInitialTracker(manga)
                     db.insertTrack(trackManager.mdList.refresh(track)).executeAsBlocking()
@@ -619,7 +619,7 @@ class LibraryUpdateService(
     }
 
     private suspend fun updateTrackings(manga: LibraryManga, loggedServices: List<TrackService>) {
-        db.getTracks(manga).executeAsBlocking()
+        db.getTracks(manga.id).executeAsBlocking()
             .map { track ->
                 supervisorScope {
                     async {
@@ -739,7 +739,7 @@ class LibraryUpdateService(
                 notifier.showProgressNotification(listOf(manga), count, listManga.size)
 
                 // Get this manga's trackers from the database
-                val dbTracks = db.getTracks(manga).executeAsBlocking()
+                val dbTracks = db.getTracks(manga.id).executeAsBlocking()
 
                 // find the mdlist entry if its unfollowed the follow it
                 val tracker = TrackItem(dbTracks.firstOrNull { it.sync_id == TrackManager.MDLIST } ?: trackManager.mdList.createInitialTracker(manga), trackManager.mdList)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingUpdateJob.kt
index 65531d013..e47961eef 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingUpdateJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingUpdateJob.kt
@@ -30,7 +30,7 @@ class DelayedTrackingUpdateJob(context: Context, workerParams: WorkerParameters)
         withContext(Dispatchers.IO) {
             val tracks = delayedTrackingStore.getItems().mapNotNull {
                 val manga = db.getManga(it.mangaId).executeAsBlocking() ?: return@withContext
-                db.getTracks(manga).executeAsBlocking()
+                db.getTracks(manga.id).executeAsBlocking()
                     .find { track -> track.id == it.trackId }
                     ?.also { track ->
                         track.last_chapter_read = it.lastChapterRead
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt
index b86ace552..c2ddf7247 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt
@@ -150,7 +150,7 @@ class MigrationProcessAdapter(
         }
         // Update track
         if (MigrationFlags.hasTracks(flags)) {
-            val tracks = db.getTracks(prevManga).executeAsBlocking()
+            val tracks = db.getTracks(prevManga.id).executeAsBlocking()
             if (tracks.isNotEmpty()) {
                 tracks.forEach { track ->
                     track.id = null
@@ -161,7 +161,7 @@ class MigrationProcessAdapter(
         }
         // Update custom cover
         if (MigrationFlags.hasCustomCover(flags) && prevManga.hasCustomCover(coverCache)) {
-            coverCache.setCustomCoverToCache(manga, coverCache.getCustomCoverFile(prevManga).inputStream())
+            coverCache.setCustomCoverToCache(manga, coverCache.getCustomCoverFile(prevManga.id).inputStream())
         }
         // Update extras
         if (MigrationFlags.hasExtra(flags)) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
index d110404ea..ec36ee3f2 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
@@ -174,7 +174,7 @@ class LibraryCategoryAdapter(view: LibraryCategoryView, val controller: LibraryC
         searchTitles: List<SearchTitle>? = null,
     ): Boolean {
         val mappedQueries = queries.groupBy { it.excluded }
-        val tracks = if (hasLoggedServices) db.getTracks(manga).executeAsBlocking().toList() else null
+        val tracks = if (hasLoggedServices) db.getTracks(manga.id).executeAsBlocking().toList() else null
         val source = sourceManager.get(manga.source)
         val genre = if (checkGenre) manga.getGenres().orEmpty() else emptyList()
         val hasNormalQuery = mappedQueries[false]?.all { queryComponent ->
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
index 175a49141..c5af9fc13 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@@ -545,7 +545,7 @@ class LibraryController(
 
     override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.action_move_to_category -> showChangeMangaCategoriesDialog()
+            R.id.action_move_to_category -> showMangaCategoriesDialog()
             R.id.action_download_unread -> downloadUnreadChapters()
             R.id.action_mark_as_read -> markReadStatus(true)
             R.id.action_mark_as_unread -> markReadStatus(false)
@@ -632,7 +632,7 @@ class LibraryController(
     /**
      * Move the selected manga to a list of categories.
      */
-    private fun showChangeMangaCategoriesDialog() {
+    private fun showMangaCategoriesDialog() {
         // Create a copy of selected manga
         val mangas = selectedMangas.toList()
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
index f0f2b1624..c7746181d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
@@ -35,6 +35,7 @@ import com.google.android.material.snackbar.Snackbar
 import dev.chrisbanes.insetter.applyInsetter
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.SelectableAdapter
+import eu.kanade.data.chapter.NoChaptersException
 import eu.kanade.domain.history.model.HistoryWithRelations
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.cache.CoverCache
@@ -93,7 +94,6 @@ import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.ui.recent.history.HistoryController
 import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController
 import eu.kanade.tachiyomi.ui.webview.WebViewActivity
-import eu.kanade.tachiyomi.util.chapter.NoChaptersException
 import eu.kanade.tachiyomi.util.hasCustomCover
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
@@ -187,7 +187,6 @@ class MangaController :
 
     private val preferences: PreferencesHelper by injectLazy()
     private val coverCache: CoverCache by injectLazy()
-    private val sourceManager: SourceManager by injectLazy()
 
     private var mangaInfoAdapter: MangaInfoHeaderAdapter? = null
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
index de6198a1e..d4124c3f4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
@@ -286,7 +286,7 @@ class MangaPresenter(
             return Observable.just(0)
         }
 
-        return db.getTracks(manga).asRxObservable()
+        return db.getTracks(manga.id).asRxObservable()
             .map { tracks ->
                 val loggedServices = trackManager.services.filter { it.isLogged }.map { it.id }
                 tracks
@@ -376,7 +376,7 @@ class MangaPresenter(
         if (uri != null) {
             editCover(manga, context, uri)
         } else if (resetCover) {
-            coverCache.deleteCustomCover(manga)
+            coverCache.deleteCustomCover(manga.id)
             manga.updateCoverLastModified(db)
         }
 
@@ -659,7 +659,7 @@ class MangaPresenter(
     fun deleteCustomCover(manga: Manga) {
         Observable
             .fromCallable {
-                coverCache.deleteCustomCover(manga)
+                coverCache.deleteCustomCover(manga.id)
                 manga.updateCoverLastModified(db)
                 coverCache.clearMemoryCache()
             }
@@ -880,7 +880,7 @@ class MangaPresenter(
     }
 
     fun startDownloadingNow(chapter: Chapter) {
-        downloadManager.startDownloadNow(chapter)
+        downloadManager.startDownloadNow(chapter.id)
     }
 
     /**
@@ -1101,7 +1101,7 @@ class MangaPresenter(
 
     private fun fetchTrackers() {
         trackSubscription?.let { remove(it) }
-        trackSubscription = db.getTracks(manga)
+        trackSubscription = db.getTracks(manga.id)
             .asRxObservable()
             .map { tracks ->
                 loggedServices.map { service ->
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
index 4a1e330b3..4cb667407 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
@@ -96,9 +96,9 @@ class ChaptersSettingsSheet(
 
             private val scanlatorFilters = Item.DrawableSelection(0, this, R.string.scanlator, R.drawable.ic_outline_people_alt_24dp)
 
-            override val header = null
+            override val header: Item? = null
             override val items = listOf(downloaded, unread, bookmarked, scanlatorFilters)
-            override val footer = null
+            override val footer: Item? = null
 
             override fun initModels() {
                 if (presenter.forceDownloaded()) {
@@ -186,9 +186,9 @@ class ChaptersSettingsSheet(
             private val chapterNum = Item.MultiSort(R.string.sort_by_number, this)
             private val uploadDate = Item.MultiSort(R.string.sort_by_upload_date, this)
 
-            override val header = null
+            override val header: Item? = null
             override val items = listOf(source, uploadDate, chapterNum)
-            override val footer = null
+            override val footer: Item? = null
 
             override fun initModels() {
                 val sorting = presenter.manga.sorting
@@ -248,9 +248,9 @@ class ChaptersSettingsSheet(
             private val displayTitle = Item.Radio(R.string.show_title, this)
             private val displayChapterNum = Item.Radio(R.string.show_chapter_number, this)
 
-            override val header = null
+            override val header: Item? = null
             override val items = listOf(displayTitle, displayChapterNum)
-            override val footer = null
+            override val footer: Item? = null
 
             override fun initModels() {
                 val mode = presenter.manga.displayMode
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
index 8ca25bc3a..22eee2a69 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@@ -187,7 +187,7 @@ class ReaderPresenter(
 
     private var hasTrackers: Boolean = false
     private val checkTrackers: (Manga) -> Unit = { manga ->
-        val tracks = db.getTracks(manga).executeAsBlocking()
+        val tracks = db.getTracks(manga.id).executeAsBlocking()
 
         hasTrackers = tracks.size > 0
     }
@@ -967,7 +967,7 @@ class ReaderPresenter(
         val context = Injekt.get<Application>()
 
         launchIO {
-            db.getTracks(manga).executeAsBlocking()
+            db.getTracks(manga.id).executeAsBlocking()
                 .mapNotNull { track ->
                     val service = trackManager.getService(track.sync_id)
                     if (service != null && service.isLogged && chapterRead > track.last_chapter_read /* SY --> */ && ((service.id == TrackManager.MDLIST && track.status != FollowStatus.UNFOLLOWED.int) || service.id != TrackManager.MDLIST)/* SY <-- */) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt
index 3fa69379e..60567d785 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt
@@ -143,7 +143,7 @@ class UpdatesPresenter : BasePresenter<UpdatesController>() {
     }
 
     fun startDownloadingNow(chapter: Chapter) {
-        downloadManager.startDownloadNow(chapter)
+        downloadManager.startDownloadNow(chapter.id)
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
index adc3b2c7d..321e96c7e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
@@ -37,7 +37,7 @@ fun Manga.prepUpdateCover(coverCache: CoverCache, remoteManga: SManga, refreshSa
 }
 
 fun Manga.hasCustomCover(coverCache: CoverCache): Boolean {
-    return coverCache.getCustomCoverFile(this).exists()
+    return coverCache.getCustomCoverFile(id).exists()
 }
 
 fun Manga.removeCovers(coverCache: CoverCache) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
index 9d0a6d43b..0f9c25e10 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.util.chapter
 
+import eu.kanade.data.chapter.NoChaptersException
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
@@ -187,5 +188,3 @@ private fun shouldUpdateDbChapter(dbChapter: Chapter, sourceChapter: Chapter): B
         dbChapter.chapter_number != sourceChapter.chapter_number ||
         dbChapter.source_order != sourceChapter.source_order
 }
-
-class NoChaptersException : Exception()