More major editor work, get rid of a bunch of old style templates