Fixed syntax highlighting round 2