Moved colors to the right place.
Merge pull request #1069 from phenx-de/color-cleanup

Moved colors to the right place.