Further work on the Color Scheme implementation.