Moved all colour definitions to one section