Full highlighting everywhere
Merge pull request #54 from swentel/DEV

Full highlighting everywhere