From 263f12cda75365cbe0f238d1b9529f8ccb5ab3ec Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Wed, 19 Jun 2013 16:22:46 +0200
Subject: [PATCH] Clean up of theme XML and fix font in action bar.

---
 .../progress_horizontal_transdroid.xml        | 34 ------------
 .../progress_horizontal_transdroid2.xml       | 35 ------------
 core/res/layout/actionbar_serverstatus.xml    | 12 +++-
 .../res/values-v11/styles_transdroid_dark.xml | 55 +++++--------------
 .../values-v11/styles_transdroid_light.xml    | 24 +++-----
 .../res/values-v14/styles_transdroid_dark.xml | 55 +++++--------------
 .../values-v14/styles_transdroid_light.xml    | 28 +++-------
 core/res/values-v16/styles.xml                | 11 +++-
 core/res/values/styles_transdroid_dark.xml    | 42 ++++----------
 core/res/values/styles_transdroid_light.xml   | 40 +++++---------
 10 files changed, 90 insertions(+), 246 deletions(-)
 delete mode 100644 core/res/drawable/progress_horizontal_transdroid.xml
 delete mode 100644 core/res/drawable/progress_horizontal_transdroid2.xml

diff --git a/core/res/drawable/progress_horizontal_transdroid.xml b/core/res/drawable/progress_horizontal_transdroid.xml
deleted file mode 100644
index 585c2b73..00000000
--- a/core/res/drawable/progress_horizontal_transdroid.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- File created by the Android Action Bar Style Generator
-
-     Copyright (C) 2012 readyState Software Ltd
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@android:id/background"
-          android:drawable="@drawable/progress_bg_transdroid" />
-
-    <item android:id="@android:id/secondaryProgress">
-        <scale android:scaleWidth="100%"
-               android:drawable="@drawable/progress_secondary_transdroid" />
-    </item>
-
-    <item android:id="@android:id/progress">
-        <scale android:scaleWidth="100%"
-               android:drawable="@drawable/progress_primary_transdroid" />
-    </item>
-
-</layer-list>
diff --git a/core/res/drawable/progress_horizontal_transdroid2.xml b/core/res/drawable/progress_horizontal_transdroid2.xml
deleted file mode 100644
index a3439973..00000000
--- a/core/res/drawable/progress_horizontal_transdroid2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- File created by the Android Action Bar Style Generator
-
-     Copyright (C) 2011 The Android Open Source Project
-     Copyright (C) 2012 readyState Software Ltd
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@android:id/background"
-          android:drawable="@drawable/progress_bg_transdroid2" />
-
-    <item android:id="@android:id/secondaryProgress">
-        <scale android:scaleWidth="100%"
-               android:drawable="@drawable/progress_secondary_transdroid2" />
-    </item>
-
-    <item android:id="@android:id/progress">
-        <scale android:scaleWidth="100%"
-               android:drawable="@drawable/progress_primary_transdroid2" />
-    </item>
-
-</layer-list>
diff --git a/core/res/layout/actionbar_serverstatus.xml b/core/res/layout/actionbar_serverstatus.xml
index 11874b86..e5370b6a 100644
--- a/core/res/layout/actionbar_serverstatus.xml
+++ b/core/res/layout/actionbar_serverstatus.xml
@@ -3,16 +3,17 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="?attr/actionBarSize"
-	android:paddingRight="@dimen/margin_default"
-	android:paddingTop="@dimen/ui_serverstatus_margin"
 	android:background="?attr/selectable_background_transdroid"
-	android:clickable="true" >
+	android:clickable="true"
+	android:paddingRight="@dimen/margin_default"
+	android:paddingTop="@dimen/ui_serverstatus_margin" >
 
 	<TextView
 		android:id="@+id/upcount_sign"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignParentRight="true"
+		android:fontFamily="sans-serif-light"
 		android:paddingTop="@dimen/ui_serverstatus_signmargin"
 		android:text="↑"
 		android:textColor="?attr/text_bright"
@@ -25,6 +26,7 @@
 		android:layout_width="@dimen/ui_serverstatus_width"
 		android:layout_height="wrap_content"
 		android:layout_toLeftOf="@id/upcount_sign"
+		android:fontFamily="sans-serif-light"
 		android:gravity="end"
 		android:textColor="?attr/text_bright"
 		android:textSize="@dimen/ui_serverstatus_bignumber" />
@@ -34,6 +36,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_toLeftOf="@id/upcount_text"
+		android:fontFamily="sans-serif-light"
 		android:paddingTop="@dimen/ui_serverstatus_signmargin"
 		android:text="↓"
 		android:textColor="?attr/text_bright"
