diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 620fd7ef5..024e15be2 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -6668,16 +6668,17 @@ toughness=4
 [card]
 name=Black Mana Battery
 auto={2}{T}:counter(0/0,1,Storage)
-auto={T}{C(0/0,-1,Storage)}:name(Remove 1 Counters) add{B}
-auto={T}{C(0/0,-2,Storage)}:name(Remove 2 Counters) add{B}{B}
-auto={T}{C(0/0,-3,Storage)}:name(Remove 3 Counters) add{B}{B}{B}
-auto={T}{C(0/0,-4,Storage)}:name(Remove 4 Counters) add{B}{B}{B}{B}
-auto={T}{C(0/0,-5,Storage)}:name(Remove 5 Counters) add{B}{B}{B}{B}{B}
-auto={T}{C(0/0,-6,Storage)}:name(Remove 6 Counters) add{B}{B}{B}{B}{B}{B}
-auto={T}{C(0/0,-7,Storage)}:name(Remove 7 Counters) add{B}{B}{B}{B}{B}{B}{B}
-auto={T}{C(0/0,-8,Storage)}:name(Remove 8 Counters) add{B}{B}{B}{B}{B}{B}{B}{B}
-auto={T}{C(0/0,-9,Storage)}:name(Remove 9 Counters) add{B}{B}{B}{B}{B}{B}{B}{B}{B}
-auto={T}{C(0/0,-10,Storage)}:name(Remove 10 Counters) add{B}{B}{B}{B}{B}{B}{B}{B}{B}{B}
+auto={t}:name(Remove 0 Counters) add{B}
+auto={T}{C(0/0,-1,Storage)}:name(Remove 1 Counters) add{B}{B}
+auto={T}{C(0/0,-2,Storage)}:name(Remove 2 Counters) add{B}{B}{B}
+auto={T}{C(0/0,-3,Storage)}:name(Remove 3 Counters) add{B}{B}{B}{B}
+auto={T}{C(0/0,-4,Storage)}:name(Remove 4 Counters) add{B}{B}{B}{B}{B}
+auto={T}{C(0/0,-5,Storage)}:name(Remove 5 Counters) add{B}{B}{B}{B}{B}{B}
+auto={T}{C(0/0,-6,Storage)}:name(Remove 6 Counters) add{B}{B}{B}{B}{B}{B}{B}
+auto={T}{C(0/0,-7,Storage)}:name(Remove 7 Counters) add{B}{B}{B}{B}{B}{B}{B}{B}
+auto={T}{C(0/0,-8,Storage)}:name(Remove 8 Counters) add{B}{B}{B}{B}{B}{B}{B}{B}{B}
+auto={T}{C(0/0,-9,Storage)}:name(Remove 9 Counters) add{B}{B}{B}{B}{B}{B}{B}{B}{B}{B}
+auto={T}{C(0/0,-10,Storage)}:name(Remove 10 Counters) add{B}{B}{B}{B}{B}{B}{B}{B}{B}{B}{B}
 text={2}, {T}: Put a charge counter on Black Mana Battery. -- {T}, Remove any number of charge counters from Black Mana Battery: Add {B} to your mana pool, then add an additional {B} to your mana pool for each charge counter removed this way.
 mana={4}
 type=Artifact
@@ -7934,16 +7935,17 @@ type=Instant
 [card]
 name=Blue Mana Battery
 auto={2}{T}:counter(0/0,1,Storage)
