diff --git a/forge-gui/res/editions/Aether Revolt.txt b/forge-gui/res/editions/Aether Revolt.txt
index 75da6d6cd22..a26c76ae5a7 100644
--- a/forge-gui/res/editions/Aether Revolt.txt	
+++ b/forge-gui/res/editions/Aether Revolt.txt	
@@ -205,3 +205,10 @@ AdditionalSetUnlockedInQuest=MPS_KLD
 192 U Tezzeret's Simulacrum
 193 C Pendulum of Patterns
 194 C Submerged Boneyard
+
+[tokens]
+etherium_cell
+ragavan
+r_2_2_gremlin
+c_1_1_a_servo
+c_1_1_a_thopter_flying
\ No newline at end of file
diff --git a/forge-gui/res/editions/Commander 2016.txt b/forge-gui/res/editions/Commander 2016.txt
index 91c459614d2..b0ef537eb52 100644
--- a/forge-gui/res/editions/Commander 2016.txt	
+++ b/forge-gui/res/editions/Commander 2016.txt	
@@ -358,3 +358,24 @@ Type=Other
 349 L Forest
 350 L Forest
 351 L Forest
+
+[tokens]
+c_1_1_spirit
+w_1_1_bird_flying
+w_4_4_elemental_flying
+w_0_1_goat
+w_1_1_soldier
+w_1_1_spirit_flying
+u_2_2_bird_flying
+u_1_1_squid_islandwalk
+u_1_1_a_thopter_flying
+b_0_0_germ
+b_2_2_zombie
+r_1_1_goblin_all_attack
+r_3_3_ogre
+g_3_3_beast
+g_1_1_elf_warrior
+g_1_1_saproling
+bg_1_1_worm
+c_x_x_a_horror
+c_1_1_a_myr
\ No newline at end of file
diff --git a/forge-gui/res/editions/Duel Decks Mind vs. Might.txt b/forge-gui/res/editions/Duel Decks Mind vs. Might.txt
index e64014d3915..cdfa4ad5327 100644
--- a/forge-gui/res/editions/Duel Decks Mind vs. Might.txt	
+++ b/forge-gui/res/editions/Duel Decks Mind vs. Might.txt	
@@ -74,4 +74,10 @@ Type=Duel_Decks
 65 L Forest
 
 [tokens]
-r_1_1_goblin
\ No newline at end of file
+u_2_2_drake_flying
+r_1_1_elemental
+r_1_1_goblin
+g_4_4_beast
+g_3_3_elephant
+g_1_1_elf_warrior
+g_6_6_wurm
\ No newline at end of file
diff --git a/forge-gui/res/editions/Kaladesh.txt b/forge-gui/res/editions/Kaladesh.txt
index 28269db8a42..2b68331b858 100644
--- a/forge-gui/res/editions/Kaladesh.txt
+++ b/forge-gui/res/editions/Kaladesh.txt
@@ -285,3 +285,9 @@ AdditionalSetUnlockedInQuest=MPS_KLD
 272 C Terrain Elemental
 272 R Verdant Crescendo
 273 C Woodland Stream
+
+[tokens]
+c_6_6_a_beast
+c_x_x_a_construct
+c_1_1_a_servo
+c_1_1_a_thopter_flying
\ No newline at end of file
diff --git a/forge-gui/res/editions/Masterpiece Series - Kaladesh.txt b/forge-gui/res/editions/Masterpiece Series - Kaladesh.txt
index 0ecaa2f5d15..293d07b7c0d 100644
--- a/forge-gui/res/editions/Masterpiece Series - Kaladesh.txt	
+++ b/forge-gui/res/editions/Masterpiece Series - Kaladesh.txt	
@@ -61,3 +61,9 @@ Type=Other
 52 M Trinisphere
 53 M Vedalken Shackles
 54 M Wurmcoil Engine
+
+[tokens]
+g_2_2_wolf
+c_1_1_a_thopter_flying
+c_3_3_a_wurm_deathtouch
+c_3_3_a_wurm_lifelink
\ No newline at end of file
diff --git a/forge-gui/res/editions/Modern Masters 2017.txt b/forge-gui/res/editions/Modern Masters 2017.txt
index f5520a6bcf6..4cd03184bb7 100644
--- a/forge-gui/res/editions/Modern Masters 2017.txt	
+++ b/forge-gui/res/editions/Modern Masters 2017.txt	
@@ -260,4 +260,24 @@ FoilChanceInBooster=100
 249 R Verdant Catacombs
 
 [tokens]
-r_1_1_goblin
\ No newline at end of file
+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_golem
\ No newline at end of file
diff --git a/forge-gui/res/editions/Planechase Anthology.txt b/forge-gui/res/editions/Planechase Anthology.txt
index bd4d642f934..4d590ffca88 100644
--- a/forge-gui/res/editions/Planechase Anthology.txt	
+++ b/forge-gui/res/editions/Planechase Anthology.txt	
@@ -251,5 +251,15 @@ Type=Other
 156 L Forest
 
 [tokens]
+c_0_1_eldrazi_spawn_sac
+w_4_4_angel_flying
+b_2_4_spider_reach
 r_1_1_goblin
-g_0_1_plant
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/forge-gui/res/editions/Treasure Chests.txt b/forge-gui/res/editions/Treasure Chests.txt
index 6dac524f016..07607b2f40f 100644
--- a/forge-gui/res/editions/Treasure Chests.txt	
+++ b/forge-gui/res/editions/Treasure Chests.txt	
@@ -78,4 +78,18 @@ Type=Other
 70 R Boompile
 71 R Prismatic Geoscope
 72 C Ash Barrens
-73 R Throne of the High City
\ No newline at end of file
+73 R Throne of the High City
+
+[tokens]
+spitting_slime
+w_1_1_bird_flying
+w_1_1_soldier
+w_1_1_spirit_flying
+u_1_1_a_thopter_flying
+b_1_1_assassin_deathtouch_haste
+b_0_0_germ
+r_5_5_dragon_flying
+r_1_1_goblin_all_attack
+r_8_8_lizard
+g_1_1_saproling
+c_1_1_a_construct_defender
\ No newline at end of file