Finished color refactoring