diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 2b4163cf..ce8f2efb 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -27,7 +27,7 @@ Maintainers:
 * Wildfire: Jacob Crawley
 * NVidia Harmony: bekit
 * Ace (Desire HD): Kali-
-* Glacier (MT4G): Kmobs
+* Glacier (MT4G): Zinx, Kmobs
 
 Translators:
 ------------
@@ -43,6 +43,9 @@ Translators:
 
 CHANGELOG
 ---------
+### 7.0.0
+* Common: Android 2.3.1 (Gingerbread)
+
 ### 6.1.1
 * Common: Add rotary lockscreen - Kmobs/Robert Burns
 * Common: Updated translations - (everyone)
diff --git a/overlay/ace/frameworks/base/core/res/res/values/config.xml b/overlay/ace/frameworks/base/core/res/res/values/config.xml
index d3b987ef..8b667e7a 100644
--- a/overlay/ace/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/ace/frameworks/base/core/res/res/values/config.xml
@@ -18,9 +18,6 @@
 -->
 <resources>
 
-    <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
-    <bool name="config_hspa_data_distinguishable">true</bool>
-
     <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
          specified -->
     <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
diff --git a/overlay/bravo/frameworks/base/core/res/res/values/config.xml b/overlay/bravo/frameworks/base/core/res/res/values/config.xml
index 4a6f6efe..8b667e7a 100644
--- a/overlay/bravo/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/bravo/frameworks/base/core/res/res/values/config.xml
@@ -18,16 +18,6 @@
 -->
 <resources>
 
-    <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
-    <bool name="config_hspa_data_distinguishable">true</bool>
-
-    <!-- Enables special filtering code in the framework for raw touch events
-         from the touch driver.  This code exists for one particular device,
-         and should not be enabled for any others.  Hopefully in the future
-         it will be removed when the lower-level touch driver generates better
-         data. -->
-    <bool name="config_filterTouchEvents">true</bool>
-
     <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
          specified -->
     <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
diff --git a/overlay/espresso/frameworks/base/core/res/res/values/config.xml b/overlay/espresso/frameworks/base/core/res/res/values/config.xml
index 7d0f32c5..fca11643 100644
--- a/overlay/espresso/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/espresso/frameworks/base/core/res/res/values/config.xml
@@ -18,7 +18,4 @@
 -->
 <resources>
 
-    <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
-    <bool name="config_hspa_data_distinguishable">true</bool>
-
 </resources>
diff --git a/overlay/glacier/frameworks/base/core/res/res/values/config.xml b/overlay/glacier/frameworks/base/core/res/res/values/config.xml
index d3b987ef..8b667e7a 100644
--- a/overlay/glacier/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/glacier/frameworks/base/core/res/res/values/config.xml
@@ -18,9 +18,6 @@
 -->
 <resources>
 
-    <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
-    <bool name="config_hspa_data_distinguishable">true</bool>
-
     <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
          specified -->
     <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
diff --git a/overlay/heroc/frameworks/base/core/res/res/values/config.xml b/overlay/heroc/frameworks/base/core/res/res/values/config.xml
index 9895b326..fca11643 100644
--- a/overlay/heroc/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/heroc/frameworks/base/core/res/res/values/config.xml
@@ -18,11 +18,4 @@
 -->
 <resources>
 
-    <!-- Enables special filtering code in the framework for raw touch events
-         from the touch driver.  This code exists for one particular device,
-         and should not be enabled for any others.  Hopefully in the future
-         it will be removed when the lower-level touch driver generates better
-         data. -->
-    <bool name="config_filterTouchEvents">true</bool>
-
 </resources>
diff --git a/overlay/inc/frameworks/base/core/res/res/values/config.xml b/overlay/inc/frameworks/base/core/res/res/values/config.xml
index 4a6f6efe..8b667e7a 100644
--- a/overlay/inc/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/inc/frameworks/base/core/res/res/values/config.xml
@@ -18,16 +18,6 @@
 -->
 <resources>
 
-    <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
-    <bool name="config_hspa_data_distinguishable">true</bool>
-
-    <!-- Enables special filtering code in the framework for raw touch events
-         from the touch driver.  This code exists for one particular device,
-         and should not be enabled for any others.  Hopefully in the future
-         it will be removed when the lower-level touch driver generates better
-         data. -->
-    <bool name="config_filterTouchEvents">true</bool>
-
     <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
          specified -->
     <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
