diff --git a/res/cardsfolder/saprazzan_raider.txt b/res/cardsfolder/saprazzan_raider.txt
index 2bdf75011ff..bd090805edf 100644
--- a/res/cardsfolder/saprazzan_raider.txt
+++ b/res/cardsfolder/saprazzan_raider.txt
@@ -3,7 +3,8 @@ ManaCost:2 U
 Types:Creature Merfolk
 Text:no text
 PT:1/2
-K:WheneverKeyword:BecomesBlocked:Self:Play:MoveFrom-Play-Hand:Self:ASAP:No_Condition:No Special Condition:When Saprazzan Raider becomes blocked, return it to its owner's hand.
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME becomes blocked, return it to its owner's hand.
+SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/saprazzan_raider.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/102.jpg
diff --git a/res/cardsfolder/scaled_hulk.txt b/res/cardsfolder/scaled_hulk.txt
index da7c3199c1f..4fac360add7 100644
--- a/res/cardsfolder/scaled_hulk.txt
+++ b/res/cardsfolder/scaled_hulk.txt
@@ -3,8 +3,8 @@ ManaCost:5 G
 Types:Creature Spirit
 Text:no text
 PT:4/4
-K:WheneverKeyword:CastSpell/Controller:Type/Arcane:Play:StatsPumpEOT/2/2:Self:ASAP:No_Condition:No Special Condition:Whenever you cast a Arcane spell, Scaled Hulk gets +2/+2 until end of turn.
-K:WheneverKeyword:CastSpell/Controller:Type/Spirit:Play:StatsPumpEOT/2/2:Self:ASAP:No_Condition:No Special Condition:Whenever you cast a Spirit spell, Scaled Hulk gets +2/+2 until end of turn.
+T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME gets +2/+2 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2
 SVar:BuffedBy:Arcane,Spirit
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scaled_hulk.jpg
diff --git a/res/cardsfolder/scrapheap.txt b/res/cardsfolder/scrapheap.txt
index c449b7afaa9..89731eaea79 100644
--- a/res/cardsfolder/scrapheap.txt
+++ b/res/cardsfolder/scrapheap.txt
@@ -2,7 +2,8 @@ Name:Scrapheap
 ManaCost:3
 Types:Artifact
 Text:no text
-K:WheneverKeyword:PermanentIntoGraveyard:OneTypeOfMany/Artifact/Enchantment:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:No_Condition:Initiator - OwnedByController:Whenever an artifact or enchantment is put into your graveyard from the battlefield, you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.YouCtrl,Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever an artifact or enchantment is put into your graveyard from the battlefield, you gain 1 life.
+SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scrapheap.jpg
 SetInfo:ULG|Rare|http://magiccards.info/scans/en/ul/132.jpg
diff --git a/res/cardsfolder/scroll_thief.txt b/res/cardsfolder/scroll_thief.txt
index ac1f3715aaa..35e30c18f58 100644
--- a/res/cardsfolder/scroll_thief.txt
+++ b/res/cardsfolder/scroll_thief.txt
@@ -3,7 +3,8 @@ ManaCost:2 U
 Types:Creature Merfolk Rogue
 Text:no text
 PT:1/3
-K:WheneverKeyword:DealsCombatDamage/Opponent:Self:Play:DrawCards/1:ControllingPlayer_Self:ASAP:Yes_No:No Special Condition:Whenever CARDNAME deals combat damage to a player, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Optional$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scroll_thief.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/72.jpg
diff --git a/res/cardsfolder/seasoned_marshal.txt b/res/cardsfolder/seasoned_marshal.txt
index c3b346ce4a8..5986f5b7285 100644
--- a/res/cardsfolder/seasoned_marshal.txt
+++ b/res/cardsfolder/seasoned_marshal.txt
@@ -3,7 +3,8 @@ ManaCost:2 W W
 Types:Creature Human Soldier
 Text:no text
 PT:2/2
