Refactor contributor terms using new form styles