Improve command highlighter