diff --git a/overlay/passion/frameworks/base/core/res/res/values/config.xml b/overlay/passion/frameworks/base/core/res/res/values/config.xml
index d3b987ef..8b667e7a 100644
--- a/overlay/passion/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/passion/frameworks/base/core/res/res/values/config.xml
@@ -18,9 +18,6 @@
 -->
 <resources>
 
-    <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
-    <bool name="config_hspa_data_distinguishable">true</bool>
-
     <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
          specified -->
     <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
diff --git a/overlay/vibrant/packages/apps/CMParts/res/values/config.xml b/overlay/vibrant/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index abe2959c..00000000
--- a/overlay/vibrant/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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_rgb_notification_led">false</bool>
-</resources>
diff --git a/overlay/vision/frameworks/base/core/res/res/values/config.xml b/overlay/vision/frameworks/base/core/res/res/values/config.xml
index d3b987ef..8b667e7a 100644
--- a/overlay/vision/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/vision/frameworks/base/core/res/res/values/config.xml
@@ -18,9 +18,6 @@
 -->
 <resources>
 
-    <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
-    <bool name="config_hspa_data_distinguishable">true</bool>
-
     <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
          specified -->
     <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index dc80c134..ed951ef7 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -2,20 +2,19 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_ace.mk \
     $(LOCAL_DIR)/cyanogen_bravo.mk \
     $(LOCAL_DIR)/cyanogen_bravoc.mk \
-    $(LOCAL_DIR)/cyanogen_buzz.mk \
-    $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
-    $(LOCAL_DIR)/cyanogen_espresso.mk \
-    $(LOCAL_DIR)/cyanogen_glacier.mk \
-    $(LOCAL_DIR)/cyanogen_harmony.mk \
-    $(LOCAL_DIR)/cyanogen_hero.mk \
-    $(LOCAL_DIR)/cyanogen_heroc.mk \
     $(LOCAL_DIR)/cyanogen_inc.mk \
-    $(LOCAL_DIR)/cyanogen_legend.mk \
-    $(LOCAL_DIR)/cyanogen_liberty.mk \
-    $(LOCAL_DIR)/cyanogen_one.mk \
     $(LOCAL_DIR)/cyanogen_passion.mk \
     $(LOCAL_DIR)/cyanogen_sholes.mk \
-    $(LOCAL_DIR)/cyanogen_supersonic.mk \
-    $(LOCAL_DIR)/cyanogen_vibrant.mk \
-    $(LOCAL_DIR)/cyanogen_vision.mk \
-    $(LOCAL_DIR)/cyanogen_z71.mk
+    $(LOCAL_DIR)/cyanogen_vision.mk 
+#    $(LOCAL_DIR)/cyanogen_buzz.mk \
+#    $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
+#    $(LOCAL_DIR)/cyanogen_espresso.mk \
+#    $(LOCAL_DIR)/cyanogen_glacier.mk \
+#    $(LOCAL_DIR)/cyanogen_harmony.mk \
+#    $(LOCAL_DIR)/cyanogen_hero.mk \
+#    $(LOCAL_DIR)/cyanogen_heroc.mk \
+#    $(LOCAL_DIR)/cyanogen_legend.mk \
+#    $(LOCAL_DIR)/cyanogen_liberty.mk \
+#    $(LOCAL_DIR)/cyanogen_one.mk \
+#    $(LOCAL_DIR)/cyanogen_supersonic.mk \
+#    $(LOCAL_DIR)/cyanogen_z71.mk
diff --git a/products/common.mk b/products/common.mk
index e91f4d92..4c276d59 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -38,15 +38,20 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.com.android.dataroaming=false
 
 # CyanogenMod specific product packages
-PRODUCT_PACKAGES += \
-    CMParts \
-    CMPartsHelper \
-    CMStats \
-    CMUpdateNotify \
-    CMWallpapers \
-    DSPManager \
-    FileManager \
-    Superuser
+#PRODUCT_PACKAGES += \
+#    CMParts \
+#    CMPartsHelper \
+#    CMStats \
+#    CMUpdateNotify \
+#    CMWallpapers \
+#    DSPManager \
+#    FileManager \
+#    Superuser
+
+# Enable FM radio if supported
+#ifeq ($(BOARD_HAVE_FM_RADIO), true)
+#    PRODUCT_PACKAGES += FM
+#endif
 
 # Copy over the changelog to the device
 PRODUCT_COPY_FILES += \