@@ -46,6 +49,7 @@
 		android:layout_width="@dimen/ui_serverstatus_width"
 		android:layout_height="wrap_content"
 		android:layout_toLeftOf="@id/downcount_sign"
+		android:fontFamily="sans-serif-light"
 		android:gravity="end"
 		android:textColor="?attr/text_bright"
 		android:textSize="@dimen/ui_serverstatus_bignumber" />
@@ -58,6 +62,7 @@
 		android:layout_alignParentRight="true"
 		android:layout_below="@id/upcount_text"
 		android:layout_marginTop="-4dip"
+		android:fontFamily="sans-serif-light"
 		android:gravity="end"
 		android:textColor="?attr/text_bright"
 		android:textSize="@dimen/ui_serverstatus_smallnumber" />
@@ -70,6 +75,7 @@
 		android:layout_alignRight="@id/downcount_sign"
 		android:layout_below="@id/downcount_text"
 		android:layout_marginTop="-4dip"
+		android:fontFamily="sans-serif-light"
 		android:gravity="end"
 		android:textColor="?attr/text_bright"
 		android:textSize="@dimen/ui_serverstatus_smallnumber" />
diff --git a/core/res/values-v11/styles_transdroid_dark.xml b/core/res/values-v11/styles_transdroid_dark.xml
index 51a3dfd0..bf417f3e 100644
--- a/core/res/values-v11/styles_transdroid_dark.xml
+++ b/core/res/values-v11/styles_transdroid_dark.xml
@@ -20,55 +20,43 @@
 
     <style name="Theme.Transdroid.Dark" parent="@style/Theme.Sherlock">
         <item name="actionBarItemBackground">@drawable/selectable_background_transdroid</item>
-        <item name="popupMenuStyle">@style/transdroid_PopupMenu</item>
-        <item name="dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-        <item name="actionBarTabStyle">@style/transdroid_ActionBarTabStyle</item>
-        <item name="actionDropDownStyle">@style/transdroid_DropDownNav</item>
-        <item name="actionBarStyle">@style/transdroid_solid_ActionBar</item>
+        <item name="popupMenuStyle">@style/PopupMenu.Transdroid.Dark</item>
+        <item name="dropDownListViewStyle">@style/DropDownListView.Transdroid.Dark</item>
+        <item name="actionBarTabStyle">@style/ActionBarTabStyle.Transdroid.Dark</item>
+        <item name="actionDropDownStyle">@style/DropDownNav.Transdroid.Dark</item>
+        <item name="actionBarStyle">@style/ActionBar.Solid.Transdroid.Dark</item>
 
-        <item name="android:popupMenuStyle">@style/transdroid_PopupMenu</item>
-        <item name="android:dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-        <item name="android:actionBarTabStyle">@style/transdroid_ActionBarTabStyle</item>
-        <item name="android:actionDropDownStyle">@style/transdroid_DropDownNav</item>
-        <item name="android:actionBarStyle">@style/transdroid_solid_ActionBar</item>
+        <item name="android:popupMenuStyle">@style/PopupMenu.Transdroid.Dark</item>
+        <item name="android:dropDownListViewStyle">@style/DropDownListView.Transdroid.Dark</item>
+        <item name="android:actionBarTabStyle">@style/ActionBarTabStyle.Transdroid.Dark</item>
+        <item name="android:actionDropDownStyle">@style/ActionBarTabStyle.Transdroid.Dark</item>
+        <item name="android:actionBarStyle">@style/ActionBar.Solid.Transdroid.Dark</item>
         <item name="android:panelBackground">@drawable/menu_hardkey_panel_transdroid</item>
-        
-        
     </style>
 
-    <style name="transdroid_solid_ActionBar" parent="@style/Widget.Sherlock.ActionBar.Solid">
+    <style name="ActionBar.Solid.Transdroid.Dark" parent="@style/Widget.Sherlock.ActionBar.Solid">
         <item name="background">@drawable/ab_solid_transdroid</item>
         <item name="backgroundStacked">@drawable/ab_stacked_solid_transdroid</item>
         <item name="backgroundSplit">@drawable/ab_bottom_solid_transdroid</item>
-        <item name="progressBarStyle">@style/transdroid_ProgressBar</item>
 
         <item name="android:background">@drawable/ab_solid_transdroid</item>
-        <item name="android:progressBarStyle">@style/transdroid_ProgressBar</item>
     </style>
 
