Adding new highlighting and symbol detection with labels

Comparison:

Current highlighting
![screenshot 2014-02-07 09 32 53](https://f.cloud.github.com/assets/3052345/2124604/410e25ea-9242-11e3-995b-133c709825dc.png)

New Highlighting
![screenshot 2014-02-07 09 33 58](https://f.cloud.github.com/assets/3052345/2124609/4c3cbb8e-9242-11e3-97db-7c90dca1108a.png)