more changes to swatches