-K:WheneverKeyword:Attacks:Self:Play:TapPermanent:NormalInput/Creature:ASAP:Yes_No:No Special Condition:Whenever Seasoned Marshal attacks, you may tap target creature.
+T:Mode$ Attacks | ValidCard$ Card.Self | Optional$ True | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME attacks, you may tap target creature.
+SVar:TrigTap:AB$Tap | Cost$ 0 | Tgt$ TgtC
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seasoned_marshal.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/44.jpg
diff --git a/res/cardsfolder/seers_sundial.txt b/res/cardsfolder/seers_sundial.txt
index 02e8653751e..28452dfc503 100644
--- a/res/cardsfolder/seers_sundial.txt
+++ b/res/cardsfolder/seers_sundial.txt
@@ -2,7 +2,8 @@ Name:Seer's Sundial
 ManaCost:4
 Types:Artifact
 Text:no text
-K:WheneverKeyword:EntersBattleField:Type/Land:Play:DrawCards/1:ControllingPlayer_Self:ASAP:PayMana/2:Initiator - OwnedByController:Landfall - Whenever a land enters the battlefield under your control, you may pay 2. If you do, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigDraw | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you may pay 2. If you do, draw a card.
+SVar:TrigDraw:AB$Draw | Cost$ 2 | Defined$ You | NumCards$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seers_sundial.jpg
 SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/130.jpg
diff --git a/res/cardsfolder/serum_tank.txt b/res/cardsfolder/serum_tank.txt
index a326667d954..0d5a219dc99 100644
--- a/res/cardsfolder/serum_tank.txt
+++ b/res/cardsfolder/serum_tank.txt
@@ -2,8 +2,10 @@ Name:Serum Tank
 ManaCost:3
 Types:Artifact
 Text:no text
-K:WheneverKeyword:EntersBattleField:Type/Artifact:Play:CustomCounter.CHARGE/1:Self:ASAP:No_Condition:No Special Condition:Whenever Serum Tank or another artifact enters the battlefield, put a charge counter on Serum Tank.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another artifact enters the battlefield,
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other | Execute$ TrigPutCounter | TriggerDescription$ put a charge counter on CARDNAME.
 A:AB$Draw | Cost$ 3 T SubCounter<1/CHARGE> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serum_tank.jpg
 SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/240.jpg
diff --git a/res/cardsfolder/seshiro_the_anointed.txt b/res/cardsfolder/seshiro_the_anointed.txt
index 2266cc21225..022c28089b5 100644
--- a/res/cardsfolder/seshiro_the_anointed.txt
+++ b/res/cardsfolder/seshiro_the_anointed.txt
@@ -4,7 +4,8 @@ Types:Legendary Creature Snake Monk
 Text:no text
 PT:3/4
 K:stPumpAll:Creature.Snake+Other+YouCtrl:2/2:No Condition:Other Snake creatures you control get +2/+2.
-K:WheneverKeyword:DealsCombatDamage/Opponent:Type/Snake:Play:DrawCards/1:ControllingPlayer_Self:ASAP:Yes_No:Initiator - OwnedByController:Whenever a Snake you control deals combat damage to a player, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Snake.YouCtrl | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigDraw | TriggerDescription$ Whenever a Snake you control deals combat damage to a player, you may draw a card.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seshiro_the_anointed.jpg
 SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/241.jpg
diff --git a/res/cardsfolder/shrieking_specter.txt b/res/cardsfolder/shrieking_specter.txt
index 9530008be2f..cfd05e4403e 100644
--- a/res/cardsfolder/shrieking_specter.txt
+++ b/res/cardsfolder/shrieking_specter.txt
@@ -4,7 +4,8 @@ Types:Creature Specter
 Text:no text
 PT:2/2
 K:Flying
-K:WheneverKeyword:Attacks:Self:Play:DiscardCards/1:ControllingPlayer_Opponent:ASAP:No_Condition:No Special Condition:Whenever Shrieking Specter attacks, defending player discards a card.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME attacks, defending player discards a card.
+SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shrieking_specter.jpg
 SetInfo:S99|Uncommon|http://magiccards.info/scans/en/st/89.jpg
diff --git a/res/cardsfolder/sleepers_robe.txt b/res/cardsfolder/sleepers_robe.txt
index 0b67915f0c6..24d853f5970 100644
--- a/res/cardsfolder/sleepers_robe.txt
+++ b/res/cardsfolder/sleepers_robe.txt
@@ -4,7 +4,8 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:Fear
-K:WheneverKeyword:DealsDamage/Opponent:Enchanted_Creature:Play:DrawCards/1:ControllingPlayer_Self:ASAP:Yes_No:No Special Condition:Whenever enchanted creature deals damage to an opponent, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Opponent | Optional$ True | Execute$ TrigDraw | TriggerDescription$ Whenever enchanted creature deals damage to an opponent, 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/sleepers_robe.jpg
 SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/273.jpg
