diff --git a/projects/mtg/bin/Res/sets/FEM/_cards.dat b/projects/mtg/bin/Res/sets/FEM/_cards.dat
index 5333e1292..8bff224c7 100644
--- a/projects/mtg/bin/Res/sets/FEM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/FEM/_cards.dat
@@ -1,292 +1,292 @@
 [card]
 text={1}{T}, Sacrifice Aeolipile: Aeolipile deals 2 damage to target creature or player.
+auto={1}{T}{S}:damage:2 target(creature,player)
 id=1827
 name=Aeolipile
 rarity=R
-type=Artifact
 mana={2}
-auto={1}{T}{S}:damage:2 target(creature,player)
+type=Artifact
 [/card]
 [card]
+text={T}, Sacrifice Armor Thrull: Put a +1/+2 counter on target creature.
 id=1838
 name=Armor Thrull
+rarity=C
 mana={2}{B}
 type=Creature
 subtype=Thrull
+auto={T}{S}:counter(1/2) target(creature)
 power=1
 toughness=3
-text={T}, Sacrifice Armor Thrull: Put a +1/+2 counter on target creature.
-auto={T}{S}:counter(1/2) target(creature)
-rarity=C
 [/card]
 [card]
 text={T}, Sacrifice Basal Thrull: Add {B}{B} to your mana pool.
 id=1842
 name=Basal Thrull
 rarity=C
+mana={B}{B}
 type=Creature
 subtype=Thrull
-mana={B}{B}
+auto={S}:Add {B}{B}
 power=1
 toughness=2
-auto={S}:add {B}{B}
 [/card]
 [card]
 text={T}, Sacrifice Basal Thrull: Add {B}{B} to your mana pool.
 id=1843
 name=Basal Thrull
 rarity=C
+mana={B}{B}
 type=Creature
 subtype=Thrull
-mana={B}{B}
+auto={S}:add {B}{B}
 power=1
 toughness=2
-auto={S}:add {B}{B}
 [/card]
 [card]
 text={T}, Sacrifice Basal Thrull: Add {B}{B} to your mana pool.
 id=1844
 name=Basal Thrull
 rarity=C
+mana={B}{B}
 type=Creature
 subtype=Thrull
-mana={B}{B}
+auto={S}:Add {B}{B}
 power=1
 toughness=2
-auto={S}:add {B}{B}
 [/card]
 [card]
 text={T}, Sacrifice Basal Thrull: Add {B}{B} to your mana pool.
 id=1845
 name=Basal Thrull
 rarity=C
+mana={B}{B}
 type=Creature
 subtype=Thrull
-mana={B}{B}
+auto={S}:Add {B}{B}
 power=1
 toughness=2
-auto={S}:add {B}{B}
 [/card]
 [card]
-id=1832
-name=Draconian Cylix
-mana={3}
-type=Artifact
 text={2}, {T}, Discard a card at random: Regenerate target creature.
 auto={2}{T}:regenerate target(creature) && discard:1
+id=1832
+name=Draconian Cylix
 rarity=R
+mana={3}
+type=Artifact
 [/card]
 [card]
+text={R}, {T}, Discard a card: Put a +0/+1 counter or a +1/+0 counter on target creature.
 id=1941
 name=Dwarven Armorer
 mana={R}
+rarity=R
 type=Creature
 subtype=Dwarf
-power=0
-toughness=2
-text={R}, {T}, Discard a card: Put a +0/+1 counter or a +1/+0 counter on target creature.
 auto={R}{T}{S(*|myhand)}:counter(0/1) target(creature)
 auto={R}{T}{S(*|myhand)}:counter(1/0) target(creature)
-rarity=R
+power=0
+toughness=2
 [/card]
 [card]
 text={1}{R}: Target Dwarf creature gets +1/+0 until end of turn.
 id=1943
 name=Dwarven Lieutenant
 rarity=U
+mana={R}{R}
 type=Creature
 subtype=Dwarf Soldier
-mana={R}{R}
+auto={1}{R}:1/0 target(dwarf)
 power=1
 toughness=2
-auto={1}{R}:1/0 target(dwarf)
 [/card]
 [card]
-text=Dwarven Ruins comes into play tapped.     {T}: Add {R} to your mana pool.     {T}, Sacrifice Dwarven Ruins: Add {R}{R} to your mana pool.
+text=Dwarven Ruins enters the battlefield tapped.   {T}: Add {R} to your mana pool.   {T}, Sacrifice Dwarven Ruins: Add {R}{R} to your mana pool.
 id=2005
 name=Dwarven Ruins
