diff --git a/app/src/main/res/color/divider.xml b/app/src/main/res/color/divider.xml
deleted file mode 100644
index 1915480d2..000000000
--- a/app/src/main/res/color/divider.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:alpha="0.12" android:color="?attr/colorOnSurface"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/stroke_color.xml b/app/src/main/res/color/stroke_color.xml
deleted file mode 100644
index daeffa86f..000000000
--- a/app/src/main/res/color/stroke_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?attr/colorPrimary" android:state_checked="true"/>
-	<item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_checked="false"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/totoro.webp b/app/src/main/res/drawable-hdpi/ic_totoro.webp
similarity index 100%
rename from app/src/main/res/drawable-hdpi/totoro.webp
rename to app/src/main/res/drawable-hdpi/ic_totoro.webp
diff --git a/app/src/main/res/drawable-mdpi/totoro.webp b/app/src/main/res/drawable-mdpi/ic_totoro.webp
similarity index 100%
rename from app/src/main/res/drawable-mdpi/totoro.webp
rename to app/src/main/res/drawable-mdpi/ic_totoro.webp
diff --git a/app/src/main/res/drawable-xhdpi/totoro.webp b/app/src/main/res/drawable-xhdpi/ic_totoro.webp
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/totoro.webp
rename to app/src/main/res/drawable-xhdpi/ic_totoro.webp
diff --git a/app/src/main/res/drawable-xxhdpi/totoro.webp b/app/src/main/res/drawable-xxhdpi/ic_totoro.webp
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/totoro.webp
rename to app/src/main/res/drawable-xxhdpi/ic_totoro.webp
diff --git a/app/src/main/res/drawable-xxxhdpi/totoro.webp b/app/src/main/res/drawable-xxxhdpi/ic_totoro.webp
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/totoro.webp
rename to app/src/main/res/drawable-xxxhdpi/ic_totoro.webp
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
deleted file mode 100644
index 695880601..000000000
--- a/app/src/main/res/drawable/divider.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-	<size android:height="1dp"/>
-	<solid android:color="?attr/colorOnSurface" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient.xml b/app/src/main/res/drawable/gradient.xml
deleted file mode 100644
index f90e2ebb4..000000000
--- a/app/src/main/res/drawable/gradient.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<gradient
-		android:angle="90"
-		android:endColor="#00ffffff"
-		android:centerColor="#00000000"
-		android:startColor="#aa000000"
-		android:type="linear"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_chip_storage.xml b/app/src/main/res/drawable/ic_chip_storage.xml
deleted file mode 100644
index 6e8a580b1..000000000
--- a/app/src/main/res/drawable/ic_chip_storage.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="12dp"
-	android:height="12dp"
-	android:tint="?android:textColorPrimary"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="@android:color/white"
-		android:pathData="M18,4v16L6,20L6,8.83L10.83,4L18,4m0,-2h-8L4,8v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM9,7h2v4L9,11zM12,7h2v4h-2zM15,7h2v4h-2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_chip_tag.xml b/app/src/main/res/drawable/ic_chip_tag.xml
deleted file mode 100644
index d5df0cdda..000000000
--- a/app/src/main/res/drawable/ic_chip_tag.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="12dp"
-	android:height="12dp"
-	android:tint="?android:textColorPrimary"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M21.41 11.58L12.41 2.58A2 2 0 0 0 11 2H4A2 2 0 0 0 2 4V11A2 2 0 0 0 2.59 12.42L11.59 21.42A2 2 0 0 0 13 22A2 2 0 0 0 14.41 21.41L21.41 14.41A2 2 0 0 0 22 13A2 2 0 0 0 21.41 11.58M13 20L4 11V4H11L20 13M6.5 5A1.5 1.5 0 1 1 5 6.5A1.5 1.5 0 0 1 6.5 5Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_chip_user.xml b/app/src/main/res/drawable/ic_chip_user.xml
deleted file mode 100644
index 7766cafe5..000000000
--- a/app/src/main/res/drawable/ic_chip_user.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="12dp"
-	android:height="12dp"
-	android:tint="?android:textColorPrimary"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,6A2,2 0 0,0 10,8A2,2 0 0,0 12,10A2,2 0 0,0 14,8A2,2 0 0,0 12,6M12,13C14.67,13 20,14.33 20,17V20H4V17C4,14.33 9.33,13 12,13M12,14.9C9.03,14.9 5.9,16.36 5.9,17V18.1H18.1V17C18.1,16.36 14.97,14.9 12,14.9Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_chip_web.xml b/app/src/main/res/drawable/ic_chip_web.xml
deleted file mode 100644
index da38fecd3..000000000
--- a/app/src/main/res/drawable/ic_chip_web.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="12dp"
-	android:height="12dp"
-	android:tint="?android:textColorPrimary"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="@android:color/white"
-		android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2s-0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2s-0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_eye.xml b/app/src/main/res/drawable/ic_eye.xml
deleted file mode 100644
index 86a1ee448..000000000
--- a/app/src/main/res/drawable/ic_eye.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5C19.17,14.87 15.79,17 12,17s-7.17,-2.13 -8.82,-5.5C4.83,8.13 8.21,6 12,6m0,-2C7,4 2.73,7.11 1,11.5 2.73,15.89 7,19 12,19s9.27,-3.11 11,-7.5C21.27,7.11 17,4 12,4zM12,9c1.38,0 2.5,1.12 2.5,2.5S13.38,14 12,14s-2.5,-1.12 -2.5,-2.5S10.62,9 12,9m0,-2c-2.48,0 -4.5,2.02 -4.5,4.5S9.52,16 12,16s4.5,-2.02 4.5,-4.5S14.48,7 12,7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_eye_checkable.xml b/app/src/main/res/drawable/ic_eye_checkable.xml
deleted file mode 100644
index 7f35e1761..000000000
--- a/app/src/main/res/drawable/ic_eye_checkable.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-	android:enterFadeDuration="@android:integer/config_mediumAnimTime"
-	android:exitFadeDuration="@android:integer/config_mediumAnimTime">
-	<item android:drawable="@drawable/ic_eye" android:state_checked="true" />
-	<item android:drawable="@drawable/ic_eye_off" android:state_checked="false" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_eye_off.xml b/app/src/main/res/drawable/ic_eye_off.xml
deleted file mode 100644
index 33f8b6967..000000000
--- a/app/src/main/res/drawable/ic_eye_off.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,6c3.79,0 7.17,2.13 8.82,5.5 -0.59,1.22 -1.42,2.27 -2.41,3.12l1.41,1.41c1.39,-1.23 2.49,-2.77 3.18,-4.53C21.27,7.11 17,4 12,4c-1.27,0 -2.49,0.2 -3.64,0.57l1.65,1.65C10.66,6.09 11.32,6 12,6zM10.93,7.14L13,9.21c0.57,0.25 1.03,0.71 1.28,1.28l2.07,2.07c0.08,-0.34 0.14,-0.7 0.14,-1.07C16.5,9.01 14.48,7 12,7c-0.37,0 -0.72,0.05 -1.07,0.14zM2.01,3.87l2.68,2.68C3.06,7.83 1.77,9.53 1,11.5 2.73,15.89 7,19 12,19c1.52,0 2.98,-0.29 4.32,-0.82l3.42,3.42 1.41,-1.41L3.42,2.45 2.01,3.87zM9.51,11.37l2.61,2.61c-0.04,0.01 -0.08,0.02 -0.12,0.02 -1.38,0 -2.5,-1.12 -2.5,-2.5 0,-0.05 0.01,-0.08 0.01,-0.13zM6.11,7.97l1.75,1.75c-0.23,0.55 -0.36,1.15 -0.36,1.78 0,2.48 2.02,4.5 4.5,4.5 0.63,0 1.23,-0.13 1.77,-0.36l0.98,0.98c-0.88,0.24 -1.8,0.38 -2.75,0.38 -3.79,0 -7.17,-2.13 -8.82,-5.5 0.7,-1.43 1.72,-2.61 2.93,-3.53z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml
deleted file mode 100644
index 1b040f39f..000000000
--- a/app/src/main/res/drawable/ic_person.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,6c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2m0,10c2.7,0 5.8,1.29 6,2L6,18c0.23,-0.72 3.31,-2 6,-2m0,-12C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_star_rating.xml b/app/src/main/res/drawable/ic_star_rating.xml
deleted file mode 100644
index c96d7ace6..000000000
--- a/app/src/main/res/drawable/ic_star_rating.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="16dp"
-	android:height="16dp"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="?attr/colorAccent"
-		android:pathData="M12,15.4l-3.76,2.27l1,-4.28l-3.32,-2.88l4.38,-0.38l1.7,-4.03l1.71,4.04l4.38,0.38l-3.32,2.88l1,4.28z" />
-	<path
-		android:fillColor="?android:textColorPrimary"
-		android:pathData="M22,9.24l-7.19,-0.62L12,2L9.19,8.63L2,9.24l5.46,4.73L5.82,21L12,17.27L18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27l1,-4.28l-3.32,-2.88l4.38,-0.38L12,6.1l1.71,4.04l4.38,0.38l-3.32,2.88l1,4.28L12,15.4z" />
-</vector>
diff --git a/app/src/main/res/layout/navigation_header.xml b/app/src/main/res/layout/navigation_header.xml
index 9c82c3288..cc5b83e5a 100644
--- a/app/src/main/res/layout/navigation_header.xml
+++ b/app/src/main/res/layout/navigation_header.xml
@@ -14,7 +14,7 @@
 		android:layout_marginStart="@dimen/nav_item_horizontal_padding"
 		android:layout_marginTop="@dimen/margin_normal"
 		android:layout_marginBottom="@dimen/margin_normal"
