Fix bug where the alternative inline expression wouldn't end
Add support for more color schemes for Handlebars expressions
Cleanup comments and scope names