diff --git a/projects/mtg/bin/Res/sets/ARB/_cards.dat b/projects/mtg/bin/Res/sets/ARB/_cards.dat
index f692c4c9e..f2c3b169d 100644
--- a/projects/mtg/bin/Res/sets/ARB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat
@@ -37,6 +37,19 @@ toughness=3
 abilities=exalted
 [/card]
 [card]
+id=188965
+name=Filigree Angel
+mana={5}{W}{W}{U}
+type=Artifact Creature
+subtype=Angel
+power=4
+toughness=4
+text=Flying When Filigree Angel comes into play, you gain 3 life for each artifact you control.
+abilities=flying
+auto=foreach(artifact|myinplay):life:3
+rarity=R
+[/card]
+[card]
 text=
 id=189647
 name=Grizzled Leotau
diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat
index 52f242c1e..634df7258 100644
--- a/projects/mtg/bin/Res/sets/ARB/todo.dat
+++ b/projects/mtg/bin/Res/sets/ARB/todo.dat
@@ -347,17 +347,6 @@ text=Destroy all blocking creatures and all blocked creatures.
 rarity=R
 [/card]
 [card]
-id=188965
-name=Filigree Angel
-mana={5}{W}{W}{U}
-type=Artifact Creature
-subtype=Angel
-power=4
-toughness=4
-text=Flying When Filigree Angel comes into play, you gain 3 life for each artifact you control.
-rarity=R
-[/card]
-[card]
 id=180609
 name=Finest Hour
 mana={2}{G}{W}{U}
diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat
index dc1afcf37..4222e18fd 100644
--- a/projects/mtg/bin/Res/sets/EVE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat
@@ -217,6 +217,18 @@ subtype=Kithkin Wizard
 toughness=3
 [/card]
 [card]
+text=When Kithkin Zealot comes into play, you gain 1 life for each black and/or red permanent target opponent controls.
+auto=foreach(*[red;black]|opponentinplay):life:1
+id=154346
+name=Kithkin Zealot
+rarity=C
+type=Creature
+mana={1}{W}
+power=1
+subtype=Kithkin Cleric
+toughness=3
+[/card]
+[card]
 text=Fear     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
 abilities=fear,persist
 id=147437
diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat
index 06b64a016..2b441cdd4 100644
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -691,17 +691,6 @@ type=Instant
 mana={3}{GU}
 [/card]
 [card]
-text=When Kithkin Zealot comes into play, you gain 1 life for each black and/or red permanent target opponent controls.
-id=154346
-name=Kithkin Zealot
-rarity=C
-type=Creature
-mana={1}{W}
-power=1
-subtype=Kithkin Cleric
-toughness=3
-[/card]
-[card]
 text=Whenever you play a spell, equipped creature gets +2/+2 until end of turn.     Equip {2}
 id=157971
 name=Leering Emblem
diff --git a/projects/mtg/bin/Res/sets/LRW/_cards.dat b/projects/mtg/bin/Res/sets/LRW/_cards.dat
index 0e602faaa..86b75f603 100644
--- a/projects/mtg/bin/Res/sets/LRW/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LRW/_cards.dat
@@ -125,6 +125,18 @@ subtype=Merfolk Rogue
 toughness=1
 [/card]
 [card]
+text=Sacrifice Elvish Eulogist: You gain 1 life for each Elf card in your graveyard.
+auto={s}:foreach(Elf|mygraveyard):life:1
+id=141804
+name=Elvish Eulogist
+rarity=C
+type=Creature
+mana={G}
+power=1
+subtype=Elf Shaman
+toughness=1
+[/card]
+[card]
 text=Put a 1/1 green Elf Warrior creature token into play for each Elf you control.
 id=139676
 name=Elvish Promenade
diff --git a/projects/mtg/bin/Res/sets/LRW/todo.dat b/projects/mtg/bin/Res/sets/LRW/todo.dat
index fe14ef93d..df098af75 100644
--- a/projects/mtg/bin/Res/sets/LRW/todo.dat
+++ b/projects/mtg/bin/Res/sets/LRW/todo.dat
@@ -531,17 +531,6 @@ subtype=Elf Druid
 toughness=2
 [/card]
 [card]
-text=Sacrifice Elvish Eulogist: You gain 1 life for each Elf card in your graveyard.
-id=141804
-name=Elvish Eulogist
-rarity=C
-type=Creature
-mana={G}
-power=1
-subtype=Elf Shaman
-toughness=1
-[/card]
-[card]
 text=Whenever a player plays a Giant spell, you may put a +1/+1 counter on Elvish Handservant.
 id=146179
 name=Elvish Handservant
diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat
index 29f5ad29c..a66c0f070 100644
--- a/projects/mtg/bin/Res/sets/MRD/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRD/todo.dat
@@ -1342,17 +1342,6 @@ subtype=Zombie
 toughness=1
 [/card]
 [card]
