fr: update to v2.1 - reformat.