diff --git a/astrid/src/main/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml
index 4fc41bb8d..f9a51b58c 100644
--- a/astrid/src/main/AndroidManifest.xml
+++ b/astrid/src/main/AndroidManifest.xml
@@ -298,7 +298,7 @@
 
         <activity
             android:name="com.todoroo.astrid.core.CustomFilterActivity"
-            android:theme="@style/Tasks.Dialog.Light" />
+            android:theme="@style/Tasks.Dialog" />
 
         <activity
             android:name="com.todoroo.astrid.core.CustomFilterExposer$DeleteActivity"
@@ -333,7 +333,7 @@
         <activity
             android:name="com.todoroo.astrid.actfm.TagSettingsActivityTablet"
             android:windowSoftInputMode="stateHidden"
-            android:theme="@style/Tasks.Dialog.Light" />
+            android:theme="@style/Tasks.Dialog" />
 
         <!-- gtasks -->
         <activity
diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 7dea08000..3159f659b 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -101,9 +101,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
         navigationDrawer.setUp(drawerLayout);
 //        drawerLayout.setStatusBarBackgroundColor(getResources().getColor(android.R.color.holo_blue_bright));
 
-        TypedValue typedValue = new TypedValue();
-        getTheme().resolveAttribute(R.attr.ic_drawer, typedValue, true);
-
         initializeFragments();
 
         Bundle extras = getIntent().getExtras();
@@ -239,8 +236,8 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
             Filter newList = getIntent().getParcelableExtra(TOKEN_SWITCH_TO_FILTER);
             getIntent().removeExtra(TOKEN_SWITCH_TO_FILTER);
             onFilterItemClicked(newList);
