diff --git a/default.xml b/default.xml
index ad05f5d5f1f..3eb8ceb1677 100644
--- a/default.xml
+++ b/default.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="korg"
-           fetch="git://android.git.kernel.org/"
+  <remote  name="aosp"
+           fetch="https://android.googlesource.com/"
            review="review.source.android.com" />
 
   <remote  name="github"
            fetch="git://github.com/"
            review="review.cyanogenmod.com" />
+           
+  <remote  name="github-https"
+           fetch="https://github.com/"
+           review="review.cyanogenmod.com" />
 
   <default revision="gingerbread"
            remote="github" />
@@ -20,109 +24,8 @@
   <project path="bootable/recovery" name="CyanogenMod/android_bootable_recovery" />
   <project path="dalvik" name="CyanogenMod/android_dalvik" />
   <project path="development" name="CyanogenMod/android_development" />
-  <project path="device/advent/vega" name="CyanogenMod/android_device_advent_vega" />
   <project path="device/common" name="CyanogenMod/android_device_common" />
-  <project path="device/bn/encore" name="CyanogenMod/android_device_bn_encore" />
-  <project path="device/commtiva/z71" name="CyanogenMod/android_device_commtiva_z71" />
-  <project path="device/dell/streak7" name="CyanogenMod/android_device_dell_streak7" />
-  <project path="device/elocity/a7" name="CyanogenMod/android_device_elocity_a7" />
-  <project path="device/geeksphone/one" name="CyanogenMod/android_device_geeksphone_one" />
-  <project path="device/geeksphone/zero" name="CyanogenMod/android_device_geeksphone_zero" />
-  <project path="device/huawei/ascend" name="CyanogenMod/android_device_huawei_ascend" />
-  <project path="device/huawei/u8150" name="CyanogenMod/android_device_huawei_u8150" />
-  <project path="device/huawei/u8220" name="CyanogenMod/android_device_huawei_u8220" />
-  <project path="device/htc/common" name="CyanogenMod/android_device_htc_common" />
-  <project path="device/htc/7x30-recovery" name="CyanogenMod/android_device_htc_7x30-recovery" />
-  <project path="device/htc/ace" name="CyanogenMod/android_device_htc_ace" />
-  <project path="device/htc/bravo" name="CyanogenMod/android_device_htc_bravo" />
-  <project path="device/htc/bravoc" name="CyanogenMod/android_device_htc_bravoc" />
-  <project path="device/htc/buzz" name="CyanogenMod/android_device_htc_buzz" />
-  <project path="device/htc/click" name="CyanogenMod/android_device_htc_click" />
-  <project path="device/htc/desirec" name="CyanogenMod/android_device_htc_desirec" />
-  <project path="device/htc/dream_sapphire" name="CyanogenMod/android_device_htc_dream_sapphire" />
-  <project path="device/htc/espresso" name="CyanogenMod/android_device_htc_espresso" />
-  <project path="device/htc/inc" name="CyanogenMod/android_device_htc_inc" />
-  <project path="device/htc/glacier" name="CyanogenMod/android_device_htc_glacier" />
-  <project path="device/htc/hero" name="CyanogenMod/android_device_htc_hero" />
-  <project path="device/htc/heroc" name="CyanogenMod/android_device_htc_heroc" />
-  <project path="device/htc/legend" name="CyanogenMod/android_device_htc_legend" />
-  <project path="device/htc/leo" name="CyanogenMod/android_device_htc_leo" />
-  <project path="device/htc/liberty" name="CyanogenMod/android_device_htc_liberty" />
-  <project path="device/htc/mecha" name="CyanogenMod/android_device_htc_mecha" />
-  <project path="device/htc/msm7x30-common" name="CyanogenMod/android_device_htc_msm7x30-common" />
-  <project path="device/htc/passion" name="CyanogenMod/android_device_htc_passion" />
-  <project path="device/htc/passion-common" name="CyanogenMod/android_device_htc_passion-common" />
-  <project path="device/htc/saga" name="CyanogenMod/android_device_htc_saga" />
-  <project path="device/htc/speedy" name="CyanogenMod/android_device_htc_speedy" />
-  <project path="device/htc/supersonic" name="CyanogenMod/android_device_htc_supersonic" />
-  <project path="device/htc/vision" name="CyanogenMod/android_device_htc_vision" />
-  <project path="device/htc/vivo" name="CyanogenMod/android_device_htc_vivo" />
-  <project path="device/htc/vivow" name="CyanogenMod/android_device_htc_vivow" />
-  <project path="device/lge/p970" name="CyanogenMod/android_device_lge_p970" />
-  <project path="device/lge/p990" name="CyanogenMod/android_device_lge_p990" />
-  <project path="device/lge/p999" name="CyanogenMod/android_device_lge_p999" />
-  <project path="device/lge/star-common" name="CyanogenMod/android_device_lge_star-common" />
-  <project path="device/malata/smb-common" name="CyanogenMod/android_device_malata_smb-common" />
-  <project path="device/malata/smb_a1002" name="CyanogenMod/android_device_malata_smb_a1002" />
-  <project path="device/malata/smb_a1004" name="CyanogenMod/android_device_malata_smb_a1004" />
-  <project path="device/malata/smb_a1011" name="CyanogenMod/android_device_malata_smb_a1011" />
-  <project path="device/malata/smb_b9701" name="CyanogenMod/android_device_malata_smb_b9701" />
-  <project path="device/motorola/common" name="CyanogenMod/android_device_motorola_common" />
-  <project path="device/motorola/droid2" name="CyanogenMod/android_device_motorola_droid2" />
-  <project path="device/motorola/droid2we" name="CyanogenMod/android_device_motorola_droid2we" />
-  <project path="device/motorola/jordan" name="CyanogenMod/android_device_motorola_jordan" />
-  <project path="device/motorola/morrison" name="CyanogenMod/android_device_motorola_morrison" />
-  <project path="device/motorola/motus" name="CyanogenMod/android_device_motorola_motus" />
-  <project path="device/motorola/olympus" name="CyanogenMod/android_device_motorola_olympus" />
-  <project path="device/motorola/shadow" name="CyanogenMod/android_device_motorola_shadow" />
-  <project path="device/motorola/sholes" name="CyanogenMod/android_device_motorola_sholes" />
-  <project path="device/motorola/stingray" name="CyanogenMod/android_device_motorola_stingray" />
-  <project path="device/motorola/zeppelin" name="CyanogenMod/android_device_motorola_zeppelin" />
-  <project path="device/sample" name="CyanogenMod/android_device_sample" />
-  <project path="device/samsung/aries-common" name="CyanogenMod/android_device_samsung_aries-common" />
-  <project path="device/samsung/c1-common" name="CyanogenMod/android_device_samsung_c1-common" />
-  <project path="device/samsung/captivatemtd" name="CyanogenMod/android_device_samsung_captivatemtd" />
-  <project path="device/samsung/charge" name="CyanogenMod/android_device_samsung_charge" />
-  <project path="device/samsung/cooper" name="CyanogenMod/android_device_samsung_cooper" />
-  <project path="device/samsung/crespo" name="CyanogenMod/android_device_samsung_crespo" />
-  <project path="device/samsung/crespo4g" name="CyanogenMod/android_device_samsung_crespo4g" />
-  <project path="device/samsung/epic4g" name="CyanogenMod/android_device_samsung_epic4g" />
-  <project path="device/samsung/epicmtd" name="CyanogenMod/android_device_samsung_epicmtd" />
-  <project path="device/samsung/fascinate" name="CyanogenMod/android_device_samsung_fascinate" />
-  <project path="device/samsung/fascinatemtd" name="CyanogenMod/android_device_samsung_fascinatemtd" />
-  <project path="device/samsung/galaxyace" name="CyanogenMod/android_device_samsung_galaxyace" />
-  <project path="device/samsung/galaxys2" name="CyanogenMod/android_device_samsung_galaxys2" />
-  <project path="device/samsung/galaxys2att" name="CyanogenMod/android_device_samsung_galaxys2att"/>
-  <project path="device/samsung/galaxysbmtd" name="CyanogenMod/android_device_samsung_galaxysbmtd" />
-  <project path="device/samsung/galaxysmtd" name="CyanogenMod/android_device_samsung_galaxysmtd" />
-  <project path="device/samsung/galaxys4g" name="CyanogenMod/android_device_samsung_galaxys4g" />
-  <project path="device/samsung/mesmerizemtd" name="CyanogenMod/android_device_samsung_mesmerizemtd" />
-  <project path="device/samsung/p7100" name="CyanogenMod/android_device_samsung_p7100" />
-  <project path="device/samsung/showcasemtd" name="CyanogenMod/android_device_samsung_showcasemtd" />
-  <project path="device/samsung/sidekick4g" name="CyanogenMod/android_device_samsung_sidekick4g" />
-  <project path="device/samsung/tass" name="CyanogenMod/android_device_samsung_tass" />
-  <project path="device/samsung/vibrantmtd" name="CyanogenMod/android_device_samsung_vibrantmtd" />
-  <project path="device/samsung/vzwtab" name="CyanogenMod/android_device_samsung_vzwtab" />
-  <project path="device/semc/anzu" name="CyanogenMod/android_device_semc_anzu" />
-  <project path="device/semc/coconut" name="CyanogenMod/android_device_semc_coconut" />
-  <project path="device/semc/es209ra" name="CyanogenMod/android_device_semc_es209ra" />
-  <project path="device/semc/hallon" name="CyanogenMod/android_device_semc_hallon" />
-  <project path="device/semc/iyokan" name="CyanogenMod/android_device_semc_iyokan" />
-  <project path="device/semc/mango" name="CyanogenMod/android_device_semc_mango" />
-  <project path="device/semc/mimmi" name="CyanogenMod/android_device_semc_mimmi" />
-  <project path="device/semc/mogami-common" name="CyanogenMod/android_device_semc_mogami-common" />
-  <project path="device/semc/msm7x27-common" name="CyanogenMod/android_device_semc_msm7x27-common" />
-  <project path="device/semc/msm7x30-common" name="CyanogenMod/android_device_semc_msm7x30-common" />
-  <project path="device/semc/robyn" name="CyanogenMod/android_device_semc_robyn" />
-  <project path="device/semc/satsuma" name="CyanogenMod/android_device_semc_satsuma" />
-  <project path="device/semc/shakira" name="CyanogenMod/android_device_semc_shakira" />
-  <project path="device/semc/smultron" name="CyanogenMod/android_device_semc_smultron" />
-  <project path="device/semc/urushi" name="CyanogenMod/android_device_semc_urushi" />
-  <project path="device/semc/zeus" name="CyanogenMod/android_device_semc_zeus" />
-  <project path="device/semc/zeusc" name="CyanogenMod/android_device_semc_zeusc" />
-  <project path="device/semc/zeus-common" name="CyanogenMod/android_device_semc_zeus-common" />
-  <project path="device/zte/blade" name="CyanogenMod/android_device_zte_blade" />
-  <project path="device/zte/v9" name="CyanogenMod/android_device_zte_v9" />
+  <!-- Device directories go here -->
   <project path="external/alsa-lib" name="CyanogenMod/android_external_alsa-lib" />
   <project path="external/alsa-utils" name="CyanogenMod/android_external_alsa-utils" />
   <project path="external/apache-http" name="CyanogenMod/android_external_apache-http" />
