diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4d9d11b..04398e6 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -73,6 +73,13 @@ BOARD_USE_REVERSE_FFC := true
 BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := leo
 BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 1240
 
+# Use RGB565 surfaces until userspace drivers are upgraded
+BOARD_NO_RGBX_8888 := true
+
+BOARD_HAVE_FM_RADIO := true
+BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO
+
+
 # # cat /proc/mtd
 # dev:    size   erasesize  name
 # mtd0: 000a0000 00020000 "misc"
diff --git a/leo.mk b/leo.mk
index 1e9c286..4406805 100755
--- a/leo.mk
+++ b/leo.mk
@@ -19,31 +19,30 @@
 # not specialized for any geography.
 #
 
+# The gps config appropriate for this device
+PRODUCT_COPY_FILES += \
+    device/htc/leo/gps.conf:system/etc/gps.conf
 
 ## (1) First, the most specific values, i.e. the aspects that are specific to GSM
 
-PRODUCT_COPY_FILES += \
-    vendor/htc/leo/proprietary/libcamera.so:obj/lib/libcamera.so
-
 PRODUCT_COPY_FILES += \
     device/htc/leo/init.leo.rc:root/init.leo.rc \
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.sf.lcd_density=240 \
-    rild.libpath=/system/lib/libhtc_ril.so \
-    ro.ril.ecc.HTC-ELL=92,93,94 \
-    ro.ril.ecc.HTC-WWE=999 \
-    ro.ril.enable.a52.HTC-ITA=1 \
-    ro.ril.enable.a53.HTC-ITA=1 \
-    ro.ril.enable.a52=0 \
-    ro.ril.enable.a53=1 \
-    ro.ril.enable.dtm = 1 \
-    ro.ril.gprsclass = 12 \
-    ro.ril.hsdpa.category=8 \
-    ro.ril.hsupa.category=5 \
-    ro.ril.hsxpa=2 \
-    wifi.interface=eth0 \
-    wifi.supplicant_scan_interval=15
+    ro.com.google.clientidbase=android-tmobile-us \
+    ro.com.google.clientidbase.vs=android-hms-tmobile-us \
+    ro.com.google.clientidbase.ms=android-hms-tmobile-us \
+    ro.com.google.locationfeatures=1 \
+    ro.com.google.networklocation=1 \
+    ro.com.google.gmsversion=2.2_r6 \
+    ro.setupwizard.enable_bypass=1 \
+    dalvik.vm.lockprof.threshold=500 \
+    dalvik.vm.dexopt-flags=m=y
+    ro.media.dec.jpeg.memcap=20000000 \
+    dalvik.vm.lockprof.threshold=500 \
+    dalvik.vm.dexopt-flags=m=y \
+    ro.opengles.version=131072
+
 
 # Default network type.
 # 0 => WCDMA preferred.
@@ -58,6 +57,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.ril.avoid.pdp.overlap = 1
 
+# we have enough storage space to hold precise GC data
+PRODUCT_TAGS += dalvik.gc.type-precise
+
 # Set default_france.acdb to audio_ctl driver if the ro.cid is HTC__203
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.ril.enable.prl.recognition = 0
@@ -74,8 +76,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ## (2) Also get non-open-source GSM-specific aspects if available
 $(call inherit-product-if-exists, vendor/htc/leo/leo-vendor.mk)
 
-PRODUCT_PROPERTY_OVERRIDES +=
-    ro.media.dec.jpeg.memcap=20000000
 
 DEVICE_PACKAGE_OVERLAYS += device/htc/leo/overlay
 
@@ -104,8 +104,6 @@ PRODUCT_PACKAGES += \
     libOmxVidEnc
 
 
-# we have enough storage space to hold precise GC data
-PRODUCT_TAGS += dalvik.gc.type-precise
 
 # leo uses high-density artwork where available
 PRODUCT_LOCALES := hdpi