diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index b3ec656..5a9f59c 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -66,7 +66,7 @@
     NexusLauncherRelease \
     NexusWallpapersStubPrebuilt2019Static \
     GalleryGoPrebuilt \
-    PixelThemes \
+    PixelThemesStub2019 \
     AboutBliss \
     BlissStatistics \
     Contacts \
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index 116da36..797512c 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -49,17 +49,6 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := EmergencyInfoGoogleNoUi
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_DEX_PREOPT := false
-LOCAL_PRODUCT_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := AboutBliss
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
@@ -83,7 +72,7 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := PixelThemes
+LOCAL_MODULE := PixelThemesStub2019
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := PRESIGNED
diff --git a/prebuilt/common/app/EmergencyInfoGoogleNoUi.apk b/prebuilt/common/app/EmergencyInfoGoogleNoUi.apk
deleted file mode 100644
index f03280b..0000000
--- a/prebuilt/common/app/EmergencyInfoGoogleNoUi.apk
+++ /dev/null
Binary files differ
diff --git a/prebuilt/common/app/PixelThemes.apk b/prebuilt/common/app/PixelThemesStub2019.apk
similarity index 100%
rename from prebuilt/common/app/PixelThemes.apk
rename to prebuilt/common/app/PixelThemesStub2019.apk
Binary files differ
diff --git a/prebuilt/common/priv-app/NexusLauncherRelease.apk b/prebuilt/common/priv-app/NexusLauncherRelease.apk
index f07af49..bde4eb2 100644
--- a/prebuilt/common/priv-app/NexusLauncherRelease.apk
+++ b/prebuilt/common/priv-app/NexusLauncherRelease.apk
Binary files differ