diff --git a/forge-gui/res/editions/Modern Event Deck.txt b/forge-gui/res/editions/Modern Event Deck.txt
index 0feaf877df1..a7c0456c7aa 100644
--- a/forge-gui/res/editions/Modern Event Deck.txt	
+++ b/forge-gui/res/editions/Modern Event Deck.txt	
@@ -35,6 +35,6 @@ ScryfallCode=MD1
 26 U Ghost Quarter @Peter Mohrbacher
 
 [tokens]
-w_1_1_soldier
-w_1_1_spirit_flying
-c_1_1_a_phyrexian_myr
+0 c_1_1_a_phyrexian_myr @Unknown
+1 w_1_1_soldier @Goran Josic
+2 w_1_1_spirit_flying @Kev Walker
diff --git a/forge-gui/res/editions/Modern Horizons 2.txt b/forge-gui/res/editions/Modern Horizons 2.txt
index ba8171f53fa..988d8c9099a 100644
--- a/forge-gui/res/editions/Modern Horizons 2.txt	
+++ b/forge-gui/res/editions/Modern Horizons 2.txt	
@@ -591,26 +591,25 @@ ScryfallCode=MH2
 6 Zuran Orb|MH2|1
 
 [tokens]
-b_0_0_phyrexian_germ
-b_0_0_zombie_army
-b_2_2_zombie
-bg_1_1_insect
-c_0_0_a_construct_total_artifacts
-c_1_1_a_thopter_flying
-c_a_clue_draw
-c_a_clue_draw
-c_a_food_sac
-c_a_food_sac
-c_a_treasure_sac
-c_a_treasure_sac
-g_1_1_squirrel
-g_4_4_beast
-g_5_3_elemental
-r_1_1_goblin
-rw_4_4_a_golem
-u_0_3_crab
-w_1_1_bird_flying
-
-[other]
-eternalize_timeless_dragon
-eternalize_timeless_witness
+0 rw_4_4_a_golem @Unknown
+0 [other] @Unknown
+0 eternalize_timeless_dragon @Unknown
+0 eternalize_timeless_witness @Unknown
+1 w_1_1_bird_flying @Howard Lyon
+2 u_0_3_crab @Yeong-Hao Han
+3 b_0_0_phyrexian_germ @Igor Kieryluk
+6 b_2_2_zombie @Paul Scott Canavan
+7 b_0_0_zombie_army @Tomasz Jedruszek
+8 r_1_1_goblin @Karl Kopinski
+9 g_4_4_beast @Lucas Graciano
+10 g_5_3_elemental @Nils Hamm
+11 g_1_1_squirrel @Daniel Ljunggren
+13 bg_1_1_insect @Kim Sokol
+14 c_a_clue_draw @John Avon
+15 c_a_clue_draw @John Avon
+16 c_0_0_a_construct_total_artifacts @Mark Behm
+17 c_a_food_sac @Steven Belledin
+18 c_a_food_sac @Steven Belledin
+19 c_1_1_a_thopter_flying @Richard Wright
+20 c_a_treasure_sac @Alayna Danner
+21 c_a_treasure_sac @Alayna Danner
diff --git a/forge-gui/res/editions/Modern Horizons 3 Commander.txt b/forge-gui/res/editions/Modern Horizons 3 Commander.txt
index 7719af642c1..e2c92928f86 100644
--- a/forge-gui/res/editions/Modern Horizons 3 Commander.txt	
+++ b/forge-gui/res/editions/Modern Horizons 3 Commander.txt	
@@ -406,28 +406,28 @@ ScryfallCode=M3C
 411 R Rishkar's Expertise @Magali Villeneuve
 
 [tokens]
-b_3_3_beast_deathtouch
-b_x_x_aetherborn
-c_10_10_eldrazi
-c_1_1_a_myr
-c_1_1_a_thopter_flying
-c_1_1_eldrazi_scion_sac
-c_1_1_shapeshifter_changeling
-c_2_2_spirit
-c_4_4_eldrazi_angel_flying_vigilance
-c_6_12_a_construct_trample
-g_1_1_forest_dryad
-g_1_1_saproling
-g_2_2_boar
-g_3_3_ape
-g_3_3_beast
-g_3_3_elephant
-g_4_4_beast
-g_x_x_hydra
-marit_lage
-r_1_1_goblin
-r_5_5_dragon_flying
-rgw_1_1_sand_warrior
-u_2_1_a_phyrexian_myr
-u_2_2_shapeshifter_changeling
-u_x_x_illusion
+0 rgw_1_1_sand_warrior @Unknown
+1 c_10_10_eldrazi @Jack Wang
+2 c_4_4_eldrazi_angel_flying_vigilance @Nino Is
+3 c_1_1_eldrazi_scion_sac @Izzy
+4 c_1_1_shapeshifter_changeling @Steve Prescott
+5 c_2_2_spirit @Johann Bodin
+6 u_x_x_illusion @Jason A. Engle
+7 u_2_1_a_phyrexian_myr @Daarken
+8 u_2_2_shapeshifter_changeling @Filip Burburan
+9 b_x_x_aetherborn @Yeong-Hao Han
+10 b_3_3_beast_deathtouch @Dave Kendall
+11 marit_lage @Stephan Martiniere
+12 r_5_5_dragon_flying @Loïc Canavaggia
+13 r_1_1_goblin @Kev Walker
+14 g_3_3_ape @Lars Grant-West
+15 g_3_3_beast @Jesper Ejsing
+16 g_4_4_beast @Steve Prescott
+17 g_2_2_boar @James Ryman
+18 g_3_3_elephant @Lars Grant-West
+19 g_1_1_forest_dryad @Donato Giancola
+20 g_x_x_hydra @Simon Dominic
+21 g_1_1_saproling @Trevor Claxton
+24 c_6_12_a_construct_trample @Jung Park
+25 c_1_1_a_myr @Ryan Pancoast
+26 c_1_1_a_thopter_flying @Adam Paquette
diff --git a/forge-gui/res/editions/Modern Horizons 3.txt b/forge-gui/res/editions/Modern Horizons 3.txt
index c3d07e28847..4e12b22b929 100644
--- a/forge-gui/res/editions/Modern Horizons 3.txt	
+++ b/forge-gui/res/editions/Modern Horizons 3.txt	
@@ -657,34 +657,34 @@ A193 R A-Nadu, Winged Wisdom @Daren Bader
 1 Jyoti, Moag Ancient|M3C
 
 [tokens]
-b_0_0_phyrexian_germ
-b_0_0_zombie_army
-b_1_1_rat_lifelink
-b_1_1_snake_deathtouch
-b_1_2_a_phyrexian_wurm_deathtouch
-b_2_1_a_phyrexian_wurm_lifelink
-b_2_2_zombie
-bg_1_1_insect
-c_0_1_eldrazi_spawn_sac
-c_1_1_a_servo
-c_3_3_a_phyrexian_golem
-c_a_blood_draw
-c_a_clue_draw
-c_a_food_sac
-c_a_treasure_sac
-g_0_1_plant
-g_1_1_insect
-r_1_1_gremlin
-u_1_1_a_thopter_flying
-u_1_2_moonfolk_flying
-u_2_2_bird_flying
-u_3_3_fish_hatches_whale
-u_6_6_whale_hatches_kraken
-u_9_9_kraken
-w_1_1_cat
-w_1_1_soldier
-w_1_1_spirit_flying
-w_2_1_cat_warrior
-w_2_2_fox_vigilance
-w_4_4_angel_flying
-wb_1_1_spirit_flying
+2 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+3 w_4_4_angel_flying @Magali Villeneuve
+4 w_1_1_cat @Maxime Minard
+5 w_2_1_cat_warrior @Ben Wootten
+6 w_2_2_fox_vigilance @Chuck Lukacs
+7 w_1_1_soldier @Paolo Parente
+8 w_1_1_spirit_flying @Wayne Wu
+9 u_2_2_bird_flying @Carlos Palma Cruchaga
+10 u_3_3_fish_hatches_whale @Dan Murayama Scott
+11 u_9_9_kraken @Dan Murayama Scott
+12 u_1_2_moonfolk_flying @Chuck Lukacs
+13 u_1_1_a_thopter_flying @Andrew Murray
+14 u_6_6_whale_hatches_kraken @Dan Murayama Scott
+16 b_0_0_phyrexian_germ @Igor Kieryluk
+17 b_1_2_a_phyrexian_wurm_deathtouch @David Astruga
+18 b_2_1_a_phyrexian_wurm_lifelink @David Astruga
+19 b_1_1_rat_lifelink @Carlos Palma Cruchaga
+20 b_1_1_snake_deathtouch @Caroline Gariba
+21 b_2_2_zombie @Anna Steinbauer
+22 b_0_0_zombie_army @Warren Mahy
+23 r_1_1_gremlin @Tony Foti
+25 g_1_1_insect @Madeline Boni
+26 g_0_1_plant @Daren Bader
+27 bg_1_1_insect @Kim Sokol
+28 wb_1_1_spirit_flying @Christina Kraus
+29 c_a_blood_draw @Miranda Meeks
+30 c_a_clue_draw @Michele Giorgi
+31 c_a_food_sac @Leanna Crossan
+32 c_3_3_a_phyrexian_golem @Volkan Baǵa
+33 c_1_1_a_servo @Jung Park
+34 c_a_treasure_sac @Nino Vecia
diff --git a/forge-gui/res/editions/Modern Horizons.txt b/forge-gui/res/editions/Modern Horizons.txt
index d7d020ea26f..c1357221bc5 100644
--- a/forge-gui/res/editions/Modern Horizons.txt	
+++ b/forge-gui/res/editions/Modern Horizons.txt	
@@ -270,22 +270,22 @@ ScryfallCode=MH1
 255 R Flusterstorm @Chris Rallis
 
 [tokens]
-b_2_2_zombie
-c_0_0_a_construct_total_artifacts
-c_1_1_a_myr
-c_2_2_shapeshifter_changeling
-c_3_3_a_phyrexian_golem
-g_1_1_squirrel
-g_1_2_spider_reach
-g_2_2_bear
-g_3_3_elephant
-g_4_4_rhino_trample
-marit_lage
-r_1_1_elemental
-r_1_1_goblin
-r_3_1_elemental_trample_haste
-u_1_1_illusion_flying
-w_1_1_bird_flying
-w_1_1_soldier
-w_4_4_angel_flying_vigilance
-wb_1_1_spirit_flying
+0 c_3_3_a_phyrexian_golem @Unknown
+1 c_2_2_shapeshifter_changeling @Johann Bodin
+2 w_4_4_angel_flying_vigilance @Winona Nelson
+3 w_1_1_bird_flying @James Ryman
+4 w_1_1_soldier @Greg Staples
+5 u_1_1_illusion_flying @Véronique Meignaud
+6 marit_lage @Stephan Martiniere
+7 b_2_2_zombie @Anna Steinbauer
+8 r_1_1_elemental @Winona Nelson
+9 r_3_1_elemental_trample_haste @Victor Adame Minguez
+10 r_1_1_goblin @Kev Walker
+11 g_2_2_bear @Heather Hudson
+12 g_3_3_elephant @Lars Grant-West
+13 g_4_4_rhino_trample @Tomasz Jedruszek
+14 g_1_2_spider_reach @Daniel Ljunggren
+15 g_1_1_squirrel @Daniel Ljunggren
+16 wb_1_1_spirit_flying @Josh Hass
+17 c_0_0_a_construct_total_artifacts @Victor Adame Minguez
+19 c_1_1_a_myr @Ryan Pancoast
diff --git a/forge-gui/res/editions/Modern Masters 2015.txt b/forge-gui/res/editions/Modern Masters 2015.txt
index 3ab44182291..df2e24b8531 100644
--- a/forge-gui/res/editions/Modern Masters 2015.txt	
+++ b/forge-gui/res/editions/Modern Masters 2015.txt	
@@ -262,19 +262,19 @@ ScryfallCode=MM2
 249 U Simic Growth Chamber @John Avon
 
 [tokens]
-c_0_1_eldrazi_spawn_sac
-c_0_1_eldrazi_spawn_sac
-c_0_1_eldrazi_spawn_sac
-w_1_1_soldier
-w_1_1_spirit_flying
-b_1_1_faerie_rogue_flying
-b_0_0_phyrexian_germ
-b_1_1_thrull
-g_3_3_elephant
-g_1_1_insect
-g_1_1_saproling
-g_1_1_snake
-g_2_2_wolf
-bg_1_1_worm
-c_3_3_a_golem
-c_1_1_a_myr
+0 b_0_0_phyrexian_germ @Unknown
+1 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+2 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+3 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+4 w_1_1_soldier @Greg Staples
+5 w_1_1_spirit_flying @Mike Sass
+6 b_1_1_faerie_rogue_flying @Dave Allsop
+8 b_1_1_thrull @Mark Tedin
+9 g_3_3_elephant @Lars Grant-West
+10 g_1_1_insect @Ron Spencer
+11 g_1_1_saproling @Warren Mahy
+12 g_1_1_snake @Austin Hsu
+13 g_2_2_wolf @Daren Bader
+14 bg_1_1_worm @Chuck Lukacs
+15 c_3_3_a_golem @Nic Klein
+16 c_1_1_a_myr @Ryan Pancoast
diff --git a/forge-gui/res/editions/Modern Masters 2017.txt b/forge-gui/res/editions/Modern Masters 2017.txt
index 179f71bd86a..c4a1910a4dd 100644
--- a/forge-gui/res/editions/Modern Masters 2017.txt	
+++ b/forge-gui/res/editions/Modern Masters 2017.txt	
@@ -262,24 +262,24 @@ ScryfallCode=MM3
 249 R Verdant Catacombs @Vance Kovacs
 
 [tokens]
-w_4_4_angel_flying
-w_1_1_bird_flying
-w_1_1_soldier
-w_1_1_spirit_flying
-b_2_4_spider_reach
-b_2_2_zombie
-r_4_4_dragon_flying
-r_1_1_goblin
-r_1_1_goblin_haste
-g_3_3_beast
-g_4_4_beast
-g_3_3_centaur
-g_3_3_elephant
-g_x_x_ooze
-g_1_1_saproling
-g_5_5_wurm_trample
-gw_x_x_elemental_total_creatures
-rg_4_4_giant_warrior_haste
-rg_1_1_goblin_warrior
-rw_1_1_soldier_haste
-c_3_3_a_phyrexian_golem
+0 gw_x_x_elemental_total_creatures @Unknown
+0 rw_1_1_soldier_haste @Unknown
+0 c_3_3_a_phyrexian_golem @Unknown
+1 w_4_4_angel_flying @Anthony Palumbo
+2 w_1_1_bird_flying @James Ryman
+3 w_1_1_soldier @Magali Villeneuve
+4 w_1_1_spirit_flying @Ryan Yee
+5 b_2_4_spider_reach @Lars Grant-West
+6 b_2_2_zombie @Lucas Graciano
+7 r_4_4_dragon_flying @Vance Kovacs
+8 r_1_1_goblin @Brandon Kitkouski
+9 r_1_1_goblin_haste @Brandon Kitkouski
+9 g_3_3_beast @John Donahue
+10 g_4_4_beast @Steve Prescott
+11 g_3_3_centaur @Slawomir Maniak
+12 g_3_3_elephant @Lars Grant-West
+13 g_x_x_ooze @Marco Nelor
+14 g_1_1_saproling @Brad Rigney
+15 g_5_5_wurm_trample @Anthony Palumbo
+17 rg_4_4_giant_warrior_haste @Trevor Hairsine
+18 rg_1_1_goblin_warrior @Dave Allsop
diff --git a/forge-gui/res/editions/Modern Masters.txt b/forge-gui/res/editions/Modern Masters.txt
index d2b8284bd12..aec126aa5ea 100644
--- a/forge-gui/res/editions/Modern Masters.txt	
+++ b/forge-gui/res/editions/Modern Masters.txt	
@@ -242,18 +242,18 @@ ScryfallCode=MMA
 229 U Vivid Meadow @Rob Alexander
 
 [tokens]
