diff --git a/res/cardsfolder/geths_grimoire.txt b/res/cardsfolder/geths_grimoire.txt
index b5860a57ecf..0f0d90c458a 100644
--- a/res/cardsfolder/geths_grimoire.txt
+++ b/res/cardsfolder/geths_grimoire.txt
@@ -2,7 +2,8 @@ Name:Geth's Grimoire
 ManaCost:4
 Types:Artifact
 Text:no text
-K:WheneverKeyword:DiscardsCard:ControllingPlayer_Opponent:Play:DrawCards/1:ControllingPlayer_Self:ASAP:Yes_No:No Special Condition:Whenever an opponent discards a card, you may draw a card.
+T:Mode$ Discarded | ValidCard$ Card.YouDontCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent discards a card, you may draw a card.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/geths_grimoire.jpg
 SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/123.jpg
diff --git a/res/cardsfolder/ghitu_slinger.txt b/res/cardsfolder/ghitu_slinger.txt
index da466076fb2..51b565e8631 100644
--- a/res/cardsfolder/ghitu_slinger.txt
+++ b/res/cardsfolder/ghitu_slinger.txt
@@ -3,8 +3,9 @@ ManaCost:2 R
 Types:Creature Human Nomad
 Text:no text
 PT:2/2
-K:WheneverKeyword:EntersBattleField:Self:Play:Damage/2:InputType - CreatureORPlayer:ASAP:No_Condition:SingleTarget:When Ghitu Slinger enters the battlefield, it deals 2 damage to target creature or player.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 2 damage to target creature or player.
 K:Echo:2 R
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghitu_slinger.jpg
 SetInfo:ULG|Common|http://magiccards.info/scans/en/ul/77.jpg
diff --git a/res/cardsfolder/glade_gnarr.txt b/res/cardsfolder/glade_gnarr.txt
index ecb6653db4d..5e66c88ca6a 100644
--- a/res/cardsfolder/glade_gnarr.txt
+++ b/res/cardsfolder/glade_gnarr.txt
@@ -3,7 +3,8 @@ ManaCost:5 G
 Types:Creature Beast
 Text:no text
 PT:4/4
-K:WheneverKeyword:CastSpell/Any:Color/blue:Play:StatsPumpEOT/2/2:Self:ASAP:No_Condition:No Special Condition:Whenever a player casts a blue spell, Glade Gnarr gets +2/+2 until end of turn.
+T:Mode$ SpellCast | ValidCard$ Card.Blue | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a player casts a blue spell, CARDNAME gets +2/+2 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ You | NumAtt$ 2 | NumDef$ 2
 SVar:BuffedBy:Spell.Blue
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/glassdust_hulk.txt b/res/cardsfolder/glassdust_hulk.txt
index 9bc085bf974..c50c8173b3a 100644
--- a/res/cardsfolder/glassdust_hulk.txt
+++ b/res/cardsfolder/glassdust_hulk.txt
@@ -4,7 +4,8 @@ Types:Artifact Creature Golem
 Text:no text
 PT:3/4
 K:Cycling:WU
-K:WheneverKeyword:EntersBattleField:Type/Artifact:Play:KeywordPumpEOT/Unblockable!StatsPumpEOT/1/1:Self!Self:ASAP:No_Condition:Initiator - OwnedByController!Initiator - Other than Self:Whenever another artifact enters the battlefield under your control, Glassdust Hulk gets +1/+1 until end of turn and is unblockable this turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another artifact enters the battlefield under your control, CARDNAME gets +1/+1 until end of turn and is unblockable this turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Unblockable
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glassdust_hulk.jpg
diff --git a/res/cardsfolder/glaze_fiend.txt b/res/cardsfolder/glaze_fiend.txt
index 56da6566008..91514f3c56d 100644
--- a/res/cardsfolder/glaze_fiend.txt
+++ b/res/cardsfolder/glaze_fiend.txt
@@ -4,7 +4,8 @@ Types:Artifact Creature Illusion
 Text:no text
 PT:0/1
 K:Flying