+auto=tap
+auto={T}:Add {R}
+auto={T}{S}:Add {R}{R}
 rarity=U
 type=Land
-auto=tap
-auto={T}:add {R}
-auto={T}{S}:add {R}{R}
 [/card]
 [card]
-text=Ebon Stronghold comes into play tapped.     {T}: Add {B} to your mana pool.     {T}, Sacrifice Ebon Stronghold: Add {B}{B} to your mana pool.
+text=Ebon Stronghold enters the battlefield tapped.   {T}: Add {B} to your mana pool.   {T}, Sacrifice Ebon Stronghold: Add {B}{B} to your mana pool.
 id=2006
 name=Ebon Stronghold
+auto=tap
+auto={T}:Add {B}
+auto={T}{S}:Add {B}{B}
 rarity=U
 type=Land
-auto=tap
-auto={T}:add {B}
-auto={T}{S}:add {B}{B}
 [/card]
 [card]
 text={1}{G}: Target blocking creature gets +0/+1 until end of turn.
 id=1904
 name=Elven Fortress
-rarity=C
-type=Enchantment
-mana={G}
 auto={1}{G}:0/1 target(creature[blocking])
+rarity=C
+mana={G}
+type=Enchantment
 [/card]
 [card]
 text={1}{G}: Target blocking creature gets +0/+1 until end of turn.
 id=1905
 name=Elven Fortress
-rarity=C
-type=Enchantment
-mana={G}
 auto={1}{G}:0/1 target(creature[blocking])
+rarity=C
+mana={G}
+type=Enchantment
 [/card]
 [card]
 text={1}{G}: Target blocking creature gets +0/+1 until end of turn.
 id=1906
 name=Elven Fortress
-rarity=C
-type=Enchantment
-mana={G}
 auto={1}{G}:0/1 target(creature[blocking])
+rarity=C
+mana={G}
+type=Enchantment
 [/card]
 [card]
 text={1}{G}: Target blocking creature gets +0/+1 until end of turn.
 id=1907
 name=Elven Fortress
-rarity=C
-type=Enchantment
-mana={G}
 auto={1}{G}:0/1 target(creature[blocking])
+rarity=C
+mana={G}
+type=Enchantment
 [/card]
 [card]
+text={1}, {T}, Sacrifice Elven Lyre: Target creature gets +2/+2 until end of turn.
 id=1833
 name=Elven Lyre
+auto={1}{T}{S}:2/2 target(creature)
+rarity=R
 mana={2}
 type=Artifact
-text={1}, {T}, Sacrifice Elven Lyre: Target creature gets +2/+2 until end of turn.
-rarity=R
-auto={1}{T}{S}:2/2 target(creature)
 [/card]
 [card]
+text=Sacrifice a Goblin: Regenerate target creature.
+auto={S(goblin|myBattlefield)}:regenerate target(creature)
 id=1947
 name=Goblin Chirurgeon
+rarity=C
 mana={R}
 type=Creature
 subtype=Goblin Shaman
 power=0
 toughness=2
-text=Sacrifice a Goblin: Regenerate target creature.
-auto={S(goblin|myinplay)}:regenerate target(creature)
-rarity=C
 [/card]
 [card]
+text=Sacrifice a Goblin: Regenerate target creature.
+auto={S(goblin|myBattlefield)}:regenerate target(creature)
 id=1948
 name=Goblin Chirurgeon
+rarity=C
 mana={R}
 type=Creature
 subtype=Goblin Shaman
 power=0
 toughness=2
-text=Sacrifice a Goblin: Regenerate target creature.
-auto={S(goblin|myinplay)}:regenerate target(creature)
-rarity=C
 [/card]
 [card]
+text=Sacrifice a Goblin: Regenerate target creature.
+auto={S(goblin|myBattlefield)}:regenerate target(creature)
 id=1949
 name=Goblin Chirurgeon
+rarity=C
 mana={R}
 type=Creature
 subtype=Goblin Shaman
 power=0
 toughness=2
-text=Sacrifice a Goblin: Regenerate target creature.
-auto={S(goblin|myinplay)}:regenerate target(creature)
-rarity=C
 [/card]
 [card]
-text=Havenwood Battleground comes into play tapped.     {T}: Add {G} to your mana pool.     {T}, Sacrifice Havenwood Battleground: Add {G}{G} to your mana pool.
+text=Havenwood Battleground enters the battlefield tapped.   {T}: Add {G} to your mana pool.   {T}, Sacrifice Havenwood Battleground: Add {G}{G} to your mana pool.
 id=2007
 name=Havenwood Battleground
