Partial reimplementation of the Color Schemes. Plus some bug fixes.