diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index ae32218..5b0fc72 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -24,13 +24,15 @@
 * Legend: Alexander Hofbauer
 * Vision (G2/Desire Z): Cyanogen
 * Geeksphone ONE: arcee
+* Geeksphone ZERO: arcee
 * Z71 (Boston, G1305, XT502, A60, Blaze, others): arcee
-* Wildfire: Jacob Crawley
+* Wildfire: Jacob Crawley, Arne Coucheron
 * NVidia Harmony: bekit
 * Ace (Desire HD): Kali-
 * Glacier (MT4G): Zinx, Kmobs
 * Click (Tattoo): KalimochoAz
 * Blade (San Francisco, Sapo A5, others): Tom Giordano and Jacob Crawley
+* Encore (Nook Color): dalingrin, cvpcs, nemith, cicada, fattire
 
 Translators:
 ------------
@@ -38,12 +40,14 @@
 * Italian: Eugenio Ziliotto, Giulio Cervera
 * Japanese: Takuo Kitame
 * French: Sébastien Vaucher, David Girault
-* Chinese: comercy, Ladios Jonquil, Qian Zheng
+* Simplified Chinese: comercy, Qian Zheng
 * Russian: OlegKrikun, Pavel Volkov
 * Portuguese: Eduardo Martins, Ricardo Pinho
-* Spanish: PeRiJeY, KalimochoAz
+* Portuguese-Brazil: Gustavo Rosa
+* Spanish: PeRiJeY, KalimochoAz, Chuckycrx
 * Catalan: Oriol Pellicer
 * Finnish: Antti Leukkunen
+* Swedish: Patrik Kullman
 * Polish: Maciej Rozbicki
 * Korean: Inseok Lee
 * Traditional Chinese: Ladios Jonquil
@@ -51,7 +55,7 @@
 CHANGELOG
 ---------
 ### 7.0.0
-* Common: Android 2.3.2 (Gingerbread) - Google
+* Common: Android 2.3.3 (Gingerbread) - Google
 * Common: Fixes and changes from AOSP master - Various
 * Common: ClockworkMod Recovery 3.0: Koush, Cyanogen, Zinx
 * Common: Themes engine - T-Mobile
@@ -70,6 +74,7 @@
 * Common: Workaround for unknown phone number - Jiri Tyr
 * Common: Trackball answer/hangup - Juan Rodriguez
 * Common: CMParts reorganization - Robert Burns
+* Common: View ChangeLog via CMParts (System) - Wes Garner
 * Common: Optional screen on/off animations - Diogo Ferreira
 * Common: New browser incognito mode - optedoblivion
 * Common: New trackball/trackpad wake - Zinx, Cyanogen
@@ -78,10 +83,11 @@
 * Common: Customizable overscroll - arcee
 * Common: Torch cleanup - defer
 * Common: 2D compositor backwards compatibility - arcee
-* Common: OpenGL backwards compatibility - Zinx, Cyanogen
+* Common: OpenGL backwards compatibility - Zinx, Cyanogen, Sileht, ezterry
 * Common: SMS templates using gestures - Riccardo Ciovati
 * Common: Phone Goggles - David Bidorff
 * Common: Option to always show battery percentage on lockscreen - Robert Burns
+* Common: Option to show music controls with compatible headset connection - Wes Garner
 * Common: CPU frequency/scaling control in CMParts - Robert Ramiega
 * Common: Option to pause/play music with camera button - cvpcs
 * Common: Allow SIP User-Agent configuration - arcee
@@ -90,12 +96,19 @@
 * Common: Updated FLAC support - cvpcs, Cyanogen, kroot
 * Common: Updated wallpapers - Fitsnugly, Prash
 * Common: Customizable search/long-press search - Sven Dawitz
-* Common: New lockscreen styles - Rotary Revamped (default) and Lense - Sven Dawitz
+* Common: New lockscreen styles - Rotary Revamped (default) and Lense - Sven Dawitz, Stefano Pignataro
 * Common: Customizable app launcher on rotary lockscreen - Sven Dawitz
 * Common: Now playing and album art on lockscreen - kmobs
-* Common: GPS fixes - CodeAurora
+* Common: GPS fixes - CodeAurora, arcee
 * Common: Breakfast/Brunch - arcee
+* Common: Statusbar battery percentage with mini icon - Sven Dawitz, design by Jazz Kalsi
+* Common: SMS split for braindead carriers - Mike Wielgosz
+* Common: MMS user-defined custom vibrate - Wes Garner
+* Common: CMParts cleanup - Sven Dawitz
+* Common: Notification profiles - Martin Long
+* Common: TI wl12xx FM radio reverse engineering - Michael A. Reid
 * Espresso/Legend: Enabled native WiFi tethering - Cyanogen, OMAPZoom.org
+* Legend/Liberty/Buzz/Click: Enabled FM Radio - Alexander Hofbauer (libaudio patch)
 * Z71: Enabled MPEG4/AAC video recording - arcee
 * Z71: Enabled native WiFi tethering - arcee
 * Passion/Bravo/BravoC/Supersonic/Inc: Kernel 2.6.37 - Google, Cyanogen, defer, Kali-, toastcfh, slayher
@@ -103,7 +116,8 @@
 * Vision/Glacier/Ace: Unified kernel - HTC, Cyanogen, Zinx, Kali-, defer
 * Vision/Glacier/Ace: Fix FM radio on 2.3 - Zinx
 * Vision: Only install WiFi calling on TMUS devices - attn1
-* Espresso/Legend/Liberty: Unified kernel - HTC, Cyanogen, attn1, jznomoney, Alex Hofbauer
+* Espresso/Legend/Liberty: Unified kernel - HTC, Cyanogen, attn1, jznomoney, Alexander Hofbauer
+* Supersonic: WiMAX support - HTC, Shinzul, toastcfh, shift, #teamwin, Cyanogen
 * ONE: Enabled native WiFi tethering - arcee
 
 ### 6.1.3
diff --git a/get-google-files b/get-google-files
index afb6515..6158782 100755
--- a/get-google-files
+++ b/get-google-files
@@ -2,8 +2,8 @@
 import sys, random, urllib2, zipfile, StringIO, os
 from optparse import OptionParser
 
-FILENAME=["gapps-gb-20110120-signed.zip","gapps-gb-tegra-20110118-signed.zip","gapps-hdpi-20101114-signed.zip","gapps-mdpi-20101020-signed.zip","gapps-mdpi-tiny-20101020-signed.zip","gapps-mdpi-tegra-20101020-signed.zip","gapps-passion-EPE54B-signed.zip","gapps-ds-ERE36B-signed.zip","DRC83_base_defanged.zip"]
-VERSIONS=["gb","gb-tegra","hdpi","mdpi","mdpi-tiny","tegra","cm5hdpi","cm5mdpi","cm4"]
+FILENAME=["gapps-gb-20110307-signed.zip","gapps-hdpi-20101114-signed.zip","gapps-mdpi-20110301-signed.zip","gapps-mdpi-tiny-20101020-signed.zip","gapps-mdpi-tegra-20101020-signed.zip","gapps-passion-EPE54B-signed.zip","gapps-ds-ERE36B-signed.zip","DRC83_base_defanged.zip"]
+VERSIONS=["gb","hdpi","mdpi","mdpi-tiny","tegra","cm5hdpi","cm5mdpi","cm4"]
 MIRRORS=["http://goo-inside.me/gapps/","http://android.d3xt3r01.tk/cyanogen/gapps/","http://android.local.host.name/gapps/"]
 
 def device():
@@ -49,7 +49,7 @@
 def main():
     parser = OptionParser(usage="usage: %prog [options]")
     parser.add_option("-m", "--method", dest='method', default="download", help="Extraction Method: download")
