Joy v. 2.5.0.9: Add Swatch is here