diff --git a/pawlet_rpi4.mk b/pawlet_rpi4.mk
index 826ab16..8195cf5 100644
--- a/pawlet_rpi4.mk
+++ b/pawlet_rpi4.mk
@@ -12,10 +12,15 @@ PRODUCT_AAPT_CONFIG := normal mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
 PRODUCT_CHARACTERISTICS := tablet,nosdcard
 
-# RPI specifics (base config)
+# Base config
 $(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 \
@@ -29,6 +34,22 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml
 
+# LineageOS packages/services
+#PRODUCT_PACKAGES += \
+#    Updater \
+#    LineageSetupWizard \
+#    privapp_whitelist_org.lineageos.setupwizard
+
+#
+# PawletOS Specifics
+#
+
+# Include fonts
+$(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 \
@@ -39,12 +60,6 @@ PRODUCT_SYSTEM_PROPERTIES += \
     ro.pawlet.version=1.0 \
     ro.oxmc.os_name=PawletOS
 
-# Include fonts
-$(call inherit-product, vendor/pawlet/overlays/FontsOverlay/fonts.mk)
-
-# Include media
-#$(call inherit-product, vendor/pawlet/overlays/MediaOverlay/media.mk)
-
 # Config Provisioner App and config
 PRODUCT_PACKAGES += \
     ConfigProvisioner
@@ -56,12 +71,6 @@ PRODUCT_COPY_FILES += \
 BOARD_SEPOLICY_DIRS += \
     frameworks/base/pawlet/sepolicy
 
-# LineageOS packages/services
-#PRODUCT_PACKAGES += \
-#    Updater \
-#    LineageSetupWizard \
-#    privapp_whitelist_org.lineageos.setupwizard
-
 # Lawnchair integration
 $(call inherit-product, vendor/lawnchair/Lawnchair/lawnchair.mk)
 PRODUCT_PACKAGES += Lawnchair
@@ -73,9 +82,6 @@ PRODUCT_PACKAGES += Lawnchair
 # VivladiBrowser
 PRODUCT_PACKAGES += VivladiBrowser
 
-# Other apps
-PRODUCT_PACKAGES += ThemePicker
-
 # Remove unwanted packages
 $(call inherit-product, device/pawlet/rpi/remove_packages.mk)