Changed swatch list formatting, easier to maintain.