Improvements for highlighting mixed modes

@lennartcl