diff --git a/BoardConfig.mk b/BoardConfig.mk
index 83fe080..3b80986 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -62,9 +62,9 @@ BOARD_VENDOR_QCOM_AMSS_VERSION := 1550
 
 BOARD_VENDOR_USE_AKMD := akm8973
 
-BOARD_EGL_CFG := device/htc/leo/prebuilt/egl.cfg
+#BOARD_EGL_CFG := device/htc/leo/prebuilt/egl.cfg
 
-BOARD_USE_FROYO_LIBCAMERA := true
+#BOARD_USE_FROYO_LIBCAMERA := true
 
 TARGET_USES_16BPPSURFACE_FOR_OPAQUE := true
 BOARD_NO_RGBX_8888 := true
@@ -72,8 +72,8 @@ BOARD_USES_QCOM_LIBS := true
 
 BOARD_USE_KINETO_COMPATIBILITY := true
 
-BOARD_HAVE_FM_RADIO := true
-BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO
+#BOARD_HAVE_FM_RADIO := true
+#BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO
 
 TARGET_CUSTOM_RELEASETOOL := device/htc/leo/releasetools/squisher
 
@@ -102,5 +102,6 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := leo
 BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200
 
 TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/leo/prebuilt/recovery_kernel
--include device/htc/7x30-recovery/BoardConfigCommon.mk
-TARGET_PROVIDES_INIT_RC := true
+
+# Hardware rendering
+#USE_OPENGL_RENDERER := true
diff --git a/leo.mk b/leo.mk
index 6a7b744..6e55084 100755
--- a/leo.mk
+++ b/leo.mk
@@ -25,7 +25,6 @@
 PRODUCT_COPY_FILES += \
     device/htc/leo/prebuilt/init.htcleo.rc:root/init.htcleo.rc \
     device/htc/leo/prebuilt/ueventd.htcleo.rc:root/ueventd.htcleo.rc \
-    device/htc/leo/prebuilt/init.rc:root/init.rc \
 
 # we have enough storage space to hold precise GC data
 PRODUCT_TAGS += dalvik.gc.type-precise
@@ -59,13 +58,15 @@ PRODUCT_PACKAGES += \
     sensors.htcleo \
     lights.htcleo \
     librs_jni \
-    libc \
     gralloc.qsd8k \
     copybit.qsd8k \
     leo-reference-ril \
     gps.htcleo \
     libgps \
-    libhtc_ril_wrapper
+    libhtc_ril_wrapper \
+    audio.a2dp.default \
+    audio.primary.qsd8k \
+    audio_policy.qsd8k
 
 
 
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index d570d1f..244176f 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -124,21 +124,21 @@
     <string name="config_geocodeProvider">com.google.android.location.GeocodeProvider</string>
 
 
-    <!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.
-         Please don't copy them, copy anything else. -->
-
-    <!-- This string array should be overridden by the device to present a list of network
-         attributes.  This is used by the connectivity manager to decide which networks can coexist
-         based on the hardware -->
-    <!-- An Array of "[Connection name],[ConnectivityManager connection type],
-         [associated radio-type],[priority]  -->
+    <!-- An Array of "[Connection name],[ConnectivityManager.TYPE_xxxx],
+         [associated radio-type],[priority],[restoral-timer(ms)],[dependencyMet]  -->
+    <!-- the 5th element "resore-time" indicates the number of milliseconds to delay
+         before automatically restore the default connection.  Set -1 if the connection
+         does not require auto-restore. -->
+    <!-- the 6th element indicates boot-time dependency-met value. -->
     <string-array translatable="false" name="networkAttributes">