diff --git a/res/cardsfolder/slinking_giant.txt b/res/cardsfolder/slinking_giant.txt
index e7076795d7d..e2116fc7763 100644
--- a/res/cardsfolder/slinking_giant.txt
+++ b/res/cardsfolder/slinking_giant.txt
@@ -4,8 +4,9 @@ Types:Creature Giant Rogue
 Text:no text
 PT:4/4
 K:Wither
-K:WheneverKeyword:Blocks:Self:Play:StatsPumpEOT/-3/0:Self:ASAP:No_Condition:No Special Condition:Whenever Slinking Giant blocks, it gets -3/-0 until end of turn.
-K:WheneverKeyword:BecomesBlocked:Self:Play:StatsPumpEOT/-3/0:Self:ASAP:No_Condition:No Special Condition:Whenever Slinking Giant becomes blocked, it gets -3/-0 until end of turn.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, 
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ it gets -3/-0 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ -3
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slinking_giant.jpg
 SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/106.jpg
diff --git a/res/cardsfolder/snake_umbra.txt b/res/cardsfolder/snake_umbra.txt
index 83abdf4ff49..2302344aade 100644
--- a/res/cardsfolder/snake_umbra.txt
+++ b/res/cardsfolder/snake_umbra.txt
@@ -4,8 +4,9 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:+1/+1
-K:WheneverKeyword:DealsDamage/Opponent:Enchanted_Creature:Play:DrawCards/1:ControllingPlayer_Self:ASAP:Yes_No:No Special Condition:Whenever enchanted creature deals damage to an opponent, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | Optional$ True | Execute$ TrigDraw | TriggerDescription$ Whenever enchanted creature deals damage to an opponent, you may draw a card.
 K:Totem armor
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snake_umbra.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/207.jpg
diff --git a/res/cardsfolder/snorting_gahr.txt b/res/cardsfolder/snorting_gahr.txt
index 8e0e05ee024..e4fd5481d9f 100644
--- a/res/cardsfolder/snorting_gahr.txt
+++ b/res/cardsfolder/snorting_gahr.txt
@@ -3,7 +3,8 @@ ManaCost:2 G G
 Types:Creature Rhino Beast
 Text:no text
 PT:3/3
-K:WheneverKeyword:BecomesBlocked:Self:Play:StatsPumpEOT/2/2:Self:ASAP:No_Condition:No Special Condition:Whenever CARDNAME becomes blocked, it gets +2/+2 until end of turn.
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it gets +2/+2 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snorting_gahr.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/272.jpg
diff --git a/res/cardsfolder/soldevi_steam_beast.txt b/res/cardsfolder/soldevi_steam_beast.txt
index cb8f2bc461b..d54eb2f547c 100644
--- a/res/cardsfolder/soldevi_steam_beast.txt
+++ b/res/cardsfolder/soldevi_steam_beast.txt
@@ -3,8 +3,9 @@ ManaCost:5
 Types:Artifact Creature Beast
 Text:no text
 PT:4/2
-K:WheneverKeyword:BecomesTapped:Self:Play:ModifyLife/2:ControllingPlayer_Opponent:ASAP:No_Condition:No Special Condition:Whenever Soldevi Steam Beast becomes tapped, target opponent gains 2 life.
+T:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME becomes tapped, target opponent gains 2 life.
 A:AB$Regenerate | Cost$ 2 | SpellDescription$ Regenerate CARDNAME.
+SVar:TrigGainLife:AB$GainLife | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Choose target opponent | LifeAmount$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soldevi_steam_beast.jpg
 SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/177.jpg
diff --git a/res/cardsfolder/soltari_trooper.txt b/res/cardsfolder/soltari_trooper.txt
index 9ffa297f68e..18fd151be4b 100644
--- a/res/cardsfolder/soltari_trooper.txt
+++ b/res/cardsfolder/soltari_trooper.txt
@@ -4,7 +4,8 @@ Types:Creature Soltari Soldier
 Text:no text
 PT:1/1
 K:Shadow
