more color refactoring