-w_5_5_giant_warrior
-w_1_1_kithkin_soldier
-w_1_1_soldier
-u_1_1_illusion_flying
-b_1_1_bat_flying
-b_1_1_goblin_rogue
-b_2_4_spider_reach
-b_2_2_zombie
-r_4_4_dragon_flying
-r_1_1_goblin
-g_4_4_elemental
-g_1_1_saproling
-g_2_5_treefolk_shaman
-ub_1_1_faerie_rogue_flying
-bg_1_1_worm
+1 w_5_5_giant_warrior @Svetlin Velinov
+2 w_1_1_kithkin_soldier @Randy Gallegos
+3 w_1_1_soldier @Goran Josic
+4 u_1_1_illusion_flying @Véronique Meignaud
+5 b_1_1_bat_flying @Wayne Reynolds
+6 b_1_1_goblin_rogue @Dave Kendall
+7 b_2_4_spider_reach @Lars Grant-West
+8 b_2_2_zombie @Bud Cook
+9 r_4_4_dragon_flying @Vance Kovacs
+10 r_1_1_goblin @Dave Kendall
+11 g_4_4_elemental @Brandon Kitkouski
+12 g_1_1_saproling @Warren Mahy
+13 g_2_5_treefolk_shaman @Zack Stella
+14 ub_1_1_faerie_rogue_flying @E. M. Gist
+15 bg_1_1_worm @Chuck Lukacs
diff --git a/forge-gui/res/editions/Morningtide.txt b/forge-gui/res/editions/Morningtide.txt
index 0ec224e56d5..ed8f45d615c 100644
--- a/forge-gui/res/editions/Morningtide.txt
+++ b/forge-gui/res/editions/Morningtide.txt
@@ -163,12 +163,12 @@ ScryfallCode=MOR
 150 R Rustic Clachan @Fred Fields
 
 [tokens]
-w_5_5_giant_warrior
-w_1_1_kithkin_soldier
-u_1_1_merfolk_wizard
-b_1_1_faerie_rogue_flying
-b_1_1_goblin_rogue
-g_4_4_elemental
-g_1_1_elf_warrior
-g_2_5_treefolk_shaman
-g_2_2_wolf
+0 w_1_1_kithkin_soldier @Unknown
+0 u_1_1_merfolk_wizard @Unknown
+0 b_1_1_goblin_rogue @Unknown
+0 g_4_4_elemental @Unknown
+0 g_1_1_elf_warrior @Unknown
+0 g_2_2_wolf @Unknown
+1 w_5_5_giant_warrior @Steve Ellis
+2 b_1_1_faerie_rogue_flying @Jim Nelson
+3 g_2_5_treefolk_shaman @Richard Sardinha
diff --git a/forge-gui/res/editions/Multiverse Legends.txt b/forge-gui/res/editions/Multiverse Legends.txt
index 0923c48a0af..0bec4688390 100644
--- a/forge-gui/res/editions/Multiverse Legends.txt	
+++ b/forge-gui/res/editions/Multiverse Legends.txt	
@@ -270,5 +270,5 @@ ScryfallCode=MUL
 2 Zirda, the Dawnwaker|MUL
 
 [tokens]
-r_3_1_elemental_trample_haste
-u_2_1_a_phyrexian_myr
+1 u_2_1_a_phyrexian_myr @Samuel Perin
+2 r_3_1_elemental_trample_haste @Victor Adame Minguez
diff --git a/forge-gui/res/editions/Murders at Karlov Manor Commander.txt b/forge-gui/res/editions/Murders at Karlov Manor Commander.txt
index 4ee3ff55a7f..10d7c3b0273 100644
--- a/forge-gui/res/editions/Murders at Karlov Manor Commander.txt	
+++ b/forge-gui/res/editions/Murders at Karlov Manor Commander.txt	
@@ -366,31 +366,30 @@ ScryfallCode=MKC
 358 R Ransom Note @Gaboleps
 
 [tokens]
-b_0_0_phyrexian_germ
-b_2_2_zombie
-c_10_10_eldrazi
-c_6_12_a_construct_trample
-c_a_clue_draw
-c_a_food_sac
-c_a_gold_sac
-c_a_treasure_sac
-g_1_1_insect
-g_1_1_insect_flying_deathtouch
-g_1_1_saproling
-g_1_1_snake
-g_2_2_cat
-g_4_4_rhino_warrior
-kobolds_of_kher_keep
-komas_coil
-lightning_rager
-r_3_3_ogre
-tiny
-u_1_1_tentacle
-u_2_2_drake_flying
-u_4_3_salamander_warrior
-w_1_1_human_soldier
-w_1_1_soldier
-w_1_1_spirit_flying
-
-[other]
-embalm_vizier_of_many_faces
+0 komas_coil @Unknown
+0 [other] @Unknown
+0 embalm_vizier_of_many_faces @Unknown
+1 c_10_10_eldrazi @Jack Wang
+2 w_1_1_human_soldier @Deruchenko Alexander
+3 w_1_1_soldier @Greg Staples
+4 w_1_1_spirit_flying @Kim Sokol
+6 u_2_2_drake_flying @Svetlin Velinov
+8 u_4_3_salamander_warrior @J.P. Targete
+9 u_1_1_tentacle @Dan Murayama Scott
+10 b_0_0_phyrexian_germ @Igor Kieryluk
+11 b_2_2_zombie @Jason A. Engle
+12 kobolds_of_kher_keep @Paolo Parente
+13 lightning_rager @Svetlin Velinov
+14 r_3_3_ogre @Paul Bonner
+15 g_2_2_cat @Raoul Vitale
+17 g_1_1_insect @Martina Pilcerova
+18 g_1_1_insect_flying_deathtouch @Martina Pilcerova
+18 g_4_4_rhino_warrior @Zoltan Boros
+19 g_1_1_saproling @Sam White
+20 g_1_1_snake @Lars Grant-West
+21 tiny @Campbell White
+22 c_a_clue_draw @Daneen Wilkerson
+23 c_6_12_a_construct_trample @Jung Park
+24 c_a_food_sac @Steven Belledin
+25 c_a_gold_sac @Richard Wright
+26 c_a_treasure_sac @Florian de Gesincourt
diff --git a/forge-gui/res/editions/Murders at Karlov Manor.txt b/forge-gui/res/editions/Murders at Karlov Manor.txt
index 2c98d646b3a..00d5acd51eb 100644
--- a/forge-gui/res/editions/Murders at Karlov Manor.txt	
+++ b/forge-gui/res/editions/Murders at Karlov Manor.txt	
@@ -531,23 +531,23 @@ Base=Any:fromsheet("MKM prerelease promo")
 1 Field of the Dead|SPG
 
 [tokens]
-b_1_1_bat_flying
-b_2_1_skeleton
-bg_2_1_spider_menace_reach
-c_0_0_a_thopter_flying
-c_1_1_a_thopter_flying
-c_a_clue_draw
-c_a_clue_draw
-c_a_clue_draw
-c_a_clue_draw
-c_a_clue_draw
-g_0_0_ooze_trample
-g_0_1_plant
-r_1_1_goblin
-r_2_2_imp_burn_opp
-u_1_1_merfolk
-voja_fenstalker
-w_1_1_dog
-w_1_1_human
-wb_1_1_spirit_flying
-wu_2_2_detective
+1 w_1_1_dog @Alayna Danner
+2 w_1_1_human @Leesha Hannigan
+3 u_1_1_merfolk @Leesha Hannigan
+4 b_1_1_bat_flying @Tony Foti
+5 b_2_1_skeleton @Camille Alquier
+6 r_1_1_goblin @J.P. Targete
+7 r_2_2_imp_burn_opp @Caroline Gariba
+8 g_0_0_ooze_trample @Raph Lomotan
+9 g_0_1_plant @Madeline Boni
+10 wu_2_2_detective @Fay Dalton
+11 bg_2_1_spider_menace_reach @Helge C. Balzer
+12 wb_1_1_spirit_flying @Christina Kraus
+13 voja_fenstalker @Samuel Perin
+14 c_a_clue_draw @Mike Burns
+15 c_a_clue_draw @Mike Burns
+16 c_a_clue_draw @Mike Burns
+17 c_a_clue_draw @Mike Burns
+18 c_a_clue_draw @Mike Burns
+19 c_0_0_a_thopter_flying @David Sondered
+20 c_1_1_a_thopter_flying @Samuel Perin
diff --git a/forge-gui/res/editions/Mythic Edition - Guilds of Ravnica.txt b/forge-gui/res/editions/Mythic Edition - Guilds of Ravnica.txt
index f03e478328c..77ef7a80c76 100644
--- a/forge-gui/res/editions/Mythic Edition - Guilds of Ravnica.txt	
+++ b/forge-gui/res/editions/Mythic Edition - Guilds of Ravnica.txt	
@@ -16,6 +16,6 @@ GR7 M Tezzeret, Agent of Bolas @Aleksi Briclot
 GR8 M Vraska, Golgari Queen @Livia Prima
 
 [tokens]
-w_1_1_soldier
-b_2_2_zombie
-c_1_1_a_construct_defender
+G1 w_1_1_soldier @Goran Josic
+G2 b_2_2_zombie @Anna Steinbauer
+G3 c_1_1_a_construct_defender @Victor Adame Minguez
diff --git a/forge-gui/res/editions/Mythic Edition - Ravnica Allegiance.txt b/forge-gui/res/editions/Mythic Edition - Ravnica Allegiance.txt
index 8c156f0a5fd..ced74f3ce1c 100644
--- a/forge-gui/res/editions/Mythic Edition - Ravnica Allegiance.txt	
+++ b/forge-gui/res/editions/Mythic Edition - Ravnica Allegiance.txt	
@@ -16,5 +16,5 @@ RA7 M Domri, Chaos Bringer @Jason Rainville
 RA8 M Kaya, Orzhov Usurper @Chris Rallis
 
 [tokens]
-c_0_0_a_construct_total_artifacts
-rg_4_4_beast_trample
+0 rg_4_4_beast_trample @Unknown
+R1 c_0_0_a_construct_total_artifacts @Victor Adame Minguez
diff --git a/forge-gui/res/editions/Mythic Edition - War of the Spark.txt b/forge-gui/res/editions/Mythic Edition - War of the Spark.txt
index 71f5a040f4b..678ec0adfc2 100644
--- a/forge-gui/res/editions/Mythic Edition - War of the Spark.txt	
+++ b/forge-gui/res/editions/Mythic Edition - War of the Spark.txt	
@@ -16,5 +16,5 @@ WS7 M Nahiri, the Harbinger @Kieran Yanner
 WS8 M Sarkhan Unbroken @Eric Deschamps
 
 [tokens]
-b_3_3_beast_deathtouch
-r_4_4_dragon_flying
+W1 b_3_3_beast_deathtouch @Dave Kendall
+W2 r_4_4_dragon_flying @Raymond Swanland
diff --git a/forge-gui/res/editions/New Phyrexia.txt b/forge-gui/res/editions/New Phyrexia.txt
index 460e7213ea6..3020c7adffc 100644
--- a/forge-gui/res/editions/New Phyrexia.txt	
+++ b/forge-gui/res/editions/New Phyrexia.txt	
@@ -189,9 +189,9 @@ ScryfallCode=NPH
 175 L Forest @Mark Tedin
 
 [tokens]
-b_0_0_phyrexian_germ
-r_1_1_phyrexian_goblin_haste
-g_3_3_beast
-g_1_1_phyrexian_insect_infect
-c_3_3_a_phyrexian_golem
-c_1_1_a_phyrexian_myr
+0 b_0_0_phyrexian_germ @Unknown
+0 r_1_1_phyrexian_goblin_haste @Unknown
+0 g_1_1_phyrexian_insect_infect @Unknown
+0 c_3_3_a_phyrexian_golem @Unknown
+0 c_1_1_a_phyrexian_myr @Unknown
+1 g_3_3_beast @Dave Allsop
diff --git a/forge-gui/res/editions/Oath of the Gatewatch.txt b/forge-gui/res/editions/Oath of the Gatewatch.txt
index d77daed9188..53547daf178 100644
--- a/forge-gui/res/editions/Oath of the Gatewatch.txt	
+++ b/forge-gui/res/editions/Oath of the Gatewatch.txt	
@@ -201,17 +201,17 @@ ScryfallCode=OGW
 184a C Wastes @Raymond Swanland
 
 [tokens]
-c_1_1_eldrazi_scion_sac
-c_1_1_eldrazi_scion_sac
-c_1_1_eldrazi_scion_sac
-c_1_1_eldrazi_scion_sac
-c_1_1_eldrazi_scion_sac
-c_1_1_eldrazi_scion_sac
-w_3_3_angel_flying
-w_2_2_knight_ally
-w_1_1_kor_ally
-u_8_8_octopus
-b_2_2_zombie
-r_3_1_elemental_haste
-g_x_x_elemental
-g_0_1_plant
+0 w_2_2_knight_ally @Unknown
+0 w_1_1_kor_ally @Unknown
+0 u_8_8_octopus @Unknown
+1 c_1_1_eldrazi_scion_sac @Izzy
+2 c_1_1_eldrazi_scion_sac @Izzy
+3 c_1_1_eldrazi_scion_sac @Izzy
+4 c_1_1_eldrazi_scion_sac @Izzy
+5 c_1_1_eldrazi_scion_sac @Izzy
+6 c_1_1_eldrazi_scion_sac @Izzy
+7 w_3_3_angel_flying @Anastasia Ovchinnikova
+8 b_2_2_zombie @Kev Walker
+9 r_3_1_elemental_haste @Raymond Swanland
+10 g_x_x_elemental @Vincent Proce
+11 g_0_1_plant @Daren Bader
diff --git a/forge-gui/res/editions/Outlaws of Thunder Junction Commander.txt b/forge-gui/res/editions/Outlaws of Thunder Junction Commander.txt
index b692a9e0485..5f1261d67aa 100644
--- a/forge-gui/res/editions/Outlaws of Thunder Junction Commander.txt	
+++ b/forge-gui/res/editions/Outlaws of Thunder Junction Commander.txt	
@@ -350,30 +350,30 @@ ScryfallCode=OTC
 342 R Yavimaya Coast @Jesper Ejsing
 
 [tokens]