-    <style name="transdroid_transparent_ActionBar" parent="@style/Widget.Sherlock.ActionBar">
-        <item name="background">@drawable/ab_transparent_transdroid</item>
-        <item name="progressBarStyle">@style/transdroid_ProgressBar</item>
-        
-        <item name="android:background">@drawable/ab_transparent_transdroid</item>
-        <item name="android:progressBarStyle">@style/transdroid_ProgressBar</item>
-    </style>
-	
-    <style name="transdroid_PopupMenu" parent="@style/Widget.Sherlock.ListPopupWindow">	
+    <style name="PopupMenu.Transdroid.Dark" parent="@style/Widget.Sherlock.ListPopupWindow">	
         <item name="android:popupBackground">@drawable/menu_dropdown_panel_transdroid</item>	
     </style>
 	
-    <style name="transdroid_DropDownListView" parent="@style/Widget.Sherlock.ListView.DropDown">
+    <style name="DropDownListView.Transdroid.Dark" parent="@style/Widget.Sherlock.ListView.DropDown">
         <item name="android:listSelector">@drawable/selectable_background_transdroid</item>
     </style>
 
-    <style name="transdroid_ActionBarTabStyle" parent="@style/Widget.Sherlock.ActionBar.TabView">
+    <style name="ActionBarTabStyle.Transdroid.Dark" parent="@style/Widget.Sherlock.ActionBar.TabView">
         <item name="background">@drawable/tab_indicator_ab_transdroid</item>
 
         <item name="android:background">@drawable/tab_indicator_ab_transdroid</item>
     </style>
 	
-    <style name="transdroid_DropDownNav" parent="@style/Widget.Sherlock.Spinner.DropDown.ActionBar">
+    <style name="DropDownNav.Transdroid.Dark" parent="@style/Widget.Sherlock.Spinner.DropDown.ActionBar">
         <item name="background">@drawable/spinner_background_ab_transdroid</item>
 
         <item name="android:background">@drawable/spinner_background_ab_transdroid</item>
@@ -76,17 +64,4 @@
         <item name="android:dropDownSelector">@drawable/selectable_background_transdroid</item>
     </style>
     
-    <style name="transdroid_ProgressBar" parent="@style/Widget.Sherlock.ProgressBar.Horizontal">
-        <item name="android:progressDrawable">@drawable/progress_horizontal_transdroid</item>
-    </style>
-    
-    <!-- this style is only referenced in a Light.DarkActionBar based theme -->
-    <style name="Theme.transdroid.widget" parent="@style/Theme.Sherlock">
-        <item name="popupMenuStyle">@style/transdroid_PopupMenu</item>
-        <item name="dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-        
-        <item name="android:popupMenuStyle">@style/transdroid_PopupMenu</item>
-        <item name="android:dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/core/res/values-v11/styles_transdroid_light.xml b/core/res/values-v11/styles_transdroid_light.xml
index f9248492..03a595ff 100644
--- a/core/res/values-v11/styles_transdroid_light.xml
+++ b/core/res/values-v11/styles_transdroid_light.xml
@@ -17,34 +17,26 @@
      limitations under the License.
 -->
 
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="Theme.Transdroid.Light" parent="@style/Theme.Sherlock.Light">
         <item name="android:popupMenuStyle">@style/PopupMenu.Transdroid2</item>
-        <item name="android:dropDownListViewStyle">@style/DropDownListView.Transdroid2</item>
-        <item name="android:actionBarTabStyle">@style/ActionBarTabStyle.Transdroid2</item>
-        <item name="android:actionDropDownStyle">@style/DropDownNav.Transdroid2</item>
-        <item name="android:actionBarStyle">@style/ActionBar.Solid.Transdroid2</item>
+        <item name="android:dropDownListViewStyle">@style/DropDownListView.Transdroid.Light</item>
+        <item name="android:actionBarTabStyle">@style/ActionBarTabStyle.Transdroid.Light</item>
+        <item name="android:actionDropDownStyle">@style/DropDownNav.Transdroid.Light</item>
+        <item name="android:actionBarStyle">@style/ActionBar.Solid.Transdroid.Light</item>
         <item name="android:actionModeBackground">@drawable/cab_background_top_transdroid2</item>
-        <item name="android:actionModeCloseButtonStyle">@style/ActionButton.CloseMode.Transdroid2</item>
+        <item name="android:actionModeCloseButtonStyle">@style/ActionButton.CloseMode.Transdroid.Light</item>
         
         
     </style>
 
-    <style name="ActionBar.Solid.Transdroid2" parent="@style/Widget.Sherlock.Light.ActionBar.Solid">
+    <style name="ActionBar.Solid.Transdroid.Light" parent="@style/Widget.Sherlock.Light.ActionBar.Solid">
         <item name="android:background">@drawable/ab_solid_transdroid2</item>
