diff --git a/res/cardsfolder/arctic_wolves.txt b/res/cardsfolder/arctic_wolves.txt
index 3eb35ee3852..174eec9ad20 100644
--- a/res/cardsfolder/arctic_wolves.txt
+++ b/res/cardsfolder/arctic_wolves.txt
@@ -4,7 +4,8 @@ Types:Creature Wolf
 Text:no text
 PT:4/5
 K:Cumulative upkeep:2
-K:When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, 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/arctic_wolves.jpg
 SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/60.jpg
diff --git a/res/cardsfolder/carven_caryatid.txt b/res/cardsfolder/carven_caryatid.txt
index f17836a0e26..fb8035da6a7 100644
--- a/res/cardsfolder/carven_caryatid.txt
+++ b/res/cardsfolder/carven_caryatid.txt
@@ -4,7 +4,8 @@ Types:Creature Spirit
 Text:no text
 PT:2/5
 K:Defender
-K:When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, 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/carven_caryatid.jpg
 SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/155.jpg
diff --git a/res/cardsfolder/council_of_advisors.txt b/res/cardsfolder/council_of_advisors.txt
index 3e3df9c391f..2d54c9bde24 100644
--- a/res/cardsfolder/council_of_advisors.txt
+++ b/res/cardsfolder/council_of_advisors.txt
@@ -3,7 +3,8 @@ ManaCost:2 U
 Types:Creature Human Advisor
 Text:no text
 PT:1/1
-K:When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal_Three_Kingdoms/council_of_advisors.jpg
 SetInfo:PTK|Uncommon|http://magiccards.info/scans/en/p3k/40.jpg
diff --git a/res/cardsfolder/elvish_visionary.txt b/res/cardsfolder/elvish_visionary.txt
index 037bf7133ed..18daba2a659 100644
--- a/res/cardsfolder/elvish_visionary.txt
+++ b/res/cardsfolder/elvish_visionary.txt
@@ -3,7 +3,8 @@ ManaCost:1 G
 Types:Creature Elf Shaman
 Text:no text
 PT:1/1
-K:When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, 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/elvish_visionary.jpg
 SetInfo:M10|Common|http://magiccards.info/scans/en/m10/178.jpg
diff --git a/res/cardsfolder/eternity_snare.txt b/res/cardsfolder/eternity_snare.txt
index 3bd10a98b7d..1060f131136 100644
--- a/res/cardsfolder/eternity_snare.txt
+++ b/res/cardsfolder/eternity_snare.txt
@@ -4,7 +4,8 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPumpCurse:CARDNAME doesn't untap during your untap step.:Enchanted creature doesn't untap during its controller's untap step.
-K:When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, 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/eternity_snare.jpg
 SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/61.jpg
diff --git a/res/cardsfolder/frog_tongue.txt b/res/cardsfolder/frog_tongue.txt
index f4c0b0348ea..0a7630d870a 100644
--- a/res/cardsfolder/frog_tongue.txt
+++ b/res/cardsfolder/frog_tongue.txt
@@ -4,7 +4,8 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:Reach
-K:When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, 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/frog_tongue.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/122.jpg
diff --git a/res/cardsfolder/haru_onna.txt b/res/cardsfolder/haru_onna.txt
index cefd00b652e..b8f27e78183 100644
--- a/res/cardsfolder/haru_onna.txt
+++ b/res/cardsfolder/haru_onna.txt
@@ -3,7 +3,8 @@ ManaCost:3 G
 Types:Creature Spirit
 Text:no text
 PT:2/1
-K:When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/jungle_barrier.txt b/res/cardsfolder/jungle_barrier.txt
index 3b956fb73d8..0b5d6d05892 100644
--- a/res/cardsfolder/jungle_barrier.txt
+++ b/res/cardsfolder/jungle_barrier.txt
@@ -4,7 +4,8 @@ Types:Creature Plant Wall
 Text:no text
 PT:2/6
 K:Defender
-K:When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, 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/jungle_barrier.jpg
 SetInfo:APC|Uncommon|http://magiccards.info/scans/en/ap/106.jpg
diff --git a/res/cardsfolder/kaleidostone.txt b/res/cardsfolder/kaleidostone.txt
index 7c93d9538ea..c9762182da4 100644
--- a/res/cardsfolder/kaleidostone.txt
+++ b/res/cardsfolder/kaleidostone.txt
@@ -2,7 +2,8 @@ Name:Kaleidostone
 ManaCost:2
 Types:Artifact
 Text:no text
-K:When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 A:AB$ Mana | Cost$ 5 T Sac<1/CARDNAME> | Produced$ W U B R G | SpellDescription$ Add W U B R G to your mana pool.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/kavu_climber.txt b/res/cardsfolder/kavu_climber.txt
index d1087105a2c..b4524129562 100644
--- a/res/cardsfolder/kavu_climber.txt
+++ b/res/cardsfolder/kavu_climber.txt
@@ -3,7 +3,8 @@ ManaCost:3 G G
 Types:Creature Kavu
 Text:no text
 PT:3/3
-K:When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83175.jpg
 SetInfo:INV|Common|http://magiccards.info/scans/en/in/192.jpg