diff --git a/app/src/main/res/anim/enter_from_left.xml b/app/src/main/res/anim/enter_from_left.xml
deleted file mode 100644
index 67f7b0f76a..0000000000
--- a/app/src/main/res/anim/enter_from_left.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="200"
-        android:fromXDelta="-100%"
-        android:toXDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/enter_from_right.xml b/app/src/main/res/anim/enter_from_right.xml
deleted file mode 100644
index e5a91703ea..0000000000
--- a/app/src/main/res/anim/enter_from_right.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="200"
-        android:fromXDelta="100%"
-        android:toXDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/exit_to_left.xml b/app/src/main/res/anim/exit_to_left.xml
deleted file mode 100644
index b5d7eb0fcc..0000000000
--- a/app/src/main/res/anim/exit_to_left.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="200"
-        android:fromXDelta="0%"
-        android:toXDelta="-100%" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/exit_to_right.xml b/app/src/main/res/anim/exit_to_right.xml
deleted file mode 100644
index c0f406cb01..0000000000
--- a/app/src/main/res/anim/exit_to_right.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="200"
-        android:fromXDelta="0%"
-        android:toXDelta="100%" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
deleted file mode 100644
index 79e511214b..0000000000
--- a/app/src/main/res/anim/fade_in.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <alpha
-        android:duration="300"
-        android:fillAfter="true"
-        android:fromAlpha="0.0"
-        android:interpolator="@android:anim/accelerate_interpolator"
-        android:toAlpha="1.0" />
-</set>
diff --git a/app/src/main/res/drawable/library_item_selector_amoled.xml b/app/src/main/res/drawable/library_item_selector.xml
similarity index 56%
rename from app/src/main/res/drawable/library_item_selector_amoled.xml
rename to app/src/main/res/drawable/library_item_selector.xml
index 18b0fb40eb..8dc63c3173 100644
--- a/app/src/main/res/drawable/library_item_selector_amoled.xml
+++ b/app/src/main/res/drawable/library_item_selector.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/selectorColorDark">
+    android:color="?attr/colorLibrarySelection">
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="@color/selectorColorDark" />
+                <color android:color="?attr/colorLibrarySelectionActive" />
             </item>
 
             <item android:state_activated="true">
-                <color android:color="@color/selectorColorDark" />
+                <color android:color="?attr/colorLibrarySelectionActive" />
             </item>
 
             <item>
-                <color android:color="@color/md_black_1000" />
+                <color android:color="?android:attr/colorBackground" />
             </item>
         </selector>
     </item>
diff --git a/app/src/main/res/drawable/library_item_selector_dark.xml b/app/src/main/res/drawable/library_item_selector_dark.xml
deleted file mode 100644
index 7e2dc8b749..0000000000
--- a/app/src/main/res/drawable/library_item_selector_dark.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/colorAccentDark">
-    <item>
-        <selector>
-            <item android:state_selected="true">
-                <color android:color="@color/selectorColorDark" />
-            </item>
-
-            <item android:state_activated="true">
-                <color android:color="@color/selectorColorDark" />
-            </item>
-
-            <item>
-                <color android:color="@color/backgroundDark" />
-            </item>
-        </selector>
-    </item>
-</ripple>
diff --git a/app/src/main/res/drawable/library_item_selector_light.xml b/app/src/main/res/drawable/library_item_selector_light.xml
deleted file mode 100644
index e51877cc91..0000000000
--- a/app/src/main/res/drawable/library_item_selector_light.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/colorAccentLight">
-    <item>
-        <selector>
-            <item android:state_selected="true">
-                <color android:color="@color/selectorColorLight" />
-            </item>
-
-            <item android:state_activated="true">
-                <color android:color="@color/selectorColorLight" />
-            </item>
-
-            <item>
-                <color android:color="@color/backgroundLight" />
-            </item>
-        </selector>
-    </item>
-</ripple>
diff --git a/app/src/main/res/layout/source_grid_item.xml b/app/src/main/res/layout/source_grid_item.xml
index 7620e861c2..03d2045be1 100644
--- a/app/src/main/res/layout/source_grid_item.xml
+++ b/app/src/main/res/layout/source_grid_item.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectable_library_drawable"
+    android:background="@drawable/library_item_selector"
     android:padding="4dp">
 
     <androidx.cardview.widget.CardView
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d80d40ed2e..b0e994eb53 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -11,7 +11,8 @@
         <attr name="max_seek" format="integer"/>
     </declare-styleable>
 