-K:WheneverKeyword:Attacks:Self:Play:StatsPumpEOT/1/1:Self:ASAP:No_Condition:No Special Condition:Whenever Soltari Trooper attacks, it gets +1/+1 until end of turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+1 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 1 | NumDef$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soltari_trooper.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/259.jpg
diff --git a/res/cardsfolder/somnomancer.txt b/res/cardsfolder/somnomancer.txt
index 12522b60474..efc23156c7e 100644
--- a/res/cardsfolder/somnomancer.txt
+++ b/res/cardsfolder/somnomancer.txt
@@ -3,7 +3,8 @@ ManaCost:1 WU
 Types:Creature Kithkin Wizard
 Text:no text
 PT:2/1
-K:WheneverKeyword:EntersBattleField:Self:Play:TapPermanent:NormalInput/Creature:ASAP:No_Condition:No Special Condition:When Somnomancer enters the battlefield, you may tap target creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Optional$ True | Execute$ TrigTap | TrggierDescription$ When CARDNAME enters the battlefield, you may tap target creature.
+SVar:TrigTap:AB$Tap | Cost$ 0 | Tgt$ TgtC
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/somnomancer.jpg
diff --git a/res/cardsfolder/soul_net.txt b/res/cardsfolder/soul_net.txt
index 57745b0cc0d..1c5ce8ee94d 100644
--- a/res/cardsfolder/soul_net.txt
+++ b/res/cardsfolder/soul_net.txt
@@ -2,7 +2,8 @@ Name:Soul Net
 ManaCost:1
 Types:Artifact
 Text:no text
-K:WheneverKeyword:PermanentIntoGraveyard:Type/Creature:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:PayMana/1:No Special Condition:Whenever a creature is put into a graveyard from the battlefield, you may pay 1. If you do, you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature is put into a graveyard from the battlefield, you may pay 1. If you do, you gain 1 life.
+SVar:TrigGainLife:AB$GainLife | Cost$ 1 | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_net.jpg
 SetInfo:LEB|Uncommon|http://magiccards.info/scans/en/be/272.jpg
diff --git a/res/cardsfolder/soul_warden.txt b/res/cardsfolder/soul_warden.txt
index b9391c19681..8eefe2f17c2 100644
--- a/res/cardsfolder/soul_warden.txt
+++ b/res/cardsfolder/soul_warden.txt
@@ -3,7 +3,8 @@ ManaCost:W
 Types:Creature Human Cleric
 Text:no text
 PT:1/1
-K:WheneverKeyword:EntersBattleField:Type/Creature:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:No_Condition:Initiator - Other than Self:Whenever another creature enters the battlefield, you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever another creature enters the battlefield, you gain 1 life.
+SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card84112.jpg
 SetInfo:M10|Common|http://magiccards.info/scans/en/m10/34.jpg
diff --git a/res/cardsfolder/soulcatcher.txt b/res/cardsfolder/soulcatcher.txt
index 8681012fa25..7031c6d250e 100644
--- a/res/cardsfolder/soulcatcher.txt
+++ b/res/cardsfolder/soulcatcher.txt
@@ -3,8 +3,9 @@ ManaCost:1 W
 Types:Creature Bird Soldier
 Text:no text
 PT:1/1
-K:WheneverKeyword:PermanentIntoGraveyard:Type/Creature:Play:+1+1 Counters/1:Self:ASAP:No_Condition:Initiator - Has Keyword/Flying:Whenever a creature with flying is put into a graveyard from the battlefield, put a +1/+1 counter on Soulcatcher.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature with flying is put into a graveyard from the battlefield, put a +1/+1 counter on CARDNAME.
 K:Flying
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soulcatcher.jpg
 SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/47.jpg
diff --git a/res/cardsfolder/souls_attendant.txt b/res/cardsfolder/souls_attendant.txt
index 1ec53feaa56..dca1b75b940 100644
--- a/res/cardsfolder/souls_attendant.txt
+++ b/res/cardsfolder/souls_attendant.txt
@@ -3,7 +3,8 @@ ManaCost:W
 Types:Creature Human Cleric
 Text:no text
 PT:1/1