@@ -306,7 +209,7 @@
   <project path="packages/wallpapers/LivePicker" name="CyanogenMod/android_packages_wallpapers_LivePicker" />
   <project path="packages/wallpapers/MagicSmoke" name="CyanogenMod/android_packages_wallpapers_MagicSmoke" />
   <project path="packages/wallpapers/MusicVisualization" name="CyanogenMod/android_packages_wallpapers_MusicVisualization" />
-  <project path="prebuilt" name="CyanogenMod/android_prebuilt" />
+  <project path="prebuilt" name="CyanogenMod/android_prebuilt" remote="github-https" />
   <project path="sdk" name="CyanogenMod/android_sdk" revision="tools_r7" />
   <project path="system/bluetooth" name="CyanogenMod/android_system_bluetooth" />
   <project path="system/core" name="CyanogenMod/android_system_core" />
@@ -316,8 +219,8 @@
   <project path="system/su" name="CyanogenMod/android_system_su" />
   <project path="system/vold" name="CyanogenMod/android_system_vold" />
   <project path="system/wlan/ti" name="CyanogenMod/android_system_wlan_ti" />
-
-  <project path="vendor/cyanogen" name="CyanogenMod/android_vendor_cyanogen" />
+<!-- Use local Cyanogen Vendor for Blaze files -->
+  <project path="vendor/cyanogen" name="IngCr3at1on/android_vendor_cyanogen" />
   <project path="vendor/qcom/opensource/webkit" name="CyanogenMod/android_vendor_qcom_opensource_webkit" />
   <project path="vendor/tmobile/apps/ThemeChooser" name="CyanogenMod/themes-platform-vendor-tmobile-apps-ThemeChooser" />
   <project path="vendor/tmobile/libs/com.tmobile.themes" name="CyanogenMod/android_vendor_tmobile_libs_com.tmobile.themes" />
@@ -326,6 +229,6 @@
   <project path="vendor/tmobile/themes/Cyanbread" name="CyanogenMod/android_vendor_tmobile_themes_Cyanbread" />
   <project path="vendor/tmobile/products/themes" name="CyanogenMod/android_vendor_tmobile_products_themes" />
 
-  <project path="android" name="CyanogenMod/android" />
+  <project path="android" name="IngCr3at1on/android" />
 
 </manifest>