fix and adjust new syntax highlighter