diff --git a/forge-gui/res/cardsfolder/upcoming/amateur_auteur.txt b/forge-gui/res/cardsfolder/upcoming/amateur_auteur.txt
new file mode 100644
index 00000000000..06a635bb044
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/amateur_auteur.txt
@@ -0,0 +1,6 @@
+Name:Amateur Auteur
+Types:Creature Human
+ManaCost:1 W
+PT:2/2
+A:AB$ Destroy | Cost$ Sac<1/CARDNAME> | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment.
+Oracle:Sacrifice Amateur Auteur: Destroy target enchantment.
diff --git a/forge-gui/res/cardsfolder/upcoming/beast_in_show.txt b/forge-gui/res/cardsfolder/upcoming/beast_in_show.txt
new file mode 100644
index 00000000000..1095c4626f8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/beast_in_show.txt
@@ -0,0 +1,6 @@
+Name:Beast in Show
+ManaCost:4 G G
+Types:Creature Beast
+K:Trample
+Oracle:Trample
+PT:6/4
diff --git a/forge-gui/res/cardsfolder/upcoming/blast_from_the_past.txt b/forge-gui/res/cardsfolder/upcoming/blast_from_the_past.txt
new file mode 100644
index 00000000000..198caee6af7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/blast_from_the_past.txt
@@ -0,0 +1,11 @@
+Name:Blast from the Past
+ManaCost:2 R
+Types:Instant
+K:Madness:R
+K:Cycling:1 R
+K:Kicker:2 R
+K:Flashback 3 R
+K:Buyback:4 R
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ DBToken | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | Condition$ Kicked | TokenImage$ r 1 1 goblin ugl | ConditionDescription$ If CARDNAME was kicked, create a 1/1 red Goblin creature token.
+Oracle:Madness {R}, cycling {1}{R}, kicker {2}{R}, flashback {3}{R}, buyback{4}{R}\nBlast from the Past deals 2 damage to target creature or player.\nIf Blast from the Past was kicked, create a 1/1 red Goblin creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/clambassadors.txt b/forge-gui/res/cardsfolder/upcoming/clambassadors.txt
new file mode 100644
index 00000000000..0c494ff2bd5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/clambassadors.txt
@@ -0,0 +1,8 @@
+Name:Clambassadors
+ManaCost:3 U
+Types:Creature Clamfolk
+PT:4/4
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ DBChoosePermanent | TriggerDescription$ Whenever CARDNAME deals damage to a player, choose an artifact, creature, or land you control. That player gains control of that permanent. | StackDescription$ None
+SVar:DBChoosePermanent:DB$ ChooseCard | Mandatory$ True | AILogic$ WorstCard | Choices$ Artifact.YouCtrl,Creature.YouCtrl,Land.YouCtrl | Amount$ 1 | SubAbility$ DBGainControl
+SVar:DBGainControl:DB$ GainControl | Defined$ ChosenCard | NewController$ TriggeredTarget
+Oracle:Whenever Clambassadors deals damage to a player, choose an artifact, creature, or land you control. That player gains control of that permanent.
diff --git a/forge-gui/res/cardsfolder/upcoming/crow_storm.txt b/forge-gui/res/cardsfolder/upcoming/crow_storm.txt
new file mode 100644
index 00000000000..40ef641d70f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/crow_storm.txt
@@ -0,0 +1,6 @@
+Name:Crow Storm
+ManaCost:2 U
+Types:Sorcery
+K:Storm
+A:SP$ Token | Cost$ 2 U | TokenOwner$ You | TokenAmount$ 1 | TokenPower$ 1 | TokenToughness$ 2 | TokenColors$ Blue | TokenTypes$ Bird,Creature | TokenKeywords$ Flying | TokenName$ Storm Crow | TokenImage$ storm crow | SpellDescription$ Create a 1/2 blue Bird creature token with flying named Storm Crow.
+Oracle:Create a 1/2 blue Bird creature token with flying named Storm Crow.\nStorm (When you cast this spell, copy it for each spell cast before it this turn.)
diff --git a/forge-gui/res/cardsfolder/upcoming/curious_killbot.txt b/forge-gui/res/cardsfolder/upcoming/curious_killbot.txt
new file mode 100644
index 00000000000..91d024f64cb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/curious_killbot.txt
@@ -0,0 +1,5 @@
+Name:Curious Killbot
+ManaCost:2
+Types:Artifact Creature Killbot
+PT:2/1
+Oracle:
diff --git a/forge-gui/res/cardsfolder/upcoming/delighted_killbot.txt b/forge-gui/res/cardsfolder/upcoming/delighted_killbot.txt
new file mode 100644
index 00000000000..ebb610d93a5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/delighted_killbot.txt
@@ -0,0 +1,5 @@
+Name:Delighted Killbot
+ManaCost:2
+Types:Artifact Creature Killbot
+PT:2/1
+Oracle:
diff --git a/forge-gui/res/cardsfolder/upcoming/despondent_killbot.txt b/forge-gui/res/cardsfolder/upcoming/despondent_killbot.txt
new file mode 100644
index 00000000000..d3e8327f6b8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/despondent_killbot.txt
@@ -0,0 +1,5 @@
+Name:Despondent Killbot
+ManaCost:2
+Types:Artifact Creature Killbot
+PT:2/1
+Oracle:
diff --git a/forge-gui/res/cardsfolder/upcoming/distract.txt b/forge-gui/res/cardsfolder/upcoming/distract.txt
new file mode 100644
index 00000000000..ff6b7d806ff
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/distract.txt
@@ -0,0 +1,6 @@
+Name:Distract
+ManaCost:U
+Types:Instant
+A:SP$ Tap | Cost$ U | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDraw | SpellDescription$ Tap target land.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
+Oracle:Tap target land. Draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/drake_stone.txt b/forge-gui/res/cardsfolder/upcoming/drake_stone.txt
new file mode 100644
index 00000000000..724750495db
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/drake_stone.txt
@@ -0,0 +1,10 @@
+Name:Drake Stone
+ManaCost:U
+Types:Planeswalker Stone
+Loyalty:4
+A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 1 | References$ DBDiscard | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then each player discards a card.
+SVar:DBDiscard: DB$ Discard | NumCards$ 1 | Mode$ TgtChoose | Defined$ Player | SpellDescription$ Each player discards a card.
+A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True  | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put target permanent on the bottom of its owner's library.
+A:AB$ GainControl | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | TargetMin$ 0 | TargetMax$ 10 | ValidTgts$ Permanent | SpellDescription$ Gain control up to ten target permanents.
+SVar:MaxTargets:Count$Valid Creature
+Oracle:[+1] Draw a card, then each player discards a card.\n[-3] Put target permanent on the bottom of its owner's library.\n[-7] Gain control of up to ten target permanents.
diff --git a/forge-gui/res/cardsfolder/upcoming/earl_of_squirrel.txt b/forge-gui/res/cardsfolder/upcoming/earl_of_squirrel.txt
new file mode 100644
index 00000000000..522cc3b6ffe
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/earl_of_squirrel.txt
@@ -0,0 +1,12 @@
+Name:Earl of Squirrel
+ManaCost:4 G G
+Types:Creature Squirrel Advisor
+K:Squirrellink
+S:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Token.Creature | AddType$ Squirrel | SpellDescription$ Creature tokens you control are Squirrels in addition to their other creature types.
+S:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Squirrel.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | SpellDescription$ Other Squirrels you control get +1/+1.
+T:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ TrigToken | TriggerZones$ Battlefield 
+SVar:TrigToken:DB$ Token | TokenAmount$ X | References$ X | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ g 1 1 squirrel ust
+SVar:X:TriggerCount$DamageAmount
+DeckHas:Ability$ Token
+Oracle:Squirrellink (Damage dealt by this creature also causes you to create that many 1/1 green Squirrel creature tokens.)\nCreature tokens you control are Squirrels in addition to their other creature types.\nOther Squirrels you control get +1/+1.
+PT:4/4
diff --git a/forge-gui/res/cardsfolder/upcoming/enraged_killbot.txt b/forge-gui/res/cardsfolder/upcoming/enraged_killbot.txt
new file mode 100644
index 00000000000..4325e05d05c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/enraged_killbot.txt
@@ -0,0 +1,5 @@
+Name:Enraged Killbot
+ManaCost:2
+Types:Artifact Creature Killbot
+PT:2/1
+Oracle:
diff --git a/forge-gui/res/cardsfolder/upcoming/enthrall.txt b/forge-gui/res/cardsfolder/upcoming/enthrall.txt
new file mode 100644
index 00000000000..7405e175a15
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/enthrall.txt
@@ -0,0 +1,6 @@
+Name:Enthrall
+ManaCost:1 B
+Types:Sorcery
+A:SP$ Discard | Cost$ 1 B | ValidTgts$ Player | NumCards$ X | References$ X | Mode$ TgtChoose |SpellDescription$ Target player discards a card for each spell you've cast this turn.
+SVar:X:Count$ThisTurnCast_Card.YouCtrl
+Oracle:Target player discards a card for each spell you've cast this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/form_of_the_squirrel.txt b/forge-gui/res/cardsfolder/upcoming/form_of_the_squirrel.txt
new file mode 100644
index 00000000000..d008032c9f1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/form_of_the_squirrel.txt
@@ -0,0 +1,10 @@
+Name:Form of the Squirrel
+ManaCost:G
+Types:Enchantment
+S:Mode$ Continuous | Affected$ You | AddKeyword$ Hexproof | Description$ You have hexproof.
+S:Mode$ CantBeCast | ValidCard$ Spell | Caster$ You | EffectZone$ Battlefield | Description$ You can't cast spells.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Self | Execute$ TrigToken | TriggerDescription$ As CARDNAME enters the battlefield, create a 1/1 green Squirrel creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | TokenTriggers$ TrigLTB
+SVar:TrigLTB:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLose | TriggerController$ TriggeredCardController | TriggerDescription$ You lose the game when this leaves the battlefield.
+SVar:TrigLose:DB$ LosesGame | Defined$ You
+Oracle:As Form of the Squirrel enters the battlefield, create a 1/1 green Squirrel creature token. You lose the game when it leaves the battlefield.\nCreatures can't attack you.\nYou have hexproof.\nYou can't play spells.
diff --git a/forge-gui/res/cardsfolder/upcoming/jackknight.txt b/forge-gui/res/cardsfolder/upcoming/jackknight.txt
new file mode 100644
index 00000000000..302a2463af1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/jackknight.txt
@@ -0,0 +1,11 @@
+Name:Jackknight
+ManaCost:1 W
+Types:Artifact Creature Cyborg Knight
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigCounters | TriggerDescription$ Whenever another artifact enters the battlefield under your control, put a +1/+1 counter on CARDNAME. If that artifact is a Contraption, Jackknight gains lifelink until end of turn.
+SVar:TrigCounters:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | ConditionDefined$ TriggeredCard | ConditionPresent$ Contraption | Defined$ Self |KW$ Lifelink
+DeckHas:Ability$ Counters
+DeckHints:Type$ Contraption
+SVar:RemRandomDeck:True
+Oracle:Whenever another artifact enters the battlefield under your control, put a +1/+1 counter on Jackknight. If that artifact is a Contraption, Jackknight gains lifelink until end of turn.
+PT:1/1
diff --git a/forge-gui/res/cardsfolder/upcoming/novellamental.txt b/forge-gui/res/cardsfolder/upcoming/novellamental.txt
new file mode 100644
index 00000000000..4d4d1fbab42
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/novellamental.txt
@@ -0,0 +1,7 @@
+Name:Novellamental
+ManaCost:1 U
+Types:Creature Elemental
+K:Flying
+K:CARDNAME can block only creatures with flying.
+Oracle:Flying\nNovellamental can block only creatures with flying.
+PT:2/1
diff --git a/forge-gui/res/cardsfolder/upcoming/old_fogey.txt b/forge-gui/res/cardsfolder/upcoming/old_fogey.txt
new file mode 100644
index 00000000000..3910bb99c23
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/old_fogey.txt
@@ -0,0 +1,14 @@
+Name:Old Fogey
+ManaCost:G G
+Types:Creature Dinosaur
+PT:7/7
+K:Phasing
+K:Cumulative upkeep: 1
+K:Echo:G G
+K:Fading:3
+K:Bands with Other Dinosaurs
+K:Snow plainswalk
+K:Protection:Homarid:Protection from Homarids
+K:Flanking
+K:Rampage 2
+Oracle:Phasing, cumulative upkeep {1}, echo {G}{G}, fading 3, bands with other Dinosaurs, protection from Homarids, snow-covered plainswalk, flanking, rampage 2
diff --git a/forge-gui/res/cardsfolder/upcoming/target_minotaur.txt b/forge-gui/res/cardsfolder/upcoming/target_minotaur.txt
new file mode 100644
index 00000000000..ec4789a2c60
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/target_minotaur.txt
@@ -0,0 +1,6 @@
+Name:Target Minotaur
+ManaCost:1 R
+Types:Creature Minotaur Warrior
+K:Prowess
+Oracle:Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)
+PT:2/1
diff --git a/forge-gui/res/editions/Drake Stone.txt b/forge-gui/res/editions/Drake Stone.txt
new file mode 100644
index 00000000000..0392ae23251
--- /dev/null
+++ b/forge-gui/res/editions/Drake Stone.txt	
@@ -0,0 +1,14 @@
+[metadata]
+Code=DS0
+Date=2010-07-14
+Name=Drake Stone
+Code2=DS0
+Type=Expansion
+MciCode=ds0
+
+[cards]
+1 U Illusory Thoughts
+2 U Concentrate
+3 U Distract
+4 U Enthrall
+5 M Drake Stone
diff --git a/forge-gui/res/editions/Unglued.txt b/forge-gui/res/editions/Unglued.txt
index 58f61f38595..8c14f6b39e9 100644
--- a/forge-gui/res/editions/Unglued.txt
+++ b/forge-gui/res/editions/Unglued.txt
@@ -3,9 +3,95 @@ Code=UGL
 Date=1998-08-11
 Name=Unglued
 MciCode=ug
