Hopefully fixed issue with template URLs.