From ccd1c7bc1d5856c50c14f6b80c5c82a66199f61c Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Wed, 29 Jan 2020 23:57:17 -0800
Subject: [PATCH] Using night colors instead of night themes

So I dont have to use get theme (which was causing lag) and fixes some theming bugs
---
 .../data/backup/BackupRestoreService.kt       |   4 +-
 .../data/download/DownloadNotifier.kt         |   2 +-
 .../data/library/LibraryUpdateService.kt      |   6 +-
 .../tachiyomi/data/updater/UpdaterJob.kt      |   2 +-
 .../tachiyomi/data/updater/UpdaterNotifier.kt |   2 +-
 .../tachiyomi/extension/ExtensionUpdateJob.kt |   2 +-
 .../ui/base/activity/BaseActivity.kt          |   7 ++
 .../kanade/tachiyomi/ui/main/MainActivity.kt  |   9 --
 .../tachiyomi/ui/reader/SaveImageNotifier.kt  |   2 +-
 .../res/drawable-night/list_item_selector.xml |  20 ++++
 app/src/main/res/drawable/button_bg_error.xml |   4 +-
 .../res/drawable/button_bg_transparent.xml    |  12 +-
 .../drawable/library_item_selector_amoled.xml |   6 +-
 .../drawable/library_item_selector_dark.xml   |   8 +-
 .../drawable/library_item_selector_light.xml  |   8 +-
 .../main/res/drawable/line_divider_dark.xml   |   2 +-
 .../main/res/drawable/line_divider_light.xml  |   2 +-
 ...ector_light.xml => list_item_selector.xml} |   8 +-
 .../drawable/list_item_selector_amoled.xml    |   6 +-
 .../res/drawable/list_item_selector_dark.xml  |  14 +--
 app/src/main/res/drawable/sc_book_48dp.xml    |   2 +-
 app/src/main/res/drawable/sc_explore_48dp.xml |   2 +-
 app/src/main/res/drawable/sc_glasses_48dp.xml |   2 +-
 app/src/main/res/drawable/sc_update_48dp.xml  |   2 +-
 .../res/layout/catalogue_drawer_content.xml   |   2 +-
 .../main/res/layout/catalogue_grid_item.xml   |   8 +-
 .../main/res/layout/catalogue_list_item.xml   |   2 +-
 .../main/res/layout/migration_manga_card.xml  |   4 +-
 app/src/main/res/layout/navigation_header.xml |   2 +-
 .../main/res/layout/navigation_view_group.xml |   2 +-
 .../main/res/layout/pref_account_login.xml    |   2 +-
 .../layout/recent_chapters_section_item.xml   |   1 +
 app/src/main/res/values-night/colors.xml      |  26 ++++-
 app/src/main/res/values-night/styles.xml      |   6 +
 app/src/main/res/values-night/themes.xml      |  62 ++---------
 app/src/main/res/values/colors.xml            |  51 +++------
 app/src/main/res/values/styles.xml            |  20 ++--
 app/src/main/res/values/themes.xml            | 104 +++++++++---------
 38 files changed, 206 insertions(+), 220 deletions(-)
 create mode 100644 app/src/main/res/drawable-night/list_item_selector.xml
 rename app/src/main/res/drawable/{list_item_selector_light.xml => list_item_selector.xml} (60%)
 create mode 100644 app/src/main/res/values-night/styles.xml

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
index 873484ff91..f2c2db5acd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
@@ -344,7 +344,7 @@ class BackupRestoreService : Service() {
                 .setOngoing(true)
                 .setOnlyAlertOnce(true)
                 .setAutoCancel(false)
-                .setColor(ContextCompat.getColor(this, R.color.colorAccentLight))
+                .setColor(ContextCompat.getColor(this, R.color.colorAccent))
                 .addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent)
     }
 
