[Defy General] Kayant:
Copy this I added all the things you need :D

<?xml version="1.0" encoding="UTF-8"?>
<manifest>

<!-- CM removals -->
<remove-project name="CyanogenMod/android_frameworks_av" />
<remove-project name="CyanogenMod/android_frameworks_base" />
<remove-project name="CyanogenMod/android_frameworks_native" />
<remove-project name="CyanogenMod/android_hardware_libhardware_legacy" />
<remove-project name="CyanogenMod/android_hardware_ril" />
<remove-project name="CyanogenMod/android_system_core" />
<remove-project name="CyanogenMod/android_hardware_ti_omap3" />
<remove-project name="CyanogenMod/android_bootable_recovery" />
<remove-project name="CyanogenMod/android_frameworks_opt_telephony" />
<remove-project name="CyanogenMod/android_system_vold" />
<remove-project name="CyanogenMod/android_packages_apps_Settings" />
<remove-project name="CyanogenMod/android_external_wpa_supplicant_6" />
<remove-project name="CyanogenMod/android_bionic" />
<remove-project name="CyanogenMod/android_hardware_ti_wlan" />
<remove-project name="CyanogenMod/android_external_yaffs2" />

<project path="frameworks/av" name="Quarx2k/android_frameworks_av" revision="mr1-staging" />
<project path="frameworks/base" name="Quarx2k/android_frameworks_base" revision="mr1-staging" />
<project path="frameworks/native" name="Quarx2k/android_frameworks_native" revision="mr1-staging" />
<project path="hardware/ril" name="Quarx2k/android_hardware_ril" revision="mr1-staging" />
<project path="hardware/ti/omap3" name="CyanogenDefy/android_hardware_ti_omap3-compat" revision="jellybean"/>
<project path="bootable/recovery" name="Quarx2k/android_bootable_recovery" revision="jb4.2-defy" />
<project path="packages/apps/MotoFM" name="maniac103/android_packages_apps_MotoFM" revision="jellybean" />
<project path="packages/apps/MotoFMService" name="maniac103/android_packages_apps_MotoFMService" revision="gingerbread" />
<project path="packages/apps/Usb" name="CyanogenDefy/android_packages_apps_Usb" revision="ics" />
<project path="vendor/motorola" name="Quarx2k/proprietary_vendor_motorola" revision="jellybean"/>
<project path="device/moto/jordan-common" name="Quarx2k/android_device_moto_jordan-common" revision="mr1-staging" />
<project path="device/moto/mb526" name="Quarx2k/android_device_moto_mb526" revision="mr1-staging" />
<project path="device/moto/mb520" name="CyanogenKobe/android_device_moto_mb520" revision="jellybean"/>
<project path="external/bootmenu" name="Quarx2k/android_external_bootmenu" revision="jellybean"/>
<project path="external/hostapd" name="tpruvot/android_external_hostapd" revision="ics" />
<project path="packages/apps/HwaSettings" name="royale1223/HwaSettings" revision="master" />
<project path="jordan-kernel" name="Quarx2k/jordan-kernel" revision="2.6.32" />
<project path="system/wlan/ti" name="tpruvot/android_system_wlan_ti" revision="gingerbread" />
<project path="hardware/libhardware_legacy" name="Quarx2k/android_hardware_libhardware_legacy" revision="mr1-staging" />
<project path="system/core" name="Quarx2k/android_system_core" revision="mr1-staging" />
<project path="frameworks/opt/telephony" name="Quarx2k/android_frameworks_opt_telephony" revision="mr1-staging" />
<project path="system/vold" name="Quarx2k/android_system_vold" revision="mr1-staging" />
<project path="packages/apps/Settings" name="Quarx2k/android_packages_apps_Settings" revision="mr1-staging" />
<project path="external/wpa_supplicant_6" name="Quarx2k/android_external_wpa_supplicant_6" revision="mr1-staging" />
<project path="bionic" name="Quarx2k/android_bionic" />
<project path="hardware/ti/wlan" name="CyanogenDefy/android_hardware_ti_wlan" revision="mr1-staging" />
<project path="external/yaffs2" name="tpruvot/android_external_yaffs2" revision="jellybean" />
</manifest>

</manifest>

Add don't forget the fix from the post from before as I think that may also cause problems .....