-    <attr name="selectable_library_drawable" format="reference|integer"/>
+    <attr name="colorLibrarySelection" format="reference|integer"/>
+    <attr name="colorLibrarySelectionActive" format="reference|integer"/>
     <attr name="colorFilterActive" format="reference|integer"/>
     <attr name="colorBackgroundSplash" format="reference|integer"/>
 
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index a28b6bb7ee..fa365dbbd1 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <item name="catalogue_filter_sort_group" type="id"/>
-    <item name="catalogue_filter_sort_item" type="id"/>
-
     <item name="reader_pager" type="id"/>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 566590ec62..b1fa2df606 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -172,14 +172,6 @@
     </style>
 
 
-    <style name="Theme.Widget.CheckBox" />
-
-    <style name="Theme.Widget.CheckBox.Light" parent="TextAppearance.Regular.Body1">
-        <item name="android:textColor">@color/md_white_1000</item>
-        <item name="buttonTint">@color/md_white_1000</item>
-    </style>
-
-
     <style name="Theme.Widget.SpinnerItem" parent="Widget.AppCompat.DropDownItem.Spinner">
         <item name="android:textColor">?attr/colorOnSurface</item>
         <item name="android:background">@drawable/list_item_selector</item>
@@ -302,16 +294,6 @@
     <!--===-->
     <!--OLD-->
     <!--===-->
-    <style name="AlertDialogStyle" parent="Theme.MaterialComponents.Light.Dialog.Alert">
-        <item name="android:windowTitleStyle">@style/DialogTitleText</item>
-        <item name="colorAccent">?attr/colorPrimary</item>
-    </style>
-
-    <style name="DialogTitleText">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
-    </style>
-
     <style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimary</item>
@@ -326,14 +308,4 @@
 
     <style name="FilePickerAlertDialogTheme" parent="Theme.MaterialComponents.Light.Dialog.Alert" />
 
-    <style name="reader_settings_popup_animation">
-        <item name="android:windowEnterAnimation">@anim/enter_from_right</item>
-        <item name="android:windowExitAnimation">@anim/exit_to_right</item>
-    </style>
-
-    <style name="reader_brightness_popup_animation">
-        <item name="android:windowEnterAnimation">@anim/enter_from_left</item>
-        <item name="android:windowExitAnimation">@anim/exit_to_left</item>
-    </style>
-
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index dcd2636f54..26dee4eaa7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -59,7 +59,8 @@
         <item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
 
         <!-- Custom Attributes-->
-        <item name="selectable_library_drawable">@drawable/library_item_selector_light</item>
+        <item name="colorLibrarySelection">?attr/colorAccent</item>
+        <item name="colorLibrarySelectionActive">@color/selectorColorLight</item>
         <item name="colorFilterActive">@color/filterColorDark</item>
     </style>
 
@@ -134,7 +135,8 @@
         <item name="md_background_color">?attr/colorSurface</item>
 
         <!-- Custom Attributes-->
-        <item name="selectable_library_drawable">@drawable/library_item_selector_dark</item>
+        <item name="colorLibrarySelection">?attr/colorAccent</item>
+        <item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
         <item name="colorFilterActive">@color/filterColorDark</item>
     </style>
 
@@ -163,7 +165,8 @@
         <item name="md_background_color">@color/colorAmoledPrimary</item>
 
         <!-- Custom Attributes-->
-        <item name="selectable_library_drawable">@drawable/library_item_selector_amoled</item>
+        <item name="colorLibrarySelection">@color/selectorColorDark</item>
+        <item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
     </style>
 
     <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled">