diff --git a/api/src/com/todoroo/andlib/utility/Preferences.java b/api/src/com/todoroo/andlib/utility/Preferences.java
index 9e2bcef43..95ab91812 100644
--- a/api/src/com/todoroo/andlib/utility/Preferences.java
+++ b/api/src/com/todoroo/andlib/utility/Preferences.java
@@ -61,7 +61,7 @@ public class Preferences {
      */
     public static void setIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, String value) {
         String key = r.getString(keyResource);
-        if(!prefs.contains(key) || !(prefs.getAll().get(key) instanceof Boolean))
+        if(!prefs.contains(key) || !(prefs.getAll().get(key) instanceof String))
             editor.putString(key, value);
     }
 
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 964566a46..3765b377d 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -69,6 +69,9 @@
   <!-- account status section key -->
   <string name="p_account">account</string>
 
+  <!-- list view section key -->
+  <string name="p_list_view">p_list_view</string>
+
   <!-- simple input box style -->
   <string name="p_simple_input_boxes">simple_input_boxes</string>
   
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 1addb6e33..46c8959e0 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -664,7 +664,7 @@
   <!-- slide 34c: Preference: Task List Show Notes -->
   <string name="EPr_showNotes_title">Show notes in task</string>
   <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Customize task edit screen</string>
+  <string name="EPr_beastMode_title">Task edit screen</string>
   <!-- slide 35h -->
   <string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string>
   <!-- slide 35j -->
@@ -717,6 +717,9 @@
   <!-- Preference: menu items -->
   <string name="EPr_menu_items">Menu items</string>
 
+  <!-- Preference: list view -->
+  <string name="EPr_list_view">List view</string>
+
   <!-- Preference: task edit comments -->
   <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
   
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index a4495cb2f..49aeb7996 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -28,6 +28,18 @@
         android:title="@string/EPr_appearance_header"
         android:summary="@string/EPr_appearance_summary">
         
+        <com.todoroo.astrid.ui.MultilineListPreference
+            android:key="@string/p_theme"
+            android:entries="@array/EPr_themes"
+            android:entryValues="@array/EPr_theme_settings"
+            android:title="@string/EPr_theme_title" />
+        
+        <com.todoroo.astrid.ui.MultilineListPreference
+            android:key="@string/p_theme_widget"
+            android:entries="@array/EPr_themes_widget"
+            android:entryValues="@array/EPr_theme_widget_settings"
+            android:title="@string/EPr_theme_widget_title" />
+        
         <PreferenceScreen android:title="@string/EPr_taskRowPrefs_title" android:key="@string/p_taskRowPrefs">
         
 	        <com.todoroo.astrid.ui.MultilineListPreference
@@ -56,79 +68,95 @@
         <PreferenceScreen android:title="@string/EPr_beastMode_title" 
             android:key="@string/p_beastMode"/>
         
-        <PreferenceScreen android:title="@string/EPr_menu_items" android:key="@string/p_menu_items">
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_menu_search"
-                android:title="@string/TLA_menu_search"
-                android:defaultValue="true" />
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_menu_friends"
-                android:title="@string/TLA_menu_friends"
-                android:defaultValue="true"/>
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_featured_lists"
-                android:title="@string/EPr_show_featured_lists"
-                android:defaultValue="true"/>
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_menu_sync"
-                android:title="@string/TLA_menu_sync"
-                android:defaultValue="true"/>
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_menu_sort"
-                android:title="@string/TLA_menu_sort"
-                android:defaultValue="true"/>
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_menu_addons"
-                android:title="@string/TLA_menu_addons"
-                android:defaultValue="true"/>    
-        </PreferenceScreen>
+        <PreferenceScreen android:title="@string/EPr_list_view" android:key="@string/p_list_view">
+            <PreferenceScreen android:title="@string/EPr_menu_items" android:key="@string/p_menu_items">
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_menu_search"
+	                android:title="@string/TLA_menu_search"
+	                android:defaultValue="true" />
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_menu_friends"
+	                android:title="@string/TLA_menu_friends"
+	                android:defaultValue="true"/>
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_featured_lists"
+	                android:title="@string/EPr_show_featured_lists"
+	                android:defaultValue="true"/>
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_menu_sync"
+	                android:title="@string/TLA_menu_sync"
+	                android:defaultValue="true"/>
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_menu_sort"
+	                android:title="@string/TLA_menu_sort"
+	                android:defaultValue="true"/>
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_menu_addons"
+	                android:title="@string/TLA_menu_addons"
+	                android:defaultValue="true"/>
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+		            android:key="@string/p_use_filters"
+		            android:title="@string/EPr_use_filters_title"
+		            android:summary="@string/EPr_use_filters_subtitle"
+		            android:defaultValue="true"/>
+            </PreferenceScreen>
         