@@ -57,6 +62,7 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/common
 
 # Bring in some audio files
 include frameworks/base/data/sounds/AudioPackage4.mk
+include frameworks/base/data/sounds/AudioPackage5.mk
 
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
@@ -82,8 +88,8 @@ PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/xbin/powertop:system/xbin/powertop \
     vendor/cyanogen/prebuilt/common/xbin/openvpn-up.sh:system/xbin/openvpn-up.sh
 
-PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/common/etc/init.d/05mountsd:system/etc/init.d/05mountsd
+#PRODUCT_COPY_FILES += \
+#    vendor/cyanogen/prebuilt/common/etc/init.d/05mountsd:system/etc/init.d/05mountsd
 #    vendor/cyanogen/prebuilt/common/etc/init.d/10apps2sd:system/etc/init.d/10apps2sd
 
 PRODUCT_COPY_FILES +=  \
diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
index abf3c133..1714a0f9 100644
--- a/products/cyanogen_ace.mk
+++ b/products/cyanogen_ace.mk
@@ -22,12 +22,7 @@ PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ace BUILD_ID=FRF91 BUILD_DISPLA
 #PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
 #PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_ace_defconfig
 
-# Include the Torch and FM apps
-PRODUCT_PACKAGES += \
-    Torch \
-    FM    
-
-# Extra Vision overlay
+# Extra Ace overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ace
 
 #
@@ -35,10 +30,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ace
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DesireHD
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DesireHD
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-DesireHD
+        ro.modversion=CyanogenMod-7.0.0-RC0-DesireHD
 endif
 
 #
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index 21120bf2..fd2e3b8a 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -22,11 +22,6 @@ PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
 PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
 PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_bravo_defconfig
 
-# Include the Torch and FM apps
-PRODUCT_PACKAGES += \
-    Torch \
-    FM
-
 # Extra Bravo (CDMA/GSM) overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo
 
@@ -44,10 +39,10 @@ WITH_WINDOWS_MEDIA := true
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Desire
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Desire
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Desire
+        ro.modversion=CyanogenMod-7.0.0-RC0-Desire
 endif
 
 #
diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
index c92d738b..75a91f14 100644
--- a/products/cyanogen_bravoc.mk
+++ b/products/cyanogen_bravoc.mk
@@ -19,9 +19,6 @@ PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
 PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
 PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_bravoc_defconfig
 
-# Include the Torch app
-PRODUCT_PACKAGES += Torch
-
 # Extra Bravo (CDMA/GSM) overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo
 
@@ -33,10 +30,10 @@ WITH_WINDOWS_MEDIA := true
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-BravoC
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-BravoC
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-BravoC
+        ro.modversion=CyanogenMod-7.0.0-RC0-BravoC
 endif
 
 #
diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk
index c9e3e85f..c7321aae 100644
--- a/products/cyanogen_buzz.mk
+++ b/products/cyanogen_buzz.mk
@@ -20,9 +20,6 @@ PRODUCT_MODEL := HTC Wildfire
 PRODUCT_MANUFACTURER := HTC
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
 
-# Include the Torch app
-PRODUCT_PACKAGES += Torch
-
 # Extra Passion overlay
 PRODUCT_PACKAGE_OVERLAYS += device/htc/buzz/overlay
 
@@ -43,8 +40,8 @@ PRODUCT_COPY_FILES +=  \
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-buzz
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-buzz
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-buzz
+        ro.modversion=CyanogenMod-7.0.0-RC0-buzz
 endif
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index 51a25285..02c78ed2 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -38,10 +38,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DS
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DS
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-DS
+        ro.modversion=CyanogenMod-7.0.0-RC0-DS
 endif
 
 # Use the audio profile hack
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index 28bd3c4e..f7d9f2e4 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -22,18 +22,15 @@ PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-
 # Extra Espresso overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/espresso
 
-# Include the Torch app
-PRODUCT_PACKAGES += Torch
-
 #
 # Set ro.modversion
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Slide
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Slide
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Slide
+        ro.modversion=CyanogenMod-7.0.0-RC0-Slide
 endif
 
 #
