Merge branch 'bestel74/add_apply_button_color_chooser'