Rearrange/add some bot sources; don't strip colors