Update colourscheme

 * Moved commented options to end of file
 * Fixed several instances of wrong colours
 * Tweak multiple options