-		app:srcCompat="@drawable/totoro" />
+		app:srcCompat="@drawable/ic_totoro" />
 
 	<View
 		android:id="@+id/divider"
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index c846e8b74..f5a8f2613 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -75,7 +75,6 @@
 	<string name="webtoon">Манхва</string>
 	<string name="read_mode">Рэжым чытання</string>
 	<string name="grid_size">Памер табліцы</string>
-	<string name="search_results_on_s">Вынікі пошуку па %s</string>
 	<string name="search_on_s">Пошук па %s</string>
 	<string name="delete_manga">Выдаліць мангу</string>
 	<string name="reader_settings">Настаўленні чытання</string>
@@ -96,7 +95,6 @@
 	<string name="internal_storage">Унутраны назапашвальнік</string>
 	<string name="external_storage">Знешняе сховішча</string>
 	<string name="domain">Дамен</string>
-	<string name="_default">Безумоўна</string>
 	<string name="application_update">Правяраць абнаўленне прыкладання</string>
 	<string name="app_update_available">Даступна абнаўленне прыкладання</string>
 	<string name="show_notification_app_update">Паказваць апавяшчэнне пры наяўнасці новай версіі</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 819baa8e0..071f78ac5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -74,7 +74,6 @@
 	<string name="webtoon">Webtoon</string>
 	<string name="read_mode">Modo de lectura</string>
 	<string name="grid_size">Tamaño de la cuadrícula</string>
