From ee26d6dffd8c77115683ea242c3ab729c70f7ea6 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 22 Jul 2023 18:56:45 -0400
Subject: [PATCH] Remove some uses of color resources

---
 .../tachiyomi/ui/reader/ReaderActivity.kt     | 14 ++++----
 .../ui/reader/ReaderNavigationOverlayView.kt  |  2 +-
 .../ui/reader/viewer/ViewerNavigation.kt      | 13 ++++----
 .../sc_collections_bookmark_48dp.xml          |  4 +--
 .../main/res/drawable-v26/sc_explore_48dp.xml |  2 +-
 .../main/res/drawable-v26/sc_history_48dp.xml |  2 +-
 .../res/drawable-v26/sc_new_releases_48dp.xml |  2 +-
 app/src/main/res/drawable/anim_caret_down.xml |  4 +--
 app/src/main/res/drawable/ic_book_24dp.xml    |  2 +-
 .../main/res/drawable/ic_bookmark_24dp.xml    |  2 +-
 .../res/drawable/ic_bookmark_border_24dp.xml  |  2 +-
 app/src/main/res/drawable/ic_check_24dp.xml   |  2 +-
 app/src/main/res/drawable/ic_close_24dp.xml   |  2 +-
 app/src/main/res/drawable/ic_crop_24dp.xml    |  2 +-
 .../main/res/drawable/ic_crop_off_24dp.xml    |  8 ++---
 app/src/main/res/drawable/ic_delete_24dp.xml  |  2 +-
 .../main/res/drawable/ic_done_prev_24dp.xml   |  4 +--
 .../main/res/drawable/ic_drag_handle_24dp.xml |  2 +-
 .../main/res/drawable/ic_extension_24dp.xml   |  2 +-
 app/src/main/res/drawable/ic_folder_24dp.xml  |  2 +-
 app/src/main/res/drawable/ic_glasses_24dp.xml |  2 +-
 app/src/main/res/drawable/ic_info_24dp.xml    |  2 +-
 .../main/res/drawable/ic_offline_pin_24dp.xml |  2 +-
 .../main/res/drawable/ic_overflow_24dp.xml    |  2 +-
 app/src/main/res/drawable/ic_pause_24dp.xml   |  2 +-
 app/src/main/res/drawable/ic_photo_24dp.xml   |  2 +-
 .../main/res/drawable/ic_play_arrow_24dp.xml  |  2 +-
 .../ic_reader_continuous_vertical_24dp.xml    |  6 ++--
 .../res/drawable/ic_reader_default_24dp.xml   |  4 +--
 .../main/res/drawable/ic_reader_ltr_24dp.xml  | 10 +++---
 .../main/res/drawable/ic_reader_rtl_24dp.xml  | 10 +++---
 .../res/drawable/ic_reader_vertical_24dp.xml  |  4 +--
 .../res/drawable/ic_reader_webtoon_24dp.xml   |  4 +--
 app/src/main/res/drawable/ic_refresh_24dp.xml |  2 +-
 .../ic_screen_lock_landscape_24dp.xml         |  2 +-
 .../drawable/ic_screen_lock_portrait_24dp.xml |  2 +-
 .../res/drawable/ic_screen_rotation_24dp.xml  |  2 +-
 .../main/res/drawable/ic_settings_24dp.xml    |  2 +-
 app/src/main/res/drawable/ic_share_24dp.xml   |  2 +-
 .../ic_stay_current_landscape_24dp.xml        |  2 +-
 .../ic_stay_current_portrait_24dp.xml         |  2 +-
 .../ic_system_update_alt_white_24dp.xml       |  2 +-
 app/src/main/res/drawable/ic_tachi.xml        |  4 +--
 .../res/drawable/ic_warning_white_24dp.xml    |  2 +-
 app/src/main/res/drawable/ic_webview_24dp.xml |  2 +-
 .../drawable/sc_collections_bookmark_48dp.xml |  4 +--
 app/src/main/res/drawable/sc_explore_48dp.xml |  2 +-
 app/src/main/res/drawable/sc_history_48dp.xml |  2 +-
 .../res/drawable/sc_new_releases_48dp.xml     |  2 +-
 .../src/main/res/values/colors.xml            | 33 -------------------
 50 files changed, 83 insertions(+), 113 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 511226b18e..fdc22cbc95 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -936,18 +936,20 @@ class ReaderActivity : BaseActivity() {
             }
         }
 
