Highlighting Fixed
Numerous parsing fixes and improvements
License file recovered
Theme encapsulation improved