diff --git a/forge-gui/res/cardsfolder/g/goblin_goon.txt b/forge-gui/res/cardsfolder/g/goblin_goon.txt
index 9e033694361..2f4ed831921 100644
--- a/forge-gui/res/cardsfolder/g/goblin_goon.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_goon.txt
@@ -2,9 +2,9 @@ Name:Goblin Goon
 ManaCost:3 R
 Types:Creature Goblin Mutant
 PT:6/6
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ CARDNAME can't attack. & CARDNAME can't block. | CheckSVar$ X | SVarCompare$ LEY | Description$ CARDNAME can't attack unless you control more creatures than defending player. CARDNAME can't block unless you control more creatures than attacking player.
+S:Mode$ CantAttack | ValidCard$ Card.Self | UnlessDefender$ hasFewerCreaturesInPlayThanYou | Description$ CARDNAME can't attack unless you control more creatures than defending player.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ Y | SVarCompare$ GEX | Description$ CARDNAME can't block unless you control more creatures than attacking player.
 SVar:X:Count$Valid Creature.YouCtrl
-SVar:Y:Count$Valid Creature.YouDontCtrl
+SVar:Y:Count$Valid Creature.ActivePlayerCtrl
 SVar:BuffedBy:Creature
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_goon.jpg
 Oracle:Goblin Goon can't attack unless you control more creatures than defending player.\nGoblin Goon can't block unless you control more creatures than attacking player.
diff --git a/forge-gui/res/cardsfolder/m/mogg_toady.txt b/forge-gui/res/cardsfolder/m/mogg_toady.txt
index dae4a3a2d08..708375ed69d 100644
--- a/forge-gui/res/cardsfolder/m/mogg_toady.txt
+++ b/forge-gui/res/cardsfolder/m/mogg_toady.txt
@@ -2,9 +2,9 @@ Name:Mogg Toady
 ManaCost:1 R
 Types:Creature Goblin
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ CARDNAME can't attack. & CARDNAME can't block. | CheckSVar$ X | SVarCompare$ LEY | References$ X,Y | Description$ CARDNAME can't attack unless you control more creatures than defending player.CARDNAME can't block unless you control more creatures than attacking player.
+S:Mode$ CantAttack | ValidCard$ Card.Self | UnlessDefender$ hasFewerCreaturesInPlayThanYou | Description$ CARDNAME can't attack unless you control more creatures than defending player.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ Y | SVarCompare$ GEX | Description$ CARDNAME can't block unless you control more creatures than attacking player.
 SVar:X:Count$Valid Creature.YouCtrl
-SVar:Y:Count$Valid Creature.YouDontCtrl
+SVar:Y:Count$Valid Creature.ActivePlayerCtrl
 SVar:BuffedBy:Creature
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mogg_toady.jpg
 Oracle:Mogg Toady can't attack unless you control more creatures than defending player.\nMogg Toady can't block unless you control more creatures than attacking player.
diff --git a/forge-gui/res/cardsfolder/m/monstrous_hound.txt b/forge-gui/res/cardsfolder/m/monstrous_hound.txt
index 3f1660cd13e..1d1d9a05e88 100644
--- a/forge-gui/res/cardsfolder/m/monstrous_hound.txt
+++ b/forge-gui/res/cardsfolder/m/monstrous_hound.txt
@@ -2,8 +2,8 @@ Name:Monstrous Hound
 ManaCost:3 R
 Types:Creature Hound
 PT:4/4
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ CARDNAME can't attack. & CARDNAME can't block. | CheckSVar$ X | SVarCompare$ LEY | References$ X,Y | Description$ CARDNAME can't attack unless you control more lands than defending player. CARDNAME can't block unless you control more lands than attacking player.
+S:Mode$ CantAttack | ValidCard$ Card.Self | UnlessDefender$ hasFewerLandsInPlayThanYou | Description$ CARDNAME can’t attack unless you control more lands than defending player.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ Y | SVarCompare$ GEX | Description$ CARDNAME can't block unless you control more lands than attacking player.
 SVar:X:Count$Valid Land.YouCtrl
-SVar:Y:Count$Valid Land.YouDontCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/monstrous_hound.jpg
+SVar:Y:Count$Valid Land.ActivePlayerCtrl
 Oracle:Monstrous Hound can't attack unless you control more lands than defending player.\nMonstrous Hound can't block unless you control more lands than attacking player.