Updated tpl files to match master changes.