diff --git a/overlay/frameworks/base/core/res/res/drawable-hdpi/status_bar_background.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_background.png
similarity index 100%
rename from overlay/frameworks/base/core/res/res/drawable-hdpi/status_bar_background.png
rename to overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_background.png
diff --git a/overlay/frameworks/base/core/res/res/drawable-hdpi/statusbar_background.9.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/statusbar_background.9.png
similarity index 100%
rename from overlay/frameworks/base/core/res/res/drawable-hdpi/statusbar_background.9.png
rename to overlay/common/frameworks/base/core/res/res/drawable-hdpi/statusbar_background.9.png
diff --git a/overlay/frameworks/base/core/res/res/drawable-mdpi/status_bar_background.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_background.png
similarity index 100%
rename from overlay/frameworks/base/core/res/res/drawable-mdpi/status_bar_background.png
rename to overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_background.png
diff --git a/overlay/frameworks/base/core/res/res/drawable-mdpi/statusbar_background.9.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/statusbar_background.9.png
similarity index 100%
rename from overlay/frameworks/base/core/res/res/drawable-mdpi/statusbar_background.9.png
rename to overlay/common/frameworks/base/core/res/res/drawable-mdpi/statusbar_background.9.png
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
rename to overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
diff --git a/overlay/packages/providers/ContactsProvider/res/values/unrestricted_packages.xml b/overlay/common/packages/providers/ContactsProvider/res/values/unrestricted_packages.xml
similarity index 100%
rename from overlay/packages/providers/ContactsProvider/res/values/unrestricted_packages.xml
rename to overlay/common/packages/providers/ContactsProvider/res/values/unrestricted_packages.xml
diff --git a/overlay/passion/frameworks/base/core/res/res/values/config.xml b/overlay/passion/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 00000000..4a6f6efe
--- /dev/null
+++ b/overlay/passion/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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>
+
+    <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
+    <bool name="config_hspa_data_distinguishable">true</bool>
+
+    <!-- Enables special filtering code in the framework for raw touch events
+         from the touch driver.  This code exists for one particular device,
+         and should not be enabled for any others.  Hopefully in the future
+         it will be removed when the lower-level touch driver generates better
+         data. -->
+    <bool name="config_filterTouchEvents">true</bool>
+
+    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
+         specified -->
+    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
+
+</resources>
diff --git a/products/common.mk b/products/common.mk
index c953a197..04429b68 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -20,8 +20,8 @@ PRODUCT_COPY_FILES += \
     vendor/cyanogen/CHANGELOG:system/etc/CHANGELOG-CM.txt \
     vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
 
-# Allow the use of overlays
-PRODUCT_PACKAGE_OVERLAYS := vendor/cyanogen/overlay
+# Common CM overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/common
 
 # Bring in some audio files
 include frameworks/base/data/sounds/AudioPackage4.mk
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index bda49aae..796d2a99 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -15,6 +15,9 @@ PRODUCT_MANUFACTURER := HTC
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF83 BUILD_DISPLAY_ID=FRF83 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF83/42295:user/release-keys TARGET_BUILD_TYPE=userdebug
 PRIVATE_BUILD_DESC="passion-user 2.2 FRF83 42295 release-keys"
 
+# Extra Passion overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion
+
 #
 # Set ro.modversion
 #