-        <item>"wifi,1,1,1"</item>
-        <item>"mobile,0,0,0"</item>
-        <item>"mobile_mms,2,0,2"</item>
-        <item>"mobile_supl,3,0,2"</item>
-        <item>"mobile_dun,4,0,4"</item>
-        <item>"mobile_hipri,5,0,3"</item>
+        <item>"wifi,1,1,1,-1,true"</item>
+        <item>"mobile,0,0,0,-1,true"</item>
+        <item>"mobile_mms,2,0,2,60000,true"</item>
+        <item>"mobile_supl,3,0,2,60000,true"</item>
+        <item>"mobile_dun,4,0,3,60000,true"</item>
+        <item>"mobile_hipri,5,0,3,60000,true"</item>
+        <item>"mobile_bluetooth,7,7,1,-1,true"</item>
+        <item>"wifi_p2p,13,1,0,-1,true"</item>
     </string-array>
 
     <!-- List of regexpressions describing the interface (if any) that represent tetherable
@@ -148,15 +148,6 @@
         <item>"usb0"</item>
     </string-array>
 
-    <!-- Regex array of allowable upstream ifaces for tethering - for example if you want
-         tethering on a new interface called "foo2" add <item>"foo\\d"</item> to the array -->
-<!--    <string-array translatable="false" name="config_tether_upstream_regexs">
-        <item>"rmnet\\d"</item>
-        <item>"ppp\\d"</item>
-        <item>"eth\\d"</item>
-    </string-array>
--->
-
     <!-- List of regexpressions describing the interface (if any) that represent tetherable
          Wifi interfaces.  If the device doesn't want to support tethering over Wifi this
          should be empty.  An example would be "softap.*" -->
@@ -169,28 +160,21 @@
         <item>30</item>
     </integer-array>
 
-
-    <!-- Boolean indicating if we require the use of DUN on mobile for tethering -->
-<!--
-    <bool translatable="false" name="config_tether_dun_required">false</bool>
--->
-
     <!-- Vibrator pattern for a very short but reliable vibration for soft keyboard tap -->
     <integer-array name="config_keyboardTapVibePattern">
         <item>30</item>
     </integer-array>
 
-   <!-- Enable use of power animations -->
+    <!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
+    <bool name="config_unplugTurnsOnScreen">true</bool>
+
+    <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
+        autodetected from the Configuration. -->
+    <bool name="config_showNavigationBar">false</bool>
+
+    <!-- Minimum screen brightness allowed by the power manager. -->
+    <integer name="config_screenBrightnessDim">10</integer>
+
+    <!-- Enable use of power animations -->
     <bool name="config_animateScreenLights">false</bool>
-
-   <!-- Enable Tablet tweaks -->
-<!--
-    <bool name="cm_default_has_soft_buttons">true</bool>
-    <bool name="cm_default_show_soft_home">false</bool>
-    <bool name="cm_default_show_soft_menu">false</bool>
-    <bool name="cm_default_show_soft_back">false</bool>
-    <bool name="cm_default_show_soft_search">false</bool>
-    <bool name="cm_default_show_soft_quick_na">false</bool>
--->
-
 </resources>
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
deleted file mode 100644
index a6af5fd..0000000
--- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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>
-</resources>
diff --git a/overlay/frameworks/base/tests/ImfTest/res/values/config.xml b/overlay/frameworks/base/tests/ImfTest/res/values/config.xml
deleted file mode 100644
index 157d04a..0000000
--- a/overlay/frameworks/base/tests/ImfTest/res/values/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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_expect_ime_autopop">true</bool>
-</resources>
diff --git a/overlay/packages/apps/CMParts/res/values/config.xml b/overlay/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 0c8b4ce..0000000
--- a/overlay/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="has_trackball">false</bool>
-    <bool name="has_dual_notification_led">true</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_led_flash">true</bool>
-    <bool name="has_search_button">false</bool>
-</resources>
diff --git a/overlay/packages/apps/Camera/res/values/config.xml b/overlay/packages/apps/Camera/res/values/config.xml
deleted file mode 100644
index c08ec21..0000000
--- a/overlay/packages/apps/Camera/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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>
-    <!-- Autofocus parameters -->
-    <!-- <string name="touchFocusParameter">touch-focus</string> -->
-</resources>
diff --git a/overlay/packages/apps/Contacts/res/values/config.xml b/overlay/packages/apps/Contacts/res/values/config.xml
deleted file mode 100644
index 09b6689..0000000
--- a/overlay/packages/apps/Contacts/res/values/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-
-<!-- Passion-specific Contacts app resources. -->
-<resources>
-    <!-- Enable the onscreen "Dial" button in the dialer. -->
-    <bool name="config_show_onscreen_dial_button">true</bool>
-</resources>
diff --git a/overlay/packages/apps/Mms/res/xml/mms_config.xml b/overlay/packages/apps/Mms/res/xml/mms_config.xml
index 73a57b5..9d6c7f3 100644
--- a/overlay/packages/apps/Mms/res/xml/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml/mms_config.xml
@@ -18,9 +18,10 @@
         version 1 - initial version.
         version 2 - added recipientLimit.
         version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
 -->
 
