Color rework

I did not move this to the api package to not interfere with your work...