-auto={T}{C(0/0,-1,Storage)}:name(Remove 1 Counters) add{U}
-auto={T}{C(0/0,-2,Storage)}:name(Remove 2 Counters) add{U}{U}
-auto={T}{C(0/0,-3,Storage)}:name(Remove 3 Counters) add{U}{U}{U}
-auto={T}{C(0/0,-4,Storage)}:name(Remove 4 Counters) add{U}{U}{U}{U}
-auto={T}{C(0/0,-5,Storage)}:name(Remove 5 Counters) add{U}{U}{U}{U}{U}
-auto={T}{C(0/0,-6,Storage)}:name(Remove 6 Counters) add{U}{U}{U}{U}{U}{U}
-auto={T}{C(0/0,-7,Storage)}:name(Remove 7 Counters) add{U}{U}{U}{U}{U}{U}{U}
-auto={T}{C(0/0,-8,Storage)}:name(Remove 8 Counters) add{U}{U}{U}{U}{U}{U}{U}{U}
-auto={T}{C(0/0,-9,Storage)}:name(Remove 9 Counters) add{U}{U}{U}{U}{U}{U}{U}{U}{U}
-auto={T}{C(0/0,-10,Storage)}:name(Remove 10 Counters) add{U}{U}{U}{U}{U}{U}{U}{U}{U}{U}
+auto={t}:name(Remove 0 Counters) add{U}
+auto={T}{C(0/0,-1,Storage)}:name(Remove 1 Counters) add{U}{U}
+auto={T}{C(0/0,-2,Storage)}:name(Remove 2 Counters) add{U}{U}{U}
+auto={T}{C(0/0,-3,Storage)}:name(Remove 3 Counters) add{U}{U}{U}{U}
+auto={T}{C(0/0,-4,Storage)}:name(Remove 4 Counters) add{U}{U}{U}{U}{U}
+auto={T}{C(0/0,-5,Storage)}:name(Remove 5 Counters) add{U}{U}{U}{U}{U}{U}
+auto={T}{C(0/0,-6,Storage)}:name(Remove 6 Counters) add{U}{U}{U}{U}{U}{U}{U}
+auto={T}{C(0/0,-7,Storage)}:name(Remove 7 Counters) add{U}{U}{U}{U}{U}{U}{U}{U}
+auto={T}{C(0/0,-8,Storage)}:name(Remove 8 Counters) add{U}{U}{U}{U}{U}{U}{U}{U}{U}
+auto={T}{C(0/0,-9,Storage)}:name(Remove 9 Counters) add{U}{U}{U}{U}{U}{U}{U}{U}{U}{U}
+auto={T}{C(0/0,-10,Storage)}:name(Remove 10 Counters) add{U}{U}{U}{U}{U}{U}{U}{U}{U}{U}{U}
 text={2}, {T}: Put a charge counter on Blue Mana Battery. -- {T}, Remove any number of charge counters from Blue Mana Battery: Add {U} to your mana pool, then add an additional {U} to your mana pool for each charge counter removed this way.
 mana={4}
 type=Artifact
@@ -14847,7 +14849,7 @@ toughness=1
 [/card]
 [card]
 name=Crossway Vampire
-auto=cantblock target(creature)
+auto=target(creature) cantblock ueot
 text=When Crossway Vampire enters the battlefield, target creature can't block this turn.
 mana={1}{R}{R}
 type=Creature
@@ -30723,16 +30725,17 @@ subtype=Aura
 [card]
 name=Green Mana Battery
 auto={2}{T}:counter(0/0,1,Storage)
