diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 44403bcfc..10dca33f2 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -281,7 +281,7 @@
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
-    <activity android:name="com.todoroo.astrid.core.CustomFilterActivity" android:theme="@style/Theme_Dialog" />
+    <activity android:name="com.todoroo.astrid.core.CustomFilterActivity" android:theme="@style/Theme.Dialog" />
     <activity android:name="com.todoroo.astrid.core.CustomFilterExposer$DeleteActivity" android:theme="@style/Theme.FullTransparent" />
     <activity android:name="com.todoroo.astrid.tags.TagFilterExposer$DeleteTagActivity" android:theme="@style/Theme.FullTransparent" />
     <activity android:name="com.todoroo.astrid.tags.TagFilterExposer$RenameTagActivity" android:theme="@style/Theme.FullTransparent" />
@@ -334,7 +334,7 @@
               android:theme="@android:style/Theme.Dialog"/>
     <activity android:name="com.todoroo.astrid.actfm.TagSettingsActivity"
               android:windowSoftInputMode="stateHidden"
-              android:theme="@style/Theme_Dialog"/>
+              android:theme="@style/Theme.Dialog"/>
     <activity android:name="com.todoroo.astrid.actfm.TagUpdatesActivity"
               android:windowSoftInputMode="stateHidden"/>
     <!-- <receiver android:name="com.todoroo.astrid.actfm.EditPeopleExposer">
@@ -443,7 +443,7 @@
     <!-- backup -->
     <service android:name="com.todoroo.astrid.backup.BackupService"/>
     <activity android:name="com.todoroo.astrid.backup.BackupActivity"
-              android:theme="@style/Theme_Dialog" />
+              android:theme="@style/Theme.Dialog" />
     <activity android:name="com.todoroo.astrid.backup.BackupPreferences"
               android:theme="@android:style/Theme" 
               android:label="@string/backup_BPr_header">
@@ -481,22 +481,7 @@
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>
-    <!-- <receiver android:name="com.todoroo.astrid.notes.EditNoteExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_ACTIONS" />
-        <action android:name="com.todoroo.astrid.EDIT_NOTES" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>       -->
-                  
-    <!-- timers -->
-    <!-- <receiver android:name="com.todoroo.astrid.timers.TimerActionExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_ACTIONS" />
-        <action android:name="com.todoroo.astrid.TIMER_BUTTON" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver> -->
+
     <receiver android:name="com.todoroo.astrid.timers.TimerFilterExposer">
       <intent-filter android:priority="10000">
         <action android:name="com.todoroo.astrid.REQUEST_FILTERS" />
diff --git a/astrid/res/drawable/task_edit_background_transparent.xml b/astrid/res/drawable/task_edit_background_transparent_black.xml
similarity index 100%
rename from astrid/res/drawable/task_edit_background_transparent.xml
rename to astrid/res/drawable/task_edit_background_transparent_black.xml
diff --git a/astrid/res/drawable/task_edit_background_transparent_white.xml b/astrid/res/drawable/task_edit_background_transparent_white.xml
new file mode 100644
index 000000000..62fcd147a
--- /dev/null
+++ b/astrid/res/drawable/task_edit_background_transparent_white.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!-- Bottom 2dp Shadow -->
+    <item>
+        <shape android:shape="rectangle" >
+            <gradient
+                android:endColor="#33eeeeee"
+                android:startColor="#33d8d8d8" />
+
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+    <item android:bottom="2dp" android:right="1dp">
+        <shape android:shape="rectangle" >
+            <solid android:color="#33ffffff" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index b1abceb21..37ae07518 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -9,6 +9,7 @@
   <attr name="asHeaderBackground" format="reference"/>
   <attr name="asHeaderButtonBackground" format="reference"/>
   <attr name="asTextColor" format="color"/>
+  <attr name="asTextColorInverse" format="color"/>
   <attr name="asDetailsColor" format="color"/>
   <attr name="asDueDateColor" format="color"/>
   <attr name="asDueDateOverdueColor" format="color"/>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index a59a8c09f..03e492369 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -9,12 +9,13 @@
         <item name="asContentBackground">@android:color/black</item>
         <item name="asHeaderButtonBackground">@drawable/header_button</item>
         <item name="asSeparatorBackground">@android:drawable/divider_horizontal_dark</item>
-        <item name="asTextColor">#ffffffff</item>
-        <item name="asDetailsColor">#ff777777</item>
+        <item name="asTextColor">#ffffff</item>
+        <item name="asTextColorInverse">#000000</item>
+        <item name="asDetailsColor">#777777</item>
         <item name="asDueDateColor">#878787</item>
-        <item name="asDueDateOverdueColor">#ffee5555</item>
+        <item name="asDueDateOverdueColor">#ee5555</item>
         <item name="asDueDateCompletedColor">#ff777777</item>
-        <item name="asFilterHeaderColor">#ffcccccc</item>
+        <item name="asFilterHeaderColor">#cccccc</item>
         <item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
         <item name="asMembersHeaderBackground">@drawable/ios_fabric_480_dark</item>
         <item name="asSeparatorBackground">#888888</item>
@@ -43,28 +44,21 @@
 		<item name="asContentBackground">#22000000</item>
         <item name="abBackground">#aa000000</item>
         <item name="asEditBackground">#33272327</item>
