Improved syntax highlighting, with support for future tmpl module