Swatch importer done, updating the rest
Swatch thing and other updates