-b_1_1_assassin_deathtouch_haste
-b_1_1_rat
-b_2_2_rogue
-b_2_2_zombie
-c_10_10_eldrazi
-c_1_1_a_soldier
-c_1_1_a_thopter_flying
-c_1_1_eldrazi_scion_sac
-c_a_blood_draw
-c_a_food_sac
-g_0_1_plant
-g_1_1_insect
-g_2_2_boar
-g_3_3_ape
-g_4_2_plant_warrior_reach
-g_5_3_elemental
-r_0_2_dragon_egg_defender_hatches_dragon
-r_1_1_elemental
-r_2_2_dragon_flying_firebreathing
-r_4_4_dragon_elemental_flying_prowess
-rg_5_5_elemental
-rgw_1_1_sand_warrior
-u_1_1_bird_illusion_flying
-u_2_2_drake_flying
-u_x_x_shark_flying
-w_4_4_angel_flying
-wb_2_1_inkling_flying
+0 rgw_1_1_sand_warrior @Unknown
+1 c_10_10_eldrazi @Jack Wang
+2 c_1_1_eldrazi_scion_sac @Izzy
+3 w_4_4_angel_flying @Magali Villeneuve
+4 u_1_1_bird_illusion_flying @James Paick
+5 u_2_2_drake_flying @Svetlin Velinov
+6 u_x_x_shark_flying @Caio Monteiro
+7 b_1_1_assassin_deathtouch_haste @Josu Hernaiz
+8 b_1_1_rat @Mike Bierek
+9 b_2_2_rogue @Maria Poliakova
+10 b_2_2_zombie @Igor Kieryluk
+11 r_2_2_dragon_flying_firebreathing @Lars Grant-West
+12 r_0_2_dragon_egg_defender_hatches_dragon @Jehan Choo
+13 r_4_4_dragon_elemental_flying_prowess @Andrea Piparo
+14 r_1_1_elemental @Winona Nelson
+15 g_3_3_ape @Lars Grant-West
+16 g_2_2_boar @James Ryman
+17 g_5_3_elemental @Nils Hamm
+18 g_1_1_insect @Christopher Moeller
+19 g_0_1_plant @Jakub Kasper
+20 g_4_2_plant_warrior_reach @Xabi Gaztelua
+21 rg_5_5_elemental @Brad Rigney
+22 wb_2_1_inkling_flying @Scott Murphy
+24 c_a_blood_draw @Miranda Meeks
+25 c_a_food_sac @Lucas Graciano
+26 c_1_1_a_soldier @Kev Walker
+27 c_1_1_a_thopter_flying @Svetlin Velinov
diff --git a/forge-gui/res/editions/Outlaws of Thunder Junction.txt b/forge-gui/res/editions/Outlaws of Thunder Junction.txt
index 2795a29e0f4..9ac6aac1490 100644
--- a/forge-gui/res/editions/Outlaws of Thunder Junction.txt	
+++ b/forge-gui/res/editions/Outlaws of Thunder Junction.txt	
@@ -464,20 +464,20 @@ Base=Land:fromSheet("OTJ cards")
 1 Tarnation Vista|BIG
 
 [tokens]
-b_1_1_vampire_rogue_lifelink
-beau
-c_a_clue_draw
-c_a_treasure_sac
-g_2_1_varmint
-g_3_3_elk
-g_x_x_elemental
-meteorite
-r_1_1_mercenary_tappump
-r_3_1_dinosaur
-r_4_4_scorpion_dragon_flying_haste
-u_1_1_bird_flying
-ub_2_2_zombie_rogue
-w_1_1_sheep
-w_2_2_ox
-w_2_2_spirit_flying
-w_3_3_angel_flying
+2 w_3_3_angel_flying @Leonardo Santanna
+3 w_2_2_ox @Fiona Hsieh
+4 w_1_1_sheep @Edgar Sánchez Hidalgo
+5 w_2_2_spirit_flying @Domenico Cava
+6 beau @Loïc Canavaggia
+7 u_1_1_bird_flying @Eduardo Francisco
+8 b_1_1_vampire_rogue_lifelink @Robin Olausson
+9 r_3_1_dinosaur @Xabi Gaztelua
+10 r_1_1_mercenary_tappump @Eduardo Francisco
+11 r_4_4_scorpion_dragon_flying_haste @Diego Gisbert
+12 g_x_x_elemental @Jason Smith
+13 g_3_3_elk @Lie Setiawan
+14 g_2_1_varmint @Ralph Horsley
+15 ub_2_2_zombie_rogue @Caio E Santos
+16 c_a_clue_draw @Clint Lockwood
+17 meteorite @Ina Wong
+18 c_a_treasure_sac @Monztre
diff --git a/forge-gui/res/editions/Phyrexia All Will Be One Commander.txt b/forge-gui/res/editions/Phyrexia All Will Be One Commander.txt
index a57a52c0489..bd312afdbee 100644
--- a/forge-gui/res/editions/Phyrexia All Will Be One Commander.txt	
+++ b/forge-gui/res/editions/Phyrexia All Will Be One Commander.txt	
@@ -182,25 +182,25 @@ ScryfallCode=ONC
 174 R Windbrisk Heights @Omar Rayyan
 
 [tokens]
-b_0_0_phyrexian_germ
-c_10_10_eldrazi
-c_1_1_a_myr
-c_1_1_a_thopter_flying
-c_x_x_a_golem_haste
-c_x_x_a_phyrexian_horror
-g_1_1_phyrexian_insect_infect
-g_3_3_beast
-g_3_3_elephant
-g_x_x_phyrexian_wurm_trample_toxic
-kobolds_of_kher_keep
-r_1_1_goblin
-r_5_5_dragon_flying
-rw_1_1_soldier_haste
-w_1_1_bird_flying
-w_1_1_human
-w_1_1_human_soldier
-w_1_1_soldier
-w_1_1_spirit_flying
-w_2_2_soldier_vigilance
-w_4_4_angel_flying
-w_4_4_angel_flying_vigilance
+0 rw_1_1_soldier_haste @Unknown
+1 c_10_10_eldrazi @Jack Wang
+3 w_4_4_angel_flying @Volkan Baǵa
+4 w_1_1_bird_flying @Howard Lyon
+5 w_1_1_human @Ben Maier
+6 w_1_1_human_soldier @Deruchenko Alexander
+7 w_1_1_soldier @Magali Villeneuve
+8 w_2_2_soldier_vigilance @Johan Grenier
+9 w_1_1_spirit_flying @Jason A. Engle
+10 r_5_5_dragon_flying @Raymond Swanland
+11 r_1_1_goblin @Goran Josic
+12 kobolds_of_kher_keep @Paolo Parente
+13 g_3_3_beast @Jesper Ejsing
+14 g_3_3_elephant @Lars Grant-West
+15 g_1_1_phyrexian_insect_infect @Adrian Smith
+16 g_x_x_phyrexian_wurm_trample_toxic @Nicholas Gregory
+17 w_4_4_angel_flying_vigilance @Volkan Baǵa
+18 c_x_x_a_golem_haste @José Parodi
+19 c_1_1_a_myr @Ryan Pancoast
+20 c_x_x_a_phyrexian_horror @Scott Chou
+21 c_1_1_a_thopter_flying @Richard Wright
+23 b_0_0_phyrexian_germ @Igor Kieryluk
diff --git a/forge-gui/res/editions/Phyrexia All Will Be One.txt b/forge-gui/res/editions/Phyrexia All Will Be One.txt
index d7b9eda8240..bc234217a72 100644
--- a/forge-gui/res/editions/Phyrexia All Will Be One.txt	
+++ b/forge-gui/res/editions/Phyrexia All Will Be One.txt	
@@ -507,15 +507,15 @@ ScryfallCode=ONE
 283 R Phyrexian Arena @Martina Fačková
 
 [tokens]
-c_1_1_a_phyrexian_mite_toxic_noblock
-c_1_1_a_phyrexian_mite_toxic_noblock
-c_2_2_a_drone_deathtouch_leavedrain
-c_3_3_a_phyrexian_golem
-g_3_3_phyrexian_beast_toxic
-g_x_x_phyrexian_horror
-r_1_1_phyrexian_goblin
-r_2_2_rebel
-r_x_1_phyrexian_horror_trample_haste
-the_hollow_sentinel
-w_2_2_cat
-w_2_2_samurai_double_strike
+1 w_2_2_cat @April Prime
+2 w_2_2_samurai_double_strike @Gaboleps
+3 r_1_1_phyrexian_goblin @Jokubas Uogintas
+4 r_x_1_phyrexian_horror_trample_haste @Camille Alquier
+5 r_2_2_rebel @Bram Sels
+6 g_3_3_phyrexian_beast_toxic @Uriah Voth
+7 g_x_x_phyrexian_horror @Allen Williams
+8 c_2_2_a_drone_deathtouch_leavedrain @Steve Argyle
+9 the_hollow_sentinel @Igor Kieryluk
+10 c_3_3_a_phyrexian_golem @Samuel Araya
+11 c_1_1_a_phyrexian_mite_toxic_noblock @Oriana Menendez
+12 c_1_1_a_phyrexian_mite_toxic_noblock @Oriana Menendez
diff --git a/forge-gui/res/editions/Planechase Anthology.txt b/forge-gui/res/editions/Planechase Anthology.txt
index 02d7703db08..e7b752a8841 100644
--- a/forge-gui/res/editions/Planechase Anthology.txt	
+++ b/forge-gui/res/editions/Planechase Anthology.txt	
@@ -251,22 +251,22 @@ OPCA85 C Windriddle Palaces @Kekai Kotaki
 OPCA86 C The Zephyr Maze @rk post
 
 [tokens]
-c_7_7_eldrazi_annihilator
-c_0_1_eldrazi_spawn_sac
-c_0_1_eldrazi_spawn_sac
-c_0_1_eldrazi_spawn_sac
-w_4_4_angel_flying
-w_0_1_goat
-b_0_0_phyrexian_germ
-b_2_4_spider_reach
-b_2_2_zombie
-r_5_5_dragon_flying
-r_1_1_goblin
-r_4_4_hellion
-g_3_3_beast
-g_3_3_boar
-g_1_1_insect
-g_1_1_ooze
-g_2_2_ooze_mitotic
-g_0_1_plant
-g_1_1_saproling
+0 b_0_0_phyrexian_germ @Unknown
+1 c_7_7_eldrazi_annihilator @Vincent Proce
+2 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+3 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+4 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+5 w_4_4_angel_flying @Cyril Van Der Haegen
+6 w_0_1_goat @Terese Nielsen
+8 b_2_4_spider_reach @Lars Grant-West
+9 b_2_2_zombie @Dave Kendall
+10 r_5_5_dragon_flying @Jim Pavelec
+11 r_1_1_goblin @Brandon Kitkouski
+12 r_4_4_hellion @Anthony Francisco
+13 g_3_3_beast @Dave Allsop
+14 g_3_3_boar @Jesper Ejsing
+15 g_1_1_insect @Carl Critchlow
+16 g_1_1_ooze @Raymond Swanland
+17 g_2_2_ooze_mitotic @Raymond Swanland
+18 g_0_1_plant @Daren Bader
+19 g_1_1_saproling @Brad Rigney
diff --git a/forge-gui/res/editions/Ravnica Allegiance Guild Kit.txt b/forge-gui/res/editions/Ravnica Allegiance Guild Kit.txt
index 933d536522f..8f27eb6c22e 100644
--- a/forge-gui/res/editions/Ravnica Allegiance Guild Kit.txt	
+++ b/forge-gui/res/editions/Ravnica Allegiance Guild Kit.txt	
@@ -141,13 +141,13 @@ ScryfallCode=GK2
 133 L Forest @Yeong-Hao Han
 
 [tokens]
-w_1_1_spirit_flying
-b_1_1_bat_flying
-r_6_6_dragon_flying
-r_2_1_goblin_haste
-g_3_3_frog_lizard
-g_x_x_ooze
-g_1_1_saproling
-g_6_6_wurm
-wu_1_1_bird_flying
-wb_1_1_cleric_deathpact
+0 g_3_3_frog_lizard @Unknown
+1 wu_1_1_bird_flying @Shishizaru
+2 w_1_1_spirit_flying @Dave Allsop
+3 b_1_1_bat_flying @Wayne Reynolds
+4 wb_1_1_cleric_deathpact @Jason Chan
+5 r_6_6_dragon_flying @Mark Zug
+6 r_2_1_goblin_haste @Carl Critchlow
+7 g_1_1_saproling @Warren Mahy
+8 g_6_6_wurm @Mitch Cotie
+9 g_x_x_ooze @Marco Nelor
diff --git a/forge-gui/res/editions/Ravnica Allegiance.txt b/forge-gui/res/editions/Ravnica Allegiance.txt
index ba8f71d8089..bf2c577c907 100644
--- a/forge-gui/res/editions/Ravnica Allegiance.txt	
+++ b/forge-gui/res/editions/Ravnica Allegiance.txt	
@@ -298,15 +298,15 @@ Rakdos Guildgate|RNA
 Simic Guildgate|RNA
 
 [tokens]
-rg_4_4_beast_trample
-g_3_3_centaur
-g_3_3_frog_lizard
-r_1_1_goblin
-w_1_1_human
-u_0_2_illusion_mesmerize
-g_2_2_ooze
-wu_4_4_sphinx_flying_vigilance
-wb_1_1_spirit_flying
-c_1_1_a_thopter_flying
-c_a_treasure_sac
-b_2_2_zombie
+1 w_1_1_human @Bram Sels
+2 u_0_2_illusion_mesmerize @Kev Walker
+3 b_2_2_zombie @Jason A. Engle
+4 r_1_1_goblin @Svetlin Velinov
+5 g_3_3_centaur @Sidharth Chaturvedi
+6 g_3_3_frog_lizard @Jack Wang
+7 g_2_2_ooze @Lake Hurwitz
+8 rg_4_4_beast_trample @Winona Nelson
+9 wu_4_4_sphinx_flying_vigilance @Scott Murphy
+10 wb_1_1_spirit_flying @Josh Hass
+11 c_1_1_a_thopter_flying @Darren Tan
+12 c_a_treasure_sac @Mark Behm
diff --git a/forge-gui/res/editions/Ravnica Remastered.txt b/forge-gui/res/editions/Ravnica Remastered.txt
index d35e155c6d5..2579091ebc8 100644
--- a/forge-gui/res/editions/Ravnica Remastered.txt	
+++ b/forge-gui/res/editions/Ravnica Remastered.txt	
@@ -513,22 +513,22 @@ ScryfallCode=RVR
 1 Chromatic Lantern|RVR
 
 [tokens]
