Swatches

Removed unnecessary swatches and ensured used swatches were set to
global colours.