diff --git a/core/src/main/res/drawable/ic_baseline_error_24.xml b/core/src/main/res/drawable/ic_baseline_error_24.xml
index 391e8b4c5..2b55d10e9 100644
--- a/core/src/main/res/drawable/ic_baseline_error_24.xml
+++ b/core/src/main/res/drawable/ic_baseline_error_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#000000"
+<vector android:height="24dp" android:tint="@color/testpress_black"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <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,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
diff --git a/core/src/main/res/layout/account_activity_list_inner_content.xml b/core/src/main/res/layout/account_activity_list_inner_content.xml
index 1c43f0a7c..7a40c2340 100644
--- a/core/src/main/res/layout/account_activity_list_inner_content.xml
+++ b/core/src/main/res/layout/account_activity_list_inner_content.xml
@@ -6,7 +6,7 @@
     android:orientation="horizontal"
     android:paddingBottom="6dp"
     android:paddingLeft="20dp"
-    android:background="#ffffff"
+    android:background="@color/testpress_white"
     android:paddingRight="5dp">
 
     <ImageView
@@ -23,7 +23,7 @@
             android:id="@+id/ipAddress"
             android:text="@string/ip_address"
             android:textSize="15sp"
-            android:textColor="#333"
+            android:textColor="@color/testpress_black"
             android:textStyle="bold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
@@ -31,7 +31,7 @@
         <TextView
             android:id="@+id/lastUsed"
             android:textSize="13sp"
-            android:textColor="#333"
+            android:textColor="@color/testpress_black"
             android:text="@string/last_used"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
@@ -40,7 +40,7 @@
             android:id="@+id/deviceName"
             android:text="@string/ip_address"
             android:textSize="13sp"
-            android:textColor="#333"
+            android:textColor="@color/testpress_black"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
     </LinearLayout>
diff --git a/core/src/main/res/layout/testpress_explore_spinner_item.xml b/core/src/main/res/layout/testpress_explore_spinner_item.xml
index 6a1cf1015..5e37093de 100644
--- a/core/src/main/res/layout/testpress_explore_spinner_item.xml
+++ b/core/src/main/res/layout/testpress_explore_spinner_item.xml
@@ -11,7 +11,7 @@
         android:paddingBottom="5dp"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:textColor="#ffffff"
+        android:textColor="@color/testpress_white"
         android:maxLines="1"
         android:ellipsize="end"
         android:gravity="center_vertical"
diff --git a/core/src/main/res/layout/testpress_grid_fragment.xml b/core/src/main/res/layout/testpress_grid_fragment.xml
index 9c3e0ba2a..2fab15b7a 100644
--- a/core/src/main/res/layout/testpress_grid_fragment.xml
+++ b/core/src/main/res/layout/testpress_grid_fragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@android:color/white"
+    android:background="@color/testpress_white"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
diff --git a/core/src/main/res/layout/testpress_image_view_layout.xml b/core/src/main/res/layout/testpress_image_view_layout.xml
index 7581ee72a..e9b1b5506 100644
--- a/core/src/main/res/layout/testpress_image_view_layout.xml
+++ b/core/src/main/res/layout/testpress_image_view_layout.xml
@@ -8,7 +8,7 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:gravity="center"
-        android:background="#ffffff"
+        android:background="@color/testpress_white"
         android:scaleType="matrix"/>
 
 </RelativeLayout>
diff --git a/core/src/main/res/layout/testpress_list_placholder.xml b/core/src/main/res/layout/testpress_list_placholder.xml
index 860c9f776..dba6c8e50 100644
--- a/core/src/main/res/layout/testpress_list_placholder.xml
+++ b/core/src/main/res/layout/testpress_list_placholder.xml
@@ -3,7 +3,7 @@
     android:orientation="horizontal"
     android:paddingVertical="10dp"
     android:paddingHorizontal="20dp"
-    android:background="@android:color/white"
+    android:background="@color/testpress_white"
     android:id="@+id/chapter_item_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..854b11785
--- /dev/null
+++ b/core/src/main/res/values-night/colors.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedResources">
+
+    <!-- Dark mode color overrides -->
+    <color name="testpress_white">#1F1F1F</color>
+    <color name="testpress_black">#E0E0E0</color>
+
+    <color name="testpress_table_text">#B8B8B8</color>
+    <color name="testpress_text_gray_dark">#999999</color>
+    <color name="testpress_text_gray">#888888</color>
+    <color name="testpress_text_gray_medium">#666666</color>
+
+    <color name="testpress_pager_background">#0B0B0B</color>
+    <color name="testpress_pager_background_alternate">#181818</color>
+
+    <color name="testpress_tab_text_color">#777777</color>
+    <color name="testpress_tab_background_color">#1F1F1F</color>
+
+    <color name="testpress_dropdown_list_divider_color">#5C5C5C</color>
+    <color name="testpress_body_text">#9FFFFFFF</color>
+
+    <color name="testpress_gray_light">#191919</color>
+    <color name="testpress_dotted_line">#222222</color>
+    <color name="testpress_text_gray_light">#404040</color>
+
+    <color name="testpress_difficulty_percentage_gray">#999999</color>
+
+</resources>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
new file mode 100644
index 000000000..d8dd79bf4
--- /dev/null
+++ b/core/src/main/res/values-night/styles.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedResources">
+
+    <!-- Dark mode style overrides -->
+    <style name="TestpressTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" >
+        <item name="android:background">@color/testpress_white</item>
+    </style>
+
+    <style name="TestpressAppCompatAlertDialogStyle" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="colorAccent">@color/testpress_dialog_accent</item>
+        <item name="android:textColorPrimary">@color/testpress_black</item>
+        <item name="android:background">@color/testpress_white</item>
+    </style>
+
+</resources>
diff --git a/core/src/main/res/values/color.xml b/core/src/main/res/values/color.xml
index 4af1a654b..991fbe527 100644
--- a/core/src/main/res/values/color.xml
+++ b/core/src/main/res/values/color.xml
@@ -53,4 +53,5 @@
     <color name="testpress_blue_text">#3b99d8</color>
     <color name="testpress_blue_image">#3598db</color>
     <color name="ai_fab_background">#089669</color>
+    <color name="testpress_dialog_accent">#08AE9E</color>
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index d88a965f1..b54de63a7 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -3,7 +3,7 @@
     tools:ignore="UnusedResources">
 
     <!-- Base application theme. -->
-    <style name="TestpressTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
+    <style name="TestpressTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar.Bridge">
         <item name="colorPrimary">@color/testpress_actionbar_background</item>
         <item name="colorAccent">@color/testpress_color_primary</item>
         <item name="windowActionBar">false</item>
@@ -33,9 +33,9 @@
     </style>
 
     <style name="TestpressAppCompatAlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">#08AE9E</item>
-        <item name="android:textColorPrimary">#333333</item>
-        <item name="android:background">#FFFFFF</item>
+        <item name="colorAccent">@color/testpress_dialog_accent</item>
+        <item name="android:textColorPrimary">@color/testpress_black</item>
+        <item name="android:background">@color/testpress_white</item>
     </style>
 
     <style name="Widget.Testpress.HeaderBar.Spinner.Base" parent="Widget.AppCompat.Light.Spinner.DropDown.ActionBar">
@@ -79,7 +79,7 @@
         <item name="android:textColor">@color/testpress_button_text_color</item>
     </style>
 
-    <style name="TestpressTextInputLayoutTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="TestpressTextInputLayoutTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:textSize">14sp</item>
         <!--Bar Color in False State-->
         <item name="colorControlNormal">#c5c5c5</item>