diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
index 3f0b0a39a3e..16e43f05de7 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
@@ -514,7 +514,7 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone
                     return false;
                 }
             }
-        } else {
+        } else if (!hasParam("CharacteristicDefining")) {
             if (!getHostCard().isInZone(ZoneType.Battlefield)) { // default
                 return false;
             }
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
index fe5d0ddd5b5..406a61fad43 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -168,7 +168,7 @@ public final class StaticAbilityContinuous {
 
         if (layer == StaticAbilityLayer.TEXT && params.containsKey("GainTextOf")) {
             final String valid = params.get("GainTextOf");
-            CardCollection allValid = CardLists.getValidCards(game.getCardsInGame(), valid, hostCard.getController(), hostCard, null);
+            CardCollection allValid = CardLists.getValidCards(game.getCardsInGame(), valid, hostCard.getController(), hostCard, stAb);
             if (allValid.size() > 1) {
                 // TODO: if ever necessary, support gaining text of multiple cards at the same time
                 System.err.println("Error: GainTextOf parameter was not defined as a unique card for " + hostCard);
@@ -271,7 +271,7 @@ public final class StaticAbilityContinuous {
                         String keywordDefined = params.get("KeywordDefined");
                         CardCollectionView definedCards = game.getCardsIn(ZoneType.Battlefield);
                         definedCards = CardLists.getValidCards(definedCards, keywordDefined, hostCard.getController(),
-                                hostCard, null);
+                                hostCard, stAb);
                         for (Card c : definedCards) {
                             final int cmc = c.getCMC();
                             String y = (input.replace(" from EachCMCAmongDefined", ":Card.cmcEQ"
@@ -504,7 +504,7 @@ public final class StaticAbilityContinuous {
                 if ("True".equals(look)) {
                     look = "You";
                 }
-                mayLookAt = AbilityUtils.getDefinedPlayers(hostCard, look, null);
+                mayLookAt = AbilityUtils.getDefinedPlayers(hostCard, look, stAb);
             }
             if (params.containsKey("MayPlay")) {
                 controllerMayPlay = true;
@@ -567,7 +567,7 @@ public final class StaticAbilityContinuous {
                     }
                 }
                 if (params.containsKey("ControlOpponentsSearchingLibrary")) {
-                    Player cntl = Iterables.getFirst(AbilityUtils.getDefinedPlayers(hostCard, params.get("ControlOpponentsSearchingLibrary"), null), null);
+                    Player cntl = Iterables.getFirst(AbilityUtils.getDefinedPlayers(hostCard, params.get("ControlOpponentsSearchingLibrary"), stAb), null);
                     p.addControlledWhileSearching(se.getTimestamp(), cntl);
                 }
 
@@ -941,7 +941,7 @@ public final class StaticAbilityContinuous {
         final String[] strngs = params.get("Affected").split(",");
 
         for (Player p : controller.getGame().getPlayersInTurnOrder()) {
-            if (p.isValid(strngs, controller, hostCard, null)) {
+            if (p.isValid(strngs, controller, hostCard, stAb)) {
                 players.add(p);
             }
         }
diff --git a/forge-gui/res/cardsfolder/c/cho_arrim_legate.txt b/forge-gui/res/cardsfolder/c/cho_arrim_legate.txt
index 28cc0bf6045..902b37f3c81 100644
--- a/forge-gui/res/cardsfolder/c/cho_arrim_legate.txt
+++ b/forge-gui/res/cardsfolder/c/cho_arrim_legate.txt
@@ -2,9 +2,8 @@ Name:Cho-Arrim Legate
 ManaCost:2 W
 Types:Creature Human Soldier
 PT:1/2
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Swamp and you control a Plains, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Swamp and you control a Plains, you may cast this spell without paying its mana cost.
 K:Protection from black
 SVar:X:Count$Valid Swamp.OppCtrl
 SVar:Y:Count$Valid Plains.YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cho_arrim_legate.jpg
 Oracle:If an opponent controls a Swamp and you control a Plains, you may cast this spell without paying its mana cost.\nProtection from black
diff --git a/forge-gui/res/cardsfolder/c/crashing_tide.txt b/forge-gui/res/cardsfolder/c/crashing_tide.txt
index ff477823985..eb2e3b43077 100644
--- a/forge-gui/res/cardsfolder/c/crashing_tide.txt
+++ b/forge-gui/res/cardsfolder/c/crashing_tide.txt
@@ -1,10 +1,9 @@
 Name:Crashing Tide
 ManaCost:2 U
 Types:Sorcery
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Flash | IsPresent$ Merfolk.YouCtrl | Description$ This spell has flash as long as you control a Merfolk.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Flash | IsPresent$ Merfolk.YouCtrl | Description$ This spell has flash as long as you control a Merfolk.
 A:SP$ ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBDraw | SpellDescription$ Return target creature to its owner's hand. Draw a card.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
 DeckHints:Type$Merfolk
 SVar:BuffedBy:Merfolk
-SVar:Picture:http://www.wizards.com/global/images/magic/general/crashing_tide.jpg
 Oracle:This spell has flash as long as you control a Merfolk.\nReturn target creature to its owner's hand.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/d/deadly_rollick.txt b/forge-gui/res/cardsfolder/d/deadly_rollick.txt
index 6644c5c8d05..6a4bf7543d6 100644
--- a/forge-gui/res/cardsfolder/d/deadly_rollick.txt
+++ b/forge-gui/res/cardsfolder/d/deadly_rollick.txt
@@ -1,6 +1,6 @@
 Name:Deadly Rollick
 ManaCost:3 B
 Types:Instant
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
 A:SP$ ChangeZone | Cost$ 3 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
-Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nExile target creature.
\ No newline at end of file
+Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nExile target creature.
diff --git a/forge-gui/res/cardsfolder/d/deepwood_legate.txt b/forge-gui/res/cardsfolder/d/deepwood_legate.txt
index 0e2e3596ec2..0360721ca03 100644
--- a/forge-gui/res/cardsfolder/d/deepwood_legate.txt
+++ b/forge-gui/res/cardsfolder/d/deepwood_legate.txt
@@ -2,7 +2,7 @@ Name:Deepwood Legate
 ManaCost:3 B
 Types:Creature Shade
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Forest and you control a Swamp, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Forest and you control a Swamp, you may cast this spell without paying its mana cost.
 A:AB$ Pump | Cost$ B | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
 SVar:X:Count$Valid Forest.OppCtrl
 SVar:Y:Count$Valid Swamp.YouCtrl
diff --git a/forge-gui/res/cardsfolder/d/deflecting_swat.txt b/forge-gui/res/cardsfolder/d/deflecting_swat.txt
index 7221e374958..02de0439a89 100755
--- a/forge-gui/res/cardsfolder/d/deflecting_swat.txt
+++ b/forge-gui/res/cardsfolder/d/deflecting_swat.txt
@@ -1,6 +1,6 @@
 Name:Deflecting Swat
 ManaCost:2 R
 Types:Instant
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
 A:SP$ ChangeTargets | Cost$ 2 R | TargetType$ Spell,Activated,Triggered | Optional$ True | ValidTgts$ Card | TgtPrompt$ Select target spell or ability | SpellDescription$ You may choose new targets for target spell or ability.
-Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nYou may choose new targets for target spell or ability.
\ No newline at end of file
+Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nYou may choose new targets for target spell or ability.
diff --git a/forge-gui/res/cardsfolder/f/flawless_maneuver.txt b/forge-gui/res/cardsfolder/f/flawless_maneuver.txt
index 4dc1d40d6bc..e500193d7f1 100755
--- a/forge-gui/res/cardsfolder/f/flawless_maneuver.txt
+++ b/forge-gui/res/cardsfolder/f/flawless_maneuver.txt
@@ -1,6 +1,6 @@
 Name:Flawless Maneuver
 ManaCost:2 W
 Types:Instant
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
 A:SP$ PumpAll | Cost$ 2 W | ValidCards$ Creature.YouCtrl | KW$ Indestructible | SpellDescription$ Creatures you control gain indestructible until end of turn.
 Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nCreatures you control gain indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/k/kyren_legate.txt b/forge-gui/res/cardsfolder/k/kyren_legate.txt
index 7cd200701fd..1e132b392fd 100644
--- a/forge-gui/res/cardsfolder/k/kyren_legate.txt
+++ b/forge-gui/res/cardsfolder/k/kyren_legate.txt
@@ -2,9 +2,8 @@ Name:Kyren Legate
 ManaCost:1 R
 Types:Creature Goblin
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Plains and you control a Mountain, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Plains and you control a Mountain, you may cast this spell without paying its mana cost.
 K:Haste
 SVar:X:Count$Valid Plains.OppCtrl
 SVar:Y:Count$Valid Mountain.YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kyren_legate.jpg
 Oracle:If an opponent controls a Plains and you control a Mountain, you may cast this spell without paying its mana cost.\nHaste
diff --git a/forge-gui/res/cardsfolder/l/land_grant.txt b/forge-gui/res/cardsfolder/l/land_grant.txt
index b1c4fdd234f..3a227629013 100644
--- a/forge-gui/res/cardsfolder/l/land_grant.txt
+++ b/forge-gui/res/cardsfolder/l/land_grant.txt
@@ -1,7 +1,7 @@
 Name:Land Grant
 ManaCost:1 G
 Types:Sorcery
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:Reveal<1/Hand> | CheckSVar$ X | SVarCompare$ EQ0 | Description$ If you have no land cards in hand, you may reveal your hand rather than pay Land Grant's mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:Reveal<1/Hand> | CheckSVar$ X | SVarCompare$ EQ0 | Description$ If you have no land cards in hand, you may reveal your hand rather than pay Land Grant's mana cost.
 SVar:X:Count$TypeInYourHand.Land
 A:SP$ ChangeZone | Cost$ 1 G | Origin$ Library | Destination$ Hand | ChangeType$ Forest | ChangeNum$ 1 | SpellDescription$ Search your library for a Forest card, reveal that card, and put it into your hand. Then shuffle your library.
 Oracle:If you have no land cards in hand, you may reveal your hand rather than pay this spell's mana cost.\nSearch your library for a Forest card, reveal that card, and put it into your hand. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/m/massacre.txt b/forge-gui/res/cardsfolder/m/massacre.txt
index b9a2e89c0e5..910bc919d19 100644
--- a/forge-gui/res/cardsfolder/m/massacre.txt
+++ b/forge-gui/res/cardsfolder/m/massacre.txt
@@ -1,9 +1,8 @@
 Name:Massacre
 ManaCost:2 B B
 Types:Sorcery
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Plains and you control a Swamp, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Plains and you control a Swamp, you may cast this spell without paying its mana cost.
 SVar:X:Count$Valid Plains.OppCtrl
 SVar:Y:Count$Valid Swamp.YouCtrl
 A:SP$ PumpAll | Cost$ 2 B B | ValidCards$ Creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ All creatures get -2/-2 until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/massacre.jpg
 Oracle:If an opponent controls a Plains and you control a Swamp, you may cast this spell without paying its mana cost.\nAll creatures get -2/-2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/m/mogg_salvage.txt b/forge-gui/res/cardsfolder/m/mogg_salvage.txt
index 2887cfe3ae5..784b759fe1d 100644
--- a/forge-gui/res/cardsfolder/m/mogg_salvage.txt
+++ b/forge-gui/res/cardsfolder/m/mogg_salvage.txt
@@ -1,9 +1,8 @@
 Name:Mogg Salvage
 ManaCost:2 R
 Types:Instant
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls an Island and you control a Mountain, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls an Island and you control a Mountain, you may cast this spell without paying its mana cost.
 SVar:X:Count$Valid Island.OppCtrl
 SVar:Y:Count$Valid Mountain.YouCtrl
 A:SP$ Destroy | Cost$ 2 R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mogg_salvage.jpg
 Oracle:If an opponent controls an Island and you control a Mountain, you may cast this spell without paying its mana cost.\nDestroy target artifact.
diff --git a/forge-gui/res/cardsfolder/m/mutual_destruction.txt b/forge-gui/res/cardsfolder/m/mutual_destruction.txt
index fed0117d0b1..0ce98b47e83 100755
--- a/forge-gui/res/cardsfolder/m/mutual_destruction.txt
+++ b/forge-gui/res/cardsfolder/m/mutual_destruction.txt
@@ -1,7 +1,7 @@
 Name:Mutual Destruction
 ManaCost:B
 Types:Sorcery
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flash | IsPresent$ Permanent.YouCtrl+hasKeywordFlash | EffectZone$ All | Description$ CARDNAME has flash as long as you control a permanent with flash.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Flash | IsPresent$ Permanent.YouCtrl+hasKeywordFlash | Description$ CARDNAME has flash as long as you control a permanent with flash.
 A:SP$ Destroy | Cost$ B Sac<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature.
 SVar:AICostPreference:SacCost$Creature.Token,Creature.cmcLE2
 Oracle:This spell has flash as long as you control a permanent with flash.\nAs an additional cost to cast this spell, sacrifice a creature.\nDestroy target creature.
diff --git a/forge-gui/res/cardsfolder/o/obscuring_haze.txt b/forge-gui/res/cardsfolder/o/obscuring_haze.txt
index 227a65915b3..67f04d51372 100755
--- a/forge-gui/res/cardsfolder/o/obscuring_haze.txt
+++ b/forge-gui/res/cardsfolder/o/obscuring_haze.txt
@@ -1,7 +1,7 @@
 Name:Obscuring Haze
 ManaCost:2 G
 Types:Instant
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
 A:SP$ Effect | Cost$ 2 G | ReplacementEffects$ RPrevent | AILogic$ Fog | SpellDescription$ Prevent all damage that would be dealt this turn by creatures your opponents control.
 SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidSource$ Creature.OppCtrl | Description$ Prevent all damage that would be dealt this turn by creatures your opponents control.
 Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nPrevent all damage that would be dealt this turn by creatures your opponents control.
diff --git a/forge-gui/res/cardsfolder/o/once_upon_a_time.txt b/forge-gui/res/cardsfolder/o/once_upon_a_time.txt
index d4a0ca42d5f..ac74f45271c 100644
--- a/forge-gui/res/cardsfolder/o/once_upon_a_time.txt
+++ b/forge-gui/res/cardsfolder/o/once_upon_a_time.txt
@@ -1,7 +1,7 @@
 Name:Once Upon a Time
 ManaCost:1 G
 Types:Instant
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | CheckSVar$ X | SVarCompare$ EQ0 | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | Description$ If this spell is the first spell you've cast this game, you may cast it without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | CheckSVar$ X | SVarCompare$ EQ0 | MayPlay$ True | MayPlayDontGrantZonePermissions$ True | MayPlayWithoutManaCost$ True | Description$ If this spell is the first spell you've cast this game, you may cast it without paying its mana cost.
 SVar:X:Count$YouCastThisGame
 A:SP$ Dig | Cost$ 1 G | DigNum$ 5 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Card.Creature,Card.Land | RestRandomOrder$ True | SpellDescription$ Look at the top five cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
 Oracle:If this spell is the first spell you've cast this game, you may cast it without paying its mana cost.\nLook at the top five cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/q/qasali_ambusher.txt b/forge-gui/res/cardsfolder/q/qasali_ambusher.txt
index 36ff5381dde..65cb68170d5 100644
--- a/forge-gui/res/cardsfolder/q/qasali_ambusher.txt
+++ b/forge-gui/res/cardsfolder/q/qasali_ambusher.txt
@@ -3,9 +3,8 @@ ManaCost:1 G W
 Types:Creature Cat Warrior
 PT:2/3
 K:Reach
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | CheckSVar$ X | CheckSecondSVar$ Y | CheckThirdSVar$ Z | MayPlay$ True | MayPlayWithoutManaCost$ True | MayPlayWithFlash$ True | MayPlayDontGrantZonePermissions$ True | Description$ If a creature is attacking you and you control a Forest and a Plains, you may cast CARDNAME without paying its mana cost and as though it had flash.
+S:Mode$ Continuous | CharacteristicDefining$ True | CheckSVar$ X | CheckSecondSVar$ Y | CheckThirdSVar$ Z | MayPlay$ True | MayPlayWithoutManaCost$ True | MayPlayWithFlash$ True | MayPlayDontGrantZonePermissions$ True | Description$ If a creature is attacking you and you control a Forest and a Plains, you may cast CARDNAME without paying its mana cost and as though it had flash.
 SVar:X:Count$Valid Creature.attackingYou
 SVar:Y:Count$Valid Forest.YouCtrl
 SVar:Z:Count$Valid Plains.YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/qasali_ambusher.jpg
 Oracle:Reach\nIf a creature is attacking you and you control a Forest and a Plains, you may cast Qasali Ambusher without paying its mana cost and as though it had flash.
diff --git a/forge-gui/res/cardsfolder/r/refreshing_rain.txt b/forge-gui/res/cardsfolder/r/refreshing_rain.txt
index 2349ba8f8a9..650b5a08d6d 100644
--- a/forge-gui/res/cardsfolder/r/refreshing_rain.txt
+++ b/forge-gui/res/cardsfolder/r/refreshing_rain.txt
@@ -1,9 +1,8 @@
 Name:Refreshing Rain
 ManaCost:3 G
 Types:Instant
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Swamp and you control a Forest, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Swamp and you control a Forest, you may cast this spell without paying its mana cost.
 SVar:X:Count$Valid Swamp.OppCtrl
 SVar:Y:Count$Valid Forest.YouCtrl
 A:SP$ GainLife | Cost$ 3 G | LifeAmount$ 6 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player gains 6 life.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/refreshing_rain.jpg
 Oracle:If an opponent controls a Swamp and you control a Forest, you may cast this spell without paying its mana cost.\nTarget player gains 6 life.
diff --git a/forge-gui/res/cardsfolder/r/rushwood_legate.txt b/forge-gui/res/cardsfolder/r/rushwood_legate.txt
index 4c24c78870a..1e6fefab32a 100644
--- a/forge-gui/res/cardsfolder/r/rushwood_legate.txt
+++ b/forge-gui/res/cardsfolder/r/rushwood_legate.txt
@@ -2,8 +2,7 @@ Name:Rushwood Legate
 ManaCost:2 G
 Types:Creature Dryad
 PT:2/1
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls an Island and you control a Forest, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls an Island and you control a Forest, you may cast this spell without paying its mana cost.
 SVar:X:Count$Valid Island.OppCtrl
 SVar:Y:Count$Valid Forest.YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/rushwood_legate.jpg
 Oracle:If an opponent controls an Island and you control a Forest, you may cast this spell without paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/s/saprazzan_legate.txt b/forge-gui/res/cardsfolder/s/saprazzan_legate.txt
index 5ce08feed83..985f0aedec7 100644
--- a/forge-gui/res/cardsfolder/s/saprazzan_legate.txt
+++ b/forge-gui/res/cardsfolder/s/saprazzan_legate.txt
@@ -2,9 +2,8 @@ Name:Saprazzan Legate
 ManaCost:3 U
 Types:Creature Merfolk Soldier
 PT:1/3
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Mountain and you control an Island, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Mountain and you control an Island, you may cast this spell without paying its mana cost.
 K:Flying
 SVar:X:Count$Valid Mountain.OppCtrl
 SVar:Y:Count$Valid Island.YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/saprazzan_legate.jpg
 Oracle:If an opponent controls a Mountain and you control an Island, you may cast this spell without paying its mana cost.\nFlying
diff --git a/forge-gui/res/cardsfolder/s/sivvis_ruse.txt b/forge-gui/res/cardsfolder/s/sivvis_ruse.txt
index 2f085d4299c..f1a2d13f331 100644
--- a/forge-gui/res/cardsfolder/s/sivvis_ruse.txt
+++ b/forge-gui/res/cardsfolder/s/sivvis_ruse.txt
@@ -1,11 +1,10 @@
 Name:Sivvi's Ruse
 ManaCost:2 W W
 Types:Instant
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Mountain and you control a Plains, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Mountain and you control a Plains, you may cast this spell without paying its mana cost.
 A:SP$ Effect | Cost$ 2 W W | Name$ Sivvi's Ruse Effect | ReplacementEffects$ RPrevent | SpellDescription$ Prevent all damage that would be dealt this turn to creatures you control.
 SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidTarget$ Creature.YouCtrl | Description$ Prevent all damage that would be dealt this turn to creatures you control.
 SVar:X:Count$Valid Mountain.OppCtrl
 SVar:Y:Count$Valid Plains.YouCtrl
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sivvis_ruse.jpg
 Oracle:If an opponent controls a Mountain and you control a Plains, you may cast this spell without paying its mana cost.\nPrevent all damage that would be dealt this turn to creatures you control.
diff --git a/forge-gui/res/cardsfolder/s/submerge.txt b/forge-gui/res/cardsfolder/s/submerge.txt
index 31bfd5eede7..72849324a56 100644
--- a/forge-gui/res/cardsfolder/s/submerge.txt
+++ b/forge-gui/res/cardsfolder/s/submerge.txt
@@ -1,9 +1,8 @@
 Name:Submerge
 ManaCost:4 U
 Types:Instant
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Forest and you control an Island, you may cast this spell without paying its mana cost.
+S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | CheckSVar$ X | CheckSecondSVar$ Y | Description$ If an opponent controls a Forest and you control an Island, you may cast this spell without paying its mana cost.
 SVar:X:Count$Valid Forest.OppCtrl
 SVar:Y:Count$Valid Island.YouCtrl
 A:SP$ ChangeZone | Cost$ 4 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put target creature on top of its owner's library.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/submerge.jpg
 Oracle:If an opponent controls a Forest and you control an Island, you may cast this spell without paying its mana cost.\nPut target creature on top of its owner's library.