[Master] Add highlighting