Swatch colour fixes, mixins not working with some swatch sets