+        private val grayBackgroundColor = Color.rgb(0x20, 0x21, 0x25)
+
         /**
          * Initializes the reader subscriptions.
          */
         init {
             readerPreferences.readerTheme().changes()
                 .onEach { theme ->
-                    binding.readerContainer.setBackgroundResource(
+                    binding.readerContainer.setBackgroundColor(
                         when (theme) {
-                            0 -> R.color.md_white_1000
-                            2 -> R.color.reader_background_dark
+                            0 -> Color.WHITE
+                            2 -> grayBackgroundColor
                             3 -> automaticBackgroundColor()
-                            else -> R.color.md_black_1000
+                            else -> Color.BLACK
                         },
                     )
                 }
@@ -1000,9 +1002,9 @@ class ReaderActivity : BaseActivity() {
          */
         private fun automaticBackgroundColor(): Int {
             return if (baseContext.isNightMode()) {
-                R.color.reader_background_dark
+                grayBackgroundColor
             } else {
-                R.color.md_white_1000
+                Color.WHITE
             }
         }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt
index c7a2834534..9a0258ba45 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt
@@ -66,7 +66,7 @@ class ReaderNavigationOverlayView(context: Context, attributeSet: AttributeSet)
 
             // Scale rect from 1f,1f to screen width and height
             canvas.withScale(width.toFloat(), height.toFloat()) {
-                regionPaint.color = context.getColor(region.type.colorRes)
+                regionPaint.color = region.type.color
                 drawRect(rect, regionPaint)
             }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt
index aedfb2bbd7..67e923d3f0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.ui.reader.viewer
 
+import android.graphics.Color
 import android.graphics.PointF
 import android.graphics.RectF
 import androidx.annotation.StringRes
@@ -9,12 +10,12 @@ import eu.kanade.tachiyomi.util.lang.invert
 
 abstract class ViewerNavigation {
 
-    sealed class NavigationRegion(@StringRes val nameRes: Int, val colorRes: Int) {
-        data object MENU : NavigationRegion(R.string.action_menu, R.color.navigation_menu)
-        data object PREV : NavigationRegion(R.string.nav_zone_prev, R.color.navigation_prev)
-        data object NEXT : NavigationRegion(R.string.nav_zone_next, R.color.navigation_next)
-        data object LEFT : NavigationRegion(R.string.nav_zone_left, R.color.navigation_left)
-        data object RIGHT : NavigationRegion(R.string.nav_zone_right, R.color.navigation_right)
+    sealed class NavigationRegion(@StringRes val nameRes: Int, val color: Int) {
+        data object MENU : NavigationRegion(R.string.action_menu, Color.argb(0xCC, 0x95, 0x81, 0x8D))
+        data object PREV : NavigationRegion(R.string.nav_zone_prev, Color.argb(0xCC, 0xFF, 0x77, 0x33))
+        data object NEXT : NavigationRegion(R.string.nav_zone_next, Color.argb(0xCC, 0x84, 0xE2, 0x96))
+        data object LEFT : NavigationRegion(R.string.nav_zone_left, Color.argb(0xCC, 0x7D, 0x11, 0x28))
+        data object RIGHT : NavigationRegion(R.string.nav_zone_right, Color.argb(0xCC, 0xA6, 0xCF, 0xD5))
     }
 
     data class Region(
diff --git a/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml b/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
index 44e525ef68..fd2784fbba 100644
--- a/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
@@ -13,10 +13,10 @@
             android:translateX="16"
             android:translateY="16">
             <path
-                android:fillColor="@color/md_white_1000"
+                android:fillColor="#FFF"
                 android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z"/>
             <path
-                android:fillColor="@color/md_white_1000"
+                android:fillColor="#FFF"
                 android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z"/>
         </group>
     </vector>
diff --git a/app/src/main/res/drawable-v26/sc_explore_48dp.xml b/app/src/main/res/drawable-v26/sc_explore_48dp.xml
index dfc58e17ab..9737e6031f 100644
--- a/app/src/main/res/drawable-v26/sc_explore_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_explore_48dp.xml
@@ -13,7 +13,7 @@
             android:translateX="16"
             android:translateY="16">
             <path
-                android:fillColor="@color/md_white_1000"
+                android:fillColor="#FFF"
                 android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
         </group>
     </vector>
diff --git a/app/src/main/res/drawable-v26/sc_history_48dp.xml b/app/src/main/res/drawable-v26/sc_history_48dp.xml
index e4034f520c..f8b0ff94a0 100644
--- a/app/src/main/res/drawable-v26/sc_history_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_history_48dp.xml
@@ -13,7 +13,7 @@
             android:translateX="16"
             android:translateY="16">
             <path
-                android:fillColor="@color/md_white_1000"
+                android:fillColor="#FFF"
                 android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
         </group>
     </vector>
diff --git a/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml b/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
index 8b06f27cd4..256f5ff8fe 100644
--- a/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
+++ b/app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
@@ -13,7 +13,7 @@
             android:translateX="16"
             android:translateY="16">
             <path
-                android:fillColor="@color/md_white_1000"
+                android:fillColor="#FFF"
                 android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
         </group>
     </vector>
diff --git a/app/src/main/res/drawable/anim_caret_down.xml b/app/src/main/res/drawable/anim_caret_down.xml
index e5288406e2..eae8ba7488 100644
--- a/app/src/main/res/drawable/anim_caret_down.xml
+++ b/app/src/main/res/drawable/anim_caret_down.xml
@@ -24,7 +24,7 @@
                             android:translateY="-1.0">
                             <path
                                 android:name="caret_l_rect"
-                                android:fillColor="@android:color/black"
+                                android:fillColor="#000"
                                 android:pathData="M -1.0,-4.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
                         </group>
                     </group>
@@ -40,7 +40,7 @@
                             android:translateY="1.0">
                             <path
                                 android:name="caret_r_rect"
-                                android:fillColor="@android:color/black"
+                                android:fillColor="#000"
                                 android:pathData="M -1.0,-4.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
                         </group>
                     </group>
diff --git a/app/src/main/res/drawable/ic_book_24dp.xml b/app/src/main/res/drawable/ic_book_24dp.xml
index 7d4d316941..3560020405 100644
--- a/app/src/main/res/drawable/ic_book_24dp.xml
+++ b/app/src/main/res/drawable/ic_book_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M18,2L6,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM9,4h2v5l-1,-0.75L9,9L9,4zM18,20L6,20L6,4h1v9l3,-2.25L13,13L13,4h5v16z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bookmark_24dp.xml b/app/src/main/res/drawable/ic_bookmark_24dp.xml
index 15610e67bb..0c63a2e549 100644
--- a/app/src/main/res/drawable/ic_bookmark_24dp.xml
+++ b/app/src/main/res/drawable/ic_bookmark_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bookmark_border_24dp.xml b/app/src/main/res/drawable/ic_bookmark_border_24dp.xml
index 2eefc2efc6..c3d2916eb6 100644
--- a/app/src/main/res/drawable/ic_bookmark_border_24dp.xml
+++ b/app/src/main/res/drawable/ic_bookmark_border_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_check_24dp.xml b/app/src/main/res/drawable/ic_check_24dp.xml
index b268959e37..6c1b167711 100644
--- a/app/src/main/res/drawable/ic_check_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_close_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml
index 6f6c8767dc..425ac8c0d9 100644
--- a/app/src/main/res/drawable/ic_close_24dp.xml
+++ b/app/src/main/res/drawable/ic_close_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_crop_24dp.xml b/app/src/main/res/drawable/ic_crop_24dp.xml
index f802c216e4..cc9409940c 100644
--- a/app/src/main/res/drawable/ic_crop_24dp.xml
+++ b/app/src/main/res/drawable/ic_crop_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17,15h2V7c0,-1.1 -0.9,-2 -2,-2H9v2h8v8zM7,17V1H5v4H1v2h4v10c0,1.1 0.9,2 2,2h10v4h2v-4h4v-2H7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_crop_off_24dp.xml b/app/src/main/res/drawable/ic_crop_off_24dp.xml
index 5d234a0b04..50be29bff7 100644
--- a/app/src/main/res/drawable/ic_crop_off_24dp.xml
+++ b/app/src/main/res/drawable/ic_crop_off_24dp.xml
@@ -4,15 +4,15 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M7,1l-2,0l0,1.18l2,2l0,-3.18z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17,7v7.18l0.82,0.82H19V7a2.0059,2.0059 0,0 0,-2 -2H9V6.18L9.82,7Z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M19.0001,19l-2,-2h0L2.1,2.1 0.68,3.51 2.1707,5H1V7H4.1718L5,7.8278V17a2.0059,2.0059 0,0 0,2 2h9.1778L17,19.8218V23h2V21.8207L20.49,23.31 21.9,21.9l-2.9,-2.9ZM7,17V9.8268L14.1768,17Z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M19.82,17l2,2l1.18,0l0,-2l-3.18,0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml
index 8d17bb3c5e..5b42118591 100644
--- a/app/src/main/res/drawable/ic_delete_24dp.xml
+++ b/app/src/main/res/drawable/ic_delete_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_done_prev_24dp.xml b/app/src/main/res/drawable/ic_done_prev_24dp.xml
index 2e738222ca..a2c231ca9f 100644
--- a/app/src/main/res/drawable/ic_done_prev_24dp.xml
+++ b/app/src/main/res/drawable/ic_done_prev_24dp.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M22,18l-3,0l0,-4l-2,0l0,4l-3,0l4,4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_drag_handle_24dp.xml b/app/src/main/res/drawable/ic_drag_handle_24dp.xml
index e8d56863a7..69a19c7243 100644
--- a/app/src/main/res/drawable/ic_drag_handle_24dp.xml
+++ b/app/src/main/res/drawable/ic_drag_handle_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_extension_24dp.xml b/app/src/main/res/drawable/ic_extension_24dp.xml
index 1be5ca11b2..7682b25800 100644
--- a/app/src/main/res/drawable/ic_extension_24dp.xml
+++ b/app/src/main/res/drawable/ic_extension_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M20.5,11H19V7c0,-1.1 -0.9,-2 -2,-2h-4V3.5C13,2.12 11.88,1 10.5,1S8,2.12 8,3.5V5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8H3.5c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-1.5c0,-1.49 1.21,-2.7 2.7,-2.7 1.49,0 2.7,1.21 2.7,2.7V22H17c1.1,0 2,-0.9 2,-2v-4h1.5c1.38,0 2.5,-1.12 2.5,-2.5S21.88,11 20.5,11z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_folder_24dp.xml b/app/src/main/res/drawable/ic_folder_24dp.xml
index ab42ef1ab3..cf0f12e394 100644
--- a/app/src/main/res/drawable/ic_folder_24dp.xml
+++ b/app/src/main/res/drawable/ic_folder_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_glasses_24dp.xml b/app/src/main/res/drawable/ic_glasses_24dp.xml
index 3316bfde11..581a599141 100644
--- a/app/src/main/res/drawable/ic_glasses_24dp.xml
+++ b/app/src/main/res/drawable/ic_glasses_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M3,10C2.76,10 2.55,10.09 2.41,10.25C2.27,10.4 2.21,10.62 2.24,10.86L2.74,13.85C2.82,14.5 3.4,15 4,15H7C7.64,15 8.36,14.44 8.5,13.82L9.56,10.63C9.6,10.5 9.57,10.31 9.5,10.19C9.39,10.07 9.22,10 9,10H3M7,17H4C2.38,17 0.96,15.74 0.76,14.14L0.26,11.15C0.15,10.3 0.39,9.5 0.91,8.92C1.43,8.34 2.19,8 3,8H9C9.83,8 10.58,8.35 11.06,8.96C11.17,9.11 11.27,9.27 11.35,9.45C11.78,9.36 12.22,9.36 12.64,9.45C12.72,9.27 12.82,9.11 12.94,8.96C13.41,8.35 14.16,8 15,8H21C21.81,8 22.57,8.34 23.09,8.92C23.6,9.5 23.84,10.3 23.74,11.11L23.23,14.18C23.04,15.74 21.61,17 20,17H17C15.44,17 13.92,15.81 13.54,14.3L12.64,11.59C12.26,11.31 11.73,11.31 11.35,11.59L10.43,14.37C10.07,15.82 8.56,17 7,17M15,10C14.78,10 14.61,10.07 14.5,10.19C14.42,10.31 14.4,10.5 14.45,10.7L15.46,13.75C15.64,14.44 16.36,15 17,15H20C20.59,15 21.18,14.5 21.25,13.89L21.76,10.82C21.79,10.62 21.73,10.4 21.59,10.25C21.45,10.09 21.24,10 21,10H15Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_info_24dp.xml b/app/src/main/res/drawable/ic_info_24dp.xml
index 40a580d5b9..17de546879 100644
--- a/app/src/main/res/drawable/ic_info_24dp.xml
+++ b/app/src/main/res/drawable/ic_info_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_offline_pin_24dp.xml b/app/src/main/res/drawable/ic_offline_pin_24dp.xml
index 9a9cc213f6..f3dcb36251 100644
--- a/app/src/main/res/drawable/ic_offline_pin_24dp.xml
+++ b/app/src/main/res/drawable/ic_offline_pin_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM17,18H7v-2h10V18zM10.3,14L7,10.7l1.4,-1.4l1.9,1.9l5.3,-5.3L17,7.3L10.3,14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_overflow_24dp.xml b/app/src/main/res/drawable/ic_overflow_24dp.xml
index 2ae4b83fb3..2ae642fa47 100644
--- a/app/src/main/res/drawable/ic_overflow_24dp.xml
+++ b/app/src/main/res/drawable/ic_overflow_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause_24dp.xml b/app/src/main/res/drawable/ic_pause_24dp.xml
index 2ffb66b3c8..e987185eaa 100644
--- a/app/src/main/res/drawable/ic_pause_24dp.xml
+++ b/app/src/main/res/drawable/ic_pause_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_photo_24dp.xml b/app/src/main/res/drawable/ic_photo_24dp.xml
index cffc7970d4..84dd78d749 100644
--- a/app/src/main/res/drawable/ic_photo_24dp.xml
+++ b/app/src/main/res/drawable/ic_photo_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_24dp.xml
index 88f629175b..a568215cd3 100644
--- a/app/src/main/res/drawable/ic_play_arrow_24dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M8,5v14l11,-7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_reader_continuous_vertical_24dp.xml b/app/src/main/res/drawable/ic_reader_continuous_vertical_24dp.xml
index 7997bba7bb..33e4cf30cf 100644
--- a/app/src/main/res/drawable/ic_reader_continuous_vertical_24dp.xml
+++ b/app/src/main/res/drawable/ic_reader_continuous_vertical_24dp.xml
@@ -4,12 +4,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17.3159,1h-10a2.0059,2.0059 0,0 0,-2 2L5.3159,21a2.0059,2.0059 0,0 0,2 2h10a2.0059,2.0059 0,0 0,2 -2L19.3159,3A2.0059,2.0059 0,0 0,17.3159 1ZM17.3159,21h-10L7.3159,3h10Z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M11.3083,5h2v5.5h-2z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M15.308,16l-2,0l0,-4.5l-2,0l0,4.5l-2,0l3,3l3,-3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_reader_default_24dp.xml b/app/src/main/res/drawable/ic_reader_default_24dp.xml
index 3ec2d7598e..bf8a5dbd6f 100644
--- a/app/src/main/res/drawable/ic_reader_default_24dp.xml
+++ b/app/src/main/res/drawable/ic_reader_default_24dp.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M6.9906,18L6.9906,6h12L18.9906,3a2.0059,2.0059 0,0 0,-2 -2h-10a2.0059,2.0059 0,0 0,-2 2L4.9906,21a2.0059,2.0059 0,0 0,2 2h10a2.0059,2.0059 0,0 0,2 -2L18.9906,18h-12ZM6.9906,3h10L16.9906,4h-10ZM16.9906,21h-10L6.9906,20h10Z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M21.7706,12.44l-0.02,0.03a3.5546,3.5546 0,0 0,0.05 -0.47,3.9031 3.9031,0 0,0 -0.05,-0.48l0.02,0.03 0.85,-0.68a0.5068,0.5068 0,0 0,0.12 -0.64l-0.84,-1.46a0.4986,0.4986 0,0 0,-0.61 -0.22l-1.01,0.39 0.0099,0.04a3.6135,3.6135 0,0 0,-0.8 -0.48l-0.17,-1.07a0.4879,0.4879 0,0 0,-0.49 -0.43h-1.68a0.4876,0.4876 0,0 0,-0.49 0.42l-0.17,1.08a3.6149,3.6149 0,0 0,-0.8 0.48l0.02,-0.03 -1.01,-0.39a0.4878,0.4878 0,0 0,-0.61 0.22l-0.84,1.46a0.5068,0.5068 0,0 0,0.12 0.64l0.85,0.68 0.02,-0.03a3.9148,3.9148 0,0 0,-0.05 0.48,3.915 3.915,0 0,0 0.05,0.48l-0.02,-0.03 -0.85,0.68a0.5068,0.5068 0,0 0,-0.12 0.64l0.84,1.46a0.4985,0.4985 0,0 0,0.61 0.22l1.01,-0.39 -0.02,-0.03a4.4991,4.4991 0,0 0,0.8 0.46l0.17,1.08a0.4876,0.4876 0,0 0,0.49 0.42h1.68a0.4876,0.4876 0,0 0,0.49 -0.42l0.17,-1.08a3.6138,3.6138 0,0 0,0.8 -0.48l-0.02,0.03 1.02,0.39a0.4879,0.4879 0,0 0,0.61 -0.22l0.84,-1.46a0.5068,0.5068 0,0 0,-0.12 -0.64ZM17.9906,14a2,2 0,1 1,2 -2A2.0059,2.0059 0,0 1,17.9906 14Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_reader_ltr_24dp.xml b/app/src/main/res/drawable/ic_reader_ltr_24dp.xml
index 2c44474e90..9ba417af94 100644
--- a/app/src/main/res/drawable/ic_reader_ltr_24dp.xml
+++ b/app/src/main/res/drawable/ic_reader_ltr_24dp.xml
@@ -4,18 +4,18 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17.3159,18h-10L7.3159,16h-2v5a2.0059,2.0059 0,0 0,2 2h10a2.0059,2.0059 0,0 0,2 -2L19.3159,16h-2ZM17.3159,21h-10L7.3159,20h10Z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M7.3159,6h10L17.3159,8h2L19.3159,3a2.0059,2.0059 0,0 0,-2 -2h-10a2.0059,2.0059 0,0 0,-2 2L5.3159,8h2ZM7.3159,3h10L17.3159,4h-10Z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M22.311,12l-3,-3l0,2l-11.99,0l0,2l11.99,0l0,2l3,-3z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M2.3206,11h1.5v2h-1.5z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M4.8206,11h1.5v2h-1.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_reader_rtl_24dp.xml b/app/src/main/res/drawable/ic_reader_rtl_24dp.xml
index bce2932fcf..290a31ffae 100644
--- a/app/src/main/res/drawable/ic_reader_rtl_24dp.xml
+++ b/app/src/main/res/drawable/ic_reader_rtl_24dp.xml
@@ -4,18 +4,18 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M7,6H17V8h2V3a2.0059,2.0059 0,0 0,-2 -2H7A2.0059,2.0059 0,0 0,5 3V8H7ZM7,3H17V4H7Z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17,18L7,18L7,16L5,16v5a2.0059,2.0059 0,0 0,2 2L17,23a2.0059,2.0059 0,0 0,2 -2L19,16L17,16ZM17,21L7,21L7,20L17,20Z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M5.005,13l11.99,0l0,-2l-11.99,0l0,-2l-3,3l3,3l0,-2z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M20.4953,11h1.5v2h-1.5z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17.9953,11h1.5v2h-1.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_reader_vertical_24dp.xml b/app/src/main/res/drawable/ic_reader_vertical_24dp.xml
index def93b2c21..db122b7221 100644
--- a/app/src/main/res/drawable/ic_reader_vertical_24dp.xml
+++ b/app/src/main/res/drawable/ic_reader_vertical_24dp.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17,1L7,1A2.0059,2.0059 0,0 0,5 3L5,21a2.0059,2.0059 0,0 0,2 2L17,23a2.0059,2.0059 0,0 0,2 -2L19,3A2.0059,2.0059 0,0 0,17 1ZM17,3v1.0462L7,4.0462L7,3ZM17,6.0462v12L7,18.0462v-12ZM7,21v-0.9538L17,20.0462L17,21Z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M9,13l3,3l3,-3l-2,0l0,-5l-2,0l0,5l-2,0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_reader_webtoon_24dp.xml b/app/src/main/res/drawable/ic_reader_webtoon_24dp.xml
index b7683822de..a9876f1471 100644
--- a/app/src/main/res/drawable/ic_reader_webtoon_24dp.xml
+++ b/app/src/main/res/drawable/ic_reader_webtoon_24dp.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M11.992,19l3,-3l-2,0l0,-11l-2,0l0,11l-2,0l3,3z" />
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17,1L7,1A2.0059,2.0059 0,0 0,5 3L5,21a2.0059,2.0059 0,0 0,2 2L17,23a2.0059,2.0059 0,0 0,2 -2L19,3A2.0059,2.0059 0,0 0,17 1ZM17,21L7,21L7,3L17,3Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_refresh_24dp.xml b/app/src/main/res/drawable/ic_refresh_24dp.xml
index 311594eaa6..3d951426fd 100644
--- a/app/src/main/res/drawable/ic_refresh_24dp.xml
+++ b/app/src/main/res/drawable/ic_refresh_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_screen_lock_landscape_24dp.xml b/app/src/main/res/drawable/ic_screen_lock_landscape_24dp.xml
index f78d9a5d43..6c46c7b8a1 100644
--- a/app/src/main/res/drawable/ic_screen_lock_landscape_24dp.xml
+++ b/app/src/main/res/drawable/ic_screen_lock_landscape_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M21,5L3,5c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,7c0,-1.1 -0.9,-2 -2,-2zM19,17L5,17L5,7h14v10zM10,16h4c0.55,0 1,-0.45 1,-1v-3c0,-0.55 -0.45,-1 -1,-1v-1c0,-1.11 -0.9,-2 -2,-2 -1.11,0 -2,0.9 -2,2v1c-0.55,0 -1,0.45 -1,1v3c0,0.55 0.45,1 1,1zM10.8,10c0,-0.66 0.54,-1.2 1.2,-1.2 0.66,0 1.2,0.54 1.2,1.2v1h-2.4v-1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_screen_lock_portrait_24dp.xml b/app/src/main/res/drawable/ic_screen_lock_portrait_24dp.xml
index 718ca70baf..c7ee82f6b1 100644
--- a/app/src/main/res/drawable/ic_screen_lock_portrait_24dp.xml
+++ b/app/src/main/res/drawable/ic_screen_lock_portrait_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M10,16h4c0.55,0 1,-0.45 1,-1v-3c0,-0.55 -0.45,-1 -1,-1v-1c0,-1.11 -0.9,-2 -2,-2 -1.11,0 -2,0.9 -2,2v1c-0.55,0 -1,0.45 -1,1v3c0,0.55 0.45,1 1,1zM10.8,10c0,-0.66 0.54,-1.2 1.2,-1.2 0.66,0 1.2,0.54 1.2,1.2v1h-2.4v-1zM17,1L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-2 -2,-2zM17,19L7,19L7,5h10v14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_screen_rotation_24dp.xml b/app/src/main/res/drawable/ic_screen_rotation_24dp.xml
index 3243d5a75d..04460bd85a 100644
--- a/app/src/main/res/drawable/ic_screen_rotation_24dp.xml
+++ b/app/src/main/res/drawable/ic_screen_rotation_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M16.48,2.52c3.27,1.55 5.61,4.72 5.97,8.48h1.5C23.44,4.84 18.29,0 12,0l-0.66,0.03 3.81,3.81 1.33,-1.32zM10.23,1.75c-0.59,-0.59 -1.54,-0.59 -2.12,0L1.75,8.11c-0.59,0.59 -0.59,1.54 0,2.12l12.02,12.02c0.59,0.59 1.54,0.59 2.12,0l6.36,-6.36c0.59,-0.59 0.59,-1.54 0,-2.12L10.23,1.75zM14.83,21.19L2.81,9.17l6.36,-6.36 12.02,12.02 -6.36,6.36zM7.52,21.48C4.25,19.94 1.91,16.76 1.55,13L0.05,13C0.56,19.16 5.71,24 12,24l0.66,-0.03 -3.81,-3.81 -1.33,1.32z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml
index df54c6b13d..39195ad39c 100644
--- a/app/src/main/res/drawable/ic_settings_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml
index 394e3effe4..9507de0d31 100644
--- a/app/src/main/res/drawable/ic_share_24dp.xml
+++ b/app/src/main/res/drawable/ic_share_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#FFF"
       android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml b/app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml
index ac185cda4b..a36b366c4b 100644
--- a/app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml
+++ b/app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M1.01,7L1,17c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2V7c0,-1.1 -0.9,-2 -2,-2H3c-1.1,0 -1.99,0.9 -1.99,2zM19,7v10H5V7h14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml b/app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml
index 23e9f4f263..25ce497393 100644
--- a/app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml
+++ b/app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/black"
+        android:fillColor="#000"
         android:pathData="M17,1.01L7,1c-1.1,0 -1.99,0.9 -1.99,2v18c0,1.1 0.89,2 1.99,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_system_update_alt_white_24dp.xml b/app/src/main/res/drawable/ic_system_update_alt_white_24dp.xml
index f317562bec..982263ca67 100644
--- a/app/src/main/res/drawable/ic_system_update_alt_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_system_update_alt_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M12,16.5l4,-4h-3v-9h-2v9L8,12.5l4,4zM21,3.5h-6v1.99h6v14.03L3,19.52L3,5.49h6L9,3.5L3,3.5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2v-14c0,-1.1 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_tachi.xml b/app/src/main/res/drawable/ic_tachi.xml
index 0065c6340d..0c988fbf1b 100644
--- a/app/src/main/res/drawable/ic_tachi.xml
+++ b/app/src/main/res/drawable/ic_tachi.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="256"
     android:viewportHeight="256">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M102.6,19.2c0.3,5.7 0.6,13.1 0.8,16.6l0.4,6.3 -42.7,-0.3c-23.4,-0.2 -43.4,-0.7 -44.3,-1.2 -1.7,-0.8 -1.8,0.6 -1.8,20.4v21.2l2.3,-0.6C23.9,79.7 50.6,79 126,79s102.1,0.7 108.8,2.6l2.2,0.6V61c0,-19.8 -0.1,-21.2 -1.7,-20.4 -1,0.5 -21,1 -44.4,1.2l-42.7,0.3 0.4,-6.3c0.2,-3.5 0.5,-10.9 0.8,-16.6l0.4,-10.2h-47.6l0.4,10.2zM58.8,93.2c-10.4,3.9 -18.8,7.7 -18.8,8.3 0,0.7 1.4,4.3 3.1,8.1 8,17.7 20.6,61.5 24.1,83.6 0.6,4.3 1.6,7.8 2.2,7.8 0.6,0 10.4,-3.2 21.9,-7.1 14.9,-5.2 20.7,-7.6 20.7,-8.7 0,-3.2 -17.8,-61 -26.2,-85C82,89.6 80.4,86 79.1,86.1c-0.9,0 -10,3.2 -20.3,7.1z" />
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M167.2,93.7c-3.3,21 -15.6,61.6 -28.8,95l-6.9,17.3H6v40h243v-40h-37.1c-29.3,0 -37,-0.3 -36.6,-1.3 0.3,-0.6 2.7,-5.9 5.3,-11.7 2.5,-5.8 7.5,-18.3 11,-27.9 6.7,-18.4 21.4,-64.3 21.4,-67 0,-1.3 -4.6,-2.8 -21.2,-6.9 -11.7,-2.9 -21.8,-5.2 -22.4,-5.2 -0.6,0 -1.6,3.5 -2.2,7.7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_warning_white_24dp.xml b/app/src/main/res/drawable/ic_warning_white_24dp.xml
index 74fcc6f747..d3a075a8ce 100644
--- a/app/src/main/res/drawable/ic_warning_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_warning_white_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#FFF"
         android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_webview_24dp.xml b/app/src/main/res/drawable/ic_webview_24dp.xml
index cd993e203d..9400f45ed1 100644
--- a/app/src/main/res/drawable/ic_webview_24dp.xml
+++ b/app/src/main/res/drawable/ic_webview_24dp.xml
@@ -3,5 +3,5 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
+    <path android:fillColor="#FFF" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
 </vector>
diff --git a/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml b/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
index 6b7189f35f..d45e333f7c 100644
--- a/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
+++ b/app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
@@ -15,10 +15,10 @@
         android:translateX="12"
         android:translateY="12">
         <path
-            android:fillColor="@color/md_white_1000"
+            android:fillColor="#FFF"
             android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z" />
         <path
-            android:fillColor="@color/md_white_1000"
+            android:fillColor="#FFF"
             android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/sc_explore_48dp.xml b/app/src/main/res/drawable/sc_explore_48dp.xml
index 3a489bd1cd..bc97eb2592 100644
--- a/app/src/main/res/drawable/sc_explore_48dp.xml
+++ b/app/src/main/res/drawable/sc_explore_48dp.xml
@@ -15,7 +15,7 @@
         android:translateX="12"
         android:translateY="12">
         <path
-            android:fillColor="@color/md_white_1000"
+            android:fillColor="#FFF"
             android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/sc_history_48dp.xml b/app/src/main/res/drawable/sc_history_48dp.xml
index 2988dfb89e..3ee54e497c 100644
--- a/app/src/main/res/drawable/sc_history_48dp.xml
+++ b/app/src/main/res/drawable/sc_history_48dp.xml
@@ -15,7 +15,7 @@
         android:translateX="12"
         android:translateY="12">
         <path
-            android:fillColor="@color/md_white_1000"
+            android:fillColor="#FFF"
             android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/sc_new_releases_48dp.xml b/app/src/main/res/drawable/sc_new_releases_48dp.xml
index 31e43db8f5..20d04862c0 100644
--- a/app/src/main/res/drawable/sc_new_releases_48dp.xml
+++ b/app/src/main/res/drawable/sc_new_releases_48dp.xml
@@ -15,7 +15,7 @@
         android:translateX="12"
         android:translateY="12">
         <path
-            android:fillColor="@color/md_white_1000"
+            android:fillColor="#FFF"
             android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
     </group>
 </vector>
diff --git a/presentation-core/src/main/res/values/colors.xml b/presentation-core/src/main/res/values/colors.xml
index 281b87825c..3d66ea077d 100644
--- a/presentation-core/src/main/res/values/colors.xml
+++ b/presentation-core/src/main/res/values/colors.xml
@@ -19,8 +19,6 @@
     <color name="surface_amoled">#000001</color>
     <color name="background_amoled">#000000</color>
 
-    <color name="reader_background_dark">#202125</color>
-
     <!-- Material Design Colors -->
     <color name="md_black_1000">#000000</color>
     <color name="md_black_1000_87">#DE000000</color>
@@ -39,35 +37,4 @@
     <color name="md_white_1000_8">#14FFFFFF</color>
     <color name="md_white_1000_6">#0FFFFFFF</color>
 
-    <color name="md_grey_50">#FAFAFA</color>
-    <color name="md_grey_50_75">#BFFAFAFA</color>
-    <color name="md_grey_100">#F5F5F5</color>
-    <color name="md_grey_300">#E0E0E0</color>
-    <color name="md_grey_800">#424242</color>
-    <color name="md_grey_900">#212121</color>
-    <color name="md_grey_900_75">#BF212121</color>
-
-    <color name="md_blue_A200">#448AFF</color>
-    <color name="md_blue_A200_75">#BF448AFF</color>
-    <color name="md_blue_A200_50">#80448AFF</color>
-
-    <color name="md_blue_A400">#2979FF</color>
-    <color name="md_blue_A400_75">#BF2979FF</color>
-    <color name="md_blue_A400_38">#612979FF</color>
-    <color name="md_blue_A400_12">#1F2979FF</color>
-
-    <color name="md_blue_grey_900">#263238</color>
-    <color name="md_blue_grey_800">#37474F</color>
-
-    <!-- Navigation Overlay Colors -->
-    <color name="navigation_next">#CB84E296</color>
-    <color name="navigation_prev">#CCFF7733</color>
-    <color name="navigation_menu">#CC95818D</color>
-    <color name="navigation_right">#CCA6CFD5</color>
-    <color name="navigation_left">#CC7D1128</color>
-
-    <!-- ActionMode status bar color -->
-    <color name="abc_decor_view_status_guard" tools:override="true">@android:color/transparent</color>
-    <color name="abc_decor_view_status_guard_light" tools:override="true">@android:color/transparent</color>
-
 </resources>