-Type=Other
+Type=Expansion
+BoosterCovers=1
+Booster=6 Common, 1 Uncommon, 1 Rare, 1 BasicLand
+FoilAlwaysInCommonSlot=False
 
 [cards]
+1 U Charm School
+2 R The Cheese Stands Alone
+3 C Double Dip
+4 U Get a Life
+5 R I'm Rubber, You're Glue
+6 C Knight of the Hokey Pokey
+7 U Lexivore
+8 R Look at Me, I'm the DCI
+9 C Mesa Chicken
+10 U Miss Demeanor
+11 R Once More with Feeling
+12 C Prismatic Wardrobe
+13 C Sex Appeal
+14 R Bureaucracy
+15 U Censorship
+16 U Checks and Balances
+17 R Chicken a la King
+18 C Clambassadors
+19 C Clam-I-Am
+20 C Clam Session
+21 C Common Courtesy
+22 C Denied!
+23 C Double Take
+24 C Fowl Play
+25 R Free-for-All
+26 R Psychic Network
+27 U Sorry
+28 R B.F.M. (Big Furry Monster) A
+29 R B.F.M. (Big Furry Monster) B
+30 C Deadhead
+31 C Double Cross
+32 U Handcuffs
+33 R Infernal Spawn of Evil
+34 U Jumbo Imp
+35 C Organ Harvest
+36 R Ow
+37 C Poultrygeist
+38 C Temp of the Damned
+39 U Volrath's Motion Sensor
+40 R Burning Cinder Fury of Crimson Chaos Fire
+41 C Chicken Egg
+42 C Double Deal
+43 C Goblin Bookie
+44 C Goblin Bowling Team
+45 U Goblin Tutor
+46 C Hurloon Wrangler
+47 R Jalum Grifter
+48 C Krazy Kow
+49 R Landfill
+50 U Ricochet
+51 R Spark Fiend
+52 R Strategy, Schmategy
+53 U The Ultimate Nightmare of Wizards of the Coast Customer Service
+54 R Cardboard Carapace
+55 C Double Play
+56 C Elvish Impersonators
+57 U Flock of Rabid Sheep
+58 C Free-Range Chicken
+59 U Gerrymandering
+60 C Ghazban Ogress
+61 C Growth Spurt
+62 C Gus
+63 U Hungry Hungry Heifer
+64 R Incoming!
+65 R Mine, Mine, Mine!
+66 R Squirrel Farm
+67 C Team Spirit
+68 R Timmy, Power Gamer
+69 R Ashnod's Coupon
+70 R Blacker Lotus
+71 U Bronze Calendar
+72 C Chaos Confetti
+73 U Clay Pigeon
+74 R Giant Fan
+75 R Jack-in-the-Mox
+76 R Jester's Sombrero
+77 R Mirror Mirror
+78 C Paper Tiger
+79 C Rock Lobster
+80 C Scissors Lizard
+81 U Spatula of the Ages
+82 U Urza's Contact Lenses
+83 U Urza's Science Fair Project
 84 L Plains
 85 L Island
 86 L Swamp
