diff --git a/pawlet_rpi4.mk b/pawlet_rpi4.mk
index 1c565c3..7a7ec86 100644
--- a/pawlet_rpi4.mk
+++ b/pawlet_rpi4.mk
@@ -12,11 +12,11 @@ PRODUCT_AAPT_CONFIG := normal mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
 PRODUCT_CHARACTERISTICS := tablet,nosdcard
 
-# RPI specifics
+# RPI specifics (base config)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call enforce-product-packages-exist,com.android.ranging)
 
-# Overlays
+# Overlays (Mostly RaspberryVanilla)
 PRODUCT_PACKAGES += \
     AndroidRpiOverlay \
     BluetoothRpiOverlay \
@@ -29,10 +29,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml
 
-# Lawnchair integration
-$(call inherit-product-if-exists, vendor/lawnchair/lawnchair.mk)
-PRODUCT_PACKAGES += Lawnchair
-
 # PawletOS Framework Components
 PRODUCT_PACKAGES += \
     pawlet-framework-res-overlay \
@@ -43,6 +39,12 @@ PRODUCT_SYSTEM_PROPERTIES += \
     ro.pawlet.version=1.0 \
     ro.oxmc.os_name=PawletOS
 
+# Include fonts
+$(call inherit-product, vendor/pawlet/fonts/fonts.mk)
+
+# Include media
+#$(call inherit-product, vendor/pawlet/media/media.mk)
+
 # Config Provisioner App and config
 #PRODUCT_PACKAGES += \
 #    ConfigProvisioner