-	<string name="search_results_on_s">Resultados de búsqueda en %s</string>
 	<string name="search_on_s">Buscar en %s</string>
 	<string name="delete_manga">Borrar manga</string>
 	<string name="text_delete_local_manga">¿Realmente quieres borrar \"%s\"  del almacenamiento local de tu teléfono? \nEsta operación no se puede deshacer.</string>
@@ -95,7 +94,6 @@
 	<string name="internal_storage">Almacenamiento interno</string>
 	<string name="external_storage">Almacenamiento externo</string>
 	<string name="domain">Dominio</string>
-	<string name="_default">Por defecto</string>
 	<string name="application_update">Comprobar actualizaciones automáticamente</string>
 	<string name="app_update_available">Una nueva versión de la aplicación está disponible</string>
 	<string name="show_notification_app_update">Mostrar notificación si la actualización está disponible</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 957cea79b..1bad6948a 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
 	<color name="color_primary">#1976D2</color>
 	<color name="color_primary_variant">#1565C0</color>
-	<color name="color_accent">#E57373</color>
 	<color name="color_on_secondary">@android:color/black</color>
 
 	<color name="color_control_light">#2EFFFFFF</color> <!-- 18% white -->
@@ -13,11 +13,8 @@
 	<color name="system_ui_scrim_black">#B3000000</color> <!-- 70% black -->
 
 	<!-- In dark mode without light status bar we can use transparent -->
-	<color name="status_bar_scrim">@android:color/transparent</color>
 
 	<!-- Other colors with light mode alternatives -->
-	<color name="highlighted_card_background">#263238</color>
 	<color name="list_divider">#1fffffff</color>
 
-	<item name="chip_bg_alpha_checked" format="float" type="dimen">0.27</item>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-notnight-v23/colors.xml b/app/src/main/res/values-notnight-v23/colors.xml
deleted file mode 100644
index ef3e00027..000000000
--- a/app/src/main/res/values-notnight-v23/colors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<!-- We use a light scrim on API 23+ since we use a light status bar -->
-	<color name="status_bar_scrim">@color/system_ui_scrim_light</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f3887596f..369ab8bd2 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -74,7 +74,6 @@
 	<string name="webtoon">Манхва</string>
 	<string name="read_mode">Режим чтения</string>
 	<string name="grid_size">Размер таблицы</string>
