Add color refactorings from da0f0cd5ce