diff --git a/res/cardsfolder/angel_of_despair.txt b/res/cardsfolder/angel_of_despair.txt
index f5071978bb5..aebae24e4c0 100644
--- a/res/cardsfolder/angel_of_despair.txt
+++ b/res/cardsfolder/angel_of_despair.txt
@@ -1,10 +1,11 @@
 Name:Angel of Despair
 ManaCost:3 W W B B
 Types:Creature Angel
-Text:When Angel of Despair enters the battlefield, destroy target permanent.
+Text:no text
 PT:5/5
 K:Flying
-K:etbDestroyTgt:Permanent
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target permanent.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent.
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/gpt/en-us/card83869.jpg
 SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/101.jpg
diff --git a/res/cardsfolder/aven_cloudchaser.txt b/res/cardsfolder/aven_cloudchaser.txt
index 2524661a256..5d8e47f1d99 100644
--- a/res/cardsfolder/aven_cloudchaser.txt
+++ b/res/cardsfolder/aven_cloudchaser.txt
@@ -1,10 +1,11 @@
 Name:Aven Cloudchaser
 ManaCost:3 W
 Types:Creature Bird Soldier
-Text:When Aven Cloudchaser enters the battlefield, destroy target enchantment.
+Text:no text
 PT:2/2
 K:Flying
-K:etbDestroyTgt:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target enchantment.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_cloudchaser.jpg
 SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/5.jpg
diff --git a/res/cardsfolder/bala_ged_scorpion.txt b/res/cardsfolder/bala_ged_scorpion.txt
index 8b6796491ce..556b6564761 100644
--- a/res/cardsfolder/bala_ged_scorpion.txt
+++ b/res/cardsfolder/bala_ged_scorpion.txt
@@ -1,9 +1,10 @@
 Name:Bala Ged Scorpion
 ManaCost:3 B
 Types:Creature Scorpion
-Text:When Bala Ged Scorpion enters the battlefield, you may destroy target creature with power 1 or less.
+Text:no text
 PT:2/3
-K:etbDestroyTgtMay:Creature.powerLE1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target creature with power 1 or less.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.powerLE1 | TgtPrompt$ Select target creature with power 1 or less.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bala_ged_scorpion.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/95.jpg
diff --git a/res/cardsfolder/big_game_hunter.txt b/res/cardsfolder/big_game_hunter.txt
index eee2552b681..157c61a69ee 100644
--- a/res/cardsfolder/big_game_hunter.txt
+++ b/res/cardsfolder/big_game_hunter.txt
@@ -1,11 +1,12 @@
 Name:Big Game Hunter
 ManaCost:1 B B
 Types:Creature Human Rebel Assassin
-Text:When Big Game Hunter enters the battlefield, destroy target creature with power 4 or greater. It can't be regenerated.
+Text:no text
 PT:1/1
-K:etbDestroyTgt:Creature.powerGE4:NoRegen
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target creature with power 4 or greater. It can't be regenerated.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.powerGE4 | NoRegen$ True | TgtPrompt$ Select target creature with power 4 or greater.
 K:Madness:B
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/big_game_hunter.jpg
 SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/63.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/bone_shredder.txt b/res/cardsfolder/bone_shredder.txt
index af9bebfba90..20415f95ba0 100644
--- a/res/cardsfolder/bone_shredder.txt
+++ b/res/cardsfolder/bone_shredder.txt
@@ -1,11 +1,12 @@
 Name:Bone Shredder
 ManaCost:2 B
 Types:Creature Minion
-Text:When Bone Shredder enters the battlefield, destroy target nonartifact, nonblack creature.
+Text:no text
 PT:1/1
 K:Flying
 K:Echo:2 B
-K:etbDestroyTgt:Creature.nonArtifact+nonBlack
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target nonartifact, nonblack creature.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.nonArtifact+nonBlack | TgtPrompt$ Select target nonartifact, nonblack creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bone_shredder.jpg
 SetInfo:ULG|Uncommon|http://magiccards.info/scans/en/ul/49.jpg
diff --git a/res/cardsfolder/cloudchaser_eagle.txt b/res/cardsfolder/cloudchaser_eagle.txt
index 9e8f84e82bf..b8cebe587fc 100644
--- a/res/cardsfolder/cloudchaser_eagle.txt
+++ b/res/cardsfolder/cloudchaser_eagle.txt
@@ -1,10 +1,11 @@
 Name:Cloudchaser Eagle
 ManaCost:3 W
 Types:Creature Bird
