Add agnostic colorscheme. Tidy up some bits.