+auto=tap
+auto={T}:Add {G}
+auto={T}{S}:Add {G}{G}
 rarity=U
 type=Land
-auto=tap
-auto={T}:add {G}
-auto={T}{S}:add {G}{G}
 [/card]
 [card]
 text={U}: Tap target green creature.
 id=1879
 name=Homarid Shaman
 rarity=R
+mana={2}{U}{U}
 type=Creature
 subtype=Homarid Shaman
-mana={2}{U}{U}
+auto={U}:tap target(creature[green])
 power=2
 toughness=1
-auto={U}:tap target(creature[green])
 [/card]
 [card]
 text=Target player discards two cards at random.
 id=1849
-name=Hymn to Tourach
-rarity=C
-type=Sorcery
-mana={B}{B}
 target=player
 auto=discard:2
+name=Hymn to Tourach
+rarity=C
+mana={B}{B}
+type=Sorcery
 [/card]
 [card]
 text=Target player discards two cards at random.
 id=1850
-name=Hymn to Tourach
-rarity=C
-type=Sorcery
-mana={B}{B}
 target=player
 auto=discard:2
+name=Hymn to Tourach
+rarity=C
+mana={B}{B}
+type=Sorcery
 [/card]
 [card]
 text=Target player discards two cards at random.
 id=1851
-name=Hymn to Tourach
-rarity=C
-type=Sorcery
-mana={B}{B}
 target=player
 auto=discard:2
+name=Hymn to Tourach
+rarity=C
+mana={B}{B}
+type=Sorcery
 [/card]
 [card]
 text=Target player discards two cards at random.
 id=1852
-name=Hymn to Tourach
-rarity=C
-type=Sorcery
-mana={B}{B}
 target=player
 auto=discard:2
+name=Hymn to Tourach
+rarity=C
+mana={B}{B}
+type=Sorcery
 [/card]
 [card]
 text={1}{W}: Target Soldier creature gets +1/+0 until end of turn.
 id=1988
 name=Icatian Lieutenant
 rarity=R
+mana={W}{W}
 type=Creature
 subtype=Human Soldier
-mana={W}{W}
+auto={1}{W}:target(soldier) 1/0
 power=1
 toughness=2
-auto={1}{W}:target(soldier) 1/0
 [/card]
 [card]
 text={1}{W}{W}: Target creature gets +1/+1 until end of turn.
 id=1993
 name=Icatian Priest
 rarity=U
+mana={W}
 type=Creature
 subtype=Human Cleric
-mana={W}
+auto={1}{W}{W}:1/1 target(creature)
 power=1
 toughness=1
-auto={1}{W}{W}:1/1 target(creature)
 [/card]
 [card]
 text={1}{T}: Target creature gains first strike until end of turn.
@@ -305,239 +305,237 @@ text={1}{T}: Target creature gains first strike until end of turn.
 id=1995
 name=Icatian Scout
 rarity=C
+mana={W}
 type=Creature
 subtype=Human Soldier Scout
-mana={W}
+auto={1}{T}:first strike target(creature)
 power=1
-toughness=1
-auto={1}{T}:first strike target(creature) 
+toughness=1 
 [/card]
 [card]
 text={1}{T}: Target creature gains first strike until end of turn.
 id=1996
 name=Icatian Scout
 rarity=C
+mana={W}
 type=Creature
 subtype=Human Soldier Scout
-mana={W}
+auto={1}{T}:first strike target(creature)
 power=1
-toughness=1
-auto={1}{T}:first strike target(creature) 
+toughness=1 
 [/card]
 [card]
 text={1}{T}: Target creature gains first strike until end of turn.
 id=1997
 name=Icatian Scout
 rarity=C
+mana={W}
 type=Creature
 subtype=Human Soldier Scout
-mana={W}
+auto={1}{T}:first strike target(creature)
 power=1
-toughness=1
-auto={1}{T}:first strike target(creature) 
+toughness=1 
 [/card]
 [card]
-text=Put four 1/1 white Citizen creature tokens into play.
+text=Put four 1/1 white Citizen creature tokens onto the battlefield.
 id=1999
 name=Icatian Town
-rarity=R
-type=Sorcery
-mana={5}{W}
 auto=token(Citizen,creature human,1/1,white)*4
+rarity=R
+mana={5}{W}
+type=Sorcery
 [/card]
 [card]
 text={1}{T}, Sacrifice Implements of Sacrifice: Add two mana of any one color to your mana pool.
 id=1834
 name=Implements of Sacrifice
