diff --git a/app/src/main/res/layout/fragment_recovery_code_input.xml b/app/src/main/res/layout/fragment_recovery_code_input.xml
index 911415eb..03521fdf 100644
--- a/app/src/main/res/layout/fragment_recovery_code_input.xml
+++ b/app/src/main/res/layout/fragment_recovery_code_input.xml
@@ -60,6 +60,7 @@
 
         <Button
             android:id="@+id/doneButton"
+            style="@style/ActionPrimaryButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/fragment_recovery_code_output.xml b/app/src/main/res/layout/fragment_recovery_code_output.xml
index 5d0d918e..54560f51 100644
--- a/app/src/main/res/layout/fragment_recovery_code_output.xml
+++ b/app/src/main/res/layout/fragment_recovery_code_output.xml
@@ -71,6 +71,7 @@
 
     <Button
         android:id="@+id/confirmCodeButton"
+        style="@style/ActionPrimaryButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/fragment_restore_progress.xml b/app/src/main/res/layout/fragment_restore_progress.xml
index 4bd34495..c2bd8457 100644
--- a/app/src/main/res/layout/fragment_restore_progress.xml
+++ b/app/src/main/res/layout/fragment_restore_progress.xml
@@ -68,7 +68,7 @@
 
     <Button
         android:id="@+id/button"
-        style="@style/Widget.AppCompat.Button.Colored"
+        style="@style/ActionPrimaryButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/app/src/main/res/layout/fragment_restore_set.xml b/app/src/main/res/layout/fragment_restore_set.xml
index 2b81c026..9d3f85bd 100644
--- a/app/src/main/res/layout/fragment_restore_set.xml
+++ b/app/src/main/res/layout/fragment_restore_set.xml
@@ -57,7 +57,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
-        android:textColor="@android:color/holo_red_dark"
+        android:textColor="?android:colorError"
         android:textSize="18sp"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@+id/backView"
diff --git a/app/src/main/res/layout/fragment_storage_check.xml b/app/src/main/res/layout/fragment_storage_check.xml
index 0694ab16..4e772795 100644
--- a/app/src/main/res/layout/fragment_storage_check.xml
+++ b/app/src/main/res/layout/fragment_storage_check.xml
@@ -50,7 +50,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="32dp"
         android:layout_marginEnd="16dp"
-        android:textColor="@android:color/holo_red_dark"
+        android:textColor="?android:colorError"
         android:textSize="18sp"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -63,7 +63,7 @@
 
     <Button
         android:id="@+id/backButton"
-        style="@style/Widget.AppCompat.Button.Colored"
+        style="@style/ActionPrimaryButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
diff --git a/app/src/main/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml
new file mode 100644
index 00000000..3b094f6e
--- /dev/null
+++ b/app/src/main/res/values-night/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="isLight">false</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..7bb73bd0
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="accent">@*android:color/accent_device_default_dark</color>
+    <color name="primary">@*android:color/primary_device_default_settings</color>
+    <color name="primaryDark">@*android:color/primary_dark_device_default_settings</color>
+    <color name="background">@color/primaryDark</color>
+    <color name="actionBarPrimary">@color/background</color>
+    <color name="statusBarColor">@android:color/transparent</color>
+    <color name="red">@*android:color/error_color_device_default_dark</color>
+</resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
new file mode 100644
index 00000000..f4c5000d
--- /dev/null
+++ b/app/src/main/res/values/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="isLight">true</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5956cfd7..b2f95493 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="accent">#99cc00</color>
-    <color name="divider">#8A000000</color>
+    <color name="accent">@*android:color/accent_device_default_light</color>
+    <color name="primary">@*android:color/primary_device_default_settings_light</color>
+    <color name="primaryDark">@*android:color/primary_dark_device_default_settings_light</color>
+    <color name="background">@*android:color/background_device_default_light</color>
+    <color name="actionBarPrimary">@*android:color/primary_device_default_light</color>
+    <color name="statusBarColor">@*android:color/primary_dark_material_light_light_status_bar</color>
+    <color name="red">@*android:color/error_color_device_default_dark</color>
+    <color name="divider">#20ffffff</color>
     <color name="green">#558B2F</color>
-    <color name="red">#D32F2F</color>
     <color name="yellow">#F9A825</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c1b981cd..169dde24 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,21 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight">
+    <style name="AppTheme" parent="@style/Theme.AppCompat.DayNight">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primaryDark</item>
         <item name="colorAccent">@color/accent</item>
+        <item name="colorError">@color/red</item>
+        <item name="android:windowBackground">@color/background</item>
+        <item name="fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="android:windowLightStatusBar">@bool/isLight</item>
+        <item name="android:statusBarColor">@color/statusBarColor</item>
+        <item name="actionBarTheme">@style/Theme.ActionBar</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="Theme.ActionBar" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <item name="colorPrimary">@color/actionBarPrimary</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">
@@ -10,4 +23,7 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <!-- Copied from Settings -->
+    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored" />
+
 </resources>