Improved Syntax Highlighting