Split XSL into modules
Tweaked header and events