diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index bf9983fd6..3bbf03c2b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -172,7 +172,7 @@ public class TagFilterExposer extends BroadcastReceiver {
                 new Comparator<Tag>() {
             @Override
             public int compare(Tag object1, Tag object2) {
-                return object1.tag.compareTo(object2.tag);
+                return object1.tag.compareToIgnoreCase(object2.tag);
             }
         });
         for(Iterator<Entry<String, Tag>> i = tags.entrySet().iterator(); i.hasNext(); ) {
diff --git a/astrid/res/drawable-hdpi/filter_btn_background.9.png b/astrid/res/drawable-hdpi/filter_btn_background.9.png
new file mode 100644
index 000000000..6f0ad1811
Binary files /dev/null and b/astrid/res/drawable-hdpi/filter_btn_background.9.png differ
diff --git a/astrid/res/drawable-hdpi/header_tasks_normal.png b/astrid/res/drawable-hdpi/header_tasks_normal.png
index 8aab73116..bac6f93df 100644
Binary files a/astrid/res/drawable-hdpi/header_tasks_normal.png and b/astrid/res/drawable-hdpi/header_tasks_normal.png differ
diff --git a/astrid/res/drawable/edit_titlebar.9.png b/astrid/res/drawable/edit_titlebar.9.png
index 5363c7f19..cdc2cebab 100644
Binary files a/astrid/res/drawable/edit_titlebar.9.png and b/astrid/res/drawable/edit_titlebar.9.png differ
diff --git a/astrid/res/drawable/edit_titlebar_white.9.png b/astrid/res/drawable/edit_titlebar_white.9.png
index c6f960f3a..edb98ca7e 100644
Binary files a/astrid/res/drawable/edit_titlebar_white.9.png and b/astrid/res/drawable/edit_titlebar_white.9.png differ
diff --git a/astrid/res/drawable/filter_btn_background.9.png b/astrid/res/drawable/filter_btn_background.9.png
index e3b3d5cf9..47cde5167 100644
Binary files a/astrid/res/drawable/filter_btn_background.9.png and b/astrid/res/drawable/filter_btn_background.9.png differ
diff --git a/astrid/res/drawable/filter_count.xml b/astrid/res/drawable/filter_count.xml
index 5f837e693..a9e5af08e 100644
--- a/astrid/res/drawable/filter_count.xml
+++ b/astrid/res/drawable/filter_count.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <solid
-    android:color="#aa282828" />
+    android:color="#66282828" />
   <corners
     android:bottomRightRadius="4dp"
     android:bottomLeftRadius="4dp"
diff --git a/astrid/res/layout/contact_adapter_row.xml b/astrid/res/layout/contact_adapter_row.xml
index 521ce3f09..ef2979ced 100644
--- a/astrid/res/layout/contact_adapter_row.xml
+++ b/astrid/res/layout/contact_adapter_row.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="55dip"
         style="@android:attr/dropDownItemStyle"
-        android:textAppearance="@android:attr/textAppearanceLargeInverse"
+        android:textColor="?attr/asTextColor"
         android:singleLine="true"
         android:textSize="18sp"/>
         
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 9c1a53d8b..f85a5f593 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -299,7 +299,7 @@
         android:paddingTop="15dip"
         android:text="@string/actfm_EPA_intro"
         android:gravity="center"
-        android:textColor="#ffaa00" />
+        android:textColor="#ee9900" />
     </LinearLayout>
   </ScrollView>
 
diff --git a/astrid/res/layout/task_list_body_tag.xml b/astrid/res/layout/task_list_body_tag.xml
index 91bd1a8ca..0415dc4f3 100644
--- a/astrid/res/layout/task_list_body_tag.xml
+++ b/astrid/res/layout/task_list_body_tag.xml
@@ -70,6 +70,7 @@
                             android:layout_toRightOf="@id/picture"
                             android:layout_alignParentTop="true"
                             android:layout_marginTop="10dip"
+                            style="@style/TextAppearance.GEN_EditLabel"
                             android:text="@string/actfm_TVA_tag_label" />
                           
                         <EditText
@@ -92,6 +93,7 @@
                         android:layout_height="wrap_content"
                         android:paddingTop="10dip"
                         android:paddingBottom="5dip"
+                        style="@style/TextAppearance.GEN_EditLabel"
                         android:text="@string/actfm_TVA_members_label" />
                     
                     <com.todoroo.astrid.ui.PeopleContainer
@@ -119,6 +121,7 @@
                             android:layout_width="fill_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dip"
+                            style="@style/TextAppearance.GEN_EditLabel"
                             android:text="@string/actfm_TVA_tag_owner_label" />
                           
                         <TextView
@@ -134,6 +137,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dip"
                             android:paddingLeft="45dip"
+                            style="@style/TextAppearance"
                             android:text="@string/actfm_TVA_silence_label" />
                             
                     </LinearLayout>
diff --git a/astrid/res/layout/update_adapter_row.xml b/astrid/res/layout/update_adapter_row.xml
index 4ad40bfa4..202731a93 100644
--- a/astrid/res/layout/update_adapter_row.xml
+++ b/astrid/res/layout/update_adapter_row.xml
@@ -37,6 +37,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/title"
         android:layout_alignParentLeft="true"
+        style="@style/TextAppearance.TAd_ItemDetails"
         android:paddingLeft="50dip"
         android:textSize="14sp" />
         
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index f5521c168..b9890b0ed 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -11,6 +11,7 @@
   <attr name="asDueDateCompletedColor" format="color"/>
   <attr name="asFilterHeaderColor" format="color"/>
   <attr name="asFilterHeaderBackground" format="reference"/>
+  <attr name="asFilterCountColor" format="color"/>
 
   <declare-styleable name="ContactsAutoComplete">
     <attr name="allowMultiple" format="boolean"/>
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 6c433a7a1..74df58964 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -172,6 +172,7 @@
     <item>white</item>
     <item>black</item>
     <item>transparent</item>
+    <item>transparent-white</item>
   </string-array>
     
   <string-array name="EPr_font_size">
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 37a97591e..c885c1944 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -370,7 +370,7 @@
   <string name="EPr_theme_title">Color Theme</string>
   <!-- Preference: Theme Description (%s => value) -->
   <string name="EPr_theme_desc">Currently: %s</string>  
-  <!-- Preference: Transparent Description (android 1.6) -->
+  <!-- Preference: Theme Description (android 1.6) -->
   <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
   
   <!-- Preference Category: Defaults Title -->
@@ -433,7 +433,8 @@
     <!-- theme_settings: labels for Theme preference menu -->
     <item>White</item>
     <item>Black</item>
-    <item>Transparent</item>
+    <item>Transparent (White Text)</item>
+    <item>Transparent (Black Text)</item>
   </string-array>
   
   <!-- ========================================== Task Management Settings == -->
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index d607b494f..c09c8e17a 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -25,12 +25,16 @@
         <item name="asContentBackground">@drawable/background_white</item>
         <item name="asHeaderBackground">@drawable/header_background_white</item>
         <item name="asTextColor">#ff000000</item>
-        <item name="asDetailsColor">#ff7777aa</item>
+        <item name="asDetailsColor">#ff6666aa</item>
         <item name="asDueDateColor">#ff000000</item>
         <item name="asFilterHeaderColor">#ffffff</item>
         <item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
     </style>
     
+    <style name="Theme.TransparentWhite" parent="Theme.White">
+        <item name="asContentBackground">@drawable/background_transparent</item>
+    </style>
+    
     <!--================================================== General == -->
 
     <style name="Content">
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index 5eec95ba2..ba74a338c 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -113,7 +113,7 @@ public class FilterListActivity extends ExpandableListActivity {
                 finish();
                 AndroidUtilities.callApiMethod(5, FilterListActivity.this, "overridePendingTransition", //$NON-NLS-1$
                         new Class<?>[] { Integer.TYPE, Integer.TYPE },
-                        R.anim.slide_left_in, R.anim.slide_left_out);
+                        R.anim.slide_bottom_out, 0);
             }
         });
 
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index 94681ca49..bfb831348 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -421,11 +421,13 @@ public class FilterAdapter extends BaseExpandableListAdapter {
 
         if(viewHolder.item instanceof FilterListHeader || viewHolder.item instanceof FilterCategory) {
             viewHolder.name.setTextAppearance(activity, headerStyle);
+            viewHolder.name.setShadowLayer(1, 1, 1, Color.BLACK);
             viewHolder.view.setBackgroundDrawable(headerBackground);
             viewHolder.view.setPadding((int) (7 * metrics.density), 5, 0, 5);
             viewHolder.view.getLayoutParams().height = (int) (40 * metrics.density);
         } else {
             viewHolder.name.setTextAppearance(activity, filterStyle);
+            viewHolder.name.setShadowLayer(0, 0, 0, 0);
             viewHolder.view.setPadding((int) (7 * metrics.density), 8, 0, 8);
             viewHolder.view.getLayoutParams().height = (int) (58 * metrics.density);
         }
diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java
index 75ecf1786..bfed2a5a5 100644
--- a/astrid/src/com/todoroo/astrid/service/ThemeService.java
+++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java
@@ -16,6 +16,8 @@ public class ThemeService {
             activity.setTheme(R.style.Theme);
         else if(preference != null && preference.equals("transparent"))
             activity.setTheme(R.style.Theme_Transparent);
+        else if(preference != null && preference.equals("transparent-white"))
+            activity.setTheme(R.style.Theme_TransparentWhite);
         else
             activity.setTheme(R.style.Theme_White);