diff --git a/config/common.mk b/config/common.mk
index 78479ee..e93864c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -60,6 +60,10 @@
     vendor/slim/prebuilt/common/etc/cron/cron.daily/01clear_cache:system/etc/cron/cron.daily/01clear_cache \
     vendor/slim/prebuilt/common/etc/cron/cron.weekly/01clear_cache:system/etc/cron/cron.weekly/01clear_cache 
 
+# Workaround for NovaLauncher zipalign fails
+PRODUCT_COPY_FILES += \
+    vendor/slim/prebuilt/common/app/NovaLauncher.apk:system/app/NovaLauncher.apk
+
 # Embed SuperUser
 SUPERUSER_EMBEDDED := true
 
@@ -82,11 +86,9 @@
 
 # Extra Optional packages
 PRODUCT_PACKAGES += \
-    HoloLauncherHD \
     DashClock \
     SlimFileManager \
     SlimCenter \
-    Velvet \
     LatinIME \
     SlimIRC
 
@@ -104,10 +106,10 @@
 include vendor/slim/config/themes_common.mk
 
 # Versioning System
-# Reopen 4.2.2.build.4.3
+# Pre codefreeze 4.2.2.build.5
 PRODUCT_VERSION_MAJOR = 4.2.2
 PRODUCT_VERSION_MINOR = build
-PRODUCT_VERSION_MAINTENANCE = 4.3
+PRODUCT_VERSION_MAINTENANCE = 5.PCFR
 
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=$(BUILD_ID)
 
diff --git a/prebuilt/common/app/NovaLauncher.apk b/prebuilt/common/app/NovaLauncher.apk
new file mode 100644
index 0000000..e07ad73
--- /dev/null
+++ b/prebuilt/common/app/NovaLauncher.apk
Binary files differ
diff --git a/proprietary/Velvet/Android.mk b/proprietary/Velvet/Android.mk
deleted file mode 100644
index f59f24f..0000000
--- a/proprietary/Velvet/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE :=Velvet
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
diff --git a/proprietary/Velvet/Velvet.apk b/proprietary/Velvet/Velvet.apk
deleted file mode 100644
index 4811291..0000000
--- a/proprietary/Velvet/Velvet.apk
+++ /dev/null
Binary files differ
diff --git a/proprietary/hololauncherhd/Android.mk b/proprietary/hololauncherhd/Android.mk
deleted file mode 100644
index bd8ef30..0000000
--- a/proprietary/hololauncherhd/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE :=HoloLauncherHD
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
diff --git a/proprietary/hololauncherhd/HoloLauncherHD.apk b/proprietary/hololauncherhd/HoloLauncherHD.apk
deleted file mode 100644
index c2e7390..0000000
--- a/proprietary/hololauncherhd/HoloLauncherHD.apk
+++ /dev/null
Binary files differ
diff --git a/tools/squisher b/tools/squisher
index 42734bd..4d95a07 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -41,7 +41,7 @@
 QUIET=-q
 DELETE_BINS="applypatch applypatch_static check_prereq recovery updater"
 DELETE_MEDIA="*.qmg"
-DELETE_APKS="Launcher2.apk LiveWallpapers.apk VoiceDialer.apk SpeechRecorder.apk VisualizationWallpapers.apk VideoEditor.apk Exchange2.apk HoloSpiralWallpaper.apk MagicSmokeWallpapers.apk NoiseField.apk Galaxy4.apk Calendar.apk OpenWnn.apk PinyinIME.apk QuickSearchBox.apk Velvet.apk Provision.apk"
+DELETE_APKS="Launcher2.apk LiveWallpapers.apk VoiceDialer.apk SpeechRecorder.apk VisualizationWallpapers.apk VideoEditor.apk Exchange2.apk HoloSpiralWallpaper.apk MagicSmokeWallpapers.apk NoiseField.apk Galaxy4.apk Calendar.apk OpenWnn.apk PinyinIME.apk QuickSearchBox.apk Provision.apk"
 DELETE_GALLERY="Gallery2.apk"
 DELETE_FONTS="MTLmr3m.ttf"