-Text:When Cloudchaser Eagle enters the battlefield, destroy target enchantment.
+Text:no text
 PT:2/2
 K:Flying
-K:etbDestroyTgt:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target enchantment.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cloudchaser_eagle.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/227.jpg
diff --git a/res/cardsfolder/dakmor_lancer.txt b/res/cardsfolder/dakmor_lancer.txt
index a54492338a8..8aebc391884 100644
--- a/res/cardsfolder/dakmor_lancer.txt
+++ b/res/cardsfolder/dakmor_lancer.txt
@@ -1,9 +1,10 @@
 Name:Dakmor Lancer
 ManaCost:4 B B
 Types:Creature Human Knight
-Text:When Dakmor Lancer enters the battlefield, destroy target nonblack creature.
+Text:no text
 PT:3/3
-K:etbDestroyTgt:Creature.nonBlack
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target nonblack creature.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dakmor_lancer.jpg
 SetInfo:S99|Rare|http://magiccards.info/scans/en/st/71.jpg
diff --git a/res/cardsfolder/dark_hatchling.txt b/res/cardsfolder/dark_hatchling.txt
index 02fd5df519d..c687e1b21ad 100644
--- a/res/cardsfolder/dark_hatchling.txt
+++ b/res/cardsfolder/dark_hatchling.txt
@@ -1,10 +1,11 @@
 Name:Dark Hatchling
 ManaCost:4 B B
 Types:Creature Horror
-Text:When Dark Hatchling enters the battlefield, destroy target nonblack creature. It can't be regenerated.
+Text:no text
 PT:3/3
 K:Flying
-K:etbDestroyTgt:Creature.nonBlack:NoRegen
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target nonblack creature.  It can't be regenerated.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.nonBlack | NoRegen$ True | TgtPrompt$ Select target nonblack creature.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dark_hatchling.jpg
 SetInfo:USG|Rare|http://magiccards.info/scans/en/us/126.jpg
diff --git a/res/cardsfolder/halo_hunter.txt b/res/cardsfolder/halo_hunter.txt
index 74cacc5d550..cdcba4f3503 100644
--- a/res/cardsfolder/halo_hunter.txt
+++ b/res/cardsfolder/halo_hunter.txt
@@ -1,10 +1,11 @@
 Name:Halo Hunter
 ManaCost:2 B B B
 Types:Creature Demon
-Text:When Halo Hunter enters the battlefield, destroy target Angel.
+Text:no text
 PT:6/3
 K:Intimidate
-K:etbDestroyTgt:Angel
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target Angel.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Angel | TgtPrompt$ Select target Angel
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/halo_hunter.jpg
 SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/96.jpg
diff --git a/res/cardsfolder/hammerheim_deadeye.txt b/res/cardsfolder/hammerheim_deadeye.txt
index affe861b815..53cc8abc52a 100644
--- a/res/cardsfolder/hammerheim_deadeye.txt
+++ b/res/cardsfolder/hammerheim_deadeye.txt
@@ -1,10 +1,11 @@
 Name:Hammerheim Deadeye
 ManaCost:3 R
 Types:Creature Giant Warrior
-Text:When Hammerheim Deadeye enters the battlefield, destroy target creature with flying.
+Text:no text
 PT:3/3
 K:Echo:5 R
-K:etbDestroyTgt:Creature.withFlying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target creature with flying.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hammerheim_deadeye.jpg
 SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/101.jpg
diff --git a/res/cardsfolder/indrik_stomphowler.txt b/res/cardsfolder/indrik_stomphowler.txt
index daee988de46..ec1a53fda75 100644
--- a/res/cardsfolder/indrik_stomphowler.txt
+++ b/res/cardsfolder/indrik_stomphowler.txt
@@ -1,9 +1,10 @@
 Name:Indrik Stomphowler
 ManaCost:4 G
 Types:Creature Beast
-Text:When Indrik Stomphowler enters the battlefield, destroy target artifact or enchantment.
+Text:no text
 PT:4/4
-K:etbDestroyTgt:Artifact,Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact or enchantment.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/indrik_stomphowler.jpg
 SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/86.jpg
