diff --git a/projects/mtg/bin/Res/sets/ARB/_cards.dat b/projects/mtg/bin/Res/sets/ARB/_cards.dat
index f9afd9344..5de1dd802 100644
--- a/projects/mtg/bin/Res/sets/ARB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat
@@ -24,6 +24,18 @@ mana={R}{G}
 type=Instant
 [/card]
 [card]
+id=180614
+name=Dauntless Escort
+mana={1}{G}{W}
+type=Creature
+subtype=Rhino Soldier
+power=3
+toughness=3
+text=Sacrifice Dauntless Escort: Creatures you control are indestructible this turn.
+auto={S}:lord(creature|mybattlefield) indestructible
+rarity=R
+[/card]
+[card]
 text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)
 id=179542
 name=Ethercaste Knight
diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat
index 2bc472b4a..64269c1a7 100644
--- a/projects/mtg/bin/Res/sets/ARB/todo.dat
+++ b/projects/mtg/bin/Res/sets/ARB/todo.dat
@@ -153,18 +153,7 @@ subtype=Aura
 text=Enchant creature Enchanted creature can't attack or block. When enchanted creature becomes the target of a spell or ability, remove that creature from the game.
 rarity=C
 [/card]
-[card]
-id=180614
-name=Dauntless Escort
-mana={1}{G}{W}
-type=Creature
-subtype=Rhino Soldier
-power=3
-toughness=3
-text=Sacrifice Dauntless Escort: Creatures you control are indestructible this turn.
-auto={S}:lord(creature|mybattlefield) indestructible
-rarity=R
-[/card]
+
 [card]
 id=179543
 name=Deadshot Minotaur
diff --git a/projects/mtg/bin/Res/sets/CFX/_cards.dat b/projects/mtg/bin/Res/sets/CFX/_cards.dat
index 081740ba9..168375753 100644
--- a/projects/mtg/bin/Res/sets/CFX/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CFX/_cards.dat
@@ -596,6 +596,22 @@ type=Enchantment
 mana={3}{B}{R}
 [/card]
 [card]
+text={G}: Thornling gains haste until end of turn.     {G}: Thornling gains trample until end of turn.     {G}: Thornling is indestructible this turn.     {1}: Thornling gets +1/-1 until end of turn.     {1}: Thornling gets -1/+1 until end of turn.
+auto={G}:haste
+auto={G}:trample
+auto={G}:indestructible
+auto={1}:+1/-1
+auto={1}:-1/+1
+id=180341
+name=Thornling
+rarity=M
+type=Creature
+mana={3}{G}{G}
+power=4
+subtype=Elemental Shapeshifter
+toughness=4
+[/card]
+[card]
 text=When Tukatongue Thallid is put into a graveyard from play, put a 1/1 green Saproling creature token into play.
 auto=@movedTo(this|graveyard):token(Saproling,creature Saproling,1/1,green)
 id=184995
diff --git a/projects/mtg/bin/Res/sets/CFX/todo.dat b/projects/mtg/bin/Res/sets/CFX/todo.dat
index de557efcb..1f0075276 100644
--- a/projects/mtg/bin/Res/sets/CFX/todo.dat
+++ b/projects/mtg/bin/Res/sets/CFX/todo.dat
@@ -708,22 +708,7 @@ rarity=R
 type=Sorcery
 mana={3}{U}{U}
 [/card]
-[card]
-text={G}: Thornling gains haste until end of turn.     {G}: Thornling gains trample until end of turn.     {G}: Thornling is indestructible this turn.     {1}: Thornling gets +1/-1 until end of turn.     {1}: Thornling gets -1/+1 until end of turn.
-auto={G}:haste
-auto={G}:trample
-auto={G}:indestructible
-auto={1}:+1/-1
-auto={1}:-1/+1
-id=180341
-name=Thornling
-rarity=M
-type=Creature
-mana={3}{G}{G}
-power=4
-subtype=Elemental Shapeshifter
-toughness=4
-[/card]
+
 [card]
 text=Toxic Iguanar has deathtouch as long as you control a green permanent. (Whenever it deals damage to a creature, destroy that creature.)
 id=170956
