diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index cf31354..b0a4581 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -27,7 +27,8 @@
 * Geeksphone ZERO: arcee
 * Z71 (Boston, G1305, XT502, A60, Blaze, others): arcee
 * Wildfire: Jacob Crawley, Arne Coucheron
-* NVidia Harmony: bekit, pershoot
+* Harmony (Malata smb_a1002/smb_b9701): bekit, pershoot
+* Harmony (Malata smb_a1004/smb_a1011): arcee
 * Ace (Desire HD): Kali-
 * Glacier (MT4G): Zinx, Kmobs
 * Click (Tattoo): KalimochoAz
@@ -35,6 +36,7 @@
 * Encore (Nook Color): dalingrin, cvpcs, nemith, cicada, fattire
 * Speedy: toastcfh
 * Zeppelin (CLIQ XT/Quench): firesnatch, turl
+* Morrison (CLIQ/DEXT): ngiordano, dwagner, JassyCliq
 
 Translators:
 ------------
diff --git a/overlay/morrison/packages/apps/CMParts/res/values/config.xml b/overlay/morrison/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..913a3db
--- /dev/null
+++ b/overlay/morrison/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Whether or not to display the trackball settings -->
+    <bool name="has_trackball">false</bool>
+    <bool name="has_camera_button">true</bool>
+    <bool name="has_rgb_notification_led">false</bool>
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/overlay/harmony/packages/apps/ADWLauncher/res/values/config.xml b/overlay/smb_a1002/packages/apps/ADWLauncher/res/values/config.xml
similarity index 100%
rename from overlay/harmony/packages/apps/ADWLauncher/res/values/config.xml
rename to overlay/smb_a1002/packages/apps/ADWLauncher/res/values/config.xml
diff --git a/overlay/harmony/packages/apps/CMParts/res/values/config.xml b/overlay/smb_a1002/packages/apps/CMParts/res/values/config.xml
similarity index 100%
rename from overlay/harmony/packages/apps/CMParts/res/values/config.xml
rename to overlay/smb_a1002/packages/apps/CMParts/res/values/config.xml
diff --git a/overlay/harmony/packages/apps/Contacts/AndroidManifest.xml b/overlay/smb_a1002/packages/apps/Contacts/AndroidManifest.xml
similarity index 100%
rename from overlay/harmony/packages/apps/Contacts/AndroidManifest.xml
rename to overlay/smb_a1002/packages/apps/Contacts/AndroidManifest.xml
diff --git a/overlay/harmony/packages/apps/ADWLauncher/res/values/config.xml b/overlay/smb_b9701/packages/apps/ADWLauncher/res/values/config.xml
similarity index 100%
copy from overlay/harmony/packages/apps/ADWLauncher/res/values/config.xml
copy to overlay/smb_b9701/packages/apps/ADWLauncher/res/values/config.xml
diff --git a/overlay/harmony/packages/apps/CMParts/res/values/config.xml b/overlay/smb_b9701/packages/apps/CMParts/res/values/config.xml
similarity index 100%
copy from overlay/harmony/packages/apps/CMParts/res/values/config.xml
copy to overlay/smb_b9701/packages/apps/CMParts/res/values/config.xml
diff --git a/overlay/harmony/packages/apps/Contacts/AndroidManifest.xml b/overlay/smb_b9701/packages/apps/Contacts/AndroidManifest.xml
similarity index 100%
copy from overlay/harmony/packages/apps/Contacts/AndroidManifest.xml
copy to overlay/smb_b9701/packages/apps/Contacts/AndroidManifest.xml
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 02b547f..d183761 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -18,16 +18,20 @@
     $(LOCAL_DIR)/cyanogen_galaxysmtd.mk \
     $(LOCAL_DIR)/cyanogen_generic.mk \
     $(LOCAL_DIR)/cyanogen_glacier.mk \
-    $(LOCAL_DIR)/cyanogen_harmony.mk \
     $(LOCAL_DIR)/cyanogen_legend.mk \
     $(LOCAL_DIR)/cyanogen_leo.mk \
     $(LOCAL_DIR)/cyanogen_liberty.mk \
     $(LOCAL_DIR)/cyanogen_mecha.mk \
