diff --git a/CHANGELOG.md b/CHANGELOG.md
index aed03720..c80cc673 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@
 
 ### Notes
 - This contains breaking changes, any backups made prior to this release can no longer be restored.
-- Application can no longer be built in the Android source tree. It must be built using Gradle and binaries can now be found here: https://github.com/stevesoltys/seedvault-prebuilt
+- Application can no longer be built in the Android source tree. It must be built using Gradle and binaries can now be found here: https://github.com/seedvault-app/seedvault-prebuilt
 
 ## [0.3.0] - 2019-03-14
 ### Fixed
@@ -38,7 +38,7 @@
 
 ## [0.1.2] - 2019-02-11
 ### Fixed
-- Downgrade SDK target version to 26 due to [#15](https://github.com/stevesoltys/seedvault/issues/15).
+- Downgrade SDK target version to 26 due to [#15](https://github.com/seedvault-app/seedvault/issues/15).
 
 ## [0.1.1] - 2019-02-11
 ### Added
@@ -47,4 +47,4 @@
 - Upgrade target SDK version to 28.
 
 ### Fixed
-- Ignore `com.android.providers.downloads.ui` to resolve [#14](https://github.com/stevesoltys/seedvault/issues/14).
+- Ignore `com.android.providers.downloads.ui` to resolve [#14](https://github.com/seedvault-app/seedvault/issues/14).
diff --git a/README.md b/README.md
index d5295d0e..49410804 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,10 @@ A backup application for the [Android Open Source Project](https://source.androi
 
 - Android 11
 
-For older versions of Android, check out [the branches](https://github.com/stevesoltys/seedvault/branches).
+For older versions of Android, check out [the branches](https://github.com/seedvault-app/seedvault/branches).
 
 ## Getting Started
-- Check out [the wiki](https://github.com/stevesoltys/seedvault/wiki) for information on building the application with 
+- Check out [the wiki](https://github.com/seedvault-app/seedvault/wiki) for information on building the application with 
 AOSP.
 
 ## What makes this different?
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 02e69e15..2fc78cf4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.stevesoltys.seedvault"
-    android:versionCode="30000011"
-    android:versionName="11-1.1">
+    android:versionCode="30000021"
+    android:versionName="11-1.2">
     <!--
     The version code is the targeted SDK_VERSION plus 6 digits for our own version code.
     The version name is the targeted Android version followed by - and our own version name.
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt
index 0d30472c..fd4bd5e4 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt
@@ -236,7 +236,7 @@ internal class BackupCoordinator(
         // K/V backups (typically starting with package manager metadata - @pm@)
         // are scheduled with JobInfo.Builder#setOverrideDeadline() and thus do not respect backoff.
         // We need to reject them manually when we can not do a backup now.
-        // What else we tried can be found in: https://github.com/stevesoltys/seedvault/issues/102
+        // What else we tried can be found in: https://github.com/seedvault-app/seedvault/issues/102
         if (packageName == MAGIC_PACKAGE_MANAGER) {
             if (!settingsManager.canDoBackupNow()) {
                 // Returning anything else here (except non-incremental-required which re-tries)
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 8a84d5bd..54560f51 100644
--- a/app/src/main/res/layout/fragment_recovery_code_output.xml
+++ b/app/src/main/res/layout/fragment_recovery_code_output.xml
@@ -57,19 +57,21 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/wordList"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:layout_height="0dp"
+        android:scrollbars="vertical"
         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:layout_constraintBottom_toTopOf="@+id/confirmCodeButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/divider"
+        app:layout_constraintVertical_chainStyle="spread_inside"
         app:spanCount="2"
         tools:itemCount="12"
         tools:listitem="@layout/list_item_recovery_code_output" />
 
     <Button
         android:id="@+id/confirmCodeButton"
+        style="@style/ActionPrimaryButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -78,6 +80,7 @@
         android:text="@string/recovery_code_confirm_button"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/wordList" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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/layout/list_item_recovery_code_output.xml b/app/src/main/res/layout/list_item_recovery_code_output.xml
index fade3223..780f3df7 100644
--- a/app/src/main/res/layout/list_item_recovery_code_output.xml
+++ b/app/src/main/res/layout/list_item_recovery_code_output.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="24dp"
+    android:layout_marginTop="24dp"
+    android:layout_marginBottom="24dp"
     tools:showIn="@layout/fragment_recovery_code_output">
 
     <TextView
@@ -25,12 +26,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:autoSizeTextType="uniform"
         android:textSize="24sp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/num"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Test1" />
+        tools:text="Test1CanBeLong" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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/strings.xml b/app/src/main/res/values/strings.xml
index b7ea9c36..13e0440a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@
     <string name="settings_backup_status_summary">Last backup: %1$s</string>
     <string name="settings_backup_exclude_apps">Exclude apps</string>
     <string name="settings_backup_now">Backup now</string>
-    <string name="settings_backup_recovery_code">Recovery Code</string>
+    <string name="settings_backup_recovery_code">Recovery code</string>
     <string name="settings_backup_recovery_code_summary">Verify existing code or generate a new one</string>
 
     <!-- Storage -->
@@ -39,8 +39,8 @@
     <string name="storage_fake_drive_summary">Needs to be plugged in</string>
     <string name="storage_available_bytes"><xliff:g example="1 GB" id="size">%1$s</xliff:g> free</string>
     <string name="storage_fake_nextcloud_title" translatable="false">Nextcloud</string>
-    <string name="storage_fake_nextcloud_summary">Click to install</string>
-    <string name="storage_fake_nextcloud_summary_installed">Click to set up account</string>
+    <string name="storage_fake_nextcloud_summary">Tap to install</string>
+    <string name="storage_fake_nextcloud_summary_installed">Tap to set up account</string>
     <string name="storage_fake_nextcloud_summary_unavailable">Account not available. Set one up (or disable passcode).</string>
     <string name="storage_check_fragment_backup_title">Initializing backup location…</string>
     <string name="storage_check_fragment_restore_title">Looking for backups…</string>
@@ -154,6 +154,6 @@
     <string name="about_author">Written by: <a href="https://github.com/stevesoltys">Steve Soltys</a> and <a href="https://blog.grobox.de">Torsten Grote</a></string>
     <string name="about_design">Design by: <a href="https://www.glennsorrentino.com/">Glenn Sorrentino</a></string>
     <string name="about_sponsor">Sponsored by: <a href="https://www.calyxinstitute.org">Calyx Institute</a> for use in <a href="https://calyxos.org">CalyxOS</a></string>
-    <string name="about_source_code">Source Code: https://github.com/stevesoltys/seedvault</string>
+    <string name="about_source_code">Source code: https://github.com/seedvault-app/seedvault</string>
 
 </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>
diff --git a/contactsbackup/src/main/AndroidManifest.xml b/contactsbackup/src/main/AndroidManifest.xml
index ba7bbb32..59480435 100644
--- a/contactsbackup/src/main/AndroidManifest.xml
+++ b/contactsbackup/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.calyxos.backup.contacts"
-    android:versionCode="30000011"
-    android:versionName="11-1.1">
+    android:versionCode="30000021"
+    android:versionName="11-1.2">
     <!--
     The version code is the targeted SDK_VERSION plus 6 digits for our own version code.
     The version name is the targeted Android version followed by - and our own version name.
diff --git a/contactsbackup/src/main/java/org/calyxos/backup/contacts/VCardExporter.java b/contactsbackup/src/main/java/org/calyxos/backup/contacts/VCardExporter.java
index c83de68e..cb7a5523 100644
--- a/contactsbackup/src/main/java/org/calyxos/backup/contacts/VCardExporter.java
+++ b/contactsbackup/src/main/java/org/calyxos/backup/contacts/VCardExporter.java
@@ -45,7 +45,7 @@ class VCardExporter {
     private Collection<String> getLookupKeys() {
         String[] projection = new String[]{LOOKUP_KEY};
         // We can not add IS_PRIMARY here as this gets lost on restored contacts
-        String selection = ACCOUNT_TYPE + " is null";
+        String selection = ACCOUNT_TYPE + " is null OR " + ACCOUNT_TYPE + "='com.android.contacts'";
         Cursor cursor = contentResolver.query(CONTENT_URI, projection, selection, null, null);
         if (cursor == null) {
             Log.e(TAG, "Cursor for LOOKUP_KEY is null");