diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index c62175a17..a6044a72b 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -86,8 +86,6 @@
     <bool name="maskpass_default" translatable="false">true</bool>
     <string name="allow_copy_password_key" translatable="false">allow_copy_password_key</string>
     <bool name="allow_copy_password_default" translatable="false">false</bool>
-    <string name="clear_clipboard_notification_key" translatable="false">clear_clipboard_notification_key</string>
-    <bool name="clear_clipboard_notification_default" translatable="false">false</bool>
     <string name="recentfile_key" translatable="false">recentfile</string>
     <bool name="recentfile_default" translatable="false">true</bool>
     <string name="keyfile_key" translatable="false">keyfile</string>
@@ -108,6 +106,8 @@
     <string name="magic_keyboard_preference_key" translatable="false">magic_keyboard_preference_key</string>
     <string name="clipboard_notifications_key" translatable="false">clipboard_notifications_key</string>
     <bool name="clipboard_notifications_default" translatable="false">false</bool>
+    <string name="clear_clipboard_notification_key" translatable="false">clear_clipboard_notification_key</string>
+    <bool name="clear_clipboard_notification_default" translatable="false">true</bool>
     <string name="clipboard_timeout_key" translatable="false">clip_timeout_key</string>
     <string name="clipboard_timeout_default" translatable="false">60000</string>
     <string name="settings_autofill_enable_key" translatable="false">settings_autofill_enable_key</string>
@@ -117,9 +117,9 @@
     <string name="keyboard_notification_entry_key" translatable="false">keyboard_notification_entry_key</string>
     <bool name="keyboard_notification_entry_default" translatable="false">true</bool>
     <string name="keyboard_notification_entry_clear_close_key" translatable="false">keyboard_notification_entry_clear_close_key</string>
-    <bool name="keyboard_notification_entry_clear_close_default" translatable="false">false</bool>
+    <bool name="keyboard_notification_entry_clear_close_default" translatable="false">true</bool>
     <string name="keyboard_entry_timeout_key" translatable="false">keyboard_entry_timeout_key</string>
-    <string name="keyboard_theme_key" translatable="false">keyboard_theme_key</string>
+    <string name="keyboard_entry_timeout_default" translatable="false">60000</string>
     <string name="keyboard_key_vibrate_key" translatable="false">keyboard_key_vibrate_key</string>
     <bool name="keyboard_key_vibrate_default" translatable="false">true</bool>
     <string name="keyboard_key_sound_key" translatable="false">keyboard_key_sound_key</string>
diff --git a/app/src/main/res/xml/keyboard_preferences.xml b/app/src/main/res/xml/keyboard_preferences.xml
index 839d3a760..1485d6e1e 100644
--- a/app/src/main/res/xml/keyboard_preferences.xml
+++ b/app/src/main/res/xml/keyboard_preferences.xml
@@ -43,7 +43,7 @@
             android:entries="@array/timeout_options"
             android:entryValues="@array/timeout_values"
             android:dialogTitle="@string/keyboard_entry_timeout_title"
-            android:defaultValue="@string/timeout_default"
+            android:defaultValue="@string/keyboard_entry_timeout_default"
             android:dependency="@string/keyboard_notification_entry_clear_close_key"/>
     </PreferenceCategory>
     <PreferenceCategory