reoorganize
clean up swatches crap