-<mms_config version="3">
+<mms_config version="4">
     <!-- Maximum message size in bytes for a MMS message -->
     <int name="maxMessageSize">1048576</int>
 
@@ -31,9 +32,31 @@
     <int name="maxImageWidth">2592</int>
 
     <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Passion</string>
+    <string name="userAgent">Leo</string>
 
     <!-- UAProf URL -->
-    <string name="uaProfUrl">http://www.htcmms.com.tw/Android/Common/nexusone/ua-profile.xml</string>
+    <string name="uaProfUrl">http://www.htcmms.com.tw/Android/Common/leo/ua-profile.xml</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">-1</int>
+
+    <!-- Maximum number of SMS message segments in a long text message before converting
+         the SMS message to an MMS message. -->
+    <int name="smsToMmsTextThreshold">4</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
 
 </mms_config>
diff --git a/overlay/packages/apps/Phone/res/values/config.xml b/overlay/packages/apps/Phone/res/values/config.xml
deleted file mode 100644
index 32d3cd3..0000000
--- a/overlay/packages/apps/Phone/res/values/config.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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.
--->
-
-<!-- Passion-specific phone app resources. -->
-<resources>
-
-    <!-- Enable the onscreen touch UI for all states of the in-call UI. -->
-    <!--<bool name="allow_incoming_call_touch_ui">true</bool>-->
-    <!--<bool name="allow_in_call_touch_ui">true</bool>-->
-
-    <!-- This is a device with capacitive buttons, so disable the feature
-         where BACK rejects the current incoming call.  (Since it's so
-         easy to press the key accidentally as you pull the phone out of
-         your pocket.) -->
-    <!--<bool name="allow_back_key_to_reject_incoming_call">false</bool>-->
-
-    <!-- Enable the onscreen "Dial" button in the emergency dialer. -->
-    <bool name="config_show_onscreen_dial_button">true</bool>
-
-    <!-- This device uses libaudio-qsd8k which implements
-         AudioHardware::setMicMute(bool state) and AudioHardware::getMicMute(bool* state)
-         so microphone muting calls should be routed through the AudioManager API. -->
-    <bool name="send_mic_mute_to_AudioManager">true</bool>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
deleted file mode 100644
index ee25c1c..0000000
--- a/overlay/packages/apps/Settings/res/values/bools.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
-    <!-- Whether or not there is a notification led that is too intrusive to be pulsing
-         constantly -->
-    <!--<bool name="has_intrusive_led">true</bool>-->
-    <!-- Whether or not the dock settings are to be displayed for this device when docked -->
-    <bool name="has_dock_settings">true</bool>
-</resources>
diff --git a/prebuilt/init.htcleo.rc b/prebuilt/init.htcleo.rc
index b15603d..dfb3bc8 100644
--- a/prebuilt/init.htcleo.rc
+++ b/prebuilt/init.htcleo.rc
@@ -76,7 +76,7 @@ on boot
     chown media system /sys/android_camera/cam_mode
 
     # enable the GPS
-    setprop ro.ril.def.agps.mode 2
+    #setprop ro.ril.def.agps.mode 2
 
     # performance tweaks for flash
     write /sys/block/mtdblock3/bdi/read_ahead_kb 2048
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index f59e671..1cd206c 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -74,19 +74,19 @@ done
 # This file is generated by device/$MANUFACTURER/$DEVICE/setup-makefiles.sh
 
 # Live wallpaper packages