-K:WheneverKeyword:EntersBattleField:Type/Artifact:Play:StatsPumpEOT/2/2:Self:ASAP:No_Condition:Initiator - OwnedByController!Initiator - Other than Self:Whenever another artifact enters the battlefield under your control, Glaze Fiend gets +2/+2 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | Execute$ TrigPump | TriggerDescrtiption$ Whenever another artifact enters the battlefield under your control, CARDNAME gets +2/+2 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glaze_fiend.jpg
diff --git a/res/cardsfolder/goblin_arsonist.txt b/res/cardsfolder/goblin_arsonist.txt
index d9594cc5fed..406e5e1cb55 100644
--- a/res/cardsfolder/goblin_arsonist.txt
+++ b/res/cardsfolder/goblin_arsonist.txt
@@ -3,7 +3,8 @@ ManaCost:R
 Types:Creature Goblin Shaman
 Text:no text
 PT:1/1
-K:WheneverKeyword:PermanentIntoGraveyard:Self:Graveyard:Damage/1:InputType - CreatureORPlayer:ASAP:No_Condition:SingleTarget:When Goblin Arsonist is put into a graveyard from the battlefield, you may have it deal 1 damage to target creature or player.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Optional$ True | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may have it deal 1 damage to target creature or player.
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_arsonist.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/147.jpg
diff --git a/res/cardsfolder/goblin_dirigible.txt b/res/cardsfolder/goblin_dirigible.txt
index 5ecc67644cb..e29fd4ef035 100644
--- a/res/cardsfolder/goblin_dirigible.txt
+++ b/res/cardsfolder/goblin_dirigible.txt
@@ -5,7 +5,8 @@ Text:no text
 PT:4/4
 K:Flying
 K:CARDNAME doesn't untap during your untap step.
-K:WheneverKeyword:BeginningOfUpkeep:No_Initiator:Play:UntapPermanent:Self:ASAP:PayMana/4:ControllerUpkeep:At the beginning of your upkeep, you may pay 4. If you do, untap Goblin Dirigible.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may pay 4. If you do, untap CARDNAME.
+SVar:TrigUntap:AB$Untap | Cost$ 4 | Defined$ Self
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_dirigible.jpg
 SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/177.jpg
diff --git a/res/cardsfolder/goblin_medics.txt b/res/cardsfolder/goblin_medics.txt
index a37c8a4e4fa..51c2935d333 100644
--- a/res/cardsfolder/goblin_medics.txt
+++ b/res/cardsfolder/goblin_medics.txt
@@ -3,7 +3,8 @@ ManaCost:2 R
 Types:Creature Goblin Shaman
 Text:no text
 PT:1/1
-K:WheneverKeyword:BecomesTapped:Self:Play:Damage/1:InputType - CreatureORPlayer:ASAP:No_Condition:SingleTarget:Whenever Goblin Medics becomes tapped, it deals 1 damage to target creature or player.
+T:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME becomes tapped, it deals 1 damage to target creature or player.
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_medics.jpg
 SetInfo:ULG|Common|http://magiccards.info/scans/en/ul/79.jpg
diff --git a/res/cardsfolder/goblin_war_wagon.txt b/res/cardsfolder/goblin_war_wagon.txt
index 47330f7262f..225ac0c4ba6 100644
--- a/res/cardsfolder/goblin_war_wagon.txt
+++ b/res/cardsfolder/goblin_war_wagon.txt
@@ -4,7 +4,8 @@ Types:Artifact Creature Juggernaut
 Text:no text
 PT:3/3
 K:CARDNAME doesn't untap during your untap step.
-K:WheneverKeyword:BeginningOfUpkeep:No_Initiator:Play:UntapPermanent:Self:ASAP:PayMana/2:ControllerUpkeep:At the beginning of your upkeep, you may pay 2. If you do, untap Goblin War Wagon.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may pay 2. If you do, untap CARDNAME.
+SVar:TrigUntap:AB$Untap | Cost$ 2 | Defined$ Self
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_war_wagon.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/179.jpg
diff --git a/res/cardsfolder/goldenglow_moth.txt b/res/cardsfolder/goldenglow_moth.txt
index 93ecfb8e73c..5e1e00a76f0 100644
--- a/res/cardsfolder/goldenglow_moth.txt
+++ b/res/cardsfolder/goldenglow_moth.txt
@@ -4,7 +4,8 @@ Types:Creature Insect
 Text:no text
 PT:0/1
 K:Flying
