Rewrite JavaScript syntax highlighting
Merge branch 'rewrite-js-highlighter'