diff --git a/forge-gui/res/cardsfolder/s/sphere_of_the_suns.txt b/forge-gui/res/cardsfolder/s/sphere_of_the_suns.txt
index 1e6975a38ae..5ba1c787cec 100644
--- a/forge-gui/res/cardsfolder/s/sphere_of_the_suns.txt
+++ b/forge-gui/res/cardsfolder/s/sphere_of_the_suns.txt
@@ -1,10 +1,10 @@
 Name:Sphere of the Suns
 ManaCost:2
 Types:Artifact
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ SphereTapped | Description$ CARDNAME enters the battlefield tapped and with three charge counters on it.
-SVar:SphereTapped:AB$ Tap | Cost$ 0 | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
-SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 3 | SubAbility$ MoveToPlay
-SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
+K:ETBReplacement:Other:SphereTapped
+SVar:SphereTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped and with three charge counters on it.
+SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 3
 A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sphere_of_the_suns.jpg
 Oracle:Sphere of the Suns enters the battlefield tapped and with three charge counters on it.\n{T}, Remove a charge counter from Sphere of the Suns: Add one mana of any color to your mana pool.
diff --git a/forge-gui/res/cardsfolder/v/vivid_crag.txt b/forge-gui/res/cardsfolder/v/vivid_crag.txt
index 5df5706c110..867a356b6fc 100644
--- a/forge-gui/res/cardsfolder/v/vivid_crag.txt
+++ b/forge-gui/res/cardsfolder/v/vivid_crag.txt
@@ -1,11 +1,11 @@
 Name:Vivid Crag
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | Description$ CARDNAME enters the battlefield tapped with two charge counters on it.
-SVar:LandTapped:AB$ Tap | Cost$ 0 | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
-SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 | SubAbility$ MoveToPlay
-SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two charge counters on it.
+SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
 A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vivid_crag.jpg
 Oracle:Vivid Crag enters the battlefield tapped with two charge counters on it.\n{T}: Add {R} to your mana pool.\n{T}, Remove a charge counter from Vivid Crag: Add one mana of any color to your mana pool.
diff --git a/forge-gui/res/cardsfolder/v/vivid_creek.txt b/forge-gui/res/cardsfolder/v/vivid_creek.txt
index 321ea3d1121..ea9f8967e83 100644
--- a/forge-gui/res/cardsfolder/v/vivid_creek.txt
+++ b/forge-gui/res/cardsfolder/v/vivid_creek.txt
@@ -1,11 +1,11 @@
 Name:Vivid Creek
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | Description$ CARDNAME enters the battlefield tapped with two charge counters on it.
-SVar:LandTapped:AB$ Tap | Cost$ 0 | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
-SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 | SubAbility$ MoveToPlay
-SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two charge counters on it.
+SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
 A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vivid_creek.jpg
 Oracle:Vivid Creek enters the battlefield tapped with two charge counters on it.\n{T}: Add {U} to your mana pool.\n{T}, Remove a charge counter from Vivid Creek: Add one mana of any color to your mana pool.
diff --git a/forge-gui/res/cardsfolder/v/vivid_grove.txt b/forge-gui/res/cardsfolder/v/vivid_grove.txt
index ab916747a20..e3dca4c7c47 100644
--- a/forge-gui/res/cardsfolder/v/vivid_grove.txt
+++ b/forge-gui/res/cardsfolder/v/vivid_grove.txt
@@ -1,11 +1,11 @@
 Name:Vivid Grove
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | Description$ CARDNAME enters the battlefield tapped with two charge counters on it.
-SVar:LandTapped:AB$ Tap | Cost$ 0 | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
-SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 | SubAbility$ MoveToPlay
-SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two charge counters on it.
+SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
 A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vivid_grove.jpg
 Oracle:Vivid Grove enters the battlefield tapped with two charge counters on it.\n{T}: Add {G} to your mana pool.\n{T}, Remove a charge counter from Vivid Grove: Add one mana of any color to your mana pool.
diff --git a/forge-gui/res/cardsfolder/v/vivid_marsh.txt b/forge-gui/res/cardsfolder/v/vivid_marsh.txt
index 976b2a16262..ce2aef561d0 100644
--- a/forge-gui/res/cardsfolder/v/vivid_marsh.txt
+++ b/forge-gui/res/cardsfolder/v/vivid_marsh.txt
@@ -1,11 +1,12 @@
 Name:Vivid Marsh
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | Description$ CARDNAME enters the battlefield tapped with two charge counters on it.
-SVar:LandTapped:AB$ Tap | Cost$ 0 | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
-SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 | SubAbility$ MoveToPlay
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two charge counters on it.
+SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
 A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vivid_marsh.jpg
 Oracle:Vivid Marsh enters the battlefield tapped with two charge counters on it.\n{T}: Add {B} to your mana pool.\n{T}, Remove a charge counter from Vivid Marsh: Add one mana of any color to your mana pool.
diff --git a/forge-gui/res/cardsfolder/v/vivid_meadow.txt b/forge-gui/res/cardsfolder/v/vivid_meadow.txt
index 19e614267dd..d09702b4fb1 100644
--- a/forge-gui/res/cardsfolder/v/vivid_meadow.txt
+++ b/forge-gui/res/cardsfolder/v/vivid_meadow.txt
@@ -1,11 +1,11 @@
 Name:Vivid Meadow
 ManaCost:no cost
 Types:Land
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | Description$ CARDNAME enters the battlefield tapped with two charge counters on it.
-SVar:LandTapped:AB$ Tap | Cost$ 0 | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
-SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 | SubAbility$ MoveToPlay
-SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two charge counters on it.
+SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
 A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vivid_meadow.jpg
 Oracle:Vivid Meadow enters the battlefield tapped with two charge counters on it.\n{T}: Add {W} to your mana pool.\n{T}, Remove a charge counter from Vivid Meadow: Add one mana of any color to your mana pool.