diff --git a/app/src/main/res/layout/header_language.xml b/app/src/main/res/layout/header_language.xml
index 9914b8af6..3706abb5a 100644
--- a/app/src/main/res/layout/header_language.xml
+++ b/app/src/main/res/layout/header_language.xml
@@ -11,7 +11,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_margin="@dimen/activity_horizontal_margin"
-      android:textColor="@color/primary_text"
+      android:textColor="@color/textDarkPrimary"
       android:textSize="16sp"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_book.xml b/app/src/main/res/layout/item_book.xml
index 21e872680..3552460d6 100644
--- a/app/src/main/res/layout/item_book.xml
+++ b/app/src/main/res/layout/item_book.xml
@@ -29,7 +29,7 @@
       android:layout_height="wrap_content"
       android:layout_marginEnd="@dimen/activity_horizontal_margin"
       android:layout_marginStart="@dimen/activity_horizontal_margin"
-      android:textColor="@color/primary_text"
+      android:textColor="@color/textDarkPrimary"
       android:textSize="16sp"
       app:layout_constraintStart_toEndOf="@id/item_book_icon"
       app:layout_constraintTop_toTopOf="parent"
@@ -40,7 +40,7 @@
       android:id="@+id/item_book_date"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textColor="@color/secondary_text"
+      android:textColor="@color/textDarkSecondary"
       app:layout_constraintStart_toStartOf="@id/item_book_title"
       app:layout_constraintTop_toBottomOf="@id/item_book_title"
       tools:text="1 Jan 2018"
@@ -52,7 +52,7 @@
       android:layout_height="wrap_content"
       android:layout_marginEnd="@dimen/activity_horizontal_margin"
       android:layout_marginStart="@dimen/activity_horizontal_margin"
-      android:textColor="@color/secondary_text"
+      android:textColor="@color/textDarkSecondary"
       app:layout_constraintStart_toEndOf="@id/item_book_date"
       app:layout_constraintTop_toTopOf="@id/item_book_date"
       tools:text="20 GB"
@@ -64,7 +64,7 @@
       android:layout_height="wrap_content"
       android:layout_marginEnd="@dimen/activity_horizontal_margin"
       android:layout_marginStart="@dimen/activity_horizontal_margin"
-      android:textColor="@color/secondary_text"
+      android:textColor="@color/textDarkSecondary"
       app:layout_constraintStart_toEndOf="@id/item_book_size"
       app:layout_constraintTop_toTopOf="@id/item_book_size"
       tools:text="10.1 K articles"
@@ -74,9 +74,9 @@
       android:id="@+id/item_book_description"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
+      android:textColor="@color/textDarkSecondary"
       android:layout_marginEnd="8dp"
       android:layout_marginRight="8dp"
-      android:textColor="@color/secondary_text"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="@id/item_book_title"
       app:layout_constraintTop_toBottomOf="@id/item_book_date"
diff --git a/app/src/main/res/layout/item_intro_1.xml b/app/src/main/res/layout/item_intro_1.xml
index 500d26c56..2b5866957 100644
--- a/app/src/main/res/layout/item_intro_1.xml
+++ b/app/src/main/res/layout/item_intro_1.xml
@@ -47,7 +47,7 @@
       android:layout_height="wrap_content"
       android:text="@string/human_kind_knowledge"
       android:textAlignment="center"
-      android:textColor="@color/secondary_text"
+      android:textColor="@color/textDarkSecondary"
       android:textSize="15sp"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_intro_2.xml b/app/src/main/res/layout/item_intro_2.xml
index 3b752457e..e11218abd 100644
--- a/app/src/main/res/layout/item_intro_2.xml
+++ b/app/src/main/res/layout/item_intro_2.xml
@@ -49,7 +49,7 @@
       android:layout_height="wrap_content"
       android:text="@string/download_books_message"
       android:textAlignment="center"
-      android:textColor="@color/secondary_text"
+      android:textColor="@color/textDarkSecondary"
       android:textSize="15sp"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 890f952f4..be87d0648 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,8 +6,6 @@
   <color name="primary_dark_night">#ff212121</color>
   <color name="primary_light">#ffffff</color>
   <color name="accent">#2196F3</color>
