new colors, refactoring