@karlenigma if I were you, and what I'm going to do with my own mass porting to 2.0 that's in progress, is write a custom module for handling those forms and have them all share the same code.