Another attempt at fixing syntax highlighting