diff --git a/projects/mtg/bin/Res/sets/LRW/_cards.dat b/projects/mtg/bin/Res/sets/LRW/_cards.dat
index 930c11e43..d133fe118 100644
--- a/projects/mtg/bin/Res/sets/LRW/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LRW/_cards.dat
@@ -1121,6 +1121,19 @@ subtype=Giant Shaman
 toughness=4
 [/card]
 [card]
+text=Other Treefolk creatures you control get +1/+1.     Other Treefolk and Forests you control are indestructible.
+id=139690
+auto=lord(treefolk|myinplay) 1/1 other
+auto=lord(treefolk,forest|myinplay) indestructible other
+name=Timber Protector
+rarity=R
+type=Creature
+mana={4}{G}
+power=4
+subtype=Treefolk Warrior
+toughness=6
+[/card]
+[card]
 text=Flash     Enchant creature     When Triclopean Sight comes into play, untap enchanted creature.     Enchanted creature gets +1/+1 and has vigilance.
 abilities=flash
 target=creature
diff --git a/projects/mtg/bin/Res/sets/LRW/todo.dat b/projects/mtg/bin/Res/sets/LRW/todo.dat
index c5e966f0b..1be137a5c 100644
--- a/projects/mtg/bin/Res/sets/LRW/todo.dat
+++ b/projects/mtg/bin/Res/sets/LRW/todo.dat
@@ -1725,19 +1725,7 @@ power=1
 subtype=Merfolk Wizard
 toughness=1
 [/card]
-[card]
-text=Other Treefolk creatures you control get +1/+1.     Other Treefolk and Forests you control are indestructible.
-id=139690
-auto=lord(treefolk|myinplay) 1/1 other
-auto=lord(treefolk,forest|myinplay) indestructible other
-name=Timber Protector
-rarity=R
-type=Creature
-mana={4}{G}
-power=4
-subtype=Treefolk Warrior
-toughness=6
-[/card]
+
 [card]
 text=When Treefolk Harbinger comes into play, you may search your library for a Treefolk or Forest card, reveal it, then shuffle your library and put that card on top of it.
 id=139495
diff --git a/projects/mtg/bin/Res/sets/M10/_cards.dat b/projects/mtg/bin/Res/sets/M10/_cards.dat
index e46c5b583..b99706539 100644
--- a/projects/mtg/bin/Res/sets/M10/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M10/_cards.dat
@@ -837,6 +837,17 @@ alias=1165
 abilitites=flying
 [/card]
 [card]
+id=190568
+name=Indestructibility
+mana={3}{W}
+type=Enchantment
+subtype=Aura
+text=Enchant permanent Enchanted permanent is indestructible. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)
+target=creature
+auto=indestructible
+rarity=R
+[/card]
+[card]
 id=191387
 name=Island
 auto={T}:Add{U}
diff --git a/projects/mtg/bin/Res/sets/M10/todo.dat b/projects/mtg/bin/Res/sets/M10/todo.dat
index b37215f93..06e5b1066 100644
--- a/projects/mtg/bin/Res/sets/M10/todo.dat
+++ b/projects/mtg/bin/Res/sets/M10/todo.dat
@@ -284,17 +284,7 @@ toughness=4
 text=Flying When Illusionary Servant becomes the target of a spell or ability, sacrifice it.
 rarity=C
 [/card]
-[card]
-id=190568
-name=Indestructibility
-mana={3}{W}
-type=Enchantment
-subtype=Aura
-text=Enchant permanent Enchanted permanent is indestructible. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)
-target=creature
-auto=indestructible
-rarity=R
-[/card]
+
 [card]
 id=191090
 name=Inferno Elemental