Debugged and improved syntax highlighting