Improve Color-Class
Miscelous edits, beginning of improving code-parts