Changed the way colors are used.