diff --git a/cm.mk b/cm.mk
index ca362e2..3d18855 100644
--- a/cm.mk
+++ b/cm.mk
@@ -20,11 +20,6 @@ PRODUCT_NAME := cm_leo
 #Set build fingerprint / ID / Prduct Name ect.
 PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=leo BUILD_ID=IML74K BUILD_DISPLAY_ID=IML74K BUILD_FINGERPRINT="google/htc_leo/leo:4.0.3/IML74K/239410:user/release-keys" PRVIATE_BUILD_DESC="full_leo-user 4.0.3 IML74K 239410 release-keys"
 
-
-PRODUCT_PACKAGES += \
-    Camera \
-    CMSettings
-
 # Release name and versioning
 PRODUCT_RELEASE_NAME := LEO
 #PRODUCT_VERSION_DEVICE_SPECIFIC := -aali
diff --git a/leo.mk b/leo.mk
index 1861f29..49661b7 100644
--- a/leo.mk
+++ b/leo.mk
@@ -99,9 +99,10 @@ PRODUCT_PACKAGES += \
     libgps \
     com.android.future.usb.accessory \
     libhtc_ril_wrapper
-
-# leo uses high-density artwork where available 
-PRODUCT_LOCALES := hdpi
+	
+# leo uses high-density artwork where available
+PRODUCT_AAPT_CONFIG := normal hdpi
+PRODUCT_AAPT_PREF_CONFIG := hdpi
 
 PRODUCT_COPY_FILES += \
     device/htc/leo/prebuilt/vold.fstab:system/etc/vold.fstab
diff --git a/overlay/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg b/overlay/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg
deleted file mode 100644
index 811149b..0000000
Binary files a/overlay/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg and /dev/null differ
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 0f33fef..a95e44e 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -21,12 +21,6 @@
      for different hardware and product builds. -->
 <resources>
 
-    <!-- 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>
-
     <!-- Flag indicating whether we should enable the automatic brightness in Settings.
          config_hardware_automatic_brightness_available is not set, so we will use software implementation -->
     <bool name="config_automatic_brightness_available">true</bool>
@@ -39,53 +33,41 @@
          manager will disable alpha trasformation in animations where not
          strictly needed. -->
     <bool name="config_sf_limitedAlpha">true</bool>
+	
+	<!-- Flag indicating whether the surface flinger is inefficient
+         at performing a blur. Used by parts of the UI to turn off
+         the blur effect where it isn't worth the performance hit.
+         As of Honeycomb, blurring is not supported anymore. -->
+    <bool name="config_sf_slowBlur">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:
-
-         Zone 0:        0 <= LUX < array[0]
-         Zone 1:        array[0] <= LUX < array[1]
-         ...
-         Zone N:        array[N - 1] <= LUX < array[N]
-         Zone N + 1:    array[N] <= LUX < infinity
-
-           Must be overridden in platform specific overlays -->
-    <integer-array name="config_autoBrightnessLevels">
-        <item>11</item>
-        <item>41</item>
-        <item>91</item>
-        <item>161</item>
-        <item>226</item>
-        <item>321</item>
-        <item>641</item>
-        <item>1281</item>
-        <item>2601</item>
+<integer-array name="config_autoBrightnessLevels">
+        <item>160</item>
+        <item>225</item>
+        <item>320</item>
+        <item>640</item>
+        <item>1280</item>
+        <item>2600</item>
+        <item>5800</item>
     </integer-array>
 
     <!-- Array of output values for LCD backlight corresponding to the LUX values
-         in the config_autoBrightnessLevels array.  This array should have size one greater
-         than the size of the config_autoBrightnessLevels array.
-    -->
+         in the config_autoBrightnessLevels array. This array should have size one greater
+         than the size of the config_autoBrightnessLevels array. -->
     <integer-array name="config_autoBrightnessLcdBacklightValues">
-        <item>89</item>
-        <item>89</item>
-        <item>126</item>
-        <item>164</item>
-        <item>164</item>
-        <item>164</item>
-        <item>187</item>
-        <item>210</item>
-        <item>233</item>
+        <item>60</item>
+        <item>100</item>
+        <item>120</item>
+        <item>140</item>
+        <item>160</item>
+        <item>180</item>
+        <item>220</item>
         <item>255</item>
     </integer-array>
 
     <!-- Array of output values for button backlight corresponding to the LUX values
