Revamp bundles. Add Ag and ctrlp