+auto={1}{T}{S}:Add {B}{B}
+auto={1}{T}{S}:Add {U}{U}
+auto={1}{T}{S}:Add {G}{G}
+auto={1}{T}{S}:Add {R}{R}
+auto={1}{T}{S}:Add {W}{W}
 rarity=R
-type=Artifact
 mana={2}
-auto={1}{T}{S}:add {B}{B}
-auto={1}{T}{S}:add {U}{U}
-auto={1}{T}{S}:add {G}{G}
-auto={1}{T}{S}:add {R}{R}
-auto={1}{T}{S}:add {W}{W}
+type=Artifact
 [/card]
 [card]
-text=Protection from black     {W}: Order of Leitbur gains first strike until end of turn.     {W}{W}: Order of Leitbur gets +1/+0 until end of turn.
+text=Protection from black   {W}: Order of Leitbur gains first strike until end of turn.     {W}{W}: Order of Leitbur gets +1/+0 until end of turn.
 id=2000
 name=Order of Leitbur
 rarity=C
+mana={W}{W}
 type=Creature
 subtype=Human Cleric Knight
-mana={W}{W}
+auto={W}:first strike
+auto={W}{W}:1/0
 power=2
 toughness=1
 abilities=protection from black
-auto={W}:first strike
-auto={W}{W}:1/0
 [/card]
 [card]
-text=Protection from black     {W}: Order of Leitbur gains first strike until end of turn.     {W}{W}: Order of Leitbur gets +1/+0 until end of turn.
+text=Protection from black   {W}: Order of Leitbur gains first strike until end of turn.     {W}{W}: Order of Leitbur gets +1/+0 until end of turn.
 id=2001
 name=Order of Leitbur
 rarity=C
+mana={W}{W}
 type=Creature
 subtype=Human Cleric Knight
-mana={W}{W}
+auto={W}:first strike
+auto={W}{W}:1/0
 power=2
 toughness=1
 abilities=protection from black
-auto={W}:first strike
-auto={W}{W}:1/0
 [/card]
 [card]
-text=Protection from black     {W}: Order of Leitbur gains first strike until end of turn.     {W}{W}: Order of Leitbur gets +1/+0 until end of turn.
+text=Protection from black   {W}: Order of Leitbur gains first strike until end of turn.     {W}{W}: Order of Leitbur gets +1/+0 until end of turn.
 id=2002
 name=Order of Leitbur
 rarity=C
+rarity=C
+mana={W}{W}
 type=Creature
 subtype=Human Cleric Knight
-mana={W}{W}
+auto={W}:first strike
+auto={W}{W}:1/0
 power=2
 toughness=1
 abilities=protection from black
-auto={W}:first strike
-auto={W}{W}:1/0
 [/card]
 [card]
-text=Protection from white     {B}: Order of the Ebon Hand gains first strike until end of turn.     {B}{B}: Order of the Ebon Hand gets +1/+0 until end of turn.
+text=Protection from white   {B}: Order of the Ebon Hand gains first strike until end of turn.     {B}{B}: Order of the Ebon Hand gets +1/+0 until end of turn.
 id=1862
 name=Order of the Ebon Hand
 rarity=C
+mana={B}{B}
 type=Creature
 subtype=Cleric Knight
-mana={B}{B}
+auto={B}:first strike
+auto={B}{B}:1/0
 power=2
 toughness=1
 abilities=protection from white
-auto={B}:first strike
-auto={B}{B}:1/0
 [/card]
 [card]
-text=Protection from white     {B}: Order of the Ebon Hand gains first strike until end of turn.     {B}{B}: Order of the Ebon Hand gets +1/+0 until end of turn.
+text=Protection from white   {B}: Order of the Ebon Hand gains first strike until end of turn.     {B}{B}: Order of the Ebon Hand gets +1/+0 until end of turn.
 id=1863
 name=Order of the Ebon Hand
 rarity=C
+mana={B}{B}
 type=Creature
 subtype=Cleric Knight
-mana={B}{B}
+auto={B}:first strike
+auto={B}{B}:1/0
 power=2
 toughness=1
 abilities=protection from white
-auto={B}:first strike
-auto={B}{B}:1/0
 [/card]
 [card]
-text=Protection from white     {B}: Order of the Ebon Hand gains first strike until end of turn.     {B}{B}: Order of the Ebon Hand gets +1/+0 until end of turn.
+text=Protection from white   {B}: Order of the Ebon Hand gains first strike until end of turn.     {B}{B}: Order of the Ebon Hand gets +1/+0 until end of turn.
 id=1864
 name=Order of the Ebon Hand
 rarity=C
+mana={B}{B}
 type=Creature
 subtype=Cleric Knight
