COLOR Scheme fixes #2