diff --git a/products/common.mk b/products/common.mk
index d113816..d34a4cf 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -5,10 +5,6 @@
 
 PRODUCT_PACKAGES += ADWLauncher
 
-# Add ROMManager build property
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.ringtone=DonMessWivIt.ogg
-
 ifdef CYANOGEN_NIGHTLY
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.rommanager.developerid=cyanogenmodnightly
@@ -25,9 +21,6 @@
 # Tiny toolbox
 TINY_TOOLBOX:=true
 
-# Enable Windows Media if supported by the board
-WITH_WINDOWS_MEDIA:=true
-
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
     ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html \
@@ -60,12 +53,8 @@
 # Common CM overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/common
 
-# Bring in some audio files
-include frameworks/base/data/sounds/AudioPackage4.mk
-include frameworks/base/data/sounds/AudioPackage5.mk
-
 # T-Mobile theme engine
-include vendor/cyanogen/products/themes.mk
+include vendor/cyanogen/products/themes_common.mk
 
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
diff --git a/products/common_full.mk b/products/common_full.mk
new file mode 100644
index 0000000..6a15ec5
--- /dev/null
+++ b/products/common_full.mk
@@ -0,0 +1,13 @@
+# Inherit common CM stuff
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+# Bring in all audio files
+include frameworks/base/data/sounds/AllAudio.mk
+
+# Theme packages
+include vendor/cyanogen/products/themes.mk
+
+# Default ringtone
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.config.ringtone=DonMessWivIt.ogg
+
diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
index 3376a2e..132f219 100644
--- a/products/cyanogen_ace.mk
+++ b/products/cyanogen_ace.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/ace/ace.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index 7c64d79..5ee889a 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/bravo/full_bravo.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
index 6a33ea6..ddf0084 100644
--- a/products/cyanogen_bravoc.mk
+++ b/products/cyanogen_bravoc.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/bravoc/full_bravoc.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 #
 # Setup device specific product configuration.
diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk
index 0cf0b64..e27fbad 100644
--- a/products/cyanogen_buzz.mk
+++ b/products/cyanogen_buzz.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/buzz/full_buzz.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_crespo.mk b/products/cyanogen_crespo.mk
index 6ab153b..cbfc132 100644
--- a/products/cyanogen_crespo.mk
+++ b/products/cyanogen_crespo.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/samsung/crespo/full_crespo.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index e24ed50..5739b0f 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/espresso/espresso.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_generic.mk b/products/cyanogen_generic.mk
index 5f1213f..d22a458 100644
--- a/products/cyanogen_generic.mk
+++ b/products/cyanogen_generic.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, build/target/product/full.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 #
 # Setup device specific product configuration.
diff --git a/products/cyanogen_glacier.mk b/products/cyanogen_glacier.mk
index af13f59..c8068c7 100644
--- a/products/cyanogen_glacier.mk
+++ b/products/cyanogen_glacier.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/glacier/glacier.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk
index ae9e96a..84a761e 100644
--- a/products/cyanogen_harmony.mk
+++ b/products/cyanogen_harmony.mk
@@ -1,7 +1,7 @@
 $(call inherit-product, device/nvidia/harmony/device_harmony.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 #
 # Setup device specific product configuration.
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
index 89e301d..b8ce29e 100644
--- a/products/cyanogen_hero.mk
+++ b/products/cyanogen_hero.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/hero/full_hero.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
index e0ea5d9..5080d04 100644
--- a/products/cyanogen_heroc.mk
+++ b/products/cyanogen_heroc.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/heroc/heroc.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 
 #
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index 15b9758..9acc48d 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -1,7 +1,7 @@
 $(call inherit-product, device/htc/inc/inc.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 #
 # Setup device specific product configuration.
diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk
index 9db82cc..00eca55 100644
--- a/products/cyanogen_legend.mk
+++ b/products/cyanogen_legend.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/legend/legend.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index 83e5e32..46c89f3 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/liberty/liberty.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index f23afee..6f3079f 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/passion/full_passion.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index 5300e4f..420789a 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/motorola/sholes/sholes.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 #
 # Setup device specific product configuration.
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index 946f36c..580b478 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/supersonic/supersonic.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 #
 # Setup device specific product configuration.
diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk
index 85b9d95..32792c6 100644
--- a/products/cyanogen_vision.mk
+++ b/products/cyanogen_vision.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/vision/vision.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk
index 9e9a3ca..3b9b5d8 100644
--- a/products/cyanogen_z71.mk
+++ b/products/cyanogen_z71.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/commtiva/z71/device_z71.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/themes.mk b/products/themes.mk
index f8a5607..39d6ffa 100644
--- a/products/themes.mk
+++ b/products/themes.mk
@@ -1,11 +1,4 @@
-# T-Mobile theme engine
+# Theme packages
 PRODUCT_PACKAGES += \
-       ThemeManager \
-       ThemeChooser \
-       com.tmobile.themes \
        Androidian \
        Cyanbread
-
-PRODUCT_COPY_FILES += \
-       vendor/cyanogen/prebuilt/common/etc/permissions/com.tmobile.themes.xml:system/etc/permissions/com.tmobile.themes.xml
-
diff --git a/products/themes_common.mk b/products/themes_common.mk
new file mode 100644
index 0000000..a6e651e
--- /dev/null
+++ b/products/themes_common.mk
@@ -0,0 +1,9 @@
+# T-Mobile theme engine
+PRODUCT_PACKAGES += \
+       ThemeManager \
+       ThemeChooser \
+       com.tmobile.themes
+
+PRODUCT_COPY_FILES += \
+       vendor/cyanogen/prebuilt/common/etc/permissions/com.tmobile.themes.xml:system/etc/permissions/com.tmobile.themes.xml
+