diff --git a/forge-gui/res/cardsfolder/a/arctic_aven.txt b/forge-gui/res/cardsfolder/a/arctic_aven.txt
index 7148e8a4120..b2d3952c883 100644
--- a/forge-gui/res/cardsfolder/a/arctic_aven.txt
+++ b/forge-gui/res/cardsfolder/a/arctic_aven.txt
@@ -1,6 +1,6 @@
 Name:Arctic Aven
 ManaCost:2 U
-Types:Creature Bird
+Types:Creature Bird Wizard
 PT:2/1
 K:Flying
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control a Plains.
diff --git a/forge-gui/res/cardsfolder/a/arms_dealer.txt b/forge-gui/res/cardsfolder/a/arms_dealer.txt
index ef96e0841d8..4a2cdf68879 100644
--- a/forge-gui/res/cardsfolder/a/arms_dealer.txt
+++ b/forge-gui/res/cardsfolder/a/arms_dealer.txt
@@ -1,6 +1,6 @@
 Name:Arms Dealer
 ManaCost:2 R
-Types:Creature Goblin
+Types:Creature Goblin Rogue
 PT:1/1
 A:AB$ DealDamage | Cost$ 1 R Sac<1/Goblin> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
 DeckHints:Type$Goblin
diff --git a/forge-gui/res/cardsfolder/a/ashen_firebeast.txt b/forge-gui/res/cardsfolder/a/ashen_firebeast.txt
index abcca77e6cb..4f939ef4439 100644
--- a/forge-gui/res/cardsfolder/a/ashen_firebeast.txt
+++ b/forge-gui/res/cardsfolder/a/ashen_firebeast.txt
@@ -1,6 +1,6 @@
 Name:Ashen Firebeast
 ManaCost:6 R R
-Types:Creature Beast
+Types:Creature Elemental Beast
 PT:6/6
 A:AB$ DamageAll | Cost$ 1 R | ValidCards$ Creature.withoutFlying | NumDmg$ 1 | ValidDescription$ each creature without flying. | SpellDescription$ CARDNAME deals 1 damage to each creature without flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ashen_firebeast.jpg
diff --git a/forge-gui/res/cardsfolder/c/chaos_moon.txt b/forge-gui/res/cardsfolder/c/chaos_moon.txt
index 7c00e587d7b..c504f849fd6 100644
--- a/forge-gui/res/cardsfolder/c/chaos_moon.txt
+++ b/forge-gui/res/cardsfolder/c/chaos_moon.txt
@@ -1,7 +1,7 @@
 Name:Chaos Moon
 ManaCost:3 R
 Types:Enchantment
-T:Mode$Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigCount | TriggerDescription$ At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds R to his or her mana pool. If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type. (in addition to the mana the land produces)
+T:Mode$Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigCount | TriggerDescription$ At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds R to his or her mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
 SVar:TrigCount:AB$ Effect | Cost$ 0 | Triggers$ TrigRamp | SVars$ TrigMana | StaticAbilities$ STPump | ConditionCheckSVar$ X | ConditionSVarCompare$ M21 | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ RepCurse | SVars$ ProduceColorless | StaticAbilities$ STCurse | ConditionCheckSVar$ X | ConditionSVarCompare$ M20
 SVar:TrigRamp:Mode$ TapsForMana | ValidCard$ Mountain | Execute$ TrigMana | Static$ True | TriggerZones$ Command | TriggerDescription$ Whenever a player taps a Mountain for mana, that player adds R to his or her mana pool.
@@ -14,4 +14,4 @@ SVar:X:Count$Valid Permanent
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chaos_moon.jpg
-Oracle:At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to his or her mana pool. If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type. (in addition to the mana the land produces)
+Oracle:At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to his or her mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
diff --git a/forge-gui/res/cardsfolder/c/chub_toad.txt b/forge-gui/res/cardsfolder/c/chub_toad.txt
index 03fdb9ad7bb..6dbac98b911 100644
--- a/forge-gui/res/cardsfolder/c/chub_toad.txt
+++ b/forge-gui/res/cardsfolder/c/chub_toad.txt
@@ -1,6 +1,6 @@
 Name:Chub Toad
 ManaCost:2 G
-Types:Creature Toad
+Types:Creature Frog
 PT:1/1
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets +2/+2 until end of turn.
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/cinder_cloud.txt b/forge-gui/res/cardsfolder/c/cinder_cloud.txt
index af1af9edb98..18be7982e0e 100644
--- a/forge-gui/res/cardsfolder/c/cinder_cloud.txt
+++ b/forge-gui/res/cardsfolder/c/cinder_cloud.txt
@@ -1,6 +1,6 @@
 Name:Cinder Cloud
 ManaCost:3 R R
-Types:Sorcery
+Types:Instant
 A:SP$ Destroy | Cost$ 3 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberDestroyed$ True | SubAbility$ DBDamage | SpellDescription$ Destroy target creature. If a white creature dies this way, Cinder Cloud deals damage to that creature's controller equal to the creature's power.
 SVar:DBDamage:DB$ DealDamage | Defined$ RememberedController | NumDmg$ Z | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | References$ Y,Z
 SVar:Y:RememberedLKI$Valid Creature.White
diff --git a/forge-gui/res/cardsfolder/c/coral_eel.txt b/forge-gui/res/cardsfolder/c/coral_eel.txt
index e767afe49ad..2df11a52a06 100644
--- a/forge-gui/res/cardsfolder/c/coral_eel.txt
+++ b/forge-gui/res/cardsfolder/c/coral_eel.txt
@@ -1,6 +1,6 @@
 Name:Coral Eel
 ManaCost:1 U
