Colors cleanup and refactoring.