-b_2_2_zombie
-g_1_1_saproling
-g_3_3_centaur
-g_4_4_rhino_trample
-g_6_6_wurm
-gw_2_2_elf_knight_vigilance
-r_1_1_goblin
-r_2_1_goblin_haste
-r_6_6_dragon_flying
-rg_4_4_beast_trample
-rw_1_1_soldier_haste
-u_1_1_bird_illusion_flying
-voja
-w_1_1_bird_flying
-w_1_1_spirit_flying
-w_4_4_angel_flying
-w_4_4_angel_flying_vigilance
-wb_1_1_spirit_flying
-wu_4_4_sphinx_flying_vigilance
+0 gw_2_2_elf_knight_vigilance @Unknown
+0 rw_1_1_soldier_haste @Unknown
+1 w_1_1_bird_flying @James Ryman
+3 w_4_4_angel_flying @Grzegorz Rutkowski
+4 w_1_1_spirit_flying @Dave Allsop
+5 u_1_1_bird_illusion_flying @James Paick
+6 b_2_2_zombie @Simon Dominic
+7 r_6_6_dragon_flying @Mark Zug
+8 r_1_1_goblin @Mark Zug
+9 r_2_1_goblin_haste @Carl Critchlow
+10 g_3_3_centaur @Slawomir Maniak
+11 g_4_4_rhino_trample @Aaron Miller
+12 g_1_1_saproling @Dana Knutson
+13 g_6_6_wurm @Mitch Cotie
+14 rg_4_4_beast_trample @Winona Nelson
+15 w_4_4_angel_flying_vigilance @Grzegorz Rutkowski
+17 wu_4_4_sphinx_flying_vigilance @Scott Murphy
+18 wb_1_1_spirit_flying @Cliff Childs
+19 voja @Richard Sardinha
diff --git a/forge-gui/res/editions/Return to Ravnica.txt b/forge-gui/res/editions/Return to Ravnica.txt
index a7514363bc0..b060680608a 100644
--- a/forge-gui/res/editions/Return to Ravnica.txt	
+++ b/forge-gui/res/editions/Return to Ravnica.txt	
@@ -288,17 +288,17 @@ ScryfallCode=RTR
 274 L Forest @Richard Wright
 
 [tokens]
-w_1_1_bird_flying
-w_2_2_knight_vigilance
-w_2_2_knight_vigilance
-w_1_1_soldier
-b_1_1_assassin_lose_con
-r_6_6_dragon_flying
-r_1_1_goblin
-g_3_3_centaur
-g_3_3_centaur
-g_x_x_ooze
-g_4_4_rhino_trample
-g_1_1_saproling
-g_5_5_wurm_trample
-gw_8_8_elemental_vigilance
+0 gw_8_8_elemental_vigilance @Unknown
+1 w_1_1_bird_flying @James Ryman
+2 w_2_2_knight_vigilance @Matt Stewart
+3 w_2_2_knight_vigilance @Matt Stewart
+3 w_1_1_soldier @Steve Prescott
+4 b_1_1_assassin_lose_con @Svetlin Velinov
+5 r_6_6_dragon_flying @Mark Zug
+6 r_1_1_goblin @Christopher Moeller
+7 g_3_3_centaur @Slawomir Maniak
+7 g_3_3_centaur @Slawomir Maniak
+8 g_x_x_ooze @Marco Nelor
+9 g_4_4_rhino_trample @Tomasz Jedruszek
+10 g_1_1_saproling @Raoul Vitale
+11 g_5_5_wurm_trample @Anthony Palumbo
diff --git a/forge-gui/res/editions/Rise of the Eldrazi.txt b/forge-gui/res/editions/Rise of the Eldrazi.txt
index 655d714c7e1..e53cc8b9698 100644
--- a/forge-gui/res/editions/Rise of the Eldrazi.txt	
+++ b/forge-gui/res/editions/Rise of the Eldrazi.txt	
@@ -261,13 +261,13 @@ ScryfallCode=ROE
 248 L Forest @Jung Park
 
 [tokens]
-tuktuk_the_returned
-c_0_1_eldrazi_spawn_sac
-c_0_1_eldrazi_spawn_sac
-c_0_1_eldrazi_spawn_sac
-w_1_1_kor_soldier
-r_5_5_dragon_flying
-r_x_x_elemental
-r_4_4_hellion
-g_3_3_elephant
-g_x_x_ooze
+0 w_1_1_kor_soldier @Unknown
+0 r_5_5_dragon_flying @Unknown
+0 g_3_3_elephant @Unknown
+1a c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+1a c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+1a c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+2 r_x_x_elemental @Jung Park
+3 r_4_4_hellion @Anthony Francisco
+4 g_x_x_ooze @Daniel Ljunggren
+5 tuktuk_the_returned @Franz Vohwinkel
diff --git a/forge-gui/res/editions/Rivals of Ixalan.txt b/forge-gui/res/editions/Rivals of Ixalan.txt
index 88dece623f5..fcb471e572f 100644
--- a/forge-gui/res/editions/Rivals of Ixalan.txt	
+++ b/forge-gui/res/editions/Rivals of Ixalan.txt	
@@ -233,15 +233,15 @@ ScryfallCode=RIX
 1 Forest|RIX
 
 [tokens]
-w_1_1_vampire_lifelink
-u_1_1_merfolk_hexproof
-r_1_1_elemental
-r_0_1_elemental_rekindling_phoenix
-g_3_3_dinosaur_trample
-g_1_1_saproling
-c_4_4_a_golem
-c_a_treasure_sac
-c_a_treasure_sac
-c_a_treasure_sac
-c_a_treasure_sac
-c_a_treasure_sac
+0 w_1_1_vampire_lifelink @Unknown
+0 u_1_1_merfolk_hexproof @Unknown
+0 g_3_3_dinosaur_trample @Unknown
+0 c_a_treasure_sac @Unknown
+0 c_a_treasure_sac @Unknown
+0 c_a_treasure_sac @Unknown
+0 c_a_treasure_sac @Unknown
+0 c_a_treasure_sac @Unknown
+1 r_0_1_elemental_rekindling_phoenix @Jason Rainville
+2 r_1_1_elemental @Lius Lasahido
+3 g_1_1_saproling @Joseph Meehan
+4 c_4_4_a_golem @Svetlin Velinov
diff --git a/forge-gui/res/editions/Scars of Mirrodin.txt b/forge-gui/res/editions/Scars of Mirrodin.txt
index 1e9f98208d1..22c5beeea01 100644
--- a/forge-gui/res/editions/Scars of Mirrodin.txt	
+++ b/forge-gui/res/editions/Scars of Mirrodin.txt	
@@ -263,12 +263,12 @@ ScryfallCode=SOM
 249 L Forest @Mark Tedin
 
 [tokens]
-w_2_2_cat
-w_1_1_soldier
-r_1_1_goblin
-g_1_1_phyrexian_insect_infect
-g_2_2_wolf
-c_3_3_a_golem
-c_1_1_a_myr
-c_3_3_a_phyrexian_wurm_deathtouch
-c_3_3_a_phyrexian_wurm_lifelink
+0 g_1_1_phyrexian_insect_infect @Unknown
+0 c_3_3_a_phyrexian_wurm_deathtouch @Unknown
+0 c_3_3_a_phyrexian_wurm_lifelink @Unknown
+1 w_2_2_cat @Scott Chou
+2 w_1_1_soldier @Goran Josic
+3 r_1_1_goblin @Goran Josic
+5 g_2_2_wolf @Chris Rahn
+6 c_3_3_a_golem @Nic Klein
+7 c_1_1_a_myr @Ryan Pancoast
diff --git a/forge-gui/res/editions/Shadowmoor.txt b/forge-gui/res/editions/Shadowmoor.txt
index 089f5e3cae9..2376a38914d 100644
--- a/forge-gui/res/editions/Shadowmoor.txt
+++ b/forge-gui/res/editions/Shadowmoor.txt
@@ -314,15 +314,15 @@ ScryfallCode=SHM
 301 L Forest @Steve Prescott
 
 [tokens]
-w_1_1_kithkin_soldier
-w_1_1_spirit_flying
-b_1_1_rat
-r_1_1_elemental_haste
-g_1_1_elf_warrior
-g_1_2_spider_reach
-g_2_2_wolf
-br_5_5_elemental
-gw_1_1_elf_warrior
-ub_1_1_faerie_rogue_flying
-rg_4_4_giant_warrior_haste
-rg_1_1_goblin_warrior
+0 gw_1_1_elf_warrior @Unknown
+1 w_1_1_kithkin_soldier @Randy Gallegos
+2 w_1_1_spirit_flying @Jeremy Enecio
+3 b_1_1_rat @Carl Critchlow
+4 r_1_1_elemental_haste @Cyril Van Der Haegen
+5 g_1_1_elf_warrior @William O'Connor
+6 g_1_2_spider_reach @Thomas M. Baxa
+7 g_2_2_wolf @Lars Grant-West
+8 ub_1_1_faerie_rogue_flying @E. M. Gist
+9 br_5_5_elemental @Dave Dorman
+10 rg_4_4_giant_warrior_haste @Trevor Hairsine
+11 rg_1_1_goblin_warrior @Dave Allsop
diff --git a/forge-gui/res/editions/Shadows over Innistrad.txt b/forge-gui/res/editions/Shadows over Innistrad.txt
index 56bf8e9c285..0a0f41b6eb2 100644
--- a/forge-gui/res/editions/Shadows over Innistrad.txt	
+++ b/forge-gui/res/editions/Shadows over Innistrad.txt	
@@ -312,19 +312,19 @@ ScryfallCode=SOI
 297 L Forest @Andreas Rocha
 
 [tokens]
-w_4_4_angel_flying
-w_1_1_human_soldier
-w_1_1_spirit_flying
-b_1_1_vampire_knight_lifelink
-b_2_2_zombie
-r_1_1_devil_burn
-g_1_1_insect
-g_3_3_ooze
-g_2_2_wolf
-wb_1_1_human_cleric
-c_a_clue_draw
-c_a_clue_draw
-c_a_clue_draw
-c_a_clue_draw
-c_a_clue_draw
-c_a_clue_draw
+1 w_4_4_angel_flying @Magali Villeneuve
+2 w_1_1_human_soldier @Deruchenko Alexander
+3 w_1_1_spirit_flying @Jason A. Engle
+4 b_1_1_vampire_knight_lifelink @Lake Hurwitz
+5 b_2_2_zombie @Craig J Spearing
+6 r_1_1_devil_burn @Wayne England
+7 g_1_1_insect @Christopher Moeller
+8 g_3_3_ooze @Nils Hamm
+9 g_2_2_wolf @Aaron Miller
+10 wb_1_1_human_cleric @Min Yum
+11 c_a_clue_draw @John Avon
+12 c_a_clue_draw @John Avon
+13 c_a_clue_draw @John Avon
+14 c_a_clue_draw @John Avon
+15 c_a_clue_draw @John Avon
+16 c_a_clue_draw @John Avon
diff --git a/forge-gui/res/editions/Shards of Alara.txt b/forge-gui/res/editions/Shards of Alara.txt
index 0d741d43911..597adaf78ba 100644
--- a/forge-gui/res/editions/Shards of Alara.txt	
+++ b/forge-gui/res/editions/Shards of Alara.txt	
@@ -265,14 +265,14 @@ ScryfallCode=ALA
 250 M Rafiq of the Many @Meel Tamphanon
 
 [tokens]
-w_1_1_soldier
-u_0_1_a_homunculus
-u_1_1_a_thopter_flying
-b_1_1_skeleton_regenerate
-b_2_2_zombie
-r_4_4_dragon_flying
-r_1_1_goblin
-r_1_1_goblin_haste
-g_x_x_ooze
-g_1_1_saproling
-rgw_8_8_beast
+0 rgw_8_8_beast @Unknown
+1 w_1_1_soldier @Alan Pollack
+2 u_0_1_a_homunculus @Howard Lyon
+3 u_1_1_a_thopter_flying @Andrew Murray
+4 b_1_1_skeleton_regenerate @Thomas M. Baxa
+5 b_2_2_zombie @Dave Kendall
+6 r_4_4_dragon_flying @Vance Kovacs
+7 r_1_1_goblin @Brandon Kitkouski
+8 r_1_1_goblin_haste @Brandon Kitkouski
+8 g_x_x_ooze @Anthony S. Waters
+9 g_1_1_saproling @Trevor Claxton
diff --git a/forge-gui/res/editions/Starter Commander Decks.txt b/forge-gui/res/editions/Starter Commander Decks.txt
index d340caad8bf..a9d73e64e61 100644
--- a/forge-gui/res/editions/Starter Commander Decks.txt	
+++ b/forge-gui/res/editions/Starter Commander Decks.txt	
@@ -360,28 +360,28 @@ ScryfallCode=SCD
 352 L Forest @Titus Lunter
 
 [tokens]
-b_0_0_zombie_army
-b_2_2_zombie
-b_2_2_zombie_knight_menace
-b_x_x_demon_flying
-c_10_10_eldrazi
-c_1_1_a_thopter_flying
-c_a_treasure_sac
-g_1_1_elf_warrior
-g_1_1_insect_flying_deathtouch
-g_1_1_saproling
-g_3_3_beast
-g_3_3_elephant
-karox_bladewing
-r_3_3_ogre
-r_5_5_dragon_flying
-u_1_1_a_thopter_flying
-u_1_1_faerie_flying
-w_1_1_bird_flying
-w_1_1_cat_bird_flying
-w_1_1_human_warrior
-w_1_1_pegasus_flying
-w_1_1_soldier_lifelink
-w_1_1_spirit_flying
-w_2_2_cat
-w_2_2_cat_beast
+1 c_10_10_eldrazi @Jack Wang
+2 w_1_1_bird_flying @Allen Douglas
+3 w_2_2_cat @Jesper Ejsing
+4 w_2_2_cat_beast @Bayard Wu
+5 w_1_1_cat_bird_flying @Leesha Hannigan
+6 w_1_1_human_warrior @Gabor Szikszai
+7 w_1_1_pegasus_flying @Greg Hildebrandt
+8 w_1_1_soldier_lifelink @John Severin Brassell
+9 w_1_1_spirit_flying @Jason A. Engle
+10 u_1_1_faerie_flying @Irina Nordsol
+11 u_1_1_a_thopter_flying @Andrew Murray
+12 b_x_x_demon_flying @Evan Shipard
+13 b_2_2_zombie @Lucas Graciano
+14 b_0_0_zombie_army @David Astruga
+15 b_2_2_zombie_knight_menace @Lucas Graciano
+16 r_5_5_dragon_flying @Alex Konstad
+17 karox_bladewing @XiaoDi Jin
+18 r_3_3_ogre @Paul Bonner
+19 g_3_3_beast @Jesper Ejsing
+20 g_3_3_elephant @Lars Grant-West
+21 g_1_1_elf_warrior @William O'Connor
+22 g_1_1_insect_flying_deathtouch @Martina Pilcerova
+23 g_1_1_saproling @Joseph Meehan
+24 c_1_1_a_thopter_flying @Richard Wright
+25 c_a_treasure_sac @Alayna Danner
diff --git a/forge-gui/res/editions/Streets of New Capenna Commander.txt b/forge-gui/res/editions/Streets of New Capenna Commander.txt
index 89ffec428a2..b230dd5bc42 100644
--- a/forge-gui/res/editions/Streets of New Capenna Commander.txt	
+++ b/forge-gui/res/editions/Streets of New Capenna Commander.txt	
@@ -455,37 +455,37 @@ ScryfallCode=NCC
 447 R Windbrisk Heights @Omar Rayyan
 
 [tokens]
