Fixed even more color bugs

To keep color handling on OS X consistent, I had to amend some methods. (I suggest some refactoring in order to keep dependencies clean, so that one does not have to search for and modify all possible places where colors are used.)