-text=Nim Lasher gets +1/+0 for each artifact you control.
-id=12394
-name=Nim Lasher
-rarity=C
-type=Creature
-mana={2}{B}
-power=1
-subtype=Zombie
-toughness=1
-[/card]
-[card]
 text={2}{B}, Sacrifice Nim Replica: Target creature gets -1/-1 until end of turn.
 id=46041
 name=Nim Replica
@@ -1364,17 +1353,6 @@ subtype=Zombie
 toughness=1
 [/card]
 [card]
-text=Nim Shambler gets +1/+0 for each artifact you control. Sacrifice a creature: Regenerate Nim Shambler.
-id=48126
-name=Nim Shambler
-rarity=U
-type=Creature
-mana={2}{B}{B}
-power=2
-subtype=Zombie
-toughness=1
-[/card]
-[card]
 text={4}, {T}: Put a fate counter on target permanent.     {5}, {T}, Sacrifice Oblivion Stone: Destroy each nonland permanent without a fate counter on it, then remove all fate counters from all permanents.
 id=34901
 name=Oblivion Stone
diff --git a/projects/mtg/bin/Res/sets/MRQ/_cards.dat b/projects/mtg/bin/Res/sets/MRQ/_cards.dat
index 73f8d2b74..0824a3d8f 100644
--- a/projects/mtg/bin/Res/sets/MRQ/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRQ/_cards.dat
@@ -623,6 +623,16 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Remove all creature cards in all graveyards from the game. You gain 1 life for each card removed this way.
+auto=foreach(creature|graveyard):life:1
+auto=MoveTo(removedfromgame) all(creature|graveyard)
+id=19787
+name=Honor the Fallen
+rarity=R
+type=Instant
+mana={1}{W}
+[/card]
+[card]
 text=Creatures you control have fear.
 auto=lord(creature|myinplay) fear
 id=19833
diff --git a/projects/mtg/bin/Res/sets/MRQ/todo.dat b/projects/mtg/bin/Res/sets/MRQ/todo.dat
index 5bf3b96e1..112575d69 100644
--- a/projects/mtg/bin/Res/sets/MRQ/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRQ/todo.dat
@@ -847,14 +847,6 @@ subtype=Giant
 toughness=4
 [/card]
 [card]
-text=Remove all creature cards in all graveyards from the game. You gain 1 life for each card removed this way.
-id=19787
-name=Honor the Fallen
-rarity=R
-type=Instant
-mana={1}{W}
-[/card]
-[card]
 text=Whenever a player plays a spell, he or she may pay {1}. If that player does, he or she draws a card at end of turn.
 id=19755
 name=Horn of Plenty
diff --git a/projects/mtg/bin/Res/sets/ODY/todo.dat b/projects/mtg/bin/Res/sets/ODY/todo.dat
index a59f39c3e..dc5377c13 100644
--- a/projects/mtg/bin/Res/sets/ODY/todo.dat
+++ b/projects/mtg/bin/Res/sets/ODY/todo.dat
@@ -44,6 +44,7 @@ mana={1}{U}
 [/card]
 [card]
 text=You gain 2 life for each card in your graveyard.       Flashback {9}{W}{W}{W} (You may play this card from your graveyard for its flashback cost. Then remove it from the game.)
+auto=foreach(*|mygraveyard):life:2
 id=30555
 name=Ancestral Tribute
 rarity=R
diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat
index 0589ad4ef..8fd34be47 100644
--- a/projects/mtg/bin/Res/sets/POR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/POR/_cards.dat
@@ -498,6 +498,15 @@ type=Basic Land
 subtype=Forest
 [/card]
 [card]
+text=You gain 1 life for each Forest in play.
+auto=foreach(Forest):life:1
+id=4297
+name=Fruition
+rarity=C
+type=Sorcery
+mana={G}
+[/card]
+[card]
 id=4263
 name=Giant Octopus
 rarity=C
@@ -1084,6 +1093,15 @@ power=2
 toughness=3
 [/card]
 [card]
+text=You gain 2 life for each Mountain target opponent controls.
+auto=foreach(Mountain|opponentinplay):life:2
+id=4391
+name=Renewing Dawn
+rarity=U
+type=Sorcery
+mana={1}{W}
+[/card]
+[card]
 id=4316
 name=Rowan Treefolk
 rarity=C
@@ -1104,6 +1122,18 @@ mana={1}{W}
 type=Sorcery
 [/card]
 [card]
+text=Sacred Knight can't be blocked by black and/or red creatures.
+auto=cantbeblockedby(creature[red;black])
+id=4392
+name=Sacred Knight
+rarity=C
+type=Creature
+mana={3}{W}
+power=3
+subtype=Human Knight
+toughness=2
+[/card]
+[card]
 text=Scorching Spear deals 1 damage to target creature or player.
 target=creature,player
 auto=Damage:1
