diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
index c2d7d38a5..08eecd08e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
@@ -3,9 +3,9 @@ package eu.kanade.tachiyomi
 import android.os.Build
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
+import eu.kanade.tachiyomi.data.animelib.AnimelibUpdateJob
 import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
 import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
-import eu.kanade.tachiyomi.data.animelib.AnimelibUpdateJob
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.TrackManager
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/UnattendedTrackService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/UnattendedTrackService.kt
index 83dc6b656..760172261 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/UnattendedTrackService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/UnattendedTrackService.kt
@@ -1,11 +1,11 @@
 package eu.kanade.tachiyomi.data.track
 
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
-import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.data.database.models.Anime
+import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.track.model.AnimeTrackSearch
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.source.AnimeSource
+import eu.kanade.tachiyomi.source.Source
 
 /**
  * An Unattended Track Service will never prompt the user to match a manga with the remote.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/episode/EpisodeTrackSync.kt b/app/src/main/java/eu/kanade/tachiyomi/util/episode/EpisodeTrackSync.kt
index b88ae811f..9b6ef8ac7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/episode/EpisodeTrackSync.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/episode/EpisodeTrackSync.kt
@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.util.episode
 
 import eu.kanade.tachiyomi.data.database.AnimeDatabaseHelper
-import eu.kanade.tachiyomi.data.database.models.Episode
 import eu.kanade.tachiyomi.data.database.models.AnimeTrack
+import eu.kanade.tachiyomi.data.database.models.Episode
 import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.util.lang.launchIO
 import timber.log.Timber
diff --git a/app/src/main/res/layout/watcher_color_filter_settings.xml b/app/src/main/res/layout/watcher_color_filter_settings.xml
deleted file mode 100644
index 80899cf9b..000000000
--- a/app/src/main/res/layout/watcher_color_filter_settings.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <!-- Color filter -->
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/switch_color_filter"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/pref_custom_color_filter"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <!-- Red filter -->
-
-        <SeekBar
-            android:id="@+id/seekbar_color_filter_red"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:max="255"
-            android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-            app:layout_constraintEnd_toStartOf="@id/txt_color_filter_red_value"
-            app:layout_constraintStart_toEndOf="@id/color_filter_symbols_barrier"
-            app:layout_constraintTop_toBottomOf="@id/switch_color_filter" />
-
-        <TextView
-            android:id="@+id/txt_color_filter_red_symbol"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/color_filter_r_value"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
-            app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" />
-
-        <TextView
-            android:id="@+id/txt_color_filter_red_value"
-            android:layout_width="30dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
-            app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" />
-
-        <!-- Green filter -->
-
-        <SeekBar
-            android:id="@+id/seekbar_color_filter_green"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:max="255"
-            android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-            app:layout_constraintEnd_toStartOf="@id/txt_color_filter_green_value"
-            app:layout_constraintStart_toEndOf="@id/color_filter_symbols_barrier"
-            app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red" />
-
-        <TextView
-            android:id="@+id/txt_color_filter_green_symbol"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/color_filter_g_value"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
-            app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" />
-
-        <TextView
-            android:id="@+id/txt_color_filter_green_value"
-            android:layout_width="30dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
-            app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" />
-
-        <!-- Blue filter -->
-
-        <SeekBar
-            android:id="@+id/seekbar_color_filter_blue"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:max="255"
-            android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-            app:layout_constraintEnd_toStartOf="@id/txt_color_filter_blue_value"
-            app:layout_constraintStart_toEndOf="@id/color_filter_symbols_barrier"
-            app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green" />
-
-        <TextView
-            android:id="@+id/txt_color_filter_blue_symbol"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/color_filter_b_value"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
-            app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" />
-
-        <TextView
-            android:id="@+id/txt_color_filter_blue_value"
-            android:layout_width="30dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
-            app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" />
-
-        <!-- Alpha filter -->
-
-        <SeekBar
-            android:id="@+id/seekbar_color_filter_alpha"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:max="255"
-            android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-            app:layout_constraintEnd_toStartOf="@id/txt_color_filter_alpha_value"
-            app:layout_constraintStart_toEndOf="@id/color_filter_symbols_barrier"
-            app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue" />
-
-        <TextView
-            android:id="@+id/txt_color_filter_alpha_symbol"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/color_filter_a_value"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
-            app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" />
-
-        <TextView
-            android:id="@+id/txt_color_filter_alpha_value"
-            android:layout_width="30dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
-            app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" />
-
-        <!-- Filter mode -->
-
-        <TextView
-            android:id="@+id/color_filter_mode_text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/pref_color_filter_mode"
-            app:layout_constraintBaseline_toBaselineOf="@id/color_filter_mode"
-            app:layout_constraintEnd_toStartOf="@id/color_filter_mode"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <androidx.appcompat.widget.AppCompatSpinner
-            android:id="@+id/color_filter_mode"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:entries="@array/color_filter_modes"
-            app:layout_constraintEnd_toStartOf="@id/spinner_end"
-            app:layout_constraintStart_toEndOf="@id/verticalcenter"
-            app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_alpha" />
-
-        <!-- Brightness -->
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/custom_brightness"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/pref_custom_brightness"
-            app:layout_constraintTop_toBottomOf="@id/color_filter_mode_text" />
-
-        <!-- Brightness value -->
-
-        <eu.kanade.tachiyomi.widget.NegativeSeekBar
-            android:id="@+id/brightness_seekbar"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-            app:layout_constraintEnd_toStartOf="@id/txt_brightness_seekbar_value"
-            app:layout_constraintStart_toEndOf="@id/txt_brightness_seekbar_icon"
-            app:layout_constraintTop_toBottomOf="@id/custom_brightness"
-            app:max_seek="100"
-            app:min_seek="-75" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/txt_brightness_seekbar_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
-            android:tint="?attr/colorOnBackground"
-            app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
-            app:srcCompat="@drawable/ic_brightness_5_24dp" />
-
-        <TextView
-            android:id="@+id/txt_brightness_seekbar_value"
-            android:layout_width="30dp"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.Medium.SubHeading"
-            app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/brightness_seekbar" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/color_filter_symbols_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="end"
-            app:constraint_referenced_ids="txt_color_filter_alpha_symbol,txt_color_filter_blue_symbol,txt_color_filter_red_symbol,txt_color_filter_green_symbol" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/verticalcenter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.5" />
-
-        <android.widget.Space
-            android:id="@+id/spinner_end"
-            android:layout_width="16dp"
-            android:layout_height="0dp"
-            app:layout_constraintStart_toEndOf="parent"
-            tools:ignore="MissingConstraints" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/watcher_general_settings.xml b/app/src/main/res/layout/watcher_general_settings.xml
deleted file mode 100644
index e266d49b7..000000000
--- a/app/src/main/res/layout/watcher_general_settings.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <eu.kanade.tachiyomi.widget.MaterialSpinnerView
-            android:id="@+id/rotation_mode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:entries="@array/rotation_type"
-            app:title="@string/pref_rotation_type" />
-
-        <eu.kanade.tachiyomi.widget.MaterialSpinnerView
-            android:id="@+id/background_color"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:entries="@array/reader_themes"
-            app:title="@string/pref_reader_theme" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/show_page_number"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_show_page_number" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/fullscreen"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_fullscreen" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/cutout_short"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_cutout_short"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/keepscreen"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_keep_screen_on" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/long_tap"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_read_with_long_tap" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/always_show_episode_transition"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_always_show_chapter_transition" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/page_transitions"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/pref_page_transitions" />
-
-    </LinearLayout>
-
-</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/watcher_reading_mode_settings.xml b/app/src/main/res/layout/watcher_reading_mode_settings.xml
deleted file mode 100644
index 15968285b..000000000
--- a/app/src/main/res/layout/watcher_reading_mode_settings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <eu.kanade.tachiyomi.widget.MaterialSpinnerView
-            android:id="@+id/viewer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:entries="@array/viewers_selector"
-            app:title="@string/pref_category_for_this_series" />
-
-        <!-- Pager preferences -->
-        <include
-            android:id="@+id/pager_prefs_group"
-            layout="@layout/reader_pager_settings"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <!-- Webtoon preferences -->
-        <include
-            android:id="@+id/webtoon_prefs_group"
-            layout="@layout/reader_webtoon_settings"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
-    </LinearLayout>
-
-</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/watcher_transition_view.xml b/app/src/main/res/layout/watcher_transition_view.xml
deleted file mode 100644
index d40d40e7e..000000000
--- a/app/src/main/res/layout/watcher_transition_view.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/upper_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:textSize="17.5sp"
-        tools:text="Top" />
-
-    <LinearLayout
-        android:id="@+id/warning"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:gravity="center_vertical">
-
-        <ImageView
-            android:layout_width="18dp"
-            android:layout_height="18dp"
-            android:layout_marginEnd="8dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_warning_white_24dp"
-            app:tint="?attr/colorOnBackground"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/warning_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="Warning" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/lower_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="17.5sp"
-        tools:text="Bottom" />
-
-</LinearLayout>