-        <item name="android:progressBarStyle">@style/ProgressBar.Transdroid2</item>
     </style>
 
-    <style name="ActionBar.Transparent.Transdroid2" parent="@style/Widget.Sherlock.Light.ActionBar">
+    <style name="ActionBar.Transparent.Transdroid.Light" parent="@style/Widget.Sherlock.Light.ActionBar">
         <item name="android:background">@drawable/ab_transparent_transdroid2</item>
-        <item name="android:progressBarStyle">@style/ProgressBar.Transdroid2</item>
     </style>
     
-    <!-- this style is only referenced in a Light.DarkActionBar based theme -->
-    <style name="Theme.Transdroid2.Widget" parent="@style/Theme.Sherlock">
-        <item name="android:popupMenuStyle">@style/PopupMenu.Transdroid2</item>
-        <item name="android:dropDownListViewStyle">@style/DropDownListView.Transdroid2</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/core/res/values-v14/styles_transdroid_dark.xml b/core/res/values-v14/styles_transdroid_dark.xml
index 0c3300c7..62a740a1 100644
--- a/core/res/values-v14/styles_transdroid_dark.xml
+++ b/core/res/values-v14/styles_transdroid_dark.xml
@@ -20,58 +20,46 @@
 
     <style name="Theme.Transdroid.Dark" parent="@style/Theme.Sherlock">
         <item name="actionBarItemBackground">@drawable/selectable_background_transdroid</item>
-        <item name="popupMenuStyle">@style/transdroid_PopupMenu</item>
-        <item name="dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-        <item name="actionBarTabStyle">@style/transdroid_ActionBarTabStyle</item>
-        <item name="actionDropDownStyle">@style/transdroid_DropDownNav</item>
-        <item name="actionBarStyle">@style/transdroid_solid_ActionBar</item>
+        <item name="popupMenuStyle">@style/PopupMenu.Transdroid.Dark</item>
+        <item name="dropDownListViewStyle">@style/DropDownListView.Transdroid.Dark</item>
+        <item name="actionBarTabStyle">@style/ActionBarTabStyle.Transdroid.Dark</item>
+        <item name="actionDropDownStyle">@style/DropDownNav.Transdroid.Dark</item>
+        <item name="actionBarStyle">@style/ActionBar.Solid.Transdroid.Dark</item>
 
         <item name="android:actionBarItemBackground">@drawable/selectable_background_transdroid</item>
-        <item name="android:popupMenuStyle">@style/transdroid_PopupMenu</item>
-        <item name="android:dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-        <item name="android:actionBarTabStyle">@style/transdroid_ActionBarTabStyle</item>
-        <item name="android:actionDropDownStyle">@style/transdroid_DropDownNav</item>
-        <item name="android:actionBarStyle">@style/transdroid_solid_ActionBar</item>
+        <item name="android:popupMenuStyle">@style/PopupMenu.Transdroid.Dark</item>
+        <item name="android:dropDownListViewStyle">@style/DropDownListView.Transdroid.Dark</item>
+        <item name="android:actionBarTabStyle">@style/ActionBarTabStyle.Transdroid.Dark</item>
+        <item name="android:actionDropDownStyle">@style/DropDownNav.Transdroid.Dark</item>
+        <item name="android:actionBarStyle">@style/ActionBar.Solid.Transdroid.Dark</item>
         <item name="android:panelBackground">@drawable/menu_hardkey_panel_transdroid</item>
-        
-        
     </style>
 
-    <style name="transdroid_solid_ActionBar" parent="@style/Widget.Sherlock.ActionBar.Solid">
+    <style name="ActionBar.Solid.Transdroid.Dark" parent="@style/Widget.Sherlock.ActionBar.Solid">
         <item name="background">@drawable/ab_solid_transdroid</item>
         <item name="backgroundStacked">@drawable/ab_stacked_solid_transdroid</item>
         <item name="backgroundSplit">@drawable/ab_bottom_solid_transdroid</item>
-        <item name="progressBarStyle">@style/transdroid_ProgressBar</item>
 
         <item name="android:background">@drawable/ab_solid_transdroid</item>
         <item name="android:backgroundStacked">@drawable/ab_stacked_solid_transdroid</item>
         <item name="android:backgroundSplit">@drawable/ab_bottom_solid_transdroid</item>
-        <item name="android:progressBarStyle">@style/transdroid_ProgressBar</item>
     </style>
 
