diff --git a/forge-gui/res/editions/Kamigawa Neon Dynasty Commander.txt b/forge-gui/res/editions/Kamigawa Neon Dynasty Commander.txt
index 42ab5f69914..66746dd008c 100644
--- a/forge-gui/res/editions/Kamigawa Neon Dynasty Commander.txt	
+++ b/forge-gui/res/editions/Kamigawa Neon Dynasty Commander.txt	
@@ -186,3 +186,17 @@ ScryfallCode=NEC
 178 R Spire of Industry @John Avon
 179 R Temple of Abandon @Adam Paquette
 180 R Temple of Enlightenment @Piotr Dura
+
+[tokens]
+b_0_0_phyrexian_germ
+c_1_1_a_myr
+c_1_1_a_thopter_flying
+c_1_1_e_shrine
+g_0_1_plant
+g_1_1_saproling
+g_3_3_beast
+g_3_3_elephant
+r_1_1_elemental
+r_1_1_goblin
+smoke_blessing
+w_4_4_angel_flying_vigilance
diff --git a/forge-gui/res/editions/Kamigawa Neon Dynasty.txt b/forge-gui/res/editions/Kamigawa Neon Dynasty.txt
index 757a4e1a32e..29bd3287cd2 100644
--- a/forge-gui/res/editions/Kamigawa Neon Dynasty.txt	
+++ b/forge-gui/res/editions/Kamigawa Neon Dynasty.txt	
@@ -312,10 +312,25 @@ ScryfallCode=NEO
 300 L Mountain @Ayami Nakashima
 301 L Forest @Ezoi
 302 L Forest @Ezoi
+
+[borderless]
 303 M The Wandering Emperor @Terada Katsuya
 304 M Tezzeret, Betrayer of Flesh @Lack
 305 M Kaito Shizuki @Tetsuo Hara
 306 M Tamiyo, Compleated Sage @Terada Katsuya
+406 M Ao, the Dawn Sky @Ishikawa Kenta
+407 R Kyodai, Soul of Kamigawa @Yukihiro Maruo
+408 M Kairi, the Swirling Sky @Yoshiya
+409 M Junji, the Midnight Sky @Satoru Senda
+410 M Atsushi, the Blazing Sky @Toshiaki Takayama
+411 M Kura, the Boundless Sky @Satoru Senda
+412 R Boseiju, Who Endures @Esuthio
+413 R Eiganjo, Seat of the Empire @ZOUNOSE
+414 R Otawara, Soaring City @Yuta Shimpo
+415 R Sokenzan, Crucible of Defiance @Nao Miyoshi
+416 R Takenuma, Abandoned Mire @Nao Miyoshi
+
+[showcase]
 307 M Jin-Gitaxias, Progress Tyrant @Chase Stone
 308 M Tamiyo, Compleated Sage @Chris Rahn
 309 C Eiganjo Exemplar @Yamada Rokkaku
@@ -415,17 +430,6 @@ ScryfallCode=NEO
 403 R Mirror Box @Mid
 404 R Reckoner Bankbuster @Yoshiya
 405 R Surgehacker Mech @Inuchiyo Meimaru
-406 M Ao, the Dawn Sky @Ishikawa Kenta
-407 R Kyodai, Soul of Kamigawa @Yukihiro Maruo
-408 M Kairi, the Swirling Sky @Yoshiya
-409 M Junji, the Midnight Sky @Satoru Senda
-410 M Atsushi, the Blazing Sky @Toshiaki Takayama
-411 M Kura, the Boundless Sky @Satoru Senda
-412 R Boseiju, Who Endures @Esuthio
-413 R Eiganjo, Seat of the Empire @ZOUNOSE
-414 R Otawara, Soaring City @Yuta Shimpo
-415 R Sokenzan, Crucible of Defiance @Nao Miyoshi
-416 R Takenuma, Abandoned Mire @Nao Miyoshi
 417 R Farewell @Fuzichoco
 418 M The Wandering Emperor @Hisashi Momose
 419 M Tezzeret, Betrayer of Flesh @Maekawa Yuichi
@@ -442,6 +446,8 @@ ScryfallCode=NEO
 430 R Hidetsugu, Devouring Chaos @SENNSU
 431 R Hidetsugu, Devouring Chaos @SENNSU
 432 R Hidetsugu, Devouring Chaos @SENNSU
+
+[extended art]
 433 M Ao, the Dawn Sky @Chris Rahn
 434 R Brilliant Restoration @Wylie Beckert
 435 R Cloudsteel Kirin @Jonathan Kuo
@@ -515,10 +521,33 @@ ScryfallCode=NEO
 503 R Otawara, Soaring City @Alayna Danner
 504 R Sokenzan, Crucible of Defiance @Lucas Staniec
 505 R Takenuma, Abandoned Mire @Sam Burley
-506 R Invoke Despair @Donato Giancola
+
+[buy a box]
 507 R Satoru Umezawa @Yoji Shinkawa
+
+[promo]
+506 R Invoke Despair @Donato Giancola
 508 C Spirited Companion @Ilse Gort
 509 U Enthusiastic Mechanaut @Anna Steinbauer
 510 U Jukai Naturalist @Anna Steinbauer
 511 U Silver-Fur Master @Carl Critchlow
 512 U Secluded Courtyard @Sam Burley
+
+[tokens]
+b_1_1_rat_rogue
+c_1_1_a_construct
+c_1_1_pilot_crewbuff
+c_1_1_spirit
+c_a_treasure_sac
+g_1_1_human_monk_g
+g_4_5_spirit
+g_x_x_spirit_total_lands
+keimi
+mechtitan
+r_2_2_goblin_shaman_treasure
+r_2_2_spirit_menace
+r_3_1_a_construct_haste
+r_5_5_dragon_spirit_flying
+tamiyos_notebook
+u_1_1_ninja_unblockable
+w_2_2_samurai_vigilance