Added colour swatches and font swatches in.