diff --git a/products/cyanogen_glacier.mk b/products/cyanogen_glacier.mk
index 002789ab..784b7982 100644
--- a/products/cyanogen_glacier.mk
+++ b/products/cyanogen_glacier.mk
@@ -22,9 +22,6 @@ PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_glacier BUILD_ID=FRG83 BUILD_DI
 #PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
 #PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_glacier_defconfig
 
-# Include the Torch app
-PRODUCT_PACKAGES += Torch FM
-
 # Extra glacier overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/glacier
 
@@ -33,10 +30,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/glacier
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-glacier
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-glacier
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-glacier
+        ro.modversion=CyanogenMod-7.0.0-RC0-glacier
 endif
 
 #
diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk
index 68b19f45..18af9314 100644
--- a/products/cyanogen_harmony.mk
+++ b/products/cyanogen_harmony.mk
@@ -21,10 +21,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/harmony
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Harmony
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Harmony
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Harmony
+        ro.modversion=CyanogenMod-7.0.0-RC0-Harmony
 endif
 
 #
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
index c93ce281..bbd78e39 100644
--- a/products/cyanogen_hero.mk
+++ b/products/cyanogen_hero.mk
@@ -27,10 +27,10 @@ WITH_WINDOWS_MEDIA := true
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Hero
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Hero
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Hero
+        ro.modversion=CyanogenMod-7.0.0-RC0-Hero
 endif
 
 #
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
index c11833d8..372ca17c 100644
--- a/products/cyanogen_heroc.mk
+++ b/products/cyanogen_heroc.mk
@@ -23,10 +23,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/heroc
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Heroc
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Heroc
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-	 ro.modversion=CyanogenMod-6.2.0-RC0-Heroc
+	 ro.modversion=CyanogenMod-7.0.0-RC0-Heroc
 endif
 
 #
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index 80d9b996..1fa86821 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -18,21 +18,15 @@ PRODUCT_PROPERTY_OVERRIDES += ro.product.version=3.26.605.1
 # Extra Passion overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/inc
 
-# Include the FM Radio
-PRODUCT_PACKAGES += FM
-# Include the Flashlight/Torch
-PRODUCT_PACKAGES += Torch
-
-
 #
 # Set ro.modversion
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Inc
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Inc
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Inc
+        ro.modversion=CyanogenMod-7.0.0-RC0-Inc
 endif
 
 #
diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk
index 38227e1c..0fd07935 100644
--- a/products/cyanogen_legend.mk
+++ b/products/cyanogen_legend.mk
@@ -19,18 +19,15 @@ PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_legend BUILD_ID=FRG83 BUILD_DIS
 
 PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-legend.map
 
-# Include the Torch app
-PRODUCT_PACKAGES += Torch
-
 #
 # Set ro.modversion
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Legend
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Legend
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Legend
+        ro.modversion=CyanogenMod-7.0.0-RC0-Legend
 endif
 
 #
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index 494a8c9b..8a31d590 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -19,15 +19,13 @@ PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_liberty BUILD_ID=FRG83 BUILD_DI
 
 PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-liberty.map
 
-#PRODUCT_PACKAGES += FM
-
 
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Liberty
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Liberty
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Liberty
+        ro.modversion=CyanogenMod-7.0.0-RC0-Liberty
 endif
 
 #
diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk
index c9412ae6..17a80ed0 100644
--- a/products/cyanogen_one.mk
+++ b/products/cyanogen_one.mk
@@ -22,18 +22,13 @@ PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=geeksphone-one PRODUCT_NAME=geeks
 #
 PRODUCT_PROPERTY_OVERRIDES += dalvik.vm.dexopt-data-only=1
 
-#
-# Set ro.modversion
-#
-
-
 
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-ONE
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-ONE
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-ONE
+        ro.modversion=CyanogenMod-7.0.0-RC0-ONE
 endif
 
 #
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 74775156..028e5c9e 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -22,11 +22,6 @@ PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
 PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
 PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_mahimahi_defconfig
 
-# Include the Torch and FM apps
-PRODUCT_PACKAGES += \
-    Torch \
-    FM
-
 # Extra Passion overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion
 
