Color picker n refactoring