-auto={T}{C(0/0,-1,Storage)}:name(Remove 1 Counters) add{G}
-auto={T}{C(0/0,-2,Storage)}:name(Remove 2 Counters) add{G}{G}
-auto={T}{C(0/0,-3,Storage)}:name(Remove 3 Counters) add{G}{G}{G}
-auto={T}{C(0/0,-4,Storage)}:name(Remove 4 Counters) add{G}{G}{G}{G}
-auto={T}{C(0/0,-5,Storage)}:name(Remove 5 Counters) add{G}{G}{G}{G}{G}
-auto={T}{C(0/0,-6,Storage)}:name(Remove 6 Counters) add{G}{G}{G}{G}{G}{G}
-auto={T}{C(0/0,-7,Storage)}:name(Remove 7 Counters) add{G}{G}{G}{G}{G}{G}{G}
-auto={T}{C(0/0,-8,Storage)}:name(Remove 8 Counters) add{G}{G}{G}{G}{G}{G}{G}{G}
-auto={T}{C(0/0,-9,Storage)}:name(Remove 9 Counters) add{G}{G}{G}{G}{G}{G}{G}{G}{G}
-auto={T}{C(0/0,-10,Storage)}:name(Remove 10 Counters) add{G}{G}{G}{G}{G}{G}{G}{G}{G}{G}
+auto={t}:name(Remove 0 Counters) add{G}
+auto={T}{C(0/0,-1,Storage)}:name(Remove 1 Counters) add{G}{G}
+auto={T}{C(0/0,-2,Storage)}:name(Remove 2 Counters) add{G}{G}{G}
+auto={T}{C(0/0,-3,Storage)}:name(Remove 3 Counters) add{G}{G}{G}{G}
+auto={T}{C(0/0,-4,Storage)}:name(Remove 4 Counters) add{G}{G}{G}{G}{G}
+auto={T}{C(0/0,-5,Storage)}:name(Remove 5 Counters) add{G}{G}{G}{G}{G}{G}
+auto={T}{C(0/0,-6,Storage)}:name(Remove 6 Counters) add{G}{G}{G}{G}{G}{G}{G}
+auto={T}{C(0/0,-7,Storage)}:name(Remove 7 Counters) add{G}{G}{G}{G}{G}{G}{G}{G}
+auto={T}{C(0/0,-8,Storage)}:name(Remove 8 Counters) add{G}{G}{G}{G}{G}{G}{G}{G}{G}
+auto={T}{C(0/0,-9,Storage)}:name(Remove 9 Counters) add{G}{G}{G}{G}{G}{G}{G}{G}{G}{G}
+auto={T}{C(0/0,-10,Storage)}:name(Remove 10 Counters) add{G}{G}{G}{G}{G}{G}{G}{G}{G}{G}{G}
 text={2}, {T}: Put a charge counter on Green Mana Battery. -- {T}, Remove any number of charge counters from Green Mana Battery: Add {G} to your mana pool, then add an additional {G} to your mana pool for each charge counter removed this way.
 mana={4}
 type=Artifact
@@ -35684,8 +35687,8 @@ type=Sorcery
 [/card]
 [card]
 name=Intangible Virtue
-auto=all(creature[token]|mybattlefield) 1/1
-auto=all(creature[token]|mybattlefield) vigilance
+auto=lord(creature[token]|mybattlefield) 1/1
+auto=lord(creature[token]|mybattlefield) vigilance
 text=Creature tokens you control get +1/+1 and have vigilance.
 mana={1}{W}
 type=Enchantment
@@ -57459,16 +57462,17 @@ type=Instant
 [card]
 name=Red Mana Battery
 auto={2}{T}:counter(0/0,1,Charge)
-auto={T}{C(0/0,-1,Charge)}:name(Remove 1 Counters) add{R}
-auto={T}{C(0/0,-2,Charge)}:name(Remove 2 Counters) add{R}{R}
-auto={T}{C(0/0,-3,Charge)}:name(Remove 3 Counters) add{R}{R}{R}
-auto={T}{C(0/0,-4,Charge)}:name(Remove 4 Counters) add{R}{R}{R}{R}
-auto={T}{C(0/0,-5,Charge)}:name(Remove 5 Counters) add{R}{R}{R}{R}{R}
-auto={T}{C(0/0,-6,Charge)}:name(Remove 6 Counters) add{R}{R}{R}{R}{R}{R}
-auto={T}{C(0/0,-7,Charge)}:name(Remove 7 Counters) add{R}{R}{R}{R}{R}{R}{R}
-auto={T}{C(0/0,-8,Charge)}:name(Remove 8 Counters) add{R}{R}{R}{R}{R}{R}{R}{R}
-auto={T}{C(0/0,-9,Charge)}:name(Remove 9 Counters) add{R}{R}{R}{R}{R}{R}{R}{R}{R}
-auto={T}{C(0/0,-10,Charge)}:name(Remove 10 Counters) add{R}{R}{R}{R}{R}{R}{R}{R}{R}{R}
+auto={t}:name(Remove 0 Counters) add{r}
+auto={T}{C(0/0,-1,Charge)}:name(Remove 1 Counters) add{R}{r}
+auto={T}{C(0/0,-2,Charge)}:name(Remove 2 Counters) add{R}{R}{r}
+auto={T}{C(0/0,-3,Charge)}:name(Remove 3 Counters) add{R}{R}{R}{r}
+auto={T}{C(0/0,-4,Charge)}:name(Remove 4 Counters) add{R}{R}{R}{R}{r}
+auto={T}{C(0/0,-5,Charge)}:name(Remove 5 Counters) add{R}{R}{R}{R}{R}{r}
+auto={T}{C(0/0,-6,Charge)}:name(Remove 6 Counters) add{R}{R}{R}{R}{R}{R}{r}
+auto={T}{C(0/0,-7,Charge)}:name(Remove 7 Counters) add{R}{R}{R}{R}{R}{R}{R}{r}
+auto={T}{C(0/0,-8,Charge)}:name(Remove 8 Counters) add{R}{R}{R}{R}{R}{R}{R}{R}{r}
+auto={T}{C(0/0,-9,Charge)}:name(Remove 9 Counters) add{R}{R}{R}{R}{R}{R}{R}{R}{R}{r}
+auto={T}{C(0/0,-10,Charge)}:name(Remove 10 Counters) add{R}{R}{R}{R}{R}{R}{R}{R}{R}{R}{r}
 text={2}, {T}: Put a charge counter on Red Mana Battery. -- {T}, Remove any number of charge counters from Red Mana Battery: Add {R} to your mana pool, then add an additional {R} to your mana pool for each charge counter removed this way.
 mana={4}
 type=Artifact
