Updated base, data, and account templates