-b_2_2_zombie
-b_x_x_demon_flying
-c_0_1_eldrazi_spawn_sac
-c_10_10_eldrazi
-c_1_1_a_thopter_flying
-c_a_clue_draw
-c_a_food_sac
-g_0_1_plant
-g_1_1_elf_warrior
-g_1_1_insect
-g_1_1_ooze
-g_1_1_saproling
-g_1_2_spider_reach
-g_2_2_ooze_mitotic
-g_3_3_beast
-g_3_3_elephant
-g_5_5_wurm
-g_x_x_treefolk
-lightning_rager
-r_0_1_elemental_rekindling_phoenix
-r_1_1_devil_burn
-r_3_3_ogre
-rw_1_1_soldier_haste
-u_1_1_faerie_flying
-u_1_1_squid_islandwalk
-u_1_1_tentacle
-u_2_2_drake_flying
-ur_5_5_elemental_flying
-w_0_1_goat
-w_1_1_human
-w_1_1_human_soldier
-w_1_1_soldier_lifelink
-w_2_2_cat_beast
-w_4_4_elemental_flying
+0 rw_1_1_soldier_haste @Unknown
+1 c_10_10_eldrazi @Jack Wang
+2 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+4 w_2_2_cat_beast @Bayard Wu
+5 w_4_4_elemental_flying @Svetlin Velinov
+6 w_0_1_goat @John Thacker
+7 w_1_1_human @Ben Maier
+8 w_1_1_human_soldier @Eric Deschamps
+9 w_1_1_soldier_lifelink @John Severin Brassell
+10 u_2_2_drake_flying @Svetlin Velinov
+11 u_1_1_faerie_flying @Irina Nordsol
+12 u_1_1_squid_islandwalk @Jack Wang
+13 u_1_1_tentacle @Dan Murayama Scott
+15 b_x_x_demon_flying @Evan Shipard
+16 b_2_2_zombie @Paul Scott Canavan
+17 r_1_1_devil_burn @Kev Walker
+18 r_0_1_elemental_rekindling_phoenix @Jason Rainville
+19 lightning_rager @Svetlin Velinov
+20 r_3_3_ogre @Paul Bonner
+21 g_3_3_beast @Jesper Ejsing
+22 g_3_3_elephant @Lars Grant-West
+23 g_1_1_elf_warrior @William O'Connor
+24 g_1_1_insect @Jakub Kasper
+25 g_1_1_ooze @Raymond Swanland
+26 g_2_2_ooze_mitotic @Raymond Swanland
+27 g_0_1_plant @Daren Bader
+28 g_1_1_saproling @Joseph Meehan
+29 g_1_2_spider_reach @Sam Rowan
+30 g_x_x_treefolk @Filip Burburan
+31 g_5_5_wurm @Slawomir Maniak
+32 ur_5_5_elemental_flying @Randy Gallegos
+34 c_a_clue_draw @Randy Vargas
+35 c_a_food_sac @Steve Prescott
+36 c_1_1_a_thopter_flying @Richard Wright
diff --git a/forge-gui/res/editions/Streets of New Capenna.txt b/forge-gui/res/editions/Streets of New Capenna.txt
index ffcb6a1de32..a305d7200d2 100644
--- a/forge-gui/res/editions/Streets of New Capenna.txt	
+++ b/forge-gui/res/editions/Streets of New Capenna.txt	
@@ -564,19 +564,19 @@ A242 C A-Paragon of Modernity @Volkan Baǵa
 1 Forest|SNC|4
 
 [tokens]
-b_2_2_rogue
-b_4_3_ogre_warrior
-c_a_treasure_sac
-c_a_treasure_sac
-c_a_treasure_sac
-c_a_treasure_sac
-c_a_treasure_sac
-g_2_2_cat_haste
-g_3_1_dog_vigilance
-g_4_4_rhino_warrior
-gw_1_1_citizen
-r_1_1_devil_burn
-u_1_1_fish_unblockable
-u_1_1_wizard_countersac
-w_2_2_spirit_flying
-w_3_3_angel_flying
+0 gw_1_1_citizen @Unknown
+2 w_3_3_angel_flying @Julia Metzger
+3 w_2_2_spirit_flying @Miranda Meeks
+4 u_1_1_fish_unblockable @Stella Spente
+5 u_1_1_wizard_countersac @Denys Tsiperko
+6 b_4_3_ogre_warrior @Dallas Williams
+7 b_2_2_rogue @Maria Poliakova
+8 r_1_1_devil_burn @Mike Jordana
+9 g_2_2_cat_haste @David Gaillet
+10 g_3_1_dog_vigilance @David Gaillet
+11 g_4_4_rhino_warrior @Zoltan Boros
+13 c_a_treasure_sac @Nadia Hurianova
+14 c_a_treasure_sac @Nadia Hurianova
+15 c_a_treasure_sac @Nadia Hurianova
+16 c_a_treasure_sac @Nadia Hurianova
+17 c_a_treasure_sac @Nadia Hurianova
diff --git a/forge-gui/res/editions/Strixhaven School of Mages.txt b/forge-gui/res/editions/Strixhaven School of Mages.txt
index 28bed1c04cb..54f7ab1bbe0 100644
--- a/forge-gui/res/editions/Strixhaven School of Mages.txt	
+++ b/forge-gui/res/editions/Strixhaven School of Mages.txt	
@@ -443,10 +443,10 @@ A258 U A-Spell Satchel @YW Tang
 2 Spirit Summoning
 
 [tokens]
-bg_1_1_pest_lifegain
-br_3_6_avatar_haste_bolt
-c_a_treasure_sac
-gu_0_0_fractal
-rw_3_2_spirit
-ur_4_4_elemental
-wb_2_1_inkling_flying
+0 gu_0_0_fractal @Unknown
+0 rw_3_2_spirit @Unknown
+1 br_3_6_avatar_haste_bolt @Bryan Sola
+2 ur_4_4_elemental @Alayna Danner
+4 wb_2_1_inkling_flying @Scott Murphy
+5 bg_1_1_pest_lifegain @Ilse Gort
+7 c_a_treasure_sac @Andrew Mar
diff --git a/forge-gui/res/editions/Tarkir Dragonstorm Commander.txt b/forge-gui/res/editions/Tarkir Dragonstorm Commander.txt
index c176bae2501..15802fd1a2c 100644
--- a/forge-gui/res/editions/Tarkir Dragonstorm Commander.txt	
+++ b/forge-gui/res/editions/Tarkir Dragonstorm Commander.txt	
@@ -421,38 +421,37 @@ ScryfallCode=TDC
 413 R Yavimaya Coast @Jesper Ejsing
 
 [tokens]
-b_1_1_rat
-b_1_1_snake_deathtouch
-c_10_10_eldrazi
-c_1_1_a_myr
-c_1_1_a_servo
-c_1_1_a_soldier
-c_1_1_a_thopter_flying
-c_a_gold_sac
-first_mate_ragavan
-g_0_1_plant
-g_1_1_insect
-g_1_1_insect_flying_deathtouch
-g_1_2_spider_reach
-g_3_3_beast
-g_3_3_frog_lizard
-gw_1_1_citizen
-karox_bladewing
-r_0_2_dragon_egg_defender_hatches_dragon
-r_1_1_elemental
-r_1_1_elemental_haste
-r_2_2_dragon_flying_firebreathing
-r_5_5_dragon_flying
-r_x_x_dragon_illusion_flying_haste
-u_4_3_salamander_warrior
-ur_4_4_elemental
-w_0_1_goat
-w_1_1_dog
-w_1_1_human
-w_1_1_spirit_flying
-w_1_3_wall_defender
-w_4_4_angel_flying_vigilance
-wb_2_1_inkling_flying
-
-[other]
-eternalize_timeless_witness
+0 gw_1_1_citizen @Unknown
+0 [other] @Unknown
+0 eternalize_timeless_witness @Unknown
+1 c_10_10_eldrazi @Jack Wang
+2 w_4_4_angel_flying_vigilance @Grzegorz Rutkowski
+3 w_1_1_dog @Manuel Castañón
+4 w_0_1_goat @Adam Paquette
+5 w_1_1_human @Ben Maier
+6 w_1_1_spirit_flying @Jason A. Engle
+7 w_1_3_wall_defender @Gaboleps
+8 u_4_3_salamander_warrior @J.P. Targete
+9 b_1_1_rat @Mike Bierek
+10 b_1_1_snake_deathtouch @Caroline Gariba
+12 r_0_2_dragon_egg_defender_hatches_dragon @Jehan Choo
+13 r_2_2_dragon_flying_firebreathing @Lars Grant-West
+14 r_5_5_dragon_flying @Raymond Swanland
+15 r_x_x_dragon_illusion_flying_haste @Andrew Mar
+17 r_1_1_elemental @Cyril Van Der Haegen
+18 first_mate_ragavan @Maxime Minard
+19 karox_bladewing @XiaoDi Jin
+20 g_3_3_beast @John Donahue
+21 g_3_3_frog_lizard @Jack Wang
+22 r_1_1_elemental_haste @Cyril Van Der Haegen
+23 g_1_1_insect @
+24 g_0_1_plant @Daren Bader
+25 g_1_1_insect_flying_deathtouch @
+26 g_1_2_spider_reach @
+27 ur_4_4_elemental @Alayna Danner
+28 wb_2_1_inkling_flying @
+29 c_a_gold_sac @Yeong-Hao Han
+30 c_1_1_a_myr @Ryan Pancoast
+31 c_1_1_a_servo @Victor Adame Minguez
+32 c_1_1_a_soldier @Kev Walker
+33 c_1_1_a_thopter_flying @Svetlin Velinov
diff --git a/forge-gui/res/editions/Tarkir Dragonstorm.txt b/forge-gui/res/editions/Tarkir Dragonstorm.txt
index 77143ca4067..904df0d197b 100644
--- a/forge-gui/res/editions/Tarkir Dragonstorm.txt	
+++ b/forge-gui/res/editions/Tarkir Dragonstorm.txt	
@@ -515,18 +515,18 @@ Replace=.012F Mythic:fromSheet("TDM cards")
 1 Eerie Ultimatum|SPG
 
 [tokens]
-2 w_1_1_bird_flying @Camille Alquier
-3 w_1_1_monk_prowess @Elizabeth Peiró
-4 w_1_1_soldier @Eelis Kyttanen
-5 w_2_2_soldier @Nathaniel Himawan
-6 w_1_1_spirit @Julie Dillon
-7 w_2_2_spirit @Josiah "Jo" Cameron
-8 w_3_3_spirit @Elizabeth Peiró
-9 w_x_x_spirit @Zara Alfonso
-10 b_2_2_zombie_druid @Andrea Piparo
-11 r_4_4_dragon_flying @Lars Grant-West
-12 r_1_1_goblin @Paolo Parente
-13 r_1_1_warrior @Forrest Imel
-14 g_5_5_elephant @Deruchenko Alexander
-15 reliquary_dragon @Andrew Mar
-16 c_a_treasure_sac @Gaboleps
+0 2 w_1_1_bird_flying @Camille Alquier @Unknown
+0 3 w_1_1_monk_prowess @Elizabeth Peiró @Unknown
+0 4 w_1_1_soldier @Eelis Kyttanen @Unknown
+0 5 w_2_2_soldier @Nathaniel Himawan @Unknown
+0 6 w_1_1_spirit @Julie Dillon @Unknown
+0 7 w_2_2_spirit @Josiah "Jo" Cameron @Unknown
+0 8 w_3_3_spirit @Elizabeth Peiró @Unknown
+0 9 w_x_x_spirit @Zara Alfonso @Unknown
+0 10 b_2_2_zombie_druid @Andrea Piparo @Unknown
+0 11 r_4_4_dragon_flying @Lars Grant-West @Unknown
+0 12 r_1_1_goblin @Paolo Parente @Unknown
+0 13 r_1_1_warrior @Forrest Imel @Unknown
+0 14 g_5_5_elephant @Deruchenko Alexander @Unknown
+0 15 reliquary_dragon @Andrew Mar @Unknown
+0 16 c_a_treasure_sac @Gaboleps @Unknown
diff --git a/forge-gui/res/editions/Tenth Edition.txt b/forge-gui/res/editions/Tenth Edition.txt
index 8591acaac35..60478f1bcf0 100644
--- a/forge-gui/res/editions/Tenth Edition.txt	
+++ b/forge-gui/res/editions/Tenth Edition.txt	
@@ -397,9 +397,9 @@ ScryfallCode=10E
 383 L Forest @Stephan Martiniere
 
 [tokens]
-wasp
-w_1_1_soldier
-b_2_2_zombie
-r_5_5_dragon_flying
-r_1_1_goblin
-g_1_1_saproling
+1 w_1_1_soldier @Paolo Parente
+2 b_2_2_zombie @Carl Critchlow
+3 r_5_5_dragon_flying @Jim Pavelec
+4 r_1_1_goblin @Dave Kendall
+5 g_1_1_saproling @Cyril Van Der Haegen
+6 wasp @Ron Spencer
diff --git a/forge-gui/res/editions/The Big Score.txt b/forge-gui/res/editions/The Big Score.txt
index ebe60453f6a..7c2df29f8b0 100644
--- a/forge-gui/res/editions/The Big Score.txt	
+++ b/forge-gui/res/editions/The Big Score.txt	
@@ -107,10 +107,10 @@ ScryfallCode=BIG
 95 M Tarnation Vista @Alayna Danner
 
 [tokens]
-b_2_1_bat_flying
-c_0_0_a_construct_total_artifacts
-c_1_1_a_gnome
-c_3_3_a_golem
-c_a_blood_draw
-c_a_food_sac
-c_a_map_sac_explore
+1 b_2_1_bat_flying @Inkognit
+2 c_a_blood_draw @Mark Poole
+3 c_0_0_a_construct_total_artifacts @Matteo Bassini
+4 c_a_food_sac @Patrik Hell
+5 c_1_1_a_gnome @Villarrte
+6 c_3_3_a_golem @Brian Valeza
+7 c_a_map_sac_explore @Camille Alquier
diff --git a/forge-gui/res/editions/The Brothers War Commander.txt b/forge-gui/res/editions/The Brothers War Commander.txt
index e8dab263067..e67e50360e1 100644
--- a/forge-gui/res/editions/The Brothers War Commander.txt	
+++ b/forge-gui/res/editions/The Brothers War Commander.txt	
@@ -217,15 +217,15 @@ ScryfallCode=BRC
 211 C Vault of Whispers @Alexander Forssberg
 
 [tokens]
