Now swatches are working