-    <style name="transdroid_transparent_ActionBar" parent="@style/Widget.Sherlock.ActionBar">
-        <item name="background">@drawable/ab_transparent_transdroid</item>
-        <item name="progressBarStyle">@style/transdroid_ProgressBar</item>
-        
-        <item name="android:background">@drawable/ab_transparent_transdroid</item>
-        <item name="android:progressBarStyle">@style/transdroid_ProgressBar</item>
-    </style>
-	
-    <style name="transdroid_PopupMenu" parent="@style/Widget.Sherlock.ListPopupWindow">	
+    <style name="PopupMenu.Transdroid.Dark" parent="@style/Widget.Sherlock.ListPopupWindow">	
         <item name="android:popupBackground">@drawable/menu_dropdown_panel_transdroid</item>	
     </style>
 	
-    <style name="transdroid_DropDownListView" parent="@style/Widget.Sherlock.ListView.DropDown">
+    <style name="DropDownListView.Transdroid.Dark" parent="@style/Widget.Sherlock.ListView.DropDown">
         <item name="android:listSelector">@drawable/selectable_background_transdroid</item>
     </style>
 
-    <style name="transdroid_ActionBarTabStyle" parent="@style/Widget.Sherlock.ActionBar.TabView">
+    <style name="ActionBarTabStyle.Transdroid.Dark" parent="@style/Widget.Sherlock.ActionBar.TabView">
         <item name="background">@drawable/tab_indicator_ab_transdroid</item>
 
         <item name="android:background">@drawable/tab_indicator_ab_transdroid</item>
     </style>
 	
-    <style name="transdroid_DropDownNav" parent="@style/Widget.Sherlock.Spinner.DropDown.ActionBar">
+    <style name="DropDownNav.Transdroid.Dark" parent="@style/Widget.Sherlock.Spinner.DropDown.ActionBar">
         <item name="background">@drawable/spinner_background_ab_transdroid</item>
 
         <item name="android:background">@drawable/spinner_background_ab_transdroid</item>
@@ -79,17 +67,4 @@
         <item name="android:dropDownSelector">@drawable/selectable_background_transdroid</item>
     </style>
     
-    <style name="transdroid_ProgressBar" parent="@style/Widget.Sherlock.ProgressBar.Horizontal">
-        <item name="android:progressDrawable">@drawable/progress_horizontal_transdroid</item>
-    </style>
-    
-    <!-- this style is only referenced in a Light.DarkActionBar based theme -->
-    <style name="Theme.transdroid.widget" parent="@style/Theme.Sherlock">
-        <item name="popupMenuStyle">@style/transdroid_PopupMenu</item>
-        <item name="dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-        
-        <item name="android:popupMenuStyle">@style/transdroid_PopupMenu</item>
-        <item name="android:dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/core/res/values-v14/styles_transdroid_light.xml b/core/res/values-v14/styles_transdroid_light.xml
index f916bd11..242309f8 100644
--- a/core/res/values-v14/styles_transdroid_light.xml
+++ b/core/res/values-v14/styles_transdroid_light.xml
@@ -17,38 +17,28 @@
      limitations under the License.
 -->
 
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="Theme.Transdroid.Light" parent="@style/Theme.Sherlock.Light">
         <item name="android:actionBarItemBackground">@drawable/selectable_background_transdroid2</item>
-        <item name="android:popupMenuStyle">@style/PopupMenu.Transdroid2</item>
-        <item name="android:dropDownListViewStyle">@style/DropDownListView.Transdroid2</item>
-        <item name="android:actionBarTabStyle">@style/ActionBarTabStyle.Transdroid2</item>
-        <item name="android:actionDropDownStyle">@style/DropDownNav.Transdroid2</item>
-        <item name="android:actionBarStyle">@style/ActionBar.Solid.Transdroid2</item>
+        <item name="android:popupMenuStyle">@style/PopupMenu.Transdroid.Light</item>
+        <item name="android:dropDownListViewStyle">@style/DropDownListView.Transdroid.Light</item>
+        <item name="android:actionBarTabStyle">@style/ActionBarTabStyle.Transdroid.Light</item>
+        <item name="android:actionDropDownStyle">@style/DropDownNav.Transdroid.Light</item>
+        <item name="android:actionBarStyle">@style/ActionBar.Solid.Transdroid.Light</item>
         <item name="android:actionModeBackground">@drawable/cab_background_top_transdroid2</item>
         <item name="android:actionModeSplitBackground">@drawable/cab_background_bottom_transdroid2</item>
