LUN-507 : Fix submit buttons for color picker
LUN-507 : Rename theme and refactor code