diff --git a/projects/mtg/bin/Res/sets/CFX/_cards.dat b/projects/mtg/bin/Res/sets/CFX/_cards.dat
index 097a67a7c..757e85be6 100644
--- a/projects/mtg/bin/Res/sets/CFX/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CFX/_cards.dat
@@ -456,6 +456,18 @@ toughness=2
 abilities=protection from blue
 [/card]
 [card]
+text=Protection from artifacts
+id=183022
+name=Nacatl Savage
+rarity=C
+mana={1}{G}
+type=Creature
+subtype=Cat Warrior
+auto=protection from artifact
+power=2
+toughness=1
+[/card]
+[card]
 text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)  {T}: Add {G}, {W}, or {U} to your mana pool.
 id=179434
 name=Noble Hierarch
diff --git a/projects/mtg/bin/Res/sets/CFX/todo.dat b/projects/mtg/bin/Res/sets/CFX/todo.dat
index cf8501a4d..eca693ec7 100644
--- a/projects/mtg/bin/Res/sets/CFX/todo.dat
+++ b/projects/mtg/bin/Res/sets/CFX/todo.dat
@@ -459,17 +459,6 @@ subtype=Cat Warrior
 toughness=4
 [/card]
 [card]
-text=Protection from artifacts
-id=183022
-name=Nacatl Savage
-rarity=C
-type=Creature
-mana={1}{G}
-power=2
-subtype=Cat Warrior
-toughness=1
-[/card]
-[card]
 text=+3: Destroy target noncreature permanent.     -2: Gain control of target creature.     -9: Nicol Bolas, Planeswalker deals 7 damage to target player. That player discards seven cards, then sacrifices seven permanents.
 id=179441
 name=Nicol Bolas, Planeswalker
diff --git a/projects/mtg/bin/Res/sets/CHK/_cards.dat b/projects/mtg/bin/Res/sets/CHK/_cards.dat
index 8e4797c7f..1b5ce2979 100644
--- a/projects/mtg/bin/Res/sets/CHK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CHK/_cards.dat
@@ -465,6 +465,18 @@ power=0
 toughness=1
 [/card]
 [card]
+text=Protection from Spirits and from Arcane
+id=50412
+name=Kitsune Riftwalker
+rarity=C
+mana={1}{W}{W}
+type=Creature
+subtype=Fox Wizard
+auto=protection from(spirit,arcane)
+power=2
+toughness=1
+[/card]
+[card]
 text=Shroud, trample
 id=50488
 name=Kodama of the North Tree
diff --git a/projects/mtg/bin/Res/sets/CHK/todo.dat b/projects/mtg/bin/Res/sets/CHK/todo.dat
index 78bc7a692..a09734cdc 100644
--- a/projects/mtg/bin/Res/sets/CHK/todo.dat
+++ b/projects/mtg/bin/Res/sets/CHK/todo.dat
@@ -1006,17 +1006,6 @@ toughness=3
 text=At end of turn, if Kitsune Mystic is enchanted by two or more Auras, flip it. rarity=R
 [/card]
 [card]
-id=50412
-name=Kitsune Riftwalker
-mana={1}{W}{W}
-type=Creature
-subtype=Fox Wizard
-power=2
-toughness=1
-text=Protection from Spirits and from Arcane
-rarity=C
-[/card]
-[card]
 id=81702
 name=Kodama's Might
 mana={G}
diff --git a/projects/mtg/bin/Res/sets/DIS/_cards.dat b/projects/mtg/bin/Res/sets/DIS/_cards.dat
index 079e13288..da945daf0 100644
--- a/projects/mtg/bin/Res/sets/DIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DIS/_cards.dat
@@ -1,366 +1,380 @@
 [card]
+text=Flying, trample
 id=97107
 name=Assault Zeppelid
-abilities=flying,trample
+rarity=C
 mana={2}{G}{U}
 type=Creature
 subtype=Beast
 power=3
 toughness=3
-text=Flying, trample
-rarity=C
+abilities=flying,trample
 [/card]
 [card]
+text=Flying, protection from enchantments
+id=97101
+name=Azorius First-Wing
+rarity=C
+mana={W}{U}
+type=Creature
+subtype=Griffin
+auto=protection from(enchantment)
+power=2
+toughness=2
+abilities=flying
+[/card]
+[card]
+text={1}, {T}: Add {W}{U} to your mana pool.
 id=97085
 name=Azorius Signet
+auto={1}{T}:Add {W}{U}
+rarity=C
 mana={2}
 type=Artifact
-text={1}, {T}: Add {W}{U} to your mana pool.
-auto={1}{T}:add{W}{U}
-rarity=C
 [/card]
 [card]
+text=Flying Whenever Beacon Hawk deals combat damage to a player, you may untap target creature. {W}: Beacon Hawk gets +0/+1 until end of turn.
+auto=@damaged(player) from(this):may untap target(creature)
 id=111225
 name=Beacon Hawk
+rarity=C
 mana={1}{W}
 type=Creature
 subtype=Bird
+auto={W}:0/1
 power=1
 toughness=1
 abilities=flying
