Reinserted colour and font swatches until undefined colour swatch issue is resolved