-        <item name="android:actionModeCloseButtonStyle">@style/ActionButton.CloseMode.Transdroid2</item>
-        
-        
+        <item name="android:actionModeCloseButtonStyle">@style/ActionButton.CloseMode.Transdroid.Light</item>
     </style>
 
-    <style name="ActionBar.Solid.Transdroid2" parent="@style/Widget.Sherlock.Light.ActionBar.Solid">
+    <style name="ActionBar.Solid.Transdroid.Light" parent="@style/Widget.Sherlock.Light.ActionBar.Solid">
         <item name="android:background">@drawable/ab_solid_transdroid2</item>
         <item name="android:backgroundStacked">@drawable/ab_stacked_solid_transdroid2</item>
         <item name="android:backgroundSplit">@drawable/ab_bottom_solid_transdroid2</item>
-        <item name="android:progressBarStyle">@style/ProgressBar.Transdroid2</item>
     </style>
 
-    <style name="ActionBar.Transparent.Transdroid2" parent="@style/Widget.Sherlock.Light.ActionBar">
+    <style name="ActionBar.Transparent.Transdroid.Light" parent="@style/Widget.Sherlock.Light.ActionBar">
         <item name="android:background">@drawable/ab_transparent_transdroid2</item>
-        <item name="android:progressBarStyle">@style/ProgressBar.Transdroid2</item>
     </style>
     
-    <!-- this style is only referenced in a Light.DarkActionBar based theme -->
-    <style name="Theme.Transdroid2.Widget" parent="@style/Theme.Sherlock">
-        <item name="android:popupMenuStyle">@style/PopupMenu.Transdroid2</item>
-        <item name="android:dropDownListViewStyle">@style/DropDownListView.Transdroid2</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/core/res/values-v16/styles.xml b/core/res/values-v16/styles.xml
index 6570d483..35fbd18b 100644
--- a/core/res/values-v16/styles.xml
+++ b/core/res/values-v16/styles.xml
@@ -1,5 +1,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <style name="PopupMenu.Transdroid2" parent="@style/Widget.Sherlock.Light.ListPopupWindow">	
+        <item name="android:popupBackground">@drawable/menu_dropdown_panel_transdroid2</item>
+		<item name="android:fontFamily">sans-serif</item>
+    </style>
+	
+    <style name="PopupMenu.Transdroid.Dark" parent="@style/Widget.Sherlock.ListPopupWindow">	
+        <item name="android:popupBackground">@drawable/menu_dropdown_panel_transdroid</item>
+		<item name="android:fontFamily">sans-serif</item>
+    </style>
+	
 	<!-- Taken from http://stackoverflow.com/questions/10020466/android-4-0-sub-title-section-label-styling -->
 	<style name="SectionHeader" parent="android:Widget.Holo.Light.TextView">
 		<item name="android:drawableBottom">@drawable/section_header</item>
@@ -13,7 +23,6 @@
 	
 	<style name="DefaultTextView" parent="android:Widget.Holo.Light.TextView">
 		<item name="android:textSize">@dimen/text_default</item>
-		<item name="android:fontFamily">sans-serif-light</item>
 	</style>
 
 	<style name="LabelTextView" parent="android:Widget.Holo.Light.TextView">
diff --git a/core/res/values/styles_transdroid_dark.xml b/core/res/values/styles_transdroid_dark.xml
index 67651e0f..d3fbf97d 100644
--- a/core/res/values/styles_transdroid_dark.xml
+++ b/core/res/values/styles_transdroid_dark.xml
@@ -20,46 +20,36 @@
 
     <style name="Theme.Transdroid.Dark" parent="@style/Theme.Sherlock">
         <item name="actionBarItemBackground">@drawable/selectable_background_transdroid</item>
-        <item name="popupMenuStyle">@style/transdroid_PopupMenu</item>
-        <item name="dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-        <item name="actionBarTabStyle">@style/transdroid_ActionBarTabStyle</item>
-        <item name="actionDropDownStyle">@style/transdroid_DropDownNav</item>
-        <item name="actionBarStyle">@style/transdroid_solid_ActionBar</item>
+        <item name="popupMenuStyle">@style/PopupMenu.Transdroid.Dark</item>
+        <item name="dropDownListViewStyle">@style/DropDownListView.Transdroid.Dark</item>
+        <item name="actionBarTabStyle">@style/ActionBarTabStyle.Transdroid.Dark</item>
+        <item name="actionDropDownStyle">@style/DropDownNav.Transdroid.Dark</item>
+        <item name="actionBarStyle">@style/ActionBar.Solid.Transdroid.Dark</item>
     </style>
 
