DIPLOMA: Highlight color swatches properly