-text=Flying Whenever Beacon Hawk deals combat damage to a player, you may untap target creature. {W}: Beacon Hawk gets +0/+1 until end of turn.
-auto=@damaged(player) from(this):may untap target(creature)
-auto={W}:0/1
-rarity=C
 [/card]
 [card]
+text=Flying Whenever you cast an enchantment spell, put a +1/+1 counter on each creature you control.
+auto=@movedTo(enchantment|mystack):all(creature|mybattlefield) counter(1/1,1)
 id=107317
 name=Celestial Ancient
+rarity=R
 mana={3}{W}{W}
 type=Creature
 subtype=Elemental
 power=3
 toughness=3
-text=Flying Whenever you cast an enchantment spell, put a +1/+1 counter on each creature you control.
-auto=@movedTo(enchantment|mystack):all(creature|mybattlefield) counter(1/1,1)
 abilities=flying
-rarity=R
 [/card]
 [card]
+text=Flying Hellbent - Demon's Jester gets +2/+1 as long as you have no cards in hand.
 id=107599
 name=Demon's Jester
+rarity=C
 mana={3}{B}
 type=Creature
 subtype=Imp
-abilities=flying
+auto=aslongas(*|myhand)-2/-1
 power=4
 toughness=3
-auto=aslongas(*|myhand)-2/-1
-text=Flying Hellbent - Demon's Jester gets +2/+1 as long as you have no cards in hand.
-rarity=C
+abilities=flying
 [/card]
 [card]
+text=Trample   Dread Slag gets -4/-4 for each card in your hand.
 id=107322
 name=Dread Slag
+rarity=R
 mana={3}{B}{R}
 type=Creature
 subtype=Horror
+auto=foreach(*|myhand) -4/-4
 power=9
 toughness=9
-text=Trample Dread Slag gets -4/-4 for each card in your hand.
 abilities=trample
-auto=foreach(*|myhand) -4/-4
-rarity=R
 [/card]
 [card]
+text={T}, Sacrifice Haazda Exonerator: Destroy target Aura.
 id=107467
 name=Haazda Exonerator
+rarity=C
 mana={W}
 type=Creature
 subtype=Human Cleric
+auto={T}{S}:destroy target(aura)
 power=1
 toughness=1
-text={T}, Sacrifice Haazda Exonerator: Destroy target Aura.
-auto={T}{S}:destroy target(aura)
-rarity=C
 [/card]
 [card]
+text=Flying
 id=107260
 name=Mistral Charger
+rarity=U
 mana={1}{W}
 type=Creature
 subtype=Pegasus
 power=2
 toughness=1
-text=Flying
 abilities=flying
-rarity=U
 [/card]
 [card]
+text={T}: Rakdos Ickspitter deals 1 damage to target creature and that creature's controller loses 1 life.
+auto={T}:damage:1 target(creature) && life:-1 targetcontroller
 id=97074
 name=Rakdos Ickspitter
+rarity=C
 mana={1}{B}{R}
 type=Creature
 subtype=Thrull
 power=1
 toughness=1
-text={T}: Rakdos Ickspitter deals 1 damage to target creature and that creature's controller loses 1 life.
-auto={T}:damage:1 target(creature) && life:-1 targetcontroller
-rarity=C
 [/card]
 [card]
+text={R}{R}: Rakdos Pit Dragon gains flying until end of turn.   {R}: Rakdos Pit Dragon gets +1/+0 until end of turn.   Hellbent - Rakdos Pit Dragon has double strike as long as you have no cards in hand.
 id=111188
 name=Rakdos Pit Dragon
+rarity=R
 mana={2}{R}{R}
 type=Creature
 subtype=Dragon
-power=3
-toughness=3
-text={R}{R}: Rakdos Pit Dragon gains flying until end of turn. {R}: Rakdos Pit Dragon gets +1/+0 until end of turn. Hellbent - Rakdos Pit Dragon has double strike as long as you have no cards in hand.
-rarity=R
+auto=aslongas(*|myHand) -double strike
 auto={R}{R}:flying
 auto={R}:1/0
+power=3
+toughness=3
 abilities=double strike
-auto=aslongas(*|myHand)-double strike
 [/card]
 [card]
+text={1}, {T}: Add {B}{R} to your mana pool.
 id=97098
+auto={1}{T}:Add {B}{R}
 name=Rakdos Signet
+rarity=C
 mana={2}
 type=Artifact
-text={1}, {T}: Add {B}{R} to your mana pool.
-auto={1}{T}:add{B}{R}
-rarity=C
 [/card]
 [card]
+text=Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)   At the beginning of your upkeep, you may search your library for a Rat card, reveal it, and put it into your hand. If you do, shuffle your library.
+auto=@each my upkeep:may moveTo(myHand) target(rat|mylibrary)
 id=107273
 name=Ratcatcher
+rarity=R
 mana={4}{B}{B}
 type=Creature
 subtype=Ogre Rogue
 power=4
 toughness=4
