diff --git a/OpenKeychain/src/main/res/xml/experimental_preferences.xml b/OpenKeychain/src/main/res/xml/experimental_preferences.xml
index 1c8fae46f..9312997b0 100644
--- a/OpenKeychain/src/main/res/xml/experimental_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/experimental_preferences.xml
@@ -2,8 +2,8 @@
     <Preference
         android:persistent="true"
         android:selectable="false"
-        android:title="@string/label_experimental_settings_desc_title"
-        android:summary="@string/label_experimental_settings_desc_summary" />
+        android:summary="@string/label_experimental_settings_desc_summary"
+        android:title="@string/label_experimental_settings_desc_title" />
 
     <SwitchPreference
         android:defaultValue="false"
@@ -27,6 +27,7 @@
         android:title="@string/label_experimental_settings_keybase_title" />
 
     <ListPreference
+        android:defaultValue="light"
         android:dialogTitle="@string/label_theme"
         android:entries="@array/theme_entries"
         android:entryValues="@array/theme_values"