diff --git a/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java
index 795162f76da..aa0ab0f4215 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java
@@ -64,11 +64,15 @@ public class CloneEffect extends SpellAbilityEffect {
         Card cardToCopy = null;
         
         if (sa.hasParam("Choices")) {
-            CardCollectionView choices = game.getCardsIn(ZoneType.Battlefield);
+            ZoneType choiceZone = ZoneType.Battlefield;
+            if (sa.hasParam("ChoiceZone")) {
+                choiceZone = ZoneType.smartValueOf(sa.getParam("ChoiceZone"));
+            }
+            CardCollectionView choices = game.getCardsIn(choiceZone);
             choices = CardLists.getValidCards(choices, sa.getParam("Choices"), activator, host);
             
             String title = sa.hasParam("ChoiceTitle") ? sa.getParam("ChoiceTitle") : "Choose a card ";
-            cardToCopy = activator.getController().chooseSingleEntityForEffect(choices, sa, title, true);
+            cardToCopy = activator.getController().chooseSingleEntityForEffect(choices, sa, title, false);
         } else if (sa.hasParam("Defined")) {
             List<Card> cloneSources = AbilityUtils.getDefinedCards(host, sa.getParam("Defined"), sa);
             if (!cloneSources.isEmpty()) {
diff --git a/forge-gui/res/cardsfolder/a/altered_ego.txt b/forge-gui/res/cardsfolder/a/altered_ego.txt
index 4561c1c6d5a..2abb7970b14 100644
--- a/forge-gui/res/cardsfolder/a/altered_ego.txt
+++ b/forge-gui/res/cardsfolder/a/altered_ego.txt
@@ -3,10 +3,10 @@ ManaCost:X 2 G U
 Types:Creature Shapeshifter
 PT:0/0
 K:CARDNAME can't be countered.
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it enters with X additional +1/+1 counters on it.
-SVar:DBCopy:DB$ Clone | Defined$ ChosenCard | SubAbility$ DBAddCounter
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | SubAbility$ DBAddCounter | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it enters with X additional +1/+1 counters on it.
 SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | ETB$ True | CounterNum$ X | References$ X
 SVar:X:Count$xPaid
+DeckHas:Ability$Counter
 SVar:Picture:http://www.wizards.com/global/images/magic/general/altered_ego.jpg
 Oracle:This spell can't be countered.\nYou may have Altered Ego enter the battlefield as a copy of any creature on the battlefield, except it enters with X additional +1/+1 counters on it.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/b/body_double.txt b/forge-gui/res/cardsfolder/b/body_double.txt
index 97228a15caa..b0e5e8033bd 100644
--- a/forge-gui/res/cardsfolder/b/body_double.txt
+++ b/forge-gui/res/cardsfolder/b/body_double.txt
@@ -2,8 +2,7 @@ Name:Body Double
 ManaCost:4 U
 Types:Creature Shapeshifter
 PT:0/0
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature | ChoiceZone$ Graveyard | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ AtLeast1 | SpellDescription$ You may have Body Double enter the battlefield as a copy of any creature card in a graveyard.
-SVar:DBCopy:DB$ Clone | Defined$ Remembered
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | ChoiceZone$ Graveyard | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any artifact on the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/body_double.jpg
 Oracle:You may have Body Double enter the battlefield as a copy of any creature card in a graveyard.
diff --git a/forge-gui/res/cardsfolder/c/clever_impersonator.txt b/forge-gui/res/cardsfolder/c/clever_impersonator.txt
index 1d20b2ed845..e9e0c5e2f44 100644
--- a/forge-gui/res/cardsfolder/c/clever_impersonator.txt
+++ b/forge-gui/res/cardsfolder/c/clever_impersonator.txt
@@ -2,8 +2,7 @@ Name:Clever Impersonator
 ManaCost:2 U U
 Types:Creature Shapeshifter
 PT:0/0
-K:ETBReplacement:Copy:ChoosePermanent:Optional
-SVar:ChoosePermanent:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Permanent.nonLand+Other | SubAbility$ DBCopy | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any nonland permanent on the battlefield.
-SVar:DBCopy:DB$ Clone | Defined$ ChosenCard
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Permanent.nonLand+Other | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any nonland permanent on the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/clever_impersonator.jpg
 Oracle:You may have Clever Impersonator enter the battlefield as a copy of any nonland permanent on the battlefield.
diff --git a/forge-gui/res/cardsfolder/c/clone.txt b/forge-gui/res/cardsfolder/c/clone.txt
index ac6656d4471..2c207534487 100644
--- a/forge-gui/res/cardsfolder/c/clone.txt
+++ b/forge-gui/res/cardsfolder/c/clone.txt
@@ -2,8 +2,7 @@ Name:Clone
 ManaCost:3 U
 Types:Creature Shapeshifter
 PT:0/0
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
-SVar:DBCopy:DB$ Clone | Defined$ Remembered
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/clone.jpg
 Oracle:You may have Clone enter the battlefield as a copy of any creature on the battlefield.
diff --git a/forge-gui/res/cardsfolder/c/copy_artifact.txt b/forge-gui/res/cardsfolder/c/copy_artifact.txt
index 40bbca8c51b..0fc73efaa1c 100644
--- a/forge-gui/res/cardsfolder/c/copy_artifact.txt
+++ b/forge-gui/res/cardsfolder/c/copy_artifact.txt
@@ -1,8 +1,7 @@
 Name:Copy Artifact
 ManaCost:1 U
 Types:Enchantment
-K:ETBReplacement:Copy:ChooseArtifact:Optional
-SVar:ChooseArtifact:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Artifact.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any artifact on the battlefield, except it's an enchantment in addition to its other types.
-SVar:DBCopy:DB$ Clone | Defined$ Remembered | AddTypes$ Enchantment
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Artifact.Other | AddTypes$ Enchantment | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any artifact on the battlefield, except it's an enchantment in addition to its other types.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/copy_artifact.jpg
 Oracle:You may have Copy Artifact enter the battlefield as a copy of any artifact on the battlefield, except it's an enchantment in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/c/copy_enchantment.txt b/forge-gui/res/cardsfolder/c/copy_enchantment.txt
index 494f5b269e5..50d5e2e4919 100644
--- a/forge-gui/res/cardsfolder/c/copy_enchantment.txt
+++ b/forge-gui/res/cardsfolder/c/copy_enchantment.txt
@@ -1,9 +1,8 @@
 Name:Copy Enchantment
 ManaCost:2 U
 Types:Enchantment
-K:ETBReplacement:Copy:ChooseEnchantment:Optional
-SVar:ChooseEnchantment:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Enchantment.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any enchantment on the battlefield.
-SVar:DBCopy:DB$ Clone | Defined$ Remembered
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Enchantment.Other | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any enchantment on the battlefield.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/copy_enchantment.jpg
 Oracle:You may have Copy Enchantment enter the battlefield as a copy of any enchantment on the battlefield.
diff --git a/forge-gui/res/cardsfolder/d/dacks_duplicate.txt b/forge-gui/res/cardsfolder/d/dacks_duplicate.txt
index 3db4d7df68a..ce5cd483f24 100644
--- a/forge-gui/res/cardsfolder/d/dacks_duplicate.txt
+++ b/forge-gui/res/cardsfolder/d/dacks_duplicate.txt
@@ -2,8 +2,7 @@ Name:Dack's Duplicate
 ManaCost:2 U R
 Types:Creature Shapeshifter
 PT:0/0
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | AILogic$ AtLeast1 | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield except it gains haste and dethrone. (Whenever it attacks the player with the most life or tied for most life, put a +1/+1 counter on it.)
-SVar:DBCopy:DB$ Clone | Defined$ ChosenCard | AddKeywords$ Haste & Dethrone
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | AddKeywords$ Haste & Dethrone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield except it gains haste and dethrone. (Whenever it attacks the player with the most life or tied for most life, put a +1/+1 counter on it.)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dacks_duplicate.jpg
 Oracle:You may have Dack's Duplicate enter the battlefield as a copy of any creature on the battlefield except it gains haste and dethrone. (Whenever it attacks the player with the most life or tied for most life, put a +1/+1 counter on it.)
diff --git a/forge-gui/res/cardsfolder/j/jwari_shapeshifter.txt b/forge-gui/res/cardsfolder/j/jwari_shapeshifter.txt
index 67c1f8416a5..7f577e6cf89 100644
--- a/forge-gui/res/cardsfolder/j/jwari_shapeshifter.txt
+++ b/forge-gui/res/cardsfolder/j/jwari_shapeshifter.txt
@@ -2,9 +2,8 @@ Name:Jwari Shapeshifter
 ManaCost:1 U
 Types:Creature Shapeshifter Ally
 PT:0/0
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Ally+Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any Ally creature on the battlefield.
-SVar:DBCopy:DB$ Clone | Defined$ Remembered
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Ally+Other | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any Ally creature on the battlefield.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jwari_shapeshifter.jpg
 Oracle:You may have Jwari Shapeshifter enter the battlefield as a copy of any Ally creature on the battlefield.
diff --git a/forge-gui/res/cardsfolder/m/masterwork_of_ingenuity.txt b/forge-gui/res/cardsfolder/m/masterwork_of_ingenuity.txt
index 47d7ec723dc..917c583dd38 100644
--- a/forge-gui/res/cardsfolder/m/masterwork_of_ingenuity.txt
+++ b/forge-gui/res/cardsfolder/m/masterwork_of_ingenuity.txt
@@ -1,8 +1,7 @@
 Name:Masterwork of Ingenuity
 ManaCost:1
 Types:Artifact Equipment
-K:ETBReplacement:Copy:ChooseEquipment:Optional
-SVar:ChooseEquipment:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Equipment.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any Equipment on the battlefield.
-SVar:DBCopy:DB$ Clone | Defined$ Remembered
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Equipment.Other | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any Equipment on the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/masterwork_of_ingenuity.jpg
 Oracle:You may have Masterwork of Ingenuity enter the battlefield as a copy of any Equipment on the battlefield.
diff --git a/forge-gui/res/cardsfolder/m/mercurial_pretender.txt b/forge-gui/res/cardsfolder/m/mercurial_pretender.txt
index 1971a98f2cc..c6e48a645d5 100644
--- a/forge-gui/res/cardsfolder/m/mercurial_pretender.txt
+++ b/forge-gui/res/cardsfolder/m/mercurial_pretender.txt
@@ -2,9 +2,8 @@ Name:Mercurial Pretender
 ManaCost:4 U
 Types:Creature Shapeshifter
 PT:0/0
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.YouCtrl+Other | SubAbility$ DBCopy | AILogic$ AtLeast1 | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature you control except it gains "{2}{U}{U}: Return this creature to its owner's hand."
-SVar:DBCopy:DB$ Clone | Defined$ ChosenCard | AddAbilities$ MercurialBounce
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.YouCtrl+Other | AddAbilities$ MercurialBounce | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature you control except it gains "{2}{U}{U}: Return this creature to its owner's hand."
 SVar:MercurialBounce:AB$ ChangeZone | Cost$ 2 U U | Defined$ Self | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mercurial_pretender.jpg
 Oracle:You may have Mercurial Pretender enter the battlefield as a copy of any creature you control except it gains "{2}{U}{U}: Return this creature to its owner's hand."
diff --git a/forge-gui/res/cardsfolder/m/metamorphic_alteration.txt b/forge-gui/res/cardsfolder/m/metamorphic_alteration.txt
index edf43609407..33f4c43c7e5 100644
--- a/forge-gui/res/cardsfolder/m/metamorphic_alteration.txt
+++ b/forge-gui/res/cardsfolder/m/metamorphic_alteration.txt
@@ -3,6 +3,9 @@ ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBClone | TriggerDescription$ As CARDNAME enters the battlefield, choose a creature.
-SVar:DBClone:DB$ Clone | Defined$ ChosenCard | CloneTarget$ Enchanted | Choices$ Creature | Duration$ UntilUnattached
+K:ETBReplacement:Other:ChooseCreature
+SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SpellDescription$ As CARDNAME enters the battlefield, choose a creature.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Static$ True | Origin$ Any | Destination$ Battlefield | Execute$ DBClone | TriggerDescription$ Enchanted creature is a copy of the chosen creature.
+SVar:DBClone:DB$ Clone | Defined$ ChosenCard | CloneTarget$ Enchanted | Duration$ UntilUnattached | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 Oracle:Enchant creature\nAs Metamorphic Alteration enters the battlefield, choose a creature.\nEnchanted creature is a copy of the chosen creature.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/mirror_image.txt b/forge-gui/res/cardsfolder/m/mirror_image.txt
index 08997d88fb4..15deb13db7f 100644
--- a/forge-gui/res/cardsfolder/m/mirror_image.txt
+++ b/forge-gui/res/cardsfolder/m/mirror_image.txt
@@ -1,10 +1,8 @@
 Name:Mirror Image
 ManaCost:2 U
 Types:Creature Shapeshifter
-R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | Optional$ True | ReplaceWith$ ChooseCreature | Description$ You may have CARDNAME enter the battlefield as a copy of any creature you control.
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.YouCtrl | SubAbility$ DBCopy | AILogic$ Clone
-SVar:DBCopy:DB$ Clone | Defined$ ChosenCard | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
+PT:0/0
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.YouCtrl | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature you control.
 SVar:NeedsToPlay:Creature.YouCtrl
 Oracle:You may have Mirror Image enter the battlefield as a copy of any creature you control.
-PT:0/0
diff --git a/forge-gui/res/cardsfolder/p/phantasmal_image.txt b/forge-gui/res/cardsfolder/p/phantasmal_image.txt
index 571fe08898a..7c110e6016e 100644
--- a/forge-gui/res/cardsfolder/p/phantasmal_image.txt
+++ b/forge-gui/res/cardsfolder/p/phantasmal_image.txt
@@ -3,9 +3,8 @@ ManaCost:1 U
 Types:Creature Illusion
 PT:0/0
 # Make Svars for granting abilities and triggers on clones distinct to avoid SVars getting overwritten when cloning a clone
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ AtLeast1 | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it's an Illusion in addition to its other types and it gains "When this creature becomes the target of a spell or ability, sacrifice it."
-SVar:DBCopy:DB$ Clone | Defined$ Remembered | AddTypes$ Illusion | AddTriggers$ PhantasmalImageTgtTrig | AddSVars$ PhantasmalImageSac,Targeting
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | AddTypes$ Illusion | AddTriggers$ PhantasmalImageTgtTrig | AddSVars$ PhantasmalImageSac,Targeting | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it's an Illusion in addition to its other types and it gains "When this creature becomes the target of a spell or ability, sacrifice it."
 SVar:PhantasmalImageTgtTrig:Mode$ BecomesTarget | ValidTarget$ Card.Self | Execute$ PhantasmalImageSac | TriggerDescription$ When this creature becomes the target of a spell or ability, sacrifice it.
 SVar:PhantasmalImageSac:DB$Sacrifice | Defined$ Self
 SVar:Targeting:Dies
diff --git a/forge-gui/res/cardsfolder/p/progenitor_mimic.txt b/forge-gui/res/cardsfolder/p/progenitor_mimic.txt
index 57034b74c49..19553c0e0ed 100644
--- a/forge-gui/res/cardsfolder/p/progenitor_mimic.txt
+++ b/forge-gui/res/cardsfolder/p/progenitor_mimic.txt
@@ -2,9 +2,8 @@ Name:Progenitor Mimic
 ManaCost:4 G U
 Types:Creature Shapeshifter
 PT:0/0
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | SpellDescription$ You may have Progenitor Mimic enter the battlefield as a copy of any creature on the battlefield, except it gains "At the beginning of your upkeep, if this creature isn't a token, create a token that's a copy of this creature."
-SVar:DBCopy:DB$ Clone | Defined$ ChosenCard | AddTriggers$ ProgenitorTrig | AddSVars$ ProgenitorCopy,ProgenitorTrig
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | AddTriggers$ ProgenitorTrig | AddSVars$ ProgenitorCopy,ProgenitorTrig | SpellDescription$ You may have Progenitor Mimic enter the battlefield as a copy of any creature on the battlefield, except it gains "At the beginning of your upkeep, if this creature isn't a token, create a token that's a copy of this creature."
 SVar:ProgenitorTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ ProgenitorCopy | IsPresent$ Card.Self+nonToken | TriggerDescription$ At the beginning of your upkeep, if CARDNAME isn't a token, create a token that's a copy of CARDNAME."
 SVar:ProgenitorCopy:DB$ CopyPermanent | Defined$ Self | NumCopies$ 1
 SVar:NeedsToPlay:Creature.inZoneBattlefield
diff --git a/forge-gui/res/cardsfolder/p/protean_raider.txt b/forge-gui/res/cardsfolder/p/protean_raider.txt
index 0509883f268..5818ffb6450 100644
--- a/forge-gui/res/cardsfolder/p/protean_raider.txt
+++ b/forge-gui/res/cardsfolder/p/protean_raider.txt
@@ -2,9 +2,8 @@ Name:Protean Raider
 ManaCost:1 U R
 Types:Creature Shapeshifter Pirate
 PT:2/2
-R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | Optional$ True | ReplaceWith$ ChooseCreature | CheckSVar$ RaidTest | References$ RaidTest | Description$ Raid — If you attacked with a creature this turn, you may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | AILogic$ Clone
-SVar:DBCopy:DB$ Clone | Defined$ ChosenCard | SubAbility$ DBChangeZone
+R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | Optional$ True | ReplaceWith$ DBCopy | CheckSVar$ RaidTest | References$ RaidTest | Description$ Raid — If you attacked with a creature this turn, you may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | SubAbility$ DBChangeZone | SpellDescription$ Raid — If you attacked with a creature this turn, you may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
 SVar:DBChangeZone:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:RaidTest:Count$AttackersDeclared
 SVar:Picture:http://www.wizards.com/global/images/magic/general/protean_raider.jpg
diff --git a/forge-gui/res/cardsfolder/s/sakashima_the_impostor.txt b/forge-gui/res/cardsfolder/s/sakashima_the_impostor.txt
index dd599c39b63..db012d45c58 100644
--- a/forge-gui/res/cardsfolder/s/sakashima_the_impostor.txt
+++ b/forge-gui/res/cardsfolder/s/sakashima_the_impostor.txt
@@ -3,9 +3,8 @@ ManaCost:2 U U
 Types:Legendary Creature Human Rogue
 PT:3/1
 # Make Svars for granting abilities and triggers on clones distinct to avoid SVars getting overwritten when cloning a clone
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | RememberChosen$ True | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except its name is still CARDNAME, it's legendary in addition to its other types, and it gains "{2}{U}{U}: Return CARDNAME to its owner's hand at the beginning of the next end step."
-SVar:DBCopy:DB$ Clone | Defined$ Remembered | KeepName$ True | AddTypes$ Legendary | AddAbilities$ ReturnSakashima | AddSVars$ TrigReturnSak
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | KeepName$ True | AddTypes$ Legendary | AddAbilities$ ReturnSakashima | AddSVars$ TrigReturnSak | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except its name is still CARDNAME, it's legendary in addition to its other types, and it gains "{2}{U}{U}: Return CARDNAME to its owner's hand at the beginning of the next end step."
 SVar:ReturnSakashima:AB$ DelayedTrigger | Cost$ 2 U U | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturnSak | SpellDescription$ Return CARDNAME to it's owners hand at the beginning of the next end step.
 SVar:TrigReturnSak:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sakashima_the_impostor.jpg
diff --git a/forge-gui/res/cardsfolder/s/sakashimas_student.txt b/forge-gui/res/cardsfolder/s/sakashimas_student.txt
index 8fbfe634b11..b1bd6ef73f6 100644
--- a/forge-gui/res/cardsfolder/s/sakashimas_student.txt
+++ b/forge-gui/res/cardsfolder/s/sakashimas_student.txt
@@ -4,7 +4,6 @@ Types:Creature Human Ninja
 PT:0/0
 K:Ninjutsu:1 U
 K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it's a Ninja in addition to its other creature types.
-SVar:DBCopy:DB$ Clone | Defined$ Remembered | AddTypes$ Ninja
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | AddTypes$ Ninja | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it's a Ninja in addition to its other creature types.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sakashimas_student.jpg
 Oracle:Ninjutsu {1}{U} ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nYou may have Sakashima's Student enter the battlefield as a copy of any creature on the battlefield, except it's a Ninja in addition to its other creature types.
diff --git a/forge-gui/res/cardsfolder/s/sculpting_steel.txt b/forge-gui/res/cardsfolder/s/sculpting_steel.txt
index bf518d6afa7..6521ad86929 100644
--- a/forge-gui/res/cardsfolder/s/sculpting_steel.txt
+++ b/forge-gui/res/cardsfolder/s/sculpting_steel.txt
@@ -1,8 +1,7 @@
 Name:Sculpting Steel
 ManaCost:3
 Types:Artifact
-K:ETBReplacement:Copy:ChooseArtifact:Optional
-SVar:ChooseArtifact:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Artifact.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any artifact on the battlefield.
-SVar:DBCopy:DB$ Clone | Defined$ Remembered
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Artifact.Other | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any artifact on the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sculpting_steel.jpg
 Oracle:You may have Sculpting Steel enter the battlefield as a copy of any artifact on the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/stunt_double.txt b/forge-gui/res/cardsfolder/s/stunt_double.txt
index 482cfa2a404..5736894dc2a 100644
--- a/forge-gui/res/cardsfolder/s/stunt_double.txt
+++ b/forge-gui/res/cardsfolder/s/stunt_double.txt
@@ -3,8 +3,7 @@ ManaCost:3 U
 Types:Creature Shapeshifter
 PT:0/0
 K:Flash
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
-SVar:DBCopy:DB$ Clone | Defined$ Remembered
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stunt_double.jpg
 Oracle:Flash\nYou may have Stunt Double enter the battlefield as a copy of any creature on the the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/v/vesuva.txt b/forge-gui/res/cardsfolder/v/vesuva.txt
index 9aea3e7e074..609ef29457a 100644
--- a/forge-gui/res/cardsfolder/v/vesuva.txt
+++ b/forge-gui/res/cardsfolder/v/vesuva.txt
@@ -1,9 +1,8 @@
 Name:Vesuva
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Copy:ChooseLand:Optional
-SVar:ChooseLand:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Land.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield tapped as a copy of any land on the battlefield.
-SVar:DBCopy:DB$ Clone | Defined$ Remembered | IntoPlayTapped$ True
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Land.Other | IntoPlayTapped$ True | SpellDescription$ You may have CARDNAME enter the battlefield tapped as a copy of any land on the battlefield.
 SVar:NeedsToPlay:Land.YouDontCtrl+notnamedVesuva,Land.YouCtrl+nonLegendary+notnamedVesuva
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vesuva.jpg
 Oracle:You may have Vesuva enter the battlefield tapped as a copy of any land on the battlefield.