Very frustrating to have to re-create these. The best solution would be have these fields sync over from Form Fields but if that is too intensive, at minimum make them a quick select from the Catalog builder.