Improved syntax highlighting for keywords - issue #1