-    <style name="transdroid_solid_ActionBar" parent="@style/Widget.Sherlock.ActionBar.Solid">
+    <style name="ActionBar.Solid.Transdroid.Dark" parent="@style/Widget.Sherlock.ActionBar.Solid">
         <item name="background">@drawable/ab_solid_transdroid</item>
         <item name="backgroundStacked">@drawable/ab_stacked_solid_transdroid</item>
         <item name="backgroundSplit">@drawable/ab_bottom_solid_transdroid</item>
-        <item name="progressBarStyle">@style/transdroid_ProgressBar</item>
 
         <item name="android:background">@drawable/ab_solid_transdroid</item>
-        <item name="android:progressBarStyle">@style/transdroid_ProgressBar</item>
     </style>
 
-    <style name="transdroid_transparent_ActionBar" parent="@style/Widget.Sherlock.ActionBar">
-        <item name="background">@drawable/ab_transparent_transdroid</item>
-        <item name="progressBarStyle">@style/transdroid_ProgressBar</item>
-        
-        <item name="android:background">@drawable/ab_transparent_transdroid</item>
-        <item name="android:progressBarStyle">@style/transdroid_ProgressBar</item>
-    </style>
-	
-    <style name="transdroid_PopupMenu" parent="@style/Widget.Sherlock.ListPopupWindow">	
+    <style name="PopupMenu.Transdroid.Dark" parent="@style/Widget.Sherlock.ListPopupWindow">	
         <item name="android:popupBackground">@drawable/menu_dropdown_panel_transdroid</item>	
     </style>
 	
-    <style name="transdroid_DropDownListView" parent="@style/Widget.Sherlock.ListView.DropDown">
+    <style name="DropDownListView.Transdroid.Dark" parent="@style/Widget.Sherlock.ListView.DropDown">
         <item name="android:listSelector">@drawable/selectable_background_transdroid</item>
     </style>
 
-    <style name="transdroid_ActionBarTabStyle" parent="@style/Widget.Sherlock.ActionBar.TabView">
+    <style name="ActionBarTabStyle.Transdroid.Dark" parent="@style/Widget.Sherlock.ActionBar.TabView">
         <item name="background">@drawable/tab_indicator_ab_transdroid</item>
 
         <item name="android:background">@drawable/tab_indicator_ab_transdroid</item>
     </style>
 	
-    <style name="transdroid_DropDownNav" parent="@style/Widget.Sherlock.Spinner.DropDown.ActionBar">
+    <style name="DropDownNav.Transdroid.Dark" parent="@style/Widget.Sherlock.Spinner.DropDown.ActionBar">
         <item name="background">@drawable/spinner_background_ab_transdroid</item>
 
         <item name="android:background">@drawable/spinner_background_ab_transdroid</item>
@@ -67,16 +57,4 @@
         <item name="android:dropDownSelector">@drawable/selectable_background_transdroid</item>
     </style>
     
-    <style name="transdroid_ProgressBar" parent="@style/Widget.Sherlock.ProgressBar.Horizontal">
-        <item name="android:progressDrawable">@drawable/progress_horizontal_transdroid</item>
-    </style>
-    
-    <!-- this style is only referenced in a Light.DarkActionBar based theme -->
-    <style name="Theme.transdroid.widget" parent="@style/Theme.Sherlock">
-        <item name="popupMenuStyle">@style/transdroid_PopupMenu</item>
-        <item name="dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-        
-        <item name="android:dropDownListViewStyle">@style/transdroid_DropDownListView</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/core/res/values/styles_transdroid_light.xml b/core/res/values/styles_transdroid_light.xml
index db8619ca..ebf32fcf 100644
--- a/core/res/values/styles_transdroid_light.xml
+++ b/core/res/values/styles_transdroid_light.xml
@@ -19,60 +19,48 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Theme.Transdroid2" parent="@style/Theme.Sherlock.Light">
+    <style name="Theme.Transdroid.Light" parent="@style/Theme.Sherlock.Light">
         <item name="actionBarItemBackground">@drawable/selectable_background_transdroid2</item>
-        <item name="popupMenuStyle">@style/PopupMenu.Transdroid2</item>
-        <item name="dropDownListViewStyle">@style/DropDownListView.Transdroid2</item>
-        <item name="actionBarTabStyle">@style/ActionBarTabStyle.Transdroid2</item>
-        <item name="actionDropDownStyle">@style/DropDownNav.Transdroid2</item>
-        <item name="actionBarStyle">@style/ActionBar.Solid.Transdroid2</item>
+        <item name="popupMenuStyle">@style/PopupMenu.Transdroid.Light</item>
+        <item name="dropDownListViewStyle">@style/DropDownListView.Transdroid.Light</item>
+        <item name="actionBarTabStyle">@style/ActionBarTabStyle.Transdroid.Light</item>
+        <item name="actionDropDownStyle">@style/DropDownNav.Transdroid.Light</item>
+        <item name="actionBarStyle">@style/ActionBar.Solid.Transdroid.Light</item>
         <item name="actionModeBackground">@drawable/cab_background_top_transdroid2</item>
         <item name="actionModeSplitBackground">@drawable/cab_background_bottom_transdroid2</item>