@@ -82777,16 +82781,17 @@ toughness=2
 [card]
 name=White Mana Battery
 auto={2}{T}:counter(0/0,1,Storage)
-auto={T}{C(0/0,-1,Storage)}:name(Remove 1 Counters) add{W}
-auto={T}{C(0/0,-2,Storage)}:name(Remove 2 Counters) add{W}{W}
-auto={T}{C(0/0,-3,Storage)}:name(Remove 3 Counters) add{W}{W}{W}
-auto={T}{C(0/0,-4,Storage)}:name(Remove 4 Counters) add{W}{W}{W}{W}
-auto={T}{C(0/0,-5,Storage)}:name(Remove 5 Counters) add{W}{W}{W}{W}{W}
-auto={T}{C(0/0,-6,Storage)}:name(Remove 6 Counters) add{W}{W}{W}{W}{W}{W}
-auto={T}{C(0/0,-7,Storage)}:name(Remove 7 Counters) add{W}{W}{W}{W}{W}{W}{w}
-auto={T}{C(0/0,-8,Storage)}:name(Remove 8 Counters) add{W}{W}{W}{W}{W}{W}{w}{w}
-auto={T}{C(0/0,-9,Storage)}:name(Remove 9 Counters) add{W}{W}{W}{W}{W}{W}{w}{w}{w}
-auto={T}{C(0/0,-10,Storage)}:name(Remove 10 Counters) add{W}{W}{W}{W}{W}{w}{w}{w}{w}{w}
+auto={t}:name(Remove 0 Counters) add{W}
+auto={T}{C(0/0,-1,Storage)}:name(Remove 1 Counters) add{W}{W}
+auto={T}{C(0/0,-2,Storage)}:name(Remove 2 Counters) add{W}{W}{W}
+auto={T}{C(0/0,-3,Storage)}:name(Remove 3 Counters) add{W}{W}{W}{W}
+auto={T}{C(0/0,-4,Storage)}:name(Remove 4 Counters) add{W}{W}{W}{W}{W}
+auto={T}{C(0/0,-5,Storage)}:name(Remove 5 Counters) add{W}{W}{W}{W}{W}{W}
+auto={T}{C(0/0,-6,Storage)}:name(Remove 6 Counters) add{W}{W}{W}{W}{W}{W}{W}
+auto={T}{C(0/0,-7,Storage)}:name(Remove 7 Counters) add{W}{W}{W}{W}{W}{W}{w}{W}
+auto={T}{C(0/0,-8,Storage)}:name(Remove 8 Counters) add{W}{W}{W}{W}{W}{W}{w}{w}{W}
+auto={T}{C(0/0,-9,Storage)}:name(Remove 9 Counters) add{W}{W}{W}{W}{W}{W}{w}{w}{w}{W}
+auto={T}{C(0/0,-10,Storage)}:name(Remove 10 Counters) add{W}{W}{W}{W}{W}{w}{w}{w}{w}{w}{W}
 text={2}, {T}: Put a charge counter on White Mana Battery. -- {T}, Remove any number of charge counters from White Mana Battery: Add {W} to your mana pool, then add an additional {W} to your mana pool for each charge counter removed this way.
 mana={4}
 type=Artifact