-        <PreferenceScreen android:title="@string/EPr_filters_to_show_title" android:key="@string/p_filters_to_show">
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_my_tasks_filter"
-                android:title="@string/BFE_Active"
-                android:defaultValue="true"
-                android:enabled="false" />
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_today_filter"
-                android:title="@string/today"
-                android:defaultValue="true"/>
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_recently_modified_filter"
-                android:title="@string/BFE_Recent"
-                android:defaultValue="true"/>
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_ive_assigned_filter"
-                android:title="@string/BFE_Assigned"
-                android:defaultValue="true"/>
-            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_show_not_in_list_filter"
-                android:title="@string/tag_FEx_untagged"
-                android:defaultValue="true"/>
+	        <PreferenceScreen android:title="@string/EPr_filters_to_show_title" android:key="@string/p_filters_to_show">
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_my_tasks_filter"
+	                android:title="@string/BFE_Active"
+	                android:defaultValue="true"
+	                android:enabled="false" />
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_today_filter"
+	                android:title="@string/today"
+	                android:defaultValue="true"/>
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_recently_modified_filter"
+	                android:title="@string/BFE_Recent"
+	                android:defaultValue="true"/>
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_ive_assigned_filter"
+	                android:title="@string/BFE_Assigned"
+	                android:defaultValue="true"/>
+	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_show_not_in_list_filter"
+	                android:title="@string/tag_FEx_untagged"
+	                android:defaultValue="true"/>
+	        </PreferenceScreen>
+	        
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	            android:key="@string/p_show_quickadd_controls"
+	            android:title="@string/EPr_show_quickadd_controls"
+	            android:defaultValue="true" />
+	        
+	        <CheckBoxPreference
+	            android:key="@string/p_swipe_lists_enabled"
+	            android:title="@string/EPr_swipe_lists_performance_title" 
+	            android:defaultValue="false"/>
+	        
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	            android:key="@string/p_show_list_members"
+	            android:title="@string/EPr_show_list_members_title"
+	            android:defaultValue="true"/>
+	        
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	            android:key="@string/p_voiceInputEnabled"
+	            android:title="@string/EPr_voiceInputEnabled_title"
+	            android:defaultValue="true" />
+	                
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	            android:key="@string/p_voiceInputCreatesTask"
+	            android:title="@string/EPr_voiceInputCreatesTask_title"
+	            android:dependency="@string/p_voiceInputEnabled"
+	            android:defaultValue="false" />
         </PreferenceScreen>
 
-        <com.todoroo.astrid.ui.MultilineListPreference
-            android:key="@string/p_theme"
-            android:entries="@array/EPr_themes"
-            android:entryValues="@array/EPr_theme_settings"
-            android:title="@string/EPr_theme_title" />
-        
-        <com.todoroo.astrid.ui.MultilineListPreference
-            android:key="@string/p_theme_widget"
-            android:entries="@array/EPr_themes_widget"
-            android:entryValues="@array/EPr_theme_widget_settings"
-            android:title="@string/EPr_theme_widget_title" />
-
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:key="@string/p_simple_input_boxes"
             android:title="@string/EPr_simple_input_boxes"
             android:defaultValue="false"/>
         
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/p_show_quickadd_controls"
-            android:title="@string/EPr_show_quickadd_controls"
-            android:defaultValue="true" />
-        
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:key="@string/p_showSmartConfirmation_key"
             android:title="@string/EPr_showSmartConfirmation_title"
@@ -139,27 +167,11 @@
 	        android:title="@string/EPr_ideaAuto_title"
 	        android:defaultValue="true" />
         
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/p_use_filters"
-            android:title="@string/EPr_use_filters_title"
-            android:summary="@string/EPr_use_filters_subtitle"
-            android:defaultValue="true"/>
-        
         <CheckBoxPreference
 	        android:title="@string/EPr_force_phone_layout"
 	        android:key="@string/p_force_phone_layout"
 	        android:defaultValue="false"/>
 
-        <CheckBoxPreference
-            android:key="@string/p_swipe_lists_enabled"
-	        android:title="@string/EPr_swipe_lists_performance_title" 
-	        android:defaultValue="false"/>
-        
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/p_show_list_members"
-            android:title="@string/EPr_show_list_members_title"
-            android:defaultValue="true"/>
-
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:key="@string/p_show_task_edit_comments"
             android:title="@string/EPr_show_task_edit_comments"
@@ -168,17 +180,6 @@
         <CheckBoxPreference
 	        android:key="@string/p_use_contact_picker"
 	        android:title="@string/EPr_use_contact_picker"/>
-        
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/p_voiceInputEnabled"
-            android:title="@string/EPr_voiceInputEnabled_title"
-            android:defaultValue="true" />
-                
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/p_voiceInputCreatesTask"
-            android:title="@string/EPr_voiceInputCreatesTask_title"
-            android:dependency="@string/p_voiceInputEnabled"
-            android:defaultValue="false" />
              
     </PreferenceScreen>
 
diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java
index 8fc79a58a..758ef411f 100644
--- a/astrid/src/com/todoroo/astrid/service/ThemeService.java
+++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java
@@ -184,7 +184,8 @@ public class ThemeService {
     }
 
     public static int getDrawable(int lightDrawable, int alter) {
-        boolean darkTheme = currentTheme == R.style.Theme || currentTheme == R.style.Theme_Transparent;
+        int theme = getUnsimplifiedTheme();
+        boolean darkTheme = theme == R.style.Theme || theme == R.style.Theme_Transparent;
         switch(alter) {
         case FLAG_FORCE_DARK:
             darkTheme = true;