Fix order of swatchs