diff --git a/BoardConfig.mk b/BoardConfig.mk
index 099bb86..3f95de1 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -78,6 +78,9 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 1240
 # Use RGB565 surfaces until userspace drivers are upgraded
 BOARD_NO_RGBX_8888 := true
 
+# Use Special Leo update
+TARGET_USES_LEOUPDATE := true
+
 BOARD_HAVE_FM_RADIO := true
 BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO
 
diff --git a/extract-files.sh b/extract-files.sh
index 43ab716..d85ef7d 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -42,9 +42,12 @@ adb pull /system/lib/libgsl.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
 adb pull /system/lib/libgps.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libgps.so
 adb pull /system/lib/libhtc_acoustic.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libhtc_acoustic.so
 adb pull /system/lib/libhtc_ril.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libhtc_ril.so
-adb pull /system/lib/libhtc_ril_wrapper.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libhtc_ril_wrapper.so.so
+adb pull /system/lib/libhtc_ril_wrapper.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libhtc_ril_wrapper.so
 adb pull /system/lib/liboemcamera.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/liboemcamera.so
 adb pull /system/lib/libOmxVdec.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libOmxVdec.so
+adb pull /system/lib/libOmxVidenc.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libOmxVidenc.so
+adb pull /system/lib/libOmxCore.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libOmxCore.so
+adb pull /system/lib/libmm-omxcore.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libmm-omxcore.so
 
 (cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/device-vendor-blobs.mk
 # Copyright (C) 2010 The Android Open Source Project
@@ -92,7 +95,10 @@ PRODUCT_COPY_FILES += \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libhtc_ril_wrapper.so:system/lib/libhtc_ril_wrapper.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/liboemcamera.so:system/lib/liboemcamera.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libgps.so:system/lib/libgps.so \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxVdec.so:system/lib/libOmxVdec.so
+    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxVdec.so:system/lib/libOmxVdec.so \\
+    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxVidEnc.so:system/lib/libOmxVidEnc.so \\
+    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxCore.so:system/lib/libOmxCore.so \\
+    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libmm-omxcore.so:system/lib/libmm-omxcore.so \\
 EOF
 
 ./setup-makefiles.sh
diff --git a/gps.conf b/gps.conf
index 68c5bfc..674147d 100644
--- a/gps.conf
+++ b/gps.conf
@@ -2,8 +2,6 @@ NTP_SERVER=north-america.pool.ntp.org
 XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
 XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
 XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin
-SUPL_HOST=supl.google.com
-SUPL_PORT=7276
 NTP_SERVER=0.north-america.pool.ntp.org
 NTP_SERVER=1.north-america.pool.ntp.org
 NTP_SERVER=2.north-america.pool.ntp.org
@@ -11,6 +9,8 @@ NTP_SERVER=3.north-america.pool.ntp.org
 XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
 XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
 XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin
+SUPL_HOST=supl.google.com
+SUPL_PORT=7276
 SUPL_HOST=FQDN
 SUPL_PORT=7275
 SUPL_TLS_HOST=FQDN
diff --git a/initrd.gz b/initrd.gz
index 6408af2..8ca9245 100644
Binary files a/initrd.gz and b/initrd.gz differ
diff --git a/kernel b/kernel
new file mode 100755
index 0000000..117cdc1
Binary files /dev/null and b/kernel differ
diff --git a/leo.mk b/leo.mk
index 32309e5..3534fe2 100755
--- a/leo.mk
+++ b/leo.mk
@@ -110,9 +110,7 @@ PRODUCT_PACKAGES += \
     gralloc.qsd8k \
     copybit.qsd8k \
     leo-reference-ril \
-    gps.leo \
-    libOmxCore \
-    libOmxVidEnc 
+    gps.leo
 
 
 
@@ -146,6 +144,15 @@ PRODUCT_COPY_FILES += \
     device/htc/leo/zImage:boot/zImage \
     device/htc/leo/initrd.gz:boot/initrd.gz \
 
+ifeq ($(TARGET_PREBUILT_KERNEL),)
+LOCAL_KERNEL := device/htc/leo/kernel
+else
+LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
+endif
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_KERNEL):kernel
+
 # media profiles and capabilities spec
 $(call inherit-product, device/htc/leo/media_a1026.mk)
 
diff --git a/modules/bcm4329.ko b/modules/bcm4329.ko
index e6f7c14..3e16fb8 100644
Binary files a/modules/bcm4329.ko and b/modules/bcm4329.ko differ
diff --git a/modules/cifs.ko b/modules/cifs.ko
index a97ef67..6d9c69d 100644
Binary files a/modules/cifs.ko and b/modules/cifs.ko differ
diff --git a/modules/msm_rmnet.ko b/modules/msm_rmnet.ko
index ebd4233..a94f089 100644
Binary files a/modules/msm_rmnet.ko and b/modules/msm_rmnet.ko differ
diff --git a/modules/nls_utf8.ko b/modules/nls_utf8.ko
index 35c8951..c81c89b 100644
Binary files a/modules/nls_utf8.ko and b/modules/nls_utf8.ko differ
diff --git a/modules/tun.ko b/modules/tun.ko
index 32a55aa..2a45c02 100644
Binary files a/modules/tun.ko and b/modules/tun.ko differ
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index a482888..61ae196 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -25,9 +25,9 @@
     <bool name="config_automatic_brightness_available">true</bool>
 
    
-    <bool name="config_animateScreenLights">true</bool>
+    <bool name="config_animateScreenLights">false</bool>
 
-    <!-- disable menu hard key on Passion in non-pattern lockscreen -->
+    <!-- disable menu hard key on HD2 in non-pattern lockscreen -->
     <bool name="config_disableMenuKeyInLockScreen">true</bool>
 
     <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
diff --git a/zImage b/zImage
old mode 100755
new mode 100644
index 117cdc1..309150b
Binary files a/zImage and b/zImage differ