More XHTML Page Templates work