This is a major suggestion. For each template, we could mark off on the checkbox below the editor controls of save and revert template, what extra conditionals we'd like to apply. This would save us all the headache of having to comparing templates before upgrading before we revert, then apply our changes.
