Update existing forms to use base form template