diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
index ec06255..173473b 100644
--- a/res/xml/bars_settings.xml
+++ b/res/xml/bars_settings.xml
@@ -29,25 +29,25 @@
             android:key="status_bar_brightness_control"
             android:title="@string/status_bar_toggle_brightness"
             android:summary="@string/status_bar_toggle_brightness_summary"
-            android:defaultValue="false" />
+            android:persistent="false"/>
 
     <CheckBoxPreference
             android:key="status_bar_notif_count"
             android:title="@string/status_bar_notif_count_title"
             android:summary="@string/status_bar_notif_count_summary"
-            android:defaultValue="false" />
+            android:persistent="false"/>
 
     <CheckBoxPreference
             android:key="status_bar_traffic"
             android:title="@string/show_network_speed"
             android:summary="@string/show_network_speed_summary"
-            android:defaultValue="false" />
+            android:persistent="false" />
 
     <CheckBoxPreference
             android:key="status_bar_network_activity"
             android:title="@string/show_activity_indicators_on_status_bar_title"
             android:summary="@string/show_activity_indicators_on_status_bar_summary"
-            android:defaultValue="false" />
+            android:persistent="false"/>
 
     <!-- Navigation bar -->
     <PreferenceCategory
diff --git a/res/xml/battery_light_settings.xml b/res/xml/battery_light_settings.xml
index b3d73c6..d3a59fb 100644
--- a/res/xml/battery_light_settings.xml
+++ b/res/xml/battery_light_settings.xml
@@ -20,7 +20,7 @@
     <SwitchPreference
         android:key="battery_light_enabled"
         android:title="@string/battery_light_enable"
-        android:defaultValue="true" />
+        android:persistent="false"/>
 
     <PreferenceCategory
         android:key="general_section"
@@ -29,8 +29,8 @@
         <CheckBoxPreference
             android:key="battery_light_pulse"
             android:title="@string/battery_low_pulse_title"
-            android:defaultValue="true"
-            android:dependency="battery_light_enabled" />
+            android:dependency="battery_light_enabled"
+            android:persistent="false" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/brightness_settings.xml b/res/xml/brightness_settings.xml
index acb4625..a71d04c 100644
--- a/res/xml/brightness_settings.xml
+++ b/res/xml/brightness_settings.xml
@@ -49,11 +49,13 @@
                 <CheckBoxPreference
                         android:key="button_no_brightness"
                         android:title="@string/button_no_brightness"
-                        android:summary="@string/button_no_brightness_summary"/>
+                        android:summary="@string/button_no_brightness_summary"
+                        android:persistent="false"/>
                 <CheckBoxPreference
                         android:key="button_link_brightness"
                         android:title="@string/button_link_brightness"
-                        android:summary="@string/button_link_brightness_summary"/>
+                        android:summary="@string/button_link_brightness_summary"
+                        android:persistent="false"/>
                 <Preference
                         android:key="button_timeout"
                         android:title="@string/button_timeout_title" />
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index cdbe159..2260816 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -39,7 +39,7 @@
             android:key="button_volume_wake_screen"
             android:title="@string/button_volume_wake_title"
             android:summary="@string/button_volume_wake_summary"
-            android:defaultValue="false" />
+            android:persistent="false"/>
 
         <ListPreference
             android:key="button_volume_default_screen"
@@ -47,7 +47,7 @@
             android:summary="@string/button_volume_default_summary"
             android:entries="@array/button_volume_default_entries"
             android:entryValues="@array/button_volume_default_values"
-            android:defaultValue="0" />
+            android:persistent="false"/>
 
     </PreferenceCategory>
 
@@ -58,7 +58,6 @@
         <SwitchPreference
             android:key="keys_enable_custom"
             android:title="@string/keys_enable_custom_title"
-            android:defaultValue="false"
             android:persistent="false" />
     </PreferenceCategory>
    
diff --git a/res/xml/menus_settings.xml b/res/xml/menus_settings.xml
index 6a5ca69..4858f90 100644
--- a/res/xml/menus_settings.xml
+++ b/res/xml/menus_settings.xml
@@ -29,13 +29,13 @@
             android:key="power_menu_screenshot"
             android:title="@string/power_menu_toggle_screenshot_title"
             android:summary="@string/power_menu_toggle_screenshot_summary"
-            android:defaultValue="false" />
+            android:persistent="false"/>
 
     <CheckBoxPreference
             android:key="power_menu_screenrecord"
             android:title="@string/power_menu_toggle_screenrecord_title"
             android:summary="@string/power_menu_toggle_screenrecord_summary"
-            android:defaultValue="false" />
+            android:persistent="false"/>
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/more_interface_settings.xml b/res/xml/more_interface_settings.xml
index f035aca..d17361b 100644
--- a/res/xml/more_interface_settings.xml
+++ b/res/xml/more_interface_settings.xml
@@ -29,7 +29,7 @@
             android:key="recent_menu_clear_all"
             android:title="@string/show_recent_clear_all_button_title"
             android:summary="@string/show_recent_clear_all_button_summary"
-            android:defaultValue="true" />
+            android:persistent="false" />
 
     <ListPreference
             android:key="recent_menu_clear_all_location"
@@ -38,13 +38,14 @@
             android:entries="@array/recent_clear_all_button_location_entries"
             android:entryValues="@array/recent_clear_all_button_location_values"
             android:defaultValue="2"
-            android:dependency="recent_menu_clear_all" />
+            android:dependency="recent_menu_clear_all" 
+            android:persistent="false"/>
 
     <CheckBoxPreference
             android:key="show_recents_memory_indicator"
             android:title="@string/show_recents_memory_indicator_title"
             android:summary="@string/show_recents_memory_indicator_summary"
-            android:defaultValue="false" />
+            android:persistent="false" />
 
     <ListPreference
             android:key="recents_memory_indicator_location"
@@ -52,7 +53,8 @@
             android:summary="@string/recents_memory_indicator_location_summary"
             android:entries="@array/recent_clear_all_button_location_entries"
             android:entryValues="@array/recent_clear_all_button_location_values"
-            android:defaultValue="1"
-            android:dependency="show_recents_memory_indicator" />
+            android:defaultValue="2"
+            android:dependency="show_recents_memory_indicator" 
+            android:persistent="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/notification_light_settings.xml b/res/xml/notification_light_settings.xml
index 1c7f73e..65df028 100644
--- a/res/xml/notification_light_settings.xml
+++ b/res/xml/notification_light_settings.xml
@@ -19,7 +19,8 @@
 
     <SwitchPreference
         android:key="notification_light_pulse"
-        android:title="@string/notification_light_enable" />
+        android:title="@string/notification_light_enable" 
+        android:persistent="false"/>
 
     <PreferenceCategory
         android:key="general_section"
@@ -53,7 +54,8 @@
     <SwitchPreference
         android:key="notification_light_pulse_custom_enable"
         android:title="@string/notification_light_use_custom"
-        android:dependency="notification_light_pulse" />
+        android:dependency="notification_light_pulse" 
+        android:persistent="false"/>
 
     <PreferenceCategory
         android:key="applications_list"
diff --git a/res/xml/notification_panel_settings.xml b/res/xml/notification_panel_settings.xml
index 007a908..f831e6d 100644
--- a/res/xml/notification_panel_settings.xml
+++ b/res/xml/notification_panel_settings.xml
@@ -24,6 +24,6 @@
             android:key="custom_status_bar_header"
             android:title="@string/custom_statusbar_header_title"
             android:summary="@string/custom_statusbar_header_summary"
-            android:defaultValue="false" />
+            android:persistent="false"/>
 
 </PreferenceScreen>