More template revisions and updates