Code refactoring, add color picker