-mana={B}{B}
+auto={B}:first strike
+auto={B}{B}:1/0
 power=2
 toughness=1
 abilities=protection from white
-auto={B}:first strike
-auto={B}{B}:1/0
 [/card]
 [card]
+text={5}, {T}, Discard a card at random: Draw two cards.
 id=1835
 name=Ring of Renewal
-mana={5}
-type=Artifact
-text={5}, {T}, Discard a card at random: Draw two cards.
 auto={5}{T}:discard:1 && draw:2
 rarity=R
+mana={5}
+type=Artifact
 [/card]
 [card]
 text={U}: River Merfolk gains mountainwalk until end of turn.
 id=1888
 name=River Merfolk
 rarity=R
+mana={U}{U}
 type=Creature
 subtype=Merfolk
-mana={U}{U}
+auto={U}:mountainwalk
 power=2
 toughness=1
-auto={U}:mountainwalk
 [/card]
 [card]
-text=Ruins of Trokair comes into play tapped.     {T}: Add {W} to your mana pool.     {T}, Sacrifice Ruins of Trokair: Add {W}{W} to your mana pool.
+text=Ruins of Trokair enters the battlefield tapped.   {T}: Add {W} to your mana pool.   {T}, Sacrifice Ruins of Trokair: Add {W}{W} to your mana pool.
 id=2011
 name=Ruins of Trokair
+auto=tap
+auto={T}:Add {W}
+auto={T}{S}:Add {W}{W}
 rarity=U
 type=Land
-auto=tap
-auto={T}:add {W}
-auto={T}{S}:add {W}{W}
 [/card]
 [card]
-text=Svyelunite Temple comes into play tapped.     {T}: Add {U} to your mana pool.     {T}, Sacrifice Svyelunite Temple: Add {U}{U} to your mana pool.
+text=Svyelunite Temple enters the battlefield tapped.   {T}: Add {U} to your mana pool.   {T}, Sacrifice Svyelunite Temple: Add {U}{U} to your mana pool.
 id=2013
 name=Svyelunite Temple
 rarity=U
 type=Land
 auto=tap
-auto={T}:add {U}
-auto={T}{S}:add {U}{U}
+auto={T}:Add {U}
+auto={T}{S}:Add {U}{U}
 [/card]
 [card]
-text=Enchant creature     Enchanted creature gets +1/+1.     Sacrifice Thrull Retainer: Regenerate enchanted creature.
+text=Enchant creature   Enchanted creature gets +1/+1.   Sacrifice Thrull Retainer: Regenerate enchanted creature.
 id=1867
-name=Thrull Retainer
-rarity=U
-type=Enchantment
-subtype=Aura
-mana={B}
 target=creature
 auto=1/1
 auto={S}:regenerate
+name=Thrull Retainer
+rarity=U
+mana={B}
+type=Enchantment
+subtype=Aura
 [/card]
 [card]
+text=First strike Vodalian Knights can't attack unless defending player controls an Island. When you control no Islands, sacrifice Vodalian Knights.   {U}: Vodalian Knights gains flying until end of turn.
 id=1895
 name=Vodalian Knights
+rarity=U
 mana={1}{U}{U}
 type=Creature
 subtype=Merfolk Knight
+auto={U}:flying
 power=2
 toughness=2
-text=First strike Vodalian Knights can't attack unless defending player controls an Island. When you control no Islands, sacrifice Vodalian Knights. {U}: Vodalian Knights gains flying until end of turn.
 abilities=islandhome,first strike
-auto={U}:flying
-rarity=U
 [/card]
 [card]
-text= 
 id=1899
 name=Vodalian Soldiers
 rarity=C
+mana={1}{U}
 type=Creature
 subtype=Merfolk Soldier
-mana={1}{U}
 power=1
 toughness=2
 [/card]
 [card]
-text= 
 id=1900
 name=Vodalian Soldiers
 rarity=C
+mana={1}{U}
 type=Creature
 subtype=Merfolk Soldier
-mana={1}{U}
 power=1
 toughness=2
 [/card]
 [card]
-text= 
 id=1901
 name=Vodalian Soldiers
 rarity=C
+mana={1}{U}
 type=Creature
 subtype=Merfolk Soldier
-mana={1}{U}
 power=1
 toughness=2
 [/card]
@@ -546,9 +544,9 @@ text=
 id=1902
 name=Vodalian Soldiers
 rarity=C
+mana={1}{U}
 type=Creature
 subtype=Merfolk Soldier
-mana={1}{U}
 power=1
 toughness=2
-[/card]
+[/card]
\ No newline at end of file