Improve static highlighter

@lennartcl