Use new colour features in framework, tweak some whitespace, a couple minor changes