diff --git a/overlay/vivo/frameworks/base/core/res/res/values/config.xml b/overlay/vivo/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..960a389
--- /dev/null
+++ b/overlay/vivo/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,25 @@
+<?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.
+*/
+-->
+<resources>
+
+    <!-- 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/overlay/vivo/packages/apps/CMParts/res/values/config.xml b/overlay/vivo/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..1f71848
--- /dev/null
+++ b/overlay/vivo/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/products/AndroidProducts.mk b/products/AndroidProducts.mk
index c209f80..75993e8 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -39,6 +39,7 @@
     $(LOCAL_DIR)/cyanogen_vega.mk \
     $(LOCAL_DIR)/cyanogen_vibrantmtd.mk \
     $(LOCAL_DIR)/cyanogen_vision.mk \
+    $(LOCAL_DIR)/cyanogen_vivo.mk \
     $(LOCAL_DIR)/cyanogen_z71.mk \
     $(LOCAL_DIR)/cyanogen_zeppelin.mk \
     $(LOCAL_DIR)/cyanogen_zero.mk
diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
index 4dd9eff..be4c0d3 100644
--- a/products/cyanogen_ace.mk
+++ b/products/cyanogen_ace.mk
@@ -28,9 +28,6 @@
 # Add the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Add AicBootFix for ace battery fix
-PRODUCT_PACKAGES += AicBootFix
-
 # Broadcom FM radio
 $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
 
diff --git a/products/cyanogen_vivo.mk b/products/cyanogen_vivo.mk
new file mode 100644
index 0000000..e3a5818
--- /dev/null
+++ b/products/cyanogen_vivo.mk
@@ -0,0 +1,57 @@
+# Inherit device configuration for vivo.
+$(call inherit-product, device/htc/vivo/vivo.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_vivo
+PRODUCT_BRAND := htc_wwe
+PRODUCT_DEVICE := vivo
+PRODUCT_MODEL := Incredible S
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vivo BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=htc_wwe/htc_vivo/vivo:2.3.3/GRI40/47853:user/release-keys PRIVATE_BUILD_DESC="2.36.405.8 CL47853 release-keys"
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_vivo_defconfig
+
+# Extra vivo overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vivo
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
+# Add AicBootFix for vivo battery fix
+PRODUCT_PACKAGES += AicBootFix
+
+# Broadcom FM radio
+$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-IncS
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-IncS
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-IncS-KANG
+    endif
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index ba9e7fe..9fa60fe 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -38,6 +38,7 @@
 add_lunch_combo cyanogen_vega-eng
 add_lunch_combo cyanogen_vibrantmtd-eng
 add_lunch_combo cyanogen_vision-eng
+add_lunch_combo cyanogen_vivo-eng
 add_lunch_combo cyanogen_z71-eng
 add_lunch_combo cyanogen_zeppelin-eng
 add_lunch_combo cyanogen_zero-eng