Random other changes
Colorschemes
Tidy up, unify