Clean up and organise colour schemes