diff --git a/config/common.mk b/config/common.mk
index ac87ee6..5b0577b 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -21,6 +21,7 @@ PRODUCT_PACKAGES += \
     LiveWallpapersPicker \
     NoiseField \
     PhaseBeam \
+    BlueBalls \
     Torch
 
 # prebuilts
@@ -29,7 +30,7 @@ PRODUCT_PACKAGES += \
     LatinIME \
     LockClock \
     NovaLauncher \
-    Performance \
+    PerformanceControl \
     Superuser
 
 # tools
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_angel.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_angel.png
deleted file mode 100644
index 188b5a9..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_angel.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_cool.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_cool.png
deleted file mode 100644
index 6b37431..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_cool.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_crying.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_crying.png
deleted file mode 100644
index d819353..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_crying.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_embarrassed.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_embarrassed.png
deleted file mode 100644
index 68564b3..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_embarrassed.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_foot_in_mouth.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_foot_in_mouth.png
deleted file mode 100644
index 6695bda..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_foot_in_mouth.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_happy.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_happy.png
deleted file mode 100644
index f59e4c1..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_happy.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_heart.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_heart.png
deleted file mode 100644
index cb22312..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_heart.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_kissing.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_kissing.png
deleted file mode 100644
index 54d9116..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_kissing.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_laughing.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_laughing.png
deleted file mode 100644
index 71f10b6..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_laughing.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_lips_are_sealed.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_lips_are_sealed.png
deleted file mode 100644
index 902c6f4..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_lips_are_sealed.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_mad.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_mad.png
deleted file mode 100644
index f45d46f..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_mad.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_money_mouth.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_money_mouth.png
deleted file mode 100644
index a9e5c5e..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_money_mouth.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_pokerface.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_pokerface.png
deleted file mode 100644
index 82f3225..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_pokerface.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_sad.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_sad.png
deleted file mode 100644
index d9f1afa..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_sad.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_smirk.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_smirk.png
deleted file mode 100644
index 70526b0..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_smirk.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_surprised.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_surprised.png
deleted file mode 100644
index ab437e3..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_surprised.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_tongue_sticking_out.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_tongue_sticking_out.png
deleted file mode 100644
index 87abc91..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_tongue_sticking_out.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_undecided.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_undecided.png
deleted file mode 100644
index a257927..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_undecided.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_winking.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_winking.png
deleted file mode 100644
index 55d5276..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_winking.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_wtf.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_wtf.png
deleted file mode 100644
index c21ecb1..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_wtf.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_yelling.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_yelling.png
deleted file mode 100644
index 69befd8..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_yelling.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/ic_launcher_smsmms.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/ic_launcher_smsmms.png
deleted file mode 100644
index d7cd1b0..0000000
Binary files a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/ic_launcher_smsmms.png and /dev/null differ
diff --git a/overlay/common/packages/apps/Mms/res/mipmap-xhdpi/ic_launcher_smsmms.png b/overlay/common/packages/apps/Mms/res/mipmap-xhdpi/ic_launcher_smsmms.png
deleted file mode 100644
index bc301c9..0000000
Binary files a/overlay/common/packages/apps/Mms/res/mipmap-xhdpi/ic_launcher_smsmms.png and /dev/null differ
diff --git a/proprietary/NovaLauncher/NovaLauncher.apk b/proprietary/NovaLauncher/NovaLauncher.apk
index a758bc2..5faff28 100644
Binary files a/proprietary/NovaLauncher/NovaLauncher.apk and b/proprietary/NovaLauncher/NovaLauncher.apk differ
diff --git a/proprietary/Performance/Android.mk b/proprietary/Performance/Android.mk
deleted file mode 100644
index 655ff21..0000000
--- a/proprietary/Performance/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 := Performance
-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/Performance/Performance.apk b/proprietary/Performance/Performance.apk
deleted file mode 100644
index 607823f..0000000
Binary files a/proprietary/Performance/Performance.apk and /dev/null differ