Final fix for syntax highlightning