Continued work on syntax highlighter