-        <item name="actionModeCloseButtonStyle">@style/ActionButton.CloseMode.Transdroid2</item>
+        <item name="actionModeCloseButtonStyle">@style/ActionButton.CloseMode.Transdroid.Light</item>
     </style>
 
-    <style name="ActionBar.Solid.Transdroid2" parent="@style/Widget.Sherlock.Light.ActionBar.Solid">
+    <style name="ActionBar.Solid.Transdroid.Light" parent="@style/Widget.Sherlock.Light.ActionBar.Solid">
         <item name="background">@drawable/ab_solid_transdroid2</item>
         <item name="backgroundStacked">@drawable/ab_stacked_solid_transdroid2</item>
         <item name="backgroundSplit">@drawable/ab_bottom_solid_transdroid2</item>
-        <item name="progressBarStyle">@style/ProgressBar.Transdroid2</item>
     </style>
 
-    <style name="ActionBar.Transparent.Transdroid2" parent="@style/Widget.Sherlock.Light.ActionBar">
+    <style name="ActionBar.Transparent.Transdroid.Light" parent="@style/Widget.Sherlock.Light.ActionBar">
         <item name="background">@drawable/ab_transparent_transdroid2</item>
-        <item name="progressBarStyle">@style/ProgressBar.Transdroid2</item>
     </style>
 	
-    <style name="PopupMenu.Transdroid2" parent="@style/Widget.Sherlock.Light.ListPopupWindow">	
+    <style name="PopupMenu.Transdroid.Light" parent="@style/Widget.Sherlock.Light.ListPopupWindow">	
         <item name="android:popupBackground">@drawable/menu_dropdown_panel_transdroid2</item>	
     </style>
 	
-    <style name="DropDownListView.Transdroid2" parent="@style/Widget.Sherlock.Light.ListView.DropDown">
+    <style name="DropDownListView.Transdroid.Light" parent="@style/Widget.Sherlock.Light.ListView.DropDown">
         <item name="android:listSelector">@drawable/selectable_background_transdroid2</item>
     </style>
 
-    <style name="ActionBarTabStyle.Transdroid2" parent="@style/Widget.Sherlock.Light.ActionBar.TabView">
+    <style name="ActionBarTabStyle.Transdroid.Light" parent="@style/Widget.Sherlock.Light.ActionBar.TabView">
         <item name="android:background">@drawable/tab_indicator_ab_transdroid2</item>
     </style>
 	
-    <style name="DropDownNav.Transdroid2" parent="@style/Widget.Sherlock.Light.Spinner.DropDown.ActionBar">
+    <style name="DropDownNav.Transdroid.Light" parent="@style/Widget.Sherlock.Light.Spinner.DropDown.ActionBar">
         <item name="android:background">@drawable/spinner_background_ab_transdroid2</item>
         <item name="android:popupBackground">@drawable/menu_dropdown_panel_transdroid2</item>
         <item name="android:dropDownSelector">@drawable/selectable_background_transdroid2</item>
     </style>
     
-	<style name="ProgressBar.Transdroid2" parent="@style/Widget.Sherlock.Light.ProgressBar.Horizontal">
-        <item name="android:progressDrawable">@drawable/progress_horizontal_transdroid2</item>
-    </style>
-    
-    <style name="ActionButton.CloseMode.Transdroid2" parent="@style/Widget.Sherlock.Light.ActionButton.CloseMode">
+    <style name="ActionButton.CloseMode.Transdroid.Light" parent="@style/Widget.Sherlock.Light.ActionButton.CloseMode">
         <item name="android:background">@drawable/btn_cab_done_transdroid2</item>
     </style>
     
-    <!-- this style is only referenced in a Light.DarkActionBar based theme -->
-    <style name="Theme.Transdroid2.Widget" parent="@style/Theme.Sherlock">
-        <item name="popupMenuStyle">@style/PopupMenu.Transdroid2</item>
-        <item name="dropDownListViewStyle">@style/DropDownListView.Transdroid2</item>
-    </style>
-
 </resources>
\ No newline at end of file