-Types:Creature Eel
+Types:Creature Fish
 PT:2/1
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card84073.jpg
 Oracle:
diff --git a/forge-gui/res/cardsfolder/c/court_archers.txt b/forge-gui/res/cardsfolder/c/court_archers.txt
index e805adbff7b..f75be668ae2 100644
--- a/forge-gui/res/cardsfolder/c/court_archers.txt
+++ b/forge-gui/res/cardsfolder/c/court_archers.txt
@@ -1,6 +1,6 @@
 Name:Court Archers
 ManaCost:2 G
-Types:Creature Human Archers
+Types:Creature Human Archer
 PT:1/3
 K:Reach
 K:Exalted
diff --git a/forge-gui/res/cardsfolder/d/darksteel_juggernaut.txt b/forge-gui/res/cardsfolder/d/darksteel_juggernaut.txt
index 058a1d0ad26..30d0f6ad6af 100644
--- a/forge-gui/res/cardsfolder/d/darksteel_juggernaut.txt
+++ b/forge-gui/res/cardsfolder/d/darksteel_juggernaut.txt
@@ -1,7 +1,7 @@
 Name:Darksteel Juggernaut
 ManaCost:5
 Types:Artifact Creature Juggernaut
-PT:0/1
+PT:*/*
 K:Indestructible
 K:CARDNAME attacks each turn if able.
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of artifacts you control.
diff --git a/forge-gui/res/cardsfolder/d/dong_zhou_the_tyrant.txt b/forge-gui/res/cardsfolder/d/dong_zhou_the_tyrant.txt
index 440f736670e..0c1dadd4d76 100644
--- a/forge-gui/res/cardsfolder/d/dong_zhou_the_tyrant.txt
+++ b/forge-gui/res/cardsfolder/d/dong_zhou_the_tyrant.txt
@@ -1,6 +1,6 @@
 Name:Dong Zhou, the Tyrant
 ManaCost:4 R
-Types:Legendary Creature Human Soldiers
+Types:Legendary Creature Human Soldier
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDmgOpp | TriggerDescription$ When CARDNAME enters the battlefield, target creature an opponent controls deals damage equal to its power to that player.
 SVar:TrigDmgOpp:AB$ Pump | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target target creature an opponent controls | RememberObjects$ Targeted | SubAbility$ DBDmgOpp | StackDescription$ None | IsCurse$ True | SpellDescription$ Target creature an opponent controls deals damage equal to its power to that player.
diff --git a/forge-gui/res/cardsfolder/e/ertai_the_corrupted.txt b/forge-gui/res/cardsfolder/e/ertai_the_corrupted.txt
index 7cd5c6f76bc..9e0f1789f05 100644
--- a/forge-gui/res/cardsfolder/e/ertai_the_corrupted.txt
+++ b/forge-gui/res/cardsfolder/e/ertai_the_corrupted.txt
@@ -1,6 +1,6 @@
 Name:Ertai, the Corrupted
 ManaCost:2 W U B
-Types:Legendary Creature Wizard
+Types:Legendary Creature Human Wizard
 PT:3/4
 A:AB$ Counter | Cost$ U T Sac<1/Creature;Enchantment/creature or enchantment> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/e/ertai_wizard_adept.txt b/forge-gui/res/cardsfolder/e/ertai_wizard_adept.txt
index 19bde5f67a4..e660ee12a09 100644
--- a/forge-gui/res/cardsfolder/e/ertai_wizard_adept.txt
+++ b/forge-gui/res/cardsfolder/e/ertai_wizard_adept.txt
@@ -1,6 +1,6 @@
 Name:Ertai, Wizard Adept
 ManaCost:2 U
-Types:Legendary Creature Wizard
+Types:Legendary Creature Human Wizard
 PT:1/1
 A:AB$ Counter | Cost$ 2 U U T | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ertai_wizard_adept.jpg
diff --git a/forge-gui/res/cardsfolder/f/frenzied_goblin.txt b/forge-gui/res/cardsfolder/f/frenzied_goblin.txt
index 89388bf821b..e5eb653e217 100644
--- a/forge-gui/res/cardsfolder/f/frenzied_goblin.txt
+++ b/forge-gui/res/cardsfolder/f/frenzied_goblin.txt
@@ -1,6 +1,6 @@
 Name:Frenzied Goblin
 ManaCost:R
-Types:Creature Goblin Berzerker
+Types:Creature Goblin Berserker
 PT:1/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks, you may pay {R}. If you do, target creature can't block this turn.
 SVar:TrigPump:AB$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | KW$ HIDDEN CARDNAME can't block.
diff --git a/forge-gui/res/cardsfolder/g/ghosthelm_courier.txt b/forge-gui/res/cardsfolder/g/ghosthelm_courier.txt
index 8399a289ae1..b709434a269 100644
--- a/forge-gui/res/cardsfolder/g/ghosthelm_courier.txt
+++ b/forge-gui/res/cardsfolder/g/ghosthelm_courier.txt
@@ -1,6 +1,6 @@
 Name:Ghosthelm Courier
 ManaCost:2 U
-Types:Creature Wizard
+Types:Creature Human Wizard
 PT:2/1
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Pump | Cost$ 2 U T | ValidTgts$ Creature.Wizard | TgtPrompt$ Select target Wizard creature | UntilUntaps$ True | NumAtt$ +2 | NumDef$ +2 | KW$ Shroud | SpellDescription$ Target Wizard creature gets +2/+2 and has shroud for as long as CARDNAME remains tapped. (It can't be the target of spells or abilities.)
diff --git a/forge-gui/res/cardsfolder/g/goblin_spy.txt b/forge-gui/res/cardsfolder/g/goblin_spy.txt
index 22212082888..def747eaa41 100644
--- a/forge-gui/res/cardsfolder/g/goblin_spy.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_spy.txt
@@ -1,6 +1,6 @@
 Name:Goblin Spy
 ManaCost:R
-Types:Creature Goblin
+Types:Creature Goblin Rogue
 PT:1/1
 K:Play with the top card of your library revealed.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_spy.jpg
diff --git a/forge-gui/res/cardsfolder/g/goretusk_firebeast.txt b/forge-gui/res/cardsfolder/g/goretusk_firebeast.txt
index daba565d863..6dfb43fe2cc 100644
--- a/forge-gui/res/cardsfolder/g/goretusk_firebeast.txt
+++ b/forge-gui/res/cardsfolder/g/goretusk_firebeast.txt
@@ -1,6 +1,6 @@
 Name:Goretusk Firebeast
 ManaCost:5 R
-Types:Creature Beast
+Types:Creature Elemental Boar Beast
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 4 damage to target player.
 SVar:TrigDealDamage:DB$DealDamage | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 4
diff --git a/forge-gui/res/cardsfolder/g/grassland_crusader.txt b/forge-gui/res/cardsfolder/g/grassland_crusader.txt
index afc4fdc7252..c272d5d33ed 100644
--- a/forge-gui/res/cardsfolder/g/grassland_crusader.txt
+++ b/forge-gui/res/cardsfolder/g/grassland_crusader.txt
@@ -1,7 +1,7 @@
 Name:Grassland Crusader
 ManaCost:5 W
 Types:Creature Human Cleric Soldier
-PT:2/2
+PT:2/4
 A:AB$ Pump | Cost$ T | NumAtt$ +2 | NumDef$ +2 | ValidTgts$ Creature.Elf,Creature.Soldier | TgtPrompt$ Select target Elf or Soldier creature | SpellDescription$ Target Elf or Soldier creature gets +2/+2 until end of turn.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grassland_crusader.jpg
diff --git a/forge-gui/res/cardsfolder/g/graveborn_muse.txt b/forge-gui/res/cardsfolder/g/graveborn_muse.txt
index 9f2c9a66830..4640b75e500 100644
--- a/forge-gui/res/cardsfolder/g/graveborn_muse.txt
+++ b/forge-gui/res/cardsfolder/g/graveborn_muse.txt
@@ -1,6 +1,6 @@
 Name:Graveborn Muse
 ManaCost:2 B B
-Types: Creature Zombie Spirit
+Types:Creature Zombie Spirit
 PT:3/3
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, you draw X cards and you lose X life, where X is the number of Zombies you control.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ X | SubAbility$ DBLoseLife | References$ X
diff --git a/forge-gui/res/cardsfolder/i/impetuous_sunchaser.txt b/forge-gui/res/cardsfolder/i/impetuous_sunchaser.txt
index ee62d3b022d..48eecf731d9 100644
--- a/forge-gui/res/cardsfolder/i/impetuous_sunchaser.txt
+++ b/forge-gui/res/cardsfolder/i/impetuous_sunchaser.txt
@@ -1,6 +1,6 @@
 Name:Impetuous Sunchaser
 ManaCost:1 R
-Types:Creature Human Warrior
+Types:Creature Human Soldier
 PT:1/1
 K:Flying
 K:Haste
diff --git a/forge-gui/res/cardsfolder/i/incite_hysteria.txt b/forge-gui/res/cardsfolder/i/incite_hysteria.txt
index bf77315730d..bc9bc1c042a 100644
--- a/forge-gui/res/cardsfolder/i/incite_hysteria.txt
+++ b/forge-gui/res/cardsfolder/i/incite_hysteria.txt
@@ -1,6 +1,6 @@
 Name:Incite Hysteria
 ManaCost:2 R
-Types:Instant
+Types:Sorcery
 A:SP$Pump | Cost$ 2 R | ValidTgts$ Creature | Radiance$ True | KW$ CARDNAME can't block. | SpellDescription$ Radiance - Until end of turn, target creature and each other creature that shares a color with it gain "This creature can't block."
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/incite_hysteria.jpg
diff --git a/forge-gui/res/cardsfolder/i/intervention_pact.txt b/forge-gui/res/cardsfolder/i/intervention_pact.txt
index 3f0973d0f9e..a37cfa2bc29 100644
--- a/forge-gui/res/cardsfolder/i/intervention_pact.txt
+++ b/forge-gui/res/cardsfolder/i/intervention_pact.txt
@@ -13,4 +13,4 @@ SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Y
 SVar:TrigLoseGame:AB$ LosesGame | Cost$ 0 | UnlessCost$ 1 W W | UnlessPayer$ You | Defined$ You
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/intervention_pact.jpg
-Oracle:Instant\nThe next time a source of your choice would deal damage to you this turn, prevent that damage. You gain life equal to the damage prevented this way.\nAt the beginning of your next upkeep, pay {1}{W}{W}. If you don't, you lose the game.
+Oracle:The next time a source of your choice would deal damage to you this turn, prevent that damage. You gain life equal to the damage prevented this way.\nAt the beginning of your next upkeep, pay {1}{W}{W}. If you don't, you lose the game.
diff --git a/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt b/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt
index fcd9bba3467..56219459cbd 100644
--- a/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt
+++ b/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt
@@ -1,6 +1,6 @@
 Name:Knowledge Exploitation
 ManaCost:5 U U
-Types:Tribal Instant Rogue
+Types:Tribal Sorcery Rogue
 A:SP$ ChangeZone | Cost$ 5 U U | ValidTgts$ Opponent | Origin$ Library | Destination$ Library | ChangeType$ Instant,Sorcery | ChangeNum$ 1 | RememberChanged$ True | Reveal$ True | Shuffle$ False | DefinedPlayer$ Targeted | Chooser$ You | Mandatory$ True | SubAbility$ DBPlay | StackDescription$ Search {p:Targeted}'s library for an instant or sorcery card | SpellDescription$ Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles his or her library.
 A:SP$ ChangeZone | Cost$ 3 U | Activation$ Prowl | ValidTgts$ Opponent | Origin$ Library | Destination$ Library | ChangeType$ Instant,Sorcery | ChangeNum$ 1 | RememberChanged$ True | Reveal$ True | Shuffle$ False | PrecostDesc$ Prowl 3 U | DefinedPlayer$ Targeted | Chooser$ You | Mandatory$ True | SubAbility$ DBPlay | StackDescription$ Search {p:Targeted}'s library for an instant or sorcery card | SpellDescription$ (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Rogue.)
 SVar:DBPlay:DB$ Play | Defined$ Remembered | Controller$ You | WithoutManaCost$ True | Optional$ True | SubAbility$ DBShuffle
diff --git a/forge-gui/res/cardsfolder/m/midnight_ritual.txt b/forge-gui/res/cardsfolder/m/midnight_ritual.txt
index 03695c5a742..89421e178bc 100644
--- a/forge-gui/res/cardsfolder/m/midnight_ritual.txt
+++ b/forge-gui/res/cardsfolder/m/midnight_ritual.txt
@@ -1,6 +1,6 @@
 Name:Midnight Ritual
 ManaCost:X 2 B
-Types:Instant
+Types:Sorcery
 A:SP$ ChangeZone | Cost$ X 2 B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ MaxTgts | References$ MaxTgts | SubAbility$ DBToken | SpellDescription$ Exile X target creature cards from your graveyard. For each creature card exiled this way, put a 2/2 black Zombie creature token onto the battlefield.
 SVar:DBToken:DB$ Token | TokenImage$ b 2 2 zombie 10E | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ You | TokenAmount$ X | References$ X
 SVar:X:Targeted$Amount
diff --git a/forge-gui/res/cardsfolder/m/minotaur_explorer.txt b/forge-gui/res/cardsfolder/m/minotaur_explorer.txt
index 1057d8035fb..bc1e4400893 100644
--- a/forge-gui/res/cardsfolder/m/minotaur_explorer.txt
+++ b/forge-gui/res/cardsfolder/m/minotaur_explorer.txt
@@ -1,6 +1,6 @@
 Name:Minotaur Explorer
 ManaCost:1 R
-Types:Creature Minotaur
+Types:Creature Minotaur Scout
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you discard a card at random.
 SVar:TrigDiscard:AB$ Discard | Cost$ 0 | NumCards$ 1 | Mode$ Random | Optional$ True | RememberDiscarded$ True | SubAbility$ DBSacrifice
diff --git a/forge-gui/res/cardsfolder/o/oculus.txt b/forge-gui/res/cardsfolder/o/oculus.txt
index 7748c19d81c..e4a31ea169c 100644
--- a/forge-gui/res/cardsfolder/o/oculus.txt
+++ b/forge-gui/res/cardsfolder/o/oculus.txt
@@ -1,6 +1,6 @@
 Name:Oculus
 ManaCost:1 U
-Types:Creature Homonculus
+Types:Creature Homunculus
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ TriggeredCardController | NumCards$ 1
diff --git a/forge-gui/res/cardsfolder/o/one_with_nothing.txt b/forge-gui/res/cardsfolder/o/one_with_nothing.txt
index e06eec530df..770b46b8760 100644
--- a/forge-gui/res/cardsfolder/o/one_with_nothing.txt
+++ b/forge-gui/res/cardsfolder/o/one_with_nothing.txt
@@ -1,6 +1,6 @@
 Name:One with Nothing
 ManaCost:B
-Types:Sorcery
+Types:Instant
 A:SP$ Discard | Cost$ B | Mode$ Hand | SpellDescription$ Discard your hand.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/one_with_nothing.jpg
diff --git a/forge-gui/res/cardsfolder/p/pardic_lancer.txt b/forge-gui/res/cardsfolder/p/pardic_lancer.txt
index b6105d138a6..518b5fc5712 100644
--- a/forge-gui/res/cardsfolder/p/pardic_lancer.txt
+++ b/forge-gui/res/cardsfolder/p/pardic_lancer.txt
@@ -1,6 +1,6 @@
 Name:Pardic Lancer
 ManaCost:4 R
-Types:Creature Barbarian
+Types:Creature Human Barbarian
 PT:3/2
 A:AB$ Pump | Cost$ Discard<1/Random> | Defined$ Self | NumAtt$ +1 | KW$ First Strike | SpellDescription$ CARDNAME gets +1/+0 and gains first strike until end of turn.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/p/pensive_minotaur.txt b/forge-gui/res/cardsfolder/p/pensive_minotaur.txt
index fb393526517..2ffcb4ada17 100644
--- a/forge-gui/res/cardsfolder/p/pensive_minotaur.txt
+++ b/forge-gui/res/cardsfolder/p/pensive_minotaur.txt
@@ -1,6 +1,6 @@
 Name:Pensive Minotaur
 ManaCost:2 R
-Types:Creature Minotaur
+Types:Creature Minotaur Warrior
 PT:2/3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pensive_minotaur.jpg
 Oracle:
diff --git a/forge-gui/res/cardsfolder/p/phantom_monster.txt b/forge-gui/res/cardsfolder/p/phantom_monster.txt
index dc2f19eacca..2be6455ee7a 100644
--- a/forge-gui/res/cardsfolder/p/phantom_monster.txt
+++ b/forge-gui/res/cardsfolder/p/phantom_monster.txt
@@ -1,6 +1,6 @@
 Name:Phantom Monster
 ManaCost:3 U
-Types:Creature Phantasm
+Types:Creature Illusion
 PT:3/3
 K:Flying
 SVar:Picture:http://resources.wizards.com/magic/cards/5e/en-us/card3929.jpg
diff --git a/forge-gui/res/cardsfolder/r/raging_minotaur.txt b/forge-gui/res/cardsfolder/r/raging_minotaur.txt
index 4aea3fb530f..5d6b0e04938 100644
--- a/forge-gui/res/cardsfolder/r/raging_minotaur.txt
+++ b/forge-gui/res/cardsfolder/r/raging_minotaur.txt
@@ -1,6 +1,6 @@
 Name:Raging Minotaur
 ManaCost:2 R R
-Types:Creature Minotaur
+Types:Creature Minotaur Berserker
 PT:3/3
 K:Haste
 SVar:Picture:http://resources.wizards.com/magic/cards/po/en-us/card4358.jpg
diff --git a/forge-gui/res/cardsfolder/r/realm_seekers.txt b/forge-gui/res/cardsfolder/r/realm_seekers.txt
index 295feb24f8c..c05be6325fe 100644
--- a/forge-gui/res/cardsfolder/r/realm_seekers.txt
+++ b/forge-gui/res/cardsfolder/r/realm_seekers.txt
@@ -1,6 +1,6 @@
 Name:Realm Seekers
 ManaCost:4 G G
-Types:Creature  Elf Scout
+Types:Creature Elf Scout
 PT:0/0
 K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the total number of cards in all players' hands.
 SVar:X:Count$ValidHand Card
diff --git a/forge-gui/res/cardsfolder/r/roar_of_the_crowd.txt b/forge-gui/res/cardsfolder/r/roar_of_the_crowd.txt
index 58baffa7016..559f0a01a84 100644
--- a/forge-gui/res/cardsfolder/r/roar_of_the_crowd.txt
+++ b/forge-gui/res/cardsfolder/r/roar_of_the_crowd.txt
@@ -1,6 +1,6 @@
 Name:Roar of the Crowd
 ManaCost:3 R
-Types:Instant
+Types:Sorcery
 A:SP$ ChooseType | Cost$ 3 R | Defined$ You | Type$ Creature | SubAbility$ DBDamage | SpellDescription$ Choose a creature type. CARDNAME deals damage to target creature or player equal to the number of permanents you control of the chosen type.
 SVar:DBDamage:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | References$ X
 SVar:X:Count$Valid Permanent.ChosenType+YouCtrl
diff --git a/forge-gui/res/cardsfolder/s/snowfall.txt b/forge-gui/res/cardsfolder/s/snowfall.txt
index a18badabd51..4b0f954523d 100644
--- a/forge-gui/res/cardsfolder/s/snowfall.txt
+++ b/forge-gui/res/cardsfolder/s/snowfall.txt
@@ -2,10 +2,10 @@ Name:Snowfall
 ManaCost:2 U
 Types:Enchantment
 K:Cumulative upkeep:U
-T:Mode$ TapsForMana | ValidCard$ Island | Execute$ TrigMana | Static$ True | TriggerZones$ Battlefield | OptionalDecider$ TriggeredCardController | TriggerDescription$ Whenever an Island is tapped for mana, its controller may add {U} to his or her mana pool. If that Island is snow, its controller may add {U}{U} to his or her mana pool instead. Spend this mana only to pay cumulative upkeep costs. (in addition to the mana the land produces)
+T:Mode$ TapsForMana | ValidCard$ Island | Execute$ TrigMana | Static$ True | TriggerZones$ Battlefield | OptionalDecider$ TriggeredCardController | TriggerDescription$ Whenever an Island is tapped for mana, its controller may add {U} to his or her mana pool (in addition to the mana the land produces). If that Island is snow, its controller may add {U}{U} to his or her mana pool instead. Spend this mana only to pay cumulative upkeep costs.
 SVar:TrigMana:DB$ Mana | Produced$ U | Amount$ 1 | Defined$ TriggeredCardController | RestrictValid$ CumulativeUpkeep | ConditionDefined$ TriggeredCard | ConditionPresent$ Land.Snow | ConditionCompare$ EQ0 | SubAbility$ DBMana
 SVar:DBMana:DB$ Mana | Produced$ U | Amount$ 2 | Defined$ TriggeredCardController | RestrictValid$ CumulativeUpkeep | ConditionDefined$ TriggeredCard | ConditionPresent$ Land.Snow | ConditionCompare$ GE1
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snowfall.jpg
-Oracle:Cumulative upkeep {U} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhenever an Island is tapped for mana, its controller may add {U} to his or her mana pool. If that Island is snow, its controller may add {U}{U} to his or her mana pool instead. Spend this mana only to pay cumulative upkeep costs. (in addition to the mana the land produces)
+Oracle:Cumulative upkeep {U} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhenever an Island is tapped for mana, its controller may add {U} to his or her mana pool (in addition to the mana the land produces). If that Island is snow, its controller may add {U}{U} to his or her mana pool instead. Spend this mana only to pay cumulative upkeep costs.
diff --git a/forge-gui/res/cardsfolder/s/spectral_sliver.txt b/forge-gui/res/cardsfolder/s/spectral_sliver.txt
index 39726e2fe77..845f762feb5 100644
--- a/forge-gui/res/cardsfolder/s/spectral_sliver.txt
+++ b/forge-gui/res/cardsfolder/s/spectral_sliver.txt
@@ -1,6 +1,6 @@
 Name:Spectral Sliver
 ManaCost:2 B
-Types:Creature Sliver
+Types:Creature Sliver Spirit
 PT:2/2
 S:Mode$ Continuous | Affected$ Creature.Sliver | AddAbility$ Pump | Description$ All Sliver creatures have "{2}: This creature gets +1/+1 until end of turn."
 SVar:Pump:AB$Pump | Cost$ 2 | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sphinxs_herald.txt b/forge-gui/res/cardsfolder/s/sphinxs_herald.txt
index 478ecd81375..77012404cb1 100644
--- a/forge-gui/res/cardsfolder/s/sphinxs_herald.txt
+++ b/forge-gui/res/cardsfolder/s/sphinxs_herald.txt
@@ -1,6 +1,6 @@
 Name:Sphinx's Herald
 ManaCost:U
-Types:Artifact Creature Veldalken Wizard
+Types:Artifact Creature Vedalken Wizard
 PT:1/1
 A:AB$ ChangeZone | Cost$ 2 U T Sac<1/Creature.White> Sac<1/Creature.Blue> Sac<1/Creature.Black> | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.namedSphinx Sovereign | ChangeNum$ 1 | CostDesc$ {2}{U}, {T}, Sacrifice a white creature, a blue creature, and a black creature: | SpellDescription$ Search your library for a card named Sphinx Sovereign and put it onto the battlefield. Then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sphinxs_herald.jpg
diff --git a/forge-gui/res/cardsfolder/s/spike_drone.txt b/forge-gui/res/cardsfolder/s/spike_drone.txt
index 4484706c396..3e06e6ca6f4 100644
--- a/forge-gui/res/cardsfolder/s/spike_drone.txt
+++ b/forge-gui/res/cardsfolder/s/spike_drone.txt
@@ -1,6 +1,6 @@
 Name:Spike Drone
 ManaCost:G
-Types:Creature Spike
+Types:Creature Spike Drone
 PT:0/0
 K:etbCounter:P1P1:1
 A:AB$ PutCounter | Cost$ 2 SubCounter<1/P1P1> | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
diff --git a/forge-gui/res/cardsfolder/s/subterranean_spirit.txt b/forge-gui/res/cardsfolder/s/subterranean_spirit.txt
index 79068c789a6..cb50fa407d3 100644
--- a/forge-gui/res/cardsfolder/s/subterranean_spirit.txt
+++ b/forge-gui/res/cardsfolder/s/subterranean_spirit.txt
@@ -1,6 +1,6 @@
 Name:Subterranean Spirit
 ManaCost:3 R R
-Types:Creature Elemental
+Types:Creature Elemental Spirit
 PT:3/3
 K:Protection from red
 A:AB$ DamageAll | Cost$ T | NumDmg$ 1 | ValidCards$ Creature.withoutFlying | ValidDescription$ each creature and without flying. | SpellDescription$ CARDNAME deals 1 damage to each creature without flying.
diff --git a/forge-gui/res/cardsfolder/s/sydri_galvanic_genius.txt b/forge-gui/res/cardsfolder/s/sydri_galvanic_genius.txt
index a7b93cba0e2..90cff9fe61e 100644
--- a/forge-gui/res/cardsfolder/s/sydri_galvanic_genius.txt
+++ b/forge-gui/res/cardsfolder/s/sydri_galvanic_genius.txt
@@ -1,6 +1,6 @@
 Name:Sydri, Galvanic Genius
 ManaCost:W U B
-Types:Legendary Creature Human Wizard
+Types:Legendary Creature Human Artificer
 PT:2/2
 A:AB$ Animate | Cost$ U | ValidTgts$ Artifact.nonCreature | TgtPrompt$ Select target noncreature artifact | Power$ X | Toughness$ X | Types$ Creature | References$ X | SpellDescription$ Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn.
 SVar:X:Targeted$CardManaCost
diff --git a/forge-gui/res/cardsfolder/t/talruum_minotaur.txt b/forge-gui/res/cardsfolder/t/talruum_minotaur.txt
index ad6f6957bd3..2a932e241c1 100644
--- a/forge-gui/res/cardsfolder/t/talruum_minotaur.txt
+++ b/forge-gui/res/cardsfolder/t/talruum_minotaur.txt
@@ -1,6 +1,6 @@
 Name:Talruum Minotaur
 ManaCost:2 R R
-Types:Creature Minotaur
+Types:Creature Minotaur Berserker
 PT:3/3
 K:Haste
 SVar:Picture:http://resources.wizards.com/magic/cards/6e/en-us/card14624.jpg
diff --git a/forge-gui/res/cardsfolder/t/thalakos_scout.txt b/forge-gui/res/cardsfolder/t/thalakos_scout.txt
index e27a9876f95..8441e198ef3 100644
--- a/forge-gui/res/cardsfolder/t/thalakos_scout.txt
+++ b/forge-gui/res/cardsfolder/t/thalakos_scout.txt
@@ -1,6 +1,6 @@
 Name:Thalakos Scout
 ManaCost:2 U
-Types:Creature Thakalos Soldier Scout
+Types:Creature Thalakos Soldier Scout
 PT:2/1
 K:Shadow
 A:AB$ ChangeZone | Cost$ Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/t/torch_slinger.txt b/forge-gui/res/cardsfolder/t/torch_slinger.txt
index 7116be3a157..67761131205 100644
--- a/forge-gui/res/cardsfolder/t/torch_slinger.txt
+++ b/forge-gui/res/cardsfolder/t/torch_slinger.txt
@@ -1,6 +1,6 @@
 Name:Torch Slinger
 ManaCost:2 R
-Types: Creature Goblin Shaman
+Types:Creature Goblin Shaman
 PT:2/2
 K:Kicker 1 R
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, it deals 2 damage to target creature.
diff --git a/forge-gui/res/cardsfolder/t/tormented_hero.txt b/forge-gui/res/cardsfolder/t/tormented_hero.txt
index a311487c425..630a9a0c833 100644
--- a/forge-gui/res/cardsfolder/t/tormented_hero.txt
+++ b/forge-gui/res/cardsfolder/t/tormented_hero.txt
@@ -1,6 +1,6 @@
 Name:Tormented Hero
 ManaCost:B
-Types:Creature Human Warior
+Types:Creature Human Warrior
 PT:2/1
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ SpellCast | ValidActivatingPlayer$ You | TargetsValid$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Heroic - Whenever you cast a spell that targets CARDNAME, each opponent loses 1 life. You gain life equal to the life lost this way.
diff --git a/forge-gui/res/cardsfolder/t/trained_orgg.txt b/forge-gui/res/cardsfolder/t/trained_orgg.txt
index 9bde928e5f3..e5413e771aa 100644
--- a/forge-gui/res/cardsfolder/t/trained_orgg.txt
+++ b/forge-gui/res/cardsfolder/t/trained_orgg.txt
@@ -1,6 +1,6 @@
 Name:Trained Orgg
 ManaCost:6 R
-Types:Creature Orgg Beast
+Types:Creature Orgg
 PT:6/6
 SVar:Picture:http://resources.wizards.com/magic/cards/p3/en-us/card21785.jpg
 Oracle:
diff --git a/forge-gui/res/cardsfolder/t/transmogrifying_licid.txt b/forge-gui/res/cardsfolder/t/transmogrifying_licid.txt
index c963e9967f1..8d09fab9686 100644
--- a/forge-gui/res/cardsfolder/t/transmogrifying_licid.txt
+++ b/forge-gui/res/cardsfolder/t/transmogrifying_licid.txt
@@ -1,6 +1,6 @@
 Name:Transmogrifying Licid
 ManaCost:3
-Types:Creature Artifact Licid
+Types:Artifact Creature Licid
 PT:2/2
 A:AB$ SetState | Cost$ 1 T | Defined$ Self | NewState$ Licid | SubAbility$ DBAttach | SpellDescription$ CARDNAME loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {1} to end this effect.
 SVar:DBAttach:DB$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
diff --git a/forge-gui/res/cardsfolder/u/unnatural_speed.txt b/forge-gui/res/cardsfolder/u/unnatural_speed.txt
index 961fce8dbf7..070f46bf0b9 100644
--- a/forge-gui/res/cardsfolder/u/unnatural_speed.txt
+++ b/forge-gui/res/cardsfolder/u/unnatural_speed.txt
@@ -1,6 +1,6 @@
 Name:Unnatural Speed
 ManaCost:R
-Types:Instant
+Types:Instant Arcane
 A:SP$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SpellDescription$ Target creature gains haste until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unnatural_speed.jpg
 Oracle:Target creature gains haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/w/wall_of_blossoms.txt b/forge-gui/res/cardsfolder/w/wall_of_blossoms.txt
index 43eaf4629bf..10f187534f3 100644
--- a/forge-gui/res/cardsfolder/w/wall_of_blossoms.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_blossoms.txt
@@ -1,6 +1,6 @@
 Name:Wall of Blossoms
 ManaCost:1 G
-Types:Creature Wall
+Types:Creature Plant Wall
 PT:0/4
 K:Defender
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
diff --git a/forge-gui/res/cardsfolder/w/wall_of_kelp.txt b/forge-gui/res/cardsfolder/w/wall_of_kelp.txt
index d5e065d55f8..9864a4b4b90 100644
--- a/forge-gui/res/cardsfolder/w/wall_of_kelp.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_kelp.txt
@@ -1,6 +1,6 @@
 Name:Wall of Kelp
 ManaCost:U U
-Types:Creature Wall
+Types:Creature Plant Wall
 PT:0/3
 K:Defender
 A:AB$ Token | Cost$ U U T | TokenAmount$ 1 | TokenName$ Plant Wall | TokenTypes$ Creature,Plant,Wall | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 0 | TokenToughness$ 1 | TokenKeywords$ Defender | SpellDescription$ Put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/w/warped_researcher.txt b/forge-gui/res/cardsfolder/w/warped_researcher.txt
index fa8ea02247e..cd8e31296cb 100644
--- a/forge-gui/res/cardsfolder/w/warped_researcher.txt
+++ b/forge-gui/res/cardsfolder/w/warped_researcher.txt
@@ -1,6 +1,6 @@
 Name:Warped Researcher
 ManaCost:4 U
-Types:Creature Wizard Mutant
+Types:Creature Human Wizard Mutant
 PT:3/4
 T:Mode$ Cycled | ValidCard$ Card | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player cycles a card, CARDNAME gains flying and shroud until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ Flying & Shroud
diff --git a/forge-gui/res/cardsfolder/w/warren_instigator.txt b/forge-gui/res/cardsfolder/w/warren_instigator.txt
index dd4ff484555..3118ddd247e 100644
--- a/forge-gui/res/cardsfolder/w/warren_instigator.txt
+++ b/forge-gui/res/cardsfolder/w/warren_instigator.txt
@@ -1,6 +1,6 @@
 Name:Warren Instigator
 ManaCost:R R
-Types:Creature Goblin Berseker
+Types:Creature Goblin Berserker
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigChange | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, you may put a Goblin creature card from your hand onto the battlefield.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Goblin | ChangeNum$ 1
 PT:1/1
diff --git a/forge-gui/res/cardsfolder/w/wind_spirit.txt b/forge-gui/res/cardsfolder/w/wind_spirit.txt
index 5c9f390f12b..3bf96327ad4 100644
--- a/forge-gui/res/cardsfolder/w/wind_spirit.txt
+++ b/forge-gui/res/cardsfolder/w/wind_spirit.txt
@@ -1,6 +1,6 @@
 Name:Wind Spirit
 ManaCost:4 U
-Types:Creature Spirit
+Types:Creature Elemental Spirit
 PT:3/2
 K:Flying
 K:CantBeBlockedByAmount LT2
diff --git a/forge-gui/res/cardsfolder/w/wirewood_elf.txt b/forge-gui/res/cardsfolder/w/wirewood_elf.txt
index a349a678f6b..067a8c133eb 100644
--- a/forge-gui/res/cardsfolder/w/wirewood_elf.txt
+++ b/forge-gui/res/cardsfolder/w/wirewood_elf.txt
@@ -1,6 +1,6 @@
 Name:Wirewood Elf
 ManaCost:1 G
-Types:Creature Elf
+Types:Creature Elf Druid
 PT:1/2
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
 SVar:Picture:http://resources.wizards.com/magic/cards/ons/en-us/card39828.jpg
diff --git a/forge-gui/res/cardsfolder/w/wizard_mentor.txt b/forge-gui/res/cardsfolder/w/wizard_mentor.txt
index c94d3c85a09..0385898a7f4 100644
--- a/forge-gui/res/cardsfolder/w/wizard_mentor.txt
+++ b/forge-gui/res/cardsfolder/w/wizard_mentor.txt
@@ -1,6 +1,6 @@
 Name:Wizard Mentor
 ManaCost:2 U
-Types:Creature Wizard
+Types:Creature Human Wizard
 PT:2/2
 A:AB$ ChangeZone | Cost$ T | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature. | SubAbility$ DBChangeZone | SpellDescription$ Return CARDNAME and target creature you control to owner's hand.
 SVar:DBChangeZone:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand
diff --git a/forge-gui/res/cardsfolder/w/wretched_banquet.txt b/forge-gui/res/cardsfolder/w/wretched_banquet.txt
index 62c8c08724f..ea6c2fe71ef 100644
--- a/forge-gui/res/cardsfolder/w/wretched_banquet.txt
+++ b/forge-gui/res/cardsfolder/w/wretched_banquet.txt
@@ -1,6 +1,6 @@
 Name:Wretched Banquet
 ManaCost:B
-Types:Instant
+Types:Sorcery
 A:SP$ Destroy | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | ConditionDefined$ Targeted | ConditionPresent$ Creature.leastPower | ConditionCompare$ EQ1 | SpellDescription$ Destroy target creature if it has the least power or is tied for least power among creatures on the battlefield.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wretched_banquet.jpg
diff --git a/forge-gui/res/cardsfolder/y/yew_spirit.txt b/forge-gui/res/cardsfolder/y/yew_spirit.txt
index bb3c0487e6b..814967dc288 100644
--- a/forge-gui/res/cardsfolder/y/yew_spirit.txt
+++ b/forge-gui/res/cardsfolder/y/yew_spirit.txt
@@ -1,6 +1,6 @@
 Name:Yew Spirit
 ManaCost:4 G
-Types:Creature Treefolk Spirit
+Types:Creature Spirit Treefolk
 PT:3/3
 A:AB$ Pump | Cost$ 2 G G | NumAtt$ +X | NumDef$ +X | References$ X | SpellDescription$ CARDNAME gets +X/+X until end of turn, where X is its power.
 SVar:X:Count$CardPower
diff --git a/forge-gui/res/cardsfolder/y/young_pyromancer.txt b/forge-gui/res/cardsfolder/y/young_pyromancer.txt
index f43a6f8ef77..806cca320f6 100644
--- a/forge-gui/res/cardsfolder/y/young_pyromancer.txt
+++ b/forge-gui/res/cardsfolder/y/young_pyromancer.txt
@@ -1,6 +1,6 @@
 Name:Young Pyromancer
 ManaCost:1 R
-Types: Creature Human Shaman
+Types:Creature Human Shaman
 PT:2/1
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you cast an instant or sorcery spell, put a 1/1 red Elemental creature token onto the battlefield.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ r 1 1 elemental2 M14 | TokenOwner$ You