diff --git a/config/common_full.mk b/config/common_full.mk
index 5fa1e1f5..2c63a31e 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -1,6 +1,8 @@
 # Inherit common CM stuff
 $(call inherit-product, vendor/cm/config/common.mk)
 
+PRODUCT_SIZE := full
+
 # Include CM audio files
 include vendor/cm/config/cm_audio.mk
 
diff --git a/config/common_mini.mk b/config/common_mini.mk
new file mode 100644
index 00000000..06fa95b8
--- /dev/null
+++ b/config/common_mini.mk
@@ -0,0 +1,13 @@
+# Inherit common CM stuff
+$(call inherit-product, vendor/cm/config/common.mk)
+
+PRODUCT_SIZE := mini
+
+# Include CM audio files
+include vendor/cm/config/cm_audio.mk
+
+# Default notification/alarm sounds
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.config.notification_sound=Argon.ogg \
+    ro.config.alarm_alert=Helium.ogg
+
diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk
index da0c5f19..828b5b9d 100644
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -1,18 +1,9 @@
-# Inherit common CM stuff
-$(call inherit-product, vendor/cm/config/common.mk)
-
-# Include CM audio files
-include vendor/cm/config/cm_audio.mk
+$(call inherit-product, vendor/cm/config/common_mini.mk)
 
 # Required CM packages
 PRODUCT_PACKAGES += \
     LatinIME
 
-# Default notification/alarm sounds
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.notification_sound=Argon.ogg \
-    ro.config.alarm_alert=Helium.ogg
-
 ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
     PRODUCT_COPY_FILES += \
         vendor/cm/prebuilt/common/bootanimation/320.zip:system/media/bootanimation.zip
diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk
index 4eccd948..1d5810ff 100644
--- a/config/common_mini_tablet_wifionly.mk
+++ b/config/common_mini_tablet_wifionly.mk
@@ -1,18 +1,10 @@
 # Inherit common CM stuff
-$(call inherit-product, vendor/cm/config/common.mk)
-
-# Include CM audio files
-include vendor/cm/config/cm_audio.mk
+$(call inherit-product, vendor/cm/config/common_mini.mk)
 
 # Required CM packages
 PRODUCT_PACKAGES += \
     LatinIME
 
-# Default notification/alarm sounds
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.notification_sound=Argon.ogg \
-    ro.config.alarm_alert=Helium.ogg
-
 ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
     PRODUCT_COPY_FILES += \
         vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
diff --git a/config/common_mini_tv.mk b/config/common_mini_tv.mk
index 57256ed4..63f2bcf3 100644
--- a/config/common_mini_tv.mk
+++ b/config/common_mini_tv.mk
@@ -1,13 +1,5 @@
 # Inherit common CM stuff
-$(call inherit-product, vendor/cm/config/common.mk)
-
-# Include CM audio files
-include vendor/cm/config/cm_audio.mk
-
-# Default notification/alarm sounds
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.notification_sound=Argon.ogg \
-    ro.config.alarm_alert=Helium.ogg
+$(call inherit-product, vendor/cm/config/common_mini.mk)
 
 ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
     PRODUCT_COPY_FILES += \