Make collection add and remove swatches
Fixing names