Tweak colours and fix a couple bugs
Merge branch 'master' into staging