Color

Trying to merge this branch again, was not merged earlier and commits were missing (pulling master did not get these commits).