-        <item name="asEditRowBackground">@drawable/task_edit_background_transparent</item>
+        <item name="asEditRowBackground">@drawable/task_edit_background_transparent_black</item>
         <item name="asMembersHeaderBackground">@android:color/transparent</item>
          
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowShowWallpaper">true</item>
     </style>
-    
-    <style name="Theme.FullTransparent" parent="@style/Theme.Sherlock">
-        <item name="android:windowIsTranslucent">true</item>
-	    <item name="android:windowBackground">@android:color/transparent</item>
-	    <item name="android:windowContentOverlay">@null</item>
-	    <item name="android:backgroundDimEnabled">false</item>
-	    <item name="android:windowIsFloating">true</item>
-	</style>
         
     <style name="Theme.White" parent="@style/Theme.Sherlock.Light">
         <item name="asContentBackground">@android:color/white</item>
         <item name="asEditBackground">#f7f3f7</item>
         <item name="asHeaderButtonBackground">@drawable/header_button_white</item>
-        <item name="asTextColor">#ff000000</item>
-        <item name="asDetailsColor">#ff6666aa</item>
+        <item name="asTextColor">#000000</item>
+        <item name="asTextColorInverse">#ffffff</item>
+        <item name="asDetailsColor">#6666aa</item>
         <item name="asDueDateColor">#878787</item>
         <item name="asFilterHeaderColor">#ffffff</item>
         <item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
@@ -87,18 +81,27 @@
         <item name="abLogo">@drawable/icon_48</item>
     </style>
     
-    <style name="Theme.TransparentWhite" parent="@style/Theme.White">
-        <item name="asContentBackground">@android:color/transparent</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+    <style name="Theme.TransparentWhite" parent="Theme.White">
+        <item name="asContentBackground">#22ffffff</item>
+        <item name="abBackground">#aaffffff</item>
+        <item name="asEditBackground">#33f7f3f7</item>
+        <item name="asEditRowBackground">@drawable/task_edit_background_transparent_white</item>
         <item name="asMembersHeaderBackground">@android:color/transparent</item>
-        <!-- actionbar-styling -->
-        <item name="abBackground">@android:color/white</item>
-        <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
-        <item name="abLogo">@drawable/icon_48</item>
+         
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowShowWallpaper">true</item>
     </style>
     
-    <style name="Theme_Dialog" parent="@android:style/Theme.Dialog">
+    <style name="Theme.FullTransparent" parent="@style/Theme.Sherlock">
+        <item name="android:windowIsTranslucent">true</item>
+	    <item name="android:windowBackground">@android:color/transparent</item>
+	    <item name="android:windowContentOverlay">@null</item>
+	    <item name="android:backgroundDimEnabled">false</item>
+	    <item name="android:windowIsFloating">true</item>
+	</style>
+    
+    <style name="Theme.Dialog" parent="@android:style/Theme.Dialog">
         <item name="android:windowBackground">@null</item>
         <item name="asContentBackground">@android:color/black</item>
         <item name="asHeaderButtonBackground">@drawable/header_button</item>
@@ -130,7 +133,7 @@
         <item name="android:colorBackgroundCacheHint">@null</item>
     </style>
     
-    <style name="Theme_Dialog.White">
+    <style name="Theme.Dialog.White">
         <item name="asContentBackground">@android:color/white</item>
         <item name="asHeaderButtonBackground">@drawable/header_button_white</item>
         <item name="asTextColor">#ff000000</item>
@@ -168,11 +171,6 @@
         <item name="android:textStyle">bold</item>
     </style>
     
-    
-   	<style name="TextAppearance.GEN_EditLabel.DLG_EditLabel">
-   	    <!--  <item name="android:textColor">@android:color/white</item> -->
-   	</style>
-   	
    	<style name="TextAppearance.ActionBar_ListsHeader">
    	    <item name="android:background">@android:color/transparent</item>
    	    <item name="android:textColor">?attr/asThemeTextColor</item>
@@ -181,7 +179,7 @@
    	</style>
    	
    	<style name="TextAppearance.ActionBar_ListsHeader.Selected">   	    
-   	    <item name="android:textColor">?attr/asContentBackground</item>
+   	    <item name="android:textColor">?attr/asTextColorInverse</item>
    	</style>
    	
     <!--================================================== Custom Dialogs == -->
@@ -245,6 +243,9 @@
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">?attr/asThemeTextColor</item>        
     </style>
+    
+    <style name="TextAppearance.GEN_EditLabel.DLG_EditLabel">
+    </style>
    	
    	<style name="Theme.WhenDialog">
    	    <item name="android:windowAnimationStyle">@style/TEA_WhenDialog_Anim</item>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 92aba3bcf..9c12c9834 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -251,7 +251,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
 	private void setListsDropdownSelected(boolean selected) {
 	    int oldTextColor = lists.getTextColors().getDefaultColor();
-	    int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : R.style.TextAppearance_ActionBar_ListsHeader);
+	    int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected :
+	        R.style.TextAppearance_ActionBar_ListsHeader);
 
 	    TypedValue listDisclosure = new TypedValue();
 	    getTheme().resolveAttribute(R.attr.asListsDisclosure, listDisclosure, false);