Tidied up colour selectors & made a couple of colour changes.