diff --git a/BoardConfig.mk b/BoardConfig.mk
index bb64181..149453b 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -41,11 +41,12 @@ TARGET_BOOTLOADER_BOARD_NAME := htcleo
 
 # Wifi related defines
 BOARD_WPA_SUPPLICANT_DRIVER := WEXT
-WPA_SUPPLICANT_VERSION      := VER_0_6_X
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_wext
+WPA_SUPPLICANT_VERSION      := VER_0_8_X
 BOARD_WLAN_DEVICE           := bcm4329
 WIFI_DRIVER_MODULE_PATH     := "/system/lib/modules/bcm4329.ko"
-WIFI_DRIVER_FW_STA_PATH     := "/vendor/firmware/fw_bcm4329.bin"
-WIFI_DRIVER_FW_AP_PATH      := "/vendor/firmware/fw_bcm4329_apsta.bin"
+WIFI_DRIVER_FW_PATH_STA     := "/vendor/firmware/fw_bcm4329.bin"
+WIFI_DRIVER_FW_PATH_AP      := "/vendor/firmware/fw_bcm4329_apsta.bin"
 WIFI_DRIVER_MODULE_ARG      := "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/proc/calibration"
 WIFI_DRIVER_MODULE_NAME     := "bcm4329"
 
@@ -62,8 +63,6 @@ BOARD_VENDOR_QCOM_AMSS_VERSION := 1550
 
 BOARD_VENDOR_USE_AKMD := akm8973
 
-#BOARD_EGL_CFG := device/htc/leo/prebuilt/egl.cfg
-
 #BOARD_USE_FROYO_LIBCAMERA := true
 
 TARGET_USES_16BPPSURFACE_FOR_OPAQUE := true
@@ -104,4 +103,10 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200
 TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/leo/prebuilt/recovery_kernel
 
 # Hardware rendering
-#USE_OPENGL_RENDERER := true
+USE_OPENGL_RENDERER := true
+BOARD_EGL_CFG := device/htc/leo/prebuilt/egl.cfg
+
+#temp hw hack
+BOARD_NO_RGBX_8888 := true
+BOARD_USES_OVERLAY := true
+COMMON_GLOBAL_CFLAGS += -DBOARD_GL_OES_EGL_IMG_EXTERNAL_HACK
diff --git a/cm.mk b/cm.mk
index 47a9f67..382965f 100644
--- a/cm.mk
+++ b/cm.mk
@@ -8,7 +8,7 @@ PRODUCT_RELEASE_NAME := GN
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
 # Inherit device configuration
-$(call inherit-product, device/htc/leo/leo.mk)
+$(call inherit-product, device/htc/leo/full_leo.mk)
 
 ## Device identifier. This must come after all inclusions
 PRODUCT_MODEL := HTC HD2
@@ -19,3 +19,13 @@ PRODUCT_NAME := cm_leo
 
 #Set build fingerprint / ID / Prduct Name ect.
 PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=leo BUILD_ID=ITL41D BUILD_DISPLAY_ID=ITL41D BUILD_FINGERPRINT="google/htc_leo/leo:4.0.1/ITL41D/223971:user/release-keys" PRVIATE_BUILD_DESC="full_leo-user 4.0.1 ITL41D 223971 release-keys"
+
+
+PRODUCT_PACKAGES += \
+    Camera
+
+# Release name and versioning
+PRODUCT_RELEASE_NAME := Leo
+PRODUCT_VERSION_DEVICE_SPECIFIC := -aali
+-include vendor/cyanogen/products/common_versions.mk
+
diff --git a/leo.mk b/leo.mk
index 5c39ad7..f8009bc 100755
--- a/leo.mk
+++ b/leo.mk
@@ -60,14 +60,14 @@ PRODUCT_PACKAGES += \
     sensors.htcleo \
     lights.htcleo \
     librs_jni \
-    gralloc.qsd8k \
     leo-reference-ril \
     gps.htcleo \
     libgps \
     libhtc_ril_wrapper \
-    audio.a2dp.default \
+#    audio.a2dp.default \
     audio.primary.qsd8k \
-    audio_policy.qsd8k
+    audio_policy.qsd8k \
+    copybit.qsd8k
 
 
 
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 9f485c0..eb3545e 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -35,6 +35,12 @@
     <!-- disable menu hard key on HD2 in non-pattern lockscreen -->
     <bool name="config_disableMenuKeyInLockScreen">true</bool>
 