-	<string name="search_results_on_s">Результаты поиска по %s</string>
 	<string name="search_on_s">Поиск по %s</string>
 	<string name="delete_manga">Удалить мангу</string>
 	<string name="text_delete_local_manga">Вы уверены, что хотите удалить \"%s\" с устройства? \nЭто действие нельзя будет отменить.</string>
@@ -95,7 +94,6 @@
 	<string name="internal_storage">Внутренний накопитель</string>
 	<string name="external_storage">Внешнее хранилище</string>
 	<string name="domain">Домен</string>
-	<string name="_default">По умолчанию</string>
 	<string name="application_update">Проверять обновление приложения</string>
 	<string name="app_update_available">Доступно обновление приложения</string>
 	<string name="show_notification_app_update">Показывать уведомление при наличии новой версии</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 8d2f3f480..13b53d3c4 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -13,16 +13,6 @@
 		<attr name="android:orientation" />
 	</declare-styleable>
 
-	<!--CircleImageView attrs-->
-
-	<declare-styleable name="CircleImageView">
-		<attr name="civ_border_width" format="dimension" />
-		<attr name="civ_border_color" format="color" />
-		<attr name="civ_border_overlay" format="boolean" />
-		<attr name="civ_fill_color" format="color" />
-		<attr name="civ_circle_background_color" format="color" />
-	</declare-styleable>
-
 	<!--SearchView attrs-->
 
 	<declare-styleable name="MaterialSearchView">
@@ -48,12 +38,4 @@
 		<attr name="android:inputType" />
 	</declare-styleable>
 
-	<!--ExpandableTextView attrs-->
-
-	<declare-styleable name="ExpandableTextView">
-		<attr name="expanded" format="boolean"/>
-		<attr name="expand_enabled" format="boolean"/>
-		<attr name="collapse_lines" format="integer"/>
-	</declare-styleable>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 77bb1b4d4..6147fed95 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,48 +3,28 @@
 
 	<color name="color_primary">#1976D2</color>
 	<color name="color_primary_variant">#1565C0</color>
-	<color name="color_accent">#EF5350</color>
 	<color name="color_on_secondary">@android:color/white</color>
 
-	<color name="color_control_light">#39000000</color> <!-- Same as textColorPrimary disabled -->
-	<color name="color_surface_secondary">#F8F9FA</color> <!-- Same as textColorPrimary disabled -->
+	<color name="color_control_light">#39000000</color>
+	<color name="color_surface_secondary">#F8F9FA</color>
 
 	<!-- Scrim colors -->
 	<color name="system_ui_scrim_light">#B3FFFFFF</color> <!-- 70% white -->
 	<color name="system_ui_scrim_black">#40000000</color> <!-- 25% black -->
-
-	<!-- We use a dark scrim by default since light status is API 23+ -->
-	<color name="status_bar_scrim">@color/system_ui_scrim_black</color>
-	<!-- We use a dark scrim by default since light nav bar is API 27+ -->
 	<color name="nav_bar_scrim">@color/system_ui_scrim_black</color>
 
 	<!-- Other colors with dark mode alternatives -->
-	<color name="highlighted_card_background">#e8f0fe</color>
-	<color name="event_card_header_background">@color/event_card_header_background_light</color>
 	<color name="list_divider">#1f000000</color>>
 
-	<!-- Other colors -->
-	<color name="default_tag_color">#999</color>
-	<color name="light_grey">#e6e6e6</color>
-	<color name="scrim">#33000000</color> <!-- 20% black -->
-
-	<color name="event_card_header_background_light">#f8f9fa</color>
-	<color name="event_card_header_background_dark">#252729</color>
-
-	<item name="chip_bg_alpha_checked" format="float" type="dimen">0.18</item>
-
 	<!-- Other Colors -->
 
 	<color name="blue_primary">#1976D2</color>
 	<color name="blue_primary_dark">#1565C0</color>
-	<color name="blue_primary_darker">#283593</color>
 	<color name="red_accent">#EF5350</color>
 	<color name="grey">#424242</color>
 	<color name="grey_dark">#212121</color>
 	<color name="dim">#99000000</color>
 	<color name="error">#D32F2F</color>