-c_10_10_eldrazi
-c_1_1_a_construct
-c_1_1_a_myr
-c_1_1_a_servo
-c_x_x_a_phyrexian_horror
-g_5_3_elemental
-scrap
-u_1_1_a_thopter_flying
-u_1_1_faerie_flying
-u_2_1_a_phyrexian_myr
-w_0_1_goat
-wb_2_1_inkling_flying
+2 c_10_10_eldrazi @Jack Wang
+3 w_0_1_goat @Forrest Imel
+4 u_1_1_faerie_flying @Irina Nordsol
+5 u_2_1_a_phyrexian_myr @Daarken
+6 u_1_1_a_thopter_flying @Andrew Murray
+7 wb_2_1_inkling_flying @Scott Murphy
+8 c_1_1_a_construct @Jakub Kasper
+10 c_1_1_a_myr @Ryan Pancoast
+11 c_x_x_a_phyrexian_horror @Scott Chou
+12 scrap @Drew Tucker
+13 c_1_1_a_servo @Igor Kieryluk
+14 g_5_3_elemental @Nils Hamm
diff --git a/forge-gui/res/editions/The Brothers War.txt b/forge-gui/res/editions/The Brothers War.txt
index 4a565b0f3af..d719712bd0d 100644
--- a/forge-gui/res/editions/The Brothers War.txt	
+++ b/forge-gui/res/editions/The Brothers War.txt	
@@ -443,14 +443,14 @@ A289 R A-Geology Enthusiast @Fajareka Setiawan
 1 Forest|BRO|4
 
 [tokens]
-c_0_0_a_construct_total_artifacts
-c_1_1_a_soldier
-c_1_1_a_soldier
-c_1_1_a_thopter_flying
-c_2_2_a_construct
-c_3_3_a_zombie
-c_a_powerstone
-c_x_x_a_golem
-g_1_1_forest_dryad
-g_2_2_bear
-u_2_2_spirit_vigilance_drawcounter
+1 u_2_2_spirit_vigilance_drawcounter @Tony Foti
+2 g_2_2_bear @Alexandre Honoré
+3 g_1_1_forest_dryad @Donato Giancola
+4 c_2_2_a_construct @Deruchenko Alexander
+5 c_0_0_a_construct_total_artifacts @Scott Murphy
+6 c_x_x_a_golem @Olivier Bernard
+7 c_a_powerstone @Karl Kopinski
+8 c_1_1_a_soldier @Gabor Szikszai
+8 c_1_1_a_soldier @Gabor Szikszai
+10 c_1_1_a_thopter_flying @Samuel Perin
+11 c_3_3_a_zombie @Kieran Yanner
diff --git a/forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth Commander.txt b/forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth Commander.txt
index 11936a212e3..068ed523491 100644
--- a/forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth Commander.txt	
+++ b/forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth Commander.txt	
@@ -566,17 +566,17 @@ ScryfallCode=LTC
 558 R Minas Morgul, Dark Fortress @Campbell White
 
 [tokens]
-b_3_3_wraith_menace
-br_6_6_dragon_flying_menace_steal
-g_1_1_elf_warrior
-g_1_1_insect_flying_deathtouch
-g_3_3_beast
-g_x_x_treefolk
-r_1_1_goblin
-r_2_2_human_knight_trample_haste
-u_2_2_bird_flying
-w_0_1_goat
-w_1_1_halfling
-w_1_1_human
-w_1_1_soldier_lifelink
-w_3_3_bird_flying_attacks
+1 w_3_3_bird_flying_attacks @Pablo Mendoza
+2 w_0_1_goat @Uriah Voth
+3 w_1_1_halfling @Wangjie Li
+4 w_1_1_human @Tyukina Tatiana
+5 w_1_1_soldier_lifelink @Lixin Yin
+6 u_2_2_bird_flying @Audrey Benjaminsen
+7 b_3_3_wraith_menace @Wonchun Choi
+8 r_1_1_goblin @Zoltan Boros
+9 r_2_2_human_knight_trample_haste @Inka Schulz
+10 g_3_3_beast @Warren Mahy
+11 g_1_1_elf_warrior @Daniel Correia
+12 g_1_1_insect_flying_deathtouch @Oleg Bulakh
+13 g_x_x_treefolk @Audrey Benjaminsen
+14 br_6_6_dragon_flying_menace_steal @Crystal Sully
diff --git a/forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth.txt b/forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth.txt
index e7906598cb8..b324208d91a 100644
--- a/forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth.txt	
+++ b/forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth.txt	
@@ -866,15 +866,15 @@ A103 R A-Orcish Bowmasters @Maxim Kostin
 A246 M A-The One Ring @Veli Nyström
 
 [tokens]
-b_0_0_orc_army
-b_0_0_orc_army
-ballistic_boulder
-c_a_food_sac
-c_a_food_sac
-c_a_food_sac
-c_a_treasure_sac
-smaug
-u_1_1_tentacle
-w_1_1_human_soldier
-w_1_1_human_soldier
-w_1_1_spirit_flying
+1 w_1_1_human_soldier @Anastasia Balakchina
+1 w_1_1_human_soldier @Anastasia Balakchina
+3 w_1_1_spirit_flying @Nino Is
+4 u_1_1_tentacle @Chris Cold
+5 b_0_0_orc_army @Veli Nyström
+5 b_0_0_orc_army @Veli Nyström
+7 smaug @Jarel Threat
+8 ballistic_boulder @Alexander Forssberg
+9 c_a_food_sac @Randy Gallegos
+10 c_a_food_sac @Randy Gallegos
+11 c_a_food_sac @Randy Gallegos
+12 c_a_treasure_sac @Valera Lutfullina
diff --git a/forge-gui/res/editions/The Lost Caverns of Ixalan Commander.txt b/forge-gui/res/editions/The Lost Caverns of Ixalan Commander.txt
index 827cbfd362b..aee1cc336ec 100644
--- a/forge-gui/res/editions/The Lost Caverns of Ixalan Commander.txt	
+++ b/forge-gui/res/editions/The Lost Caverns of Ixalan Commander.txt	
@@ -378,18 +378,18 @@ ScryfallCode=LCC
 370 R Windbrisk Heights @Omar Rayyan
 
 [tokens]
-b_1_1_vampire_lifelink
-b_2_2_pirate_menace
-c_3_2_shapeshifter_changeling
-c_a_blood_draw
-g_2_2_boar
-g_3_3_beast
-g_3_3_dinosaur_trample
-g_3_3_elephant
-g_3_3_frog_lizard
-g_x_x_dinosaur_beast_trample
-ragavan
-u_1_1_bird_flying
-u_1_1_merfolk
-u_4_3_salamander_warrior
-wb_1_1_vampire_lifelink
+1 c_3_2_shapeshifter_changeling @Ryan Valle
+2 u_1_1_bird_flying @Jason A. Engle
+3 u_1_1_merfolk @PINDURSKI
+4 u_4_3_salamander_warrior @J.P. Targete
+5 b_2_2_pirate_menace @Matt Stewart
+6 b_1_1_vampire_lifelink @Lake Hurwitz
+7 ragavan @Daniel Ljunggren
+8 g_3_3_beast @Jesper Ejsing
+9 g_2_2_boar @James Ryman
+10 g_3_3_dinosaur_trample @Kitt Lapeña
+11 g_x_x_dinosaur_beast_trample @Svetlin Velinov
+12 g_3_3_elephant @Lars Grant-West
+13 g_3_3_frog_lizard @Jack Wang
+14 wb_1_1_vampire_lifelink @Zoltan Boros
+15 c_a_blood_draw @Miranda Meeks
diff --git a/forge-gui/res/editions/The Lost Caverns of Ixalan.txt b/forge-gui/res/editions/The Lost Caverns of Ixalan.txt
index 8827b2d259b..55031c6a9fd 100644
--- a/forge-gui/res/editions/The Lost Caverns of Ixalan.txt	
+++ b/forge-gui/res/editions/The Lost Caverns of Ixalan.txt	
@@ -473,20 +473,20 @@ A150 U A-Geological Appraiser @Alix Branwyn
 5 Promising Vein|LCI
 
 [tokens]
-b_1_1_bat_flying
-b_1_1_fungus_noblock
-b_2_2_skeleton_pirate
-c_1_1_a_gnome
-c_a_map_sac_explore
-c_a_treasure_sac
-g_0_1_dinosaur_egg
-g_3_3_dinosaur
-g_x_x_fungus_dinosaur
-r_3_1_dinosaur
-rw_3_2_spirit
-u_1_1_merfolk_hexproof
-w_1_1_vampire_lifelink
-w_4_4_angel_flying_vigilance
-w_x_x_a_gnome_soldier_total_artifacts_creatures
-wb_4_3_vampire_demon_flying
-wu_4_4_a_golem
+0 rw_3_2_spirit @Unknown
+2 w_4_4_angel_flying_vigilance @Zoltan Boros
+3 w_x_x_a_gnome_soldier_total_artifacts_creatures @Steve Ellis
+4 w_1_1_vampire_lifelink @Bruno Biazotto
+5 u_1_1_merfolk_hexproof @Julio Reyna
+6 b_1_1_bat_flying @Steven Russell Black
+7 b_1_1_fungus_noblock @Domenico Cava
+8 b_2_2_skeleton_pirate @Izzy
+9 r_3_1_dinosaur @Francisco Miyara
+10 g_3_3_dinosaur @Loïc Canavaggia
+11 g_0_1_dinosaur_egg @Muhammad Firdaus
+12 g_x_x_fungus_dinosaur @Dave Kendall
+13 wu_4_4_a_golem @Racrufi
+15 wb_4_3_vampire_demon_flying @Nino Vecia
+16 c_1_1_a_gnome @Racrufi
+17 c_a_map_sac_explore @Francesca Baerald
+18 c_a_treasure_sac @Wero Gallo
diff --git a/forge-gui/res/editions/Theros Beyond Death.txt b/forge-gui/res/editions/Theros Beyond Death.txt
index 80ec6cf49ef..a40807aec02 100644
--- a/forge-gui/res/editions/Theros Beyond Death.txt	
+++ b/forge-gui/res/editions/Theros Beyond Death.txt	
@@ -652,17 +652,17 @@ Unknown Shores|THB|1
 3 Uro, Titan of Nature's Wrath|THB|1
 
 [tokens]
-b_2_2_zombie
-c_0_4_a_wall_defender
-c_a_gold_sac
-g_1_2_spider_reach
-g_2_2_wolf
-r_1_1_satyr_noblock
-r_x_1_elemental_trample_haste
-u_1_1_tentacle
-u_3_2_reflection
-u_8_8_kraken_hexproof
-ub_2_3_nightmare_mill
-w_0_1_goat
-w_1_1_human_soldier
-w_2_2_pegasus_flying
+1 w_0_1_goat @John Thacker
+2 w_1_1_human_soldier @Kimonas Theodossiou
+3 w_2_2_pegasus_flying @Lars Grant-West
+4 u_8_8_kraken_hexproof @Victor Adame Minguez
+5 u_3_2_reflection @Kieran Yanner
+6 u_1_1_tentacle @Dan Murayama Scott
+7 b_2_2_zombie @Emrah Elmasli
+8 r_x_1_elemental_trample_haste @Svetlin Velinov
+9 r_1_1_satyr_noblock @Eric Deschamps
+10 g_1_2_spider_reach @Sam Rowan
+11 g_2_2_wolf @Jakub Kasper
+12 ub_2_3_nightmare_mill @Yeong-Hao Han
+13 c_a_gold_sac @Yeong-Hao Han
+14 c_0_4_a_wall_defender @Adam Paquette
diff --git a/forge-gui/res/editions/Theros.txt b/forge-gui/res/editions/Theros.txt
index 93ee35de0d8..e47f0eb9ee2 100644
--- a/forge-gui/res/editions/Theros.txt
+++ b/forge-gui/res/editions/Theros.txt
@@ -261,14 +261,14 @@ ScryfallCode=THS
 249 L Forest @Raoul Vitale
 
 [tokens]
-w_2_1_e_cleric
-w_1_1_soldier
-w_1_1_soldier
-w_1_1_soldier
-u_2_2_bird_flying
-u_1_0_elemental
-b_1_1_harpy_flying
-r_1_1_soldier_haste
-g_2_2_boar
-rg_2_2_satyr_haste
-c_3_3_e_a_golem
+0 c_3_3_e_a_golem @Unknown
+1 w_2_1_e_cleric @Johann Bodin
+2 w_1_1_soldier @Seb McKinnon
+2 w_1_1_soldier @Seb McKinnon
+2 w_1_1_soldier @Seb McKinnon
+4 u_2_2_bird_flying @Peter Mohrbacher
+5 u_1_0_elemental @Karl Kopinski
+6 b_1_1_harpy_flying @Nils Hamm
+7 r_1_1_soldier_haste @Johann Bodin
+8 g_2_2_boar @James Ryman
+9 rg_2_2_satyr_haste @Johann Bodin
diff --git a/forge-gui/res/editions/Throne of Eldraine.txt b/forge-gui/res/editions/Throne of Eldraine.txt
index 6e0ae90edee..f0bd7489079 100644
--- a/forge-gui/res/editions/Throne of Eldraine.txt	
+++ b/forge-gui/res/editions/Throne of Eldraine.txt	
@@ -428,21 +428,21 @@ A81 U A-Cauldron Familiar @Milivoj Ćeran
 A125 R A-Fires of Invention @Stanton Feng
 
 [tokens]
-w_0_1_goat
-w_1_1_human
-w_2_2_knight_vigilance
-w_1_1_mouse
-u_1_1_faerie_flying
-b_1_1_rat
-r_1_1_dwarf
-g_2_2_bear
-g_1_1_boar_food
-g_7_7_giant
-rw_2_1_human_cleric_lifelink_haste
-rw_1_2_human_rogue_haste_damage
-rw_3_1_human_warrior_trample_haste
-bg_2_2_wolf_garruk
-c_a_food_sac
-c_a_food_sac
-c_a_food_sac
-c_a_food_sac
+0 rw_2_1_human_cleric_lifelink_haste @Unknown
+0 rw_1_2_human_rogue_haste_damage @Unknown
+0 rw_3_1_human_warrior_trample_haste @Unknown
+1 w_0_1_goat @Forrest Imel
+2 w_1_1_human @Ben Maier
+3 w_2_2_knight_vigilance @Dan Murayama Scott
+4 w_1_1_mouse @Stacie Pitt
+5 u_1_1_faerie_flying @Irina Nordsol
+6 b_1_1_rat @Mike Bierek
+7 r_1_1_dwarf @Kari Christensen
+8 g_2_2_bear @Forrest Imel
+9 g_1_1_boar_food @Stacie Pitt
+10 g_7_7_giant @YW Tang
+14 bg_2_2_wolf_garruk @David Gaillet
+15 c_a_food_sac @Steven Belledin
+16 c_a_food_sac @Steven Belledin
+17 c_a_food_sac @Steven Belledin
+18 c_a_food_sac @Steven Belledin
diff --git a/forge-gui/res/editions/Time Spiral Remastered.txt b/forge-gui/res/editions/Time Spiral Remastered.txt
index 4c13f0b3785..d9ac8a33e32 100644
--- a/forge-gui/res/editions/Time Spiral Remastered.txt	
+++ b/forge-gui/res/editions/Time Spiral Remastered.txt	
@@ -425,18 +425,18 @@ ScryfallCode=TSR
 411 R Lotus Bloom @Christopher Rush
 
 [tokens]
