Add color and further vundle support