Updated: More Templates

Just adding some more changes before I take a 2 week leave.