diff --git a/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml b/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
index bf2a665..d60d25f 100644
--- a/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
+++ b/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
@@ -73,20 +73,6 @@
         launcher:spanY="1" />
 
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.DialtactsContactsEntryActivity"
-        launcher:screen="2"
-        launcher:x="1"
-        launcher:y="3" />
-
-    <favorite
-        launcher:packageName="com.google.android.apps.maps"
-        launcher:className="com.google.android.maps.MapsActivity"
-        launcher:screen="2"
-        launcher:x="3"
-        launcher:y="3" />
-
-    <favorite
         launcher:packageName="com.android.mms"
         launcher:className="com.android.mms.ui.ConversationList"
         launcher:screen="2"
@@ -94,6 +80,13 @@
         launcher:y="3" />
 
     <favorite
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.DialtactsContactsEntryActivity"
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="3" />
+
+    <favorite
         launcher:packageName="com.android.vending"
         launcher:className="com.android.vending.AssetBrowserActivity"
         launcher:screen="2"
@@ -104,20 +97,22 @@
         launcher:packageName="com.android.deskclock"
         launcher:className="com.android.deskclock.DeskClock"
         launcher:screen="2"
-        launcher:x="0"
-        launcher:y="2" />
-
-    <favorite
-        launcher:packageName="org.abrantix.rockon.rockonnggl.cm"
-        launcher:className="org.abrantix.rockon.rockonnggl.RockOnNextGenGL"
-        launcher:screen="2"
         launcher:x="3"
-        launcher:y="2" />
+        launcher:y="3" />
 
     <!--  Right screen [3] -->
+    <appwidget
+        launcher:packageName="com.android.music"
+        launcher:className="com.android.music.MediaAppWidgetProvider4x2"
+        launcher:screen="3"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+
     <favorite
-        launcher:packageName="com.google.android.gm"
-        launcher:className="com.google.android.gm.ConversationListActivityGmail"
+        launcher:packageName="com.android.email"
+        launcher:className="com.android.email.activity.Welcome"
         launcher:screen="3"
         launcher:x="1"
         launcher:y="3" />
diff --git a/overlay/common/vendor/tmobile/apps/ThemeChooser/res/values/config.xml b/overlay/common/vendor/tmobile/apps/ThemeChooser/res/values/config.xml
new file mode 100644
index 0000000..f5f3a03
--- /dev/null
+++ b/overlay/common/vendor/tmobile/apps/ThemeChooser/res/values/config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- If set to true, theme change will not apply ringtone or wallpapers
+         from the theme.  Instead, only the system's visual style will be
+         affected.  -->
+    <bool name="config_change_style_only">true</bool>
+</resources>
diff --git a/overlay/zeppelin/packages/apps/CMParts/res/values/config.xml b/overlay/zeppelin/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..913a3db
--- /dev/null
+++ b/overlay/zeppelin/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/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 2705c90..152e78f 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -27,4 +27,5 @@
     $(LOCAL_DIR)/cyanogen_vega.mk \
     $(LOCAL_DIR)/cyanogen_vision.mk \
     $(LOCAL_DIR)/cyanogen_z71.mk \
+    $(LOCAL_DIR)/cyanogen_zeppelin.mk \
     $(LOCAL_DIR)/cyanogen_zero.mk
diff --git a/products/cyanogen_zeppelin.mk b/products/cyanogen_zeppelin.mk
new file mode 100644
index 0000000..1ec40af
--- /dev/null
+++ b/products/cyanogen_zeppelin.mk
@@ -0,0 +1,45 @@
+# Inherit AOSP device configuration for zeppelin.
+$(call inherit-product, device/motorola/zeppelin/zeppelin.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_zeppelin
+PRODUCT_BRAND := motorola
+PRODUCT_DEVICE := zeppelin
+PRODUCT_MODEL := CLIQ XT
+PRODUCT_MANUFACTURER := Motorola
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-CLIQXT
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC0-CLIQXT
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC0-CLIQXT-KANG
+    endif
+endif
+
+#PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRH78 PRODUCT_NAME=zeppelin TARGET_DEVICE=zeppelin BUILD_FINGERPRINT=MOTO/zeppelin_tmo_us/zepp/zepp:2.1-update1/ERD79/2.1.54:user/ota-rel-keys,release-keys PRODUCT_BRAND=tmobile PRIVATE_BUILD_DESC="zeppelin-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=zeppelin TARGET_DEVICE=zeppelin 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/zeppelin
+
+# Add the FM app
+PRODUCT_PACKAGES += FM
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 663404d..57f44ee 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -26,6 +26,7 @@
 add_lunch_combo cyanogen_vega-eng
 add_lunch_combo cyanogen_vision-eng
 add_lunch_combo cyanogen_z71-eng
+add_lunch_combo cyanogen_zeppelin-eng
 add_lunch_combo cyanogen_zero-eng
 
 PATH=$PATH:$PWD/vendor/cyanogen/tools ; export PATH