@@ -1214,6 +1244,15 @@ toughness=3
 abilities=flying
 [/card]
 [card]
+text=You gain 3 life for each black creature target opponent controls.
+auto=foreach(creature[black]|opponentinplay):life:3
+id=4397
+name=Starlight
+rarity=U
+type=Sorcery
+mana={1}{W}
+[/card]
+[card]
 text=Flying
 id=4398
 name=Starlit Angel
@@ -1226,6 +1265,15 @@ toughness=4
 abilities=flying
 [/card]
 [card]
+text=Creatures you control get +0/+3 until end of turn.
+auto=lord(creature|myinplay) 0/3
+id=4399
+name=Steadfastness
+rarity=C
+type=Sorcery
+mana={1}{W}
+[/card]
+[card]
 id=4400
 auto={T}:2/2 target(creature) 
 name=Stern Marshal
diff --git a/projects/mtg/bin/Res/sets/POR/todo.dat b/projects/mtg/bin/Res/sets/POR/todo.dat
index 8ebbe4cfd..5f97de0c8 100644
--- a/projects/mtg/bin/Res/sets/POR/todo.dat
+++ b/projects/mtg/bin/Res/sets/POR/todo.dat
@@ -255,14 +255,6 @@ type=Sorcery
 mana={3}{R}
 [/card]
 [card]
-text=You gain 1 life for each Forest in play.
-id=4297
-name=Fruition
-rarity=C
-type=Sorcery
-mana={G}
-[/card]
-[card]
 text=If an opponent controls more lands than you, search your library for up to three Plains cards, reveal them, and put them into your hand. Then shuffle your library.
 id=4385
 name=Gift of Estates
@@ -423,25 +415,6 @@ type=Sorcery
 mana={4}{R}{R}
 [/card]
 [card]
-text=You gain 2 life for each Mountain target opponent controls.
-id=4391
-name=Renewing Dawn
-rarity=U
-type=Sorcery
-mana={1}{W}
-[/card]
-[card]
-text=Sacred Knight can't be blocked by black and/or red creatures.
-id=4392
-name=Sacred Knight
-rarity=C
-type=Creature
-mana={3}{W}
-power=3
-subtype=Human Knight
-toughness=2
-[/card]
-[card]
 text=Play Scorching Winds only during the declare attackers step and only if you are the defending player.       Scorching Winds deals 1 damage to each attacking creature.
 id=4361
 name=Scorching Winds
@@ -491,22 +464,6 @@ subtype=Cat
 toughness=3
 [/card]
 [card]
-text=You gain 3 life for each black creature target opponent controls.
-id=4397
-name=Starlight
-rarity=U
-type=Sorcery
-mana={1}{W}
-[/card]
-[card]
-text=Creatures you control get +0/+3 until end of turn.
-id=4399
-name=Steadfastness
-rarity=C
-type=Sorcery
-mana={1}{W}
-[/card]
-[card]
 text=You may play up to three additional lands this turn.
 id=4319
 name=Summer Bloom
diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat
index a38c48727..fe00161be 100644
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -1024,6 +1024,17 @@ type=Instant
 mana={4}{WU}{WU}
 [/card]
 [card]
+text=You gain 1 life for each tapped artifact, creature, and land you control.
+auto=foreach(creature[tapped]|myinplay):life:1
+auto=foreach(artifact[tapped]|myinplay):life:1
+auto=foreach(land[tapped]|myinplay):life:1
+id=159410
+name=Toil to Renown
+rarity=C
+type=Sorcery
+mana={1}{G}
+[/card]
+[card]
 text=Flash     Enchant creature     Enchanted creature gets -3/-0.
 abilities=flash
 target=creature
diff --git a/projects/mtg/bin/Res/sets/SHM/todo.dat b/projects/mtg/bin/Res/sets/SHM/todo.dat
index 7a5d65877..3a83cd326 100644
--- a/projects/mtg/bin/Res/sets/SHM/todo.dat
+++ b/projects/mtg/bin/Res/sets/SHM/todo.dat
@@ -1697,14 +1697,6 @@ type=Enchantment
 mana={4}{U}{U}{U}
 [/card]
 [card]
-text=You gain 1 life for each tapped artifact, creature, and land you control.
-id=159410
-name=Toil to Renown
-rarity=C
-type=Sorcery
-mana={1}{G}
-[/card]
-[card]
 text=Return up to one target creature card from your graveyard to play if {B} was spent to play Torrent of Souls. Creatures target player controls get +2/+0 and gain haste until end of turn if {R} was spent to play Torrent of Souls. (Do both if {B}{R} was spent.)
 id=158751
 name=Torrent of Souls