Minor default template adjustment, rewire local and fromtmatter parsing engine