diff --git a/forge-gui/res/cardsfolder/f/fresh_faced_recruit.txt b/forge-gui/res/cardsfolder/f/fresh_faced_recruit.txt
index 7703946ddcc..f5d5c72814e 100644
--- a/forge-gui/res/cardsfolder/f/fresh_faced_recruit.txt
+++ b/forge-gui/res/cardsfolder/f/fresh_faced_recruit.txt
@@ -1,6 +1,6 @@
 Name:Fresh-Faced Recruit
 ManaCost:1 R/W
-Types:Creature Human Solider
+Types:Creature Human Soldier
 PT:2/1
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ First Strike | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME has first strike.
 Oracle:As long as it's your turn, Fresh-Faced Recruit has first strike.
diff --git a/forge-gui/res/cardsfolder/p/pako_arcane_retriever.txt b/forge-gui/res/cardsfolder/p/pako_arcane_retriever.txt
index 9e77d5a4eab..838cf20ab35 100755
--- a/forge-gui/res/cardsfolder/p/pako_arcane_retriever.txt
+++ b/forge-gui/res/cardsfolder/p/pako_arcane_retriever.txt
@@ -1,6 +1,6 @@
 Name:Pako, Arcane Retriever
 ManaCost:3 R G
-Types:Legendary Creature Elemental Hound
+Types:Legendary Creature Elemental Dog
 PT:3/3
 K:Partner:Haldan, Avid Arcanist:Haldan
 K:Haste
diff --git a/forge-gui/res/cardsfolder/p/personal_decoy.txt b/forge-gui/res/cardsfolder/p/personal_decoy.txt
index 95ebe667d55..aa4e04e1ebd 100644
--- a/forge-gui/res/cardsfolder/p/personal_decoy.txt
+++ b/forge-gui/res/cardsfolder/p/personal_decoy.txt
@@ -1,6 +1,6 @@
 Name:Personal Decoy
 ManaCost:5 W U
-Types:Legendary Planeswalker Chandra
+Types:Planeswalker Duck
 Loyalty:X
 Text:CARDNAME enters the battlefield with a number of loyalty counters on it equal to your life total.
 SVar:X:Count$YourLifeTotal
diff --git a/forge-gui/res/cardsfolder/u/ursine_champion.txt b/forge-gui/res/cardsfolder/u/ursine_champion.txt
index 6e674de8c8f..43900ab0f13 100644
--- a/forge-gui/res/cardsfolder/u/ursine_champion.txt
+++ b/forge-gui/res/cardsfolder/u/ursine_champion.txt
@@ -1,6 +1,6 @@
 Name:Ursine Champion
 ManaCost:1 G
-Types:Creature Human Beserker
+Types:Creature Human Berserker
 A:AB$ Pump | Cost$ 5 G | Defined$ Self | NumAtt$ +3 | NumDef$ +3 | SubAbility$ DBAnimate | ActivationLimit$ 1 | SpellDescription$ CARDNAME gets +3/+3 and becomes a Bear Berserker until end of turn. Activate this ability only once each turn.
 SVar:DBAnimate:DB$Animate | Defined$ Self | Types$ Bear,Beserker | RemoveCreatureTypes$ True
 Oracle:{5}{G}: Ursine Champion gets +3/+3 and becomes a Bear Berserker until end of turn. Activate this ability only once each turn.
diff --git a/forge-gui/res/lists/TypeLists.txt b/forge-gui/res/lists/TypeLists.txt
index dee27cef6ab..a67c8c099ce 100644
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -37,6 +37,7 @@ Bat:Bats
 Bear:Bears
 Beast:Beasts
 Beeble:Beebles
+Beholder:Beholders
 Berserker:Berserkers
 Bird:Birds
 Blinkmoth:Blinkmoths
@@ -56,6 +57,7 @@ Clamfolk:Clamfolk
 Cleric:Clerics
 Cockatrice:Cockatrices
 Construct:Constructs
+Cow:Cows
 Coward:Cowards
 Crab:Crabs
 Crocodile:Crocodiles
@@ -92,6 +94,7 @@ Flagbearer:Flagbearers
 Fox:Foxes
 Frog:Frogs
 Fungus:Fungi
+Gamer:Gamers
 Gargoyle:Gargoyles
 Germ:Germs
 Giant:Giants
@@ -138,6 +141,8 @@ Leviathan:Leviathans
 Lhurgoyf:Lhurgoyfs
 Licid:Licids
 Lizard:Lizards
+Lobster:Lobsters
+Mammoth:Mammoths
 Manticore:Manticores
 Masticore:Masticores
 Mercenary:Mercenaries
@@ -288,6 +293,7 @@ Equipment
 Food
 Fortification
 Gold
+Key:Keys
 Treasure
 Vehicle
 [WalkerTypes]
@@ -296,6 +302,7 @@ Aminatou
 Angrath
 Arlinn
 Ashiok
+B.O.B.
 Basri
 Bolas
 Calix
@@ -305,12 +312,14 @@ Daretti
 Davriel
 Domri
 Dovin
+Duck
 Elspeth
 Estrid
 Freyalise
 Garruk
 Gideon
 Huatli
+Inzerva
 Jace
 Jaya
 Jeska