Readded colour swatches and font swatches for release 7.20 as these are still a requirement for this version of the code