Migrate all marks to new format