-    parser.add_option("-v", "--version", dest='version', default="gb", help="GApps Version: gb, gb-tegra, hdpi, mdpi, mdpi-tiny, tegra, cm5hdpi, cm5mdpi, cm4 [default: gb]")
+    parser.add_option("-v", "--version", dest='version', default="gb", help="GApps Version: gb, hdpi, mdpi, mdpi-tiny, tegra, cm5hdpi, cm5mdpi, cm4 [default: gb]")
     (options, args) = parser.parse_args()
 
     if options.method == "device":
diff --git a/get-rommanager b/get-rommanager
index e94c473..a1258b2 100755
--- a/get-rommanager
+++ b/get-rommanager
@@ -1,2 +1,2 @@
 mkdir -p `dirname $0`/proprietary
-curl -o `dirname $0`/proprietary/RomManager.apk -O http://mirror1.kanged.net/recoveries/RomManager.apk
+curl -o `dirname $0`/proprietary/RomManager.apk -O http://mirror.kanged.net/recoveries/RomManager.apk
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/usb_storage_activity.xml b/overlay/encore/frameworks/base/core/res/res/layout/usb_storage_activity.xml
similarity index 95%
rename from overlay/ldpi/frameworks/base/core/res/res/layout/usb_storage_activity.xml
rename to overlay/encore/frameworks/base/core/res/res/layout/usb_storage_activity.xml
index 587b660..298a94b 100644
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/usb_storage_activity.xml
+++ b/overlay/encore/frameworks/base/core/res/res/layout/usb_storage_activity.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    android:padding="8dip"
+    android:padding="28dip"
     >
 
     <ImageView android:id="@+id/icon"
@@ -29,7 +29,7 @@
         android:layout_marginTop="10dip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="14sp"
+        android:textSize="20sp"
         android:gravity="center"
         android:text="@string/usb_storage_message" />
 
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="6dip"
+        android:layout_marginBottom="16dip"
         >
 
         <Button android:id="@+id/mount_button" 
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/btn_code_lock_default.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/btn_code_lock_default.png
new file mode 100644
index 0000000..149da9b
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/btn_code_lock_default.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/btn_code_lock_touched.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/btn_code_lock_touched.png
new file mode 100644
index 0000000..ad9a313
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/btn_code_lock_touched.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/expander_ic_maximized.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/expander_ic_maximized.9.png
new file mode 100644
index 0000000..732a6f5
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/expander_ic_maximized.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/expander_ic_minimized.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/expander_ic_minimized.9.png
new file mode 100644
index 0000000..054e3a4
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/expander_ic_minimized.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default.png
new file mode 100644
index 0000000..5b77b9f
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green.png
new file mode 100644
index 0000000..c7c0b9a
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red.png
new file mode 100644
index 0000000..ac02dc4
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_disabled.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_disabled.9.png
new file mode 100644
index 0000000..a4c2aba
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_disabled.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_disabled_focused.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_disabled_focused.9.png
new file mode 100644
index 0000000..fdbc9d5
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_disabled_focused.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_normal.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_normal.9.png
new file mode 100644
index 0000000..c7e8018
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_normal.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_pressed.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_pressed.9.png
new file mode 100644
index 0000000..4dd82ae
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_pressed.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_selected.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_selected.9.png
new file mode 100644
index 0000000..ebb701e
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_down_selected.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_disabled.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_disabled.9.png
new file mode 100644
index 0000000..39cc3d4
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_disabled.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_normal.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_normal.9.png
new file mode 100644
index 0000000..6ffabe6
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_normal.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_pressed.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_pressed.9.png
new file mode 100644
index 0000000..9cfaaab
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_pressed.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_selected.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_selected.9.png
new file mode 100644
index 0000000..e819e9b
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_input_selected.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_disabled.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_disabled.9.png
new file mode 100644
index 0000000..005a5ae
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_disabled.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_disabled_focused.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_disabled_focused.9.png
new file mode 100644
index 0000000..f1c9465
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_disabled_focused.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_normal.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_normal.9.png
new file mode 100644
index 0000000..9927539
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_normal.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_pressed.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_pressed.9.png
new file mode 100644
index 0000000..7946450
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_pressed.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_selected.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_selected.9.png
new file mode 100644
index 0000000..8c8136a
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/timepicker_up_selected.9.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/usb_android.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/usb_android.png
new file mode 100644
index 0000000..d7b1d93
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/usb_android.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/usb_android_connected.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/usb_android_connected.png
new file mode 100644
index 0000000..c9d8439
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-mdpi/usb_android_connected.png
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
index beb3010..2c49fc4 100644
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
+++ b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
@@ -70,7 +70,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/carrier"
-            android:layout_marginTop="20dip"
+            android:layout_marginTop="22dip"
             android:layout_marginLeft="20dip"
             android:paddingBottom="2dip"
             >
@@ -80,7 +80,7 @@
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:ellipsize="none"
-                android:textSize="70sp"
+                android:textSize="68sp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:shadowColor="#C0000000"
                 android:shadowDx="0"
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml
new file mode 100644
index 0000000..074b11f
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2008, The Android Open Source 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.
+*/
+-->
+
+<!-- This is the screen that shows the 9 circle unlock widget and instructs
+     the user how to unlock their device, or make an emergency call.  This
+     is the portrait layout.  -->
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:background="#70000000"
+    >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+        <TextView
+            android:id="@+id/carrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="2dip"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="8dip"
+            android:layout_toRightOf="@+id/time"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:gravity="right|bottom"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            />
+
+        <com.android.internal.widget.DigitalClock android:id="@+id/time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="8dip"
+            android:layout_marginLeft="8dip"
+            >
+
+            <TextView android:id="@+id/timeDisplay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="bottom"
+                android:singleLine="true"
+                android:ellipsize="none"
+                android:textSize="56sp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:shadowColor="#C0000000"
+                android:shadowDx="0"
+                android:shadowDy="0"
+                android:shadowRadius="3.0"
+                android:layout_marginBottom="0dip"
+                />
+
+            <TextView android:id="@+id/am_pm"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="bottom"
+                android:singleLine="true"
+                android:ellipsize="none"
+                android:textSize="18sp"
+                android:layout_marginLeft="4dip"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:shadowColor="#C0000000"
+                android:shadowDx="0"
+                android:shadowDy="0"
+                android:shadowRadius="3.0"
+                />
+
+        </com.android.internal.widget.DigitalClock>
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/time"
+            android:layout_marginLeft="12dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            />
+
+    </RelativeLayout>
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="4dip"
+        android:background="@android:drawable/divider_horizontal_dark"
+        />
+
+    <!-- used for instructions such as "draw pattern to unlock", the next alarm, and charging
+         status.  -->
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="0dip"
+        android:layout_marginLeft="12dip"
+        android:gravity="left"
+        >
+        <TextView
+            android:id="@+id/status1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="16sp"
+            android:drawablePadding="4dip"
+            />
+        <TextView
+            android:id="@+id/statusSep"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="16sp"
+            />
+        <TextView
+            android:id="@+id/status2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="16sp"
+            android:drawablePadding="4dip"
+            />
+    </LinearLayout>
+
+    <com.android.internal.widget.LockPatternView
+        android:id="@+id/lockPattern"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:layout_marginTop="2dip"
+        android:aspect="@string/lock_pattern_view_aspect"
+         />
+
+    <!-- footer -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <!-- option 1: a single emergency call button -->
+        <RelativeLayout android:id="@+id/footerNormal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+            <Button android:id="@+id/emergencyCallAlone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text="@string/lockscreen_emergency_call"
+                style="@style/Widget.Button.Transparent"
+                android:drawableLeft="@drawable/ic_emergency"
+                android:drawablePadding="8dip"
+                />
+
+        </RelativeLayout>
+
+        <!-- option 2: an emergency call button, and a 'forgot pattern?' button -->
+        <LinearLayout android:id="@+id/footerForgotPattern"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            >
+            <Button android:id="@+id/emergencyCallTogether"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:layout_weight="1.0"
+                android:layout_marginTop="4dip"
+                android:layout_marginBottom="4dip"
+                android:layout_marginLeft="4dip"
+                android:layout_marginRight="2dip"
+                android:text="@string/lockscreen_emergency_call"
+                style="@style/Widget.Button.Transparent"
+                android:drawableLeft="@drawable/ic_emergency"
+                android:drawablePadding="8dip"
+                />
+            <Button android:id="@+id/forgotPattern"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:layout_weight="1.0"
+                android:layout_marginTop="4dip"
+                android:layout_marginBottom="4dip"
+                android:layout_marginLeft="2dip"
+                android:layout_marginRight="4dip"
+                style="@style/Widget.Button.Transparent"
+                android:visibility="invisible"
+                />
+        </LinearLayout>
+
+    </FrameLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
\ No newline at end of file
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 08d9bad..6abd4f3 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
@@ -24,7 +24,7 @@
     android:descendantFocusability="afterDescendants"
     >
 
