diff --git a/res/cardsfolder/yawgmoths_edict.txt b/res/cardsfolder/yawgmoths_edict.txt
index f3209819183..982478053a3 100644
--- a/res/cardsfolder/yawgmoths_edict.txt
+++ b/res/cardsfolder/yawgmoths_edict.txt
@@ -2,7 +2,9 @@ Name:Yawgmoth's Edict
 ManaCost:1 B
 Types:Enchantment
 Text:no text
-K:WheneverKeyword:CastSpell/Opponent:Color/white:Play:ModifyLife/1!ModifyLife/-1:ControllingPlayer_Self!ControllingPlayer_Opponent:ASAP:No_Condition:No Special Condition:Whenever an opponent casts a white spell, that player loses 1 life and you gain 1 life.
+T:Mode$ SpellCast | ValidCard$ Card.White+YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever an opponent casts a white spell, that player loses 1 life and you gain 1 life.
+SVar:TrigDrain:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1 | SubAbility$SVar=DBGainLife
+SVar:DBGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/yawgmoths_edict.jpg
diff --git a/res/cardsfolder/yuan_shaos_infantry.txt b/res/cardsfolder/yuan_shaos_infantry.txt
index 97d38eb9b0f..9c0060aa73a 100644
--- a/res/cardsfolder/yuan_shaos_infantry.txt
+++ b/res/cardsfolder/yuan_shaos_infantry.txt
@@ -3,7 +3,8 @@ ManaCost:3 R
 Types:Creature Human Soldier
 Text:no text
 PT:2/2
-K:WheneverKeyword:Attack - Alone:Self:Play:KeywordPumpEOT/Unblockable:Self:ASAP:No_Condition:No Special Condition:Whenever Yuan Shao's Infantry attacks alone, Yuan Shao's Infantry is unblockable this combat.
+T:Mode$ Attacks | ValidCard$ Card.Self | Alone$ True | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks alone, CARDNAME is unblockable this combat.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ Unblockable
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/yuan_shaos_infantry.jpg
 SetInfo:PTK|Uncommon|http://magiccards.info/scans/en/p3k/129.jpg