diff --git a/README.md b/README.md
index fd79cc4..529e6fa 100644
--- a/README.md
+++ b/README.md
@@ -1,72 +1,33 @@
-# Pixel Experience #
+# PE-Extended #
 
 ### Sync ###
 
 ```bash
 
 # Initialize local repository
-repo init -u https://github.com/pe-pie/manifest -b pie
+repo init -u https://github.com/Extended-P/manifest -b pie
 
 # Sync
-repo sync -c -jx --force-sync --no-clone-bundle --no-tags
+repo sync -c -j8 --force-sync --no-clone-bundle --no-tags
 ```
 
 ### Build ###
 
 ```bash
 
+# Setup Ccache
+ # Use Ccache for faster building
+ export USE_CCACHE=1
+ export PATH="/usr/lib/ccache/:$PATH"
+ prebuilts/misc/linux-x86/ccache/ccache -M 100G
+
 # Set up environment
-$ . build/envsetup.sh
+ . build/envsetup.sh
 
 # Choose a target
-$ lunch aosp_$device-userdebug
+ lunch aosp_$device-userdebug
 
 # Build the code
-$ mka bacon -jX
-```
-
-### Submitting Patches ###
-
-Patches are always welcome!  Please submit your patches to our Gerrit.
-
-To start contributing, just register at https://gerrit.pixelexperience.org
-
-Open up terminal to create your ssh keys required for submitting patches to gerrit and type in:
-
-```bash
-git config --global review.gerrit.pixelexperience.org.username <username you registered with>
-
-git config --global review.gerrit.pixelexperience.org.email <your email you registered with>
-
-ssh-keygen -t rsa -C "your@email.com"
-```
-
-In our gerrit click on your "Avatar" on the top right, then on "Settings".
-
-While in 'Settings' Click on "SSH Public Keys" on the left hand side and then on "Add Key".
-
-Now on your computer navigate to your home "~/.ssh" and open up "id_rsa.pub", copy/paste the context to "Gerrit SSH Public Keys".
-
-You can send patches to us by using these commands in terminal:
-
+ mka bacon -jX
 ```
-    (From root android directory)
-    . build/envsetup.sh
-    (Go to repo you are patching, make your changes and commit)
-    pixelgerrit push pie
-
-    or
-
-    git push ssh://<username>@gerrit.pixelexperience.org:29418/<project> HEAD:refs/for/<branch>
-```
-
-* `<username>` - Your Gerrit username (which can be seen/set [here](https://gerrit.pixelexperience.org/#/settings/))
-* `<project>` - The git repo you are pushing to; all options can be viewed at [this link](https://gerrit.pixelexperience.org/#/admin/projects/)
-* `<branch>` - The git branch your change is based on; for projects using this manifest, it is `pie`
-
-Make your changes and commit with a detailed message, starting with what you are working with
-Commit your patches in a single commit. Squash multiple commits using this command: `git rebase -i HEAD~<# of commits>`
-
-For more help, use this commands: `pixelgerrit help` or `pixelrebase help`
 
-[View Code Review](https://gerrit.pixelexperience.org/)
\ No newline at end of file
diff --git a/crowdin.xml b/crowdin.xml
new file mode 100644
index 0000000..9b549ab
--- /dev/null
+++ b/crowdin.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <remote name="pixel"
+          fetch="https://github.com/PixelExperience"
+          revision="pie"
+          review="gerrit.pixelexperience.org" />
+
+  <remote name="pixel-devices"
+          fetch="https://github.com/PixelExperience-Devices"
+          revision="pie" />
+
+  <remote name="github"
+          fetch="https://github.com/" />
+
+  <!-- General repos -->
+  <project path="crowdin" name="crowdin" remote="pixel" />
+
+  <!-- Framework repos -->
+  <project path="frameworks/base" name="frameworks_base" remote="pixel" />
+
+  <!-- Packages repos -->
+  <project path="packages/apps/FMRadio" name="packages_apps_FMRadio" remote="pixel" />
+  <project path="packages/apps/Settings" name="packages_apps_Settings" remote="pixel" />
+  <project path="packages/apps/Updates" name="packages_apps_Updates" remote="pixel" />
+  <project path="packages/providers/DownloadProvider" name="packages_providers_DownloadProvider" remote="pixel" />
+  <project path="packages/services/Telephony" name="packages_services_Telephony" remote="pixel" />
+  <project path="packages/resources/MotoActions" name="packages_resources_MotoActions" remote="pixel" />
+  <project path="packages/resources/OppoGestures" name="packages_resources_OppoGestures" remote="pixel" />
+
+</manifest>
diff --git a/snippets/lineage.xml b/snippets/lineage.xml
index f6e2177..c4c6887 100644
--- a/snippets/lineage.xml
+++ b/snippets/lineage.xml
@@ -32,7 +32,6 @@
   <project path="hardware/qcom/media-caf/msm8998" name="android_hardware_qcom_media" revision="lineage-16.0-caf-8998" remote="lineage" />
   <project path="hardware/qcom/wlan-caf" name="android_hardware_qcom_wlan" revision="lineage-16.0-caf" remote="lineage" />
   <project path="system/tools/dtbtool" name="android_system_tools_dtbtool" remote="lineage" />
-  <project path="vendor/codeaurora/telephony" name="android_vendor_codeaurora_telephony" remote="lineage" />
   <project path="vendor/nxp/opensource/interfaces/nfc" name="android_vendor_nxp_interfaces_opensource_nfc" remote="lineage" />
   <project path="vendor/nxp/opensource/commonsys/external/libnfc-nci" name="android_vendor_nxp_opensource_external_libnfc-nci" remote="lineage" />
   <project path="vendor/nxp/opensource/commonsys/frameworks" name="android_vendor_nxp_opensource_frameworks" remote="lineage" />
@@ -52,36 +51,25 @@
   <project path="external/libtextclassifier" name="android_external_libtextclassifier" remote="lineage" />
   <project path="external/ntfs-3g" name="android_external_ntfs-3g" remote="lineage" />
   <project path="external/selinux" name="android_external_selinux" remote="lineage" />
-  <project path="external/tinycompress" name="android_external_tinycompress" remote="lineage" />
 
   <!-- General repos -->
   <project path="art" name="android_art" remote="lineage" />
-  <project path="development" name="android_development" remote="lineage" />
 
   <!-- Hardware repos -->
   <project path="hardware/broadcom/libbt" name="android_hardware_broadcom_libbt" remote="lineage" />
+  <project path="hardware/broadcom/nfc" name="android_hardware_broadcom_nfc" remote="lineage" />
   <project path="hardware/broadcom/wlan" name="android_hardware_broadcom_wlan" remote="lineage" />
   <project path="hardware/libhardware_legacy" name="android_hardware_libhardware_legacy" remote="lineage" />
-  <project path="hardware/nxp/nfc" name="android_hardware_nxp_nfc" remote="lineage" />
-  <project path="hardware/qcom/audio/default" name="android_hardware_qcom_audio" remote="lineage" />
-  <project path="hardware/qcom/bootctrl" name="android_hardware_qcom_bootctrl" remote="lineage" />
   <project path="hardware/qcom/bt" name="android_hardware_qcom_bt" remote="lineage" />
   <project path="hardware/qcom/camera" name="android_hardware_qcom_camera" remote="lineage" />
   <project path="hardware/qcom/display" name="android_hardware_qcom_display" remote="lineage" />
-  <project path="hardware/qcom/gps" name="android_hardware_qcom_gps" remote="lineage" />
   <project path="hardware/qcom/keymaster" name="android_hardware_qcom_keymaster" remote="lineage" />
-  <project path="hardware/qcom/media" name="android_hardware_qcom_media" remote="lineage" />
   <project path="hardware/qcom/wlan" name="android_hardware_qcom_wlan" remote="lineage" />
 
-  <!-- Packages repos -->
-  <project path="packages/apps/CarrierConfig" name="android_packages_apps_CarrierConfig" remote="lineage" />
-  <project path="packages/apps/Nfc" name="android_packages_apps_Nfc" remote="lineage" />
-
   <!-- Prebuilts -->
   <project path="prebuilts/build-tools" name="android_prebuilts_build-tools" remote="lineage" clone-depth="1" />
 
   <!-- System Repos -->
-  <project path="system/security" name="android_system_security" remote="lineage" />
   <project path="system/tools/hidl" name="android_system_tools_hidl" remote="lineage" />
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/snippets/pixel.xml b/snippets/pixel.xml
index c0aafaf..22bd1b3 100644
--- a/snippets/pixel.xml
+++ b/snippets/pixel.xml
@@ -2,13 +2,25 @@
 <manifest>
 
   <remote name="pixel"
-          fetch="https://github.com/pe-pie"
+          fetch="https://github.com/PixelExperience"
           revision="pie"
           review="gerrit.pixelexperience.org" />
 
-  <remote name="pixel-devices"
-          fetch="https://github.com/PixelExperience-Devices"
+  <remote name="extended"
+          fetch="https://github.com/Extended-P" />
+
+  <remote name="havoc"
+          fetch="https://github.com/havoc-os/"
           revision="pie" />
+  
+  <remote name="omni"
+          fetch="https://github.com/omnirom/"
+          revision="android-9.0" />
+ 
+  <remote name="aoscp"
+          fetch="https://github.com/CypherOS/"
+          review="https://gerrit.cypheros.co/"
+          revision="refs/heads/poundcake-release" />
 
   <remote name="pixel-gitlab"
           fetch="https://gitlab.com/PixelExperience"
@@ -17,23 +29,37 @@
   <!-- CodeAurora additions -->
   <project path="device/qcom/sepolicy" name="device_qcom_sepolicy" remote="pixel" />
   <project path="device/qcom/sepolicy-legacy" name="device_qcom_sepolicy-legacy" remote="pixel" />
+  <project path="hardware/qcom/audio/default" name="hardware_qcom_audio" remote="pixel" />
+  <project path="hardware/qcom/audio-caf/apq8084" name="hardware_qcom_audio" revision="pie-caf-8084" remote="pixel" />
+  <project path="hardware/qcom/audio-caf/sdm845" name="hardware_qcom_audio" revision="pie-caf-845" remote="pixel" />
   <project path="hardware/qcom/bt-caf" name="hardware_qcom_bt" revision="pie-caf" remote="pixel" />
+  <project path="hardware/qcom/display-caf/apq8084" name="hardware_qcom_display" revision="pie-caf-8084" remote="pixel" />
   <project path="hardware/qcom/display-caf/msm8996" name="hardware_qcom_display" revision="pie-caf-8996" remote="pixel" />
   <project path="hardware/qcom/display-caf/msm8998" name="hardware_qcom_display" revision="pie-caf-8998" remote="pixel" />
+  <project path="hardware/qcom/display-caf/sdm845" name="hardware_qcom_display" revision="pie-caf-845" remote="pixel" />
+  <project path="hardware/qcom/media-caf/apq8084" name="hardware_qcom_media" revision="pie-caf-8084" remote="pixel" />
+  <project path="hardware/qcom/media-caf/sdm845" name="hardware_qcom_media" revision="pie-caf-845" remote="pixel" />
   <project path="hardware/qcom/fm" name="hardware_qcom_fm" remote="pixel" />
+  <project path="hardware/qcom/media" name="hardware_qcom_media" remote="pixel" />
   <project path="hardware/qcom/power" name="hardware_qcom_power" remote="pixel" />
   <project path="hardware/ril-caf" name="hardware_ril" revision="pie-caf" remote="pixel" />
   <project path="system/qcom" name="system_qcom" remote="pixel" />
+  <project path="vendor/codeaurora/telephony" name="vendor_codeaurora_telephony" remote="pixel" />
+  <project path="vendor/qcom/opensource/cryptfs_hw" name="vendor_qcom_opensource_cryptfs_hw" remote="pixel" />
 
   <!-- External repos -->
   <project path="external/perfetto" name="external_perfetto" remote="pixel" />
+  <project path="external/tinycompress" name="external_tinycompress" remote="pixel" />
 
   <!-- Framework repos -->
   <project path="frameworks/av" name="frameworks_av" remote="pixel" />
-  <project path="frameworks/base" name="frameworks_base" remote="pixel" />
+  <project path="frameworks/base" name="frameworks_base" revision="SmartNav" remote="extended" />
   <project path="frameworks/native" name="frameworks_native" remote="pixel" />
+  <project path="frameworks/opt/net/ims" name="frameworks_opt_net_ims" remote="pixel" />
+  <project path="frameworks/opt/net/voip" name="frameworks_opt_net_voip" remote="pixel" />
   <project path="frameworks/opt/net/wifi" name="frameworks_opt_net_wifi" remote="pixel" />
   <project path="frameworks/opt/telephony" name="frameworks_opt_telephony" remote="pixel" />
+  <project path="frameworks/support" name="frameworks_support" revision="pie" remote="extended" />
 
   <!-- General repos -->
   <project path="bionic" name="bionic" remote="pixel" />
@@ -53,39 +79,64 @@
   <project path="build/kati" name="build_kati" remote="pixel" />
   <project path="bootable/recovery" name="bootable_recovery" remote="pixel" />
   <project path="device/custom/sepolicy" name="device_custom_sepolicy" remote="pixel" />
-  <project path="vendor/aosp" name="vendor_aosp" remote="pixel" />
+  <project path="vendor/aosp" name="vendor_aosp" revision="pie" remote="extended" />
+  <project path="development" name="development" remote="pixel" />
   <project path="vendor/gapps" name="vendor_gapps" remote="pixel-gitlab" clone-depth="1" />
-  <project path="vendor/pixelstyle" name="vendor_pixelstyle" remote="pixel" />
+  <project path="vendor/pixelstyle" name="vendor_pixelstyle" revision="pie" remote="extended" />
 
   <!-- Hardware repos -->
   <project path="hardware/custom/interfaces" name="hardware_custom_interfaces" remote="pixel" />
+  <project path="hardware/custom/keydisabler" name="hardware_custom_keydisabler" remote="pixel" />
+  <project path="hardware/custom/telephony" name="hardware_custom_telephony" remote="pixel" />
   <project path="hardware/interfaces" name="hardware_interfaces" remote="pixel" />
   <project path="hardware/libhardware" name="hardware_libhardware" remote="pixel" />
+  <project path="hardware/qcom/bootctrl" name="hardware_qcom_bootctrl" remote="pixel" />
+  <project path="hardware/qcom/gps" name="hardware_qcom_gps" remote="pixel" />
   <project path="hardware/ril" name="hardware_ril" remote="pixel" />
+  <project path="hardware/nxp/nfc" name="hardware_nxp_nfc" remote="pixel" />
 
   <!-- Packages repos -->
   <project path="packages/apps/Bluetooth" name="packages_apps_Bluetooth" remote="pixel" />
   <project path="packages/apps/Camera2" name="packages_apps_Camera2" remote="pixel" />
+  <project path="packages/apps/Extras" name="packages_apps_Extras" revision="rearrange" remote="extended" />
   <project path="packages/apps/DocumentsUI" name="packages_apps_DocumentsUI" remote="pixel" />
   <project path="packages/apps/FMRadio" name="packages_apps_FMRadio" remote="pixel" />
-  <project path="packages/apps/Settings" name="packages_apps_Settings" remote="pixel" />
+  <project path="packages/apps/Settings" name="packages_apps_Settings" revision="pie" remote="extended" />
+  <project path="packages/apps/CarrierConfig" name="packages_apps_CarrierConfig" remote="pixel" />
+  <project path="packages/apps/CellBroadcastReceiver" name="packages_apps_CellBroadcastReceiver" remote="pixel" />
+  <project path="packages/apps/KeyChain" name="packages_apps_KeyChain" remote="pixel" />
+  <project path="packages/apps/ManagedProvisioning" name="packages_apps_ManagedProvisioning" remote="pixel" />
+  <project path="packages/apps/Nfc" name="packages_apps_Nfc" remote="pixel" />
+  <project path="packages/apps/PhoneCommon" name="packages_apps_PhoneCommon" remote="pixel" />
   <project path="packages/apps/SettingsIntelligence" name="packages_apps_SettingsIntelligence" remote="pixel" />
-  <project path="packages/apps/Updates" name="packages_apps_Updates" remote="pixel" />
+  <project path="packages/apps/Stk" name="packages_apps_Stk" remote="pixel" />
+  <project path="packages/apps/Traceur" name="packages_apps_Traceur" remote="pixel" />
+  <project path="packages/apps/TvSettings" name="packages_apps_TvSettings" remote="pixel" />
   <project path="packages/apps/WallpapersBReel2017" name="packages_apps_WallpapersBReel2017" remote="pixel-gitlab" clone-depth="1" />
   <project path="packages/apps/WallpapersBReel2018" name="packages_apps_WallpapersBReel2018" remote="pixel-gitlab" clone-depth="1" />
   <project path="packages/providers/DownloadProvider" name="packages_providers_DownloadProvider" remote="pixel" />
   <project path="packages/providers/MediaProvider" name="packages_providers_MediaProvider" remote="pixel" />
+  <project path="packages/providers/TelephonyProvider" name="packages_providers_TelephonyProvider" remote="pixel" />
+  <project path="packages/services/BuiltInPrintService" name="packages_services_BuiltInPrintService" remote="pixel" />
   <project path="packages/services/Telecomm" name="packages_services_Telecomm" remote="pixel" />
-  <project path="packages/services/Telephony" name="packages_services_Telephony" remote="pixel" />
+  <project path="packages/services/Telephony" name="packages_services_Telephony" revision="pie" remote="extended" />
 
   <!-- Prebuilts -->
   <project path="prebuilts/clang/host/linux-x86" name="prebuilts_clang_host_linux-x86" remote="pixel" clone-depth="1" />
 
   <!-- System Repos -->
   <project path="system/bt" name="system_bt" remote="pixel" />
-  <project path="system/core" name="system_core" remote="pixel" />
+  <project path="system/core" name="system_core" revision="pie" remote="extended" />
+  <project path="system/connectivity/wificond" name="system_connectivity_wificond" remote="pixel" />
   <project path="system/extras" name="system_extras" remote="pixel" />
+  <project path="system/netd" name="system_netd" remote="pixel" />
+  <project path="system/security" name="system_security" remote="pixel" />
   <project path="system/sepolicy" name="system_sepolicy" remote="pixel" />
   <project path="system/vold" name="system_vold" remote="pixel" />
 
+  <!-- Stuff -->
+  <project path="packages/services/OmniJaws" name="android_packages_services_OmniJaws" remote="havoc" />
+  <project path="packages/overlays/Extras" name="packages_overlays_Extras" revision="pasta" remote="extended" />
+  <project path="packages/apps/OmniStyle" name="android_packages_apps_OmniStyle" remote="omni" />
+  <project path="frameworks/aoscp" name="frameworks_aoscp" groups="pdk-cw-fs,pdk-fs" remote="aoscp" />
 </manifest>
diff --git a/snippets/remove.xml b/snippets/remove.xml
index d19f12a..96cfe70 100644
--- a/snippets/remove.xml
+++ b/snippets/remove.xml
@@ -55,8 +55,11 @@
   <remove-project name="platform/frameworks/av" />
   <remove-project name="platform/frameworks/base" />
   <remove-project name="platform/frameworks/native" />
+  <remove-project name="platform/frameworks/opt/net/ims" />
+  <remove-project name="platform/frameworks/opt/net/voip" />
   <remove-project name="platform/frameworks/opt/net/wifi" />
   <remove-project name="platform/frameworks/opt/telephony" />
+  <remove-project name="platform/frameworks/support" />
 
   <!-- General repos -->
   <remove-project name="kernel/tests" />
@@ -115,6 +118,7 @@
   <remove-project name="platform/packages/apps/Browser2" />
   <remove-project name="platform/packages/apps/Calendar" />
   <remove-project name="platform/packages/apps/Camera2" />
+  <remove-project name="platform/packages/apps/CellBroadcastReceiver" />
   <remove-project name="platform/packages/apps/CarrierConfig" />
   <remove-project name="platform/packages/apps/Contacts" />
   <remove-project name="platform/packages/apps/DevCamera" />
@@ -125,30 +129,37 @@
   <remove-project name="platform/packages/apps/ExactCalculator" />
   <remove-project name="platform/packages/apps/Gallery" />
   <remove-project name="platform/packages/apps/Gallery2" />
+  <remove-project name="platform/packages/apps/KeyChain" />
   <remove-project name="platform/packages/apps/Launcher2" />
   <remove-project name="platform/packages/apps/Launcher3" />
   <remove-project name="platform/packages/apps/LegacyCamera" />
   <remove-project name="platform/packages/apps/Messaging" />
   <remove-project name="platform/packages/apps/Music" />
+  <remove-project name="platform/packages/apps/ManagedProvisioning" />
   <remove-project name="platform/packages/apps/Nfc" />
   <remove-project name="platform/packages/apps/PackageInstaller" />
   <remove-project name="platform/packages/apps/Protips" />
   <remove-project name="platform/packages/apps/QuickSearchBox" />
+  <remove-project name="platform/packages/apps/PhoneCommon" />
   <remove-project name="platform/packages/apps/Settings" />
   <remove-project name="platform/packages/apps/SettingsIntelligence" />
   <remove-project name="platform/packages/apps/SoundRecorder" />
   <remove-project name="platform/packages/apps/SpareParts" />
-  <remove-project name="platform/packages/apps/Tag" />
+  <remove-project name="platform/packages/apps/Stk" />
+  <remove-project name="platform/packages/apps/Traceur" />
   <remove-project name="platform/packages/apps/Test/connectivity" />
+  <remove-project name="platform/packages/apps/TvSettings" />
   <remove-project name="platform/packages/apps/UnifiedEmail" />
   <remove-project name="platform/packages/apps/WallpaperPicker" />
   <remove-project name="platform/packages/inputmethods/LatinIME" />
   <remove-project name="platform/packages/inputmethods/OpenWnn" />
   <remove-project name="platform/packages/providers/DownloadProvider" />
   <remove-project name="platform/packages/providers/MediaProvider" />
+  <remove-project name="platform/packages/providers/TelephonyProvider" />
   <remove-project name="platform/packages/screensavers/Basic" />
   <remove-project name="platform/packages/screensavers/PhotoTable" />
   <remove-project name="platform/packages/screensavers/WebView" />
+  <remove-project name="platform/packages/services/BuiltInPrintService" />
   <remove-project name="platform/packages/services/Telecomm" />
   <remove-project name="platform/packages/services/Telephony" />
 
@@ -158,8 +169,10 @@
 
   <!-- System repos -->
   <remove-project name="platform/system/bt" />
+  <remove-project name="platform/system/connectivity/wificond" />
   <remove-project name="platform/system/core" />
   <remove-project name="platform/system/extras" />
+  <remove-project name="platform/system/netd" />
   <remove-project name="platform/system/security" />
   <remove-project name="platform/system/sepolicy" />
   <remove-project name="platform/system/tools/hidl" />