matching svn repo with template fixes