-        } else {
-            navigationDrawer.restoreLastSelected();
+//        } else {
+//            navigationDrawer.restoreLastSelected();
         }
 
         if (getIntent().hasExtra(OPEN_TASK)) {
diff --git a/astrid/src/main/java/org/tasks/preferences/ActivityPreferences.java b/astrid/src/main/java/org/tasks/preferences/ActivityPreferences.java
index 53c66e558..5d56642a2 100644
--- a/astrid/src/main/java/org/tasks/preferences/ActivityPreferences.java
+++ b/astrid/src/main/java/org/tasks/preferences/ActivityPreferences.java
@@ -36,7 +36,7 @@ public class ActivityPreferences extends Preferences {
     }
 
     public void applyDialogTheme() {
-        applyTheme(R.style.Tasks_Dialog_Light);
+        applyTheme(R.style.Tasks_Dialog);
     }
 
     public void applyTranslucentDialogTheme() {
@@ -50,7 +50,7 @@ public class ActivityPreferences extends Preferences {
 
     public int getEditDialogTheme() {
         boolean ics = AndroidUtilities.getSdkVersion() >= 14;
-        return ics ? R.style.TEA_Dialog_Light_ICS : R.style.TEA_Dialog_Light;
+        return ics ? R.style.TEA_Dialog_Light_ICS : R.style.TEA_Dialog;
     }
 
     /**
diff --git a/astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
index 5ff4c34a2..84691b9a3 100644
--- a/astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
+++ b/astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
@@ -145,18 +145,12 @@ public class NavigationDrawerFragment extends InjectingFragment {
 
         // set a custom shadow that overlays the main content when the drawer opens
         mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
-        // set up the drawer's list view with items and click listener
-
-//        ActionBar actionBar = getActionBar();
-//        actionBar.setDisplayHomeAsUpEnabled(true);
-//        actionBar.setHomeButtonEnabled(true);
 
         // ActionBarDrawerToggle ties together the the proper interactions
         // between the navigation drawer and the action bar app icon.
         mDrawerToggle = new ActionBarDrawerToggle(
                 getActivity(),                    /* host Activity */
                 mDrawerLayout,                    /* DrawerLayout object */
-//                R.drawable.ic_drawer,             /* nav drawer image to replace 'Up' caret */
                 R.string.navigation_drawer_open,  /* "open drawer" description for accessibility */
                 R.string.navigation_drawer_close  /* "close drawer" description for accessibility */
         ) {
@@ -244,16 +238,6 @@ public class NavigationDrawerFragment extends InjectingFragment {
         mDrawerToggle.onConfigurationChanged(newConfig);
     }
 
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (mDrawerLayout != null && isDrawerOpen()) {
-            menu.clear();
-//            showGlobalContextActionBar();
-        }
-        inflater.inflate(R.menu.global, menu);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
     @Override
     public boolean onContextItemSelected(android.view.MenuItem item) {
         // called when context menu appears
@@ -364,21 +348,6 @@ public class NavigationDrawerFragment extends InjectingFragment {
                 activity.getString(R.string.FLA_toast_onCreateShortcut, label), Toast.LENGTH_LONG).show();
     }
 
-    /**
-     * Per the navigation drawer design guidelines, updates the action bar to show the global app
-     * 'context', rather than just what's in the current screen.
-     */
-    private void showGlobalContextActionBar() {
-        ActionBar actionBar = getActionBar();
-        actionBar.setDisplayShowTitleEnabled(true);
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
-        actionBar.setTitle(R.string.app_name);
-    }
-
-    private ActionBar getActionBar() {
-        return ((ActionBarActivity) getActivity()).getSupportActionBar();
-    }
-
     public void closeMenu() {
         if (mDrawerLayout != null) {
             mDrawerLayout.closeDrawer(mFragmentContainerView);
diff --git a/astrid/src/main/res/drawable-hdpi/dialog_full_holo_dark.9.png b/astrid/src/main/res/drawable-hdpi/dialog_full_holo_dark.9.png
deleted file mode 100644
index 79e56f522..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/dialog_full_holo_dark.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/header_background.png b/astrid/src/main/res/drawable-hdpi/header_background.png
deleted file mode 100644
index e255528dd..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/header_background.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_overflow.png b/astrid/src/main/res/drawable-hdpi/ic_action_overflow.png
deleted file mode 100644
index 002fc4bfb..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/ic_action_overflow.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_overflow_light.png b/astrid/src/main/res/drawable-hdpi/ic_action_overflow_light.png
deleted file mode 100644
index c8792cbe2..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/ic_action_overflow_light.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_drawer.png b/astrid/src/main/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index c59f601ca..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/ic_drawer.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/dialog_full_holo_dark.9.png b/astrid/src/main/res/drawable-xhdpi/dialog_full_holo_dark.9.png
deleted file mode 100644
index f4970ad1c..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/dialog_full_holo_dark.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_overflow.png b/astrid/src/main/res/drawable-xhdpi/ic_action_overflow.png
deleted file mode 100644
index 7ba4e10ea..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/ic_action_overflow.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_overflow_light.png b/astrid/src/main/res/drawable-xhdpi/ic_action_overflow_light.png
deleted file mode 100644
index 5d8af5d63..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/ic_action_overflow_light.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_drawer.png b/astrid/src/main/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index a5fa74def..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/ic_drawer.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_overflow.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_overflow.png
deleted file mode 100644
index 5a603b6bc..000000000
Binary files a/astrid/src/main/res/drawable-xxhdpi/ic_action_overflow.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_overflow_light.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_overflow_light.png
deleted file mode 100644
index e22049b1e..000000000
Binary files a/astrid/src/main/res/drawable-xxhdpi/ic_action_overflow_light.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_drawer.png b/astrid/src/main/res/drawable-xxhdpi/ic_drawer.png
deleted file mode 100644
index 9c4685d6e..000000000
Binary files a/astrid/src/main/res/drawable-xxhdpi/ic_drawer.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/dialog_full_holo_dark.9.png b/astrid/src/main/res/drawable/dialog_full_holo_dark.9.png
deleted file mode 100644
index fb3660eab..000000000
Binary files a/astrid/src/main/res/drawable/dialog_full_holo_dark.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/header_background.9.png b/astrid/src/main/res/drawable/header_background.9.png
deleted file mode 100644
index 0058ddd79..000000000
Binary files a/astrid/src/main/res/drawable/header_background.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/header_day_blue.9.png b/astrid/src/main/res/drawable/header_day_blue.9.png
deleted file mode 100644
index 428cc2fb0..000000000
Binary files a/astrid/src/main/res/drawable/header_day_blue.9.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/ic_action_overflow.png b/astrid/src/main/res/drawable/ic_action_overflow.png
deleted file mode 100644
index 6f0fb23f4..000000000
Binary files a/astrid/src/main/res/drawable/ic_action_overflow.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/ic_action_overflow_light.png b/astrid/src/main/res/drawable/ic_action_overflow_light.png
deleted file mode 100644
index fb062e6dc..000000000
Binary files a/astrid/src/main/res/drawable/ic_action_overflow_light.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/ic_drawer.png b/astrid/src/main/res/drawable/ic_drawer.png
deleted file mode 100644
index 1ed2c56ee..000000000
Binary files a/astrid/src/main/res/drawable/ic_drawer.png and /dev/null differ
diff --git a/astrid/src/main/res/layout/alarm_edit_row.xml b/astrid/src/main/res/layout/alarm_edit_row.xml
index b05ad9239..4ee138d28 100644
--- a/astrid/src/main/res/layout/alarm_edit_row.xml
+++ b/astrid/src/main/res/layout/alarm_edit_row.xml
@@ -48,5 +48,5 @@
 	      	  android:id="@+id/TEA_Separator"
 		      android:layout_width="fill_parent"
 		      android:layout_height="1px"
-		      style="@style/TEA_Separator" />
+              android:background="?android:attr/listDivider" />
 </LinearLayout>
diff --git a/astrid/src/main/res/layout/astrid_speech_bubble.xml b/astrid/src/main/res/layout/astrid_speech_bubble.xml
index 958eff329..65fae8b78 100644
--- a/astrid/src/main/res/layout/astrid_speech_bubble.xml
+++ b/astrid/src/main/res/layout/astrid_speech_bubble.xml
@@ -39,8 +39,9 @@
 	            android:id="@+id/reminder_message"
 	            android:layout_width="fill_parent"
 	            android:layout_height="wrap_content"
-	            style="@style/TextAppearance.TLA_Reminder"
-	            android:gravity="center_vertical"/>
+                android:textSize="16sp"
+                android:textColor="#000000"
+                android:gravity="center_vertical"/>
 	    </LinearLayout>
 	</LinearLayout>
 </merge>
diff --git a/astrid/src/main/res/layout/control_set_deadline_display.xml b/astrid/src/main/res/layout/control_set_deadline_display.xml
index 3bf857cde..71dfaa567 100644
--- a/astrid/src/main/res/layout/control_set_deadline_display.xml
+++ b/astrid/src/main/res/layout/control_set_deadline_display.xml
@@ -28,13 +28,13 @@
 	         android:layout_height="wrap_content"
 		     android:layout_weight="1"
 	         android:gravity="left"
-		     style="@style/TextAppearance.EditRowDisplay" />
+             android:textColor="?attr/asThemeTextColor" />
       </LinearLayout>
       <View
 	      android:id="@+id/TEA_Separator"
 	      android:layout_width="fill_parent"
 	      android:layout_height="1px"
-	      style="@style/TEA_Separator" />
+          android:background="?android:attr/listDivider" />
 
     
 </LinearLayout>
diff --git a/astrid/src/main/res/layout/control_set_default_display.xml b/astrid/src/main/res/layout/control_set_default_display.xml
index 8cd855ed9..e3c0a4ecf 100644
--- a/astrid/src/main/res/layout/control_set_default_display.xml
+++ b/astrid/src/main/res/layout/control_set_default_display.xml
@@ -29,13 +29,13 @@
 	         android:layout_height="wrap_content"
 		     android:layout_weight="1"
 	         android:gravity="left"
-		     style="@style/TextAppearance.EditRowDisplay" />
+             android:textColor="?attr/asThemeTextColor" />
       </LinearLayout>
       <View
 	      android:id="@+id/TEA_Separator"
 	      android:layout_width="fill_parent"
 	      android:layout_height="1px"
-	      style="@style/TEA_Separator" />
+          android:background="?android:attr/listDivider" />
 
     
 </LinearLayout>
diff --git a/astrid/src/main/res/layout/control_set_files_display.xml b/astrid/src/main/res/layout/control_set_files_display.xml
index 8b1509771..8cb64912f 100644
--- a/astrid/src/main/res/layout/control_set_files_display.xml
+++ b/astrid/src/main/res/layout/control_set_files_display.xml
@@ -35,7 +35,7 @@
 	      android:id="@+id/TEA_Separator"
 	      android:layout_width="fill_parent"
 	      android:layout_height="1px"
-	      style="@style/TEA_Separator" />
+          android:background="?android:attr/listDivider" />
 
     
 </LinearLayout>
diff --git a/astrid/src/main/res/layout/control_set_gcal_display.xml b/astrid/src/main/res/layout/control_set_gcal_display.xml
index 49607c4d7..06854f07d 100644
--- a/astrid/src/main/res/layout/control_set_gcal_display.xml
+++ b/astrid/src/main/res/layout/control_set_gcal_display.xml
@@ -29,13 +29,13 @@
 	      android:gravity="left"
 	      android:maxLines="1"
 	      android:ellipsize="end"
-	      style="@style/TextAppearance.EditRowDisplay" />
+          android:textColor="?attr/asThemeTextColor" />
   </LinearLayout>
   <View
       android:layout_width="fill_parent"
       android:layout_height="1px"
       android:padding="5dip"
-      style="@style/TEA_Separator" />
+      android:background="?android:attr/listDivider" />
     
 </LinearLayout>
 
diff --git a/astrid/src/main/res/layout/control_set_importance.xml b/astrid/src/main/res/layout/control_set_importance.xml
index 58e6881d7..631f10126 100644
--- a/astrid/src/main/res/layout/control_set_importance.xml
+++ b/astrid/src/main/res/layout/control_set_importance.xml
@@ -32,7 +32,6 @@
 	         android:layout_height="wrap_content"
 	         android:gravity="left"
 	         android:text="@string/TEA_importance_label"
-		     style="@style/TextAppearance.EditRowDisplay" 
 		     android:textColor="@color/task_edit_deadline_gray"/>
       </LinearLayout>
       
@@ -40,6 +39,6 @@
 	      android:id="@+id/TEA_Separator"
 	      android:layout_width="fill_parent"
 	      android:layout_height="1px"
-	      style="@style/TEA_Separator" />
+          android:background="?android:attr/listDivider" />
     
 </LinearLayout>
diff --git a/astrid/src/main/res/layout/control_set_notes_display.xml b/astrid/src/main/res/layout/control_set_notes_display.xml
index 96c3cfaf1..57b685e49 100644
--- a/astrid/src/main/res/layout/control_set_notes_display.xml
+++ b/astrid/src/main/res/layout/control_set_notes_display.xml
@@ -27,7 +27,7 @@
             android:scaleType="fitCenter"/>
         <TextView
             android:id="@+id/display_row_edit"
-            style="@style/TextAppearance.EditRowDisplay"
+            android:textColor="?attr/asThemeTextColor"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:paddingTop="10dip"
@@ -37,7 +37,7 @@
 
     <View
         android:id="@+id/TEA_Separator"
-        style="@style/TEA_Separator"
+        android:background="?android:attr/listDivider"
         android:layout_width="fill_parent"
         android:layout_height="1px" />
 
diff --git a/astrid/src/main/res/layout/control_set_reminders.xml b/astrid/src/main/res/layout/control_set_reminders.xml
index 09d70b6aa..fe331c218 100644
--- a/astrid/src/main/res/layout/control_set_reminders.xml
+++ b/astrid/src/main/res/layout/control_set_reminders.xml
@@ -63,7 +63,7 @@
 		      <View
 		          android:layout_width="fill_parent"
 		          android:layout_height="1px"
-		          style="@style/TEA_Separator" />
+                  android:background="?android:attr/listDivider" />
 		      <LinearLayout
 		          android:id="@+id/reminder_alarm_container"
 		          android:layout_width="fill_parent"
@@ -84,7 +84,7 @@
 		             android:layout_weight="1"
 		             android:gravity="right"
 		             android:paddingLeft="10dip"
-		             style="@style/TextAppearance.EditRowDisplay" />
+                     android:textColor="?attr/asThemeTextColor" />
 			      <com.todoroo.astrid.ui.ErrorCatchingSpinner
 			        android:id="@+id/reminder_alarm"
 			        android:layout_width="0dip"
@@ -94,7 +94,7 @@
 		          android:id="@+id/TEA_Separator"
 		          android:layout_width="fill_parent"
 		          android:layout_height="1px"
-		          style="@style/TEA_Separator" />
+                  android:background="?android:attr/listDivider" />
 		    
 		</LinearLayout>
 	</ScrollView>
diff --git a/astrid/src/main/res/layout/control_set_repeat_display.xml b/astrid/src/main/res/layout/control_set_repeat_display.xml
index 41895ef33..d9d70e0f9 100644
--- a/astrid/src/main/res/layout/control_set_repeat_display.xml
+++ b/astrid/src/main/res/layout/control_set_repeat_display.xml
@@ -28,16 +28,16 @@
 	      android:layout_weight="1"
 	      android:gravity="left"
 	      android:paddingLeft="5dip"
-	      style="@style/TextAppearance.EditRowDisplay" />
+          android:textColor="?attr/asThemeTextColor" />
 	  <View
 	      android:layout_width="1px"
 	      android:layout_height="fill_parent"
-	      style="@style/TEA_Separator" />
+          android:background="?android:attr/listDivider" />
   </LinearLayout>
   <View
       android:layout_width="fill_parent"
       android:layout_height="1px"
       android:padding="5dip"
-      style="@style/TEA_Separator" />
+      android:background="?android:attr/listDivider" />
     
 </LinearLayout>
diff --git a/astrid/src/main/res/layout/control_set_timers.xml b/astrid/src/main/res/layout/control_set_timers.xml
index d9b633219..0c2e781a7 100644
--- a/astrid/src/main/res/layout/control_set_timers.xml
+++ b/astrid/src/main/res/layout/control_set_timers.xml
@@ -32,13 +32,13 @@
              android:layout_weight="1"
              android:gravity="right"
              android:paddingLeft="10dip"
-             style="@style/TextAppearance.EditRowDisplay" />
+             android:textColor="?attr/asThemeTextColor" />
     </LinearLayout>
     <View
           android:id="@+id/TEA_Separator"
           android:layout_width="fill_parent"
           android:layout_height="1px"
-          style="@style/TEA_Separator" />
+        android:background="?android:attr/listDivider" />
     <!-- elapsed time -->
     <LinearLayout
         android:layout_width="fill_parent"
@@ -59,7 +59,7 @@
              android:layout_weight="1"
              android:gravity="right"
              android:paddingLeft="10dip"
-             style="@style/TextAppearance.EditRowDisplay" />
+             android:textColor="?attr/asThemeTextColor" />
     </LinearLayout>
     <include layout="@layout/control_dialog_ok"/>
   
diff --git a/astrid/src/main/res/layout/custom_filter_activity.xml b/astrid/src/main/res/layout/custom_filter_activity.xml
index a3ffeaf08..73424a5a8 100644
--- a/astrid/src/main/res/layout/custom_filter_activity.xml
+++ b/astrid/src/main/res/layout/custom_filter_activity.xml
@@ -8,7 +8,7 @@
     android:layout_width="fill_parent" 
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    style="@style/Content">
+    android:background="?attr/asContentBackground">
     
     <!-- Filter Name -->
     <EditText android:id="@+id/filterName"
diff --git a/astrid/src/main/res/layout/date_time_picker_no_shortcuts.xml b/astrid/src/main/res/layout/date_time_picker_no_shortcuts.xml
index 72a8965e4..1c066bb07 100644
--- a/astrid/src/main/res/layout/date_time_picker_no_shortcuts.xml
+++ b/astrid/src/main/res/layout/date_time_picker_no_shortcuts.xml
@@ -27,7 +27,7 @@
 	          android:layout_width="fill_parent"
 	          android:layout_height="1px"
 	          android:layout_marginBottom="1dip"
-	          style="@style/TEA_Separator" />
+              android:background="?android:attr/listDivider" />
 		  <LinearLayout
 		      android:layout_width="fill_parent"
 		      android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
 	          android:layout_width="fill_parent"
 	          android:layout_height="1px"
 	          android:layout_marginTop="1dip"
-	          style="@style/TEA_Separator" />
+              android:background="?android:attr/listDivider" />
 		  <LinearLayout
               android:id="@+id/datetime_extras"
               android:layout_width="fill_parent"
diff --git a/astrid/src/main/res/layout/file_display_row.xml b/astrid/src/main/res/layout/file_display_row.xml
index dd9335fe6..2d9eb7588 100644
--- a/astrid/src/main/res/layout/file_display_row.xml
+++ b/astrid/src/main/res/layout/file_display_row.xml
@@ -18,7 +18,7 @@
         android:maxLines="1"
         android:singleLine="true"
         android:ellipsize="end"
-        android:textAppearance="@style/TextAppearance.EditRowDisplay"/>
+        android:textColor="?attr/asThemeTextColor" />
     <TextView
         android:id="@+id/file_type"
         android:minWidth="37dip"
diff --git a/astrid/src/main/res/layout/file_row.xml b/astrid/src/main/res/layout/file_row.xml
index f3a4a6c8c..0962a247e 100644
--- a/astrid/src/main/res/layout/file_row.xml
+++ b/astrid/src/main/res/layout/file_row.xml
@@ -20,7 +20,7 @@
         android:paddingRight="5dip"
         android:paddingLeft="3dip"
         android:layout_weight="1"
-        android:textAppearance="@style/TextAppearance.EditRowDisplay"
+        android:textColor="?attr/asThemeTextColor"
         android:gravity="left|center_vertical"/>
     <TextView
         android:id="@+id/file_type"
diff --git a/astrid/src/main/res/layout/gtasks_login_activity.xml b/astrid/src/main/res/layout/gtasks_login_activity.xml
index 53d937757..210a3bf52 100644
--- a/astrid/src/main/res/layout/gtasks_login_activity.xml
+++ b/astrid/src/main/res/layout/gtasks_login_activity.xml
@@ -7,7 +7,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    style="@style/Content">
+    android:background="?attr/asContentBackground">
 
   <ListView android:id="@android:id/list"
         android:layout_width="fill_parent"
@@ -25,8 +25,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="@string/gtasks_GLA_noaccounts"
-            android:gravity="center"
-            style="@style/TextAppearance.TLA_NoItems" />
+            android:textSize="20sp"
+            android:gravity="center" />
         
       <Button android:id="@+id/empty_button"
             android:layout_width="fill_parent"
diff --git a/astrid/src/main/res/layout/sort_selection_dialog.xml b/astrid/src/main/res/layout/sort_selection_dialog.xml
index 1dec68b00..6e26e3b1d 100644
--- a/astrid/src/main/res/layout/sort_selection_dialog.xml
+++ b/astrid/src/main/res/layout/sort_selection_dialog.xml
@@ -9,7 +9,7 @@
   android:layout_height="wrap_content"
   android:paddingLeft="10dip"
   android:paddingRight="10dip"
-  style="@style/Content">
+    android:background="?attr/asContentBackground">
 
     <LinearLayout
       android:layout_width="fill_parent"
@@ -64,7 +64,7 @@
       
       <View
           android:id="@+id/TEA_Separator"
-          style="@style/TEA_Separator"
+          android:background="?android:attr/listDivider"
           android:layout_width="fill_parent"
           android:layout_height="1px" />
 
diff --git a/astrid/src/main/res/layout/tag_settings_activity.xml b/astrid/src/main/res/layout/tag_settings_activity.xml
index 987e9eb6e..ef68b8335 100644
--- a/astrid/src/main/res/layout/tag_settings_activity.xml
+++ b/astrid/src/main/res/layout/tag_settings_activity.xml
@@ -11,7 +11,7 @@
 
     <ScrollView
         android:id="@+id/settings"
-        style="@style/Content_EditScroll"
+        android:background="?attr/asEditBackground"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="100"
@@ -40,7 +40,7 @@
                     android:text="@string/actfm_TVA_tag_label" />
 
                 <LinearLayout
-                    style="@style/EditRow"
+                    android:background="?attr/asEditRowBackground"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/tag_label"
diff --git a/astrid/src/main/res/layout/task_edit_activity.xml b/astrid/src/main/res/layout/task_edit_activity.xml
index cb946016c..f1af712df 100644
--- a/astrid/src/main/res/layout/task_edit_activity.xml
+++ b/astrid/src/main/res/layout/task_edit_activity.xml
@@ -6,7 +6,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/taskEditParent"
-    style="@style/Content"
+    android:background="?attr/asContentBackground"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -15,7 +15,7 @@
 
     <ScrollView
         android:id="@+id/edit_scroll"
-        style="@style/Content_EditScroll"
+        android:background="?attr/asEditBackground"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="100" >
@@ -29,7 +29,7 @@
 
             <LinearLayout
                 android:id="@+id/title_controls"
-                style="@style/EditRow"
+                android:background="?attr/asEditRowBackground"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="3dip"
@@ -41,7 +41,7 @@
 
             <LinearLayout
                 android:id="@+id/basic_controls"
-                style="@style/EditRow"
+                android:background="?attr/asEditRowBackground"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:layout_margin="3dip"
@@ -50,7 +50,7 @@
 
             <android.support.v4.view.ViewPager
                 android:id="@+id/pager"
-                style="@style/EditRow"
+                android:background="?attr/asEditRowBackground"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="3dip"
@@ -69,7 +69,6 @@
 
     <LinearLayout
         android:id="@+id/updatesFooter"
-        style="@style/Content"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
diff --git a/astrid/src/main/res/layout/task_list_activity.xml b/astrid/src/main/res/layout/task_list_activity.xml
index 3b9b85b48..7b90422f4 100644
--- a/astrid/src/main/res/layout/task_list_activity.xml
+++ b/astrid/src/main/res/layout/task_list_activity.xml
@@ -7,7 +7,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tasks="http://schemas.android.com/apk/res-auto"
     android:id="@+id/taskListParent"
-    style="@style/Content"
+    android:background="?attr/asContentBackground"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:descendantFocusability="beforeDescendants"
diff --git a/astrid/src/main/res/layout/task_list_swipe_layout_empty.xml b/astrid/src/main/res/layout/task_list_swipe_layout_empty.xml
index 243198fca..7eced1864 100644
--- a/astrid/src/main/res/layout/task_list_swipe_layout_empty.xml
+++ b/astrid/src/main/res/layout/task_list_swipe_layout_empty.xml
@@ -9,7 +9,7 @@
 
         <TextView
             android:id="@+id/empty_text"
-            style="@style/TextAppearance.TLA_NoItems"
+            android:textSize="20sp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml b/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml
index 85a598551..106571904 100644
--- a/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml
+++ b/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml
@@ -6,7 +6,7 @@
     android:fitsSystemWindows="true">
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/Content"
+        android:background="?attr/asContentBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="horizontal">
diff --git a/astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml b/astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml
index 6872db319..928aea53a 100644
--- a/astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml
+++ b/astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml
@@ -14,7 +14,7 @@
 
         <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/tasklist_fragment_container"
-            style="@style/Content"
+            android:background="?attr/asContentBackground"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
diff --git a/astrid/src/main/res/layout/widget_config_activity.xml b/astrid/src/main/res/layout/widget_config_activity.xml
index 8c7c457f6..d34682bc6 100644
--- a/astrid/src/main/res/layout/widget_config_activity.xml
+++ b/astrid/src/main/res/layout/widget_config_activity.xml
@@ -5,7 +5,7 @@
     android:layout_width="fill_parent" 
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    style="@style/Content">       
+    android:background="?attr/asContentBackground">
         
     <!-- Title -->
     <TextView
diff --git a/astrid/src/main/res/menu/global.xml b/astrid/src/main/res/menu/global.xml
deleted file mode 100644
index 0383f8710..000000000
--- a/astrid/src/main/res/menu/global.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tasks="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/menu_new_list"
-        android:title="@string/FLA_new_list"
-        tasks:showAsAction="never" />
-    <item
-        android:id="@+id/menu_new_filter"
-        android:title="@string/FLA_new_filter"
-        tasks:showAsAction="never" />
-    <item
-        android:id="@+id/menu_support"
-        android:title="@string/TLA_menu_support"
-        tasks:showAsAction="never" />
-    <item
-        android:id="@+id/menu_settings"
-        android:title="@string/TLA_menu_settings"
-        tasks:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/astrid/src/main/res/menu/task_list_activity.xml b/astrid/src/main/res/menu/task_list_activity.xml
index 629729b62..141963e5f 100644
--- a/astrid/src/main/res/menu/task_list_activity.xml
+++ b/astrid/src/main/res/menu/task_list_activity.xml
@@ -14,7 +14,6 @@
         android:icon="?attr/ic_action_search"
         tasks:showAsAction="ifRoom|collapseActionView"
         tasks:actionViewClass="android.support.v7.widget.SearchView"/>
-
     <item
         android:id="@+id/menu_delete_list"
         android:title="@string/tag_cm_delete"
@@ -34,4 +33,20 @@
         android:title="@string/gtasks_GTA_clear_completed"
         android:visible="false"
         tasks:showAsAction="never" />
+    <item
+        android:id="@+id/menu_new_list"
+        android:title="@string/FLA_new_list"
+        tasks:showAsAction="never" />
+    <item
+        android:id="@+id/menu_new_filter"
+        android:title="@string/FLA_new_filter"
+        tasks:showAsAction="never" />
+    <item
+        android:id="@+id/menu_support"
+        android:title="@string/TLA_menu_support"
+        tasks:showAsAction="never" />
+    <item
+        android:id="@+id/menu_settings"
+        android:title="@string/TLA_menu_settings"
+        tasks:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/astrid/src/main/res/values-v11/styles.xml b/astrid/src/main/res/values-v11/styles.xml
index 2e9274f98..0a7cb36b4 100644
--- a/astrid/src/main/res/values-v11/styles.xml
+++ b/astrid/src/main/res/values-v11/styles.xml
@@ -2,28 +2,13 @@
 <resources>
     <style name="AstridActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
         <item name="android:displayOptions">showHome|showTitle</item>
-        <item name="android:background">@drawable/header_day_blue</item>
     </style>
 
     <style name="AstridActionBarStyle.Dialog">
-        <item name="android:background">@drawable/header_background</item>
-        <item name="android:displayOptions">showHome|showTitle</item>
-    </style>
-
-    <style name="AstridActionBarStyle.Dialog.Light">
         <item name="android:background">@android:color/white</item>
         <item name="android:displayOptions">showHome|showTitle</item>
     </style>
 
-    <style name="TEA_Dialog_ICS" parent="@android:style/Theme.Holo.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
-        <item name="asTextColor">#ffffff</item>
-    </style>
-
     <style name="TEA_Dialog_Light_ICS" parent="@android:style/Theme.Holo.Light.Dialog">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
diff --git a/astrid/src/main/res/values-v21/styles.xml b/astrid/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 239a2833a..000000000
--- a/astrid/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--<style name="Tasks" parent="Theme.AppCompat.NoActionBar">-->
-<!---->
-    <!--</style>-->
-<!---->
-    <!--<style name="Tasks.Light" parent="Theme.AppCompat.Light.NoActionBar">-->
-<!---->
-    <!--</style>-->
-</resources>
\ No newline at end of file
diff --git a/astrid/src/main/res/values/attrs.xml b/astrid/src/main/res/values/attrs.xml
index 378b4afed..71e784a35 100644
--- a/astrid/src/main/res/values/attrs.xml
+++ b/astrid/src/main/res/values/attrs.xml
@@ -31,7 +31,6 @@
     <attr name="ic_action_camera" format="reference"/>
     <attr name="ic_action_mic" format="reference" />
     <attr name="ic_action_search" format="reference"/>
-    <attr name="ic_drawer" format="reference"/>
     <attr name="drawer_background" format="color"/>
     <attr name="drawer_text" format="color"/>
     <attr name="task_edit_theme_color" format="color"/>
diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml
index d68ffdb53..0f42e0ec3 100644
--- a/astrid/src/main/res/values/styles.xml
+++ b/astrid/src/main/res/values/styles.xml
@@ -1,29 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- ========================================================== General  -->
-    
-    <style name="ActionBarPopupThemeOverlay" parent="Widget.AppCompat.Light.PopupMenu" />
-
-    <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
-        <item name="spinBars">false</item>
-    </style>
-
-    <style name="AstridActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
-        <item name="displayOptions">showHome|showTitle</item>
-        <item name="background">@drawable/header_day_blue</item>
-    </style>
-
-    <style name="AstridOverflowStyle" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:src">@drawable/ic_action_overflow</item>
-    </style>
 
     <style name="Tasks" parent="Theme.AppCompat.Light.NoActionBar">
+        <!--<item name="colorPrimary">@android:color/holo_orange_light</item>-->
+        <item name="colorPrimaryDark">#636363</item>
+        <!--<item name="colorAccent">@android:color/holo_purple</item>-->
+
         <item name="android:windowBackground">@null</item>
         <item name="asDueDateOverdueColor">#ee5555</item>
         <item name="asDueDateCompletedColor">#ff777777</item>
@@ -31,7 +14,7 @@
         <item name="asEditTextBackground">@null</item>
 
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <!--<item name="android:statusBarColor">@android:color/transparent</item>-->
         <item name="asContentBackground">@android:color/white</item>
         <item name="asEditBackground">@android:color/white</item>
         <item name="asTextColor">#000000</item>
@@ -52,7 +35,6 @@
         <item name="ic_action_camera">@drawable/ic_action_camera</item>
         <item name="ic_action_mic">@drawable/ic_action_mic</item>
         <item name="ic_action_search">@drawable/ic_action_search</item>
-        <item name="ic_drawer">@drawable/ic_drawer</item>
         <item name="task_edit_theme_color">@color/task_edit_selected</item>
         <item name="importance_background_selected">@drawable/importance_background_selected</item>
         <item name="tea_icn_files">@drawable/tea_icn_files</item>
@@ -68,19 +50,23 @@
         <item name="drawer_text">#000</item>
         <item name="drawer_selected">#dddddd</item>
 
-        <item name="android:popupMenuStyle">@style/Widget.AppCompat.Light.PopupMenu</item>
-        <item name="android:listPopupWindowStyle">@style/Widget.AppCompat.Light.PopupMenu</item>
-        <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.Light.ListView.DropDown</item>
-
         <!-- actionbar-styling -->
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
         <item name="android:actionBarStyle">@style/AstridActionBarStyle</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle</item>
-        <item name="android:actionOverflowButtonStyle">@style/AstridOverflowStyle</item>
-        <item name="actionOverflowButtonStyle">@style/AstridOverflowStyle</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
+    <style name="ActionBarPopupThemeOverlay" parent="Widget.AppCompat.Light.PopupMenu" />
+
+    <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
+        <item name="spinBars">false</item>
+    </style>
+
+    <style name="AstridActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="displayOptions">showHome|showTitle</item>
+    </style>
+
     <style name="Tasks.FullTransparent" parent="@style/Theme.AppCompat">
         <item name="android:windowIsTranslucent">true</item>
 	    <item name="android:windowBackground">@android:color/transparent</item>
@@ -89,11 +75,11 @@
 	</style>
 
     <style name="AstridActionBarStyle.Dialog">
-        <item name="background">@drawable/header_background</item>
+        <item name="background">@android:color/white</item>
         <item name="displayOptions">showHome|showTitle</item>
     </style>
     
-    <style name="Tasks.Dialog.Light" parent="@android:style/Theme.Dialog">
+    <style name="Tasks.Dialog" parent="@android:style/Theme.Dialog">
         <!--<item name="android:windowBackground">@null</item>-->
         <item name="asDueDateOverdueColor">#ffee5555</item>
         <item name="asDueDateCompletedColor">#ff777777</item>
@@ -117,29 +103,16 @@
         <item name="asDetailsColor">#ff6666aa</item>
         <item name="asDueDateColor">#878787</item>
         <!-- actionbar-styling -->
-        <item name="android:actionBarStyle">@style/AstridActionBarStyle.Dialog.Light</item>
-        <item name="actionBarStyle">@style/AstridActionBarStyle.Dialog.Light</item>
+        <item name="android:actionBarStyle">@style/AstridActionBarStyle.Dialog</item>
+        <item name="actionBarStyle">@style/AstridActionBarStyle.Dialog</item>
         
         <item name="asEditBackground">#dddddd</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_transparent_white</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>
     </style>
 
-    <style name="AstridActionBarStyle.Dialog.Light">
-        <item name="background">@android:color/white</item>
-        <item name="displayOptions">showHome|showTitle</item>
-    </style>
-        
     <!--================================================== General == -->
 
-    <style name="Content">
-        <item name="android:background">?attr/asContentBackground</item>
-    </style>
-    
-    <style name="TEA_Separator">
-        <item name="android:background">?android:attr/listDivider</item>
-    </style>
-    
     <style name="TextAppearance" parent="android:TextAppearance">
         <item name="android:textColor">?attr/asTextColor</item>    
     </style>
@@ -164,16 +137,6 @@
 
     <!--=============================================== TaskListActivity == -->
     
-    <style name="TextAppearance.TLA_NoItems">
-        <item name="android:textSize">20sp</item>
-        <item name="android:gravity">center</item>
-    </style>
-    
-    <style name="TextAppearance.TLA_Reminder">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">#000000</item>        
-    </style>
-    
     <style name="ListView">
         <item name="android:divider">?attr/asListDividerColor</item>
         <item name="android:dividerHeight">1px</item>
@@ -183,30 +146,13 @@
     </style>
 
     <!-- =============================================== TaskEditActivity == -->
-    
-    <style name="Content_EditScroll">
-        <item name="android:background">?attr/asEditBackground</item>
-    </style>
-    
-    <style name="EditRow">
-        <item name="android:background">?attr/asEditRowBackground</item>
-    </style>
-    
-   	<style name="TextAppearance.EditRowDisplay">
-   	    <item name="android:textColor">?attr/asThemeTextColor</item>
-   	</style>
 
    	<style name="TEA_Dialog" parent="@android:style/Theme.Dialog">
 	    <item name="android:windowFrame">@null</item>
 	    <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
-	    <item name="android:windowBackground">@drawable/dialog_full_holo_dark</item>
 	    <item name="android:windowIsFloating">true</item>
 	    <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
 	    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
-	    <item name="asTextColor">#ffffff</item>
-	</style>
-	
-   	<style name="TEA_Dialog.Light">
    	    <item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
    	    <item name="asTextColor">#000000</item>
    	</style>