-PRODUCT_PACKAGES := \\
-    LiveWallpapers \\
-    LiveWallpapersPicker \\
-    MagicSmokeWallpapers \\
-    VisualizationWallpapers \\
-    librs_jni
+#PRODUCT_PACKAGES := \\
+#    LiveWallpapers \\
+#    LiveWallpapersPicker \\
+#    MagicSmokeWallpapers \\
+#    VisualizationWallpapers \\
+#    librs_jni
 
 # Publish that we support the live wallpaper feature.
 PRODUCT_COPY_FILES := \\
     packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml
 
 # Pick up overlay for features that depend on non-open-source files
-DEVICE_PACKAGE_OVERLAYS := $OUTDIR/overlay
+#DEVICE_PACKAGE_OVERLAYS := $OUTDIR/overlay
 
 \$(call inherit-product, $OUTDIR/$DEVICE-vendor-blobs.mk)
 EOF
diff --git a/synaptics-rmi-touchscreen.idc b/synaptics-rmi-touchscreen.idc
new file mode 100644
index 0000000..71531c1
--- /dev/null
+++ b/synaptics-rmi-touchscreen.idc
@@ -0,0 +1,64 @@
+# Copyright (C) 2010 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.
+
+#
+# Input Device Calibration File for the Leo touch screen.
+#
+# These calibration values are derived from empirical measurements
+# and may not be appropriate for use with other touch screens.
+# Refer to the input device calibration documentation for more details.
+#
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+# Touch Size
+touch.touchSize.calibration = pressure
+
+# Tool Size
+# Driver reports tool size as a linear width measurement summed over
+# all contact points.
+#
+# Raw width field measures approx. 1 unit per millimeter
+# of tool size on the surface where a raw width of 1 corresponds
+# to about 17mm of physical size.  Given that the display resolution
+# is 10px per mm we obtain a scale factor of 10 pixels / unit and
+# a bias of 160 pixels.  In addition, the raw width represents a
+# sum of all contact area so we note this fact in the calibration.
+touch.toolSize.calibration = linear
+touch.toolSize.linearScale = 10
+touch.toolSize.linearBias = 160
+touch.toolSize.isSummed = 1
+
+# Pressure
+# Driver reports signal strength as pressure.
+#
+# A normal thumb touch while touching the back of the device
+# typically registers about 100 signal strength units although
+# this value is highly variable and is sensitive to contact area,
+# manner of contact and environmental conditions.  We set the
+# scale so that a normal touch with good signal strength will be
+# reported as having a pressure somewhere in the vicinity of 1.0,
+# a featherlight touch will be below 1.0 and a heavy or large touch
+# will be above 1.0.  We don't expect these values to be accurate.
+touch.pressure.calibration = amplitude
+touch.pressure.source = default
+touch.pressure.scale = 0.01
+
+# Size
+touch.size.calibration = normalized
+
+# Orientation
+touch.orientation.calibration = none
+
diff --git a/system.prop b/system.prop
index 4095afd..367877a 100755
--- a/system.prop
+++ b/system.prop
@@ -17,6 +17,9 @@ ro.ril.hsdpa.category=8
 ro.ril.hsupa.category=5
 ro.ril.hsxpa=2
 ro.ril.enable.prl.recognition=1
+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
 
 # Time between scans in seconds. Keep it high to minimize battery drain.
 # This only affects the case in which there are remembered access points,
@@ -28,6 +31,15 @@ wifi.supplicant_scan_interval=120
 # 0 => WCDMA preferred.
 ro.telephony.default_network=0
 
+# Turn on checkjni for non-user builds.
+ro.kernel.android.checkjni=1
+
+# Set device insecure for non-user builds.
+ro.secure=0
+
+# Allow mock locations by default for non user builds
+ro.allow.mock.location=1
+
 # density in DPI of the LCD of this board. This is used to scale the UI
 # appropriately. If this property is not defined, the default value is 240 dpi.
 ro.sf.lcd_density=240