diff --git a/pawlet_rpi4.mk b/pawlet_rpi4.mk
index 1205ee4..b172d05 100644
--- a/pawlet_rpi4.mk
+++ b/pawlet_rpi4.mk
@@ -16,11 +16,6 @@ PRODUCT_CHARACTERISTICS := tablet,nosdcard
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call enforce-product-packages-exist,com.android.ranging)
 
-# System apps
-#PRODUCT_PACKAGES += \
-#    ThemePicker \
-#    SettingsIntelligence
-
 # Overlays (Mostly RaspberryVanilla)
 PRODUCT_PACKAGES += \
     AndroidRpiOverlay \
@@ -34,19 +29,18 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml
 
-#
-# PawletOS Specifics
-#
+# System apps
+PRODUCT_PACKAGES += \
+    ThemePicker \
+    SettingsIntelligence
 
-# Include fonts
+# Include fonts and media
 $(call inherit-product, vendor/pawlet/overlays/FontsOverlay/fonts.mk)
-
-# Include media
 #$(call inherit-product, vendor/pawlet/overlays/MediaOverlay/media.mk)
 
 # PawletOS Framework Components
-PRODUCT_PACKAGES += \
-    pawlet-framework-res-overlay
+#PRODUCT_PACKAGES += \
+#    pawlet-framework-res-overlay
 
 # FrameworkAPI properties
 #PRODUCT_SYSTEM_PROPERTIES += \
@@ -64,13 +58,10 @@ PRODUCT_PACKAGES += \
 BOARD_SEPOLICY_DIRS += \
     frameworks/base/pawlet/sepolicy
 
-# Lawnchair integration
-$(call inherit-product, vendor/lawnchair/Lawnchair/lawnchair.mk)
-PRODUCT_PACKAGES += Lawnchair
-
-# FlorisBoard integration
-#$(call inherit-product, vendor/floris/FlorisBoard/florisboard.mk)
-#PRODUCT_PACKAGES += Florisboard
+# UI Stuff
+PRODUCT_PACKAGES += \
+    Lawnchair
+#    Florisboard
 
 # VivladiBrowser
 PRODUCT_PACKAGES += VivladiBrowser