Fixed issues with colour swatch 8, 9 and 10