@@ -41,10 +36,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-N1
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-N1
+        ro.modversion=CyanogenMod-7.0.0-RC0-N1
 endif
 
 #
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index a9a8f071..0e361a32 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -18,10 +18,10 @@ PRODUCT_MANUFACTURER := Motorola
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Droid
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Droid
+        ro.modversion=CyanogenMod-7.0.0-RC0-Droid
 endif
 
 PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83D BUILD_DISPLAY_ID=FRG83D PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2.1/FRG83D/75603:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2.1 FRG83D 75603 release-keys" BUILD_NUMBER=75603 BUILD_UTC_DATE=1289367602 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build
@@ -31,5 +31,3 @@ PRODUCT_COPY_FILES +=  \
 
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/sholes
 
-# Include the Flashlight/Torch
-PRODUCT_PACKAGES += Torch
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index 7ea43b7e..6012479b 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -22,20 +22,15 @@ PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_supersonic_defconfig
 # Extra Supersonic overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/supersonic
 
-# Include the FM and Torch apps
-PRODUCT_PACKAGES += \
-    Torch \
-    FM
-
 #
 # Set ro.modversion
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Supersonic
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Supersonic
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Supersonic
+        ro.modversion=CyanogenMod-7.0.00-RC0-Supersonic
 endif
 
 #
diff --git a/products/cyanogen_vibrant.mk b/products/cyanogen_vibrant.mk
deleted file mode 100644
index b18db443..00000000
--- a/products/cyanogen_vibrant.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Inherit device configuration for Vibrant.
-$(call inherit-product, device/samsung/vibrant/full_vibrant.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_vibrant
-PRODUCT_BRAND := Samsung
-PRODUCT_DEVICE := SGH-T959
-PRODUCT_MODEL := SGH-T959
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-T959 BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
-
-# Extra Vibrant overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vibrant
-
-#
-# Set ro.modversion
-#
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Vibrant
-else
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Vibrant
-endif
-
-#
-# Copy Vibrant specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk
index 53f316da..c147c45a 100644
--- a/products/cyanogen_vision.mk
+++ b/products/cyanogen_vision.mk
@@ -22,11 +22,6 @@ PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vision BUILD_ID=FRF91 BUILD_DIS
 #PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
 #PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_vision_defconfig
 
-# Include the Torch app
-PRODUCT_PACKAGES += \
-    Torch \
-    FM
-
 # Extra Vision overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vision
 
@@ -35,10 +30,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vision
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-vision
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-vision
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-vision
+        ro.modversion=CyanogenMod-7.0.0-RC0-vision
 endif
 
 #
diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk
index bdbea5a1..fb9ac4be 100644
--- a/products/cyanogen_z71.mk
+++ b/products/cyanogen_z71.mk
@@ -24,10 +24,10 @@ PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=commtiva_z71 BUILD_ID=FRG83 BUILD_D
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Z71
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Z71
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.2.0-RC0-Z71
+        ro.modversion=CyanogenMod-7.0.0-RC0-Z71
 endif
 
 #
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 14f5c0e5..246bca84 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,22 +1,21 @@
 add_lunch_combo cyanogen_ace-eng
 add_lunch_combo cyanogen_bravo-eng
 add_lunch_combo cyanogen_bravoc-eng
-add_lunch_combo cyanogen_buzz-eng
-add_lunch_combo cyanogen_dream_sapphire-eng
-add_lunch_combo cyanogen_espresso-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_buzz-eng
+#add_lunch_combo cyanogen_dream_sapphire-eng
+#add_lunch_combo cyanogen_espresso-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
-add_lunch_combo cyanogen_legend-eng
-add_lunch_combo cyanogen_liberty-eng
-add_lunch_combo cyanogen_one-eng
+#add_lunch_combo cyanogen_legend-eng
+#add_lunch_combo cyanogen_liberty-eng
+#add_lunch_combo cyanogen_one-eng
 add_lunch_combo cyanogen_passion-eng
 add_lunch_combo cyanogen_sholes-eng
-add_lunch_combo cyanogen_supersonic-eng
-add_lunch_combo cyanogen_vibrant-eng
+#add_lunch_combo cyanogen_supersonic-eng
 add_lunch_combo cyanogen_vision-eng
-add_lunch_combo cyanogen_z71-eng
+#add_lunch_combo cyanogen_z71-eng
 
 PATH=$PATH:$PWD/vendor/cyanogen/tools ; export PATH