diff --git a/overlay/leo/packages/apps/CMParts/res/values/config.xml b/overlay/leo/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 00000000..1f718485
--- /dev/null
+++ b/overlay/leo/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Whether or not to display the trackball settings -->
+    <bool name="has_trackball">false</bool>
+    <bool name="has_rgb_notification_led">false</bool>
+
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/overlay/leo/packages/apps/Camera/res/values/config.xml b/overlay/leo/packages/apps/Camera/res/values/config.xml
new file mode 100644
index 00000000..9e133a13
--- /dev/null
+++ b/overlay/leo/packages/apps/Camera/res/values/config.xml
@@ -0,0 +1,28 @@
+<?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>
+	<!-- FFC parameter filtering -->
+	<bool name="ffc_canFocus">false</bool>
+	<bool name="ffc_canZoom">false</bool>
+	<string name="ffc_supportedEffects">none,mono,sepia</string>
+</resources>
+
diff --git a/products/cyanogen_leo.mk b/products/cyanogen_leo.mk
index ba520636..a3df5fd6 100644
--- a/products/cyanogen_leo.mk
+++ b/products/cyanogen_leo.mk
@@ -19,7 +19,7 @@ PRODUCT_MANUFACTURER := HTC
 PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRH78C BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83D/75603:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83D 75603 release-keys"
 
 # Extra leo overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/products/overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/leo
 
 # This file is used to install the enable RMNET and corresponding modules which dont get activated by normal module script
 PRODUCT_COPY_FILES += \
@@ -41,10 +41,10 @@ ifdef CYANOGEN_NIGHTLY
 else
     ifdef CYANOGEN_RELEASE
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC0-LEO
+            ro.modversion=CyanogenMod-7.0.0-RC1-LEO
     else
         PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-7.0.0-RC0-LEO-KANG
+            ro.modversion=CyanogenMod-7.0.0-RC1-LEO-KANG
     endif
 endif