Add highlight option

Enable or disable the highlighting feature.