Updated base templates. I probably broke stuff.