logo color switch and refactoring