refactoring, color picker, modal manager