diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index d1a7ea7..92114ec 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -13,8 +13,8 @@
 ------------
 * Nexus One: Cyanogen
 * Nexus S: Koush
-* Droid: mtwebster, Koush
-* Dream/Sapphire: Cyanogen
+* Droid: cvpcs, mtwebster, Koush
+* Dream/Sapphire: Sileht, Wes Garner, Cyanogen
 * Hero: Lox (GSM), Darchstar (CDMA)
 * Desire (GSM/CDMA): Kali-, Defer
 * Incredible: jistone, slayher, Koush
@@ -41,14 +41,49 @@
 * Portuguese: Eduardo Martins
 * Spanish: PeRiJeY, KalimochoAz
 * Catalan: Oriol Pellicer
+* Finnish: Antti Leukkunen
+* Polish: Maciej Rozbicki
+* Korean: Inseok Lee
 
 CHANGELOG
 ---------
 ### 7.0.0
 * Common: Android 2.3.2 (Gingerbread) - Google
+* Common: Fixes and changes from AOSP master - Various
 * Common: ClockworkMod Recovery 3.0: Koush, Cyanogen, Zinx
 * Common: Themes engine - T-Mobile
 * Common: Performance enhancements for Qualcomm hardware - Code Aurora
+* Common: New boot animation - 73v1n - http://www.youtube.com/watch?v=mYXiKWwp0DQ
+* Common: Fix readahead values for NAND/MMC devices
+* Common: Revamped notification widget - cvpcs
+* Common: Updated various graphics for GB style - blunden
+* Common: DSPManager updated for 2.3 - alankila
+* Common: Restyled music app - Jason Asher
+* Common: Rotary answer in Phone app - James Peterson
+* Common: BT VoiceDialer fixes - Matthew Sparby
+* Common: Calendar enhancements - James Peterson
+* Common: Stagefright fixes for 7x30, 8x50, and 7x27 - Zinx, Arcee, Cyanogen
+* Common: Pacman package manager - Kmobs
+* Common: Workaround for unknown phone number - Jiri Tyr
+* Common: Trackball answer/hangup - Juan Rodriguez
+* Common: CMParts reorganization - Robert Burns
+* Common: Optional screen on/off animations - Diogo Ferreira
+* Common: New browser incognito mode - optedoblivion
+* Common: New trackball/trackpad wake - Zinx, Cyanogen
+* Common: Legacy sensor/GPS support - Arcee
+* Common: Customizable overscroll - Arcee
+* Common: Torch cleanup - defer
+* Common: OpenGL backwards compatibility - Zinx, Cyanogen
+* Common: SMS templates using gestures - Riccardo Ciovati
+* Common: Phone Goggles - David Bidorff
+* Common: Option to always show battery percentage on lockscreen - Robert Burns
+* Espresso/Legend: Enabled native WiFi tethering - Cyanogen, OMAPZoom.org
+* Z71: Enabled native WiFi tethering - arcee
+* Passion: Kernel 2.6.37 - Google, Cyanogen
+* Vision/Glacier/Espresso: WiFi calling compatibility and optimization - Zinx
+* Vision/Glacier/Ace: Unified kernel - HTC, Cyanogen, Zinx, Kali-, defer
+* Vision/Glacier/Ace: Fix FM radio on 2.3 - Zinx
+* Espresso/Legend/Liberty: Unified kernel - HTC, Cyanogen, attn1, jznomoney, Alex Hofbauer
 
 ### 6.1.3
 * Ace: Fix issue with some BT Headset
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index d716ec3..cd3107b 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -18,7 +18,7 @@
 }
 
 check_installscript() {
-   if [ -f "/tmp/.installscript" ];
+   if [ -f "/tmp/.installscript" -a ! -f "$S/etc/force_backuptool" ];
    then
       echo "/tmp/.installscript found. Skipping backuptool."
       PROCEED=0;
@@ -70,6 +70,7 @@
 lib/libvoicesearch.so
 etc/hosts
 etc/custom_backup_list.txt
+etc/force_backuptool
 EOF
 }
 
diff --git a/prebuilt/common/etc/init.d/04modules b/prebuilt/common/etc/init.d/04modules
index ad85910..1f00d63 100755
--- a/prebuilt/common/etc/init.d/04modules
+++ b/prebuilt/common/etc/init.d/04modules
@@ -4,7 +4,15 @@
 
 MODULES="ipv6"
 
-for i in $MODULES;
+KVER=`uname -r`
+if [ ! -d /system/lib/modules/$KVER ]
+then
+    exit 0
+fi
+
+for i in $MODULES
 do
-    modprobe $i;
+    modprobe $i >/dev/null 2>&1
 done