-K:WheneverKeyword:EntersBattleField:Type/Creature:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:Yes_No:Initiator - Other than Self:Whenever another creature enters the battlefield, you may gain 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigGainLife | TriggerDescription$ Whenever another creature enters the battlefield, you may gain 1 life.
+SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/souls_attendant.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/44.jpg
diff --git a/res/cardsfolder/soultether_golem.txt b/res/cardsfolder/soultether_golem.txt
index 37cd476c2ae..b3e20e34d4e 100644
--- a/res/cardsfolder/soultether_golem.txt
+++ b/res/cardsfolder/soultether_golem.txt
@@ -3,8 +3,9 @@ ManaCost:2
 Types:Artifact Creature Golem
 Text:no text
 PT:3/3
-K:WheneverKeyword:EntersBattleField:Type/Creature:Play:CustomCounter.TIME/1:Self:ASAP:No_Condition:Initiator - Other than Self!Initiator - OwnedByController:Whenever another creature enters the battlefield under your control, put a time counter on Soultether Golem.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature enters the battlefield under your control, put a time counter on CARDNAME.
 K:Vanishing:1
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ TIME | CounterNum$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soultether_golem.jpg
diff --git a/res/cardsfolder/spincrusher.txt b/res/cardsfolder/spincrusher.txt
index a6ddd0138b2..e2036f9cd07 100644
--- a/res/cardsfolder/spincrusher.txt
+++ b/res/cardsfolder/spincrusher.txt
@@ -3,8 +3,9 @@ ManaCost:2
 Types:Artifact Creature Construct
 Text:no text
 PT:0/2
-K:WheneverKeyword:Blocks:Self:Play:+1+1 Counters/1:Self:ASAP:No_Condition:No Special Condition:Whenever Spincrusher blocks, put a +1/+1 counter on it.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME blocks, put a +1/+1 counter on it.
 A:AB$Pump | Cost$ SubCounter<1/P1P1> | KW$ Unblockable | SpellDescription$ Spincrusher is unblockable this turn.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spincrusher.jpg
diff --git a/res/cardsfolder/stone_seeder_hierophant.txt b/res/cardsfolder/stone_seeder_hierophant.txt
index 8c9af4376ac..b4196c9177b 100644
--- a/res/cardsfolder/stone_seeder_hierophant.txt
+++ b/res/cardsfolder/stone_seeder_hierophant.txt
@@ -3,8 +3,9 @@ ManaCost:2 G G
 Types:Creature Human Druid
 Text:no text
 PT:1/1
-K:WheneverKeyword:EntersBattleField:Type/Land:Play:UntapPermanent:Self:ASAP:Yes_No:Initiator - OwnedByController:Landfall - Whenever a land enters the battlefield under your control, untap Stone-Seeder Hierophant.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | Execuet$ TrigUntap | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, untap CARDNAME.
 A:AB$Untap | Cost$ T | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Untap target land.
+SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stone_seeder_hierophant.jpg
diff --git a/res/cardsfolder/stonybrook_schoolmaster.txt b/res/cardsfolder/stonybrook_schoolmaster.txt
index 589e8ca1e13..7bce932e9e7 100644
--- a/res/cardsfolder/stonybrook_schoolmaster.txt
+++ b/res/cardsfolder/stonybrook_schoolmaster.txt
@@ -3,7 +3,8 @@ ManaCost:2 W
 Types:Creature Merfolk Wizard
 Text:no text
 PT:1/2
-K:WheneverKeyword:BecomesTapped:Self:Play:MakeToken-Merfolk Wizard-U-1-1-None-/1:ControllingPlayer_Self:ASAP:Yes_No:No Special Condition:Whenever Stonybrook Schoolmaster becomes tapped, you may put a 1/1 blue Merfolk Wizard creature token onto the battlefield.
+T:Mode$ Taps | ValidCard$ Card.Self | Optional$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME becomes tapped, you may put a 1/1 blue Merfolk Wizard creature token onto the battlefield.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ U 1 1 Merfolk Wizard | TokenName$ Merfolk Wizard | TokenColors$ Blue | TokenTypes$ Creature,Merfolk,Wizard | TokenPower$ 1 | TokenToughness$ 1 | TokenOwner$ Controller
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stonybrook_schoolmaster.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/25.jpg
diff --git a/res/cardsfolder/strands_of_undeath.txt b/res/cardsfolder/strands_of_undeath.txt
index c92dc4eb619..6fb597cddbd 100644
--- a/res/cardsfolder/strands_of_undeath.txt
+++ b/res/cardsfolder/strands_of_undeath.txt
@@ -5,8 +5,9 @@ Text:no text
 PT:2/2
 K:Enchant creature
 K:enPump:0/0