-K:WheneverKeyword:Blocks:Self:Play:ModifyLife/4:ControllingPlayer_Self:ASAP:Yes_No:No Special Condition:Whenever Goldenglow Moth blocks, you may gain 4 life.
+T:Mode$ Blocks | ValidCard$ Card.Self | Optional$ True | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME blocks, you may gain 4 life.
+SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goldenglow_moth.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/15.jpg
diff --git a/res/cardsfolder/grazing_gladehart.txt b/res/cardsfolder/grazing_gladehart.txt
index 56062bc7a9b..0c790453acc 100644
--- a/res/cardsfolder/grazing_gladehart.txt
+++ b/res/cardsfolder/grazing_gladehart.txt
@@ -3,7 +3,8 @@ ManaCost:2 G
 Types:Creature Antelope
 Text:no text
 PT:2/2
-K:WheneverKeyword:EntersBattleField:Type/Land:Play:ModifyLife/2:ControllingPlayer_Self:ASAP:Yes_No:Initiator - OwnedByController:Landfall - Whenever a land enters the battlefield under your control, you may gain 2 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | Optional$ True | Execute$ TrigGainLife | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you may gain 2 life.
+SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grazing_gladehart.jpg
 SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/163.jpg
diff --git a/res/cardsfolder/gristle_grinner.txt b/res/cardsfolder/gristle_grinner.txt
index 7df85447ac9..6c27e8b0b4e 100644
--- a/res/cardsfolder/gristle_grinner.txt
+++ b/res/cardsfolder/gristle_grinner.txt
@@ -3,7 +3,8 @@ ManaCost:4 B
 Types:Creature Zombie
 Text:no text
 PT:3/3
-K:WheneverKeyword:PermanentIntoGraveyard:Type/Creature:Play:StatsPumpEOT/2/2:Self:ASAP:No_Condition:No Special Condition:Whenever a creature is put into a graveyard from the battlefield, Gristle Grinner gets +2/+2 until end of turn.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature is put into a graveyard from the battlefield, CARDNAME gets +2/+2 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gristle_grinner.jpg
 SetInfo:CSP|Uncommon|http://magiccards.info/scans/en/cs/59.jpg
diff --git a/res/cardsfolder/grixis_slavedriver.txt b/res/cardsfolder/grixis_slavedriver.txt
index 03a44b76a43..f59f215e84e 100644
--- a/res/cardsfolder/grixis_slavedriver.txt
+++ b/res/cardsfolder/grixis_slavedriver.txt
@@ -3,8 +3,9 @@ ManaCost:5 B
 Types:Creature Zombie Giant
 Text:no text
 PT:4/4
-K:WheneverKeyword:LeavesBattleField:Self:Any:MakeToken-Zombie-B-2-2-None-/1:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:When Grixis Slavedriver leaves the battlefield, put a 2/2 black Zombie creature token onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME leaves the battlefield, put a 2/2 black Zombie creature token onto the battlefield.
 K:Unearth:3 B
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ Controller | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grixis_slavedriver.jpg
 SetInfo:CFX|Uncommon|http://magiccards.info/scans/en/cfx/46.jpg
diff --git a/res/cardsfolder/grizzled_wolverine.txt b/res/cardsfolder/grizzled_wolverine.txt
index cd8bfa8bcb7..e4f8cd9f350 100644
--- a/res/cardsfolder/grizzled_wolverine.txt
+++ b/res/cardsfolder/grizzled_wolverine.txt
@@ -3,7 +3,8 @@ ManaCost:1 R R
 Types:Creature Wolverine
 Text:no text
 PT:2/2
-K:WheneverKeyword:BecomesBlocked:Self:Play:StatsPumpEOT/2/0:Self:ASAP:PayMana/R:No Special Condition:Whenever Grizzled Wolverine becomes blocked, you may pay R. If you do, Grizzled Wolverine gets +2/+0 until end of turn.
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Optional$ True | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, you may pay R. If you do, CARDNAME gets +2/+0 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ R | Defined$ Self | NumAtt$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grizzled_wolverine.jpg
 SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/192.jpg