Highlight improvements