Latest changes, mostly to the Color Scheme implementation.