diff --git a/forge-gui/res/cardsfolder/e/eiganjo_free_riders.txt b/forge-gui/res/cardsfolder/e/eiganjo_free_riders.txt
index 852d9c8c0ce..cc7213fd923 100644
--- a/forge-gui/res/cardsfolder/e/eiganjo_free_riders.txt
+++ b/forge-gui/res/cardsfolder/e/eiganjo_free_riders.txt
@@ -8,5 +8,6 @@ SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Manda
 SVar:NeedsToPlayVar:Z GE2
 SVar:Z:Count$Valid Creature.White+YouCtrl+cmcLE4
 AI:RemoveDeck:Random
+DeckNeeds:Color$white
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eiganjo_free_riders.jpg
 Oracle:Flying\nAt the beginning of your upkeep, return a white creature you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/h/hikari_twilight_guardian.txt b/forge-gui/res/cardsfolder/h/hikari_twilight_guardian.txt
index f10454fc8d8..803dbab2f25 100644
--- a/forge-gui/res/cardsfolder/h/hikari_twilight_guardian.txt
+++ b/forge-gui/res/cardsfolder/h/hikari_twilight_guardian.txt
@@ -8,5 +8,6 @@ SVar:TrigExile:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destinatio
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Exile | Destination$ Battlefield
 AI:RemoveDeck:Random
+DeckHints:Type$Spirit|Arcane
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hikari_twilight_guardian.jpg
 Oracle:Flying\nWhenever you cast a Spirit or Arcane spell, you may exile Hikari, Twilight Guardian. If you do, return it to the battlefield under its owner's control at the beginning of the next end step.