-text=Fear (This creature can't be blocked except by artifact creatures and/or black creatures.) At the beginning of your upkeep, you may search your library for a Rat card, reveal it, and put it into your hand. If you do, shuffle your library.
-auto=@each my upkeep:may moveTo(myHand) target(rat|mylibrary)
 abilities=fear
-rarity=R
 [/card]
 [card]
+text=({(b/r)} can be paid with either {B} or {R}.)   Enchant creature   Enchanted creature gets +2/-1.
 id=97076
+target=creature
+auto=2/-1
 name=Riot Spikes
+rarity=C
 mana={BR}
 type=Enchantment
 subtype=Aura
-text=({(b/r)} can be paid with either {B} or {R}.) Enchant creature Enchanted creature gets +2/-1.
-target=creature
-auto=2/-1
-rarity=C
 [/card]
 [card]
-id=107534
-name=Seal of Doom
-mana={2}{B}
-type=Enchantment
 text=Sacrifice Seal of Doom: Destroy target nonblack creature. It can't be regenerated.
 auto={S}:bury target(creature[-black])
+id=107534
+name=Seal of Doom
 rarity=C
+mana={2}{B}
+type=Enchantment
 [/card]
 [card]
-id=107531
-name=Seal of Fire
-mana={R}
-type=Enchantment
 text=Sacrifice Seal of Fire: Seal of Fire deals 2 damage to target creature or player.
 auto={S}:damage:2 target(creature,player)
+id=107531
+name=Seal of Fire
 rarity=C
+mana={R}
+type=Enchantment
 [/card]
 [card]
+text=({GU} can be paid with either {G} or {U}.)   Enchant creature.   When Shielding Plax enters the battlefield, draw a card. Enchanted creature can't be the target of spells or abilities your opponents control.
 id=97084
-name=Shielding Plax
-mana={2}{GU}
-type=Enchantment
-subtype=Aura
-text=({GU} can be paid with either {G} or {U}.) Enchant creature. When Shielding Plax enters the battlefield, draw a card. Enchanted creature can't be the target of spells or abilities your opponents control.
 target=creature
 auto=opponentshroud
 auto=draw:1
+name=Shielding Plax
 rarity=C
+mana={2}{GU}
+type=Enchantment
+subtype=Aura
 [/card]
 [card]
+text=Flying   {G}, Sacrifice Silkwing Scout: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library.
+auto={G}{S}:moveTo(myBattlefield) target(basic|mylibrary) && tap
 id=107313
 name=Silkwing Scout
+rarity=C
 mana={2}{U}
 type=Creature
 subtype=Faerie Scout
 power=2
 toughness=1
-text=Flying {G}, Sacrifice Silkwing Scout: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library.
-auto={G}{S}:moveTo(myBattlefield) target(basic|mylibrary) && tap
 abilities=flying
-rarity=C
 [/card]
 [card]
+text={U}: Untap Simic Ragworm.
 id=107565
 name=Simic Ragworm
+rarity=C
 mana={3}{G}
 type=Creature
 subtype=Worm
+auto={U}:untap
 power=3
 toughness=3
-text={U}: Untap Simic Ragworm.
-auto={U}:untap
-rarity=C
 [/card]
 [card]
+text={1}, {T}: Add {G}{U} to your mana pool.
 id=97079
+auto={1}{T}:Add{G}{U}
 name=Simic Signet
+rarity=C
 mana={2}
 type=Artifact
-text={1}, {T}: Add {G}{U} to your mana pool.
-auto={1}{T}:Add{G}{U}
-rarity=C
 [/card]
 [card]
+text=Flying; trample; shroud (This permanent can't be the target of spells or abilities.)
 id=111204
 name=Simic Sky Swallower
+rarity=R
 mana={5}{G}{U}
 type=Creature
 subtype=Leviathan
 power=6
 toughness=6
-text=Flying; trample; shroud (This permanent can't be the target of spells or abilities.)
 abilities=flying,trample,shroud
-rarity=R
 [/card]
 [card]
+text={T}: You gain 1 life.   {T}, Discard a card: You gain 3 life.
 id=107326
-name=Skullmead Cauldron
-mana={4}
-type=Artifact
-text={T}: You gain 1 life. {T}, Discard a card: You gain 3 life.
 auto={T}:life:1
 auto={T}{S(*|myhand)}:life:3
+name=Skullmead Cauldron
 rarity=U
+mana={4}
+type=Artifact
 [/card]
 [card]
+text=Defender (This creature can't attack.)   {B}: Slithering Shade gets +1/+1 until end of turn.   Hellbent - Slithering Shade can attack as though it didn't have defender as long as you have no cards in hand.
 id=111283
 name=Slithering Shade
+rarity=U
 mana={B}
 type=Creature
 subtype=Shade
+auto={B}:1/1
+auto=defender
+auto=aslongas(*|myHand) -defender
 power=0
 toughness=1
-text=Defender (This creature can't attack.) {B}: Slithering Shade gets +1/+1 until end of turn. Hellbent - Slithering Shade can attack as though it didn't have defender as long as you have no cards in hand.
-auto=defender
-auto=aslongas(*|myHand)-defender
-rarity=U
 [/card]
 [card]
+text=Defender (This creature can't attack.)   {1}{U}, Sacrifice Soulsworn Jury: Counter target creature spell.
 id=107440
 name=Soulsworn Jury
+rarity=C
 mana={2}{W}
 type=Creature
 subtype=Spirit
+auto={1}{U}{S}:fizzle target(creature|stack)
 power=1
 toughness=4
-text=Defender (This creature can't attack.) {1}{U}, Sacrifice Soulsworn Jury: Counter target creature spell.
 abilities=defender
-auto={1}{U}{S}:fizzle target(creature|stack)
-rarity=C
 [/card]
 [card]
+text=Counter all other spells. Draw a card for each spell countered this way.
 id=107284
 name=Swift Silence
-mana={2}{W}{U}{U}
-type=Instant
-text=Counter all other spells. Draw a card for each spell countered this way.
 auto=foreach(other *|stack) draw:1
 auto=fizzle all(other *|stack)
 rarity=R
+mana={2}{W}{U}{U}
+type=Instant
 [/card]
 [card]
+text=Enchant creature   Enchanted creature gets +2/+0.   Hellbent - Enchanted creature gets an additional +2/+0 as long as you have no cards in hand.
 id=107597
-name=Taste for Mayhem
-mana={R}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature gets +2/+0. Hellbent - Enchanted creature gets an additional +2/+0 as long as you have no cards in hand.
-rarity=C
 target=creature
 auto=4/0
 auto=aslongas(*|myhand)-2/0
+name=Taste for Mayhem
+rarity=C
+mana={R}
+type=Enchantment
+subtype=Aura
 [/card]
 [card]
+text=Flying Whenever Trygon Predator deals combat damage to a player, you may destroy target artifact or enchantment that player controls.
+auto=@damaged(player) from(this):may destroy target(artifact,enchantment)
 id=97112
 name=Trygon Predator
+rarity=U
 mana={1}{G}{U}
 type=Creature
 subtype=Beast
 power=2
 toughness=3
-text=Flying Whenever Trygon Predator deals combat damage to a player, you may destroy target artifact or enchantment that player controls.
-auto=@damaged(player) from(this):may destroy target(artifact,enchantment)
-abilities=Flying
-rarity=U
+abilities=flying
 [/card]
 [card]
+text=Flying   Utvara Scalper attacks each turn if able.
 id=107276
 name=Utvara Scalper
+rarity=C
 mana={1}{R}
 type=Creature
 subtype=Goblin Scout
 power=1
 toughness=2
-text=Flying Utvara Scalper attacks each turn if able.
 abilities=Flying,mustattack
-rarity=C
 [/card]
 [card]
+text={T}, Pay 1 life: Add one mana of any color to your mana pool.
 id=107477
 name=Vesper Ghoul
+rarity=C
 mana={2}{B}
 type=Creature
 subtype=Zombie Druid
+auto={T}:Add{G} && life:-1 controller
+auto={T}:Add{W} && life:-1 controller
+auto={T}:Add{R} && life:-1 controller
+auto={T}:Add{B} && life:-1 controller
+auto={T}:Add{U} && life:-1 controller
 power=1
 toughness=1
-text={T}, Pay 1 life: Add one mana of any color to your mana pool.
-auto={T}:add{G} && life:-1
-auto={T}:add{W} && life:-1
-auto={T}:add{R} && life:-1
-auto={T}:add{B} && life:-1
-auto={T}:add{U} && life:-1
-rarity=C
 [/card]
 [card]
+text=Each player draws two cards.
 id=107397
 name=Vision Skeins
-mana={1}{U}
-type=Instant
-text=Each player draws two cards.
 auto=draw:2 opponent
 auto=draw:2 controller
 rarity=C
+mana={1}{U}
+type=Instant
 [/card]
 [card]
+text=Defender (This creature can't attack.)   Flying   {1}{W}: Creatures you control with defender can attack this turn as though they didn't have defender.
 id=111226
 name=Wakestone Gargoyle
+rarity=R
 mana={3}{W}
 type=Creature
 subtype=Gargoyle
+auto={1}{W}:lord(creature[defender]|myBattlefield) -defender
 power=3
 toughness=4
-text=Defender (This creature can't attack.) Flying {1}{W}: Creatures you control with defender can attack this turn as though they didn't have defender.
 abilities=defender,flying
-auto={1}{W}:lord(creature|mybattlefield) -defender
-rarity=R
 [/card]
 [card]
-id=111202
-name=Wrecking Ball
-mana={2}{B}{R}
-type=Instant
 text=Destroy target creature or land.
+id=111202
 target=creature,land
 auto=destroy
+name=Wrecking Ball
 rarity=C
+mana={2}{B}{R}
+type=Instant
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/DIS/todo.dat b/projects/mtg/bin/Res/sets/DIS/todo.dat
index 64dca26cc..4ae1dedf3 100644
--- a/projects/mtg/bin/Res/sets/DIS/todo.dat
+++ b/projects/mtg/bin/Res/sets/DIS/todo.dat
@@ -25,7 +25,6 @@ toughness=0
 text=Graft 2 (This creature enters the battlefield with two +1/+1 counters on it. Whenever another creature enters the battlefield, you may move a +1/+1 counter from this creature onto it.) {G}: Target creature with a +1/+1 counter on it gains reach until end of turn. (It can block creatures with flying.)
 rarity=C
 [/card]
-
 [card]
 id=110639
 name=Aurora Eidolon
@@ -68,17 +67,6 @@ text=Azorius Chancery enters the battlefield tapped. When Azorius Chancery enter
 rarity=C
 [/card]
 [card]
-id=97101
-name=Azorius First-Wing
-mana={W}{U}
-type=Creature
-subtype=Griffin
-power=2
-toughness=2
-text=Flying, protection from enchantments
-rarity=C
-[/card]
-[card]
 id=97077
 name=Azorius Guildmage
 mana={WU}{WU}
diff --git a/projects/mtg/bin/Res/sets/DST/_cards.dat b/projects/mtg/bin/Res/sets/DST/_cards.dat
index 96e6f1422..72bf5f93d 100644
--- a/projects/mtg/bin/Res/sets/DST/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DST/_cards.dat
@@ -7,3 +7,29 @@ text=Whenever a player casts a white spell, you may gain 1 life.
 auto=@movedTo(*[white]|stack):may life:1 controller
 rarity=U
 [/card]
+[card]
+text=Defender (This creature can't attack.)   Protection from artifacts   Whenever an opponent casts an artifact spell, you may put a 1/1 green Insect creature token onto the battlefield.
+auto=@movedTo(artifact|opponentstack):tokentoken(Insect,creature token insect, 1/1,green)
+id=48598
+name=Infested Roothold
+rarity=U
+mana={4}{G}
+type=Creature
+subtype=Wall
+auto=protection from(artifact)
+power=0
+toughness=3
+abilities=defender
+[/card]
+[card]
+text=Protection from artifacts
+id=46002
+name=Tel-Jilad Outrider
+rarity=C
+mana={3}{G}
+type=Creature
+subtype=Elf Warrior
+auto=protection from(artifact)
+power=3
+toughness=1
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/DST/todo.dat b/projects/mtg/bin/Res/sets/DST/todo.dat
index 94b0ec7d2..d2c415a15 100644
--- a/projects/mtg/bin/Res/sets/DST/todo.dat
+++ b/projects/mtg/bin/Res/sets/DST/todo.dat
@@ -1,4 +1,4 @@
-[card]
+[card]
 id=49075
 name=AEther Snap
 mana={3}{B}{B}
@@ -624,17 +624,6 @@ text=Target creature gets +1/+0 until end of turn for each artifact you control.
 rarity=C
 [/card]
 [card]
-id=48598
-name=Infested Roothold
-mana={4}{G}
-type=Creature
-subtype=Wall
-power=0
-toughness=3
-text=Defender (This creature can't attack.) Protection from artifacts Whenever an opponent casts an artifact spell, you may put a 1/1 green Insect creature token onto the battlefield.
-rarity=U
-[/card]
-[card]
 id=48120
 name=Inflame
 mana={R}
@@ -1349,17 +1338,6 @@ text=Cast Tears of Rage only during the declare attackers step. Attacking creatu
 rarity=U
 [/card]
 [card]
-id=46002
-name=Tel-Jilad Outrider
-mana={3}{G}
-type=Creature
-subtype=Elf Warrior
-power=3
-toughness=1
-text=Protection from artifacts
-rarity=C
-[/card]
-[card]
 id=46008
 name=Tel-Jilad Wolf
 mana={2}{G}
diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index f3587cfce..496337284 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -1523,6 +1523,18 @@ toughness=2
 abilities=protection from white
 [/card]
 [card]
+text=Protection from Kavu
+id=22978
+name=Shoreline Raider
+rarity=C
+mana={2}{U}
+type=Creature
+subtype=Merfolk
+auto=protection from(kavu)
+power=2
+toughness=2
+[/card]
+[card]
 text=Simoon deals 1 damage to each creature target opponent controls.
 auto=damage:1 all(creature|opponentBattlefield)
 id=23175
@@ -1915,6 +1927,20 @@ auto={T}:Add {G}
 type=Artifact
 [/card]
 [card]
+text=First strike, protection from legendary creatures   {B}{B}, {T}: Destroy target legendary creature. It can't be regenerated.
+id=23321
+name=Tsabo Tavoc
+rarity=R
+mana={5}{B}{R}
+type=Creature
+subtype=Horror
+auto=protection from(creature[legendary])
+auto={B}{B}:bury target(creature[legendary])
+power=7
+toughness=4
+abilities=legendary,first strike
+[/card]
+[card]
 text=Counter target spell. Its controller loses 3 life.
 id=23190
 name=Undermine
diff --git a/projects/mtg/bin/Res/sets/INV/todo.dat b/projects/mtg/bin/Res/sets/INV/todo.dat
index b7c36ec9b..d19c80676 100644
--- a/projects/mtg/bin/Res/sets/INV/todo.dat
+++ b/projects/mtg/bin/Res/sets/INV/todo.dat
@@ -1112,17 +1112,6 @@ subtype=Human Wizard
 toughness=1
 [/card]
 [card]
-text=Protection from Kavu
-id=22978
-name=Shoreline Raider
-rarity=C
-type=Creature
-mana={2}{U}
-power=2
-subtype=Merfolk
-toughness=2
-[/card]
-[card]
 text=Kicker {R} (You may pay an additional {R} as you play this spell.)  Trample, haste     At end of turn, sacrifice Skizzik unless the kicker cost was paid.
 id=23096
 name=Skizzik
@@ -1366,17 +1355,6 @@ subtype=Dragon
 toughness=6
 [/card]
 [card]
-text=First strike, protection from legendary creatures     {B}{B}, {T}: Destroy target legendary creature. It can't be regenerated.
-id=23321
-name=Tsabo Tavoc
-rarity=R
-type=Legendary Creature
-mana={5}{B}{R}
-power=7
-subtype=Horror
-toughness=4
-[/card]
-[card]
 text={T}: Destroy target creature if it shares a color with the most common color among all permanents or a color tied for most common. A creature destroyed this way can't be regenerated.
 id=23048
 name=Tsabo's Assassin
diff --git a/projects/mtg/bin/Res/sets/JUD/_cards.dat b/projects/mtg/bin/Res/sets/JUD/_cards.dat
index e7f2f7e49..4b6fde142 100644
--- a/projects/mtg/bin/Res/sets/JUD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/JUD/_cards.dat
@@ -116,6 +116,19 @@ power=2
 toughness=1
 [/card]
 [card]
+text=Flying, protection from creatures
+id=35893
+name=Commander Eesha
+rarity=R
+mana={2}{W}{W}
+type=Creature
+subtype=Bird Soldier
+auto=protection from(creature)
+power=2
+toughness=4
+abilities=legendary,flying
+[/card]
+[card]
 text=Enchant creature.   Enchanted creature gets +3/+3.   When enchanted creature is put into a graveyard, put a 3/3 green Elephant creature token onto the battlefield.
 id=12692
 name=Elephant Guide
diff --git a/projects/mtg/bin/Res/sets/JUD/todo.dat b/projects/mtg/bin/Res/sets/JUD/todo.dat
index dc537a63e..0251f8db1 100644
--- a/projects/mtg/bin/Res/sets/JUD/todo.dat
+++ b/projects/mtg/bin/Res/sets/JUD/todo.dat
@@ -179,17 +179,6 @@ text=Destroy target attacking creature. You gain life equal to its power.
 rarity=U
 [/card]
 [card]
-id=35893
-name=Commander Eesha
-mana={2}{W}{W}
-type=Legendary Creature
-subtype=Bird Soldier
-power=2
-toughness=4
-text=Flying, protection from creatures
-rarity=R
-[/card]
-[card]
 id=35170
 name=Crush of Wurms
 mana={6}{G}{G}{G}
@@ -538,15 +527,15 @@ text=Enchant creature Enchanted creature can't attack or block and its activated
 rarity=C
 [/card]
 [card]
+text=Green creatures and white creatures have protection from Gorgons.   Threshold - Masked Gorgon has protection from green and from white as long as seven or more cards are in your graveyard.
 id=34480
 name=Masked Gorgon
+rarity=R
 mana={4}{B}
 type=Creature
 subtype=Gorgon
 power=5
 toughness=5
-text=Green creatures and white creatures have protection from Gorgons. Threshold  EMasked Gorgon has protection from green and from white as long as seven or more cards are in your graveyard.
-rarity=R
 [/card]
 [card]
 id=35057
diff --git a/projects/mtg/bin/Res/sets/LRW/_cards.dat b/projects/mtg/bin/Res/sets/LRW/_cards.dat
index cee13ec9a..67e4270f2 100644
--- a/projects/mtg/bin/Res/sets/LRW/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LRW/_cards.dat
@@ -751,6 +751,18 @@ toughness=4
 abilities=legendary
 [/card]
 [card]
+text=Protection from Elves
+id=139446
+name=Nath's Buffoon
+rarity=C
+mana={1}{B}
+type=Creature
+subtype=Goblin Rogue
+auto=protection from(elf)
+power=1
+toughness=1
+[/card]
+[card]
 text=Destroy target attacking or blocking creature.
 target=creature[attacking;blocking]
 auto=destroy
@@ -1178,6 +1190,18 @@ mana={1}
 type=Artifact
 [/card]
 [card]
+text=Protection from Goblins
+id=139450
+name=Warren-Scourge Elf
+rarity=C
+mana={1}{G}
+type=Creature
+subtype=Elf Warrior
+auto=protection from(goblin)
+power=1
+toughness=1
+[/card]
+[card]
 text=As Wanderwine Hub enters the battlefield, you may reveal a Merfolk card from your hand. If you don't, Wanderwine Hub comes into play tapped.     {T}: Add {W} or {U} to your mana pool.
 id=153456
 auto=tap
diff --git a/projects/mtg/bin/Res/sets/LRW/todo.dat b/projects/mtg/bin/Res/sets/LRW/todo.dat
index c9916ebad..701401c95 100644
--- a/projects/mtg/bin/Res/sets/LRW/todo.dat
+++ b/projects/mtg/bin/Res/sets/LRW/todo.dat
@@ -1240,17 +1240,6 @@ mana={1}{B}
 subtype=Shapeshifter
 [/card]
 [card]
-text=Protection from Elves
-id=139446
-name=Nath's Buffoon
-rarity=C
-type=Creature
-mana={1}{B}
-power=1
-subtype=Goblin Rogue
-toughness=1
-[/card]
-[card]
 text=All creatures able to block Nath's Elite do so.     When Nath's Elite comes into play, clash with an opponent. If you win, put a +1/+1 counter on Nath's Elite. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
 id=145990
 name=Nath's Elite
@@ -1831,17 +1820,6 @@ subtype=Goblin Rogue
 toughness=3
 [/card]
 [card]
-text=Protection from Goblins
-id=139450
-name=Warren-Scourge Elf
-rarity=C
-type=Creature
-mana={1}{G}
-power=1
-subtype=Elf Warrior
-toughness=1
-[/card]
-[card]
 text=Destroy target creature. Clash with an opponent. If you win, you gain life equal to that creature's toughness. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
 id=145991
 name=Weed Strangle
diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat
index d523723cc..bafbb6f79 100644
--- a/projects/mtg/bin/Res/sets/MRD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat
@@ -755,6 +755,19 @@ rarity=L
 subtype=Mountain
 [/card]
 [card]
+text=Flash   Protection from artifacts
+id=48930
+name=Needlebug
+rarity=U
+mana={4}
+type=Artifact Creature
+subtype=Insect
+auto=protection from(artifact)
+power=2
+toughness=2
+abilities=flash
+[/card]
+[card]
 text=Neurok Spy is unblockable as long as defending player controls an artifact.
 id=45974
 name=Neurok Spy
@@ -1242,6 +1255,31 @@ type=Artifact
 rarity=C
 [/card]
 [card]
+text=Protection from artifacts; reach (This creature can block creatures with flying.)
+id=46004
+name=Tel-Jilad Archers
+rarity=C
+mana={4}{G}
+type=Creature
+subtype=Elf Archer
+auto=protection from(artifact)
+power=2
+toughness=4
+abilities=reach
+[/card]
+[card]
+text=Protection from artifacts
+id=46003
+name=Tel-Jilad Chosen
+rarity=C
+mana={1}{G}
+type=Creature
+subtype=Elf Warrior
+auto=protection from(artifact)
+power=2
+toughness=1
+[/card]
+[card]
 text={1}{G}: Regenerate Tel-Jilad Exile.
 id=49436
 name=Tel-Jilad Exile
diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat
index 322d89041..17f1e18ae 100644
--- a/projects/mtg/bin/Res/sets/MRD/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRD/todo.dat
@@ -917,17 +917,6 @@ type=Artifact
 mana={1}
 [/card]
 [card]
-text=Flash     Protection from artifacts
-id=48930
-name=Needlebug
-rarity=U
-type=Artifact Creature
-mana={4}
-power=2
-subtype=Insect
-toughness=2
-[/card]
-[card]
 text=Flying When Neurok Familiar comes into play, reveal the top card of your library. If it's an artifact card, put it into your hand. Otherwise, put it into your graveyard.
 id=46082
 name=Neurok Familiar
@@ -1391,29 +1380,6 @@ rarity=R
 type=Artifact
 mana={3}
 [/card]
-[card]
-text=Protection from artifacts; reach (This creature can block creatures with flying.)
-id=46004
-name=Tel-Jilad Archers
-rarity=C
-type=Creature
-abilities=reach,protection from artifact
-mana={4}{G}
-power=2
-subtype=Elf Archer
-toughness=4
-[/card]
-[card]
-text=Protection from artifacts
-id=46003
-name=Tel-Jilad Chosen
-rarity=C
-type=Creature
-mana={1}{G}
-power=2
-subtype=Elf Warrior
-toughness=1
-[/card]
 
 [card]
 text={T}: Put target permanent you own on the bottom of your library.
diff --git a/projects/mtg/bin/Res/sets/ODY/_cards.dat b/projects/mtg/bin/Res/sets/ODY/_cards.dat
index c79e9a935..ddab65b7b 100644
--- a/projects/mtg/bin/Res/sets/ODY/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ODY/_cards.dat
@@ -182,6 +182,18 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=Protection from creatures
+id=29798
+name=Beloved Chaplain
+rarity=U
+mana={1}{W}
+type=Creature
+subtype=Human Cleric
+auto=protection from(creature)
+power=1
+toughness=1
+[/card]
+[card]
 text=Other creatures you control get +0/+1. 
 id=29688
 name=Blessed Orator
diff --git a/projects/mtg/bin/Res/sets/ODY/todo.dat b/projects/mtg/bin/Res/sets/ODY/todo.dat
index 68c1dabb7..ea862a1cc 100644
--- a/projects/mtg/bin/Res/sets/ODY/todo.dat
+++ b/projects/mtg/bin/Res/sets/ODY/todo.dat
@@ -176,17 +176,6 @@ type=Instant
 mana={2}{G}{G}{G}
 [/card]
 [card]
-text=Protection from creatures
-id=29798
-name=Beloved Chaplain
-rarity=U
-type=Creature
-mana={1}{W}
-power=1
-subtype=Human Cleric
-toughness=1
-[/card]
-[card]
 text=Blazing Salvo deals 3 damage to target creature unless that creature's controller has Blazing Salvo deal 5 damage to him or her.
 id=29858
 name=Blazing Salvo
diff --git a/projects/mtg/bin/Res/sets/SCG/_cards.dat b/projects/mtg/bin/Res/sets/SCG/_cards.dat
index 388c6ecc8..af6670d5d 100644
--- a/projects/mtg/bin/Res/sets/SCG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SCG/_cards.dat
@@ -1,23 +1,36 @@
 [card]
-id=47281
-name=Ark of Blight
-mana={2}
-type=Artifact
 text={3}, {T}, Sacrifice Ark of Blight: Destroy target land.
 auto={3}{T}{S}:destroy target(land)
+id=47281
+name=Ark of Blight
 rarity=U
+mana={2}
+type=Artifact
 [/card]
 [card]
+text=Flying   When Bladewing the Risen enters the battlefield, you may return target Dragon permanent card from your graveyard to the battlefield.   {B}{R}: Dragon creatures get +1/+1 until end of turn.
+auto=may moveTo(myBattlefield) target(dragon[-instant;-sorcery]|mygraveyard)
 id=42024
 name=Bladewing the Risen
+rarity=R
 mana={3}{B}{B}{R}{R}
 type=Creature
 subtype=Zombie Dragon
+auto={B}{R}:lord(dragon) 1/1
 power=4
 toughness=4
-text=Flying When Bladewing the Risen enters the battlefield, you may return target Dragon permanent card from your graveyard to the battlefield. {B}{R}: Dragon creatures get +1/+1 until end of turn.
-abilities=Legendary,Flying
-auto=may moveTo(myBattlefield) target(dragon[-instant;-sorcery]|mygraveyard)
-auto={B}{R}:lord(dragon) 1/1
-rarity=R
+abilities=legendary,flying
 [/card]
+[card]
+text=Flying, protection from Dragons
+id=39714
+name=Dragonstalker
+rarity=U
+mana={4}{W}
+type=Creature
+subtype=Bird Soldier
+auto=protection from(dragon)
+power=3
+toughness=3
+abilities=flying
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/SCG/todo.dat b/projects/mtg/bin/Res/sets/SCG/todo.dat
index afab1a550..5147aa665 100644
--- a/projects/mtg/bin/Res/sets/SCG/todo.dat
+++ b/projects/mtg/bin/Res/sets/SCG/todo.dat
@@ -1,4 +1,4 @@
-[card]
+[card]
 id=43539
 name=Accelerated Mutation
 mana={3}{G}{G}
@@ -428,17 +428,6 @@ text=Dragon spells you cast cost {2} less to cast.
 rarity=U
 [/card]
 [card]
-id=39714
-name=Dragonstalker
-mana={4}{W}
-type=Creature
-subtype=Bird Soldier
-power=3
-toughness=3
-text=Flying, protection from Dragons
-rarity=U
-[/card]
-[card]
 id=46426
 name=Dragonstorm
 mana={8}{R}
diff --git a/projects/mtg/bin/Res/sets/ULG/_cards.dat b/projects/mtg/bin/Res/sets/ULG/_cards.dat
index 2154d2acc..c4b5289b8 100644
--- a/projects/mtg/bin/Res/sets/ULG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ULG/_cards.dat
@@ -1,4 +1,17 @@
 [card]
+text=Flying, protection from artifacts
+id=12354
+name=Angelic Curator
+rarity=C
+mana={1}{W}
+type=Creature
+subtype=Angel Spirit
+auto=protection from(artifact)
+power=1
+toughness=1
+abilities=flying
+[/card]
+[card]
 text={T}: Draw a card.
 id=12390
 name=Archivist
@@ -581,6 +594,18 @@ mana={2}{G}
 type=Instant
 [/card]
 [card]
+text=Protection from artifacts
+id=12429
+name=Yavimaya Scion
+rarity=C
+mana={4}{G}
+type=Creature
+subtype=Treefolk
+auto=protection from(artifact)
+power=4
+toughness=4
+[/card]
+[card]
 text=Trample
 id=5571
 name=Yavimaya Wurm
diff --git a/projects/mtg/bin/Res/sets/ULG/todo.dat b/projects/mtg/bin/Res/sets/ULG/todo.dat
index 60600da08..715c4cdc2 100644
--- a/projects/mtg/bin/Res/sets/ULG/todo.dat
+++ b/projects/mtg/bin/Res/sets/ULG/todo.dat
@@ -7,17 +7,6 @@ text=Switch target creature's power and toughness until end of turn.
 rarity=C
 [/card]
 [card]
-id=12354
-name=Angelic Curator
-mana={1}{W}
-type=Creature
-subtype=Angel Spirit
-power=1
-toughness=1
-text=Flying, protection from artifacts
-rarity=C
-[/card]
-[card]
 id=8832
 name=Angel's Trumpet
 mana={3}
@@ -824,15 +813,4 @@ power=2
 toughness=2
 text=Echo {2}{G} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.) When Yavimaya Granger enters the battlefield, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library.
 rarity=C
-[/card]
-[card]
-id=12429
-name=Yavimaya Scion
-mana={4}{G}
-type=Creature
-subtype=Treefolk
-power=4
-toughness=4
-text=Protection from artifacts
-rarity=C
 [/card]
\ No newline at end of file