diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 11fb76059..2bf5e8b95 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -1145,15 +1145,6 @@ power=5
 toughness=3
 [/card]
 [card]
-name=Avatar of Fury
-text=If an opponent controls seven or more lands, Avatar of Fury costs {6} less to cast. -- Flying -- {R}: Avatar of Fury gets +1/+0 until end of turn.
-mana={6}{R}{R}
-type=Creature
-subtype=Avatar
-power=6
-toughness=6
-[/card]
-[card]
 name=Avatar of Hope
 text=If you have 3 or less life, Avatar of Hope costs {6} less to cast. -- Flying -- Avatar of Hope can block any number of creatures.
 mana={6}{W}{W}
@@ -1564,15 +1555,6 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Bartel Runeaxe
-text=Vigilance -- Bartel Runeaxe can't be the target of Aura spells.
-mana={3}{B}{R}{G}
-type=Legendary Creature
-subtype=Giant Warrior
-power=6
-toughness=5
-[/card]
-[card]
 name=Barter in Blood
 text=Each player sacrifices two creatures.
 mana={2}{B}{B}
@@ -8867,15 +8849,6 @@ power=*
 toughness=*
 [/card]
 [card]
-name=Gaea's Revenge
-text=Gaea's Revenge can't be countered. -- Haste -- Gaea's Revenge can't be the target of nongreen spells or abilities from nongreen sources.
-mana={5}{G}{G}
-type=Creature
-subtype=Elemental
-power=8
-toughness=5
-[/card]
-[card]
 name=Gaea's Touch
 text=You may play an additional land during your turn if that land is a basic Forest. -- Sacrifice Gaea's Touch: Add {G}{G} to your mana pool.
 mana={G}{G}