diff --git a/res/cardsfolder/ingot_chewer.txt b/res/cardsfolder/ingot_chewer.txt
index 475c72b5101..d1a8c1f59b1 100644
--- a/res/cardsfolder/ingot_chewer.txt
+++ b/res/cardsfolder/ingot_chewer.txt
@@ -1,9 +1,10 @@
 Name:Ingot Chewer
 ManaCost:4 R
 Types:Creature Elemental
-Text:When Ingot Chewer enters the battlefield, destroy target artifact.
+Text:no text
 PT:3/3
-K:etbDestroyTgt:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact.
 SVar:Evoke:R
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ingot_chewer.jpg
diff --git a/res/cardsfolder/keldon_vandals.txt b/res/cardsfolder/keldon_vandals.txt
index d0f86aab3a2..f9168eb2416 100644
--- a/res/cardsfolder/keldon_vandals.txt
+++ b/res/cardsfolder/keldon_vandals.txt
@@ -1,10 +1,11 @@
 Name:Keldon Vandals
 ManaCost:2 R
 Types:Creature Human Rogue
-Text:When Keldon Vandals enters the battlefield, destroy target artifact.
+Text:no text
 PT:4/1
 K:Echo:2 R
-K:etbDestroyTgt:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/keldon_vandals.jpg
 SetInfo:UDS|Common|http://magiccards.info/scans/en/ud/91.jpg
diff --git a/res/cardsfolder/manic_vandal.txt b/res/cardsfolder/manic_vandal.txt
index d67540ffd9c..75e9d9de976 100644
--- a/res/cardsfolder/manic_vandal.txt
+++ b/res/cardsfolder/manic_vandal.txt
@@ -1,9 +1,10 @@
 Name:Manic Vandal
 ManaCost:2 R
 Types:Creature Human Warrior
-Text:When Manic Vandal enters the battlefield, destroy target artifact.
+Text:no text
 PT:2/2
-K:etbDestroyTgt:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/manic_vandal.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/151.jpg
diff --git a/res/cardsfolder/monk_realist.txt b/res/cardsfolder/monk_realist.txt
index 2f5395c0871..d7a86d747e4 100644
--- a/res/cardsfolder/monk_realist.txt
+++ b/res/cardsfolder/monk_realist.txt
@@ -1,9 +1,10 @@
 Name:Monk Realist
 ManaCost:1 W
 Types:Creature Human Monk Cleric
-Text:When Monk Realist enters the battlefield, destroy target enchantment.
+Text:no text
 PT:1/1
-K:etbDestroyTgt:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target enchantment.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/monk_realist.jpg
 SetInfo:USG|Common|http://magiccards.info/scans/en/us/21.jpg
diff --git a/res/cardsfolder/nekrataal.txt b/res/cardsfolder/nekrataal.txt
index d27e1bccb5d..57054599078 100644
--- a/res/cardsfolder/nekrataal.txt
+++ b/res/cardsfolder/nekrataal.txt
@@ -1,10 +1,11 @@
 Name:Nekrataal
 ManaCost:2 B B
 Types:Creature Human Assassin
-Text:When Nekrataal enters the battlefield, destroy target nonartifact, nonblack creature. That creature can't be regenerated.
+Text:no text
 PT:2/1
 K:First Strike
-K:etbDestroyTgt:Creature.nonArtifact+nonBlack:NoRegen
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target nonartifact, nonblack creature.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.nonArtifact+nonBlack | NoRegen$ True | TgtPrompt$ Select target nonartifact, nonblack creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nekrataal.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/149.jpg
diff --git a/res/cardsfolder/ogre_gatecrasher.txt b/res/cardsfolder/ogre_gatecrasher.txt
index 5a0032569f5..3a96db99356 100644
--- a/res/cardsfolder/ogre_gatecrasher.txt
+++ b/res/cardsfolder/ogre_gatecrasher.txt
@@ -1,9 +1,10 @@
 Name:Ogre Gatecrasher
 ManaCost:3 R
 Types:Creature Ogre Rogue
-Text:When Ogre Gatecrasher enters the battlefield, destroy target creature with defender.
+Text:no text
 PT:3/3
-K:etbDestroyTgt:Creature.withDefender
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target creature with defender.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.withDefender | TgtPrompt$ Select target creature with defender.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_gatecrasher.jpg
 SetInfo:DIS|Common|http://magiccards.info/scans/en/di/67.jpg
