Slight swatch improvements