diff --git a/manifest_brcm_rpi.xml b/manifest_brcm_rpi.xml
index 1bbef7f..f91cb5e 100644
--- a/manifest_brcm_rpi.xml
+++ b/manifest_brcm_rpi.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
+  <!-- Remotes -->
   <remote name="github" fetch="https://github.com/" />
   <remote name="oxmcgit" fetch="https://git.oxmc.me/" />
 
-  <!-- PawletOS -->
-  <project path="vendor/dev.oxmc" name="PawletOS/oxmc_overlay" remote="oxmcgit" revision="main" />
-  <project path="frameworks/base/oxmc" name="PawletOS/FrameworkAPI" remote="oxmcgit" revision="main" />
+  <!-- PawletOS Overlays -->
+  <project path="vendor/pawlet/overlays/FrameworkResOverlay" name="PawletOS/FrameworkResOverlay" remote="oxmcgit" revision="main" />
+
+  <!-- Fonts & Media -->
+  <project path="vendor/pawlet/fonts" name="PawletOS/FontsOverlay" remote="oxmcgit" revision="main" />
+  <project path="vendor/pawlet/media" name="PawletOS/MediaOverlay" remote="oxmcgit" revision="main" />
+
+  <!-- Framework API Extensions -->
+  <project path="frameworks/base/pawlet" name="PawletOS/FrameworkAPI" remote="oxmcgit" revision="main" />
 
   <!-- Other packages/apps -->
   <project path="packages/apps/Lawnchair" name="LawnchairLauncher/lawnchair" remote="github" revision="15-dev" />