-         in the config_autoBrightnessLevels array.  This array should have size one greater
-         than the size of the config_autoBrightnessLevels array.
-    -->
+         in the config_autoBrightnessLevels array. This array should have size one greater
+         than the size of the config_autoBrightnessLevels array. -->
      <integer-array name="config_autoBrightnessButtonBacklightValues">
-        <item>255</item>
-        <item>255</item>
         <item>255</item>
         <item>255</item>
         <item>0</item>
@@ -97,16 +79,18 @@
     </integer-array>
 
     <!-- Array of output values for keyboard backlight corresponding to the LUX values
-         in the config_autoBrightnessLevels array.  This array should have size one greater
+         in the config_autoBrightnessLevels array. This array should have size one greater
          than the size of the config_autoBrightnessLevels array.
-         Leo has no keyboard so all values are zero.
-    -->
+         Leo has no keyboard so all values are zero. -->
     <integer-array name="config_autoBrightnessKeyboardBacklightValues">
         <item>0</item>
         <item>0</item>
         <item>0</item>
         <item>0</item>
         <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
     </integer-array>
     
     <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
@@ -179,7 +163,4 @@
     <!-- 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>
-
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 9be6384..b18d9dc 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -19,12 +19,12 @@
 
 <device name="Android">
   <item name="none">0</item>
-  <item name="screen.on">100</item>
+  <item name="screen.on">110</item>
   <item name="bluetooth.active">142</item> <!-- In call -->
   <item name="bluetooth.on">0.3</item>
   <!-- CPU wakelock held for 830ms on bluetooth headset at command. 43mA * 830 -->
   <item name="bluetooth.at">35690</item>
-  <item name="screen.full">160</item>
+  <item name="screen.full">250</item>
   <item name="wifi.on">4</item>
   <item name="wifi.active">120</item>
   <item name="wifi.scan">220</item>
@@ -32,7 +32,7 @@
   <item name="dsp.video">88</item>
   <item name="radio.active">300</item>
   <item name="gps.on">170</item>
-  <item name="battery.capacity">1390</item>
+  <item name="battery.capacity">1230</item>
   <item name="radio.scanning">70</item>
   <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
       <value>3</value>
@@ -69,4 +69,4 @@
       <value>148.5</value>
       <value>168.4</value>
   </array>
-</device>
+</device>
\ No newline at end of file
diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_grass.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_grass.jpg
deleted file mode 100644
index 5518d6d..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_grass.jpg and /dev/null 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
deleted file mode 100644
index a1751e2..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_grass_small.jpg and /dev/null 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
deleted file mode 100644
index 95c59ea..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_mountains.jpg and /dev/null 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
deleted file mode 100644
index 956e8f0..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_mountains_small.jpg and /dev/null 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
deleted file mode 100644
index 4bc7ff3..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_phasebeam.jpg and /dev/null 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
deleted file mode 100644
index f034b33..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_phasebeam_small.jpg and /dev/null 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
deleted file mode 100644
index 2f96d02..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_pulse.jpg and /dev/null 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
deleted file mode 100644
index 34ca847..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_pulse_small.jpg and /dev/null 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
deleted file mode 100644
index f4a3934..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpg and /dev/null 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
deleted file mode 100644
index d580182..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpg and /dev/null 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
deleted file mode 100644
index 8f3ec2d..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stars.jpg and /dev/null 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
deleted file mode 100644
index ba76f18..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stars_small.jpg and /dev/null 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
deleted file mode 100644
index fdd4aaf..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stream.jpg and /dev/null 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
deleted file mode 100644
index 432d67d..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_stream_small.jpg and /dev/null 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
deleted file mode 100644
index a8b6880..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_street_lights.jpg and /dev/null 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
deleted file mode 100644
index 11c253e..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_street_lights_small.jpg and /dev/null 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
deleted file mode 100644
index 660040e..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_sunset.jpg and /dev/null 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
deleted file mode 100644
index ed79925..0000000
Binary files a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_sunset_small.jpg and /dev/null differ
diff --git a/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml b/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml
deleted file mode 100644
index 40033cf..0000000
--- a/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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>