@@ -12493,15 +12466,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Karplusan Strider
-text=Karplusan Strider can't be the target of blue or black spells.
-mana={3}{G}
-type=Creature
-subtype=Yeti
-power=3
-toughness=4
-[/card]
-[card]
 name=Katabatic Winds
 text=Phasing (This phases in or out before you untap during each of your untap steps. While it's phased out, it's treated as though it doesn't exist.) -- Creatures with flying can't attack or block, and their activated abilities with {T} in their costs can't be activated.
 mana={2}{G}
@@ -23586,15 +23550,6 @@ mana={1}{U}
 type=Instant
 [/card]
 [card]
-name=Spellbane Centaur
-text=Creatures you control can't be the targets of blue spells or abilities from blue sources.
-mana={2}{G}
-type=Creature
-subtype=Centaur
-power=3
-toughness=2
-[/card]
-[card]
 name=Spellbinder
 text=Imprint - When Spellbinder enters the battlefield, you may exile an instant card from your hand. -- Whenever equipped creature deals combat damage to a player, you may copy the exiled card. If you do, you may cast the copy without paying its mana cost. -- Equip {4}
 mana={3}
@@ -23602,17 +23557,6 @@ type=Artifact
 subtype=Equipment
 [/card]
 [card]
-name=Spellbound Dragon
-auto=@attacking(this):target(*|myhand) dynamicability<!mytgt manacostpumppow tosrc!>
-#auto=@attacking(this):draw:1 controller
-text=Flying -- Whenever Spellbound Dragon attacks, draw a card, then discard a card. Spellbound Dragon gets +X/+0 until end of turn, where X is the discarded card's converted mana cost.
-mana={3}{U}{R}
-type=Creature
-subtype=Dragon
-power=3
-toughness=5
-[/card]
-[card]
 name=Spellbreaker Behemoth
 abilities=nofizzle
 ####Could not be added for the same reason as Quick Sliver and Root Sliver (LGN).
@@ -24802,15 +24746,6 @@ power=1
 toughness=3
 [/card]
 [card]
-name=Suq'Ata Firewalker
-text=Suq'Ata Firewalker can't be the target of red spells or abilities from red sources. -- {T}: Suq'Ata Firewalker deals 1 damage to target creature or player.
-mana={1}{U}{U}
-type=Creature
-subtype=Human Wizard
-power=0
-toughness=1
-[/card]
-[card]
 name=Surestrike Trident
 text=Equipped creature has first strike and "{T}, Unattach Surestrike Trident: This creature deals damage equal to its power to target player." -- Equip {4} ({4}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 mana={2}
@@ -25471,15 +25406,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Tetsuo Umezawa
-text=Tetsuo Umezawa can't be the target of Aura spells. -- {U}{B}{B}{R}, {T}: Destroy target tapped or blocking creature.
-mana={U}{B}{R}
-type=Legendary Creature
-subtype=Human Archer
-power=3
-toughness=3
-[/card]
-[card]
 name=Tezzeret the Seeker
 text=+1: Untap up to two target artifacts. -- -X: Search your library for an artifact card with converted mana cost X or less and put it onto the battlefield. Then shuffle your library. -- -5: Artifacts you control become 5/5 artifact creatures until end of turn.
 mana={3}{U}{U}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index dd45a2d25..adcf810ea 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -3127,8 +3127,10 @@ type=Instant
 [card]
 name=Artifact Ward
 target=creature
-auto=protection from(artifact)
-text=Enchant creature -- Enchanted creature has protection from artifacts. This effect doesn't remove Artifact Ward.
+auto=cantbeblockedby(creature[artifact])
+auto=teach(creature) preventAllCombatDamage to(this) from(creature[artifact])
+auto=teach(creature) cantbetargetof(artifact)
+text=Enchant creature -- Enchanted creature can't be blocked by artifact creatures. -- Prevent all damage that would be dealt to enchanted creature by artifact sources. -- Enchanted creature can't be the target of abilities from artifact sources.
 mana={W}
 type=Enchantment
 subtype=Aura
@@ -3675,6 +3677,19 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Avatar of Fury
+abilities=flying
+auto={R}:1/0
+otherrestriction=opponenttypemin:7 type(land)
+other={R}{R}
+text=If an opponent controls seven or more lands, Avatar of Fury costs {6} less to cast. -- Flying -- {R}: Avatar of Fury gets +1/+0 until end of turn.
+mana={6}{R}{R}
+type=Creature
+subtype=Avatar
+power=6
+toughness=6
+[/card]
+[card]
 name=Avarax
 abilities=haste
 auto=may moveTo(myhand) target(Avarax|mylibrary)
@@ -4632,7 +4647,6 @@ text=Target creature gets +2/+2 until end of turn. -- Conspire (As you cast this
 mana={GW}
 type=Instant
 [/card]
-
 [card]
 name=Barktooth Warbeard
 mana={4}{B}{R}{R}
@@ -4736,6 +4750,17 @@ mana={4}
 type=Artifact
 [/card]
 [card]
+name=Bartel Runeaxe
+abilities=vigilance
+auto=cantbetargetof(aura)
+text=Vigilance -- Bartel Runeaxe can't be the target of Aura spells.
+mana={3}{B}{R}{G}
+type=Legendary Creature
+subtype=Giant Warrior
+power=6
+toughness=5
+[/card]
+[card]
 name=Basal Sliver
 auto=lord(sliver) {S}:Add {B}{B}
 text=All Slivers have "Sacrifice this permanent: Add {B}{B} to your mana pool."
@@ -23217,6 +23242,17 @@ mana={G}
 type=Instant
 [/card]
 [card]
+name=Gaea's Revenge
+abilities=nofizzle,haste
+auto=cantbetargetof(*[-green])
+text=Gaea's Revenge can't be countered. -- Haste -- Gaea's Revenge can't be the target of nongreen spells or abilities from nongreen sources.
+mana={5}{G}{G}
+type=Creature
+subtype=Elemental
+power=8
+toughness=5
+[/card]
+[card]
 name=Gaea's Skyfolk
 abilities=flying
 text=Flying
@@ -32347,6 +32383,16 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Karplusan Strider
+auto=cantbetargetof(*[blue;black])
+text=Karplusan Strider can't be the target of blue or black spells.
+mana={3}{G}
+type=Creature
+subtype=Yeti
+power=3
+toughness=4
+[/card]
+[card]
 name=Karplusan Wolverine
 auto=@blocked(this):may damage:1 target(creature,player)
 text=Whenever Karplusan Wolverine becomes blocked, you may have it deal 1 damage to target creature or player.
@@ -58149,6 +58195,16 @@ mana={U}
 type=Instant
 [/card]
 [card]
+name=Spellbane Centaur
+auto=lord(creature|mybattlefield) cantbetargetof(*[blue])
+text=Creatures you control can't be the targets of blue spells or abilities from blue sources.
+mana={2}{G}
+type=Creature
+subtype=Centaur
+power=3
+toughness=2
+[/card]
+[card]
 name=Spellbook
 abilities=nomaxhand
 text=You have no maximum hand size.
@@ -61026,6 +61082,17 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Suq'Ata Firewalker
+auto=cantbetargetof(*[red])
+auto={T}:damage:1 target(creature,player)
+text=Suq'Ata Firewalker can't be the target of red spells or abilities from red sources. -- {T}: Suq'Ata Firewalker deals 1 damage to target creature or player.
+mana={1}{U}{U}
+type=Creature
+subtype=Human Wizard
+power=0
+toughness=1
+[/card]
+[card]
 name=Suq'Ata Lancer
 abilities=haste,flanking
 text=Haste -- Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)
@@ -62870,6 +62937,17 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Tetsuo Umezawa
+auto=cantbetargetof(aura)
+auto={U}{B}{B}{R}{T}:destroy target(creature[tapped;blocking])
+text=Tetsuo Umezawa can't be the target of Aura spells. -- {U}{B}{B}{R}, {T}: Destroy target tapped or blocking creature.
+mana={U}{B}{R}
+type=Legendary Creature
+subtype=Human Archer
+power=3
+toughness=3
+[/card]
+[card]
 name=Teysa, Orzhov Scion
 auto={S(creature[white]|myBattlefield)}{S(creature[white]|myBattlefield)}{S(creature[white]|myBattlefield)}:moveTo(exile) target(creature)
 auto=@movedTo(other creature[black]|mygraveyard) from(mybattlefield):token(Spirit,Creature Spirit,1/1,flying,white)