Revisions to Sans One, and new Sans Two template