Move colour schemes and a few others to Vundle