Syntax Highlighter Fixes and Enhancements