diff --git a/config/common.mk b/config/common.mk
index fc32ec72..32139274 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -136,15 +136,7 @@ PRODUCT_PACKAGES += \
     VideoEditor \
     VoiceDialer \
     SoundRecorder \
-    Basic \
-    HoloSpiralWallpaper \
-    MagicSmokeWallpapers \
-    NoiseField \
-    Galaxy4 \
-    LiveWallpapers \
-    LiveWallpapersPicker \
-    VisualizationWallpapers \
-    PhaseBeam
+    Basic
 
 # Custom CM packages
 PRODUCT_PACKAGES += \
diff --git a/config/common_full.mk b/config/common_full.mk
new file mode 100644
index 00000000..be4cfb92
--- /dev/null
+++ b/config/common_full.mk
@@ -0,0 +1,25 @@
+# Inherit common CM stuff
+$(call inherit-product, vendor/cm/config/common.mk)
+
+# Bring in all audio files
+include frameworks/base/data/sounds/NewAudio.mk
+
+# Extra Ringtones
+include frameworks/base/data/sounds/AudioPackageNewWave.mk
+
+# Bring in all video files
+$(call inherit-product, frameworks/base/data/videos/VideoPackage2.mk)
+
+# Include CM audio files
+include vendor/cm/config/cm_audio.mk
+
+# Optional CM packages
+PRODUCT_PACKAGES += \
+    HoloSpiralWallpaper \
+    MagicSmokeWallpapers \
+    NoiseField \
+    Galaxy4 \
+    LiveWallpapers \
+    LiveWallpapersPicker \
+    VisualizationWallpapers \
+    PhaseBeam
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index f764ce08..c9db0e9a 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -1,17 +1,5 @@
 # Inherit common CM stuff
-$(call inherit-product, vendor/cm/config/common.mk)
-
-# Bring in all audio files
-include frameworks/base/data/sounds/NewAudio.mk
-
-# Extra Ringtones
-include frameworks/base/data/sounds/AudioPackageNewWave.mk
-
-# Bring in all video files
-$(call inherit-product, frameworks/base/data/videos/VideoPackage2.mk)
-
-# Include CM audio files
-include vendor/cm/config/cm_audio.mk
+$(call inherit-product, vendor/cm/config/common_full.mk)
 
 # Default ringtone
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
index fd0ef2ef..be1ac54c 100644
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -1,17 +1,5 @@
 # Inherit common CM stuff
-$(call inherit-product, vendor/cm/config/common.mk)
-
-# Bring in all audio files
-include frameworks/base/data/sounds/NewAudio.mk
-
-# Extra Ringtones
-include frameworks/base/data/sounds/AudioPackageNewWave.mk
-
-# Bring in all video files
-$(call inherit-product, frameworks/base/data/videos/VideoPackage2.mk)
-
-# Include CM audio files
-include vendor/cm/config/cm_audio.mk
+$(call inherit-product, vendor/cm/config/common_full.mk)
 
 # Default ringtone
 PRODUCT_PROPERTY_OVERRIDES += \