Make use of personal setting but xptemplates have to go
Fix personal setting of xptemplate - still to bulky
Remove unused file and new xptemplate