Major improvements.

Add new modules, improved highlighting etc.