Added Color Highlighter and Colorpicker