diff --git a/pawlet_rpi4.mk b/pawlet_rpi4.mk
index 2589adb..826ab16 100644
--- a/pawlet_rpi4.mk
+++ b/pawlet_rpi4.mk
@@ -46,11 +46,11 @@ $(call inherit-product, vendor/pawlet/overlays/FontsOverlay/fonts.mk)
 #$(call inherit-product, vendor/pawlet/overlays/MediaOverlay/media.mk)
 
 # Config Provisioner App and config
-#PRODUCT_PACKAGES += \
-#    ConfigProvisioner
+PRODUCT_PACKAGES += \
+    ConfigProvisioner
 
-#PRODUCT_COPY_FILES += \
-#    device/pawlet/rpi/configs/provisioner/vendor.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/config_provisioner/vendor.cfg
+PRODUCT_COPY_FILES += \
+    device/pawlet/rpi/configs/provisioner/vendor.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/config_provisioner/vendor.cfg
 
 # SELinux Policy Configuration
 BOARD_SEPOLICY_DIRS += \
@@ -62,16 +62,19 @@ BOARD_SEPOLICY_DIRS += \
 #    LineageSetupWizard \
 #    privapp_whitelist_org.lineageos.setupwizard
 
-# Lawnchair integration		
-$(call inherit-product-if-exists, vendor/lawnchair/Lawnchair/lawnchair.mk)
+# Lawnchair integration
+$(call inherit-product, vendor/lawnchair/Lawnchair/lawnchair.mk)
 PRODUCT_PACKAGES += Lawnchair
 
-# FlorisBoard integration		
-#$(call inherit-product-if-exists, vendor/floris/FlorisBoard/florisboard.mk)
+# FlorisBoard integration
+#$(call inherit-product, vendor/floris/FlorisBoard/florisboard.mk)
 #PRODUCT_PACKAGES += Florisboard
 
-# VivladiBrowser integration		
-$(call inherit-product-if-exists, vendor/vivladi/VivladiBrowser/Browser.mk)
+# VivladiBrowser
+PRODUCT_PACKAGES += VivladiBrowser
+
+# Other apps
+PRODUCT_PACKAGES += ThemePicker
 
 # Remove unwanted packages
 $(call inherit-product, device/pawlet/rpi/remove_packages.mk)