Color & global refactoring