Minor improvements, remove defaulted swatches for compatibility