Add swatch and counters