adding Seb's base changes to templating files