diff --git a/products/common_full_no_themes.mk b/products/common_full_no_themes.mk
new file mode 100644
index 00000000..c45a0693
--- /dev/null
+++ b/products/common_full_no_themes.mk
@@ -0,0 +1,18 @@
+# Inherit common CM stuff
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+# CyanogenMod specific product packages
+PRODUCT_PACKAGES += \
+    CMWallpapers
+
+# Bring in all audio files
+include frameworks/base/data/sounds/AllAudio.mk
+
+# Include extra dictionaries for LatinIME
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dictionaries
+
+# Default ringtone
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.config.ringtone=Playa.ogg \
+    ro.config.notification_sound=regulus.ogg \
+    ro.config.alarm_alert=Alarm_Beep_03.ogg
diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk
index 2dc4e994..876e6c24 100644
--- a/products/cyanogen_buzz.mk
+++ b/products/cyanogen_buzz.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/buzz/buzz.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
index c577386d..bdcde714 100644
--- a/products/cyanogen_click.mk
+++ b/products/cyanogen_click.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/htc/click/click.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)