+<!-- Flag indicating whether the surface flinger has limited
+     alpha compositing functionality in hardware.  If set, the window
+     manager will disable alpha trasformation in animations where not
+     strictly needed. -->
+    <bool name="config_sf_limitedAlpha">true</bool>
+
     <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
          The N entries of this array define N + 1 zones as follows:
 
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 0000000..7035926
--- /dev/null
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2009, 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>
+    <bool name="def_accelerometer_rotation">true</bool>
+    <bool name="def_screen_brightness_automatic_mode">true</bool>
+    <integer name="def_screen_off_timeout">45000</integer>
+    <integer name="def_lockscreen_sounds_enabled">0</integer>
+
+    <!-- Default for Settings.System.POINTER_SPEED -->
+    <integer name="def_pointer_speed">100</integer>
+
+    <!-- Default for UI touch sounds enabled -->
+    <bool name="def_sound_effects_enabled">false</bool>
+    <fraction name="def_window_animation_scale">50%</fraction>
+    <fraction name="def_window_transition_scale">50%</fraction>
+</resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
new file mode 100644
index 0000000..8d4fcb0
--- /dev/null
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+
+    <!-- Control whether status bar should distinguish HSPA data icon form UMTS
+    data icon on devices -->
+    <bool name="config_hspa_data_distinguishable">true</bool>
+
+</resources>
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_grass.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_grass.jpg
new file mode 100644
index 0000000..5518d6d
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_grass.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_grass_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_grass_small.jpg
new file mode 100644
index 0000000..a1751e2
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_grass_small.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_mountains.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_mountains.jpg
new file mode 100644
index 0000000..95c59ea
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_mountains.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_mountains_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_mountains_small.jpg
new file mode 100644
index 0000000..956e8f0
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_mountains_small.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_phasebeam.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_phasebeam.jpg
new file mode 100644
index 0000000..4bc7ff3
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_phasebeam.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_phasebeam_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_phasebeam_small.jpg
new file mode 100644
index 0000000..f034b33
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_phasebeam_small.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_pulse.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_pulse.jpg
new file mode 100644
index 0000000..2f96d02
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_pulse.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_pulse_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_pulse_small.jpg
new file mode 100644
index 0000000..34ca847
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_pulse_small.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpg
new file mode 100644
index 0000000..f4a3934
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpg
new file mode 100644
index 0000000..d580182
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stars.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stars.jpg
new file mode 100644
index 0000000..8f3ec2d
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stars.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stars_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stars_small.jpg
new file mode 100644
index 0000000..ba76f18
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stars_small.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stream.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stream.jpg
new file mode 100644
index 0000000..fdd4aaf
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stream.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stream_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stream_small.jpg
new file mode 100644
index 0000000..432d67d
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stream_small.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_street_lights.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_street_lights.jpg
new file mode 100644
index 0000000..a8b6880
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_street_lights.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_street_lights_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_street_lights_small.jpg
new file mode 100644
index 0000000..11c253e
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_street_lights_small.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_sunset.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_sunset.jpg
new file mode 100644
index 0000000..660040e
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_sunset.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_sunset_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_sunset_small.jpg
new file mode 100644
index 0000000..ed79925
Binary files /dev/null and b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_sunset_small.jpg differ
diff --git a/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml b/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml
new file mode 100644
index 0000000..40033cf
--- /dev/null
+++ b/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2009 Google Inc.
+ *
+ * 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-array name="wallpapers" translatable="false">
+        <item>wallpaper_street_lights</item>
+        <item>wallpaper_stream</item>
+        <item>wallpaper_phasebeam</item>
+        <item>wallpaper_pulse</item>
+        <item>wallpaper_nexusrain</item>
+        <item>wallpaper_stars</item>
+        <item>wallpaper_canyon</item>
+        <item>wallpaper_grass</item>
+        <item>wallpaper_zanzibar</item>
+        <item>wallpaper_cloud</item>
+        <item>wallpaper_monumentvalley</item>
+        <item>wallpaper_mountains</item>
+        <item>wallpaper_sunset</item>
+        <item>wallpaper_goldengate</item>
+	<item>wallpaper_shuttle</item>
+    </string-array>
+</resources>
diff --git a/overlay/packages/apps/Phone/res/values/config.xml b/overlay/packages/apps/Phone/res/values/config.xml
index ee4d054..a179d90 100644
--- a/overlay/packages/apps/Phone/res/values/config.xml
+++ b/overlay/packages/apps/Phone/res/values/config.xml
@@ -22,4 +22,10 @@
          the com.android.internal.telephony.Phone interface (false). -->
     <bool name="send_mic_mute_to_AudioManager">true</bool>
 
+    <!-- Enable the onscreen "Dial" button in the emergency dialer. -->
+    <bool name="config_show_onscreen_dial_button">true</bool>
+
+    <!-- This device implements a noise suppression device for in call audio-->
+    <bool name="has_in_call_noise_suppression">true</bool>
+
 </resources>
diff --git a/prebuilt/init.htcleo.rc b/prebuilt/init.htcleo.rc
index 151036e..13f973a 100644
--- a/prebuilt/init.htcleo.rc
+++ b/prebuilt/init.htcleo.rc
@@ -28,6 +28,8 @@ on fs
     write /data/drm/rights/mid.txt 0
     chmod 0777 /data/drm/rights/mid.txt
 
+    setprop vold.post_fs_data_done 1
+
 on boot
     mount debugfs /sys/kernel/debug /sys/kernel/debug
 
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 61fd8f4..47ceaf9 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -23,3 +23,4 @@
 add_lunch_combo htc_leo-userdebug
 add_lunch_combo htc_leo-eng
 add_lunch_combo full_leo-eng
+add_lunch_combo cm_leo-userdebug