-	<color name="status_bar">#33000000</color>
-	<color name="tabs_line">#C3CFDD</color>
 	<color name="shadow">#99000000</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ebeb00c0d..8e9fc8d18 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,17 +3,11 @@
 
 	<!-- Common dimensions -->
 	<dimen name="margin_normal">16dp</dimen>
-	<dimen name="margin_small">8dp</dimen>
-	<dimen name="margin_large">32dp</dimen>
 
 	<!-- Dialogs -->
-	<dimen name="dialog_corner_radius">8dp</dimen>
-	<dimen name="dialogPreferredPadding">24dp</dimen>
-	<dimen name="dialogPreferredPaddingLarge">36dp</dimen> <!-- dialogPreferredPadding + 12dp -->
+	<!-- dialogPreferredPadding + 12dp -->
 
 	<!-- Navigation -->
-	<dimen name="nav_drawer_width">@dimen/match_parent</dimen>
-	<dimen name="nav_account_image_size">32dp</dimen>
 	<dimen name="nav_header_logo_size">36dp</dimen>
 	<dimen name="nav_item_horizontal_padding">24dp</dimen>
 	<!-- Intrinsic height may vary. Use a large radius to ensure a semicircle. -->
@@ -41,7 +35,6 @@
 	<dimen name="search_icon_48">48dp</dimen>
 	<dimen name="search_icon_56">56dp</dimen>
 	<dimen name="search_divider">1dp</dimen>
-	<dimen name="search_stroke_width">1dp</dimen>
 	<dimen name="search_stroke_width_focus">0dp</dimen>
 	<dimen name="search_layout_height">48dp</dimen>
 	<dimen name="search_layout_height_focus">56dp</dimen>
@@ -54,7 +47,5 @@
 	<dimen name="search_margins_focus">0dp</dimen>
 
 	<!-- per android.view.ViewGroup.LayoutParams -->
-	<item name="match_parent" format="integer" type="dimen">-1</item>
-	<item name="wrap_content" format="integer" type="dimen">-2</item>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f18633f5d..3d51e1b57 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,7 +75,6 @@
 	<string name="webtoon">Webtoon</string>
 	<string name="read_mode">Read mode</string>
 	<string name="grid_size">Grid size</string>
-	<string name="search_results_on_s">Search results on %s</string>
 	<string name="search_on_s">Search on %s</string>
 	<string name="delete_manga">Delete manga</string>
 	<string name="text_delete_local_manga">Do you really want to delete \"%s\" from your phone\'s local storage? \nThis operation cannot be undone.</string>
@@ -96,7 +95,6 @@
 	<string name="internal_storage">Internal storage</string>
 	<string name="external_storage">External storage</string>
 	<string name="domain">Domain</string>
-	<string name="_default">Default</string>
 	<string name="application_update">Check for updates automatically</string>
 	<string name="app_update_available">Application update is available</string>
 	<string name="show_notification_app_update">Show notification if update is available</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9e1bc7b0c..9d7d07c57 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,8 +2,6 @@
 
 	<!-- Widget styles -->
 
-	<style name="Widget.Kotatsu" parent="@android:style/Widget.Material" />
-
 	<style name="Widget.Kotatsu.AppBar" parent="@style/Widget.Design.AppBarLayout">
 		<item name="android:background">?attr/colorSurface</item>
 		<item name="android:elevation">8dp</item>
@@ -59,10 +57,6 @@
 		<item name="subtitleTextStyle">?attr/textAppearanceSubtitle1</item>
 	</style>
 
-	<style name="Widget.Kotatsu.AutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
-		<item name="android:popupBackground">@android:color/background_light</item>
-	</style>
-
 	<!-- TextAppearance -->
 
 	<style name="TextAppearance.Kotatsu.ToolbarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d5248af72..775f91e58 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -51,12 +51,4 @@
 
 	<style name="AppTheme.AMOLED" parent="Base.AppTheme" />
 
-	<style name="AlertDialog.Style" parent="MaterialAlertDialog.MaterialComponents">
-		<item name="shapeAppearance">@style/AlertDialog.ShapeAppearance</item>
-	</style>
-
-	<style name="AlertDialog.ShapeAppearance" parent="ShapeAppearance.MaterialComponents.MediumComponent">
-		<item name="cornerSize">@dimen/dialog_corner_radius</item>
-	</style>
-
 </resources>
\ No newline at end of file