More XHTML-fied and extended header added to templates