Final fix for syntax highlighting