diff --git a/products/common.mk b/products/common.mk
index a1f8629..64a0268 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -37,16 +37,11 @@
     CMParts \
     CMStats \
     CMUpdateNotify \
+    CMWallpapers \
     DSPManager \
     libcyanogen-dsp \
     Pacman
 
-# make wallpapers optional for low-storage-devices
-ifneq ($(PRODUCT_SKIP_WALLPAPERS),true)
-PRODUCT_PACKAGES += \
-    CMWallpapers
-endif
-
 # Extra tools in CyanogenMod
 PRODUCT_PACKAGES += \
     openvpn
diff --git a/products/cyanogen_vega.mk b/products/cyanogen_vega.mk
index 18306c7..76144b3 100644
--- a/products/cyanogen_vega.mk
+++ b/products/cyanogen_vega.mk
@@ -1,8 +1,7 @@
 $(call inherit-product, device/advent/vega/vega.mk)
 
-# skips themes and wallpaper to keep the resulting rom tiny so it fits on /system/ with all languages included
-PRODUCT_SKIP_THEMES=true
-PRODUCT_SKIP_WALLPAPERS=true
+# skips themes and keeps the resulting rom tiny so it fits on /system/ with all languages included
+PRODUCT_SPECIFIC_DEFINES += SKIP_THEMES=true
 
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common_full.mk)
diff --git a/products/themes.mk b/products/themes.mk
index 03ef574..856ab1f 100644
--- a/products/themes.mk
+++ b/products/themes.mk
@@ -1,6 +1,6 @@
 # Theme packages
 
-ifneq ($(PRODUCT_SKIP_THEMES),true)
+ifneq ($(SKIP_THEMES),true)
 PRODUCT_PACKAGES += \
        Androidian \
        Cyanbread