-K:WheneverKeyword:EntersBattleField:Self:Play:DiscardCards/2:ControllingPlayer_Opponent:ASAP:No_Condition:No Special Condition:When CARDNAME enters the battlefield, target player discards two cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, target player discards two cards.
 A:AB$Regenerate | Cost$ B | Defined$ Enchanted | SpellDescription$ Regenerate enchanted creature.
+SVar:TrigDiscard:AB$Discard | Cost$ 0 | Tgt$ TgtP | NumCards$ 2 | Mode$ TgtChoose
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/strands_of_undeath.jpg
 SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/108.jpg
diff --git a/res/cardsfolder/subversion.txt b/res/cardsfolder/subversion.txt
index c14437329c8..15beee60710 100644
--- a/res/cardsfolder/subversion.txt
+++ b/res/cardsfolder/subversion.txt
@@ -2,7 +2,9 @@ Name:Subversion
 ManaCost:3 B B
 Types:Enchantment
 Text:no text
-K:WheneverKeyword:BeginningOfUpkeep:No_Initiator:Play:ModifyLife/1!ModifyLife/-1:ControllingPlayer_Self!ControllingPlayer_Opponent:ASAP:No_Condition:ControllerUpkeep:At the beginning of your upkeep, each opponent loses 1 life. You gain life equal to the life lost this way.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of your upkeep, each opponent loses 1 life. You gain life equal to the life lost this way.
+SVar:TrigDrain:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1 | SubAbility$SVar=DBGainLife
+SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/subversion.jpg
 SetInfo:ULG|Rare|http://magiccards.info/scans/en/ul/68.jpg
diff --git a/res/cardsfolder/surrakar_marauder.txt b/res/cardsfolder/surrakar_marauder.txt
index cb81d0266d8..9d6aaeabb23 100644
--- a/res/cardsfolder/surrakar_marauder.txt
+++ b/res/cardsfolder/surrakar_marauder.txt
@@ -3,7 +3,8 @@ ManaCost:1 B
 Types:Creature Surrakar
 Text:no text
 PT:2/1
-K:WheneverKeyword:EntersBattleField:Type/Land:Play:KeywordPumpEOT/Intimidate:Self:ASAP:No_Condition:Initiator - OwnedByController:Landfall - Whenever a land enters the battlefield under your control, Surrakar Marauder gains intimidate until end of turn. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, CARDNAME gains intimidate until end of turn. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.)
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ Intimidate
 SVar:BuffedBy:Land
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/surrakar_marauder.jpg
diff --git a/res/cardsfolder/sustainer_of_the_realm.txt b/res/cardsfolder/sustainer_of_the_realm.txt
index 9b7cc6fc6c9..56480afceb0 100644
--- a/res/cardsfolder/sustainer_of_the_realm.txt
+++ b/res/cardsfolder/sustainer_of_the_realm.txt
@@ -4,7 +4,8 @@ Types:Creature Angel
 Text:no text
 PT:2/3
 K:Flying
-K:WheneverKeyword:Blocks:Self:Play:StatsPumpEOT/0/2:Self:ASAP:No_Condition:No Special Condition:Whenever CARDNAME blocks, it gets +0/+2 until end of turn.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks, it gets +0/+2 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumDef$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sustainer_of_the_realm.jpg
 SetInfo:ULG|Uncommon|http://magiccards.info/scans/en/ul/23.jpg
diff --git a/res/cardsfolder/symbiotic_beast.txt b/res/cardsfolder/symbiotic_beast.txt
index c1a784260cd..489ae4eba70 100644
--- a/res/cardsfolder/symbiotic_beast.txt
+++ b/res/cardsfolder/symbiotic_beast.txt
@@ -3,7 +3,8 @@ ManaCost:4 G G
 Types:Creature Insect Beast
 Text:no text
 PT:4/4
-K:WheneverKeyword:PermanentIntoGraveyard:Self:Graveyard:MakeToken-Insect-G-1-1-None-/4:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:When Symbiotic Beast is put into a graveyard from the battlefield, put four 1/1 green Insect creature tokens onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put four 1/1 green Insect creature tokens onto the battlefield.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ G 1 1 Insect | TokenAmount$ 4 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/symbiotic_beast.jpg
 SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/287.jpg