Tweak colours and fix a couple bugs