General styling, colour swatches updated