Syntax highlighting bugfixes and test case
Add a lot more syntax highlighting tokens