-    <LinearLayout android:id="@+id/exp_view_lin_layout"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -35,7 +35,7 @@
         >
         <com.android.systemui.statusbar.powerwidget.PowerWidget android:id="@+id/exp_power_stat"
             android:layout_width="match_parent"
-            android:layout_height="42dip"
+            android:layout_height="44dip"
             />
 
         <LinearLayout
diff --git a/overlay/ldpi/packages/apps/AndroidTerm/res/values/strings.xml b/overlay/ldpi/packages/apps/AndroidTerm/res/values/strings.xml
deleted file mode 100644
index 9aad74d..0000000
--- a/overlay/ldpi/packages/apps/AndroidTerm/res/values/strings.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source 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>
-   <string name="application_terminal">Terminal Emulator</string>
-   <string name="preferences">Preferences</string>
-   <string name="reset">Reset term</string>
-   <string name="send_email">Email to</string>
-   <string name="special_keys">Special keys</string>
-   <string name="toggle_soft_keyboard">Toggle soft keyboard</string>
-
-   <string name="edit_text">Edit text</string>
-   <string name="select_text">Select text</string>
-   <string name="copy_all">Copy all</string>
-   <string name="paste">Paste</string>
-
-   <!-- Preference dialog -->
-   <string name="screen_preferences">Screen</string>
-
-   <string name="title_statusbar_preference">Status bar</string>
-   <string name="summary_statusbar_preference">Show/hide status bar.</string>
-   <string name="dialog_title_statusbar_preference">Status bar</string>
-
-   <string name="title_cursorstyle_preference">Cursor style</string>
-   <string name="summary_cursorstyle_preference">Choose cursor style.</string>
-   <string name="dialog_title_cursorstyle_preference">Cursor style</string>
-
-   <string name="title_cursorblink_preference">Cursor blink</string>
-   <string name="summary_cursorblink_preference">Choose cursor blink.</string>
-   <string name="dialog_title_cursorblink_preference">Cursor blink</string>
-
-   <string name="text_preferences">Text</string>
-
-   <string name="title_fontsize_preference">Font size</string>
-   <string name="summary_fontsize_preference">Choose character height in points.</string>
-   <string name="dialog_title_fontsize_preference">Font size</string>
-
-   <string name="title_color_preference">Colors</string>
-   <string name="summary_color_preference">Choose text color.</string>
-   <string name="dialog_title_color_preference">Text color</string>
-
-   <string name="keyboard_preferences">Keyboard</string>
-
-   <string name="title_controlkey_preference">Control key</string>
-   <string name="summary_controlkey_preference">Choose control key.</string>
-   <string name="dialog_title_controlkey_preference">Control key</string>
-
-   <string name="title_ime_preference">Input method</string>
-   <string name="summary_ime_preference">Choose input method for soft keyboard.</string>
-   <string name="dialog_title_ime_preference">Input method</string>
-
-   <string name="shell_preferences">Shell</string>
-   <string name="title_shell_preference">Command line</string>
-   <string name="summary_shell_preference">Specify the shell command line.</string>
-   <string name="dialog_title_shell_preference">Shell</string>
-
-   <string name="title_initialcommand_preference">Initial command</string>
-   <string name="summary_initialcommand_preference">Sent to the shell when it starts.</string>
-   <string name="dialog_title_initialcommand_preference">Initial Command</string>
-
-   <!-- Don't localize these default values -->
-   <string name="default_value_statusbar_preference">0</string>
-   <string name="default_value_cursorstyle_preference">0</string>
-   <string name="default_value_cursorblink_preference">0</string>
-   <string name="default_value_fontsize_preference">12</string>
-   <string name="default_value_color_preference">1</string>
-   <string name="default_value_controlkey_preference">0</string>
-   <string name="default_value_ime_preference">0</string>
-   <string name="default_value_shell_preference">/system/bin/sh -</string>
-   <string name="default_value_initialcommand_preference">export PATH=/data/local/bin:$PATH</string>
-</resources>
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/cyanogenmod_icon.png b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/cyanogenmod_icon.png
new file mode 100644
index 0000000..bcb3ba4
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/cyanogenmod_icon.png
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies.jpg
new file mode 100644
index 0000000..f0962f4
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies_small.jpg
new file mode 100644
index 0000000..49ee836
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg
new file mode 100644
index 0000000..5b9aa91
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg
new file mode 100644
index 0000000..43e9c87
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_creamsickle.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_creamsickle.jpg
new file mode 100644
index 0000000..c5394b7
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_creamsickle.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_creamsickle_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_creamsickle_small.jpg
new file mode 100644
index 0000000..61799c7
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_creamsickle_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit.jpg
new file mode 100644
index 0000000..ecb449d
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit_small.jpg
new file mode 100644
index 0000000..2aa881b
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth.jpg
new file mode 100644
index 0000000..60bab36
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth_small.jpg
new file mode 100644
index 0000000..c8bab70
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_follow.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_follow.jpg
new file mode 100644
index 0000000..5bfdb2f
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_follow.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_follow_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_follow_small.jpg
new file mode 100644
index 0000000..536555c
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_follow_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fusia.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fusia.jpg
new file mode 100644
index 0000000..3976b04
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fusia.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fusia_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fusia_small.jpg
new file mode 100644
index 0000000..e41e5e4
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fusia_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots.jpg
new file mode 100644
index 0000000..104ae43
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg
new file mode 100644
index 0000000..92da2cf
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_iland.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_iland.jpg
new file mode 100644
index 0000000..b2b1a73
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_iland.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_iland_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_iland_small.jpg
new file mode 100644
index 0000000..4cdbb11
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_iland_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_inside.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_inside.jpg
new file mode 100644
index 0000000..ab83680
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_inside.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_inside_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_inside_small.jpg
new file mode 100644
index 0000000..b11f22b
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_inside_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall.jpg
new file mode 100644
index 0000000..1ea40c4
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall_small.jpg
new file mode 100644
index 0000000..4e112ac
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg
new file mode 100644
index 0000000..3f221a0
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg
new file mode 100644
index 0000000..9b08f72
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome.jpg
new file mode 100644
index 0000000..d08c7b9
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome_small.jpg
new file mode 100644
index 0000000..1033cfe
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate.jpg
new file mode 100644
index 0000000..c4667af
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate_small.jpg
new file mode 100644
index 0000000..55729fa
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern.jpg
new file mode 100644
index 0000000..5b91914
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern_small.jpg
new file mode 100644
index 0000000..17236fb
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint.jpg
new file mode 100644
index 0000000..474046c
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint_small.jpg
new file mode 100644
index 0000000..2a27c52
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb.jpg
new file mode 100644
index 0000000..2c40de4
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb_small.jpg
new file mode 100644
index 0000000..49590b7
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam.jpg
new file mode 100644
index 0000000..757ede6
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam_small.jpg
new file mode 100644
index 0000000..5db394e
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg.jpg
new file mode 100644
index 0000000..7dc8d03
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg_small.jpg
new file mode 100644
index 0000000..146bc16
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2.jpg
new file mode 100644
index 0000000..6542914
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2_small.jpg
new file mode 100644
index 0000000..af8fa2c
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_laelia.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_laelia.jpg
new file mode 100644
index 0000000..aedca70
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_laelia.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_laelia_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_laelia_small.jpg
new file mode 100644
index 0000000..73b3bb4
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_laelia_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_losing.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_losing.jpg
new file mode 100644
index 0000000..73a9f01
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_losing.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_losing_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_losing_small.jpg
new file mode 100644
index 0000000..a50df79
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_losing_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_lunia.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_lunia.jpg
new file mode 100644
index 0000000..d9b771f
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_lunia.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_lunia_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_lunia_small.jpg
new file mode 100644
index 0000000..ae52c31
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_lunia_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall1.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall1.jpg
new file mode 100644
index 0000000..d6fb517
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall1.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall1_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall1_small.jpg
new file mode 100644
index 0000000..edec7ba
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall1_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall2.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall2.jpg
new file mode 100644
index 0000000..3dc630e
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall2.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall2_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall2_small.jpg
new file mode 100644
index 0000000..503397b
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall2_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall3.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall3.jpg
new file mode 100644
index 0000000..6402339
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall3.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall3_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall3_small.jpg
new file mode 100644
index 0000000..cec9f0b
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall3_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall4.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall4.jpg
new file mode 100644
index 0000000..5a65026
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall4.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall4_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall4_small.jpg
new file mode 100644
index 0000000..1509a73
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall4_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall5.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall5.jpg
new file mode 100644
index 0000000..8b8da9b
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall5.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall5_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall5_small.jpg
new file mode 100644
index 0000000..10408f9
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall5_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall6.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall6.jpg
new file mode 100644
index 0000000..67ea2be
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall6.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall6_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall6_small.jpg
new file mode 100644
index 0000000..96f1526
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall6_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall7.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall7.jpg
new file mode 100644
index 0000000..5124b44
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall7.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall7_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall7_small.jpg
new file mode 100644
index 0000000..97d4c7b
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_nuwall7_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue.jpg
new file mode 100644
index 0000000..2cd927b
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue_small.jpg
new file mode 100644
index 0000000..8521f6a
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green.jpg
new file mode 100644
index 0000000..05a1d67
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green_small.jpg
new file mode 100644
index 0000000..a32dbab
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink.jpg
new file mode 100644
index 0000000..a047b03
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink_small.jpg
new file mode 100644
index 0000000..f54dd1e
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_aurora.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_aurora.jpg
new file mode 100644
index 0000000..d42c052
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_aurora.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_aurora_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_aurora_small.jpg
new file mode 100644
index 0000000..b61878f
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_aurora_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_cosmosition.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_cosmosition.jpg
new file mode 100644
index 0000000..6cecd25
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_cosmosition.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_cosmosition_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_cosmosition_small.jpg
new file mode 100644
index 0000000..e416201
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_cosmosition_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_curls.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_curls.jpg
new file mode 100644
index 0000000..41b07b7
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_curls.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_curls_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_curls_small.jpg
new file mode 100644
index 0000000..6030d9e
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_curls_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows.jpg
new file mode 100644
index 0000000..0c55665
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows_small.jpg
new file mode 100644
index 0000000..4d54bae
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm.jpg
new file mode 100644
index 0000000..7a62138
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm_small.jpg
new file mode 100644
index 0000000..901b275
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf.jpg
new file mode 100644
index 0000000..fce806c
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf_small.jpg
new file mode 100644
index 0000000..a304ebd
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_praedestinatio.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_praedestinatio.jpg
new file mode 100644
index 0000000..42a25cf
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_praedestinatio.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_praedestinatio_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_praedestinatio_small.jpg
new file mode 100644
index 0000000..9ffd230
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_praedestinatio_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reds.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reds.jpg
new file mode 100644
index 0000000..d7ec1a1
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reds.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reds_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reds_small.jpg
new file mode 100644
index 0000000..de88290
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reds_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reflection.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reflection.jpg
new file mode 100644
index 0000000..e3fdda8
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reflection.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reflection_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reflection_small.jpg
new file mode 100644
index 0000000..aa8037e
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_reflection_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_retro.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_retro.jpg
new file mode 100644
index 0000000..c3cbbf6
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_retro.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_retro_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_retro_small.jpg
new file mode 100644
index 0000000..f5810a6
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_retro_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_scintilment.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_scintilment.jpg
new file mode 100644
index 0000000..2159597
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_scintilment.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_scintilment_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_scintilment_small.jpg
new file mode 100644
index 0000000..26dcfd3
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_scintilment_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate.jpg
new file mode 100644
index 0000000..90e68ca
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate_small.jpg
new file mode 100644
index 0000000..83b93dd
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_toxia.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_toxia.jpg
new file mode 100644
index 0000000..8b87792
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_toxia.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_toxia_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_toxia_small.jpg
new file mode 100644
index 0000000..80a3467
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_toxia_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_wakka.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_wakka.jpg
new file mode 100644
index 0000000..1460d16
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_wakka.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_wakka_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_wakka_small.jpg
new file mode 100644
index 0000000..d48d872
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_wakka_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_warm.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_warm.jpg
new file mode 100644
index 0000000..018e0cd
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_warm.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_warm_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_warm_small.jpg
new file mode 100644
index 0000000..467d7bb
--- /dev/null
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_warm_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/FM/res/drawable-mdpi/fmradio_background.jpg b/overlay/ldpi/packages/apps/FM/res/drawable-mdpi/fmradio_background.jpg
new file mode 100644
index 0000000..5bf2372
--- /dev/null
+++ b/overlay/ldpi/packages/apps/FM/res/drawable-mdpi/fmradio_background.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
new file mode 100644
index 0000000..646fa79
--- /dev/null
+++ b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fmradio"
+    android:background="@drawable/fmradio_background"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <!-- This LinearLayout contains favorite Station Information display and the function buttons -->
+    <LinearLayout android:id="@+id/presets_layout"
+        android:background="@drawable/favorite_bg"
+        android:layout_width="match_parent"
+        android:layout_height="38dip"
+        android:orientation="horizontal"
+        android:layout_marginTop="212dip"
+        android:layout_marginLeft="14px"
+        android:layout_marginRight="13px"
+        >
+        <Button android:id="@+id/presets_button_1"
+            style="@style/favoriteButtonStyle"
+            />
+        <View
+            android:background="@drawable/favorite_line"
+            android:layout_width="2px"
+            android:layout_height="match_parent"
+            />
+        <Button android:id="@+id/presets_button_2"
+            style="@style/favoriteButtonStyle"
+            />
+        <View
+            android:background="@drawable/favorite_line"
+            android:layout_width="2px"
+            android:layout_height="match_parent"
+            />
+        <Button android:id="@+id/presets_button_3"
+            style="@style/favoriteButtonStyle"
+            />
+        <View
+            android:background="@drawable/favorite_line"
+            android:layout_width="2px"
+            android:layout_height="match_parent"
+            />
+        <Button android:id="@+id/presets_button_4"
+            style="@style/favoriteButtonStyle"
+            />
+        <View
+            android:background="@drawable/favorite_line"
+            android:layout_width="2px"
+            android:layout_height="match_parent"
+            />
+        <Button android:id="@+id/presets_button_5"
+            style="@style/favoriteButtonStyle"
+            />
+
+    </LinearLayout>
+
+    <!-- This LinearLayout contains Station Information display and the function buttons -->
+    <LinearLayout android:id="@+id/stationinfo_layout"
+        android:background="@null"
+        android:layout_width="match_parent"
+        android:layout_height="48dip"
+        android:orientation="horizontal"
+        android:layout_marginTop="4dip"
+        android:paddingLeft="14dip"
+        android:paddingRight="13dip"
+        >
+        <ImageButton android:id="@+id/btn_speaker"
+            android:src="@drawable/button_loudspeaker_off"
+            android:background="@null"
+            android:layout_marginLeft="5dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+
+        <LinearLayout
+            android:background="@drawable/station_freq_bg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="28dip"
+            >
+            <TextView android:id="@+id/prog_frequency_tv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="40dip"
+                android:gravity="center"
+                android:textColor="#FFC3E7AA"
+                android:textSize="30sp"
+                android:text="@string/frequency_string"
+                />
+        </LinearLayout>
+
+        <ImageButton android:id="@+id/btn_onoff"
+            android:src="@drawable/button_power_off"
+            android:background="@null"
+            android:layout_marginLeft="28dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+
+    </LinearLayout>
+
+    <!-- This is frequency indicator: a red needle -->
+    <com.android.fm.radio.FreqIndicator
+        android:id="@+id/freq_indicator_view"
+        android:progressDrawable="@drawable/freq_indicator_seek"
+        android:thumb="@drawable/freq_indicator"
+        android:thumbOffset="0dip"
+        android:layout_width="match_parent"
+        android:layout_height="54dip"
+        android:layout_marginLeft="11dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="4dip"
+        />
+
+    <!-- This is horizontal FM tuner -->
+    <com.android.fm.radio.TunerView
+        android:id="@+id/fm_tuner_view"
+        android:src="@drawable/tuner_view_0"
+        android:layout_width="match_parent"
+        android:layout_height="30px"
+        android:paddingTop="4px"
+        android:paddingBottom="10px"
+        android:paddingLeft="10px"
+        android:paddingRight="10px"
+        android:layout_marginTop="4dip"
+        android:layout_gravity="center_horizontal"
+        />
+
+</LinearLayout>
diff --git a/overlay/ldpi/packages/apps/FM/res/values/styles.xml b/overlay/ldpi/packages/apps/FM/res/values/styles.xml
new file mode 100644
index 0000000..d722efc
--- /dev/null
+++ b/overlay/ldpi/packages/apps/FM/res/values/styles.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <style name="FMStationSeekBar">
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:progressDrawable">@android:drawable/progress_horizontal</item>
+        <item name="android:indeterminateDrawable">@android:drawable/progress_horizontal</item>
+        <item name="android:minHeight">20dip</item>
+        <item name="android:maxHeight">20dip</item>
+        <item name="android:thumbOffset">8px</item>
+        <item name="android:focusable">true</item>
+    </style>
+    <style name="favoriteButtonStyle">
+        <item name="android:background">@drawable/favorite_button_bg</item>
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:shadowColor">#FFE8E8E8</item>
+        <item name="android:shadowDx">0.0</item>
+        <item name="android:shadowDy">1.0</item>
+        <item name="android:shadowRadius">1.0</item>
+    </style>
+
+</resources>
diff --git a/overlay/leo/packages/apps/CMParts/res/values/config.xml b/overlay/leo/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..1f71848
--- /dev/null
+++ b/overlay/leo/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_rgb_notification_led">false</bool>
+
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/overlay/leo/packages/apps/Camera/res/values/config.xml b/overlay/leo/packages/apps/Camera/res/values/config.xml
new file mode 100644
index 0000000..9e133a1
--- /dev/null
+++ b/overlay/leo/packages/apps/Camera/res/values/config.xml
@@ -0,0 +1,28 @@
+<?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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+	<!-- FFC parameter filtering -->
+	<bool name="ffc_canFocus">false</bool>
+	<bool name="ffc_canZoom">false</bool>
+	<string name="ffc_supportedEffects">none,mono,sepia</string>
+</resources>
+
diff --git a/overlay/speedy/frameworks/base/core/res/res/values/config.xml b/overlay/speedy/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..cf9a060
--- /dev/null
+++ b/overlay/speedy/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/speedy/packages/apps/CMParts/res/values/config.xml b/overlay/speedy/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..0171a73
--- /dev/null
+++ b/overlay/speedy/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_rgb_notification_led">false</bool>
+    <bool name="has_camera_button">false</bool>
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/overlay/speedy/packages/apps/Camera/res/values/config.xml b/overlay/speedy/packages/apps/Camera/res/values/config.xml
new file mode 100644
index 0000000..e9e9e19
--- /dev/null
+++ b/overlay/speedy/packages/apps/Camera/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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+	<string name="filtered_pictureSizes">2592x1936</string>
+</resources>
+
diff --git a/overlay/vega/packages/apps/ADWLauncher/res/values/config.xml b/overlay/vega/packages/apps/ADWLauncher/res/values/config.xml
new file mode 100644
index 0000000..d2606e9
--- /dev/null
+++ b/overlay/vega/packages/apps/ADWLauncher/res/values/config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- config_desktopColumns/Rows min value is 3, so it will add 3 to whatever value you set here -->
+    <integer name="config_desktopColumns">5</integer>
+    <integer name="config_desktopRows">4</integer>
+</resources>
diff --git a/overlay/vega/packages/apps/CMParts/res/values/config.xml b/overlay/vega/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..4cab749
--- /dev/null
+++ b/overlay/vega/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_led_flash">false</bool>
+</resources>
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index cd3107b..3953b5e 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -27,6 +27,7 @@
 
 get_files() {
     cat <<EOF
+app/BooksPhone.apk
 app/CarHomeGoogle.apk
 app/CarHomeLauncher.apk
 app/Facebook.apk
diff --git a/prebuilt/common/bin/chkkineto.sh b/prebuilt/common/bin/chkkineto.sh
deleted file mode 100644
index b94936e..0000000
--- a/prebuilt/common/bin/chkkineto.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/sh
-#
-# Remove KINETO if TMUS or GOOGLE Radio firmware not preset.
-#
-
-c=`/system/bin/getprop ro.carrier`
-p=/system/app/MS-HTCVISION-KNT20-02.apk
-r=y
-
-if [ "$c" = "TMUS" ];
-    then
-       r=n
-fi
-
-if [ "$c" = "GOOGLE" ];
-    then
-       r=n
-fi
-
-if [ "$c" = "ALL" ];
-    then
-       r=n
-fi
-
-if [ "$r" = "y" ];
-    then
-       if [ -f $p ];
-          then
-             rm -f /system/app/MS-HTCVISION-KNT20-02.apk
-             rm -f /system/lib/libkineto.so
-             rm -f /system/lib/libganril.so
-             rm -f /system/lib/librilswitch.so
-             sed 's/librilswitch.so/libhtc_ril.so/' /system/build.prop > /tmp/build.tmp
-             sed '/rilswitch/d' /tmp/build.tmp > /system/build.prop
-             chmod 644 /system/build.prop
-             rm /tmp/build*
-       fi
-fi
-
-exit 0
diff --git a/prebuilt/common/bin/modelid_cfg.sh b/prebuilt/common/bin/modelid_cfg.sh
new file mode 100644
index 0000000..8a94592
--- /dev/null
+++ b/prebuilt/common/bin/modelid_cfg.sh
@@ -0,0 +1,56 @@
+#!/sbin/sh
+#
+
+# Remove KINETO on incorrect models.
+#
+# Valid:
+# VISION   TMUS MODELID PC1010000
+# MAHIMAHI TMUS MODELID PB9910000
+# GLACIER  TMUS MODELID PD1510000
+# Espresso TMUS MODELID PB6510000
+#
+
+kineto=/system/app/MS-HTCVISION-KNT20-02.apk
+rm_kineto=y
+
+cat /proc/cmdline|egrep -q '(PC1010000)|(PB9910000)|(PD1510000)|(PB6510000)'
+if [ $? = 0 ];
+    then
+       rm_kineto=n
+fi
+
+if [ "$rm_kineto" = "y" ];
+    then
+       if [ -f $kineto ];
+          then
+             rm -f /system/app/MS-HTCVISION-KNT20-02.apk
+             rm -f /system/lib/libkineto.so
+             rm -f /system/lib/libganril.so
+             rm -f /system/lib/librilswitch.so
+             sed 's/librilswitch.so/libhtc_ril.so/' /system/build.prop > /tmp/build.tmp
+             sed '/rilswitch/d' /tmp/build.tmp > /system/build.prop
+             chmod 644 /system/build.prop
+             rm /tmp/build*
+       fi
+fi
+
+#
+# Check for spade; if NAM model update DSP and GPS config
+#
+# NAM Models:
+# DHD AT&T  MODELID PD9812000
+# DHD TELUS MODELID PD9814000
+#
+
+cat /proc/cmdline | grep -q spade
+if [ $? = 0 ];
+   then 
+cat /proc/cmdline | egrep -q '(PD9812000)|(PD9814000)'
+      if [ $? = 0 ];
+         then
+            mv /system/etc/nam/*MCLK.txt /system/etc/soundimage/
+            mv /system/etc/nam/CodecDSPID.txt /system/etc
+            mv /system/etc/nam/gps.conf /system/etc
+      fi
+    rm -R /system/etc/nam
+fi
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 6c41453..354926b 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -264,7 +264,7 @@
   <apn carrier="Tele2" mcc="240" mnc="07" apn="internet.tele2.se" mmsc="http://mmsc.tele2.se" mmsproxy="130.244.202.30" mmsport="8080" type="default,supl,mms" />
   <apn carrier="Telenor SE" mcc="240" mnc="08" apn="internet.telenor.se" type="default,supl" />
   <apn carrier="Telenor Mobilsurf" mcc="240" mnc="08" apn="services.telenor.se" proxy="172.30.253.241" port="8799" type="default,supl" />
-  <apn carrier="Telenor SE MMS" mcc="240" mnc="08" apn="services.telenor.se" mmsc="http://mss" mmsproxy="172.30.253.241" mmsport="8799" type="mms" />
+  <apn carrier="Telenor SE MMS" mcc="240" mnc="08" apn="services.telenor.se" mmsc="http://mms" mmsproxy="172.30.253.241" mmsport="8799" type="mms" />
   <apn carrier="TelenorMobilsurf" mcc="240" mnc="09" apn="services.telenor.se" proxy="173.30.253.241" port="8799" type="default,supl" />
   <apn carrier="Telenor MMS" mcc="240" mnc="09" apn="services.telenor.se" mmsc="http://mms" mmsproxy="173.30.253.241" mmsport="8799" type="mms" />
   <apn carrier="Spring data" mcc="240" mnc="10" apn="data.springmobil.se" type="default,supl" />
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 2b72e59..4bcfa19 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -6,6 +6,7 @@
     $(LOCAL_DIR)/cyanogen_buzz.mk \
     $(LOCAL_DIR)/cyanogen_click.mk \
     $(LOCAL_DIR)/cyanogen_crespo.mk \
+    $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
     $(LOCAL_DIR)/cyanogen_encore.mk \
     $(LOCAL_DIR)/cyanogen_espresso.mk \
     $(LOCAL_DIR)/cyanogen_hero.mk \
@@ -20,7 +21,9 @@
     $(LOCAL_DIR)/cyanogen_one.mk \
     $(LOCAL_DIR)/cyanogen_passion.mk \
     $(LOCAL_DIR)/cyanogen_sholes.mk \
+    $(LOCAL_DIR)/cyanogen_speedy.mk \
     $(LOCAL_DIR)/cyanogen_supersonic.mk \
+    $(LOCAL_DIR)/cyanogen_vega.mk \
     $(LOCAL_DIR)/cyanogen_vision.mk \
-    $(LOCAL_DIR)/cyanogen_z71.mk
-#    $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
+    $(LOCAL_DIR)/cyanogen_z71.mk \
+    $(LOCAL_DIR)/cyanogen_zero.mk
diff --git a/products/common.mk b/products/common.mk
index a78c37c..64a0268 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -58,7 +58,7 @@
 
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
-    vendor/cyanogen/prebuilt/common/bin/chkkineto.sh:system/bin/chkkineto.sh \
+    vendor/cyanogen/prebuilt/common/bin/modelid_cfg.sh:system/bin/modelid_cfg.sh \
     vendor/cyanogen/prebuilt/common/bin/verify_cache_partition_size.sh:system/bin/verify_cache_partition_size.sh \
     vendor/cyanogen/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf \
     vendor/cyanogen/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf \
diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
index 22d7bf8..28b6957 100644
--- a/products/cyanogen_ace.mk
+++ b/products/cyanogen_ace.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := ace
 PRODUCT_MODEL := Desire HD
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ace BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRH78C BUILD_FINGERPRINT=htc_wwe/htc_ace/ace/ace:2.2.1/FRG83D/296490:user/release-keys PRIVATE_BUILD_DESC="1.72.405.3 CL296490 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ace BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=htc_wwe/htc_ace/ace/ace:2.2.1/FRG83D/296490:user/release-keys PRIVATE_BUILD_DESC="1.72.405.3 CL296490 release-keys"
 
 # Build kernel
 #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
@@ -28,6 +28,9 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
+# Add AicBootFix for ace battery fix
+PRODUCT_PACKAGES += AicBootFix
+
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
@@ -40,10 +43,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-DesireHD
+            ro.modversion=CyanogenMod-7.0.0-RC2-DesireHD
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-DesireHD-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-DesireHD-KANG
     endif
 endif
 
diff --git a/products/cyanogen_blade.mk b/products/cyanogen_blade.mk
index bac62f2..08464c7 100644
--- a/products/cyanogen_blade.mk
+++ b/products/cyanogen_blade.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := blade
 PRODUCT_MODEL := Blade
 PRODUCT_MANUFACTURER := ZTE
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=cyanogen_blade BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C 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"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=cyanogen_blade BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRI40 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"
 
 #
 # Set ro.modversion
@@ -26,10 +26,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Blade
+            ro.modversion=CyanogenMod-7.0.0-RC2-Blade
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Blade-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-Blade-KANG
     endif
 endif
 
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index fd5a59e..006900e 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := bravo
 PRODUCT_MODEL := HTC Desire
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo/bravo:2.2/FRF91/226611:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="2.10.405.2 CL226611 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRI40 PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo/bravo:2.2/FRF91/226611:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="2.10.405.2 CL226611 release-keys"
 
 # Build kernel
 PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
@@ -46,10 +46,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Desire
+            ro.modversion=CyanogenMod-7.0.0-RC2-Desire
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Desire-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-Desire-KANG
     endif
 endif
 
diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
index c6849a7..97ca3e7 100644
--- a/products/cyanogen_bravoc.mk
+++ b/products/cyanogen_bravoc.mk
@@ -12,7 +12,7 @@
 PRODUCT_DEVICE := bravoc
 PRODUCT_MODEL := HTC Desire CDMA
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo/bravo:2.2/FRF91/226611:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="2.10.405.2 CL226611 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRI40 PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo/bravo:2.2/FRF91/226611:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="2.10.405.2 CL226611 release-keys"
 
 # Build kernel
 PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
@@ -34,10 +34,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-BravoC
+            ro.modversion=CyanogenMod-7.0.0-RC2-BravoC
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-BravoC-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-BravoC-KANG
     endif
 endif
 
diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk
index bdfd619..8f6552c 100644
--- a/products/cyanogen_buzz.mk
+++ b/products/cyanogen_buzz.mk
@@ -1,5 +1,5 @@
 # Inherit AOSP device configuration for buzz.
-$(call inherit-product, device/htc/buzz/full_buzz.mk)
+$(call inherit-product, device/htc/buzz/buzz.mk)
 
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common_full.mk)
@@ -7,9 +7,6 @@
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
 
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/buzz/prebuilt/kernel
-
 #
 # Setup device specific product configuration.
 #
@@ -18,23 +15,18 @@
 PRODUCT_DEVICE := buzz
 PRODUCT_MODEL := HTC Wildfire
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C 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"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_buzz BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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 Passion overlay
-PRODUCT_PACKAGE_OVERLAYS += device/htc/buzz/overlay
+# Extra overlay for LDPI
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi
 
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,113,115,117,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
+# Broadcom FM radio
+$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Enable Windows Media
-WITH_WINDOWS_MEDIA := true
-
+# Copy bootanimation
 PRODUCT_COPY_FILES +=  \
     vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
 
@@ -47,9 +39,9 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-buzz
+            ro.modversion=CyanogenMod-7.0.0-RC2-buzz
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-buzz-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-buzz-KANG
     endif
 endif
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
index 920cfea..d00d514 100644
--- a/products/cyanogen_click.mk
+++ b/products/cyanogen_click.mk
@@ -7,6 +7,9 @@
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
 
+# Broadcom FM radio
+$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk)
+
 # Build kernel
 PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/click/kernel
 
@@ -18,8 +21,7 @@
 PRODUCT_DEVICE := click
 PRODUCT_MODEL := HTC click
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_click BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C 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"
-PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_click BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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 Passion overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi
@@ -33,13 +35,13 @@
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-$(shell date +%m%d%Y)-NIGHTLY-click
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-click
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-click
+            ro.modversion=CyanogenMod-7.0.0-RC2.2-click
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-RC1-click-KANG
+            ro.modversion=CyanogenMod-RC2.2-click-KANG
     endif
 endif
diff --git a/products/cyanogen_crespo.mk b/products/cyanogen_crespo.mk
index 8a429bb..f033f2a 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=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_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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"
 
 # Extra Crespo overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/crespo
@@ -38,10 +38,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-NS
+            ro.modversion=CyanogenMod-7.0.0-RC2-NS
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-NS-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-NS-KANG
     endif
 endif
 
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index 9f27726..3576795 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -15,12 +15,12 @@
 PRODUCT_DEVICE := dream_sapphire
 PRODUCT_MODEL := Dream/Sapphire
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C BUILD_FINGERPRINT=tmobile/opal/sapphire/sapphire:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="opal-user 2.2.1 FRG83 60505 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=tmobile/opal/sapphire/sapphire:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="opal-user 2.2.1 FRG83 60505 release-keys"
 
 # Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_msm_defconfig
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_msm_defconfig
 
 # Extra DS overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dream_sapphire
diff --git a/products/cyanogen_encore.mk b/products/cyanogen_encore.mk
index f6ba768..8a2fb63 100644
--- a/products/cyanogen_encore.mk
+++ b/products/cyanogen_encore.mk
@@ -1,8 +1,8 @@
 # Inherit AOSP device configuration for encore.
-$(call inherit-product, device/bn/encore/device_encore.mk)
+$(call inherit-product, device/bn/encore/encore.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
 
 #
 # Setup device specific product configuration.
@@ -12,7 +12,7 @@
 PRODUCT_DEVICE := encore
 PRODUCT_MODEL := NookColor
 PRODUCT_MANUFACTURER := bn
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=encore 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"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=encore BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/encore
 
@@ -25,10 +25,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-encore
+            ro.modversion=CyanogenMod-7.0.0-RC2-encore
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-encore-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-encore-KANG
     endif
 endif
 
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index 676f6ce..c3c171f 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := espresso
 PRODUCT_MODEL := T-Mobile myTouch 3G Slide
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=htc_espresso 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"
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 PRODUCT_NAME=htc_espresso 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_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-msm722x.map
 
@@ -37,10 +37,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Slide
+            ro.modversion=CyanogenMod-7.0.0-RC2-Slide
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Slide-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-Slide-KANG
     endif
 endif
 
diff --git a/products/cyanogen_glacier.mk b/products/cyanogen_glacier.mk
index b27a470..f785441 100644
--- a/products/cyanogen_glacier.mk
+++ b/products/cyanogen_glacier.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := glacier
 PRODUCT_MODEL := HTC Glacier
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_glacier BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C BUILD_FINGERPRINT=tmobile/htc_glacier/glacier/glacier:2.2.1/FRG83/277036:user/release-keys PRIVATE_BUILD_DESC="1.17.531.2 CL277036 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_glacier BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=tmobile/htc_glacier/glacier/glacier:2.2.1/FRG83/277036:user/release-keys PRIVATE_BUILD_DESC="1.17.531.2 CL277036 release-keys"
 
 # Build kernel
 #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
@@ -43,10 +43,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-glacier
+            ro.modversion=CyanogenMod-7.0.0-RC2-glacier
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-glacier-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-glacier-KANG
     endif
 endif
 
diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk
index df6f2d0..7702aa2 100644
--- a/products/cyanogen_harmony.mk
+++ b/products/cyanogen_harmony.mk
@@ -11,7 +11,7 @@
 PRODUCT_DEVICE := harmony
 PRODUCT_MODEL := GTablet
 PRODUCT_MANUFACTURER := malata
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=harmony BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRH78C BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83D/75603:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83D 75603 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=harmony BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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/harmony
@@ -25,10 +25,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Harmony
+            ro.modversion=CyanogenMod-7.0.0-RC2-Harmony
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Harmony-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-Harmony-KANG
     endif
 endif
 
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
index 4c61c12..65d81a4 100644
--- a/products/cyanogen_heroc.mk
+++ b/products/cyanogen_heroc.mk
@@ -13,7 +13,7 @@
 PRODUCT_DEVICE := heroc
 PRODUCT_MODEL := HERO200
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C 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"
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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 for Gallery3D orientation hack
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/heroc
@@ -27,10 +27,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC0-Heroc
+            ro.modversion=CyanogenMod-7.0.0-RC2-Heroc
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC0-Heroc-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-Heroc-KANG
     endif
 endif
 
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index e846f61..8afcec3 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -11,7 +11,7 @@
 PRODUCT_DEVICE := inc
 PRODUCT_MODEL := Incredible
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=inc BUILD_FINGERPRINT=verizon_wwe/inc/inc/inc:2.2/FRF91/264707:user/release-keys PRODUCT_BRAND=verizon_wwe TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.26.605.1 CL264707 release-keys" PRODUCT_MODEL=ADR6300 PRODUCT_MANUFACTURER=HTC
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRI40 PRODUCT_NAME=inc BUILD_FINGERPRINT=verizon_wwe/inc/inc/inc:2.2/FRF91/264707:user/release-keys PRODUCT_BRAND=verizon_wwe TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.26.605.1 CL264707 release-keys" PRODUCT_MODEL=ADR6300 PRODUCT_MANUFACTURER=HTC
 
 PRODUCT_PROPERTY_OVERRIDES += ro.product.version=3.26.605.1
 
@@ -33,10 +33,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Inc
+            ro.modversion=CyanogenMod-7.0.0-RC2-Inc
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Inc-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-Inc-KANG
     endif
 endif
 
diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk
index 776dc48..5d16874 100644
--- a/products/cyanogen_legend.mk
+++ b/products/cyanogen_legend.mk
@@ -19,6 +19,9 @@
 
 PRODUCT_PACKAGES += Torch
 
+# TI FM radio
+$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk)
+
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/legend
 
 ifdef CYANOGEN_NIGHTLY
diff --git a/products/cyanogen_leo.mk b/products/cyanogen_leo.mk
index ba52063..fd62a22 100644
--- a/products/cyanogen_leo.mk
+++ b/products/cyanogen_leo.mk
@@ -16,10 +16,10 @@
 PRODUCT_DEVICE := leo
 PRODUCT_MODEL := HTC HD2
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRH78C BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83D/75603:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83D 75603 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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 leo overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/products/overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/leo
 
 # This file is used to install the enable RMNET and corresponding modules which dont get activated by normal module script
 PRODUCT_COPY_FILES += \
@@ -41,10 +41,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC0-LEO
+            ro.modversion=CyanogenMod-7.0.0-RC2-LEO
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC0-LEO-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-LEO-KANG
     endif
 endif
 
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index 597a158..bf432b5 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -15,10 +15,12 @@
 PRODUCT_DEVICE := liberty
 PRODUCT_MODEL := Liberty
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_liberty BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C 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"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_liberty BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-msm722x.map
 
+# Broadcom FM radio
+$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
@@ -26,10 +28,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Liberty
+            ro.modversion=CyanogenMod-7.0.0-RC2-Liberty
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Liberty-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-Liberty-KANG
     endif
 endif
 
diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk
index 93ab2d9..fa9fcce 100644
--- a/products/cyanogen_one.mk
+++ b/products/cyanogen_one.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := one
 PRODUCT_MODEL := Geeksphone ONE
 PRODUCT_MANUFACTURER := Geeksphone
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=geeksphone-one PRODUCT_NAME=geeksphone_one BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C 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"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=geeksphone-one PRODUCT_NAME=geeksphone_one BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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"
 
 #
 # Move dalvik cache to data partition where there is more room to solve startup problems
@@ -29,10 +29,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-ONE
+            ro.modversion=CyanogenMod-7.0.0-RC2-ONE
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-ONE-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-ONE-KANG
     endif
 endif
 
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 85a01e4..868d33c 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=FRG83D BUILD_DISPLAY_ID=GRH78C BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83D/75603:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83D 75603 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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"
 
 # Build kernel
 PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
@@ -46,10 +46,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-N1
+            ro.modversion=CyanogenMod-7.0.0-RC2-N1
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-N1-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-N1-KANG
     endif
 endif
 
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index e4f57e6..751de28 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -22,14 +22,14 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Droid
+            ro.modversion=CyanogenMod-7.0.0-RC2-Droid
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Droid-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-Droid-KANG
     endif
 endif
 
-PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRH78C 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
+PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRI40 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
 
 PRODUCT_COPY_FILES +=  \
     vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_speedy.mk b/products/cyanogen_speedy.mk
new file mode 100644
index 0000000..84e3710
--- /dev/null
+++ b/products/cyanogen_speedy.mk
@@ -0,0 +1,51 @@
+# Inherit AOSP device configuration for speedy.
+$(call inherit-product, device/htc/speedy/speedy.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_speedy
+PRODUCT_BRAND := sprint
+PRODUCT_DEVICE := speedy
+PRODUCT_MODEL := PG06100
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=htc_speedy BUILD_FINGERPRINT=sprint/htc_speedy/speedy/speedy:2.2/FRF91/291627:user/release-keys PRIVATE_BUILD_DESC="1.17.651.1 CL291627 release-keys"
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_speedy_defconfig
+
+# Extra Supersonic overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/speedy
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
+# Broadcom FM radio
+$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Speedy
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC1-Speedy
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC1-Speedy-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_supersonic.mk b/products/cyanogen_supersonic.mk
index 026c2ff..49a30b8 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -12,7 +12,7 @@
 PRODUCT_DEVICE := supersonic
 PRODUCT_MODEL := PC36100
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=htc_supersonic BUILD_FINGERPRINT=sprint/htc_supersonic/supersonic/supersonic:2.2/FRF91/252548:user/release-keys PRIVATE_BUILD_DESC="3.29.651.5 CL252548 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRI40 PRODUCT_NAME=htc_supersonic BUILD_FINGERPRINT=sprint/htc_supersonic/supersonic/supersonic:2.2/FRF91/252548:user/release-keys PRIVATE_BUILD_DESC="3.29.651.5 CL252548 release-keys"
 
 # Build kernel
 #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
@@ -37,10 +37,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Supersonic
+            ro.modversion=CyanogenMod-7.0.0-RC2-Supersonic
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Supersonic-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-Supersonic-KANG
     endif
 endif
 
diff --git a/products/cyanogen_vega.mk b/products/cyanogen_vega.mk
new file mode 100644
index 0000000..ea4e41f
--- /dev/null
+++ b/products/cyanogen_vega.mk
@@ -0,0 +1,39 @@
+$(call inherit-product, device/advent/vega/vega.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_vega
+PRODUCT_BRAND := advent
+PRODUCT_DEVICE := vega
+PRODUCT_MODEL := Vega
+PRODUCT_MANUFACTURER := Advent
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Vega BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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/vega
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Vega
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC2-Vega
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC2-Vega-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_vision.mk b/products/cyanogen_vision.mk
index 8bcc3d7..a34f1dc 100644
--- a/products/cyanogen_vision.mk
+++ b/products/cyanogen_vision.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := vision
 PRODUCT_MODEL := HTC Vision
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vision BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRH78C BUILD_FINGERPRINT=tmobile/htc_vision/vision/vision:2.2/FRF91/277427:user/release-keys PRIVATE_BUILD_DESC="1.22.531.8 CL277427 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vision BUILD_ID=FRF91 BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=tmobile/htc_vision/vision/vision:2.2/FRF91/277427:user/release-keys PRIVATE_BUILD_DESC="1.22.531.8 CL277427 release-keys"
 
 # Build kernel
 #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
@@ -43,10 +43,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-vision
+            ro.modversion=CyanogenMod-7.0.0-RC2-vision
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-vision-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-vision-KANG
     endif
 endif
 
diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk
index 40f04a5..a348d98 100644
--- a/products/cyanogen_z71.mk
+++ b/products/cyanogen_z71.mk
@@ -15,7 +15,7 @@
 PRODUCT_DEVICE := z71
 PRODUCT_MODEL := Z71
 PRODUCT_MANUFACTURER := Commtiva
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=commtiva_z71 BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C 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"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=commtiva_z71 BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-z71.map
 
@@ -28,10 +28,10 @@
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Z71
+            ro.modversion=CyanogenMod-7.0.0-RC2-Z71
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC1-Z71-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC2-Z71-KANG
     endif
 endif
 
diff --git a/products/cyanogen_zero.mk b/products/cyanogen_zero.mk
new file mode 100644
index 0000000..c7f49ec
--- /dev/null
+++ b/products/cyanogen_zero.mk
@@ -0,0 +1,41 @@
+# Inherit AOSP device configuration for zero.
+$(call inherit-product, device/geeksphone/zero/zero.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_zero
+PRODUCT_BRAND := geeksphone
+PRODUCT_DEVICE := zero
+PRODUCT_MODEL := Geeksphone ZERO
+PRODUCT_MANUFACTURER := Geeksphone
+
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=geeksphone_zero BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRI40 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"
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-ZERO
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC2-ZERO
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.0.0-RC2-ZERO-KANG
+    endif
+endif
+
+#
+# Copy legend specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/ti_fm_radio.mk b/products/ti_fm_radio.mk
new file mode 100644
index 0000000..7f91740
--- /dev/null
+++ b/products/ti_fm_radio.mk
@@ -0,0 +1,4 @@
+# TI FM Radio
+PRODUCT_PACKAGES += \
+    FM \
+    hcitool
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 3e5860f..44ef373 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -5,7 +5,7 @@
 add_lunch_combo cyanogen_buzz-eng
 add_lunch_combo cyanogen_click-eng
 add_lunch_combo cyanogen_crespo-eng
-#add_lunch_combo cyanogen_dream_sapphire-eng
+add_lunch_combo cyanogen_dream_sapphire-eng
 add_lunch_combo cyanogen_encore-eng
 add_lunch_combo cyanogen_espresso-eng
 add_lunch_combo cyanogen_generic-eng
@@ -20,9 +20,11 @@
 add_lunch_combo cyanogen_one-eng
 add_lunch_combo cyanogen_passion-eng
 add_lunch_combo cyanogen_sholes-eng
+add_lunch_combo cyanogen_speedy-eng
 add_lunch_combo cyanogen_supersonic-eng
+add_lunch_combo cyanogen_vega-eng
 add_lunch_combo cyanogen_vision-eng
 add_lunch_combo cyanogen_z71-eng
-
+add_lunch_combo cyanogen_zero-eng
 
 PATH=$PATH:$PWD/vendor/cyanogen/tools ; export PATH