+    $(LOCAL_DIR)/cyanogen_morrison.mk \
     $(LOCAL_DIR)/cyanogen_one.mk \
     $(LOCAL_DIR)/cyanogen_p990.mk \
     $(LOCAL_DIR)/cyanogen_p999.mk \
     $(LOCAL_DIR)/cyanogen_passion.mk \
     $(LOCAL_DIR)/cyanogen_sholes.mk \
+    $(LOCAL_DIR)/cyanogen_smb_a1002.mk \
+    $(LOCAL_DIR)/cyanogen_smb_a1004.mk \
+    $(LOCAL_DIR)/cyanogen_smb_a1011.mk \
+    $(LOCAL_DIR)/cyanogen_smb_b9701.mk \
     $(LOCAL_DIR)/cyanogen_speedy.mk \
     $(LOCAL_DIR)/cyanogen_supersonic.mk \
     $(LOCAL_DIR)/cyanogen_u8220.mk \
diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk
deleted file mode 100644
index 247fad7..0000000
--- a/products/cyanogen_harmony.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-$(call inherit-product, device/nvidia/harmony/device_harmony.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_harmony
-PRODUCT_BRAND := nvidia
-PRODUCT_DEVICE := harmony
-PRODUCT_MODEL := GTablet
-PRODUCT_MANUFACTURER := malata
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=harmony BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
-
-# Extra overlay
-PRODUCT_PACKAGE_OVERLAYS += \
-    vendor/cyanogen/overlay/tablet \
-    vendor/cyanogen/overlay/harmony
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Harmony
-else
-    ifdef CYANOGEN_RELEASE
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC0-Harmony
-    else
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.1.0-RC0-Harmony-KANG
-    endif
-endif
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_morrison.mk b/products/cyanogen_morrison.mk
new file mode 100644
index 0000000..597e99e
--- /dev/null
+++ b/products/cyanogen_morrison.mk
@@ -0,0 +1,45 @@
+# Inherit AOSP device configuration for zeppelin.
+$(call inherit-product, device/motorola/morrison/morrison.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+$(call inherit-product vendor/cyanogen/products/bcm_fm_radio.mk)
+
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_morrison
+PRODUCT_BRAND := motorola
+PRODUCT_DEVICE := morrison
+PRODUCT_MODEL := CLIQ
+PRODUCT_MANUFACTURER := Motorola
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-CLIQ
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-CLIQ-KANG
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-CLIQ-KANG
+    endif
+endif
+
+#PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRH78 PRODUCT_NAME=morrison TARGET_DEVICE=morrison BUILD_FINGERPRINT=MOTO/morrison_tmo_us/morr/morr:2.1-update1/ERD79/2.1.54:user/ota-rel-keys,release-keys PRODUCT_BRAND=tmobile PRIVATE_BUILD_DESC="morrison-user 2.1-update1 ERD79 2.1.54 ota-rel-keys,release-keys" BUILD_NUMBER=75603 BUILD_UTC_DATE=1289367602 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=morrison TARGET_DEVICE=morrison BUILD_ID=GRH78 BUILD_DISPLAY_ID=GRH78C BUILD_FINGERPRINT=google/soju/crespo:2.3.1/GRH78/85442:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.1 GRH78 85442 release-keys"
+
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/morrison
+
+# Add the FM app
+PRODUCT_PACKAGES += FM
diff --git a/products/cyanogen_smb_a1002.mk b/products/cyanogen_smb_a1002.mk
new file mode 100644
index 0000000..76e5cbe
--- /dev/null
+++ b/products/cyanogen_smb_a1002.mk
@@ -0,0 +1,41 @@
+$(call inherit-product, device/malata/smb_a1002/smb_a1002.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_smb_a1002
+PRODUCT_BRAND := nvidia
+PRODUCT_DEVICE := smb_a1002
+PRODUCT_MODEL := GTablet
+PRODUCT_MANUFACTURER := malata
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1002 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
+
+# Extra overlay
+PRODUCT_PACKAGE_OVERLAYS += \
+    vendor/cyanogen/overlay/tablet \
+    vendor/cyanogen/overlay/smb_a1002
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-smb_a1002
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-smb_a1002
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-smb_a1002-KANG
+    endif
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_smb_a1004.mk b/products/cyanogen_smb_a1004.mk
new file mode 100644
index 0000000..1212119
--- /dev/null
+++ b/products/cyanogen_smb_a1004.mk
@@ -0,0 +1,41 @@
+$(call inherit-product, device/malata/smb_a1004/smb_a1004.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_smb_a1004
+PRODUCT_BRAND := malata
+PRODUCT_DEVICE := smb_a1004
+PRODUCT_MODEL := SMB-A1004
+PRODUCT_MANUFACTURER := malata
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1004 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
+
+# Extra overlay
+PRODUCT_PACKAGE_OVERLAYS += \
+    vendor/cyanogen/overlay/tablet \
+    vendor/cyanogen/overlay/smb_a1002
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-SMB-A1004
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-SMB-A1004
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-SMB-A1004-KANG
+    endif
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_smb_a1011.mk b/products/cyanogen_smb_a1011.mk
new file mode 100644
index 0000000..5ace262
--- /dev/null
+++ b/products/cyanogen_smb_a1011.mk
@@ -0,0 +1,41 @@
+$(call inherit-product, device/malata/smb_a1011/smb_a1011.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_smb_a1011
+PRODUCT_BRAND := malata
+PRODUCT_DEVICE := smb_a1011
+PRODUCT_MODEL := SMB-A1011
+PRODUCT_MANUFACTURER := malata
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1011 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
+
+# Extra overlay
+PRODUCT_PACKAGE_OVERLAYS += \
+    vendor/cyanogen/overlay/tablet \
+    vendor/cyanogen/overlay/smb_a1002
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-SMB-A1011
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-SMB-A1011
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-SMB-A1011-KANG
+    endif
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_smb_b9701.mk b/products/cyanogen_smb_b9701.mk
new file mode 100644
index 0000000..385d844
--- /dev/null
+++ b/products/cyanogen_smb_b9701.mk
@@ -0,0 +1,41 @@
+$(call inherit-product, device/malata/smb_b9701/smb_b9701.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_smb_b9701
+PRODUCT_BRAND := nvidia
+PRODUCT_DEVICE := smb_b9701
+PRODUCT_MODEL := Zpad-T8
+PRODUCT_MANUFACTURER := malata
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_b9701 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
+
+# Extra overlay
+PRODUCT_PACKAGE_OVERLAYS += \
+    vendor/cyanogen/overlay/tablet \
+    vendor/cyanogen/overlay/smb_b9701
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-smb_b9701
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-smb_b9701
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-smb_b9701-KANG
+    endif
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index acfb602..84073b6 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,7 +14,6 @@
 add_lunch_combo cyanogen_galaxysmtd-eng
 add_lunch_combo cyanogen_generic-eng
 add_lunch_combo cyanogen_glacier-eng
-add_lunch_combo cyanogen_harmony-eng
 add_lunch_combo cyanogen_hero-eng
 add_lunch_combo cyanogen_heroc-eng
 add_lunch_combo cyanogen_inc-eng
@@ -22,11 +21,16 @@
 add_lunch_combo cyanogen_leo-eng
 add_lunch_combo cyanogen_liberty-eng
 add_lunch_combo cyanogen_mecha-eng
+add_lunch_combo cyanogen_morrison-eng
 add_lunch_combo cyanogen_one-eng
 add_lunch_combo cyanogen_p990-eng
 add_lunch_combo cyanogen_p999-eng
 add_lunch_combo cyanogen_passion-eng
 add_lunch_combo cyanogen_sholes-eng
+add_lunch_combo cyanogen_smb_a1002-eng
+add_lunch_combo cyanogen_smb_a1004-eng
+add_lunch_combo cyanogen_smb_a1011-eng
+add_lunch_combo cyanogen_smb_b9701-eng
 add_lunch_combo cyanogen_speedy-eng
 add_lunch_combo cyanogen_supersonic-eng
 add_lunch_combo cyanogen_u8220-eng