diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index 92077307f..c8102b7bd 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -4,7 +4,7 @@ alias=1196
 id=23155
 auto=life:3
 name=Absorb
-colour=White,Blue
+color=White,Blue
 rarity=R
 mana={W}{U}{U}
 type=Instant
@@ -35,7 +35,7 @@ type=Land
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  When Angel of Mercy comes into play, you gain 3 life.
 id=22952
 name=Angel of Mercy
-colour=White
+color=White
 rarity=U
 mana={4}{W}
 type=Creature
@@ -47,7 +47,7 @@ abilities=flying
 [/card]
 [card]
 text=Creatures you control get +0/+1.     Sacrifice Angelic Shield: Return target creature to its owner's hand.
-auto=lord(creature|myinplay) 0/1 includeself
+auto=lord(creature|myinplay) 0/1
 auto={s}:moveTo(ownerhand) target(creature)
 id=23177
 name=Angelic Shield
@@ -99,7 +99,7 @@ subtype=Aura
 text={1}{W}{W}: Target creature you control gains protection from the color of your choice until end of turn.    {1}{U}{U}: Armored Guardian gains shroud until end of turn. (It can't be the target of spells or abilities.)
 id=23197
 name=Armored Guardian
-colour=White,Blue
+color=White,Blue
 rarity=R
 mana={3}{W}{U}
 type=Creature
@@ -117,7 +117,7 @@ toughness=5
 text={3}{U},{T}: Draw a card.
 id=22947
 name=Benalish Heralds
-colour=White
+color=White
 rarity=U
 mana={3}{W}
 type=Creature
@@ -130,7 +130,7 @@ toughness=4
 text={W},{T}: Tap target creature.
 id=22937
 name=Benalish Trapper
-colour=White
+color=White
 rarity=C
 mana={1}{W}
 type=Creature
@@ -143,7 +143,7 @@ toughness=2
 text={T}: Add {B} or {R} to your mana pool.
 id=23219 
 name=Bloodstone Cameo
-colour=Artifact
+color=Artifact
 rarity=U
 mana={3}
 auto={T}: Add {B}
@@ -154,7 +154,7 @@ type=Artifact
 text=: {1}: Add {B} to your mana pool.
 id=23024
 name=Bog Initiate
-colour=Black
+color=Black
 rarity=C
 mana={1}{B}
 type=Creature
@@ -167,7 +167,7 @@ toughness=1
 text={1}{W}, {T}, Sacrifice Capashen Unicorn: Destroy target artifact or enchantment.
 id=22936
 name=Capashen Unicorn
-colour=White
+color=White
 rarity=C
 mana={1}{W}
 type=Creature
@@ -180,7 +180,7 @@ toughness=2
 text=Vigilance     {G}: Regenerate Charging Troll.
 id=23162
 name=Charging Troll
-colour=Green,White
+color=Green,White
 rarity=U
 mana={2}{G}{W}
 type=Creature
@@ -215,7 +215,7 @@ mana={B}
 text=Protection from red      {W}: Target creature gains protection from red until end of turn.
 id=22934
 name=Crimson Acolyte
-colour=White
+color=White
 rarity=C
 mana={1}{W}
 type=Creature
@@ -230,7 +230,7 @@ text=Sacrifice Crosis's Attendant: Add {U}{B}{R} to your mana pool.
 auto={1}{s}:Add {U}{B}{R}
 id=25837
 name=Crosis's Attendant
-colour=Artifact
+color=Artifact
 rarity=U
 mana={5}
 type=Artifact Creature
@@ -243,7 +243,7 @@ text=Protection from black       Crusading Knight gets +1/+1 for each Swamp your
 id=22963
 auto=foreach(swamp|opponentinplay) 1/1
 name=Crusading Knight
-colour=White
+color=White
 rarity=R
 mana={2}{W}{W}
 type=Creature
@@ -270,7 +270,7 @@ text=Sacrifice Darigaaz's Attendant: Add {B}{R}{G} to your mana pool.
 auto={1}{s}:Add {B}{R}{G}
 id=25838
 name=Darigaaz's Attendant
-colour=Artifact
+color=Artifact
 rarity=U
 mana={5}
 type=Artifact Creature
@@ -282,7 +282,7 @@ toughness=3
 text={T}: Add {U} or {B} to your mana pool.
 id=23218 
 name=Drake-Skull Cameo
-colour=Artifact
+color=Artifact
 rarity=U
 mana={3}
 auto={T}: Add {U}
@@ -294,7 +294,7 @@ text=Sacrifice Dromar's Attendant: Add {W}{U}{B} to your mana pool.
 auto={1}{s}:Add {W}{U}{B}
 id=25836
 name=Dromar's Attendant
-colour=Artifact
+color=Artifact
 rarity=U
 mana={5}
 type=Artifact Creature
@@ -312,10 +312,12 @@ name=Elfhame Palace
 rarity=U
 type=Land
 [/card]
+[card]
 text=Other Elf creatures get +1/+1 and have forestwalk. (They're unblockable as long as defending player controls a Forest.)
-alias=129534
 id=26445
 name=Elvish Champion
+auto=lord(elf) 1/1 other
+auto=lord(elf) forestwalk other
 rarity=R
 color=Green
 type=Creature
@@ -326,7 +328,7 @@ toughness=2
 [/card]
 [card]
 text=Creatures you control have haste.     Sacrifice Fires of Yavimaya: Target creature gets +2/+2 until end of turn.
-auto=lord(creature|myinplay) haste includeself
+auto=lord(creature|myinplay) haste
 auto={s}:2/2 target(creature)
 id=23180
 name=Fires of Yavimaya
@@ -339,7 +341,7 @@ type=Enchantment
 text={R}: Firescreamer gets +1/+0 until end of turn.
 id=23017
 name=Firescreamer
-colour=Black
+color=Black
 rarity=C
 mana={3}{B}
 type=Creature
@@ -392,7 +394,7 @@ subtype=Forest
 text=Protection from red
 id=23158
 name=Galina's Knight
-colour=White,Blue
+color=White,Blue
 rarity=C
 mana={W}{U}
 type=Creature
@@ -416,7 +418,7 @@ text=Flying      {U}: Glimmering Angel gains shroud until end of turn. (It can't
 id=22929
 auto={U}:shroud
 name=Glimmering Angel
-colour=White
+color=White
 rarity=C
 mana={3}{W}
 type=Creature
@@ -430,7 +432,7 @@ text=Legendary      {1}{W}{U}, {T}: Return target artifact or enchantment card f
 auto={1}{W}{U}:moveTo(myhand) target(artifact,enchantment|mygraveyard)
 id=25977
 name=Hanna, Ship's Navigator
-colour=White,Blue
+color=White,Blue
 rarity=R
 mana={1}{W}{U}
 type=Creature
@@ -467,7 +469,7 @@ type=Instant
 text={B}: Hooded Kavu gains fear until end of turn.
 id=23061
 name=Hooded Kavu
-colour=Red
+color=Red
 rarity=C
 mana={2}{R}
 type=Creature
@@ -480,7 +482,7 @@ toughness=2
 text=Lifelink (Whenever this creature deals damage, you gain that much life.)
 id=23163
 name=Horned Cheetah
-colour=Green,White
+color=Green,White
 rarity=U
 mana={2}{G}{W}
 type=Creature
@@ -597,7 +599,7 @@ abilities=legendary
 text={W}: Llanowar Cavalry gains vigilance until end of turn.
 id=23322
 name=Llanowar Cavalry
-colour=Green
+color=Green
 rarity=C
 mana={2}{G}
 type=Creature
@@ -610,7 +612,7 @@ toughness=4
 text=Protection from black
 id=23157
 name=Llanowar Knight
-colour=Green,White
+color=Green,White
 rarity=C
 mana={G}{W}
 type=Creature
@@ -623,7 +625,7 @@ abilities=protection from black
 text={T}: Llanowar Vanguard gets +0/+4 until end of turn.
 id=23123
 name=Llanowar Vanguard
-colour=Green
+color=Green
 rarity=C
 mana={2}{G}
 type=Creature
@@ -636,7 +638,7 @@ toughness=1
 text=Flying      {T}: Add one mana of any color to your mana pool.
 id=23233
 name=Lotus Guardian
-colour=Artifact
+color=Artifact
 rarity=R
 mana={7}
 type=Artifact Creature
@@ -655,7 +657,7 @@ text=Protection from white       Marauding Knight gets +1/+1 for each Plains you
 id=23053
 auto=foreach(plains|opponentinplay) 1/1
 name=Marauding Knight
-colour=Black
+color=Black
 rarity=R
 mana={2}{B}{B}
 type=Creature
@@ -668,7 +670,7 @@ abilities=protection from white
 text={B}: Regenerate Metathran Zombie.
 id=22973
 name=Metathran Zombie
-colour=Blue
+color=Blue
 rarity=C
 mana={1}{U}
 type=Creature
@@ -682,7 +684,7 @@ text=Legendary   Trample (If this creature would deal enough combat damage to it
 id=23138
 auto=foreach(land|myinplay) 1/1
 name=Molimo, Maro-Sorcerer
-colour=Green
+color=Green
 rarity=R
 mana={4}{G}{G}{G}
 type=Creature
@@ -748,7 +750,7 @@ toughness=1
 text={U}{U}, {T}: Return target creature to its owner's hand. .   {R}{R}, {T}: Nightscape Master deals 2 damage to target creature.
 id=23049
 name=Nightscape Master
-colour=Black
+color=Black
 rarity=R
 mana={2}{B}{B}
 type=Creature
@@ -762,7 +764,7 @@ toughness=2
 text={1}: Noble Panther gains first strike until end of turn.
 id=23147
 name=Noble Panther
-colour=Green,White
+color=Green,White
 rarity=R
 mana={1}{G}{W}
 type=Creature
@@ -775,7 +777,7 @@ toughness=3
 text={1}{G}: Add one mana of any color to your mana pool.
 id=23111
 name=Nomadic Elf
-colour=Green
+color=Green
 rarity=C
 mana={1}{G}
 type=Creature
@@ -792,7 +794,7 @@ toughness=2
 text=Protection from black      {W}: Target creature gains protection from black until end of turn.
 id=22935
 name=Obsidian Acolyte
-colour=White
+color=White
 rarity=C
 mana={1}{W}
 type=Creature
@@ -806,7 +808,7 @@ abilities=protection from black
 text=Sacrifice a creature: Add one mana of any color to your mana pool.
 id=23226
 name=Phyrexian Altar
-colour=Artifact
+color=Artifact
 rarity=R
 mana={3}
 type=Artifact
@@ -821,7 +823,7 @@ text=Flying (This creature can't be blocked except by creatures with flying.)  {
 auto={B}:1/0 limit:2
 id=23023
 name=Phyrexian Battleflies
-colour=Black
+color=Black
 rarity=C
 mana={B}
 type=Creature
@@ -887,7 +889,7 @@ toughness=1
 text=Flash, Haste
 id=23148
 name=Raging Kavu
-colour=Red,Green
+color=Red,Green
 rarity=R
 mana={1}{R}{G}
 type=Creature
@@ -900,7 +902,7 @@ abilities=flash,haste
 text=Flying, first strike
 id=22933
 name=Razorfoot Griffin
-colour=White
+color=White
 rarity=C
 mana={3}{W}
 type=Creature
@@ -916,7 +918,7 @@ alias=1174
 auto=draw:1
 id=23029
 name=Recover
-colour=Black
+color=Black
 rarity=C
 mana={2}{B}
 type=Sorcery
@@ -927,7 +929,7 @@ target=creature
 alias=1229
 id=22985
 name=Repulse
-colour=Black
+color=Black
 rarity=C
 mana={2}{U}
 type=Instant
@@ -938,7 +940,7 @@ target=creature[attacking]
 auto=:-99/0
 id=22943
 name=Restrain
-colour=White
+color=White
 rarity=C
 mana={2}{W}
 type=Instant
@@ -959,7 +961,7 @@ text=Sacrifice Rith's Attendant: Add {R}{G}{W} to your mana pool.
 auto={1}{s}:Add {R}{G}{W}
 id=25839
 name=Rith's Attendant
-colour=Artifact
+color=Artifact
 rarity=U
 mana={5}
 type=Artifact Creature
@@ -971,7 +973,7 @@ toughness=3
 text=Trample, protection from blue, protection from red
 id=23205
 name=Sabertooth Nishoba
-colour=Green,White
+color=Green,White
 rarity=R
 mana={4}{G}{W}
 type=Creature
@@ -1007,7 +1009,7 @@ subtype=Aura
 text={T}: Add {W} or {U} to your mana pool.
 id=23217 
 name=Seashell Cameo
-colour=Artifact
+color=Artifact
 rarity=U
 mana={3}
 auto={T}: Add {W}
@@ -1018,7 +1020,7 @@ type=Artifact
 text={R}: Serpentine Kavu gains haste until end of turn.
 id=23105
 name=Serpentine Kavu
-colour=Green
+color=Green
 rarity=C
 mana={4}{G}
 type=Creature
@@ -1041,7 +1043,7 @@ type=Land
 text=Protection from white
 id=23160
 name=Shivan Zombie
-colour=Black,Red
+color=Black,Red
 rarity=C
 mana={B}{R}
 type=Creature
@@ -1080,7 +1082,7 @@ toughness=1
 text=Forestwalk
 id=23149
 name=Slinking Serpent
-colour=Blue,Black
+color=Blue,Black
 rarity=U
 mana={2}{U}{B}
 type=Creature
@@ -1106,7 +1108,7 @@ toughness=1
 text={3}{U}, {T}: Tap target creature.    {3}{B}, {T}: Destroy target tapped creature.
 id=25752
 name=Stalking Assassin
-colour=Blue,Black
+color=Blue,Black
 rarity=R
 mana={1}{U}{B}
 type=Creature
@@ -1202,7 +1204,7 @@ toughness=2
 text={R}{R}, {T}: Thornscape Master deals 2 damage to target creature.   {W}{W}, {T}: Target creature gains protection from the color of your choice until end of turn.
 id=23136
 name=Thornscape Master
-colour=Green
+color=Green
 rarity=R
 mana={2}{G}{G}
 type=Creature
@@ -1220,7 +1222,7 @@ toughness=2
 text={T}: Add {G} or {W} to your mana pool.
 id=23221 
 name=Tigereye Cameo
-colour=Artifact
+color=Artifact
 rarity=U
 mana={3}
 auto={T}: Add {G}
@@ -1266,7 +1268,7 @@ text=Sacrifice Treva's Attendant: Add {G}{W}{U} to your mana pool.
 auto={1}{s}:Add {G}{W}{U}
 id=25840
 name=Treva's Attendant
-colour=Artifact
+color=Artifact
 rarity=U
 mana={5}
 type=Artifact Creature
@@ -1278,7 +1280,7 @@ toughness=3
 text={T}: Add {R} or {G} to your mana pool.
 id=23220
 name=Troll-Horn Cameo
-colour=Artifact
+color=Artifact
 rarity=U
 mana={3}
 auto={T}: Add {R}
@@ -1287,10 +1289,10 @@ type=Artifact
 [/card]
 [card]
 text=Other black creatures get -1/-1
-auto=lord(creature[black]) -1/-1
+auto=lord(creature[black]) -1/-1 other
 id=23035
 name=Urborg Shambler
-colour=Black
+color=Black
 rarity=U
 mana={2}{B}{B}
 type=Creature
@@ -1312,7 +1314,7 @@ type=Land
 text={T}: Add one mana of any color to your mana pool.
 id=12605
 name=Utopia Tree
-colour=Green
+color=Green
 rarity=R
 mana={1}{G}
 type=Creature
@@ -1342,7 +1344,7 @@ toughness=1
 text=Protection from green
 id=23159
 name=Vodalian Zombie
-colour=Blue,Black
+color=Blue,Black
 rarity=C
 mana={U}{B}
 type=Creature
@@ -1393,11 +1395,10 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-[card]
 text=Protection from blue
 id=23161
 name=Yavimaya Barbarian
-colour=Red,Green
+color=Red,Green
 rarity=C
 mana={R}{G}
 type=Creature
@@ -1412,7 +1413,7 @@ id=23174
 auto=foreach(creature[red]|inplay) 1/0
 auto=foreach(creature[green]|inplay) 0/1
 name=Yavimaya Kavu
-colour=Green
+color=Green
 rarity=U
 mana={2}{R}{G}
 type=Creature