Some colour schemes and a little touch up all over the place