update #268 : switched to standard-header in templates

Some little changes to templates