@@ -20,4 +106,4 @@ b_2_2_zombie
 r_1_1_goblin
 r_4_4_giant_chicken
 g_0_1_sheep
-g_1_1_squirrel
\ No newline at end of file
+g_1_1_squirrel
diff --git a/forge-gui/res/editions/Unhinged.txt b/forge-gui/res/editions/Unhinged.txt
index 46c3d6f025a..fa4df51a96d 100644
--- a/forge-gui/res/editions/Unhinged.txt
+++ b/forge-gui/res/editions/Unhinged.txt
@@ -3,17 +3,156 @@ Code=UNH
 Date=2004-11-20
 Name=Unhinged
 MciCode=uh
-Type=Other
+Type=OtherType=Expansion
+BoosterCovers=3
+Booster=10 Common, 3 Uncommon, 1 BasicLand, 1 Rare
+FoilAlwaysInCommonSlot=False
 
 [cards]
+1 U Atinlay Igpay
+2 C AWOL
+3 U Bosom Buddy
+4 C Cardpecker
+5 C Cheap Ass
+6 C Circle of Protection: Art
+7 R Collector Protector
+8 R Drawn Together
+9 U Emcee
+10 C Erase (Not the Urza's Legacy One)
+11 C Fascist Art Director
+12 U First Come, First Served
+13 R Frankie Peanuts
+14 U Head to Head
+15 U Ladies' Knight
+16 C Little Girl
+17 R Look at Me, I'm R&D
+18 C Man of Measure
+19 U Save Life
+20 C Standing Army
+21 R Staying Power
+22 C Wordmail
+23 U _
+24 R Ambiguity
+25 C Artful Looter
+26 R Avatar of Me
+27 C Brushstroke Paintermage
+28 C Bursting Beebles
+29 C Carnivorous Death-Parrot
+30 U Cheatyface
+31 C Double Header
+32 C Flaccify
+33 C Framed!
+34 R Greater Morphling
+35 R Johnny, Combo Player
+36 C Loose Lips
+37 U Magical Hacker
+38 U Mise
+39 C Moniker Mage
+40 U Mouth to Mouth
+41 R Now I Know My ABC's
+42 C Number Crunch
+43 U Question Elemental?
+44 R Richard Garfield, Ph.D.
+45 C Smart Ass
+46 U Spell Counter
+47 R Topsy Turvy
+48 R Aesthetic Consultation
+49 C Bad Ass
+50 C Bloodletter
+51 U Booster Tutor
+52 C Duh
+53 R Enter the Dungeon
+54 U Eye to Eye
+55 C The Fallen Apart
+56 C Farewell to Arms
+57 R Infernal Spawn of Infernal Spawn of Evil
+58 U Kill! Destroy!
+59 C Mother of Goons
+60 R Necro-Impotence
+61 U Persecute Artist
+62 U Phyrexian Librarian
+63 C Stop That
+64 C Tainted Monkey
+65 C Vile Bile
+66 C Wet Willie of the Damned
+67 C When Fluffy Bunnies Attack
+68 U Working Stiff
+69 U Zombie Fanboy
+70 R Zzzyxas's Abyss
+71 R Assquatch
+72 R Blast from the Past
+73 R Curse of the Fire Penguin
+74 U Deal Damage
+75 C Dumb Ass
+76 U Face to Face
+77 C Frazzled Editor
+78 C Goblin Mime
+79 C Goblin Secret Agent
+80 C Goblin S.W.A.T. Team
+81 C Mana Flair
+82 C Mons's Goblin Waiters
+83 C Orcish Paratroopers
+84 C Punctuate
+85 U Pygmy Giant
+86 C Red-Hot Hottie
+87 U Rocket-Powered Turbo Slug
+88 C Saute
+89 U Six-y Beast
+90 C Touch and Go
+91 R Yet Another Aether Vortex
+92 R B-I-N-G-O
+93 U Creature Guy
+94 U Elvish House Party
+95 C Fat Ass
+96 R Form of the Squirrel
+97 R Fraction Jackson
+98 U Gluetius Maximus
+99 U Granny's Payback
+100 C Graphic Violence
+101 C Keeper of the Sacred Word
+102 C Land Aid '04
+103 C Laughing Hyena
+104 C Monkey Monkey Monkey
+105 U Name Dropping
+106 R Old Fogey
+107 C Our Market Research Shows That Players Like Really Long Card Names So We Made this Card to Have the Absolute Longest Card Name Ever Elemental
+108 C Remodel
+109 C Shoe Tree
+110 U Side to Side
+111 C S.N.O.T.
+112 U Stone-Cold Basilisk
+113 C Supersize
+114 U Symbol Status
+115 R Uktabi Kong
+116 R "Ach! Hans, Run!"
+117 R Ass Whuppin'
+118 R Meddling Kids
+119 R Rare-B-Gone
+120 R Who // What // When // Where // Why
+121 R Gleemax
+122 R Letter Bomb
+123 U Mana Screw
+124 R Mox Lotus
+125 U My First Tome
+126 R Pointy Finger of Doom
+127 U Rod of Spanking
+128 R Time Machine
+129 U Togglodyte
+130 U Toy Boat
+131 U Urza's Hot Tub
+132 R Water Gun Balloon Game
+133 R World-Bottling Kit
+134 R City of Ass
+135 R R&D's Secret Lair
 136 L Plains
 137 L Island
 138 L Swamp
 139 L Mountain
 140 L Forest
+141 S Super Secret Tech
 
 [tokens]
 r_1_1_goblin
 g_1_1_ape
 g_3_3_ape
-g_1_1_squirrel
\ No newline at end of file
+g_1_1_squirrel
diff --git a/forge-gui/res/editions/Unsanctioned.txt b/forge-gui/res/editions/Unsanctioned.txt
index fbf14409c41..4c86652ee91 100644
--- a/forge-gui/res/editions/Unsanctioned.txt
+++ b/forge-gui/res/editions/Unsanctioned.txt
@@ -7,6 +7,92 @@ MciCode=und
 Type=Other
 
 [cards]
+1 C Adorable // Kitten
+2 C AWOL
+3 U Emcee
+4 R Flavor Judge
+5 R Frankie Peanuts
+6 C GO TO JAIL
+7 C Humming-
+8 C Knight of the Hokey Pokey
+9 R Look at Me, I'm R&D
+10 R Look at Me, I'm the DCI
+11 C Old Guard
+12 C Ordinary Pony
+13 R Staying Power
+14 U Strutting Turkey
+15 R Syr Cadian, Knight Owl
+16 R Alexander Clamilton
+17 R Avatar of Me
+18 M B.O.B. (Bevy of Beebles)
+19 C Carnivorous Death-Parrot
+20 U Cheatyface
+21 R Chicken à la King
+22 U Common Courtesy
+23 R Johnny, Combo Player
+24 C Magic Word
+25 C Mer Man
+26 R Richard Garfield, Ph.D.
+27 U Rings a Bell
+28 C Time Out
+29 U Topsy Turvy
+30 C Wall of Fortune
+31 R Acornelia, Fashionable Filcher
+32 U Bat-
+33 U Booster Tutor
+34 C Dirty Rat
+35 C Duh
+36 R Enter the Dungeon
+37 C Hoisted Hireling
+38 R Infernal Spawn of Evil
+39 R Infernal Spawn of Infernal Spawn of Evil
+40 R Infernius Spawnington III, Esq.
+41 U Inhumaniac
+42 U Jumbo Imp
+43 C Poultrygeist
+44 U Skull Saucer
+45 C Snickering Squirrel
+46 C Stinging Scorpion
+47 U Abstract Iguanart
+48 R Blast from the Past
+49 R Boomstacker
+50 C Common Iguana
+51 U Goblin Haberdasher
+52 C Goblin S.W.A.T. Team
+53 U Goblin Tutor
+54 M Infinity Elemental
+55 C Painiac
+56 U Six-y Beast
+57 R Stet, Draconic Proofreader
+58 R Strategy, Schmategy
+59 U Super-Duper Death Ray
+60 R Yet Another Aether Vortex
+61 R B-I-N-G-O
+62 C Elvish Impersonators
+63 C Free-Range Chicken
+64 C Growth Spurt
+65 U Half-Squirrel, Half-
+66 C Mother Kangaroo
+67 R Old Fogey
+68 R Pippa, Duchess of Dice
+69 U Slaying Mantis
+70 U Spirit of the Season
+71 R Squirrel Farm
+72 M Surgeon Commander
+73 R Timmy, Power Gamer
+74 C Wild Crocodile
+75 R Who // What // When // Where // Why
+76 U Bronze Calendar
+77 U Entirely Normal Armchair
+78 R Jack-in-the-Mox
+79 U Krark's Other Thumb
+80 C Paper Tiger
+81 R Pointy Finger of Doom
+82 C Rock Lobster
+83 C Scissors Lizard
+84 M Sword of Dungeons & Dragons
+85 R Water Balloon Game
+86 C Underdome
 87 L Plains
 88 L Plains
 89 L Island
diff --git a/forge-gui/res/editions/Unstable.txt b/forge-gui/res/editions/Unstable.txt
index efa45ccd3cb..ee3563f1849 100644
--- a/forge-gui/res/editions/Unstable.txt
+++ b/forge-gui/res/editions/Unstable.txt
@@ -4,9 +4,267 @@ Date=2017-12-08
 Name=Unstable
 MciCode=ust
 Type=Other
+Type=Expansion
+BoosterCovers=1
+Booster=11 Common, 3 Uncommon, 1 Rare
+FoilAlwaysInCommonSlot=False
 
 [cards]
+6 M Do-It-Yourself Seraph
+7 U Gimme Five
+8 C GO TO JAIL
+9 U Half-Kitten, Half-
+10 C Humming-
+11 R Jackknight
+U Knight of the Kitchen Sink A
+U Knight of the Kitchen Sink B
+U Knight of the Kitchen Sink C
+U Knight of the Kitchen Sink D
+U Knight of the Kitchen Sink E
+U Knight of the Kitchen Sink F
+13 U Knight of the Widget
+14 U Midlife Upgrade
+15 R Oddly Uneven
+16 C Old Guard
+17 C Ordinary // Pony
+18 U Rhino-
+19 C Riveting Rigger
+20 R Rules Lawyer
+21 C Sacrifice Play
+22 C Shaggy // Camel
+23 U Side Quest
+24 C Success!
+25 U Teacher's Pet
+26 R Animate Library
+27 C Blurry Beeble
+28 C Chipper Chopper
+29 R Clocknapper
+30 C Crafty // Octopus
+31 U Crow Storm
+32 C Defective Detective
+33 U Five-Finger Discount
+34 R Graveyard Busybody
+35 U Half-Shark, Half-
+36 R Incite Insight
+37 U Kindly Cognician
+38 C Magic Word
+39 C Mer // Man
+40 U More or Less
+C Novellamental
+C Novellamental
+C Novellamental
+C Novellamental
+42 C Numbing // Jellyfish
+43 U S.N.E.A.K. Dispatcher
+44 U Socketed Sprocketer
+45 C Spell Suck
+46 U Spy Eye
+47 U Suspicious Nanny
+48 C Time Out
+R Very Cryptic Command A
+R Very Cryptic Command B
+R Very Cryptic Command C
+R Very Cryptic Command D
+R Very Cryptic Command E
+R Very Cryptic Command F
+50 C Wall of Fortune
+51 C Big Boa // Constrictor
+52 C capital offense
+53 C Dirty // Rat
+C Extremely Slow Zombie
+C Extremely Slow Zombie
+C Extremely Slow Zombie
+C Extremely Slow Zombie
+55 C Finders, Keepers
+56 R Hangman
+57 C Hazmat Suit (Used)
+58 C Hoisted Hireling
+59 U Inhumaniac
+60 R Masterful Ninja
+61 U Ninja
+62 U Old-Fashioned Vampire
+63 R Over My Dead Bodies
+64 U Overt Operative
+65 U "Rumors of My Death..."
+66 U Skull Saucer
+U Sly Spy A
+U Sly Spy B
+U Sly Spy C
+U Sly Spy D
+U Sly Spy E
+U Sly Spy F
+68 C Snickering Squirrel
+69 R Spike, Tournament Grinder
+70 U Squirrel-Powered Scheme
+71 C Steady-Handed Mook
+72 C Stinging // Scorpion
+73 C Subcontract
+74 M Summon the Pack
+75 U Zombified
+76 R The Big Idea
+77 C Box of Free-Range Goblins
+78 C Bumbling // Pangolin
+79 C Common // Iguana
+80 R The Countdown Is at One
+81 C Feisty // Stegosaurus
+U Garbage Elemental A
+U Garbage Elemental B
+U Garbage Elemental C
+U Garbage Elemental D
+U Garbage Elemental E
+U Garbage Elemental F
+83 U Goblin Haberdasher
+84 U Half-Orc, Half-
+85 C Hammer Helper
+86 U Hammer Jammer
+87 U Hammerfest Boomtacular
+88 M Infinity Elemental
+89 C It That Gets Left Hanging
+90 C Just Desserts
+91 C Painiac
+92 U Party Crasher
 93 R Steamflogger Boss
+94 R Steamflogger of the Month
+95 U Steamflogger Temp
+96 U Steamfloggery
+97 U Super-Duper Death Ray
+C Target Minotaur
+C Target Minotaur
+C Target Minotaur
+C Target Minotaur
+99 R Three-Headed Goblin
+100 C Work a Double
+101 C Wrench-Rigger
+102 R As Luck Would Have It
+C Beast in Show
+C Beast in Show
+C Beast in Show
+C Beast in Show
+104 U Chittering Doom
+105 U Clever Combo
+106 U Druid of the Sacred Beaker
+107 C Eager // Beaver
+108 R Earl of Squirrel
+109 U First Pick
+110 U Ground Pounder
+111 U Half-Squirrel, Half-
+112 R Hydradoodle
+R Ineffable Blessing A
+R Ineffable Blessing B
+R Ineffable Blessing C
+R Ineffable Blessing D
+R Ineffable Blessing E
+R Ineffable Blessing F
+114 C Joyride Rigger
+115 U Monkey-
+116 C Mother // Kangaroo
+117 C Multi-Headed
+118 C Really Epic Punch
+119 C Selfie Preservation
+120 R Serpentine
+121 U Shellephant
+122 U Slaying Mantis
+123 C Squirrel Dealer
+124 U Steamflogger Service Rep
+125 C Wild // Crocodile
+126 C Willing Test Subject
+127 M Baron Von Count
+128 R Better Than One
+129 R Cramped Bunker
+130 M Dr. Julius Jumblemorph
+131 M The Grand Calcutron
+132 R Grusilda, Monster Masher
+133 R Hot Fix
+134 M Ol' Buzzbark
+135 M Phoebe, Head of S.N.E.A.K.
+136 M Urza, Academy Headmaster
+137 R X
+138 R Mary O'Kill
+139 R Angelic // Rocket
+140 U Border Guardian
+141 U Buzzing Whack-a-Doodle
+142 U Clock of DOOOOOOOOOOOOM!
+143 U Cogmentor
+144 U Contraption Cannon
+C Curious Killbot
+C Delighted Killbot
+C Despondent Killbot
+C Enraged Killbot
+146 U Entirely Normal Armchair
+R Everythingamajig A
+R Everythingamajig B
+R Everythingamajig C
+R Everythingamajig D
+R Everythingamajig E
+R Everythingamajig F
+148 C Gnome-Made // Engine
+149 R Handy Dandy Clone Machine
+150 R Kindslaver
+151 U Krark's Other Thumb
+152 U Labro // Bot
+153 U Lobe Lobber
+154 C Mad Science Fair Project
+155 R Modular Monstrosity
+156 U Proper Laboratory Attire
+157 U Robo-
+158 R Split Screen
+159 U Staff of the Letter Magus
+160 U Stamp of Approval
+161 U Steam-Powered
+162 U Steel Squirrel
+163 M Sword of Dungeons & Dragons
+164 C Voracious // Vacuum
+C Secret Base
+C Secret Base
+C Secret Base
+C Secret Base
+C Secret Base
+166 R Watermarket
+167 U Accessories to Murder
+168 C Applied Aeronautics
+169 U Arms Depot
+170 C Auto-Key
+171 M Bee-Bee Gun
+172 C Boomflinger
+173 C Buzz Buggy
+174 R Deadly Poison Sampler
+175 C Dictation Quillograph
+176 U Dispatch Dispensary
+177 C Division Table
+178 U Dogsnail Engine
+179 R Dual Doomsuits
+180 R Duplication Device
+181 M Faerie Aerie
+182 U Genetic Recombinator
+183 R Gift Horse
+184 U Gnomeball Machine
+185 R Goblin Slingshot
+186 R Guest List
+187 M Hard Hat Area
+188 C Head Banger
+189 R Hypnotic Swirly Disc
+190 C Inflation Station
+191 U Insufferable Syphon
+192 U Jamming Device
+193 C Lackey Recycler
+194 C Mandatory Friendship Shackles
+195 U Neural Network
+196 R Oaken Power Suit
+197 U Optical Optimizer
+198 M Pet Project
+199 C Quick-Stick Lick Trick
+200 M Rapid Prototyper
+201 R Record Store
+202 R Refibrillator
+203 C Sap Sucker
+204 U Sundering Fork
+205 U Targeting Rocket
+206 U Thud-for-Duds
+207 C Top-Secret Tunnel
+208 C Tread Mill
+209 U Turbo-Thwacking Auto-Hammer
+210 C Twiddlestick Charger
+211 U Widget Contraption
 212 L Plains
 213 L Island
 214 L Swamp
@@ -51,4 +309,4 @@ wubrg_4_4_dragon
 c_a_clue_draw
 c_a_clue_draw
 c_x_x_a_construct
-c_1_1_a_gnome
\ No newline at end of file
+c_1_1_a_gnome
diff --git a/forge-gui/res/lists/TypeLists.txt b/forge-gui/res/lists/TypeLists.txt
index ca88ebedd55..b1300df41b6 100644
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -52,12 +52,14 @@ Centaur:Centaurs
 Cephalid:Cephalids
 Chimera:Chimeras
 Citizen:Citizens
+Clamfolk:Clamfolk
 Cleric:Clerics
 Cockatrice:Cockatrices
 Construct:Constructs
 Coward:Cowards
 Crab:Crabs
 Crocodile:Crocodiles
+Cyborg:Cyborgs
 Cyclops:Cyclopes
 Dauthi:Dauthis
 Demigod:Demigods
@@ -122,6 +124,7 @@ Jackal:Jackals
 Jellyfish:Jellyfishes
 Juggernaut:Juggernauts
 Kavu:Kavu
+Killbot:Killbots
 Kirin:Kirins
 Kithkin:Kithkins
 Knight:Knights
@@ -229,6 +232,7 @@ Spike:Spikes
 Spirit:Spirits
 Splinter:Splinters
 Sponge:Sponges
+Spy:Spies
 Squid:Squids
 Squirrel:Squirrels
 Starfish:Starfish
@@ -276,7 +280,7 @@ Curse
 Saga
 Shrine
 [ArtifactTypes]
-Clue
+Clue:Clues
 Contraption
 Equipment
 Food
@@ -327,6 +331,7 @@ Samut
 Sarkhan
 Serra
 Sorin
+Stone
 Szat
 Tamiyo
 Teferi