-w_2_2_griffin_flying
-w_1_1_soldier
-cloud_sprite
-b_1_2_bat_flying_nosferatu
-b_2_2_knight_flanking_pro_white_haste
-b_2_4_spider_reach
-r_4_4_giant
-r_1_1_goblin
-kobolds_of_kher_keep
-g_3_3_ape
-g_6_1_insect_shroud
-llanowar_elves
-g_1_1_saproling
-c_2_2_a_assembly_worker
-metallic_sliver
+0 c_2_2_a_assembly_worker @Unknown
+1 w_2_2_griffin_flying @Jim Nelson
+2 w_1_1_soldier @Alex Horley-Orlandelli
+3 cloud_sprite @Mark Zug
+4 b_1_2_bat_flying_nosferatu @Mark Poole
+5 b_2_2_knight_flanking_pro_white_haste @William O'Connor
+6 b_2_4_spider_reach @Lars Grant-West
+7 r_4_4_giant @Raymond Swanland
+8 r_1_1_goblin @Thomas M. Baxa
+9 kobolds_of_kher_keep @Paolo Parente
+10 g_3_3_ape @Lars Grant-West
+11 g_6_1_insect_shroud @E. M. Gist
+12 llanowar_elves @Paolo Parente
+13 g_1_1_saproling @Warren Mahy
+15 metallic_sliver @Carl Critchlow
diff --git a/forge-gui/res/editions/Transformers.txt b/forge-gui/res/editions/Transformers.txt
index fd193363e77..0bb316d6749 100644
--- a/forge-gui/res/editions/Transformers.txt
+++ b/forge-gui/res/editions/Transformers.txt
@@ -37,5 +37,5 @@ ScryfallCode=BOT
 29 M Ultra Magnus, Tactician @Volta Creation
 
 [tokens]
-laserbeak
-ravage
+1 laserbeak @Volta Creation
+2 ravage @Volta Creation
diff --git a/forge-gui/res/editions/Ultimate Masters.txt b/forge-gui/res/editions/Ultimate Masters.txt
index bb626e62a8d..a320b944315 100644
--- a/forge-gui/res/editions/Ultimate Masters.txt	
+++ b/forge-gui/res/editions/Ultimate Masters.txt	
@@ -268,19 +268,19 @@ ScryfallCode=UMA
 254 R Urborg, Tomb of Yawgmoth @Jung Park
 
 [tokens]
-marit_lage
-spark_elemental
-w_1_1_citizen
-w_1_1_spirit_flying
-u_2_2_drake_flying
-u_2_2_homunculus
-b_1_1_faerie_rogue_flying
-b_6_6_wurm_trample
-b_2_2_zombie
-r_1_1_elemental
-r_1_1_elemental
-r_1_1_soldier_haste
-g_4_4_elemental
-g_x_x_ooze
-g_1_2_spider_reach
-wb_1_1_spirit_flying
+1 w_1_1_citizen @Michael Phillippi
+2 w_1_1_spirit_flying @Jeff Simpson
+3 u_2_2_drake_flying @Svetlin Velinov
+4 u_2_2_homunculus @Johann Bodin
+5 b_1_1_faerie_rogue_flying @Dave Allsop
+6 marit_lage @Stephan Martiniere
+7 b_6_6_wurm_trample @Daarken
+8 b_2_2_zombie @Anna Steinbauer
+9 r_1_1_elemental @Jaime Jones
+9 r_1_1_elemental @Jaime Jones
+11 r_1_1_soldier_haste @Johann Bodin
+12 spark_elemental @John Avon
+13 g_4_4_elemental @Brandon Kitkouski
+14 g_x_x_ooze @Marco Nelor
+15 g_1_2_spider_reach @Daniel Ljunggren
+16 wb_1_1_spirit_flying @Cliff Childs
diff --git a/forge-gui/res/editions/Unfinity.txt b/forge-gui/res/editions/Unfinity.txt
index 45b121f4135..1f4463053d8 100644
--- a/forge-gui/res/editions/Unfinity.txt
+++ b/forge-gui/res/editions/Unfinity.txt
@@ -648,13 +648,13 @@ F538 R Water Gun Balloon Game @Ralph Horsley
 537 R Breeding Pool @Bruce Brenneise
 
 [tokens]
-b_2_2_zombie_employee
-c_a_food_sac
-c_a_food_sac
-c_a_treasure_sac
-c_a_treasure_sac
-g_1_1_squirrel
-r_1_1_balloon_flying
-storm_crow
-w_1_1_a_clown_robot
-w_1_1_a_clown_robot
+2 w_1_1_a_clown_robot @Ralph Horsley
+2 w_1_1_a_clown_robot @Ralph Horsley
+5 storm_crow @Greg Staples
+6 b_2_2_zombie_employee @Sebastian Giacobino
+7 r_1_1_balloon_flying @Greg Bobrowski
+8 g_1_1_squirrel @Dave Greco
+10 c_a_food_sac @Matt Gaser
+11 c_a_food_sac @Matt Gaser
+12 c_a_treasure_sac @Ben Maier
+13 c_a_treasure_sac @Ben Maier
diff --git a/forge-gui/res/editions/Unglued.txt b/forge-gui/res/editions/Unglued.txt
index 440f8535341..d31c3012cff 100644
--- a/forge-gui/res/editions/Unglued.txt
+++ b/forge-gui/res/editions/Unglued.txt
@@ -100,11 +100,11 @@ ScryfallCode=UGL
 88 L Forest @Terese Nielsen
 
 [tokens]
-rabid_sheep
-w_1_1_pegasus_flying
-w_1_1_soldier
-b_2_2_zombie
-r_1_1_goblin
-r_4_4_giant_chicken
-g_0_1_sheep
-g_1_1_squirrel
+0 rabid_sheep @Unknown
+0 r_4_4_giant_chicken @Unknown
+0 g_0_1_sheep @Unknown
+1 w_1_1_pegasus_flying @Mark Zug
+2 w_1_1_soldier @Daren Bader
+3 b_2_2_zombie @Christopher Rush
+4 r_1_1_goblin @Pete Venters
+6 g_1_1_squirrel @Ron Spencer
diff --git a/forge-gui/res/editions/Unsanctioned.txt b/forge-gui/res/editions/Unsanctioned.txt
index 4d50faabb76..6fdf84b1cb4 100644
--- a/forge-gui/res/editions/Unsanctioned.txt
+++ b/forge-gui/res/editions/Unsanctioned.txt
@@ -106,6 +106,6 @@ ScryfallCode=UND
 96 L Forest @Adam Paquette
 
 [tokens]
-u_1_1_beeble
-r_1_1_goblin
-g_1_1_squirrel
+1 u_1_1_beeble @Jeff Miracola
+2 r_1_1_goblin @Dave Allsop
+3 g_1_1_squirrel @Daniel Ljunggren
diff --git a/forge-gui/res/editions/Unstable.txt b/forge-gui/res/editions/Unstable.txt
index 701fd25187e..cf3e92ffe18 100644
--- a/forge-gui/res/editions/Unstable.txt
+++ b/forge-gui/res/editions/Unstable.txt
@@ -277,40 +277,40 @@ ScryfallCode=UST
 216 L Forest @John Avon
 
 [tokens]
-storm_crow
-c_4_4_dragon_flying
-w_2_2_cat
-w_0_1_goat
-w_1_1_spirit_flying
-w_1_1_spirit_flying
-w_4_4_angel_flying
-w_4_4_angel_flying
-w_1_1_soldier
-u_1_1_faerie_spy_flying_haste_draw
-u_8_8_octopus
-u_1_1_a_thopter_flying
-u_1_1_a_thopter_flying
-b_1_1_assassin_lose_con
-b_3_3_beast_deathtouch
-b_5_5_demon_flying
-b_2_2_rogue_menace
-b_2_2_vampire_flying
-b_2_2_vampire_flying
-b_2_2_zombie
-b_2_2_zombie
-r_1_1_brainiac
-r_1_1_elemental
-r_1_1_elemental
-r_1_1_goblin
-g_3_3_beast
-g_3_3_beast
-g_1_1_saproling
-g_1_1_saproling
-g_1_1_squirrel
-g_6_6_wurm
-gw_x_x_elemental_total_creatures
-gw_x_x_elemental_total_creatures
-c_a_clue_draw
-c_a_clue_draw
-c_x_x_a_construct
-c_1_1_a_gnome
+0 w_2_2_cat @Unknown
+0 w_1_1_spirit_flying @Unknown
+0 w_1_1_spirit_flying @Unknown
+0 w_4_4_angel_flying @Unknown
+0 w_4_4_angel_flying @Unknown
+0 w_1_1_soldier @Unknown
+0 u_8_8_octopus @Unknown
+0 u_1_1_a_thopter_flying @Unknown
+0 u_1_1_a_thopter_flying @Unknown
+0 b_1_1_assassin_lose_con @Unknown
+0 b_3_3_beast_deathtouch @Unknown
+0 b_5_5_demon_flying @Unknown
+0 b_2_2_vampire_flying @Unknown
+0 b_2_2_vampire_flying @Unknown
+0 b_2_2_zombie @Unknown
+0 b_2_2_zombie @Unknown
+0 r_1_1_elemental @Unknown
+0 r_1_1_elemental @Unknown
+0 g_3_3_beast @Unknown
+0 g_3_3_beast @Unknown
+0 g_1_1_saproling @Unknown
+0 g_1_1_saproling @Unknown
+0 g_6_6_wurm @Unknown
+0 gw_x_x_elemental_total_creatures @Unknown
+0 gw_x_x_elemental_total_creatures @Unknown
+0 c_a_clue_draw @Unknown
+0 c_a_clue_draw @Unknown
+2 w_0_1_goat @Carl Critchlow
+4 u_1_1_faerie_spy_flying_haste_draw @Dmitry Burmak
+5 storm_crow @McLean Kendree
+7 b_2_2_rogue_menace @Emrah Elmasli
+10 r_1_1_brainiac @Matt Dixon
+12 r_1_1_goblin @Dave Allsop
+15 g_1_1_squirrel @John Thacker
+16 c_4_4_dragon_flying @Autumn Rain Turkel
+19 c_x_x_a_construct @Matt Gaser
+20 c_1_1_a_gnome @Dmitry Burmak
diff --git a/forge-gui/res/editions/War of the Spark.txt b/forge-gui/res/editions/War of the Spark.txt
index 20a638a938f..a27dc670ccd 100644
--- a/forge-gui/res/editions/War of the Spark.txt	
+++ b/forge-gui/res/editions/War of the Spark.txt	
@@ -335,21 +335,21 @@ ScryfallCode=WAR
 A221 R A-Teferi, Time Raveler @Chris Rallis
 
 [tokens]
-all_2_2_citizen
-b_0_0_zombie_army
-b_0_0_zombie_army
-b_0_0_zombie_army
-b_1_1_assassin_deathtouch_pwdestroy
-b_2_2_zombie
-b_4_4_zombie_warrior_vigilance
-c_1_1_a_servo
-c_2_2_spirit
-g_2_2_wolf
-r_1_1_devil_burn
-r_1_1_goblin
-r_4_4_dragon_flying
-u_2_2_wizard
-voja_friend_to_elves
-w_0_3_wall_defender
-w_2_2_soldier_vigilance
-w_4_4_angel_flying_vigilance
+0 all_2_2_citizen @Unknown
+0 voja_friend_to_elves @Unknown
+1 c_2_2_spirit @Johann Bodin
+2 w_4_4_angel_flying_vigilance @Volkan Baǵa
+3 w_2_2_soldier_vigilance @Johan Grenier
+4 w_0_3_wall_defender @Jason Rainville
+5 u_2_2_wizard @Sara Winters
+6 b_1_1_assassin_deathtouch_pwdestroy @Zezhou Chen
+7 b_2_2_zombie @Simon Dominic
+8 b_0_0_zombie_army @Tomasz Jedruszek
+8 b_0_0_zombie_army @Tomasz Jedruszek
+8 b_0_0_zombie_army @Tomasz Jedruszek
+11 b_4_4_zombie_warrior_vigilance @Mike Bierek
+12 r_1_1_devil_burn @Kev Walker
+13 r_4_4_dragon_flying @Kieran Yanner
+14 r_1_1_goblin @Mark Behm
+15 g_2_2_wolf @Lars Grant-West
+18 c_1_1_a_servo @Victor Adame Minguez
diff --git a/forge-gui/res/editions/Warhammer 40,000 Commander.txt b/forge-gui/res/editions/Warhammer 40,000 Commander.txt
index 38fc0e5038a..67690c0ee0c 100644
--- a/forge-gui/res/editions/Warhammer 40,000 Commander.txt	
+++ b/forge-gui/res/editions/Warhammer 40,000 Commander.txt	
@@ -329,20 +329,20 @@ ScryfallCode=40K
 321 M The Swarmlord @Antonio José Manzanedo
 
 [tokens]
-b_2_2_a_necron_warrior
-b_2_2_astartes_warrior_menace
-blue_horror
-c_1_1_a_insect_flying
-c_4_4_a_robot_noblock
-c_a_clue_draw
-cherubael
-g_1_1_tyranid
-g_3_3_tyranid_warrior_trample
-g_5_5_tyranid
-plaguebearer_of_nurgle
-r_3_3_spawn
-u_1_1_tyranid_gargoyle_flying
-w_1_1_soldier
-w_1_1_soldier
-w_1_1_soldier
-w_2_2_astartes_warrior_vigilance
+1 w_2_2_astartes_warrior_vigilance @Dmitriy Mironov
+2 w_1_1_soldier @Lixin Yin
+2 w_1_1_soldier @Lixin Yin
+2 w_1_1_soldier @Lixin Yin
+9 u_1_1_tyranid_gargoyle_flying @David Astruga
+12 b_2_2_astartes_warrior_menace @Helge C. Balzer
+13 cherubael @Irina Nordsol
+14 b_2_2_a_necron_warrior @Games Workshop
+15 plaguebearer_of_nurgle @Games Workshop
+16 r_3_3_spawn @Oleg Bulakh
+17 g_1_1_tyranid @Slawomir Maniak
+18 g_5_5_tyranid @Antonio José Manzanedo
+19 g_3_3_tyranid_warrior_trample @Sergio Cosmai
+20 blue_horror @Andrey Nyarl
+21 c_a_clue_draw @Mirko Failoni
+22 c_1_1_a_insect_flying @Bartek Fedyczak
+23 c_4_4_a_robot_noblock @Philip Helliwell
diff --git a/forge-gui/res/editions/Wilds of Eldraine Commander.txt b/forge-gui/res/editions/Wilds of Eldraine Commander.txt
index ccf4e992214..88bd63f0cbc 100644
--- a/forge-gui/res/editions/Wilds of Eldraine Commander.txt	
+++ b/forge-gui/res/editions/Wilds of Eldraine Commander.txt	
@@ -181,22 +181,22 @@ ScryfallCode=WOC
 173 U Vitu-Ghazi, the City-Tree @Martina Pilcerova
 
 [tokens]
