Added colorpicker and color highlighter