@@ -402,7 +402,7 @@ class BackupRestoreService : Service() {
                 .setStyle(NotificationCompat.BigTextStyle().bigText(restoreString))
                 .setSmallIcon(R.drawable.ic_tachi)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
-                .setColor(ContextCompat.getColor(this, R.color.colorAccentLight))
+                .setColor(ContextCompat.getColor(this, R.color.colorAccent))
         if (errors.size > 0 && !path.isNullOrEmpty() && !file.isNullOrEmpty()) {
             resultNotification.addAction(R.drawable.ic_clear_grey_24dp_img, getString(R.string
                 .notification_action_error_log), getErrorLogIntent(path, file))
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
index 321b3843f9..915133d784 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
@@ -222,7 +222,7 @@ internal class DownloadNotifier(private val context: Context) {
             clearActions()
             setAutoCancel(true)
             setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
-            color = ContextCompat.getColor(context, R.color.colorAccentLight)
+            color = ContextCompat.getColor(context, R.color.colorAccent)
             setProgress(0, 0, false)
         }
         notification.show(Notifications.ID_DOWNLOAD_CHAPTER_ERROR)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
index 5d0ff26620..ef30e7e637 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
@@ -103,7 +103,7 @@ class LibraryUpdateService(
             .setLargeIcon(notificationBitmap)
             .setOngoing(true)
             .setOnlyAlertOnce(true)
-            .setColor(ContextCompat.getColor(this, R.color.colorAccentLight))
+            .setColor(ContextCompat.getColor(this, R.color.colorAccent))
             .addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent)
     }
 
@@ -489,7 +489,7 @@ class LibraryUpdateService(
                 catch (e: Exception) { }
                 setGroupAlertBehavior(GROUP_ALERT_SUMMARY)
                 setContentTitle(manga.currentTitle())
-                color = ContextCompat.getColor(this@LibraryUpdateService, R.color.colorAccentLight)
+                color = ContextCompat.getColor(this@LibraryUpdateService, R.color.colorAccent)
                 val chaptersNames = if (chapterNames.size > 5) {
                     "${chapterNames.take(4).joinToString(", ")}, " +
                         resources.getQuantityString(R.plurals.notification_and_n_more,
@@ -523,7 +523,7 @@ class LibraryUpdateService(
                 setSmallIcon(R.drawable.ic_tachi)
                 setLargeIcon(notificationBitmap)
                 setContentTitle(getString(R.string.notification_new_chapters))
-                color = ContextCompat.getColor(applicationContext, R.color.colorAccentLight)
+                color = ContextCompat.getColor(applicationContext, R.color.colorAccent)
                 if (updates.size > 1) {
                     setContentText(resources.getQuantityString(R.plurals
                         .notification_new_chapters_text,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt
index 40ae3ebe9f..bb4c45a068 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt
@@ -29,7 +29,7 @@ class UpdaterJob : Job() {
                             setContentTitle(context.getString(R.string.app_name))
                             setContentText(context.getString(R.string.update_check_notification_update_available))
                             setSmallIcon(android.R.drawable.stat_sys_download_done)
-                            color = ContextCompat.getColor(context, R.color.colorAccentLight)
+                            color = ContextCompat.getColor(context, R.color.colorAccent)
                             // Download action
                             addAction(android.R.drawable.stat_sys_download_done,
                                     context.getString(R.string.action_download),
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt
index 4c752080c1..11c4f8afa6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt
@@ -97,7 +97,7 @@ internal class UpdaterNotifier(private val context: Context) {
             setSmallIcon(android.R.drawable.stat_sys_warning)
             setOnlyAlertOnce(false)
             setProgress(0, 0, false)
-            color = ContextCompat.getColor(context, R.color.colorAccentLight)
+            color = ContextCompat.getColor(context, R.color.colorAccent)
             // Retry action
             addAction(R.drawable.ic_refresh_grey_24dp_img,
                     context.getString(R.string.action_retry),
diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt
index c6712cf810..571eac1b86 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt
@@ -51,7 +51,7 @@ class ExtensionUpdateJob : Job() {
                             setContentText(extNames)
                             setStyle(NotificationCompat.BigTextStyle().bigText(extNames))
                             setSmallIcon(R.drawable.ic_extension_update)
-                            color = ContextCompat.getColor(context, R.color.colorAccentLight)
+                            color = ContextCompat.getColor(context, R.color.colorAccent)
                             setContentIntent(
                                 NotificationReceiver.openExtensionsPendingActivity(
                                     context
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
index 310c5e427f..7c30ed4107 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
@@ -18,6 +18,13 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        AppCompatDelegate.setDefaultNightMode(
+            when (preferences.theme()) {
+                1 -> AppCompatDelegate.MODE_NIGHT_NO
+                2, 3, 4 -> AppCompatDelegate.MODE_NIGHT_YES
+                else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+            }
+        )
         setTheme(when (preferences.theme()) {
             3, 6 -> R.style.Theme_Tachiyomi_Amoled
             4, 7 -> R.style.Theme_Tachiyomi_DarkBlue
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 0f79428f2a..05d12b65a0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -109,15 +109,6 @@ open class MainActivity : BaseActivity() {
     lateinit var tabAnimator: TabsAnimator
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setDefaultNightMode(
-            when (preferences.theme()) {
-                1 -> MODE_NIGHT_NO
-                2, 3, 4 -> MODE_NIGHT_YES
-                else -> MODE_NIGHT_FOLLOW_SYSTEM
-            }
-        )
-        // Some webview somewwhere breaks night mode, we create a webview to solve this:
-        // https://stackoverflow.com/a/45430282
         if (preferences.theme() in 2..4) {
             Timber.d("Manually instantiating WebView to avoid night mode issue.");
             try {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
index b9bdaa4f15..d473a4aa5c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
@@ -58,7 +58,7 @@ class SaveImageNotifier(private val context: Context) {
             setStyle(NotificationCompat.BigPictureStyle().bigPicture(image))
             setLargeIcon(image)
             setAutoCancel(true)
-            color = ContextCompat.getColor(context, R.color.colorAccentLight)
+            color = ContextCompat.getColor(context, R.color.colorAccent)
             // Clear old actions if they exist
             if (mActions.isNotEmpty())
                 mActions.clear()
diff --git a/app/src/main/res/drawable-night/list_item_selector.xml b/app/src/main/res/drawable-night/list_item_selector.xml
new file mode 100644
index 0000000000..ff1236a28c
--- /dev/null
+++ b/app/src/main/res/drawable-night/list_item_selector.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/rippleColor">
+    <item>
+        <selector>
+            <item android:state_selected="true">
+                <color android:color="@color/rippleColor" />
+            </item>
+
+            <item android:drawable="@color/rippleColor" android:state_focused="true"/>
+            <item android:drawable="@color/rippleColor" android:state_pressed="true"/>
+            <item android:drawable="@color/rippleColor" android:state_activated="true"/>
+            <item android:drawable="@color/darkPrimaryColor"/>
+
+            <item>
+                <color android:color="@color/dialog" />
+            </item>
+        </selector>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/button_bg_error.xml b/app/src/main/res/drawable/button_bg_error.xml
index 3edb3611bb..bbaa6225bb 100644
--- a/app/src/main/res/drawable/button_bg_error.xml
+++ b/app/src/main/res/drawable/button_bg_error.xml
@@ -7,11 +7,11 @@
             <padding android:left="8dp" android:right="8dp" />
         </shape>
     </item>
-    <item android:state_enabled="false" android:color="@color/textColorHintLight">
+    <item android:state_enabled="false" android:color="@color/textColorHint">
         <shape android:shape="rectangle">
             <corners android:radius="2dp" />
             <solid android:color="@android:color/transparent" />
-            <stroke android:width="1dp" android:color="@color/textColorHintLight" />
+            <stroke android:width="1dp" android:color="@color/textColorHint" />
             <padding android:left="8dp" android:right="8dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/button_bg_transparent.xml b/app/src/main/res/drawable/button_bg_transparent.xml
index 84577aa474..c23d7a920d 100644
--- a/app/src/main/res/drawable/button_bg_transparent.xml
+++ b/app/src/main/res/drawable/button_bg_transparent.xml
@@ -3,23 +3,23 @@
     <item android:state_activated="true" android:color="@color/md_white_1000">
         <shape android:shape="rectangle">
             <corners android:radius="2dp" />
-            <solid android:color="@color/colorAccentLight" />
+            <solid android:color="@color/colorAccent" />
             <padding android:left="8dp" android:right="8dp" />
         </shape>
     </item>
-    <item android:state_enabled="false" android:color="@color/textColorHintLight">
+    <item android:state_enabled="false" android:color="@color/textColorHint">
         <shape android:shape="rectangle">
             <corners android:radius="2dp" />
             <solid android:color="@android:color/transparent" />
-            <stroke android:color="@color/textColorHintLight" android:width="1dp"/>
+            <stroke android:color="@color/textColorHint" android:width="1dp"/>
             <padding android:left="8dp" android:right="8dp" />
         </shape>
     </item>
-    <item android:color="@color/colorAccentLight">
-        <shape android:shape="rectangle" android:color="@color/colorAccentLight">
+    <item android:color="@color/colorAccent">
+        <shape android:shape="rectangle" android:color="@color/colorAccent">
             <corners android:radius="2dp" />
             <solid android:color="@android:color/transparent" />
-            <stroke android:color="@color/colorAccentLight" android:width="1dp"/>
+            <stroke android:color="@color/colorAccent" android:width="1dp"/>
             <padding android:left="8dp" android:right="8dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/library_item_selector_amoled.xml b/app/src/main/res/drawable/library_item_selector_amoled.xml
index 18b0fb40eb..c7e57d6548 100644
--- a/app/src/main/res/drawable/library_item_selector_amoled.xml
+++ b/app/src/main/res/drawable/library_item_selector_amoled.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/selectorColorDark">
+    android:color="@color/selectorColor">
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="@color/selectorColorDark" />
+                <color android:color="@color/selectorColor" />
             </item>
 
             <item android:state_activated="true">
-                <color android:color="@color/selectorColorDark" />
+                <color android:color="@color/selectorColor" />
             </item>
 
             <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
index 7e2dc8b749..aa427b5fca 100644
--- a/app/src/main/res/drawable/library_item_selector_dark.xml
+++ b/app/src/main/res/drawable/library_item_selector_dark.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/colorAccentDark">
+    android:color="@color/colorAccent">
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="@color/selectorColorDark" />
+                <color android:color="@color/selectorColor" />
             </item>
 
             <item android:state_activated="true">
-                <color android:color="@color/selectorColorDark" />
+                <color android:color="@color/selectorColor" />
             </item>
 
             <item>
-                <color android:color="@color/backgroundDark" />
+                <color android:color="@color/background" />
             </item>
         </selector>
     </item>
diff --git a/app/src/main/res/drawable/library_item_selector_light.xml b/app/src/main/res/drawable/library_item_selector_light.xml
index e51877cc91..aa427b5fca 100644
--- a/app/src/main/res/drawable/library_item_selector_light.xml
+++ b/app/src/main/res/drawable/library_item_selector_light.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/colorAccentLight">
+    android:color="@color/colorAccent">
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="@color/selectorColorLight" />
+                <color android:color="@color/selectorColor" />
             </item>
 
             <item android:state_activated="true">
-                <color android:color="@color/selectorColorLight" />
+                <color android:color="@color/selectorColor" />
             </item>
 
             <item>
-                <color android:color="@color/backgroundLight" />
+                <color android:color="@color/background" />
             </item>
         </selector>
     </item>
diff --git a/app/src/main/res/drawable/line_divider_dark.xml b/app/src/main/res/drawable/line_divider_dark.xml
index 3d8da577ae..7c873bd96f 100644
--- a/app/src/main/res/drawable/line_divider_dark.xml
+++ b/app/src/main/res/drawable/line_divider_dark.xml
@@ -6,6 +6,6 @@
         android:width="1dp"
         android:height="1dp" />
 
-    <solid android:color="@color/dividerDark" />
+    <solid android:color="@color/divider" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/line_divider_light.xml b/app/src/main/res/drawable/line_divider_light.xml
index eca76daba5..7c873bd96f 100644
--- a/app/src/main/res/drawable/line_divider_light.xml
+++ b/app/src/main/res/drawable/line_divider_light.xml
@@ -6,6 +6,6 @@
         android:width="1dp"
         android:height="1dp" />
 
-    <solid android:color="@color/dividerLight" />
+    <solid android:color="@color/divider" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_item_selector_light.xml b/app/src/main/res/drawable/list_item_selector.xml
similarity index 60%
rename from app/src/main/res/drawable/list_item_selector_light.xml
rename to app/src/main/res/drawable/list_item_selector.xml
index 3fa9224b93..d219df8b1c 100644
--- a/app/src/main/res/drawable/list_item_selector_light.xml
+++ b/app/src/main/res/drawable/list_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/rippleColorLight">
+    android:color="@color/rippleColor">
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="@color/rippleColorLight" />
+                <color android:color="@color/rippleColor" />
             </item>
 
             <item android:state_activated="true">
-                <color android:color="@color/rippleColorLight" />
+                <color android:color="@color/rippleColor" />
             </item>
 
             <item>
-                <color android:color="@color/dialogLight" />
+                <color android:color="@color/dialog" />
             </item>
         </selector>
     </item>
diff --git a/app/src/main/res/drawable/list_item_selector_amoled.xml b/app/src/main/res/drawable/list_item_selector_amoled.xml
index f3a9c3e06f..e11e4e9e53 100644
--- a/app/src/main/res/drawable/list_item_selector_amoled.xml
+++ b/app/src/main/res/drawable/list_item_selector_amoled.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/rippleColorDark">
+    android:color="@color/rippleColor">
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="@color/rippleColorDark" />
+                <color android:color="@color/rippleColor" />
             </item>
 
             <item android:state_activated="true">
-                <color android:color="@color/rippleColorDark" />
+                <color android:color="@color/rippleColor" />
             </item>
 
             <item>
diff --git a/app/src/main/res/drawable/list_item_selector_dark.xml b/app/src/main/res/drawable/list_item_selector_dark.xml
index 7e8dc6495e..fea6891057 100644
--- a/app/src/main/res/drawable/list_item_selector_dark.xml
+++ b/app/src/main/res/drawable/list_item_selector_dark.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/rippleColorDark">
+    android:color="@color/rippleColor">
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="@color/rippleColorDark" />
+                <color android:color="@color/rippleColor" />
             </item>
 
-    <item android:drawable="@color/rippleColorDark" android:state_focused="true"/>
-    <item android:drawable="@color/rippleColorDark" android:state_pressed="true"/>
-    <item android:drawable="@color/rippleColorDark" android:state_activated="true"/>
-    <item android:drawable="@color/colorDarkPrimary"/>
+    <item android:drawable="@color/rippleColor" android:state_focused="true"/>
+    <item android:drawable="@color/rippleColor" android:state_pressed="true"/>
+    <item android:drawable="@color/rippleColor" android:state_activated="true"/>
+    <item android:drawable="@color/darkPrimaryColor"/>
 
             <item>
-                <color android:color="@color/dialogDark" />
+                <color android:color="@color/dialog" />
             </item>
         </selector>
     </item>
diff --git a/app/src/main/res/drawable/sc_book_48dp.xml b/app/src/main/res/drawable/sc_book_48dp.xml
index 35c7a7c2ff..9b7f8bac38 100644
--- a/app/src/main/res/drawable/sc_book_48dp.xml
+++ b/app/src/main/res/drawable/sc_book_48dp.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="48">
 
     <path
-        android:fillColor="@color/backgroundLight"
+        android:fillColor="@color/background"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
diff --git a/app/src/main/res/drawable/sc_explore_48dp.xml b/app/src/main/res/drawable/sc_explore_48dp.xml
index 1489806c88..2a6f052b85 100644
--- a/app/src/main/res/drawable/sc_explore_48dp.xml
+++ b/app/src/main/res/drawable/sc_explore_48dp.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="48">
 
     <path
-        android:fillColor="@color/backgroundLight"
+        android:fillColor="@color/background"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
diff --git a/app/src/main/res/drawable/sc_glasses_48dp.xml b/app/src/main/res/drawable/sc_glasses_48dp.xml
index 9fa1b0e15a..5fe267ec07 100644
--- a/app/src/main/res/drawable/sc_glasses_48dp.xml
+++ b/app/src/main/res/drawable/sc_glasses_48dp.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="48">
 
     <path
-        android:fillColor="@color/backgroundLight"
+        android:fillColor="@color/background"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
diff --git a/app/src/main/res/drawable/sc_update_48dp.xml b/app/src/main/res/drawable/sc_update_48dp.xml
index 3e6ba0cb97..f720873ca4 100644
--- a/app/src/main/res/drawable/sc_update_48dp.xml
+++ b/app/src/main/res/drawable/sc_update_48dp.xml
@@ -6,7 +6,7 @@
     android:viewportWidth="48">
 
     <path
-        android:fillColor="@color/backgroundLight"
+        android:fillColor="@color/background"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
 
     <group
diff --git a/app/src/main/res/layout/catalogue_drawer_content.xml b/app/src/main/res/layout/catalogue_drawer_content.xml
index b4bf2e16bc..450078cab4 100644
--- a/app/src/main/res/layout/catalogue_drawer_content.xml
+++ b/app/src/main/res/layout/catalogue_drawer_content.xml
@@ -27,7 +27,7 @@
             android:maxLines="1"
             tools:text="Title"
             android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-            android:textColor="@color/textColorPrimaryDark"/>
+            android:textColor="@color/md_white_1000"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/catalogue_grid_item.xml b/app/src/main/res/layout/catalogue_grid_item.xml
index 5b833d32ff..40f28733b3 100644
--- a/app/src/main/res/layout/catalogue_grid_item.xml
+++ b/app/src/main/res/layout/catalogue_grid_item.xml
@@ -39,12 +39,13 @@
                 style="@style/TextAppearance.Regular.Caption.Light"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/colorAccentDark"
+                android:background="@color/colorAccent"
                 android:paddingBottom="1dp"
                 android:paddingStart="3dp"
                 android:paddingEnd="3dp"
                 android:paddingTop="1dp"
                 android:visibility="gone"
+                android:textColor="@color/md_white_1000"
                 tools:visibility="visible"
                 tools:text="120"
                 app:layout_constraintStart_toEndOf="@+id/download_text"
@@ -64,6 +65,7 @@
                 android:visibility="gone"
                 tools:visibility="visible"
                 tools:text="120"
+                android:textColor="@color/md_white_1000"
                 app:layout_constraintStart_toEndOf="@+id/local_text"
                 android:layout_marginStart="4dp"
                 app:layout_constraintTop_toTopOf="parent"
@@ -74,6 +76,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@color/md_teal_500"
+                android:textColor="@color/md_white_1000"
                 android:paddingBottom="1dp"
                 android:paddingStart="3dp"
                 android:paddingEnd="3dp"
@@ -92,13 +95,14 @@
             style="@style/TextAppearance.Regular.Body1.Light"
             app:typeface="ptsansNarrowBold"
             android:layout_width="match_parent"
+            android:textColor="@color/md_white_1000"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:ellipsize="end"
             android:lineSpacingExtra="-4dp"
             android:maxLines="2"
             android:padding="8dp"
-            android:shadowColor="@color/textColorPrimaryLight"
+            android:shadowColor="@color/md_black_1000_87"
             android:shadowDx="0"
             android:shadowDy="0"
             android:shadowRadius="4"
diff --git a/app/src/main/res/layout/catalogue_list_item.xml b/app/src/main/res/layout/catalogue_list_item.xml
index 09b4e9943b..23d01e55b7 100644
--- a/app/src/main/res/layout/catalogue_list_item.xml
+++ b/app/src/main/res/layout/catalogue_list_item.xml
@@ -69,7 +69,7 @@
         style="@style/TextAppearance.Regular.Caption.Light"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/colorAccentLight"
+        android:background="@color/colorAccent"
         android:paddingBottom="1dp"
         android:paddingStart="3dp"
         android:paddingEnd="3dp"
diff --git a/app/src/main/res/layout/migration_manga_card.xml b/app/src/main/res/layout/migration_manga_card.xml
index 82e40e0b6e..38042d2fd6 100644
--- a/app/src/main/res/layout/migration_manga_card.xml
+++ b/app/src/main/res/layout/migration_manga_card.xml
@@ -45,6 +45,7 @@
             style="@style/TextAppearance.Regular.Caption.Light"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textColor="@color/md_white_1000"
             android:background="@color/md_teal_500"
             android:paddingBottom="1dp"
             android:paddingLeft="3dp"
@@ -63,12 +64,13 @@
             style="@style/TextAppearance.Regular.Body1.Light"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textColor="@color/md_white_1000"
             android:layout_gravity="bottom"
             android:ellipsize="end"
             android:lineSpacingExtra="-4dp"
             android:maxLines="2"
             android:padding="8dp"
-            android:shadowColor="@color/textColorPrimaryLight"
+            android:shadowColor="@color/md_black_1000_87"
             android:shadowDx="0"
             android:shadowDy="0"
             android:shadowRadius="4"
diff --git a/app/src/main/res/layout/navigation_header.xml b/app/src/main/res/layout/navigation_header.xml
index c7796fae9f..77dfc77507 100644
--- a/app/src/main/res/layout/navigation_header.xml
+++ b/app/src/main/res/layout/navigation_header.xml
@@ -8,7 +8,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorPrimary" />
+        android:background="@color/drawerColor" />
 
     <ImageView
         android:layout_width="64dp"
diff --git a/app/src/main/res/layout/navigation_view_group.xml b/app/src/main/res/layout/navigation_view_group.xml
index 970101cc39..45e3537f67 100644
--- a/app/src/main/res/layout/navigation_view_group.xml
+++ b/app/src/main/res/layout/navigation_view_group.xml
@@ -19,7 +19,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-        android:textColor="@color/textColorPrimaryDark"
+        android:textColor="@color/md_white_1000"
         tools:text="Header"/>
 
     <ImageView
diff --git a/app/src/main/res/layout/pref_account_login.xml b/app/src/main/res/layout/pref_account_login.xml
index c0a96a6596..6167969e0b 100644
--- a/app/src/main/res/layout/pref_account_login.xml
+++ b/app/src/main/res/layout/pref_account_login.xml
@@ -20,7 +20,7 @@
         android:layout_height="1dp"
         android:layout_marginBottom="24dp"
         android:layout_marginTop="6dp"
-        android:background="@color/dividerLight"/>
+        android:background="@color/divider"/>
 
     <TextView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/recent_chapters_section_item.xml b/app/src/main/res/layout/recent_chapters_section_item.xml
index 29d82660cc..7068ec0cfe 100644
--- a/app/src/main/res/layout/recent_chapters_section_item.xml
+++ b/app/src/main/res/layout/recent_chapters_section_item.xml
@@ -13,6 +13,7 @@
         android:id="@+id/section_text"
         style="@style/TextAppearance.Regular.SubHeading.Light.Bold"
         android:layout_width="wrap_content"
+        android:textColor="@color/md_white_1000"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:maxLines="1"/>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 94ab3f0559..29e0e17bbd 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,12 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Application Colors -->
+    <color name="colorPrimary">#212121</color>
+    <color name="colorPrimaryDark">#212121</color>
+
     <color name="drawerHighlight">@color/md_white_1000_12</color>
-    <color name="drawerPrimary">@color/colorAccentDark</color>
+    <color name="drawerPrimary">#3399FF</color>
     <color name="oldNavBarBackground">#B3000000</color>
     <color name="snackbarBackground">#FFFFFF</color>
-    <color name="cardBackground">@color/colorDarkPrimary</color>
+    <color name="cardBackground">#212121</color>
     <color name="rippleColor">@color/md_white_1000_20</color>
     <color name="dialogBackground">@color/md_grey_800</color>
     <color name="colorAccent">#3399FF</color>
-    <color name="splashBackground">@color/colorDarkPrimary</color>
+    <color name="splashBackground">#212121</color>
+
+    <color name="textColorPrimary">@color/md_white_1000</color>
+    <color name="textColorSecondary">@color/md_white_1000_70</color>
+    <color name="textColorPrimaryInverse">@color/md_black_1000_87</color>
+    <color name="textColorSecondaryInverse">@color/md_black_1000_54</color>
+    <color name="textColorHint">@color/md_white_1000_50</color>
+    <color name="textColorHintInverse">@color/md_black_1000_38</color>
+    <color name="divider">@android:color/transparent</color>
+
+    <color name="statusBar">@color/md_black_1000</color>
+    <color name="appBar">@color/md_grey_900</color>
+    <color name="background">#1C1C1D</color>
+    <color name="dialog">@color/md_grey_800</color>
+
+    <color name="selectorColor">@color/md_blue_A200_50</color>
+    <color name="iconColor">@color/md_white_1000_54</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000000..f41e6bed7d
--- /dev/null
+++ b/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.ActionBar.DayNight" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index db6bf7ddb1..cd3cb21c0c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,60 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <style name="Theme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
-    <item name="colorPrimary">@color/colorDarkPrimary</item>
-    <item name="colorPrimaryDark">@color/colorDarkPrimaryDark</item>
-    <item name="colorAccent">@color/colorAccentDark</item>
-    <item name="android:textColorPrimary">@color/textColorPrimaryDark</item>
-    <item name="android:textColorSecondary">@color/textColorSecondaryDark</item>
-    <item name="android:textColorHint">@color/textColorHintDark</item>
-    <item name="android:textColorPrimaryInverse">@color/textColorPrimaryLight</item>
-    <item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item>
-    <item name="android:textColorHintInverse">@color/textColorHintLight</item>
-    <item name="android:colorBackground">@color/backgroundDark</item>
-    <item name="android:listSelector">?colorAccent</item>
-    <item name="android:divider">@color/dividerDark</item>
-    <item name="android:listDivider">@drawable/line_divider_dark</item>
-
-    <!-- Themes -->
-    <item name="windowActionModeOverlay">true</item>
-    <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
-    <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item>
-    <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-    <item name="alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
-    <item name="android:statusBarColor">@android:color/transparent</item>
-
-
-    <!-- Custom Attributes-->
-    <item name="navigation_view_theme">@style/Theme.Widget.NavigationView</item>
-    <item name="selectable_list_drawable">@drawable/list_item_selector_dark</item>
-    <item name="selectable_library_drawable">@drawable/library_item_selector_dark</item>
-    <item name="text_color_primary">@color/textColorPrimaryDark</item>
-    <item name="background_card">@color/cardBackground</item>
-    <item name="icon_color">@color/iconColorDark</item>
-    <item name="snackbar_background">@color/snackbarBackground</item>
-    <item name="snackbar_text">@color/textColorPrimaryLight</item>
-    <item name="android:navigationBarColor">@color/oldNavBarBackground</item>
-
-
-    <!-- Material Dialog colors -->
-    <item name="md_color_title">@color/textColorPrimaryDark</item>
-    <item name="md_color_content">@color/textColorSecondaryDark</item>
-    <item name="md_color_button_text">@color/colorAccentDark</item>
-    <item name="md_background_color">@color/dialogDark</item>
-    <item name="md_corner_radius">16dp</item>
-  </style>
-
   <style name="Theme.Base.Reader" parent="Theme.Base">
     <item name="android:statusBarColor">?colorPrimaryDark</item>
     <item name="android:navigationBarColor">?colorPrimaryDark</item>
-    <item name="colorPrimary">@color/colorDarkPrimary</item>
-    <item name="colorPrimaryDark">@color/colorDarkPrimary</item>
-    <item name="android:colorBackground">@color/backgroundDark</item>
+    <item name="colorPrimary">#212121</item>
+    <item name="colorPrimaryDark">#212121</item>
+    <item name="android:colorBackground">#1C1C1D</item>
   </style>
 
   <style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Tachiyomi">
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+    <item name="colorPrimary">#54759E</item>
+    <item name="colorPrimaryDark">#54759E</item>
   </style>
 
   <!--==============-->
@@ -65,7 +21,7 @@
     <item name="colorPrimaryDark">@color/colorAmoledPrimary</item>
     <item name="android:colorBackground">@color/md_black_1000</item>
     <item name="snackbar_background">@color/trueSnackbarBackground</item>
-    <item name="snackbar_text">@color/textColorPrimaryDark</item>
+    <item name="snackbar_text">@color/textColorPrimary</item>
 
     <!-- Custom Attributes-->
     <item name="selectable_list_drawable">@drawable/list_item_selector_amoled</item>
@@ -74,9 +30,9 @@
 
 
     <!-- Material Dialog colors -->
-    <item name="md_color_title">@color/textColorPrimaryDark</item>
-    <item name="md_color_content">@color/textColorSecondaryDark</item>
-    <item name="md_color_button_text">@color/colorAccentDark</item>
+    <item name="md_color_title">@color/textColorPrimary</item>
+    <item name="md_color_content">@color/textColorSecondary</item>
+    <item name="md_color_button_text">@color/colorAccent</item>
     <item name="md_background_color">@color/dialog_amoled</item>
     <item name="md_corner_radius">16dp</item>
   </style>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 14d86763aa..76d7358e30 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Application Colors -->
     <color name="colorPrimary">#54759E</color>
+    <color name="drawerColor">#54759E</color>
     <color name="colorPrimaryDark">#54759E</color>
     <color name="drawerHighlight">@color/md_black_1000_12</color>
     <color name="drawerPrimary">@color/colorPrimary</color>
@@ -13,50 +14,34 @@
     <color name="rippleColor">@color/md_black_1000_12</color>
     <color name="colorAccent">@color/md_blue_A400</color>
     <!-- Dark Application Colors -->
-    <color name="colorDarkPrimary">#212121</color>
-    <color name="colorDarkPrimaryDark">#212121</color>
     <color name="colorAmoledPrimary">@color/md_black_1000</color>
+    <color name="dialog_amoled">@color/darkPrimaryColor</color>
 
     <color name="splashBackgroundColor">@color/colorPrimary</color>
 
     <!-- Light Theme -->
-    <color name="colorAccentLight">@color/md_blue_A400</color>
-    <color name="textColorPrimaryLight">@color/md_black_1000_87</color>
-    <color name="textColorSecondaryLight">@color/md_black_1000_54</color>
-    <color name="textColorHintLight">@color/md_black_1000_38</color>
-    <color name="dividerLight">@color/md_black_1000_12</color>
-    <color name="rippleColorLight">@color/md_black_1000_12</color>
+    <color name="textColorPrimary">@color/md_black_1000_87</color>
+    <color name="textColorSecondary">@color/md_black_1000_54</color>
+    <color name="textColorPrimaryInverse">@color/md_white_1000</color>
+    <color name="textColorSecondaryInverse">@color/md_white_1000_70</color>
+    <color name="textColorHint">@color/md_black_1000_38</color>
+    <color name="textColorHintInverse">@color/md_white_1000_50</color>
+    <color name="divider">@color/md_black_1000_12</color>
     <color name="oldNavBarBackground">#B3FFFFFF</color>
 
-    <color name="preference_fallback_accent_color">@color/colorAccentLight</color>
+    <color name="preference_fallback_accent_color">@color/colorAccent</color>
+    <color name="darkPrimaryColor">#212121</color>
 
-    <color name="statusBarLight">@color/md_grey_300</color>
-    <color name="appBarLight">@color/md_grey_100</color>
-    <color name="backgroundLight">@color/md_grey_50</color>
-    <color name="dialogLight">@color/md_white_1000</color>
+    <color name="statusBar">@color/md_grey_300</color>
+    <color name="appBar">@color/md_grey_100</color>
+    <color name="background">@color/md_grey_50</color>
+    <color name="dialog">@color/md_white_1000</color>
 
-    <color name="selectorColorLight">@color/md_blue_A400_38</color>
-    <color name="iconColorLight">@color/md_black_1000_54</color>
-
-    <!-- Dark Theme -->
-    <color name="colorAccentDark">#3399FF</color>
-    <color name="textColorPrimaryDark">@color/md_white_1000</color>
-    <color name="textColorSecondaryDark">@color/md_white_1000_70</color>
-    <color name="textColorHintDark">@color/md_white_1000_50</color>
-    <color name="dividerDark">@android:color/transparent</color>
-    <color name="rippleColorDark">@color/md_white_1000_20</color>
-
-    <color name="statusBarDark">@color/md_black_1000</color>
-    <color name="appBarDark">@color/md_grey_900</color>
-    <color name="backgroundDark">#1C1C1D</color>
-    <color name="dialogDark">@color/md_grey_800</color>
-    <color name="dialog_amoled">@color/colorDarkPrimaryDark</color>
-
-    <color name="selectorColorDark">@color/md_blue_A200_50</color>
-    <color name="iconColorDark">@color/md_white_1000_54</color>
+    <color name="selectorColor">@color/md_blue_A400_38</color>
+    <color name="iconColor">@color/md_black_1000_54</color>
 
     <!-- Reader Theme -->
-    <color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>
+    <color name="pageNumberbackground">@color/md_grey_50_75</color>
     <color name="pageNumberBackgroundDark">@color/md_grey_900_75</color>
 
     <!-- Text Colors -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 75e2fd8c4f..3c3149adc7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,7 +6,7 @@
     <!--========-->
     <style name="Theme.ActionBar" parent="@style/ThemeOverlay.AppCompat.ActionBar" />
 
-    <style name="Theme.ActionBar.Light" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+    <style name="Theme.ActionBar.DayNight" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
@@ -20,16 +20,10 @@
     <!--===========-->
     <style name="Theme.AlertDialog" />
 
-    <style name="Theme.AlertDialog.Light" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <style name="Theme.AlertDialog.DayNight" parent="Theme.AppCompat.Light.Dialog.Alert">
         <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
         <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
-        <item name="colorAccent">@color/colorAccentLight</item>
-    </style>
-
-    <style name="Theme.AlertDialog.Dark" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
-        <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
-        <item name="colorAccent">@color/colorAccentDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
     </style>
 
     <!--==============-->
@@ -61,7 +55,7 @@
     </style>
 
     <style name="TextAppearance.Regular.Body1.Light">
-        <item name="android:textColor">@color/textColorPrimaryDark</item>
+        <item name="android:textColor">@color/textColorPrimary</item>
     </style>
 
     <style name="TextAppearance.Regular.Body1.Secondary">
@@ -73,7 +67,7 @@
     </style>
 
     <style name="TextAppearance.Regular.Caption.Light">
-        <item name="android:textColor">@color/textColorPrimaryDark</item>
+        <item name="android:textColor">@color/textColorPrimary</item>
     </style>
 
     <style name="TextAppearance.Regular.Caption.Hint">
@@ -93,7 +87,7 @@
     </style>
 
     <style name="TextAppearance.Regular.SubHeading.Light">
-        <item name="android:textColor">@color/textColorPrimaryDark</item>
+        <item name="android:textColor">@color/textColorPrimary</item>
     </style>
 
     <style name="TextAppearance.Regular.SubHeading.Light.Bold">
@@ -246,7 +240,7 @@
     <style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccentLight</item>
+        <item name="colorAccent">@color/colorAccent</item>
         <item name="colorButtonNormal">@color/colorPrimary</item>
         <item name="android:textSize">14sp</item>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6b27500ba7..6be9fc8799 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -11,43 +11,43 @@
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccentLight</item>
-        <item name="android:textColorPrimary">@color/textColorPrimaryLight</item>
-        <item name="android:textColorSecondary">@color/textColorSecondaryLight</item>
-        <item name="android:textColorHint">@color/textColorHintLight</item>
-        <item name="android:textColorPrimaryInverse">@color/textColorPrimaryDark</item>
-        <item name="android:textColorSecondaryInverse">@color/textColorSecondaryDark</item>
-        <item name="android:textColorHintInverse">@color/textColorHintDark</item>
-        <item name="android:colorBackground">@color/backgroundLight</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorPrimary">@color/textColorPrimary</item>
+        <item name="android:textColorSecondary">@color/textColorSecondary</item>
+        <item name="android:textColorHint">@color/textColorHint</item>
+        <item name="android:textColorPrimaryInverse">@color/textColorPrimaryInverse</item>
+        <item name="android:textColorSecondaryInverse">@color/textColorSecondaryInverse</item>
+        <item name="android:textColorHintInverse">@color/textColorHintInverse</item>
+        <item name="android:colorBackground">@color/background</item>
         <item name="android:listSelector">?colorAccent</item>
-        <item name="android:divider">@color/dividerLight</item>
+        <item name="android:divider">@color/divider</item>
         <item name="android:listDivider">@drawable/line_divider_light</item>
 
         <!-- Themes -->
         <item name="windowActionModeOverlay">true</item>
-        <item name="actionBarTheme">@style/Theme.ActionBar.Light</item>
+        <item name="actionBarTheme">@style/Theme.ActionBar.DayNight</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
-        <item name="alertDialogTheme">@style/Theme.AlertDialog.Light</item>
+        <item name="alertDialogTheme">@style/Theme.AlertDialog.DayNight</item>
 
 
         <!-- Custom Attributes-->
         <item name="navigation_view_theme">@style/Theme.Widget.NavigationView</item>
-        <item name="selectable_list_drawable">@drawable/list_item_selector_light</item>
+        <item name="selectable_list_drawable">@drawable/list_item_selector</item>
         <item name="selectable_library_drawable">@drawable/library_item_selector_light</item>
-        <item name="text_color_primary">@color/textColorPrimaryLight</item>
+        <item name="text_color_primary">@color/textColorPrimary</item>
         <item name="background_card">@color/cardBackground</item>
-        <item name="icon_color">@color/iconColorLight</item>
+        <item name="icon_color">@color/iconColor</item>
         <item name="snackbar_background">@color/snackbarBackground</item>
-        <item name="snackbar_text">@color/textColorPrimaryDark</item>
+        <item name="snackbar_text">@color/textColorPrimaryInverse</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">#B3000000</item>
 
         <!-- Material Dialog colors -->
-        <item name="md_color_title">@color/textColorPrimaryLight</item>
-        <item name="md_color_content">@color/textColorSecondaryLight</item>
+        <item name="md_color_title">@color/textColorPrimary</item>
+        <item name="md_color_content">@color/textColorSecondary</item>
         <item name="md_color_button_text">@color/colorAccent</item>
-        <item name="md_background_color">@color/dialogLight</item>
+        <item name="md_background_color">@color/dialog</item>
         <item name="md_corner_radius">16dp</item>
     </style>
 
@@ -59,8 +59,8 @@
     <!--==============-->
     <style name="Theme.Base.Reader" parent="Theme.Base">
         <item name="android:forceDarkAllowed">false</item>
-        <item name="colorPrimary">@color/colorDarkPrimary</item>
-        <item name="colorPrimaryDark">@color/colorDarkPrimary</item>
+        <item name="colorPrimary">@color/darkPrimaryColor</item>
+        <item name="colorPrimaryDark">@color/darkPrimaryColor</item>
         <item name="android:colorBackground">@android:color/white</item>
         <item name="android:statusBarColor">?colorPrimaryDark</item>
         <item name="android:navigationBarColor">?colorPrimaryDark</item>
@@ -68,73 +68,73 @@
 
     <style name="Theme.Base.Reader.Dark" parent="Theme.AppCompat.NoActionBar">
         <item name="android:forceDarkAllowed">false</item>
-        <item name="colorPrimary">@color/colorDarkPrimary</item>
-        <item name="colorPrimaryDark">@color/colorDarkPrimaryDark</item>
+        <item name="colorPrimary">@color/darkPrimaryColor</item>
+        <item name="colorPrimaryDark">@color/darkPrimaryColor</item>
         <item name="android:colorBackground">@android:color/black</item>
-        <item name="colorAccent">@color/colorAccentDark</item>
-        <item name="android:textColorPrimary">@color/textColorPrimaryDark</item>
-        <item name="android:textColorSecondary">@color/textColorSecondaryDark</item>
-        <item name="android:textColorHint">@color/textColorHintDark</item>
-        <item name="android:textColorPrimaryInverse">@color/textColorPrimaryLight</item>
-        <item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item>
-        <item name="android:textColorHintInverse">@color/textColorHintLight</item>
+        <item name="colorAccent">#3399FF</item>
+        <item name="android:textColorPrimary">@color/md_white_1000</item>
+        <item name="android:textColorSecondary">@color/md_white_1000_70</item>
+        <item name="android:textColorHint">@color/md_white_1000_50</item>
+        <item name="android:textColorPrimaryInverse">@color/md_black_1000_87</item>
+        <item name="android:textColorSecondaryInverse">@color/md_black_1000_54</item>
+        <item name="android:textColorHintInverse">@color/md_black_1000_38</item>
         <item name="android:listSelector">?colorAccent</item>
-        <item name="android:divider">@color/dividerDark</item>
+        <item name="android:divider">@android:color/transparent</item>
         <item name="android:listDivider">@drawable/line_divider_dark</item>
 
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">?colorPrimaryDark</item>
-        <item name="android:navigationBarColor">@color/colorDarkPrimaryDark</item>
+        <item name="android:navigationBarColor">@color/darkPrimaryColor</item>
 
         <!-- Themes -->
         <item name="windowActionModeOverlay">true</item>
         <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
-        <item name="md_background_color">@color/dialogDark</item>
-        <item name="alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
+        <item name="md_background_color">@android:color/transparent</item>
+        <item name="alertDialogTheme">@style/Theme.AlertDialog.DayNight</item>
 
 
         <!-- Custom Attributes-->
         <item name="navigation_view_theme">@style/Theme.Widget.NavigationView</item>
         <item name="selectable_list_drawable">@drawable/list_item_selector_dark</item>
         <item name="selectable_library_drawable">@drawable/library_item_selector_dark</item>
-        <item name="text_color_primary">@color/textColorPrimaryDark</item>
-        <item name="background_card">@color/dialogDark</item>
-        <item name="icon_color">@color/iconColorDark</item>
+        <item name="text_color_primary">@color/md_white_1000</item>
+        <item name="background_card">@android:color/transparent</item>
+        <item name="icon_color">@color/iconColor</item>
 
     </style>
 
     <style name="Theme.Base.Reader.Light" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:forceDarkAllowed">false</item>
-        <item name="colorPrimary">@color/colorDarkPrimary</item>
-        <item name="colorPrimaryDark">@color/colorDarkPrimaryDark</item>
+        <item name="colorPrimary">@color/darkPrimaryColor</item>
+        <item name="colorPrimaryDark">@color/darkPrimaryColor</item>
         <item name="android:colorBackground">@android:color/white</item>
-        <item name="colorAccent">@color/colorAccentLight</item>
-        <item name="android:textColorPrimary">@color/textColorPrimaryLight</item>
-        <item name="android:textColorSecondary">@color/textColorSecondaryLight</item>
-        <item name="android:textColorHint">@color/textColorHintLight</item>
-        <item name="android:textColorPrimaryInverse">@color/textColorPrimaryDark</item>
-        <item name="android:textColorSecondaryInverse">@color/textColorSecondaryDark</item>
-        <item name="android:textColorHintInverse">@color/textColorHintDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorPrimary">@color/md_black_1000_87</item>
+        <item name="android:textColorSecondary">@color/md_black_1000_54</item>
+        <item name="android:textColorHint">@color/md_white_1000</item>
+        <item name="android:textColorPrimaryInverse">@color/md_white_1000</item>
+        <item name="android:textColorSecondaryInverse">@color/md_white_1000_70</item>
+        <item name="android:textColorHintInverse">@color/md_white_1000_50</item>
         <item name="android:listSelector">?colorAccent</item>
-        <item name="android:divider">@color/dividerLight</item>
+        <item name="android:divider">@color/md_white_1000_50</item>
         <item name="android:listDivider">@drawable/line_divider_light</item>
 
         <!-- Themes -->
         <item name="windowActionModeOverlay">true</item>
-        <item name="actionBarTheme">@style/Theme.ActionBar.Light</item>
+        <item name="actionBarTheme">@style/Theme.ActionBar.DayNight</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-        <item name="alertDialogTheme">@style/Theme.AlertDialog.Light</item>
+        <item name="alertDialogTheme">@style/Theme.AlertDialog.DayNight</item>
 
 
         <!-- Custom Attributes-->
         <item name="navigation_view_theme">@style/Theme.Widget.NavigationView</item>
-        <item name="selectable_list_drawable">@drawable/list_item_selector_light</item>
+        <item name="selectable_list_drawable">@drawable/list_item_selector</item>
         <item name="selectable_library_drawable">@drawable/library_item_selector_light</item>
-        <item name="text_color_primary">@color/textColorPrimaryLight</item>
-        <item name="background_card">@color/dialogLight</item>
-        <item name="icon_color">@color/iconColorLight</item>
+        <item name="text_color_primary">@color/md_black_1000_87</item>
+        <item name="background_card">@color/md_white_1000_50</item>
+        <item name="icon_color">@color/md_black_1000_54</item>
 
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">?colorPrimaryDark</item>