diff --git a/forge-gui/res/conquest/planes/Kamigawa/Towabara/Celestial Kirin.dck b/forge-gui/res/conquest/planes/Kamigawa/Towabara/Celestial Kirin.dck
new file mode 100644
index 00000000000..2788820ec6c
--- /dev/null
+++ b/forge-gui/res/conquest/planes/Kamigawa/Towabara/Celestial Kirin.dck	
@@ -0,0 +1,30 @@
+[metadata]
+Name=Celestial Kirin
+[Commander]
+1 Celestial Kirin|CHK
+[Main]
+1 Blessed Breath|CHK
+1 Candles' Glow|CHK
+1 Cleanfall|CHK
+1 Eiganjo Castle|CHK
+1 Genju of the Fields|BOK
+1 Hail of Arrows|SOK
+1 Hold the Line|CHK
+1 Hundred-Talon Kami|CHK
+1 Journeyer's Kite|CHK
+1 Kabuto Moth|CHK
+1 Kami of Ancient Law|CHK
+1 Kami of the Honored Dead|BOK
+1 Kami of the Palace Fields|CHK
+1 Lantern Kami|CHK
+1 Moonlit Strider|BOK
+1 Nikko-Onna|SOK
+1 Otherworldly Journey|CHK
+15 Plains|CHK
+1 Reciprocate|CHK
+1 Scour|BOK
+1 Spiritual Visit|SOK
+1 Terashi's Cry|CHK
+1 Terashi's Verdict|BOK
+1 That Which Was Taken|BOK
+1 Torii Watchward|SOK
diff --git a/forge-gui/res/conquest/planes/Kamigawa/Towabara/Eight-and-a-Half-Tails.dck b/forge-gui/res/conquest/planes/Kamigawa/Towabara/Eight-and-a-Half-Tails.dck
new file mode 100644
index 00000000000..e9e39a61457
--- /dev/null
+++ b/forge-gui/res/conquest/planes/Kamigawa/Towabara/Eight-and-a-Half-Tails.dck
@@ -0,0 +1,34 @@
+[metadata]
+Name=Eight-and-a-Half-Tails
+[Avatar]
+1 Eight-and-a-Half-Tails Avatar|VAN
+[Main]
+1 Baku Altar|BOK
+1 Cloudcrest Lake|CHK
+1 Faithful Squire|BOK
+1 Floating-Dream Zubera|CHK
+1 Genju of the Fields|BOK
+1 Hail of Arrows|SOK
+1 Heed the Mists|BOK
+1 Honden of Seeing Winds|CHK
+7 Island|CHK|3
+1 Jade Idol|CHK
+1 Jushi Apprentice|CHK
+1 Kami of Ancient Law|CHK
+1 Kami of the Crescent Moon|SOK
+1 Kitsune Riftwalker|CHK
+1 Lantern Kami|CHK
+1 Long-Forgotten Gohei|CHK
+1 Mikokoro, Center of the Sea|SOK
+1 Minamo, School at Water's Edge|CHK
+1 Nine-Ringed Bo|CHK
+7 Plains|CHK|3
+1 Promise of Bunrei|SOK
+1 Ribbons of the Reikai|BOK
+1 Rushing-Tide Zubera|SOK
+1 Secretkeeper|SOK
+1 Sensei's Divining Top|CHK
+1 Silent-Chant Zubera|CHK
+1 Tatsumasa, the Dragon's Fang|CHK
+1 Waxmane Baku|BOK
+[Sideboard]
diff --git a/forge-gui/res/conquest/planes/Kamigawa/Towabara/Michiko Konda, Truth Seeker.dck b/forge-gui/res/conquest/planes/Kamigawa/Towabara/Michiko Konda, Truth Seeker.dck
new file mode 100644
index 00000000000..bf6e8c0c82d
--- /dev/null
+++ b/forge-gui/res/conquest/planes/Kamigawa/Towabara/Michiko Konda, Truth Seeker.dck	
@@ -0,0 +1,33 @@
+[metadata]
+Name=Michiko Konda, Truth Seeker
+[Commander]
+1 Michiko Konda, Truth Seeker|SOK
+[Main]
+1 Araba Mothrider|SOK
+1 Bushi Tenderfoot|CHK
+1 Descendant of Kiyomaro|SOK
+1 Eiganjo Castle|CHK
+1 Eiganjo Free-Riders|SOK
+1 Empty-Shrine Kannushi|BOK
+1 General's Kabuto|CHK
+1 Hand of Honor|SOK
+1 Inner-Chamber Guard|SOK
+1 Kitsune Dawnblade|SOK
+1 Konda's Banner|CHK
+1 Konda's Hatamoto|CHK
+1 Konda, Lord of Eiganjo|CHK
+1 Manriki-Gusari|SOK
+1 Masako the Humorless|CHK
+1 Nagao, Bound by Honor|CHK
+1 No-Dachi|CHK
+1 O-Naginata|SOK
+1 Oathkeeper, Takeno's Daisho|CHK
+14 Plains|CHK
+1 Samurai Enforcers|CHK
+1 Shuko|BOK
+1 Takeno, Samurai General|CHK
+1 Tenza, Godo's Maul|CHK
+1 That Which Was Taken|BOK
+1 Untaidake, the Cloud Keeper|CHK
+[Sideboard]
+
diff --git a/forge-gui/res/conquest/planes/Kamigawa/Towabara/_events.txt b/forge-gui/res/conquest/planes/Kamigawa/Towabara/_events.txt
index 834a34eef18..7675ce4e7ca 100644
--- a/forge-gui/res/conquest/planes/Kamigawa/Towabara/_events.txt
+++ b/forge-gui/res/conquest/planes/Kamigawa/Towabara/_events.txt
@@ -1,9 +1,9 @@
 Name:Nagao, Bound by Honor|Deck:Nagao, Bound by Honor.dck|Variant:Commander|Avatar:Nagao, Bound by Honor|Desc:
 Name:Oyobi, Who Split the Heavens|Deck:Oyobi, Who Split the Heavens.dck|Variant:Commander|Avatar:Oyobi, Who Split the Heavens|Desc:
 Name:Rune-Tail, Kitsune Ascendant|Deck:Rune-Tail, Kitsune Ascendant.dck|Variant:Commander|Avatar:Rune-Tail, Kitsune Ascendant|Desc:
-Name:EVENT4|Deck:Random|Variant:None|Avatar:None|Desc:
-Name:EVENT5|Deck:Random|Variant:None|Avatar:None|Desc:
-Name:EVENT6|Deck:Random|Variant:None|Avatar:None|Desc:
+Name:Michiko Konda, Truth Seeker|Deck:Michiko Konda, Truth Seeker.dck|Variant:Commander|Avatar:Michiko Konda, Truth Seeker|Desc:
+Name:Eight-and-a-Half-Tails|Deck:Eight-and-a-Half-Tails.dck|Variant:Vanguard|Avatar:Eight-and-a-Half-Tails Avatar|Desc:
+Name:Celestial Kirin|Deck:Celestial Kirin.dck|Variant:Commander|Avatar:Celestial Kirin|Desc:
 Name:EVENT7|Deck:Random|Variant:None|Avatar:None|Desc:
 Name:EVENT8|Deck:Random|Variant:None|Avatar:None|Desc:
 Name:Random Planechase|Deck:Random|Variant:Planechase|Avatar:Planar Warden|Desc: