Color updates
Refactor