diff --git a/overlay/heroc/frameworks/base/core/res/res/values/config.xml b/overlay/heroc/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 00000000..9895b326
--- /dev/null
+++ b/overlay/heroc/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,28 @@
+<?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>
+
+    <!-- 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>
+
+</resources>
diff --git a/overlay/heroc/packages/apps/Gallery3D/res/values/config.xml b/overlay/heroc/packages/apps/Gallery3D/res/values/config.xml
new file mode 100644
index 00000000..64f4ba3a
--- /dev/null
+++ b/overlay/heroc/packages/apps/Gallery3D/res/values/config.xml
@@ -0,0 +1,21 @@
+<?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="reload_on_orientation_change">true</bool>
+
+</resources>
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
index 15766aef..9676527e 100644
--- a/products/cyanogen_heroc.mk
+++ b/products/cyanogen_heroc.mk
@@ -21,7 +21,7 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NA
 PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/heroc/kernel
 
 # Extra overlay for Gallery3D orientation hack
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dream_sapphire
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/heroc
 
 #
 # Set ro.modversion
@@ -31,7 +31,7 @@ ifdef CYANOGEN_NIGHTLY
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Heroc
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Heroc-RC1
+	 ro.modversion=CyanogenMod-6.0.0-Heroc-RC1
 endif
 
 #