diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml b/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
index 41d2fd5..7aa0c38 100644
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -130,6 +130,17 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     />
+                <TextView android:id="@+id/compact_clear_all_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right|center_vertical"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="1dp"
+                    android:text="@string/status_bar_clear_all_button"
+                    style="@style/StatusBar.ClearButton"
+                    android:paddingLeft="15dp"
+                    android:paddingRight="15dp"
+                />
             </com.android.systemui.statusbar.NotificationLinearLayout>
         </ScrollView>
 
diff --git a/overlay/mecha/frameworks/base/core/res/res/values/config.xml b/overlay/mecha/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..960a389
--- /dev/null
+++ b/overlay/mecha/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
+         specified -->
+    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
+
+</resources>
diff --git a/overlay/mecha/packages/apps/CMParts/res/values/config.xml b/overlay/mecha/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..bbe40af
--- /dev/null
+++ b/overlay/mecha/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,7 @@
+<?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>
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml
index ddae548..debe393 100755
--- a/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml
+++ b/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="power_dialog">Confirações do tablet</string>
+    <string name="power_dialog">Configurações do tablet</string>
     <string name="reboot_system">Reiniciar tablet</string>
     <string name="shutdown_confirm">Seu tablet irá desligar.</string>
     <string name="reboot_confirm">Seu tablet irá reiniciar.</string>
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 3953b5e..dc4590a 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -59,6 +59,7 @@
 app/soundback.apk
 app/Street.apk
 app/Talk.apk
+app/Talk2.apk
 app/talkback.apk
 app/Twitter.apk
 app/Vending.apk
@@ -68,6 +69,7 @@
 etc/permissions/features.xml
 framework/com.google.android.maps.jar
 lib/libspeech.so
+lib/libtalk_jni.so
 lib/libvoicesearch.so
 etc/hosts
 etc/custom_backup_list.txt
diff --git a/products/cyanogen_crespo.mk b/products/cyanogen_crespo.mk
index 00d71ec..1494f63 100644
--- a/products/cyanogen_crespo.mk
+++ b/products/cyanogen_crespo.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := crespo
 PRODUCT_MODEL := Nexus S
 PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.3 GRI40 102588 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys"
 
 # Extra Crespo overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/crespo
diff --git a/products/cyanogen_mecha.mk b/products/cyanogen_mecha.mk
index 65e3d75..8ad395e 100644
--- a/products/cyanogen_mecha.mk
+++ b/products/cyanogen_mecha.mk
@@ -20,6 +20,9 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
+# Add AicBootFix
+PRODUCT_PACKAGES += AicBootFix
+
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 8bbb348..e1ee0b7 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := passion
 PRODUCT_MODEL := Nexus One
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion 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"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion 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"
 
 # Build kernel
 PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=