-  <color name="primary_text">#212121</color>
-  <color name="secondary_text">#727272</color>
   <color name="icons">#212121</color>
   <color name="white">#fafafa</color>
   <color name="gray_list_bg">#0d000000</color>
@@ -27,4 +25,14 @@
   <color name="blueTransparent">#962e7ac4</color>
   <color name="actionModeBackground">#4285F4</color>
   <color name="titleBar">#000000</color>
+  <!-- Dark Text Color for Light Background -->
+  <color name="textDarkPrimary">#000000</color> <!-- 0% opacity-->
+  <color name="textDarkSecondary">#DE000000</color> <!--DE for 87% opacity-->
+  <color name="textDarkTertiary">#8A000000</color> <!--8A for 54% opacity-->
+
+  <!-- White Text Color for Dark Background -->
+  <color name="textLightPrimary">#FFFFFF</color> <!--100% opacity-->
+  <color name="textLightSecondary">#B2FFFFFF</color> <!--B2 for 70% opacity-->
+  <color name="textLightTertiary">#80FFFFFF</color> <!--80 for 50% opacity-->
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dafc29ae5..3b435f128 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -25,9 +25,9 @@
     <item name="dividerColor">@color/divider_light</item>
     <item name="selectedBackground">@drawable/list_bg_light</item>
     <item name="android:itemBackground">@color/primary_light</item>
-    <item name="android:textColorPrimary">@color/primary</item>
-    <item name="android:textColorSecondary">@color/primary</item>
-    <item name="android:textColorTertiary">@color/primary</item>
+    <item name="android:textColorPrimary">@color/textDarkPrimary</item>
+    <item name="android:textColorSecondary">@color/textDarkSecondary</item>
+    <item name="android:textColorTertiary">@color/textDarkTertiary</item>
     <item name="colorControlNormal">@color/accent</item>
   </style>
 
@@ -47,6 +47,12 @@
     <item name="listBackground">@drawable/list_bg</item>
     <item name="selectedBackground">@drawable/list_bg_light</item>
     <item name="android:itemBackground">@color/primary_light</item>
+    <item name="drawerBackground">@color/drawer_background_day</item>
+    <item name="dividerColor">@color/divider_light</item>
+    <item name="android:textColorPrimary">@color/textDarkPrimary</item>
+    <item name="android:textColorSecondary">@color/textDarkSecondary</item>
+    <item name="android:textColorTertiary">@color/textDarkTertiary</item>
+    <item name="colorControlNormal">@color/accent</item>
   </style>
 
   <style name="AppTheme.Night" parent="AppTheme.Base">
@@ -59,9 +65,9 @@
     <item name="android:itemBackground">@color/grey</item>
     <item name="android:itemTextAppearance">@color/grey</item>
     <item name="android:textColor">@color/primary_light</item>
-    <item name="android:textColorPrimary">@color/primary_light</item>
-    <item name="android:textColorSecondary">@color/primary_light</item>
-    <item name="android:textColorTertiary">@color/primary_light</item>
+    <item name="android:textColorPrimary">@color/textLightPrimary</item>
+    <item name="android:textColorSecondary">@color/textLightSecondary</item>
+    <item name="android:textColorTertiary">@color/textLightTertiary</item>
     <item name="android:alertDialogTheme">@style/AppTheme.Dialog.Night</item>
     <item name="colorControlNormal">@color/accent</item>
   </style>
@@ -86,8 +92,8 @@
   </style>
 
   <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat">
-    <item name="android:textColorPrimary">@color/primary_text</item>
-    <item name="actionMenuTextColor">@color/primary_text</item>
+    <item name="android:textColorPrimary">@color/textDarkPrimary</item>
+    <item name="actionMenuTextColor">@color/textDarkPrimary</item>
   </style>
 
   <style name="AppTheme.Dialog" parent="Theme.AppCompat.Light.Dialog.Alert">