+
+exit 0
diff --git a/prebuilt/common/etc/init.d/05mountsd b/prebuilt/common/etc/init.d/05mountsd
old mode 100644
new mode 100755
diff --git a/prebuilt/common/etc/init.d/06mountdl b/prebuilt/common/etc/init.d/06mountdl
new file mode 100755
index 0000000..bed7019
--- /dev/null
+++ b/prebuilt/common/etc/init.d/06mountdl
@@ -0,0 +1,13 @@
+#!/system/bin/sh
+#
+# bind mount /data/local/download to /cache/download if cache
+# partition is too small
+#
+
+CACHESIZE=$(df -k /cache | tail -n1 | tr -s ' ' | cut -d ' ' -f2)
+if [ $CACHESIZE -lt 20000 ]
+then
+  mount -o bind /data/local/download /cache/download
+fi
+
+exit 0
diff --git a/prebuilt/common/etc/permissions/com.tmobile.themes.xml b/prebuilt/common/etc/permissions/com.tmobile.software.themes.xml
similarity index 92%
rename from prebuilt/common/etc/permissions/com.tmobile.themes.xml
rename to prebuilt/common/etc/permissions/com.tmobile.software.themes.xml
index 557bc1c..f1c2f54 100644
--- a/prebuilt/common/etc/permissions/com.tmobile.themes.xml
+++ b/prebuilt/common/etc/permissions/com.tmobile.software.themes.xml
@@ -15,6 +15,6 @@
 -->
 
 <permissions>
-    <feature name="com.tmobile.themes" />
+    <feature name="com.tmobile.software.themes" />
 </permissions>
 
diff --git a/prelink-linux-arm-hero.map b/prelink-linux-arm-hero.map
index 06e3a88..a65cf79 100644
--- a/prelink-linux-arm-hero.map
+++ b/prelink-linux-arm-hero.map
@@ -78,17 +78,21 @@
 libcamera_client.so     0xABA80000 # [~1M]
 libui.so                0xAB900000 # [~1M]
 # libsgl is for backward-compatibility with donut
+libgui.so               0xAB880000 # [~1M]
 libsgl.so               0xAB800000 # [???]
 libskia.so              0xAB100000 # [~7M]
 librs_jni.so            0xAB000000 # [~1M]
 libRS.so                0xA9E00000 # [~2M]
+libandroid.so           0xA9D80000 # [<64K]
 libjnigraphics.so       0xA9D00000 # [<64K]
 libskiagl.so            0xA9C00000 # [~1M]
 
 # audio
 libFLAC.so              0xA9B00000 # [???]
 libaudiopolicy.so       0xA9A00000 # [~1M]
-libaudiopolicygeneric.so 0xA9900000 # [???]
+libeffects.so           0xA9980000 # [<64K]
+libaudioeffect_jni.so   0xA9900000 # [<64K]
+libaudiopolicygeneric.so 0xA9880000 # [???]
 libsoundpool.so         0xA9800000 # [~1M]
 libgps.so               0xA9700000 # [~1M] (moved for hero)
 libcamera.so            0xA9680000 # [~1M] (moved for hero)
diff --git a/products/common.mk b/products/common.mk
index d34a4cf..89cd782 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -69,6 +69,8 @@
     vendor/cyanogen/prebuilt/common/etc/init.d/01sysctl:system/etc/init.d/01sysctl \
     vendor/cyanogen/prebuilt/common/etc/init.d/03firstboot:system/etc/init.d/03firstboot \
     vendor/cyanogen/prebuilt/common/etc/init.d/04modules:system/etc/init.d/04modules \
+    vendor/cyanogen/prebuilt/common/etc/init.d/05mountsd:system/etc/init.d/05mountsd \
+    vendor/cyanogen/prebuilt/common/etc/init.d/06mountdl:system/etc/init.d/06mountdl \
     vendor/cyanogen/prebuilt/common/etc/init.d/20userinit:system/etc/init.d/20userinit \
     vendor/cyanogen/prebuilt/common/bin/handle_compcache:system/bin/handle_compcache \
     vendor/cyanogen/prebuilt/common/bin/compcache:system/bin/compcache \
@@ -80,7 +82,6 @@
     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
 #    vendor/cyanogen/prebuilt/common/etc/init.d/10apps2sd:system/etc/init.d/10apps2sd
 
 PRODUCT_COPY_FILES +=  \
diff --git a/products/common_full.mk b/products/common_full.mk
index 6a15ec5..6bdc250 100644
--- a/products/common_full.mk
+++ b/products/common_full.mk
@@ -9,5 +9,6 @@
 
 # Default ringtone
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.ringtone=DonMessWivIt.ogg
-
+    ro.config.ringtone=Playa.ogg \
+    ro.config.notification_sound=regulus.ogg \
+    ro.config.alarm_alert=Alarm_Beep_03.ogg
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index 5739b0f..4619dc9 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -25,6 +25,9 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
+# Build GanOptimizer
+PRODUCT_PACKAGES += GanOptimizer
+
 #
 # Set ro.modversion
 #
diff --git a/products/themes_common.mk b/products/themes_common.mk
index a6e651e..9f3964b 100644
--- a/products/themes_common.mk
+++ b/products/themes_common.mk
@@ -5,5 +5,5 @@
        com.tmobile.themes
 
 PRODUCT_COPY_FILES += \
-       vendor/cyanogen/prebuilt/common/etc/permissions/com.tmobile.themes.xml:system/etc/permissions/com.tmobile.themes.xml
+       vendor/cyanogen/prebuilt/common/etc/permissions/com.tmobile.software.themes.xml:system/etc/permissions/com.tmobile.software.themes.xml