Fixed colour swatch issues