diff --git a/app/src/main/res/layout/activity_main_onboarding.xml b/app/src/main/res/layout/activity_main_onboarding.xml
index 1c02cde..f5ad5bc 100644
--- a/app/src/main/res/layout/activity_main_onboarding.xml
+++ b/app/src/main/res/layout/activity_main_onboarding.xml
@@ -16,7 +16,9 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:textColor="@color/main_onboarding_text"
             android:text="@string/layout_onboarding_h1_welcome"
             android:id="@+id/h1_welcome" />
 
@@ -45,14 +47,16 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textColor="@color/main_onboarding_text"
                     android:text="@string/layout_onboarding_h2_app_name"
                     android:id="@+id/h2_app_name" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="@color/main_onboarding_text"
                     android:text="@string/layout_onboarding_p_app_claim"
                     android:id="@+id/p_app_claim" />
 
@@ -63,7 +67,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="@color/main_onboarding_text"
             android:text="@string/layout_onboarding_h2_request_permissions"
             android:id="@+id/h2_request_permissions"
             android:layout_marginTop="@dimen/activity_vertical_margin"/>
@@ -71,7 +76,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="@color/main_onboarding_text"
             android:textStyle="bold"
             android:text="@string/layout_onboarding_h3_permission_location"
             android:id="@+id/h3_permission_location"
@@ -79,14 +85,16 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="@color/main_onboarding_text"
             android:text="@string/layout_onboarding_p_permission_location"
             android:id="@+id/p_permission_location" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="@color/main_onboarding_text"
             android:textStyle="bold"
             android:text="@string/layout_onboarding_h3_permission_storage"
             android:id="@+id/h3_permission_storage"
@@ -94,7 +102,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="@color/main_onboarding_text"
             android:text="@string/layout_onboarding_p_permission_storage"
             android:id="@+id/p_permission_storage" />
 
diff --git a/app/src/main/res/layout/fragment_main_track_onboarding.xml b/app/src/main/res/layout/fragment_main_track_onboarding.xml
index 05a5c63..1453f13 100644
--- a/app/src/main/res/layout/fragment_main_track_onboarding.xml
+++ b/app/src/main/res/layout/fragment_main_track_onboarding.xml
@@ -10,8 +10,8 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/trackbook_grey"
-        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:textColor="@color/statistic_sheet_onboarding_text"
         android:layout_marginBottom="@dimen/activity_vertical_margin"
         android:text="@string/track_tab_onboarding_h1_part_1" />
 
@@ -25,8 +25,8 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/trackbook_grey"
-        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:textColor="@color/statistic_sheet_onboarding_text"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:text="@string/track_tab_onboarding_h1_part_2" />
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index e605cd5..076e163 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -4,6 +4,7 @@
     <!-- DAY THEME COLORS -->
     <color name="status_bar_background">@color/trackbook_black</color>
     <color name="bottom_navigation_background">@color/trackbook_black</color>
+    <color name="main_onboarding_text">@color/trackbook_white</color>
 
     <color name="fab_button_card_text">@color/trackbook_white</color>
     <color name="fab_button_card_background">@color/trackbook_grey_dark</color>
@@ -15,6 +16,7 @@
     <color name="track_management_icons">@color/trackbook_white</color>
     <color name="track_management_background">@color/trackbook_black</color>
 
+    <color name="statistic_sheet_onboarding_text">@color/trackbook_white</color>
     <color name="statistic_sheet_text">@color/trackbook_white</color>
     <color name="statistic_sheet_icons">@color/trackbook_white</color>
     <color name="statistic_sheet_background_expanded">@color/trackbook_black_85percent</color>
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 0000000..81d8d64
--- /dev/null
+++ b/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="TrackbookAppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+
+        <!-- Set AppCompat’s colors -->
+        <item name="colorPrimary">@color/trackbook_red</item>
+        <item name="colorPrimaryDark">@color/trackbook_black</item>
+        <item name="colorAccent">@color/trackbook_blue</item>
+
+    </style>
+
+    <!-- Drop down theme -->
+    <style name="TrackbookAppTheme.PopupOverlay" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:colorControlNormal">@color/track_management_text</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index aa74a60..534e303 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,6 +4,7 @@
     <!-- DAY THEME COLORS -->
     <color name="status_bar_background">@color/trackbook_white</color>
     <color name="bottom_navigation_background">@color/trackbook_red</color>
+    <color name="main_onboarding_text">@color/trackbook_grey</color>
 
     <color name="fab_button_card_text">@color/trackbook_grey_dark</color>
     <color name="fab_button_card_background">@color/trackbook_white</color>
@@ -15,6 +16,7 @@
     <color name="track_management_icons">@color/trackbook_grey_dark</color>
     <color name="track_management_background">@color/trackbook_white</color>
 
+    <color name="statistic_sheet_onboarding_text">@color/trackbook_grey</color>
     <color name="statistic_sheet_text">@color/trackbook_grey_dark</color>
     <color name="statistic_sheet_icons">@color/trackbook_grey_dark</color>
     <color name="statistic_sheet_background_expanded">@color/trackbook_white_85percent</color>