diff --git a/res/cardsfolder/rustspore_ram.txt b/res/cardsfolder/rustspore_ram.txt
index e0005669961..49d17e8d0e8 100644
--- a/res/cardsfolder/rustspore_ram.txt
+++ b/res/cardsfolder/rustspore_ram.txt
@@ -1,9 +1,10 @@
 Name:Rustspore Ram
 ManaCost:4
 Types:Artifact Creature Sheep
-Text:When Rustspore Ram enters the battlefield, destroy target Equipment.
+Text:no text
 PT:1/3
-K:etbDestroyTgt:Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target Equipment.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Equipment | TgtPrompt$ Select target Equipment.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rustspore_ram.jpg
 SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/235.jpg
diff --git a/res/cardsfolder/serpent_assassin.txt b/res/cardsfolder/serpent_assassin.txt
index 72955aa69fc..ad2659f9c8a 100644
--- a/res/cardsfolder/serpent_assassin.txt
+++ b/res/cardsfolder/serpent_assassin.txt
@@ -1,9 +1,10 @@
 Name:Serpent Assassin
 ManaCost:3 B B
 Types:Creature Snake Assassin
-Text:When Serpent Assassin enters the battlefield, you may destroy target nonblack creature.
+Text:no text
 PT:2/2
-K:etbDestroyTgtMay:Creature.nonBlack
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | Optional$ True | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy target nonblack creature.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature.
 SVar:Rarity:Rare
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal/serpent_assassin.jpg
 SetInfo:POR|Rare|http://magiccards.info/scans/en/po/31.jpg
diff --git a/res/cardsfolder/shriekmaw.txt b/res/cardsfolder/shriekmaw.txt
index 530ebe2e3d2..b8187a47b00 100644
--- a/res/cardsfolder/shriekmaw.txt
+++ b/res/cardsfolder/shriekmaw.txt
@@ -1,10 +1,11 @@
 Name:Shriekmaw
 ManaCost:4 B
 Types:Creature Elemental
-Text:When Shriekmaw enters the battlefield, destroy target nonartifact, nonblack creature.
+Text:no text
 PT:3/2
 K:Fear
-K:etbDestroyTgt:Creature.nonArtifact+nonBlack
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target nonartifact, nonblack creature.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.nonBlack+nonArtifact | TgtPrompt$ Select target nonartifact, nonblack creature.
 SVar:Evoke:1 B
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shriekmaw.jpg
diff --git a/res/cardsfolder/tivadar_of_thorn.txt b/res/cardsfolder/tivadar_of_thorn.txt
index bb43fa81e6a..2762c03f00e 100644
--- a/res/cardsfolder/tivadar_of_thorn.txt
+++ b/res/cardsfolder/tivadar_of_thorn.txt
@@ -1,11 +1,12 @@
 Name:Tivadar of Thorn
 ManaCost:1 W W
 Types:Legendary Creature Human Knight
-Text:When Tivadar of Thorn enters the battlefield, destroy target Goblin.
+Text:no text
 PT:2/2
 K:First Strike
 K:Protection from red
-K:etbDestroyTgt:Goblin
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target Goblin.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Goblin | TgtPrompt$ Select target Goblin
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tivadar_of_thorn.jpg
 SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/44.jpg
diff --git a/res/cardsfolder/uktabi_orangutan.txt b/res/cardsfolder/uktabi_orangutan.txt
index d30e5606480..704a9e5f738 100644
--- a/res/cardsfolder/uktabi_orangutan.txt
+++ b/res/cardsfolder/uktabi_orangutan.txt
@@ -1,9 +1,10 @@
 Name:Uktabi Orangutan
 ManaCost:2 G
 Types:Creature Ape
-Text:When Uktabi Orangutan enters the battlefield, destroy target artifact.
+Text:no text
 PT:2/2
-K:etbDestroyTgt:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/uktabi_orangutan.jpg
 SetInfo:VIS|Uncommon|http://magiccards.info/scans/en/vi/73.jpg
diff --git a/res/cardsfolder/viridian_shaman.txt b/res/cardsfolder/viridian_shaman.txt
index 3a4e9f2558c..300a717be31 100644
--- a/res/cardsfolder/viridian_shaman.txt
+++ b/res/cardsfolder/viridian_shaman.txt
@@ -1,9 +1,10 @@
 Name:Viridian Shaman
 ManaCost:2 G
 Types:Creature Elf Shaman
-Text:When Viridian Shaman enters the battlefield, destroy target artifact.
+Text:no text
 PT:2/2
-K:etbDestroyTgt:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/viridian_shaman.jpg
 SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/139.jpg