Updates to my new colourscheme, amongst other cleanups
Misc updates...