-b_1_1_faerie_rogue_flying
-g_1_1_human_monk_g
-g_1_1_saproling
-g_3_3_elephant
-r_4_2_pirate_noblock
-role_monster
-role_royal
-role_sorcerer
-role_virtuous
-role_virtuous
-role_virtuous
-u_1_1_faerie_flying
-ub_1_1_faerie_rogue_flying
-w_1_1_cat_lifelink
-w_1_1_human_soldier
-w_2_2_pegasus_flying
-w_2_2_cat
-w_2_4_ox
-wb_1_1_spirit_flying
+0 role_monster @Unknown
+0 role_royal @Unknown
+0 role_sorcerer @Unknown
+0 role_virtuous @Unknown
+0 role_virtuous @Unknown
+0 role_virtuous @Unknown
+5 w_2_2_cat @April Prime
+6 w_1_1_cat_lifelink @Filip Burburan
+7 w_1_1_human_soldier @Kimonas Theodossiou
+8 w_2_4_ox @Aaron Miller
+9 w_2_2_pegasus_flying @Lars Grant-West
+10 u_1_1_faerie_flying @Irina Nordsol
+11 b_1_1_faerie_rogue_flying @Dave Allsop
+12 r_4_2_pirate_noblock @Igor Krstic
+13 g_3_3_elephant @Lars Grant-West
+14 g_1_1_human_monk_g @Anastasia Ovchinnikova
+15 g_1_1_saproling @Joseph Meehan
+16 ub_1_1_faerie_rogue_flying @E. M. Gist
+17 wb_1_1_spirit_flying @Josh Hass
diff --git a/forge-gui/res/editions/Wilds of Eldraine.txt b/forge-gui/res/editions/Wilds of Eldraine.txt
index f02428937b3..e25a4f300d8 100644
--- a/forge-gui/res/editions/Wilds of Eldraine.txt	
+++ b/forge-gui/res/editions/Wilds of Eldraine.txt	
@@ -405,23 +405,23 @@ ScryfallCode=WOE
 381 R Expel the Interlopers @Awanqi (Angela Wang)
 
 [tokens]
-b_1_1_nightmare_exile_counter
-b_1_1_rat_noblock
-c_a_food_sac
-c_a_food_sac
-c_a_food_sac
-c_a_food_sac
-c_a_treasure_sac
-g_3_3_beast
-role_cursed
-role_monster
-role_royal
-role_sorcerer
-role_wicked
-role_young_hero
-u_1_1_faerie_flying_blockflying
-w_1_1_bird_flying
-w_1_1_human
-w_1_1_mouse
-w_2_2_knight_vigilance
-wu_4_4_elemental
+0 role_cursed @Unknown
+0 role_monster @Unknown
+0 role_royal @Unknown
+0 role_sorcerer @Unknown
+0 role_wicked @Unknown
+0 role_young_hero @Unknown
+1 w_1_1_bird_flying @Kisung Koh
+2 w_1_1_human @Julia Griffin
+3 w_2_2_knight_vigilance @Dominik Mayer
+4 w_1_1_mouse @Kisung Koh
+5 u_1_1_faerie_flying_blockflying @Alessandra Pisano
+6 b_1_1_nightmare_exile_counter @Raymond Swanland
+7 b_1_1_rat_noblock @Kim Sokol
+8 g_3_3_beast @Vincent Christiaens
+9 wu_4_4_elemental @Camille Alquier
+10 c_a_food_sac @Ovidio Cartagena
+11 c_a_food_sac @Ovidio Cartagena
+12 c_a_food_sac @Ovidio Cartagena
+13 c_a_food_sac @Ovidio Cartagena
+14 c_a_treasure_sac @Zezhou Chen
diff --git a/forge-gui/res/editions/Worldwake.txt b/forge-gui/res/editions/Worldwake.txt
index d82dd5f605d..ae38f8f35cf 100644
--- a/forge-gui/res/editions/Worldwake.txt
+++ b/forge-gui/res/editions/Worldwake.txt
@@ -158,11 +158,11 @@ ScryfallCode=WWK
 145 U Tectonic Edge @Vincent Proce
 
 [tokens]
-w_1_1_soldier_ally
-r_5_5_dragon_flying
-r_3_3_ogre
-g_3_3_elephant
-g_0_1_plant
-g_1_1_snake
-g_2_2_wolf
-c_6_12_a_construct_trample
+0 g_1_1_snake @Unknown
+0 g_2_2_wolf @Unknown
+1 w_1_1_soldier_ally @Kekai Kotaki
+2 r_5_5_dragon_flying @Raymond Swanland
+3 r_3_3_ogre @Paul Bonner
+4 g_3_3_elephant @Lars Grant-West
+5 g_0_1_plant @Daren Bader
+6 c_6_12_a_construct_trample @Jung Park
diff --git a/forge-gui/res/editions/Zendikar Rising Commander.txt b/forge-gui/res/editions/Zendikar Rising Commander.txt
index aafdcace141..6bd0eb45db7 100644
--- a/forge-gui/res/editions/Zendikar Rising Commander.txt	
+++ b/forge-gui/res/editions/Zendikar Rising Commander.txt	
@@ -150,15 +150,15 @@ ScryfallCode=ZNC
 142 C Terramorphic Expanse @Dan Murayama Scott
 
 [tokens]
-w_1_1_bird_flying
-w_1_1_kor_ally
-g_1_1_saproling
-g_2_2_elemental
-g_4_4_beast
-b_0_0_phyrexian_germ
-b_1_1_faerie_rogue_flying
-b_1_1_goblin_rogue
-b_1_1_rat
-rg_5_5_elemental
-c_1_1_a_thopter_flying
-ub_1_1_faerie_rogue_flying
+0 b_0_0_phyrexian_germ @Unknown
+0 ub_1_1_faerie_rogue_flying @Unknown
+1 w_1_1_bird_flying @Howard Lyon
+2 w_1_1_kor_ally @Jeremy Wilson
+3 b_1_1_faerie_rogue_flying @Dave Allsop
+5 b_1_1_goblin_rogue @Dave Kendall
+6 b_1_1_rat @Mike Bierek
+7 g_4_4_beast @Steve Prescott
+8 g_2_2_elemental @Marco Nelor
+9 g_1_1_saproling @Brad Rigney
+10 rg_5_5_elemental @Brad Rigney
+11 c_1_1_a_thopter_flying @Richard Wright
diff --git a/forge-gui/res/editions/Zendikar Rising.txt b/forge-gui/res/editions/Zendikar Rising.txt
index a65ba6ef048..fb8b1728c4b 100644
--- a/forge-gui/res/editions/Zendikar Rising.txt	
+++ b/forge-gui/res/editions/Zendikar Rising.txt	
@@ -476,14 +476,14 @@ A257 U A-Base Camp @Jokubas Uogintas
 6 Zof Consumption|ZNR
 
 [tokens]
-w_4_4_angel_warrior_flying
-w_1_1_cat
-w_2_2_cat_beast
-w_1_1_kor_warrior
-u_2_2_drake_flying
-u_x_x_illusion
-g_1_1_insect
-g_0_1_plant
-bg_x_x_hydra
-c_1_1_a_construct
-c_0_1_a_goblin_construct_noblock_ping
+1 w_4_4_angel_warrior_flying @Zoltan Boros
+2 w_1_1_cat @Ilse Gort
+3 w_2_2_cat_beast @Bayard Wu
+4 w_1_1_kor_warrior @Randy Vargas
+5 u_2_2_drake_flying @Bayard Wu
+6 u_x_x_illusion @Jason A. Engle
+7 g_1_1_insect @Jakub Kasper
+8 g_0_1_plant @Jakub Kasper
+9 bg_x_x_hydra @Filip Burburan
+10 c_1_1_a_construct @Jokubas Uogintas
+11 c_0_1_a_goblin_construct_noblock_ping @Johan Grenier
diff --git a/forge-gui/res/editions/Zendikar.txt b/forge-gui/res/editions/Zendikar.txt
index 4c2868e6702..d8dc5892e01 100644
--- a/forge-gui/res/editions/Zendikar.txt
+++ b/forge-gui/res/editions/Zendikar.txt
@@ -282,14 +282,14 @@ ScryfallCode=ZEN
 249a L Forest @Vincent Proce
 
 [tokens]
-w_4_4_angel_flying
-w_1_1_bird_flying
-w_1_1_kor_soldier
-u_2_2_illusion
-u_1_1_merfolk
-b_x_x_vampire
-b_5_5_zombie_giant
-r_7_1_elemental_trample_haste
-g_4_4_beast
-g_1_1_snake
-g_2_2_wolf
+1 w_4_4_angel_flying @Adi Granov
+2 w_1_1_bird_flying @Howard Lyon
+3 w_1_1_kor_soldier @Daren Bader
+4 u_2_2_illusion @Cyril Van Der Haegen
+5 u_1_1_merfolk @Warren Mahy
+6 b_x_x_vampire @Kekai Kotaki
+7 b_5_5_zombie_giant @Igor Kieryluk
+8 r_7_1_elemental_trample_haste @Anthony Francisco
+9 g_4_4_beast @Steve Prescott
+10 g_1_1_snake @Austin Hsu
+11 g_2_2_wolf @Daren Bader
diff --git a/forge-gui/tools/tokenCollectorScraper.py b/forge-gui/tools/tokenCollectorScraper.py
new file mode 100644
index 00000000000..405059a2b78
--- /dev/null
+++ b/forge-gui/tools/tokenCollectorScraper.py
@@ -0,0 +1,169 @@
+import os
+import requests
+from time import sleep
+
+# Function to parse files and extract relevant data
+def process_files(directory):
+    token_data = []
+
+    skipahead = True
+
+    for filename in os.listdir(directory):
+        filepath = os.path.join(directory, filename)
+        if filename == "Commander 2014.txt":
+            skipahead = False
+
+        if skipahead:
+            continue
+
+        if not os.path.isfile(filepath):
+            continue
+
+        print(filepath)
+
+        scryfall_code = None
+        newlines = []
+        tokens = []
+        with open(filepath, "r", encoding='utf-8') as file:
+            lines = file.readlines()
+            tokens_activated = False
+
+            for line in lines:
+                if not tokens_activated:
+                    newlines.append(line)
+                line = line.strip()
+                if line.startswith("ScryfallCode="):
+                    scryfall_code = line.split("=")[1]
+                elif line.startswith("[tokens]"):
+                    tokens_activated = True
+                    continue
+                elif line and tokens_activated:
+                    tokens.append(line)
+
+        if not scryfall_code:
+            print(f"No ScryfallCode found in {filename}.")
+            continue
+
+        # Call the cross-reference function here if needed
+        if len(tokens) == 0:
+            continue
+
+        tokenCode = "T" + scryfall_code
+        api_data = fetch_scryfall_data(tokenCode)
+        if not api_data:
+            print(f"No data found for {scryfall_code}.")
+            continue
+
+        matches = cross_reference(tokens, api_data)
+        if not matches:
+            print(f"No matches found for {scryfall_code}.")
+            continue
+
+        try:
+            matches.sort(key=lambda x: int(x[0]))
+        except:
+            # Because yknow collector numbers can be strings
+            matches.sort(key=lambda x: x[0])
+
+        with open(filepath, "w", encoding='utf-8') as file:
+            for line in newlines:
+                file.write(line)
+
+            for number, filename, artist in matches:
+                file.write(f"{number} {filename} {artist}\n")
+
+        print("Updated file:", filepath)
+        sleep(0.2)  # Avoid hitting the API too hard
+
+    return token_data
+
+# Function to fetch data from Scryfall API
+def fetch_scryfall_data(code):
+    url = f"https://api.scryfall.com/cards/search?q=e:{code.lower()}"
+    response = requests.get(url)
+
+    if response.status_code == 200:
+        return response.json()
+
+    print(f"Error fetching Scryfall data for {code}")
+    return None
+
+# Function to cross-reference tokens with API results
+# {"name":"Beast","type_line":"Token Creature — Beast","oracle_text":"","power":"3","toughness":"3","colors":["G"],"keywords":[]}
+def cross_reference(tokens, api_data):
+    matched_tokens = []
+
+    if "data" in api_data:
+        card_data = api_data["data"]
+
+        simplified_tokens = {}
+        found_collector_numbers = set()
+        for card in card_data:
+            built_filename, exact_name, artist = predict_filename(card)
+            simplified_tokens[built_filename] = (card["collector_number"], artist)
+            simplified_tokens[exact_name] = (card["collector_number"], artist)
+
+        for token in tokens:
+            if token in simplified_tokens:
+                collector_number = simplified_tokens[token][0]
+                artist = simplified_tokens[token][1]
+                matched_tokens.append((collector_number, token, artist))
+                found_collector_numbers.add(collector_number)
+                continue
+
+            # I have duplicates in the data. How do I make sure to skip them doing this method?
+            for key in simplified_tokens:
+                collector_number = simplified_tokens[key][0]
+                if token.startswith(key):
+                    try:
+                        while collector_number in found_collector_numbers:
+                            collector_number = str(int(collector_number)+1)
+                    except:
+                        print("UNABLE TO EXPAND COLLECTOR NUMBER", collector_number)
+
+                    artist = simplified_tokens[key][1]
+                    matched_tokens.append((collector_number, token, artist))
+                    found_collector_numbers.add(collector_number)
+                    break
+            else:
+                # I couldn't find a match. Fill in a partial match to be manually fixed later.
+                matched_tokens.append(("0", token, "@Unknown"))
+
+    return matched_tokens
+
+
+def predict_filename(card):
+    filename_builder = []
+
+
+    if "colors" in card and len(card["colors"]) > 1:
+        color_order = {"W": 0, "U": 1, "B": 2, "R": 3, "G": 4}
+        colors = card["colors"]
+        colors.sort(key=lambda color: color_order[color])
+        filename_builder.append("".join(colors).lower())
+    else:
+        filename_builder.append('c' if ("colors" not in card or card["colors"] == []) else "".join(card["colors"]).lower())
+
+    if "power" in card:
+        filename_builder.append(card["power"].replace("*", "x"))
+
+    if "toughness" in card:
+        filename_builder.append(card["toughness"].replace("*", "x"))
+
+    if "Artifact" in card["type_line"]:
+        filename_builder.append("a")
+
+    if "Enchantment" in card["type_line"]:
+        filename_builder.append("e")
+
+    filename_builder.append(card["name"].replace(" ", "_").lower())
+
+    return ("_".join(filename_builder), card["name"].replace(" ", "_").lower(), "@" + card["artist"])
+
+# Main workflow
+def main(directory):
+    process_files(directory)
+
+# Run the script
+directory_path = "../res/editions/"  # Replace with your actual directory
+main(directory_path)