Modify templates to work with new system.