refactored color swatches