From 26e7ee44171e4ad9c85426586a348ed1b31014ed Mon Sep 17 00:00:00 2001
From: slapshot5 <slapshot5@cardforge.org>
Date: Mon, 16 Jan 2012 05:18:25 +0000
Subject: [PATCH] remove SVar= from SubAbility (S cards)

---
 res/cardsfolder/s/sages_dousing.txt             | 2 +-
 res/cardsfolder/s/salt_flats.txt                | 4 ++--
 res/cardsfolder/s/savage_gorilla.txt            | 2 +-
 res/cardsfolder/s/sawtooth_loon.txt             | 2 +-
 res/cardsfolder/s/scabland.txt                  | 4 ++--
 res/cardsfolder/s/screeching_drake.txt          | 2 +-
 res/cardsfolder/s/sea_snidd.txt                 | 2 +-
 res/cardsfolder/s/second_chance.txt             | 2 +-
 res/cardsfolder/s/second_thoughts.txt           | 2 +-
 res/cardsfolder/s/see_beyond.txt                | 2 +-
 res/cardsfolder/s/seedcradle_witch.txt          | 2 +-
 res/cardsfolder/s/seeds_of_strength.txt         | 4 ++--
 res/cardsfolder/s/seismic_spike.txt             | 2 +-
 res/cardsfolder/s/seizan_perverter_of_truth.txt | 2 +-
 res/cardsfolder/s/selfless_exorcist.txt         | 2 +-
 res/cardsfolder/s/sensei_golden_tail.txt        | 2 +-
 res/cardsfolder/s/senseis_divining_top.txt      | 2 +-
 res/cardsfolder/s/serene_offering.txt           | 2 +-
 res/cardsfolder/s/serrated_biskelion.txt        | 2 +-
 res/cardsfolder/s/serum_visions.txt             | 2 +-
 res/cardsfolder/s/sever_soul.txt                | 2 +-
 res/cardsfolder/s/shadow_guildmage.txt          | 2 +-
 res/cardsfolder/s/shadow_rift.txt               | 2 +-
 res/cardsfolder/s/shadowblood_egg.txt           | 2 +-
 res/cardsfolder/s/shadowfeed.txt                | 2 +-
 res/cardsfolder/s/shard_convergence.txt         | 6 +++---
 res/cardsfolder/s/shattered_crypt.txt           | 2 +-
 res/cardsfolder/s/shauku_endbringer.txt         | 2 +-
 res/cardsfolder/s/shivan_reef.txt               | 4 ++--
 res/cardsfolder/s/shower_of_sparks.txt          | 2 +-
 res/cardsfolder/s/sift.txt                      | 2 +-
 res/cardsfolder/s/sigil_blessing.txt            | 2 +-
 res/cardsfolder/s/sign_in_blood.txt             | 2 +-
 res/cardsfolder/s/skirk_volcanist.txt           | 4 ++--
 res/cardsfolder/s/sky_eel_school.txt            | 2 +-
 res/cardsfolder/s/skycloud_egg.txt              | 2 +-
 res/cardsfolder/s/skyshroud_forest.txt          | 4 ++--
 res/cardsfolder/s/slaughter.txt                 | 2 +-
 res/cardsfolder/s/slaughter_pact.txt            | 2 +-
 res/cardsfolder/s/slay.txt                      | 2 +-
 res/cardsfolder/s/sleep.txt                     | 2 +-
 res/cardsfolder/s/slice_in_twain.txt            | 2 +-
 res/cardsfolder/s/sludge_strider.txt            | 2 +-
 res/cardsfolder/s/smallpox.txt                  | 6 +++---
 res/cardsfolder/s/smash.txt                     | 2 +-
 res/cardsfolder/s/smash_to_smithereens.txt      | 2 +-
 res/cardsfolder/s/snap.txt                      | 2 +-
 res/cardsfolder/s/snow_hound.txt                | 2 +-
 res/cardsfolder/s/soldevi_heretic.txt           | 2 +-
 res/cardsfolder/s/solemn_offering.txt           | 2 +-
 res/cardsfolder/s/soratami_cloudskater.txt      | 2 +-
 res/cardsfolder/s/sorcerers_strongbox.txt       | 2 +-
 res/cardsfolder/s/sorcerous_sight.txt           | 2 +-
 res/cardsfolder/s/sorins_thirst.txt             | 2 +-
 res/cardsfolder/s/soul_exchange.txt             | 2 +-
 res/cardsfolder/s/soul_feast.txt                | 2 +-
 res/cardsfolder/s/soul_manipulation.txt         | 2 +-
 res/cardsfolder/s/soul_rend.txt                 | 2 +-
 res/cardsfolder/s/soul_shred.txt                | 2 +-
 res/cardsfolder/s/soul_spike.txt                | 4 ++--
 res/cardsfolder/s/soulquake.txt                 | 2 +-
 res/cardsfolder/s/souls_of_the_faultless.txt    | 2 +-
 res/cardsfolder/s/sparksmith.txt                | 2 +-
 res/cardsfolder/s/spawning_breath.txt           | 2 +-
 res/cardsfolder/s/spell_contortion.txt          | 2 +-
 res/cardsfolder/s/sphinx_bone_wand.txt          | 2 +-
 res/cardsfolder/s/sphinx_of_lost_truths.txt     | 2 +-
 res/cardsfolder/s/sphinx_of_magosi.txt          | 2 +-
 res/cardsfolder/s/sphinx_sovereign.txt          | 2 +-
 res/cardsfolder/s/spike_tiller.txt              | 2 +-
 res/cardsfolder/s/spin_into_myth.txt            | 2 +-
 res/cardsfolder/s/spore_cloud.txt               | 4 ++--
 res/cardsfolder/s/spread_the_sickness.txt       | 2 +-
 res/cardsfolder/s/spring_cleaning.txt           | 2 +-
 res/cardsfolder/s/spurnmage_advocate.txt        | 2 +-
 res/cardsfolder/s/squelch.txt                   | 2 +-
 res/cardsfolder/s/stabbing_pain.txt             | 2 +-
 res/cardsfolder/s/stand_firm.txt                | 2 +-
 res/cardsfolder/s/steady_progress.txt           | 2 +-
 res/cardsfolder/s/stern_judge.txt               | 2 +-
 res/cardsfolder/s/stitchers_apprentice.txt      | 2 +-
 res/cardsfolder/s/stolen_grain.txt              | 2 +-
 res/cardsfolder/s/stomp_and_howl.txt            | 2 +-
 res/cardsfolder/s/stormcloud_djinn.txt          | 2 +-
 res/cardsfolder/s/stream_of_unconsciousness.txt | 2 +-
 res/cardsfolder/s/strength_of_night.txt         | 2 +-
 res/cardsfolder/s/stronghold_discipline.txt     | 2 +-
 res/cardsfolder/s/stun.txt                      | 2 +-
 res/cardsfolder/s/stun_sniper.txt               | 2 +-
 res/cardsfolder/s/stupor.txt                    | 2 +-
 res/cardsfolder/s/subversion.txt                | 2 +-
 res/cardsfolder/s/sudden_strength.txt           | 2 +-
 res/cardsfolder/s/suffocating_blast.txt         | 2 +-
 res/cardsfolder/s/sulfurous_springs.txt         | 4 ++--
 res/cardsfolder/s/summoners_bane.txt            | 2 +-
 res/cardsfolder/s/summoners_pact.txt            | 4 ++--
 res/cardsfolder/s/sunflare_shaman.txt           | 2 +-
 res/cardsfolder/s/sungrass_egg.txt              | 2 +-
 res/cardsfolder/s/surge_of_thoughtweft.txt      | 2 +-
 res/cardsfolder/s/swallowing_plague.txt         | 2 +-
 res/cardsfolder/s/sway_of_the_stars.txt         | 8 ++++----
 res/cardsfolder/s/swift_maneuver.txt            | 2 +-
 res/cardsfolder/s/sword_of_body_and_mind.txt    | 2 +-
 res/cardsfolder/s/sword_of_feast_and_famine.txt | 2 +-
 res/cardsfolder/s/sword_of_fire_and_ice.txt     | 2 +-
 res/cardsfolder/s/sword_of_light_and_shadow.txt | 2 +-
 res/cardsfolder/s/sword_of_war_and_peace.txt    | 2 +-
 res/cardsfolder/s/symbol_of_unsummoning.txt     | 2 +-
 res/cardsfolder/s/syphon_life.txt               | 4 ++--
 res/cardsfolder/s/syphon_soul.txt               | 2 +-
 110 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/res/cardsfolder/s/sages_dousing.txt b/res/cardsfolder/s/sages_dousing.txt
index dd897a30259..4c7d8c1b377 100644
--- a/res/cardsfolder/s/sages_dousing.txt
+++ b/res/cardsfolder/s/sages_dousing.txt
@@ -2,7 +2,7 @@ Name:Sage's Dousing
 ManaCost:2 U
 Types:Tribal Instant Wizard
 Text:no text
-A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 3 | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target spell unless its controller pays 3. If you control a Wizard, draw a card.
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 3 | SubAbility$ DBDraw | SpellDescription$ Counter target spell unless its controller pays 3. If you control a Wizard, draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | ConditionPresent$ Wizard.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Wizard,
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/salt_flats.txt b/res/cardsfolder/s/salt_flats.txt
index 9cc0f9cd120..b96b38a6509 100644
--- a/res/cardsfolder/s/salt_flats.txt
+++ b/res/cardsfolder/s/salt_flats.txt
@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ SVar=DBPain | SpellDescription$ Add W to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ SVar=DBPain | SpellDescription$ Add B to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add W to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add B to your mana pool. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 K:CARDNAME enters the battlefield tapped.
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/s/savage_gorilla.txt b/res/cardsfolder/s/savage_gorilla.txt
index d6d39a88186..130ce88361a 100644
--- a/res/cardsfolder/s/savage_gorilla.txt
+++ b/res/cardsfolder/s/savage_gorilla.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Creature Ape
 Text:no text
 PT:3/3
-A:AB$ Pump | Cost$ U B T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | SubAbility$ SVar=DBDraw | SpellDescription$ Target creature gets -3/-3 until end of turn. Draw a card.
+A:AB$ Pump | Cost$ U B T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | SubAbility$ DBDraw | SpellDescription$ Target creature gets -3/-3 until end of turn. Draw a card.
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/savage_gorilla.jpg
diff --git a/res/cardsfolder/s/sawtooth_loon.txt b/res/cardsfolder/s/sawtooth_loon.txt
index af786e8768b..b4566ba1d40 100644
--- a/res/cardsfolder/s/sawtooth_loon.txt
+++ b/res/cardsfolder/s/sawtooth_loon.txt
@@ -7,7 +7,7 @@ K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a white or blue creature you control to its owner's hand.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw two cards, then put two cards from your hand on the bottom of your library.
 SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Creature.White+YouCtrl,Creature.Blue+YouCtrl
-SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 2 | SubAbility$ SVar=DBChangeZone
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 2 | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ChangeZone | Origin$ Hand | Destination$ Library | LibraryPosition$ -1 | ChangeNum$ 2
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/scabland.txt b/res/cardsfolder/s/scabland.txt
index f12ff015f29..c6bc485ddc9 100644
--- a/res/cardsfolder/s/scabland.txt
+++ b/res/cardsfolder/s/scabland.txt
@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ SVar=DBPain | SpellDescription$ Add W to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ SVar=DBPain | SpellDescription$ Add R to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add W to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add R to your mana pool. CARDNAME deals 1 damage to you.
 K:CARDNAME enters the battlefield tapped.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/s/screeching_drake.txt b/res/cardsfolder/s/screeching_drake.txt
index 42f3904760a..45b95e48f5e 100644
--- a/res/cardsfolder/s/screeching_drake.txt
+++ b/res/cardsfolder/s/screeching_drake.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card, then discard a card.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ SVar=DBDiscard
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:Rarity:Common
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal_Second_Age/screeching_drake.jpg
diff --git a/res/cardsfolder/s/sea_snidd.txt b/res/cardsfolder/s/sea_snidd.txt
index 36cb51df039..0e7b3f95349 100644
--- a/res/cardsfolder/s/sea_snidd.txt
+++ b/res/cardsfolder/s/sea_snidd.txt
@@ -3,7 +3,7 @@ ManaCost:4 U
 Types:Creature Beast
 Text:no text
 PT:3/3
-A:AB$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ SVar=DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn.
+A:AB$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn.
 SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/second_chance.txt b/res/cardsfolder/s/second_chance.txt
index 17973acd7f7..6080281c832 100644
--- a/res/cardsfolder/s/second_chance.txt
+++ b/res/cardsfolder/s/second_chance.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Enchantment
 Text:no text
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | LifeTotal$ You | LifeAmount$ LE5 | Execute$ TrigSac | TriggerDescription$ At the beginning of your upkeep, if you have 5 or less life, sacrifice CARDNAME and take an extra turn after this one.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ SVar=DBAddTurn
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ DBAddTurn
 SVar:DBAddTurn:DB$AddTurn | Defined$ You | NumTurns$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/second_chance.jpg
diff --git a/res/cardsfolder/s/second_thoughts.txt b/res/cardsfolder/s/second_thoughts.txt
index 3228d7850d2..a69c6324776 100644
--- a/res/cardsfolder/s/second_thoughts.txt
+++ b/res/cardsfolder/s/second_thoughts.txt
@@ -2,7 +2,7 @@ Name:Second Thoughts
 ManaCost:4 W
 Types:Instant
 Text:no text
-A:SP$ ChangeZone | Cost$ 4 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target attacking creature. | SubAbility$ SVar=DBDraw
+A:SP$ ChangeZone | Cost$ 4 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target attacking creature. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/second_thoughts.jpg
diff --git a/res/cardsfolder/s/see_beyond.txt b/res/cardsfolder/s/see_beyond.txt
index 3fe85cbd54d..52e873cb502 100644
--- a/res/cardsfolder/s/see_beyond.txt
+++ b/res/cardsfolder/s/see_beyond.txt
@@ -2,7 +2,7 @@ Name:See Beyond
 ManaCost:1 U
 Types:Sorcery
 Text:no text
-A:SP$ Draw | Cost$ 1 U | NumCards$ 2 | SubAbility$ SVar=DBShuffle | SpellDescription$ Draw two cards, then shuffle a card from your hand into your library.
+A:SP$ Draw | Cost$ 1 U | NumCards$ 2 | SubAbility$ DBShuffle | SpellDescription$ Draw two cards, then shuffle a card from your hand into your library.
 SVar:DBShuffle:DB$ChangeZone | Origin$ Hand | Destination$ Library | Shuffle$ True | ChangeType$ Card.YouOwn | ChangeNum$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/seedcradle_witch.txt b/res/cardsfolder/s/seedcradle_witch.txt
index 8c45c28286f..dac4654390a 100644
--- a/res/cardsfolder/s/seedcradle_witch.txt
+++ b/res/cardsfolder/s/seedcradle_witch.txt
@@ -3,7 +3,7 @@ ManaCost:GW
 Types:Creature Elf Shaman
 Text:no text
 PT:1/1
-A:AB$ Pump | Cost$ 2 G W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SubAbility$ SVar=DBUntap | SpellDescription$ Target creature gets +3/+3 until end of turn. Untap that creature.
+A:AB$ Pump | Cost$ 2 G W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SubAbility$ DBUntap | SpellDescription$ Target creature gets +3/+3 until end of turn. Untap that creature.
 SVar:DBUntap:DB$Untap | Defined$ Targeted
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seedcradle_witch.jpg
diff --git a/res/cardsfolder/s/seeds_of_strength.txt b/res/cardsfolder/s/seeds_of_strength.txt
index a76b3aeeddd..2a3185330d4 100644
--- a/res/cardsfolder/s/seeds_of_strength.txt
+++ b/res/cardsfolder/s/seeds_of_strength.txt
@@ -2,8 +2,8 @@ Name:Seeds of Strength
 ManaCost:G W
 Types:Instant
 Text:no text
-A:SP$ Pump | Cost$ G W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | SubAbility$ SVar=DBPump1 | SpellDescription$ Target creature gets +1/+1 until end of turn. Target creature gets +1/+1 until end of turn. Target creature gets +1/+1 until end of turn.
-SVar:DBPump1:DB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | SubAbility$ SVar=DBPump2
+A:SP$ Pump | Cost$ G W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBPump1 | SpellDescription$ Target creature gets +1/+1 until end of turn. Target creature gets +1/+1 until end of turn. Target creature gets +1/+1 until end of turn.
+SVar:DBPump1:DB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBPump2
 SVar:DBPump2:DB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seeds_of_strength.jpg
diff --git a/res/cardsfolder/s/seismic_spike.txt b/res/cardsfolder/s/seismic_spike.txt
index 08040f5f48e..d299383021d 100644
--- a/res/cardsfolder/s/seismic_spike.txt
+++ b/res/cardsfolder/s/seismic_spike.txt
@@ -2,7 +2,7 @@ Name:Seismic Spike
 ManaCost:2 R R
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 2 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ SVar=DBMana | SpellDescription$ Destroy target land. Add R R to your mana pool.
+A:SP$ Destroy | Cost$ 2 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBMana | SpellDescription$ Destroy target land. Add R R to your mana pool.
 SVar:DBMana:DB$Mana | Produced$ R | Amount$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seismic_spike.jpg
diff --git a/res/cardsfolder/s/seizan_perverter_of_truth.txt b/res/cardsfolder/s/seizan_perverter_of_truth.txt
index 01c595075f9..6eef1778557 100644
--- a/res/cardsfolder/s/seizan_perverter_of_truth.txt
+++ b/res/cardsfolder/s/seizan_perverter_of_truth.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Demon Spirit
 Text:no text
 PT:6/5
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of each player's upkeep, that player loses 2 life and draws two cards.
-SVar:TrigDrain:AB$LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ 2 | SubAbility$ SVar=DBDraw
+SVar:TrigDrain:AB$LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ 2 | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | Defined$ TriggeredPlayer | NumCards$ 2
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card78965.jpg
diff --git a/res/cardsfolder/s/selfless_exorcist.txt b/res/cardsfolder/s/selfless_exorcist.txt
index 5000884c9f6..e780cfb0a1b 100644
--- a/res/cardsfolder/s/selfless_exorcist.txt
+++ b/res/cardsfolder/s/selfless_exorcist.txt
@@ -3,7 +3,7 @@ ManaCost:3 W W
 Types:Creature Human Cleric
 Text:no text
 PT:3/4
-A:AB$ ChangeZone | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Graveyard | Destination$ Exile | SubAbility$ SVar=DBDealDamage | SpellDescription$ Exile target creature card from a graveyard. That card deals damage equal to its power to CARDNAME.
+A:AB$ ChangeZone | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBDealDamage | SpellDescription$ Exile target creature card from a graveyard. That card deals damage equal to its power to CARDNAME.
 SVar:DBDealDamage:DB$DealDamage | Defined$ Self | NumDmg$ X
 SVar:X:Targeted$CardPower
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/sensei_golden_tail.txt b/res/cardsfolder/s/sensei_golden_tail.txt
index f7c483b2d7d..22cbfabc6e3 100644
--- a/res/cardsfolder/s/sensei_golden_tail.txt
+++ b/res/cardsfolder/s/sensei_golden_tail.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Fox Samurai
 Text:no text
 PT:2/1
 K:Bushido 1
-A:AB$ PutCounter | Cost$ 1 W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ TRAINING | CounterNum$ 1 | SorcerySpeed$ True | SubAbility$ SVar=DBAnimate | SpellDescription$ Put a training counter on target creature. That creature gains bushido 1 and becomes a Samurai in addition to its other creature types. Activate this ability only any time you could cast a sorcery.
+A:AB$ PutCounter | Cost$ 1 W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ TRAINING | CounterNum$ 1 | SorcerySpeed$ True | SubAbility$ DBAnimate | SpellDescription$ Put a training counter on target creature. That creature gains bushido 1 and becomes a Samurai in addition to its other creature types. Activate this ability only any time you could cast a sorcery.
 SVar:DBAnimate:DB$Animate | Defined$ Targeted | Types$ Samurai | Keywords$ Bushido 1 | Permanent$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sensei_golden_tail.jpg
diff --git a/res/cardsfolder/s/senseis_divining_top.txt b/res/cardsfolder/s/senseis_divining_top.txt
index dfaefa6dfd5..fa155aa5654 100644
--- a/res/cardsfolder/s/senseis_divining_top.txt
+++ b/res/cardsfolder/s/senseis_divining_top.txt
@@ -3,7 +3,7 @@ ManaCost:1
 Types:Artifact
 Text:no text
 A:AB$ RearrangeTopOfLibrary | Cost$ 1 | Defined$ You | NumCards$ 3 | SpellDescription$ Look at the top three cards of your library, then put them back in any order.
-A:AB$ Draw | Cost$ T | Defined$ You | NumCards$ 1 | SubAbility$ SVar=DBChangeZone | SpellDescription$ Draw a card, then put CARDNAME on top of it's owner's library.
+A:AB$ Draw | Cost$ T | Defined$ You | NumCards$ 1 | SubAbility$ DBChangeZone | SpellDescription$ Draw a card, then put CARDNAME on top of it's owner's library.
 SVar:DBChangeZone:DB$ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/serene_offering.txt b/res/cardsfolder/s/serene_offering.txt
index c260a4a9ec3..25f4213c8da 100644
--- a/res/cardsfolder/s/serene_offering.txt
+++ b/res/cardsfolder/s/serene_offering.txt
@@ -2,7 +2,7 @@ Name:Serene Offering
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ 1 W | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SubAbility$ SVar=DBGainLife | SpellDescription$ Destroy target enchantment. You gain life equal to its converted mana cost.
+A:SP$ Destroy | Cost$ 1 W | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SubAbility$ DBGainLife | SpellDescription$ Destroy target enchantment. You gain life equal to its converted mana cost.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardManaCost
 SVar:PlayMain1:TRUE
diff --git a/res/cardsfolder/s/serrated_biskelion.txt b/res/cardsfolder/s/serrated_biskelion.txt
index ebb0824e4f2..31d3dbbb4e2 100644
--- a/res/cardsfolder/s/serrated_biskelion.txt
+++ b/res/cardsfolder/s/serrated_biskelion.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact Creature Construct
 Text:no text
 PT:2/2
-A:AB$ PutCounter | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 1 | SubAbility$ SVar=DBPutCounter | IsCurse$ True | SpellDescription$ Put a -1/-1 counter on target creature and a -1/-1 counter on CARDNAME.
+A:AB$ PutCounter | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 1 | SubAbility$ DBPutCounter | IsCurse$ True | SpellDescription$ Put a -1/-1 counter on target creature and a -1/-1 counter on CARDNAME.
 SVar:DBPutCounter:DB$PutCounter | Cost$ 0 | CounterType$ M1M1 | CounterNum$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serrated_biskelion.jpg
diff --git a/res/cardsfolder/s/serum_visions.txt b/res/cardsfolder/s/serum_visions.txt
index 8f76a719bdc..8bea6df4f04 100644
--- a/res/cardsfolder/s/serum_visions.txt
+++ b/res/cardsfolder/s/serum_visions.txt
@@ -2,7 +2,7 @@ Name:Serum Visions
 ManaCost:U
 Types:Sorcery
 Text:no text
-A:SP$ Draw | Cost$ U | Defined$ You | NumCards$ 1 | SubAbility$ SVar=DBScry | SpellDescription$ Draw a card. Scry 2 (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+A:SP$ Draw | Cost$ U | Defined$ You | NumCards$ 1 | SubAbility$ DBScry | SpellDescription$ Draw a card. Scry 2 (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 SVar:DBScry:DB$Scry | ScryNum$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serum_visions.jpg
diff --git a/res/cardsfolder/s/sever_soul.txt b/res/cardsfolder/s/sever_soul.txt
index 51fe59aa4c3..6b3f626945a 100644
--- a/res/cardsfolder/s/sever_soul.txt
+++ b/res/cardsfolder/s/sever_soul.txt
@@ -2,7 +2,7 @@ Name:Sever Soul
 ManaCost:3 B B
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SubAbility$ SVar=DBGainLife | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. You gain life equal to its toughness.
+A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SubAbility$ DBGainLife | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. You gain life equal to its toughness.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardToughness
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/shadow_guildmage.txt b/res/cardsfolder/s/shadow_guildmage.txt
index c71313fffac..50ba6e5b774 100644
--- a/res/cardsfolder/s/shadow_guildmage.txt
+++ b/res/cardsfolder/s/shadow_guildmage.txt
@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:1/1
 A:AB$ ChangeZone | Cost$ U T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put target creature you control on top of its owner's library.
-A:AB$ DealDamage | Cost$ R T | Tgt$ TgtCP | NumDmg$ 1 | SubAbility$ SVar=DBDealDamage | SpellDescription$ CARDNAME deals 1 damage to target creature or player and 1 damage to you.
+A:AB$ DealDamage | Cost$ R T | Tgt$ TgtCP | NumDmg$ 1 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 1 damage to target creature or player and 1 damage to you.
 SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shadow_guildmage.jpg
diff --git a/res/cardsfolder/s/shadow_rift.txt b/res/cardsfolder/s/shadow_rift.txt
index 0cc5b5f092f..65a0eacb7e5 100644
--- a/res/cardsfolder/s/shadow_rift.txt
+++ b/res/cardsfolder/s/shadow_rift.txt
@@ -2,7 +2,7 @@ Name:Shadow Rift
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Shadow | SpellDescription$ Target creature gains shadow until end of turn. | SubAbility$ SVar=DBDraw
+A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Shadow | SpellDescription$ Target creature gains shadow until end of turn. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shadow_rift.jpg
diff --git a/res/cardsfolder/s/shadowblood_egg.txt b/res/cardsfolder/s/shadowblood_egg.txt
index 98f88560bb6..e6ed748b4ba 100644
--- a/res/cardsfolder/s/shadowblood_egg.txt
+++ b/res/cardsfolder/s/shadowblood_egg.txt
@@ -2,7 +2,7 @@ Name:Shadowblood Egg
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ B R | SubAbility$ SVar=DBDraw | SpellDescription$ Add B R to your mana pool. Draw a card.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ B R | SubAbility$ DBDraw | SpellDescription$ Add B R to your mana pool. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/s/shadowfeed.txt b/res/cardsfolder/s/shadowfeed.txt
index 47959777492..58e7766267c 100644
--- a/res/cardsfolder/s/shadowfeed.txt
+++ b/res/cardsfolder/s/shadowfeed.txt
@@ -2,7 +2,7 @@ Name:Shadowfeed
 ManaCost:B
 Types:Instant
 Text:no text
-A:SP$ ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SubAbility$ SVar=DBGainLife | SpellDescription$ Exile target card from a graveyard. You gain 3 life.
+A:SP$ ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SubAbility$ DBGainLife | SpellDescription$ Exile target card from a graveyard. You gain 3 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shadowfeed.jpg
diff --git a/res/cardsfolder/s/shard_convergence.txt b/res/cardsfolder/s/shard_convergence.txt
index 83cfc27c2b6..5a70957227f 100644
--- a/res/cardsfolder/s/shard_convergence.txt
+++ b/res/cardsfolder/s/shard_convergence.txt
@@ -2,9 +2,9 @@ Name:Shard Convergence
 ManaCost:3 G
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZone | Cost$ 3 G | Origin$ Library | Destination$ Hand | ChangeType$ Plains | ChangeNum$ 1 | SubAbility$ SVar=DBIsland | SpellDescription$ Search your library for a Plains card, an Island card, a Swamp card, and a Mountain card. Reveal those cards and put them into your hand. Then shuffle your library.
-SVar:DBIsland:DB$ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Island | ChangeNum$ 1 | SubAbility$ SVar=DBSwamp
-SVar:DBSwamp:DB$ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Swamp | ChangeNum$ 1 | SubAbility$ SVar=DBMountain
+A:SP$ ChangeZone | Cost$ 3 G | Origin$ Library | Destination$ Hand | ChangeType$ Plains | ChangeNum$ 1 | SubAbility$ DBIsland | SpellDescription$ Search your library for a Plains card, an Island card, a Swamp card, and a Mountain card. Reveal those cards and put them into your hand. Then shuffle your library.
+SVar:DBIsland:DB$ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Island | ChangeNum$ 1 | SubAbility$ DBSwamp
+SVar:DBSwamp:DB$ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Swamp | ChangeNum$ 1 | SubAbility$ DBMountain
 SVar:DBMountain:DB$ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Mountain | ChangeNum$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shard_convergence.jpg
diff --git a/res/cardsfolder/s/shattered_crypt.txt b/res/cardsfolder/s/shattered_crypt.txt
index 1e4abb31f63..f566f533bc3 100644
--- a/res/cardsfolder/s/shattered_crypt.txt
+++ b/res/cardsfolder/s/shattered_crypt.txt
@@ -2,7 +2,7 @@ Name:Shattered Crypt
 ManaCost:X B B
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZone | Cost$ X B B | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ MaxTgts | SubAbility$ SVar=DBLoseLife | SpellDescription$ Return X target creature cards from your graveyard to your hand. You lose X life.
+A:SP$ ChangeZone | Cost$ X B B | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ MaxTgts | SubAbility$ DBLoseLife | SpellDescription$ Return X target creature cards from your graveyard to your hand. You lose X life.
 SVar:DBLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$Amount
 SVar:MaxTgts:Count$TypeInYourYard.Creature
diff --git a/res/cardsfolder/s/shauku_endbringer.txt b/res/cardsfolder/s/shauku_endbringer.txt
index f7944a6f182..61f330044c4 100644
--- a/res/cardsfolder/s/shauku_endbringer.txt
+++ b/res/cardsfolder/s/shauku_endbringer.txt
@@ -6,7 +6,7 @@ PT:5/5
 K:Flying
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ GT1 | Description$ CARDNAME can't attack if another creature is on the battlefield.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, you lose 3 life.
-A:AB$ ChangeZone | Cost$ T | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature | SubAbility$ SVar=DBCounter | SpellDescription$ Exile target creature and put a +1/+1 counter on CARDNAME.
+A:AB$ ChangeZone | Cost$ T | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature | SubAbility$ DBCounter | SpellDescription$ Exile target creature and put a +1/+1 counter on CARDNAME.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 3
 SVar:DBCounter:DB$PutCounter | CounterType$ P1P1 | CounterNum$ 1 | Defined$ Self
 SVar:X:Count$Valid Creature
diff --git a/res/cardsfolder/s/shivan_reef.txt b/res/cardsfolder/s/shivan_reef.txt
index 93aee01f2fe..bca9c674b3d 100644
--- a/res/cardsfolder/s/shivan_reef.txt
+++ b/res/cardsfolder/s/shivan_reef.txt
@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ SVar=DBPain | SpellDescription$ Add U to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ SVar=DBPain | SpellDescription$ Add R to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add U to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add R to your mana pool. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shivan_reef.jpg
diff --git a/res/cardsfolder/s/shower_of_sparks.txt b/res/cardsfolder/s/shower_of_sparks.txt
index 501469e44af..6fe58c1fcb7 100644
--- a/res/cardsfolder/s/shower_of_sparks.txt
+++ b/res/cardsfolder/s/shower_of_sparks.txt
@@ -2,7 +2,7 @@ Name:Shower of Sparks
 ManaCost:R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SubAbility$ SVar=DBDamage | SpellDescription$ CARDNAME deals 1 damage to target creature
+A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 1 damage to target creature
 SVar:DBDamage:DB$DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 | SpellDescription$ and 1 damage to target player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shower_of_sparks.jpg
diff --git a/res/cardsfolder/s/sift.txt b/res/cardsfolder/s/sift.txt
index 502e162cfe3..50b1e05a511 100644
--- a/res/cardsfolder/s/sift.txt
+++ b/res/cardsfolder/s/sift.txt
@@ -2,7 +2,7 @@ Name:Sift
 ManaCost:3 U
 Types:Sorcery
 Text:no text
-A:SP$ Draw | Cost$ 3 U | NumCards$ 3 | SpellDescription$ Draw three cards, then discard a card. | SubAbility$ SVar=DBDiscard
+A:SP$ Draw | Cost$ 3 U | NumCards$ 3 | SpellDescription$ Draw three cards, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sift.jpg
diff --git a/res/cardsfolder/s/sigil_blessing.txt b/res/cardsfolder/s/sigil_blessing.txt
index 68aa13748ca..657488aedf7 100644
--- a/res/cardsfolder/s/sigil_blessing.txt
+++ b/res/cardsfolder/s/sigil_blessing.txt
@@ -2,7 +2,7 @@ Name:Sigil Blessing
 ManaCost:W G
 Types:Instant
 Text:no text
-A:SP$ Pump | Cost$ W G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +2 | NumDef$ +2 | SubAbility$ SVar=DBPumpAll | SpellDescription$ Until end of turn, target creature you control gets +3/+3 and other creatures you control get +1/+1.
+A:SP$ Pump | Cost$ W G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBPumpAll | SpellDescription$ Until end of turn, target creature you control gets +3/+3 and other creatures you control get +1/+1.
 SVar:DBPumpAll:DB$PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sigil_blessing.jpg
diff --git a/res/cardsfolder/s/sign_in_blood.txt b/res/cardsfolder/s/sign_in_blood.txt
index c7c73ddf71c..c5a973e82e3 100644
--- a/res/cardsfolder/s/sign_in_blood.txt
+++ b/res/cardsfolder/s/sign_in_blood.txt
@@ -2,7 +2,7 @@ Name:Sign in Blood
 ManaCost:B B
 Types:Sorcery
 Text:no text
-A:SP$ Draw | Cost$ B B | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SubAbility$ SVar=DBLoseLife | SpellDescription$ Target player draws two cards and loses 2 life.
+A:SP$ Draw | Cost$ B B | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SubAbility$ DBLoseLife | SpellDescription$ Target player draws two cards and loses 2 life.
 SVar:DBLoseLife:DB$LoseLife | LifeAmount$ 2 | Defined$ Targeted
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sign_in_blood.jpg
diff --git a/res/cardsfolder/s/skirk_volcanist.txt b/res/cardsfolder/s/skirk_volcanist.txt
index df69aa59fac..e2d4b0ccae4 100644
--- a/res/cardsfolder/s/skirk_volcanist.txt
+++ b/res/cardsfolder/s/skirk_volcanist.txt
@@ -5,8 +5,8 @@ Text:no text
 PT:3/1
 K:Morph:Sac<2/Mountain>
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME is turned face up, it deals 3 damage divided as you choose among one, two, or three target creatures.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature (1) | NumDmg$ 1 | SubAbility$ SVar=DBDamage2
-SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ target creature (2) | NumDmg$ 1 | SubAbility$ SVar=DBDamage3
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature (1) | NumDmg$ 1 | SubAbility$ DBDamage2
+SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ target creature (2) | NumDmg$ 1 | SubAbility$ DBDamage3
 SVar:DBDamage3:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ target creature (3) | NumDmg$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/sky_eel_school.txt b/res/cardsfolder/s/sky_eel_school.txt
index 0b058d4cee1..47e445dad0a 100644
--- a/res/cardsfolder/s/sky_eel_school.txt
+++ b/res/cardsfolder/s/sky_eel_school.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:3/3
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoot | TriggerDescription$ When CARDNAME enters the battlefield, draw a card, then discard a card.
-SVar:TrigLoot:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ SVar=DBDiscard
+SVar:TrigLoot:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:Rarity:Common
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/skycloud_egg.txt b/res/cardsfolder/s/skycloud_egg.txt
index c07e84d1936..77e3a936bae 100644
--- a/res/cardsfolder/s/skycloud_egg.txt
+++ b/res/cardsfolder/s/skycloud_egg.txt
@@ -2,7 +2,7 @@ Name:Skycloud Egg
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ W U | SubAbility$ SVar=DBDraw | SpellDescription$ Add W U to your mana pool. Draw a card.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ W U | SubAbility$ DBDraw | SpellDescription$ Add W U to your mana pool. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/s/skyshroud_forest.txt b/res/cardsfolder/s/skyshroud_forest.txt
index 354f7c8021e..038e89d0d09 100644
--- a/res/cardsfolder/s/skyshroud_forest.txt
+++ b/res/cardsfolder/s/skyshroud_forest.txt
@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ SVar=DBPain | SpellDescription$ Add U to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ SVar=DBPain | SpellDescription$ Add G to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add U to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add G to your mana pool. CARDNAME deals 1 damage to you.
 K:CARDNAME enters the battlefield tapped.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/s/slaughter.txt b/res/cardsfolder/s/slaughter.txt
index 2d7351b35b5..e5f60330fa5 100644
--- a/res/cardsfolder/s/slaughter.txt
+++ b/res/cardsfolder/s/slaughter.txt
@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Instant
 Text:no text
 A:SP$ Destroy | Cost$ 2 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SpellDescription$ Destroy target nonartifact, nonblack creature. It can't be regenerated.
-A:SP$ Destroy | Cost$ 2 B B PayLife<4> | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SubAbility$ SVar=DBBuyback | SpellDescription$ Buyback - Pay 4 life.
+A:SP$ Destroy | Cost$ 2 B B PayLife<4> | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SubAbility$ DBBuyback | SpellDescription$ Buyback - Pay 4 life.
 SVar:DBBuyback:DB$ ChangeZone | Cost$ 0 | Origin$ Stack | Destination$ Hand | ValidCard$ Card.Self
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/slaughter_pact.txt b/res/cardsfolder/s/slaughter_pact.txt
index 34c8c7a0243..591224d9ea0 100644
--- a/res/cardsfolder/s/slaughter_pact.txt
+++ b/res/cardsfolder/s/slaughter_pact.txt
@@ -3,7 +3,7 @@ ManaCost:0
 Types:Instant
 Text:no text
 K:CARDNAME is black.
-A:SP$ Destroy | Cost$ 0 | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | SubAbility$ SVar=DBDelTrig | SpellDescription$ Destroy target nonblack creature. At the beginning of your next upkeep, pay 2 B. If you don't, you lose the game.
+A:SP$ Destroy | Cost$ 0 | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | SubAbility$ DBDelTrig | SpellDescription$ Destroy target nonblack creature. At the beginning of your next upkeep, pay 2 B. If you don't, you lose the game.
 SVar:DBDelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLoseGame | TriggerDescription$ At the beginning of your next upkeep, pay 2 B. If you don't, you lose the game.
 SVar:TrigLoseGame:SP$LosesGame | Cost$ 0 | UnlessCost$ 2 B | UnlessPayer$ You | Defined$ You
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/slay.txt b/res/cardsfolder/s/slay.txt
index 215463f7266..af201e37b56 100644
--- a/res/cardsfolder/s/slay.txt
+++ b/res/cardsfolder/s/slay.txt
@@ -2,7 +2,7 @@ Name:Slay
 ManaCost:2 B
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ 2 B | ValidTgts$ Creature.Green | TgtPrompt$ Select target green creature | NoRegen$ True | SpellDescription$ Destroy target green creature. It can't be regenerated. | SubAbility$ SVar=DBDraw
+A:SP$ Destroy | Cost$ 2 B | ValidTgts$ Creature.Green | TgtPrompt$ Select target green creature | NoRegen$ True | SpellDescription$ Destroy target green creature. It can't be regenerated. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/sleep.txt b/res/cardsfolder/s/sleep.txt
index e2cc2b71997..242cbdedfba 100644
--- a/res/cardsfolder/s/sleep.txt
+++ b/res/cardsfolder/s/sleep.txt
@@ -2,7 +2,7 @@ Name:Sleep
 ManaCost:2 U U
 Types:Sorcery
 Text:no text
-A:SP$ TapAll | Cost$ 2 U U | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Creature | SubAbility$ SVar=DBPumpAll | SpellDescription$ Tap all creatures target player controls. Those creatures don't untap during that player's next untap step.
+A:SP$ TapAll | Cost$ 2 U U | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Creature | SubAbility$ DBPumpAll | SpellDescription$ Tap all creatures target player controls. Those creatures don't untap during that player's next untap step.
 SVar:DBPumpAll:DB$PumpAll | Defined$ Targeted | ValidCards$ Creature | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sleep.jpg
diff --git a/res/cardsfolder/s/slice_in_twain.txt b/res/cardsfolder/s/slice_in_twain.txt
index 972884cc327..14667dcbf69 100644
--- a/res/cardsfolder/s/slice_in_twain.txt
+++ b/res/cardsfolder/s/slice_in_twain.txt
@@ -2,7 +2,7 @@ Name:Slice in Twain
 ManaCost:2 G G
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ 2 G G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment. | SubAbility$ SVar=DBDraw
+A:SP$ Destroy | Cost$ 2 G G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slice_in_twain.jpg
diff --git a/res/cardsfolder/s/sludge_strider.txt b/res/cardsfolder/s/sludge_strider.txt
index fc40262086d..18135719f3f 100644
--- a/res/cardsfolder/s/sludge_strider.txt
+++ b/res/cardsfolder/s/sludge_strider.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigLoseLife | TriggerDescription$ Whenever another artifact enters the battlefield under your control or another artifact you control leaves the battlefield, you may pay 1. If you do, target player loses 1 life and you gain 1 life.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Secondary$ True | Execute$ TrigLoseLife | TriggerDescription$ Whenever another artifact enters the battlefield under your control or another artifact you control leaves the battlefield, you may pay 1. If you do, target player loses 1 life and you gain 1 life.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 1 | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 1 | SubAbility$ SVar=DBGainLife
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 1 | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | Cost$ 0 | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sludge_strider.jpg
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/smallpox.txt b/res/cardsfolder/s/smallpox.txt
index b821437492f..9a6b900c0f5 100644
--- a/res/cardsfolder/s/smallpox.txt
+++ b/res/cardsfolder/s/smallpox.txt
@@ -1,9 +1,9 @@
 Name:Smallpox
 ManaCost:B B
 Types:Sorcery
-A:SP$ LoseLife | Cost$ B B | Defined$ Each | LifeAmount$ 1 | SpellDescription$ Each player loses 1 life, discards a card, sacrifices a creature, then sacrifices a land. | SubAbility$ SVar=DBDiscard
-SVar:DBDiscard:DB$Discard | NumCards$ 1 | Mode$ TgtChoose | Defined$ Each | SubAbility$ SVar=DBSacCreature
-SVar:DBSacCreature:DB$Sacrifice | SacValid$ Creature | Defined$ Each | SubAbility$ SVar=DBSacLand
+A:SP$ LoseLife | Cost$ B B | Defined$ Each | LifeAmount$ 1 | SpellDescription$ Each player loses 1 life, discards a card, sacrifices a creature, then sacrifices a land. | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$Discard | NumCards$ 1 | Mode$ TgtChoose | Defined$ Each | SubAbility$ DBSacCreature
+SVar:DBSacCreature:DB$Sacrifice | SacValid$ Creature | Defined$ Each | SubAbility$ DBSacLand
 SVar:DBSacLand:DB$Sacrifice | SacValid$ Land | Defined$ Each
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/smash.txt b/res/cardsfolder/s/smash.txt
index 778ebf8afb7..98d9c2317c6 100644
--- a/res/cardsfolder/s/smash.txt
+++ b/res/cardsfolder/s/smash.txt
@@ -2,7 +2,7 @@ Name:Smash
 ManaCost:2 R
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ 2 R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact. | SubAbility$ SVar=DBDraw
+A:SP$ Destroy | Cost$ 2 R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/smash.jpg
diff --git a/res/cardsfolder/s/smash_to_smithereens.txt b/res/cardsfolder/s/smash_to_smithereens.txt
index 7e8b95c99a3..015c9e92c2d 100644
--- a/res/cardsfolder/s/smash_to_smithereens.txt
+++ b/res/cardsfolder/s/smash_to_smithereens.txt
@@ -2,7 +2,7 @@ Name:Smash to Smithereens
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ 1 R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ SVar=DBDealDamage | SpellDescription$ Destroy target artifact. CARDNAME deals 3 damage to that artifact's controller.
+A:SP$ Destroy | Cost$ 1 R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBDealDamage | SpellDescription$ Destroy target artifact. CARDNAME deals 3 damage to that artifact's controller.
 SVar:DBDealDamage:DB$DealDamage | Defined$ TargetedController | NumDmg$ 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/smash_to_smithereens.jpg
diff --git a/res/cardsfolder/s/snap.txt b/res/cardsfolder/s/snap.txt
index 57a9a5d8c6d..fd1fcd277b9 100644
--- a/res/cardsfolder/s/snap.txt
+++ b/res/cardsfolder/s/snap.txt
@@ -2,7 +2,7 @@ Name:Snap
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. Untap up to two lands. | SubAbility$ SVar=DBUntap
+A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. Untap up to two lands. | SubAbility$ DBUntap
 SVar:DBUntap:DB$ Untap | UntapUpTo$ True | UntapType$ Land | Amount$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snap.jpg
diff --git a/res/cardsfolder/s/snow_hound.txt b/res/cardsfolder/s/snow_hound.txt
index 81301799121..1982c45a322 100644
--- a/res/cardsfolder/s/snow_hound.txt
+++ b/res/cardsfolder/s/snow_hound.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Hound
 Text:no text
 PT:1/1
-A:AB$ ChangeZone | Cost$ 1 T | ValidTgts$ Creature.Blue+YouCtrl,Creature.Green+YouCtrl | TgtPrompt$ Select target blue or green creature you control | Origin$ Battlefield | Destination$ Hand | SubAbility$ SVar=Return | SpellDescription$ Return CARDNAME and target green or blue creature you control to their owner's hand.
+A:AB$ ChangeZone | Cost$ 1 T | ValidTgts$ Creature.Blue+YouCtrl,Creature.Green+YouCtrl | TgtPrompt$ Select target blue or green creature you control | Origin$ Battlefield | Destination$ Hand | SubAbility$ Return | SpellDescription$ Return CARDNAME and target green or blue creature you control to their owner's hand.
 SVar:Return:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/soldevi_heretic.txt b/res/cardsfolder/s/soldevi_heretic.txt
index a800cc8a4c2..834c8a6679e 100644
--- a/res/cardsfolder/s/soldevi_heretic.txt
+++ b/res/cardsfolder/s/soldevi_heretic.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Cleric
 Text:no text
 PT:2/2
-A:AB$ PreventDamage | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ 2 | SubAbility$ SVar=DBDraw | SpellDescription$ Prevent the next 2 damage that would be dealt to target creature this turn. Target opponent may draw a card.
+A:AB$ PreventDamage | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ 2 | SubAbility$ DBDraw | SpellDescription$ Prevent the next 2 damage that would be dealt to target creature this turn. Target opponent may draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | OptionalDecider$ Opponent
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soldevi_heretic.jpg
diff --git a/res/cardsfolder/s/solemn_offering.txt b/res/cardsfolder/s/solemn_offering.txt
index db14fdfc560..03598f2b500 100644
--- a/res/cardsfolder/s/solemn_offering.txt
+++ b/res/cardsfolder/s/solemn_offering.txt
@@ -2,7 +2,7 @@ Name:Solemn Offering
 ManaCost:2 W
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 2 W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SubAbility$ SVar=DBGainLife | SpellDescription$ Destroy target artifact or enchantment. You gain 4 life.
+A:SP$ Destroy | Cost$ 2 W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SubAbility$ DBGainLife | SpellDescription$ Destroy target artifact or enchantment. You gain 4 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/solemn_offering.jpg
diff --git a/res/cardsfolder/s/soratami_cloudskater.txt b/res/cardsfolder/s/soratami_cloudskater.txt
index 8705cf801a1..98a3e7bba17 100644
--- a/res/cardsfolder/s/soratami_cloudskater.txt
+++ b/res/cardsfolder/s/soratami_cloudskater.txt
@@ -4,7 +4,7 @@ Types:Creature Moonfolk Rogue
 Text:no text
 PT:1/1
 K:Flying
-A:AB$ Draw | Cost$ 2 Return<1/Land> | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ SVar=DBDiscard
+A:AB$ Draw | Cost$ 2 Return<1/Land> | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/sorcerers_strongbox.txt b/res/cardsfolder/s/sorcerers_strongbox.txt
index 6d094bf385c..75fa977a974 100644
--- a/res/cardsfolder/s/sorcerers_strongbox.txt
+++ b/res/cardsfolder/s/sorcerers_strongbox.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact
 Text:no text
 A:AB$ FlipACoin | Cost$ 2 T | WinSubAbility$ DBSac | SpellDescription$ Flip a coin. If you win the flip, sacrifice CARDNAME and draw three cards.
-SVar:DBSac:DB$Sacrifice | Defined$ Self | SubAbility$ SVar=DBDraw
+SVar:DBSac:DB$Sacrifice | Defined$ Self | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 3
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sorcerers_strongbox.jpg
diff --git a/res/cardsfolder/s/sorcerous_sight.txt b/res/cardsfolder/s/sorcerous_sight.txt
index ce4d00314b2..9fec0d4d3c0 100644
--- a/res/cardsfolder/s/sorcerous_sight.txt
+++ b/res/cardsfolder/s/sorcerous_sight.txt
@@ -2,7 +2,7 @@ Name:Sorcerous Sight
 ManaCost:U
 Types:Sorcery
 Text:no text
-A:SP$ RevealHand | Cost$ U | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ SVar=DBDraw | SpellDescription$ Look at target opponent's hand.
+A:SP$ RevealHand | Cost$ U | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBDraw | SpellDescription$ Look at target opponent's hand.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/sorins_thirst.txt b/res/cardsfolder/s/sorins_thirst.txt
index af2ff85d429..fef229edd3d 100644
--- a/res/cardsfolder/s/sorins_thirst.txt
+++ b/res/cardsfolder/s/sorins_thirst.txt
@@ -2,7 +2,7 @@ Name:Sorin's Thirst
 ManaCost:B B
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ B B | ValidTgts$ Creature | TgtPrompt$ Select a creature | NumDmg$ 2 | SubAbility$ SVar=DBGainLife | SpellDescription$ CARDNAME deals 2 damage to target creature and you gain 2 life.
+A:SP$ DealDamage | Cost$ B B | ValidTgts$ Creature | TgtPrompt$ Select a creature | NumDmg$ 2 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 2 damage to target creature and you gain 2 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sorins_thirst.jpg
diff --git a/res/cardsfolder/s/soul_exchange.txt b/res/cardsfolder/s/soul_exchange.txt
index 7132adfc40c..e226798a50c 100644
--- a/res/cardsfolder/s/soul_exchange.txt
+++ b/res/cardsfolder/s/soul_exchange.txt
@@ -2,7 +2,7 @@ Name:Soul Exchange
 ManaCost:B B
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZone | Cost$ B B Exile<1/Creature> | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SubAbility$ SVar=DBPutCounter | SpellDescription$ Return target creature card from your graveyard to the battlefield. Put a +2/+2 counter on that creature if the exiled creature was a Thrull.
+A:SP$ ChangeZone | Cost$ B B Exile<1/Creature> | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SubAbility$ DBPutCounter | SpellDescription$ Return target creature card from your graveyard to the battlefield. Put a +2/+2 counter on that creature if the exiled creature was a Thrull.
 SVar:DBPutCounter:DB$PutCounter | CounterNum$ X | CounterType$ P2P2 | Defined$ Targeted
 SVar:X:Exiled$Valid Thrull
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/s/soul_feast.txt b/res/cardsfolder/s/soul_feast.txt
index 4b63e6863be..45a503eebb3 100644
--- a/res/cardsfolder/s/soul_feast.txt
+++ b/res/cardsfolder/s/soul_feast.txt
@@ -2,7 +2,7 @@ Name:Soul Feast
 ManaCost:3 B B
 Types:Sorcery
 Text:no text
-A:SP$ LoseLife | Cost$ 3 B B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 4 | SubAbility$ SVar=DBGainLife | SpellDescription$ Target player loses 4 life and you gain 4 life.
+A:SP$ LoseLife | Cost$ 3 B B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 4 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 4 life and you gain 4 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 4
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_feast.jpg
diff --git a/res/cardsfolder/s/soul_manipulation.txt b/res/cardsfolder/s/soul_manipulation.txt
index 05c951486b2..0e0c130c921 100644
--- a/res/cardsfolder/s/soul_manipulation.txt
+++ b/res/cardsfolder/s/soul_manipulation.txt
@@ -4,7 +4,7 @@ Types:Instant
 Text:no text
 A:SP$ Counter | Cost$ 1 U B | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SpellDescription$ Choose one - counter target creature spell;
 A:SP$ ChangeZone | Cost$ 1 U B | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ or return target creature card from your graveyard to your hand;
-A:SP$ Counter | Cost$ 1 U B | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SubAbility$ SVar=DBChangeZone | SpellDescription$ or counter target creature spell and return target creature card from your graveyard to your hand.
+A:SP$ Counter | Cost$ 1 U B | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SubAbility$ DBChangeZone | SpellDescription$ or counter target creature spell and return target creature card from your graveyard to your hand.
 SVar:DBChangeZone:DB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/soul_rend.txt b/res/cardsfolder/s/soul_rend.txt
index 683ea6e2b3d..82266581089 100644
--- a/res/cardsfolder/s/soul_rend.txt
+++ b/res/cardsfolder/s/soul_rend.txt
@@ -2,7 +2,7 @@ Name:Soul Rend
 ManaCost:1 B
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ 1 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | ConditionDefined$ Targeted | ConditionPresent$ Creature.White | ConditionCompare$ EQ1 | NoRegen$ True | SubAbility$ SVar=DBDraw | SpellDescription$ Destroy target creature if it's white. A creature destroyed this way can't be regenerated.
+A:SP$ Destroy | Cost$ 1 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | ConditionDefined$ Targeted | ConditionPresent$ Creature.White | ConditionCompare$ EQ1 | NoRegen$ True | SubAbility$ DBDraw | SpellDescription$ Destroy target creature if it's white. A creature destroyed this way can't be regenerated.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/soul_shred.txt b/res/cardsfolder/s/soul_shred.txt
index be17026c420..ccfa993b8f7 100644
--- a/res/cardsfolder/s/soul_shred.txt
+++ b/res/cardsfolder/s/soul_shred.txt
@@ -2,7 +2,7 @@ Name:Soul Shred
 ManaCost:3 B B
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 3 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NumDmg$ 3 | SubAbility$ SVar=DBGainLife | SpellDescription$ CARDNAME deals 3 damage to target nonblack creature. You gain 3 life.
+A:SP$ DealDamage | Cost$ 3 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NumDmg$ 3 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 3 damage to target nonblack creature. You gain 3 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
 SVar:Rarity:Common
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal/soul_shred.jpg
diff --git a/res/cardsfolder/s/soul_spike.txt b/res/cardsfolder/s/soul_spike.txt
index 9eb89fc29a4..2b58ce58cc3 100644
--- a/res/cardsfolder/s/soul_spike.txt
+++ b/res/cardsfolder/s/soul_spike.txt
@@ -2,8 +2,8 @@ Name:Soul Spike
 ManaCost:5 B B
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 5 B B | Tgt$ TgtCP | NumDmg$ 4 | SubAbility$ SVar=DBGainLife | SpellDescription$ CARDNAME deals 4 damage to target creature or player and you gain 4 life.
-A:SP$ DealDamage | Cost$ ExileFromHand<2/Card.Black> | Tgt$ TgtCP | NumDmg$ 4 | SubAbility$ SVar=DBGainLife | CostDesc$ You may exile two black cards from your hand | SpellDescription$ rather than pay CARDNAME's mana cost.
+A:SP$ DealDamage | Cost$ 5 B B | Tgt$ TgtCP | NumDmg$ 4 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 4 damage to target creature or player and you gain 4 life.
+A:SP$ DealDamage | Cost$ ExileFromHand<2/Card.Black> | Tgt$ TgtCP | NumDmg$ 4 | SubAbility$ DBGainLife | CostDesc$ You may exile two black cards from your hand | SpellDescription$ rather than pay CARDNAME's mana cost.
 SVar:DBGainLife:DB$GainLife | Cost$ 0 | LifeAmount$ 4
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_spike.jpg
diff --git a/res/cardsfolder/s/soulquake.txt b/res/cardsfolder/s/soulquake.txt
index 6197e6c8770..c60deee7551 100644
--- a/res/cardsfolder/s/soulquake.txt
+++ b/res/cardsfolder/s/soulquake.txt
@@ -2,7 +2,7 @@ Name:Soulquake
 ManaCost:3 U U B B
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZoneAll | Cost$ 3 U U B B | ChangeType$ Creature | Origin$ Battlefield | Destination$ Hand | SubAbility$ SVar=DBChangeZoneAll | SpellDescription$ Return all creatures on the battlefield and all creature cards in graveyards to their owners' hands.
+A:SP$ ChangeZoneAll | Cost$ 3 U U B B | ChangeType$ Creature | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBChangeZoneAll | SpellDescription$ Return all creatures on the battlefield and all creature cards in graveyards to their owners' hands.
 SVar:DBChangeZoneAll:DB$ChangeZoneAll | ChangeType$ Creature | Origin$ Graveyard | Destination$ Hand
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/s/souls_of_the_faultless.txt b/res/cardsfolder/s/souls_of_the_faultless.txt
index d64178190b0..38bd649eea4 100644
--- a/res/cardsfolder/s/souls_of_the_faultless.txt
+++ b/res/cardsfolder/s/souls_of_the_faultless.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:0/4
 K:Defender
 T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigGain | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME is dealt combat damage, you gain that much life and attacking player loses that much life.
-SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | SubAbility$ SVar=DBDrain
+SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | SubAbility$ DBDrain
 SVar:DBDrain:DB$LoseLife | Defined$ Opponent | LifeAmount$ X
 SVar:X:TriggerCount$DamageAmount
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/sparksmith.txt b/res/cardsfolder/s/sparksmith.txt
index e261f4dcf71..be813877c49 100644
--- a/res/cardsfolder/s/sparksmith.txt
+++ b/res/cardsfolder/s/sparksmith.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Goblin
 Text:no text
 PT:1/1
-A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ SVar=DBDealDamage | SpellDescription$ CARDNAME deals X damage to target creature and X damage to you, where X is the number of Goblins on the battlefield.
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals X damage to target creature and X damage to you, where X is the number of Goblins on the battlefield.
 SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ X
 SVar:X:Count$TypeOnBattlefield.Goblin
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/s/spawning_breath.txt b/res/cardsfolder/s/spawning_breath.txt
index 2083edc1716..c7d40ea3854 100644
--- a/res/cardsfolder/s/spawning_breath.txt
+++ b/res/cardsfolder/s/spawning_breath.txt
@@ -2,7 +2,7 @@ Name:Spawning Breath
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 1 R | Tgt$ TgtCP | NumDmg$ 1 | SubAbility$ SVar=DBToken | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Put a 0/1 colorless Eldrazi Spawn creature token onto the battlefield. It has "Sacrifice this creature: Add  to your mana pool."
+A:SP$ DealDamage | Cost$ 1 R | Tgt$ TgtCP | NumDmg$ 1 | SubAbility$ DBToken | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Put a 0/1 colorless Eldrazi Spawn creature token onto the battlefield. It has "Sacrifice this creature: Add  to your mana pool."
 SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana
 SVar:ABMana:AB$Mana | Cost$ Sac<1/CARDNAME> | Produced$ 1 | Amount$ 1 | SpellDescription$ Add 1 to your mana pool.
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/spell_contortion.txt b/res/cardsfolder/s/spell_contortion.txt
index b6b84ca1282..84732bf107e 100644
--- a/res/cardsfolder/s/spell_contortion.txt
+++ b/res/cardsfolder/s/spell_contortion.txt
@@ -2,7 +2,7 @@ Name:Spell Contortion
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 2 | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target spell unless its controller pays 2. Draw a card for each time CARDNAME was kicked.
+A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 2 | SubAbility$ DBDraw | SpellDescription$ Counter target spell unless its controller pays 2. Draw a card for each time CARDNAME was kicked.
 K:Multikicker 1 U
 SVar:DBDraw:DB$Draw | NumCards$ X
 SVar:X:Count$TimesKicked
diff --git a/res/cardsfolder/s/sphinx_bone_wand.txt b/res/cardsfolder/s/sphinx_bone_wand.txt
index 53eaa390e5e..0012cd94513 100644
--- a/res/cardsfolder/s/sphinx_bone_wand.txt
+++ b/res/cardsfolder/s/sphinx_bone_wand.txt
@@ -3,7 +3,7 @@ ManaCost:7
 Types:Artifact
 Text:no text
 T:Mode$ SpellCast | ValidCard$ Instant.YouCtrl,Sorcery.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever you cast an instant or sorcery spell, you may put a charge counter on CARDNAME. If you do, CARDNAME deals damage equal to the number of charge counters on it to target creature or player.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 | SubAbility$ SVar=DBDealDamage
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 | SubAbility$ DBDealDamage
 SVar:DBDealDamage:DB$DealDamage | Tgt$ TgtCP | NumDmg$ X
 SVar:X:Count$CardCounters.CHARGE
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/s/sphinx_of_lost_truths.txt b/res/cardsfolder/s/sphinx_of_lost_truths.txt
index 22e656b4fb8..a9ab9b26197 100644
--- a/res/cardsfolder/s/sphinx_of_lost_truths.txt
+++ b/res/cardsfolder/s/sphinx_of_lost_truths.txt
@@ -8,7 +8,7 @@ K:Kicker:1 U
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+notkicked | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw three cards. Then if it wasn't kicked, discard three cards.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Secondary$ True | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, draw three cards.
 SVar:TrigKicker:AB$Draw | Cost$ 0 | NumCards$ 3
-SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 3 | SubAbility$ SVar=DBDiscard
+SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 3 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 3
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sphinx_of_lost_truths.jpg
diff --git a/res/cardsfolder/s/sphinx_of_magosi.txt b/res/cardsfolder/s/sphinx_of_magosi.txt
index 022155bbdc1..5685b5ff482 100644
--- a/res/cardsfolder/s/sphinx_of_magosi.txt
+++ b/res/cardsfolder/s/sphinx_of_magosi.txt
@@ -4,7 +4,7 @@ Types:Creature Sphinx
 Text:no text
 PT:6/6
 K:Flying
-A:AB$ Draw | Cost$ 2 U | NumCards$ 1 | Defined$ You | SubAbility$ SVar=DBPutCounter | SpellDescription$ Draw a card, then put a +1/+1 counter on CARDNAME.
+A:AB$ Draw | Cost$ 2 U | NumCards$ 1 | Defined$ You | SubAbility$ DBPutCounter | SpellDescription$ Draw a card, then put a +1/+1 counter on CARDNAME.
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sphinx_of_magosi.jpg
diff --git a/res/cardsfolder/s/sphinx_sovereign.txt b/res/cardsfolder/s/sphinx_sovereign.txt
index caa33be1678..6e74483cf6c 100644
--- a/res/cardsfolder/s/sphinx_sovereign.txt
+++ b/res/cardsfolder/s/sphinx_sovereign.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:6/6
 K:Flying
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your end step, you gain 3 life if CARDNAME is untapped. Otherwise, each opponent loses 3 life.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 3 | ConditionPresent$ Card.Self+tapped | SubAbility$ SVar=DBGainLife | ConditionCompare$ EQ1
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 3 | ConditionPresent$ Card.Self+tapped | SubAbility$ DBGainLife | ConditionCompare$ EQ1
 SVar:DBGainLife:DB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 3 | ConditionPresent$ Card.Self+untapped | ConditionCompare$ EQ1
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sphinx_sovereign.jpg
diff --git a/res/cardsfolder/s/spike_tiller.txt b/res/cardsfolder/s/spike_tiller.txt
index f14c11fc8d8..b8855282109 100644
--- a/res/cardsfolder/s/spike_tiller.txt
+++ b/res/cardsfolder/s/spike_tiller.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:0/0
 K:etbCounter:P1P1:3
 A:AB$ PutCounter | Cost$ 2 SubCounter<1/P1P1> | Tgt$ TgtC | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
-A:AB$ Animate | Cost$ 2 SubCounter<1/P1P1> | ValidTgts$ Land | TgtPrompt$ Choose target land. | Power$ 2 | Toughness$ 2 | Types$ Creature | Permanent$ True | SubAbility$ SVar=DBPutCounter | SpellDescription$ Target land becomes a 2/2 creature that's still a land. Put a +1/+1 counter on it.
+A:AB$ Animate | Cost$ 2 SubCounter<1/P1P1> | ValidTgts$ Land | TgtPrompt$ Choose target land. | Power$ 2 | Toughness$ 2 | Types$ Creature | Permanent$ True | SubAbility$ DBPutCounter | SpellDescription$ Target land becomes a 2/2 creature that's still a land. Put a +1/+1 counter on it.
 SVar:DBPutCounter:DB$PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spike_tiller.jpg
diff --git a/res/cardsfolder/s/spin_into_myth.txt b/res/cardsfolder/s/spin_into_myth.txt
index 798e217e876..78b209a1e7e 100644
--- a/res/cardsfolder/s/spin_into_myth.txt
+++ b/res/cardsfolder/s/spin_into_myth.txt
@@ -2,7 +2,7 @@ Name:Spin into Myth
 ManaCost:4 U
 Types:Instant
 Text:no text
-A:SP$ ChangeZone | Cost$ 4 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SubAbility$ SVar=DBDig | SpellDescription$ Put target creature on top of its owner's library, then fateseal 2. (To fateseal 2, look at the top two cards of an opponent's library, then put any number of them on the bottom of that player's library and the rest on top in any order.)
+A:SP$ ChangeZone | Cost$ 4 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SubAbility$ DBDig | SpellDescription$ Put target creature on top of its owner's library, then fateseal 2. (To fateseal 2, look at the top two cards of an opponent's library, then put any number of them on the bottom of that player's library and the rest on top in any order.)
 SVar:DBDig:DB$Dig | Defined$ Opponent | DigNum$ 2 | AnyNumber$ True | DestinationZone$ Library | LibraryPosition$ -1 | LibraryPosition2$ 0
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spin_into_myth.jpg
diff --git a/res/cardsfolder/s/spore_cloud.txt b/res/cardsfolder/s/spore_cloud.txt
index fe0b38d4461..4b3e0a14eef 100644
--- a/res/cardsfolder/s/spore_cloud.txt
+++ b/res/cardsfolder/s/spore_cloud.txt
@@ -2,8 +2,8 @@ Name:Spore Cloud
 ManaCost:1 G G
 Types:Instant
 Text:no text
-A:SP$ TapAll | Cost$ 1 G G | ValidCards$ Creature.blocking | SubAbility$ SVar=DBFog | SpellDescription$ Tap all blocking creatures. Prevent all combat damage that would be dealt this turn. Each attacking creature and each blocking creature doesn't untap during its controller's next untap step.
-SVar:DBFog:DB$Fog | SubAbility$ SVar=DBPumpAll
+A:SP$ TapAll | Cost$ 1 G G | ValidCards$ Creature.blocking | SubAbility$ DBFog | SpellDescription$ Tap all blocking creatures. Prevent all combat damage that would be dealt this turn. Each attacking creature and each blocking creature doesn't untap during its controller's next untap step.
+SVar:DBFog:DB$Fog | SubAbility$ DBPumpAll
 SVar:DBPumpAll:DB$PumpAll | ValidCards$ Creature.attacking,Creature.blocking | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spore_cloud.jpg
diff --git a/res/cardsfolder/s/spread_the_sickness.txt b/res/cardsfolder/s/spread_the_sickness.txt
index fb22e7ea201..c26574c0940 100644
--- a/res/cardsfolder/s/spread_the_sickness.txt
+++ b/res/cardsfolder/s/spread_the_sickness.txt
@@ -2,7 +2,7 @@ Name:Spread the Sickness
 ManaCost:4 B
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 4 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ SVar=DBProliferate | SpellDescription$ Destroy target creature, then proliferate.
+A:SP$ Destroy | Cost$ 4 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBProliferate | SpellDescription$ Destroy target creature, then proliferate.
 SVar:DBProliferate:DB$Proliferate
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spread_the_sickness.jpg
diff --git a/res/cardsfolder/s/spring_cleaning.txt b/res/cardsfolder/s/spring_cleaning.txt
index 6325df95e22..6d4c9cf0c71 100644
--- a/res/cardsfolder/s/spring_cleaning.txt
+++ b/res/cardsfolder/s/spring_cleaning.txt
@@ -2,7 +2,7 @@ Name:Spring Cleaning
 ManaCost:1 G
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ 1 G | ValidTgts$ Enchantment | SubAbility$ SVar=DBClash | SpellDescription$ Destroy target enchantment. Clash with an opponent. If you win, destroy all enchantments your opponents control.
+A:SP$ Destroy | Cost$ 1 G | ValidTgts$ Enchantment | SubAbility$ DBClash | SpellDescription$ Destroy target enchantment. Clash with an opponent. If you win, destroy all enchantments your opponents control.
 SVar:DBClash:DB$Clash | WinSubAbility$ DBDestroyAll
 SVar:DBDestroyAll:DB$DestroyAll | ValidCards$ Enchantment.YouDontCtrl
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/spurnmage_advocate.txt b/res/cardsfolder/s/spurnmage_advocate.txt
index fae2c3b4980..e47515cf25a 100644
--- a/res/cardsfolder/s/spurnmage_advocate.txt
+++ b/res/cardsfolder/s/spurnmage_advocate.txt
@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Human Cleric
 Text:no text
 PT:1/1
-A:AB$ ChangeZone | Cost$ T | ValidTgts$ Card.YouDontCtrl | TargetMin$ 2 | TargetMax$ 2 | Origin$ Graveyard | Destination$ Hand | SubAbility$ SVar=DBDestroy | SpellDescription$ Return two target cards from an opponent's graveyard to his or her hand. Destroy target attacking creature.
+A:AB$ ChangeZone | Cost$ T | ValidTgts$ Card.YouDontCtrl | TargetMin$ 2 | TargetMax$ 2 | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBDestroy | SpellDescription$ Return two target cards from an opponent's graveyard to his or her hand. Destroy target attacking creature.
 SVar:DBDestroy:DB$Destroy | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spurnmage_advocate.jpg
diff --git a/res/cardsfolder/s/squelch.txt b/res/cardsfolder/s/squelch.txt
index 8d4c853a636..0f79047a8f5 100644
--- a/res/cardsfolder/s/squelch.txt
+++ b/res/cardsfolder/s/squelch.txt
@@ -2,7 +2,7 @@ Name:Squelch
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U | TgtPrompt$ Select target Activated Ability | ValidTgts$ Card | TargetType$ Activated | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target activated ability. Draw a card.
+A:SP$ Counter | Cost$ 1 U | TgtPrompt$ Select target Activated Ability | ValidTgts$ Card | TargetType$ Activated | SubAbility$ DBDraw | SpellDescription$ Counter target activated ability. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/squelch.jpg
diff --git a/res/cardsfolder/s/stabbing_pain.txt b/res/cardsfolder/s/stabbing_pain.txt
index fbfee8458a8..dd10e0c945f 100644
--- a/res/cardsfolder/s/stabbing_pain.txt
+++ b/res/cardsfolder/s/stabbing_pain.txt
@@ -2,7 +2,7 @@ Name:Stabbing Pain
 ManaCost:B
 Types:Instant
 Text:no text
-A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SubAbility$ SVar=DBTap | SpellDescription$ Target creature gets -1/-1 until end of turn. Tap that creature.
+A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SubAbility$ DBTap | SpellDescription$ Target creature gets -1/-1 until end of turn. Tap that creature.
 SVar:DBTap:DB$Tap | Defined$ Targeted
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stabbing_pain.jpg
diff --git a/res/cardsfolder/s/stand_firm.txt b/res/cardsfolder/s/stand_firm.txt
index 2c769673ecb..00d1c40ca1d 100644
--- a/res/cardsfolder/s/stand_firm.txt
+++ b/res/cardsfolder/s/stand_firm.txt
@@ -2,7 +2,7 @@ Name:Stand Firm
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | SubAbility$ SVar=DBScry | SpellDescription$ Target creature gets +1/+1 until end of turn. Scry 2 (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+A:SP$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBScry | SpellDescription$ Target creature gets +1/+1 until end of turn. Scry 2 (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 SVar:DBScry:DB$Scry | ScryNum$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stand_firm.jpg
diff --git a/res/cardsfolder/s/steady_progress.txt b/res/cardsfolder/s/steady_progress.txt
index 8abff69cdc7..99b0b01efd8 100644
--- a/res/cardsfolder/s/steady_progress.txt
+++ b/res/cardsfolder/s/steady_progress.txt
@@ -2,7 +2,7 @@ Name:Steady Progress
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ Proliferate | Cost$ 2 U | SpellDescription$ Proliferate. Draw a card. | SubAbility$ SVar=DB
+A:SP$ Proliferate | Cost$ 2 U | SpellDescription$ Proliferate. Draw a card. | SubAbility$ DB
 SVar:DB:DB$Draw | NumCards$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/steady_progress.jpg
diff --git a/res/cardsfolder/s/stern_judge.txt b/res/cardsfolder/s/stern_judge.txt
index fbde35dff10..7bc64de35e7 100644
--- a/res/cardsfolder/s/stern_judge.txt
+++ b/res/cardsfolder/s/stern_judge.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Cleric
 Text:no text
 PT:2/2
-A:AB$ LoseLife | Cost$ T | Defined$ Opponent | LifeAmount$ X | SubAbility$ SVar=DBLoseLife | SpellDescription$ Each player loses 1 life for each Swamp he or she controls.
+A:AB$ LoseLife | Cost$ T | Defined$ Opponent | LifeAmount$ X | SubAbility$ DBLoseLife | SpellDescription$ Each player loses 1 life for each Swamp he or she controls.
 SVar:DBLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ Y
 SVar:X:Count$TypeOppCtrl.Swamp
 SVar:Y:Count$TypeYouCtrl.Swamp
diff --git a/res/cardsfolder/s/stitchers_apprentice.txt b/res/cardsfolder/s/stitchers_apprentice.txt
index 93677c919ef..2ae9a3c97f8 100644
--- a/res/cardsfolder/s/stitchers_apprentice.txt
+++ b/res/cardsfolder/s/stitchers_apprentice.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Homunculus
 Text:no text
 PT:1/2
-A:AB$ Token | Cost$ 1 U T | TokenImage$ U 2 2 Homunculus | TokenAmount$ 1 | TokenName$ Homunculus | TokenTypes$ Creature,Homunculus | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 2 | TokenToughness$ 2 | SubAbility$ SVar=DBSac | SpellDescription$ Put a 2/2 blue Homunculus creature token onto the battlefield, then sacrifice a creature.
+A:AB$ Token | Cost$ 1 U T | TokenImage$ U 2 2 Homunculus | TokenAmount$ 1 | TokenName$ Homunculus | TokenTypes$ Creature,Homunculus | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 2 | TokenToughness$ 2 | SubAbility$ DBSac | SpellDescription$ Put a 2/2 blue Homunculus creature token onto the battlefield, then sacrifice a creature.
 SVar:DBSac:DB$Sacrifice | SacValid$ Creature | Defined$ You | Amount$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/stolen_grain.txt b/res/cardsfolder/s/stolen_grain.txt
index ebc753c71da..0ad3aaf3746 100644
--- a/res/cardsfolder/s/stolen_grain.txt
+++ b/res/cardsfolder/s/stolen_grain.txt
@@ -2,7 +2,7 @@ Name:Stolen Grain
 ManaCost:4 B B
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 4 B B | ValidTgts$ Opponent | NumDmg$ 5 | SubAbility$ SVar=DBGainLife | SpellDescription$ CARDNAME deals 5 damage to target opponent. You gain 5 life.
+A:SP$ DealDamage | Cost$ 4 B B | ValidTgts$ Opponent | NumDmg$ 5 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 5 damage to target opponent. You gain 5 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 5
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stolen_grain.jpg
diff --git a/res/cardsfolder/s/stomp_and_howl.txt b/res/cardsfolder/s/stomp_and_howl.txt
index 2908168cd0d..f92aed52604 100644
--- a/res/cardsfolder/s/stomp_and_howl.txt
+++ b/res/cardsfolder/s/stomp_and_howl.txt
@@ -2,7 +2,7 @@ Name:Stomp and Howl
 ManaCost:2 G
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact and target enchantment. | SubAbility$ SVar=DestroyEnch
+A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact and target enchantment. | SubAbility$ DestroyEnch
 SVar:DestroyEnch:DB$ Destroy | Cost$ 0 | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stomp_and_howl.jpg
diff --git a/res/cardsfolder/s/stormcloud_djinn.txt b/res/cardsfolder/s/stormcloud_djinn.txt
index de3e977f154..3c21742ed1c 100644
--- a/res/cardsfolder/s/stormcloud_djinn.txt
+++ b/res/cardsfolder/s/stormcloud_djinn.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:3/3
 K:Flying
 K:CARDNAME can block only creatures with flying.
-A:AB$ Pump | Cost$ R R | NumAtt$ +2 | SubAbility$ SVar=DBDealDamage | SpellDescription$ CARDNAME gets +2/+0 until end of turn and deals 1 damage to you.
+A:AB$ Pump | Cost$ R R | NumAtt$ +2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME gets +2/+0 until end of turn and deals 1 damage to you.
 SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stormcloud_djinn.jpg
diff --git a/res/cardsfolder/s/stream_of_unconsciousness.txt b/res/cardsfolder/s/stream_of_unconsciousness.txt
index d6e1e4f8a6e..27a5cd97d4b 100644
--- a/res/cardsfolder/s/stream_of_unconsciousness.txt
+++ b/res/cardsfolder/s/stream_of_unconsciousness.txt
@@ -2,7 +2,7 @@ Name:Stream of Unconsciousness
 ManaCost:U
 Types:Tribal Instant Wizard
 Text:no text
-A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | IsCurse$ True | SubAbility$ SVar=DBDraw | SpellDescription$ Target creature gets -4/-0 until end of turn. If you control a Wizard, draw a card.
+A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | IsCurse$ True | SubAbility$ DBDraw | SpellDescription$ Target creature gets -4/-0 until end of turn. If you control a Wizard, draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | ConditionPresent$ Wizard.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Wizard,
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/strength_of_night.txt b/res/cardsfolder/s/strength_of_night.txt
index e923fb6a3f2..14ce8fc36d7 100644
--- a/res/cardsfolder/s/strength_of_night.txt
+++ b/res/cardsfolder/s/strength_of_night.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Instant
 Text:no text
 A:SP$ PumpAll | Cost$ 2 G | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Creatures you control get +1/+1 until end of turn. If CARDNAME was kicked, Zombie creatures you control get an additional +2/+2 until end of turn.
-A:SP$ PumpAll | Cost$ 2 G B | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SubAbility$ SVar=DBPumpYourZombies | SpellDescription$ Kicker B (You may pay an additional B as you cast this spell.)
+A:SP$ PumpAll | Cost$ 2 G B | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBPumpYourZombies | SpellDescription$ Kicker B (You may pay an additional B as you cast this spell.)
 SVar:DBPumpYourZombies:DB$ PumpAll | ValidCards$ Creature.Zombie+YouCtrl | NumAtt$+2 | NumDef$ +2
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/stronghold_discipline.txt b/res/cardsfolder/s/stronghold_discipline.txt
index 8f1f5332c0b..09b1db16434 100644
--- a/res/cardsfolder/s/stronghold_discipline.txt
+++ b/res/cardsfolder/s/stronghold_discipline.txt
@@ -2,7 +2,7 @@ Name:Stronghold Discipline
 ManaCost:2 B B
 Types:Sorcery
 Text:no text
-A:SP$ LoseLife | Cost$ 2 B B | Defined$ Opponent | LifeAmount$ X | SubAbility$ SVar=DBLoseLife | SpellDescription$ Each player loses 1 life for each creature he or she controls.
+A:SP$ LoseLife | Cost$ 2 B B | Defined$ Opponent | LifeAmount$ X | SubAbility$ DBLoseLife | SpellDescription$ Each player loses 1 life for each creature he or she controls.
 SVar:DBLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ Y
 SVar:X:Count$TypeOppCtrl.Creature
 SVar:Y:Count$TypeYouCtrl.Creature
diff --git a/res/cardsfolder/s/stun.txt b/res/cardsfolder/s/stun.txt
index 29b1ed714d5..ad623043065 100644
--- a/res/cardsfolder/s/stun.txt
+++ b/res/cardsfolder/s/stun.txt
@@ -2,7 +2,7 @@ Name:Stun
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. | SubAbility$ SVar=DBDraw
+A:SP$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stun.jpg
diff --git a/res/cardsfolder/s/stun_sniper.txt b/res/cardsfolder/s/stun_sniper.txt
index 820f7219e44..ad9c938c51b 100644
--- a/res/cardsfolder/s/stun_sniper.txt
+++ b/res/cardsfolder/s/stun_sniper.txt
@@ -3,7 +3,7 @@ ManaCost:W R
 Types:Creature Human Archer
 Text:no text
 PT:1/1
-A:AB$ DealDamage | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SubAbility$ SVar=DBTap | SpellDescription$ CARDNAME deals 1 damage to target creature. Tap that creature.
+A:AB$ DealDamage | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SubAbility$ DBTap | SpellDescription$ CARDNAME deals 1 damage to target creature. Tap that creature.
 SVar:DBTap:DB$Tap | Defined$ Targeted
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stun_sniper.jpg
diff --git a/res/cardsfolder/s/stupor.txt b/res/cardsfolder/s/stupor.txt
index 31318fd971d..eb0af748f6f 100644
--- a/res/cardsfolder/s/stupor.txt
+++ b/res/cardsfolder/s/stupor.txt
@@ -2,7 +2,7 @@ Name:Stupor
 ManaCost:2 B
 Types:Sorcery
 Text:no text
-A:SP$ Discard | Cost$ 2 B | ValidTgts$ Opponent | NumCards$ 1 | Mode$ Random | SpellDescription$ Target opponent discards a card at random, then discards a card. | SubAbility$ SVar=DBDiscard
+A:SP$ Discard | Cost$ 2 B | ValidTgts$ Opponent | NumCards$ 1 | Mode$ Random | SpellDescription$ Target opponent discards a card at random, then discards a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ Targeted | NumCards$ 1 | Mode$ TgtChoose
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stupor.jpg
diff --git a/res/cardsfolder/s/subversion.txt b/res/cardsfolder/s/subversion.txt
index 5f996ea82d1..28bdf153881 100644
--- a/res/cardsfolder/s/subversion.txt
+++ b/res/cardsfolder/s/subversion.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Enchantment
 Text:no text
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of your upkeep, each opponent loses 1 life. You gain life equal to the life lost this way.
-SVar:TrigDrain:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1 | SubAbility$ SVar=DBGainLife
+SVar:TrigDrain:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/subversion.jpg
diff --git a/res/cardsfolder/s/sudden_strength.txt b/res/cardsfolder/s/sudden_strength.txt
index 21844139060..9566c64e596 100644
--- a/res/cardsfolder/s/sudden_strength.txt
+++ b/res/cardsfolder/s/sudden_strength.txt
@@ -2,7 +2,7 @@ Name:Sudden Strength
 ManaCost:3 G
 Types:Instant
 Text:no text
-A:SP$ Pump | Cost$ 3 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SpellDescription$ Target creature gets +3/+3 until end of turn. | SubAbility$ SVar=DBDraw
+A:SP$ Pump | Cost$ 3 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SpellDescription$ Target creature gets +3/+3 until end of turn. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sudden_strength.jpg
diff --git a/res/cardsfolder/s/suffocating_blast.txt b/res/cardsfolder/s/suffocating_blast.txt
index 0cef0e7f09c..c8c5c6a0c43 100644
--- a/res/cardsfolder/s/suffocating_blast.txt
+++ b/res/cardsfolder/s/suffocating_blast.txt
@@ -2,7 +2,7 @@ Name:Suffocating Blast
 ManaCost:1 U U R
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U U R | Types$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ SVar=DBDamage | SpellDescription$ Counter target spell and CARDNAME deals 3 damage to target creature.
+A:SP$ Counter | Cost$ 1 U U R | Types$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ DBDamage | SpellDescription$ Counter target spell and CARDNAME deals 3 damage to target creature.
 SVar:DBDamage:DB$DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/suffocating_blast.jpg
diff --git a/res/cardsfolder/s/sulfurous_springs.txt b/res/cardsfolder/s/sulfurous_springs.txt
index 2d1841a7696..1437545d1fd 100644
--- a/res/cardsfolder/s/sulfurous_springs.txt
+++ b/res/cardsfolder/s/sulfurous_springs.txt
@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ SVar=DBPain | SpellDescription$ Add B to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ SVar=DBPain | SpellDescription$ Add R to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add B to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add R to your mana pool. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sulfurous_springs.jpg
diff --git a/res/cardsfolder/s/summoners_bane.txt b/res/cardsfolder/s/summoners_bane.txt
index 34461d564df..340eb3f377c 100644
--- a/res/cardsfolder/s/summoners_bane.txt
+++ b/res/cardsfolder/s/summoners_bane.txt
@@ -2,7 +2,7 @@ Name:Summoner's Bane
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target creature spell | ValidTgts$ Creature | SubAbility$ SVar=DBToken | SpellDescription$ Counter target creature spell. Put a 2/2 blue Illusion creature token onto the battlefield.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target creature spell | ValidTgts$ Creature | SubAbility$ DBToken | SpellDescription$ Counter target creature spell. Put a 2/2 blue Illusion creature token onto the battlefield.
 SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Illusion | TokenTypes$ Creature,Illusion | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ U 2 2 Illusion
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/summoners_bane.jpg
diff --git a/res/cardsfolder/s/summoners_pact.txt b/res/cardsfolder/s/summoners_pact.txt
index d2baa8813f3..bfa506136a6 100644
--- a/res/cardsfolder/s/summoners_pact.txt
+++ b/res/cardsfolder/s/summoners_pact.txt
@@ -3,8 +3,8 @@ ManaCost:0
 Types:Instant
 Text:no text
 K:CARDNAME is green.
-A:SP$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Green+YouOwn | ChangeNum$ 1 | SubAbility$ SVar=DBShuffle | SpellDescription$ Search your library for a green creature card, reveal it, and put it into your hand. Then shuffle your library. At the beginning of your next upkeep, pay 2 G G. If you don't, you lose the game.
-SVar:DBShuffle:DB$ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | SubAbility$ SVar=DBDelTrig
+A:SP$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Green+YouOwn | ChangeNum$ 1 | SubAbility$ DBShuffle | SpellDescription$ Search your library for a green creature card, reveal it, and put it into your hand. Then shuffle your library. At the beginning of your next upkeep, pay 2 G G. If you don't, you lose the game.
+SVar:DBShuffle:DB$ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True | SubAbility$ DBDelTrig
 SVar:DBDelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLoseGame | TriggerDescription$ At the beginning of your next upkeep, pay 2 G G. If you don't, you lose the game.
 SVar:TrigLoseGame:SP$LosesGame | Cost$ 0 | UnlessCost$ 2 G G | UnlessPayer$ You | Defined$ You
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/s/sunflare_shaman.txt b/res/cardsfolder/s/sunflare_shaman.txt
index 34907b548f1..c7254dc0641 100644
--- a/res/cardsfolder/s/sunflare_shaman.txt
+++ b/res/cardsfolder/s/sunflare_shaman.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Elemental Shaman
 Text:no text
 PT:2/1
-A:AB$ DealDamage | Cost$ 1 R T | Tgt$ TgtCP | NumDmg$ X | SubAbility$ SVar=DBDealDamage | SpellDescription$ CARDNAME deals X damage to target creature or player and X damage to itself, where X is the number of Elemental cards in your graveyard.
+A:AB$ DealDamage | Cost$ 1 R T | Tgt$ TgtCP | NumDmg$ X | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals X damage to target creature or player and X damage to itself, where X is the number of Elemental cards in your graveyard.
 SVar:DBDealDamage:DB$DealDamage | NumDmg$ X | Defined$ Self
 SVar:X:Count$TypeInYourYard.Elemental
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/s/sungrass_egg.txt b/res/cardsfolder/s/sungrass_egg.txt
index e88ac52e695..8f5c78fabed 100644
--- a/res/cardsfolder/s/sungrass_egg.txt
+++ b/res/cardsfolder/s/sungrass_egg.txt
@@ -2,7 +2,7 @@ Name:Sungrass Egg
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ G W | SubAbility$ SVar=DBDraw | SpellDescription$ Add G W to your mana pool. Draw a card.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ G W | SubAbility$ DBDraw | SpellDescription$ Add G W to your mana pool. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/s/surge_of_thoughtweft.txt b/res/cardsfolder/s/surge_of_thoughtweft.txt
index 624b5b2819d..b729bf0bbf7 100644
--- a/res/cardsfolder/s/surge_of_thoughtweft.txt
+++ b/res/cardsfolder/s/surge_of_thoughtweft.txt
@@ -2,7 +2,7 @@ Name:Surge of Thoughtweft
 ManaCost:1 W
 Types:Tribal Instant Kithkin
 Text:no text
-A:SP$ PumpAll | Cost$ 1 W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SubAbility$ SVar=DBDraw | SpellDescription$ Creatures you control get +1/+1 until end of turn. If you control a Kithkin, draw a card.
+A:SP$ PumpAll | Cost$ 1 W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBDraw | SpellDescription$ Creatures you control get +1/+1 until end of turn. If you control a Kithkin, draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | ConditionPresent$ Kithkin.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Kithkin,
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/swallowing_plague.txt b/res/cardsfolder/s/swallowing_plague.txt
index 12f4a46a93b..e5d2fa5414c 100644
--- a/res/cardsfolder/s/swallowing_plague.txt
+++ b/res/cardsfolder/s/swallowing_plague.txt
@@ -2,7 +2,7 @@ Name:Swallowing Plague
 ManaCost:X B B
 Types:Sorcery Arcane
 Text:no text
-A:SP$ DealDamage | Cost$ X B B | Tgt$ TgtC | NumDmg$ X | SubAbility$ SVar=DBGainLife | SpellDescription$ CARDNAME deals X damage to target creature and you gain X life.
+A:SP$ DealDamage | Cost$ X B B | Tgt$ TgtC | NumDmg$ X | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals X damage to target creature and you gain X life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ X
 SVar:X:Count$xPaid
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/s/sway_of_the_stars.txt b/res/cardsfolder/s/sway_of_the_stars.txt
index c826c0d1f93..715cfd7669d 100644
--- a/res/cardsfolder/s/sway_of_the_stars.txt
+++ b/res/cardsfolder/s/sway_of_the_stars.txt
@@ -2,10 +2,10 @@ Name:Sway of the Stars
 ManaCost:8 U U
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZoneAll | Cost$ 8 U U |  ChangeType$ Card | Origin$ Hand | Destination$ Library | Shuffle$ True  | SubAbility$ SVar=DBChangeAll | SpellDescription$ Each player shuffles his or her hand, graveyard, and permanents he or she owns into his or her library, then draws seven cards. Each player's life total becomes 7.
-SVar:DBChangeAll:DB$ChangeZoneAll | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | SubAbility$ SVar=DBChangeAll2
-SVar:DBChangeAll2:DB$ChangeZoneAll | ChangeType$ Permanent | Origin$ Battlefield | Destination$ Library | SubAbility$ SVar=DBDraw
-SVar:DBDraw:DB$Draw | NumCards$ 7 | Defined$ Each | SubAbility$ SVar=DBSetLife
+A:SP$ ChangeZoneAll | Cost$ 8 U U |  ChangeType$ Card | Origin$ Hand | Destination$ Library | Shuffle$ True  | SubAbility$ DBChangeAll | SpellDescription$ Each player shuffles his or her hand, graveyard, and permanents he or she owns into his or her library, then draws seven cards. Each player's life total becomes 7.
+SVar:DBChangeAll:DB$ChangeZoneAll | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | SubAbility$ DBChangeAll2
+SVar:DBChangeAll2:DB$ChangeZoneAll | ChangeType$ Permanent | Origin$ Battlefield | Destination$ Library | SubAbility$ DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 7 | Defined$ Each | SubAbility$ DBSetLife
 SVar:DBSetLife:DB$SetLife | Defined$ Each | LifeAmount$ 7
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/s/swift_maneuver.txt b/res/cardsfolder/s/swift_maneuver.txt
index 3f058d23aea..d098c37d55c 100644
--- a/res/cardsfolder/s/swift_maneuver.txt
+++ b/res/cardsfolder/s/swift_maneuver.txt
@@ -2,7 +2,7 @@ Name:Swift Maneuver
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$ PreventDamage | Cost$ 1 W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 2 | SubAbility$ SVar=DBDraw | SpellDescription$ Prevent the next 2 damage that would be dealt to target creature or player this turn. Draw a card at the beginning of the next turn's upkeep.
+A:SP$ PreventDamage | Cost$ 1 W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 2 | SubAbility$ DBDraw | SpellDescription$ Prevent the next 2 damage that would be dealt to target creature or player this turn. Draw a card at the beginning of the next turn's upkeep.
 SVar:DBDraw:DB$Draw | Cost$ 0 | NumCards$ 1 | NextUpkeep$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/swift_maneuver.jpg
diff --git a/res/cardsfolder/s/sword_of_body_and_mind.txt b/res/cardsfolder/s/sword_of_body_and_mind.txt
index 75e7ae73e81..ed5a6e72ae9 100644
--- a/res/cardsfolder/s/sword_of_body_and_mind.txt
+++ b/res/cardsfolder/s/sword_of_body_and_mind.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:Equipped creature gets +2/+2 and has protection from green and from blue.
 K:eqPump 2:+2/+2/Protection from green & Protection from blue
 T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, you put a 2/2 green Wolf creature token onto the battlefield and that player puts the top ten cards of his or her library into his or her graveyard.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | SubAbility$ SVar=DBMill
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | SubAbility$ DBMill
 SVar:DBMill:DB$Mill | Defined$ TriggeredTarget | NumCards$ 10
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sword_of_body_and_mind.jpg
diff --git a/res/cardsfolder/s/sword_of_feast_and_famine.txt b/res/cardsfolder/s/sword_of_feast_and_famine.txt
index 03f770b6e6f..620154ac5bc 100644
--- a/res/cardsfolder/s/sword_of_feast_and_famine.txt
+++ b/res/cardsfolder/s/sword_of_feast_and_famine.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:Equipped creature gets +2/+2 and has protection from black and from green.
 K:eqPump 2:+2/+2/Protection from black & Protection from green
 T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, that player discards a card and you untap all lands you control.
-SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ SVar=DBUntapAll
+SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBUntapAll
 SVar:DBUntapAll:DB$UntapAll | ValidCards$ Land.YouCtrl
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sword_of_feast_and_famine.jpg
diff --git a/res/cardsfolder/s/sword_of_fire_and_ice.txt b/res/cardsfolder/s/sword_of_fire_and_ice.txt
index c4af71fda5e..77d6c0b75e4 100644
--- a/res/cardsfolder/s/sword_of_fire_and_ice.txt
+++ b/res/cardsfolder/s/sword_of_fire_and_ice.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:Equipped creature gets +2/+2 and has protection from red and from blue.
 K:eqPump 2:+2/+2/Protection from red & Protection from blue
 T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, CARDNAME deals 2 damage to target creature or player and you draw a card.
-SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$TgtCP | NumDmg$ 2 | SubAbility$ SVar=DBDraw
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$TgtCP | NumDmg$ 2 | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sword_of_fire_and_ice.jpg
diff --git a/res/cardsfolder/s/sword_of_light_and_shadow.txt b/res/cardsfolder/s/sword_of_light_and_shadow.txt
index 77b4460e786..c6b75b4e0cf 100644
--- a/res/cardsfolder/s/sword_of_light_and_shadow.txt
+++ b/res/cardsfolder/s/sword_of_light_and_shadow.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:Equipped creature gets +2/+2 and has protection from white and from black.
 K:eqPump 2:+2/+2/Protection from white & Protection from black
 T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigGainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, you gain 3 life and you may return up to one target creature card from your graveyard to your hand.
-SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 3 | SubAbility$ SVar=DBReturn
+SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 3 | SubAbility$ DBReturn
 SVar:DBReturn:DB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature in your graveyard
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sword_of_light_and_shadow.jpg
diff --git a/res/cardsfolder/s/sword_of_war_and_peace.txt b/res/cardsfolder/s/sword_of_war_and_peace.txt
index b0d9db87743..5d42c963e75 100644
--- a/res/cardsfolder/s/sword_of_war_and_peace.txt
+++ b/res/cardsfolder/s/sword_of_war_and_peace.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:Equipped creature gets +2/+2 and has protection from red and from white.
 K:eqPump 2:+2/+2/Protection from red & Protection from white
 T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, CARDNAME deals damage to that player equal to the number of cards in his or her hand and you gain 1 life for each card in your hand.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredTarget | NumDmg$ X | SubAbility$ SVar=DBGain
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredTarget | NumDmg$ X | SubAbility$ DBGain
 SVar:X:TargetedPlayer$CardsInHand
 SVar:DBGain:DB$GainLife | Defined$ You | LifeAmount$ Y
 SVar:Y:Count$CardsInYourHand
diff --git a/res/cardsfolder/s/symbol_of_unsummoning.txt b/res/cardsfolder/s/symbol_of_unsummoning.txt
index ea317bb0b5b..74e1d378a30 100644
--- a/res/cardsfolder/s/symbol_of_unsummoning.txt
+++ b/res/cardsfolder/s/symbol_of_unsummoning.txt
@@ -2,7 +2,7 @@ Name:Symbol of Unsummoning
 ManaCost:2 U
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. | SubAbility$ SVar=DBDraw
+A:SP$ ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/symbol_of_unsummoning.jpg
diff --git a/res/cardsfolder/s/syphon_life.txt b/res/cardsfolder/s/syphon_life.txt
index 84772526b3c..05716e80d2e 100644
--- a/res/cardsfolder/s/syphon_life.txt
+++ b/res/cardsfolder/s/syphon_life.txt
@@ -2,8 +2,8 @@ Name:Syphon Life
 ManaCost:1 B B
 Types:Sorcery
 Text:no text
-A:SP$ LoseLife | Cost$ 1 B B | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 2 | SubAbility$ SVar=DBGainLife | SpellDescription$ Target player loses 2 life and you gain 2 life.
-A:SP$ LoseLife | Cost$ 1 B B Discard<1/Land> | ActivationZone$ Graveyard | CostDesc$ Retrace | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 2 | SubAbility$ SVar=DBGainLife | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
+A:SP$ LoseLife | Cost$ 1 B B | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 2 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 2 life and you gain 2 life.
+A:SP$ LoseLife | Cost$ 1 B B Discard<1/Land> | ActivationZone$ Graveyard | CostDesc$ Retrace | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 2 | SubAbility$ DBGainLife | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/syphon_life.jpg
diff --git a/res/cardsfolder/s/syphon_soul.txt b/res/cardsfolder/s/syphon_soul.txt
index 626e1bf3d69..c0344c8c497 100644
--- a/res/cardsfolder/s/syphon_soul.txt
+++ b/res/cardsfolder/s/syphon_soul.txt
@@ -2,7 +2,7 @@ Name:Syphon Soul
 ManaCost:2 B
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 2 B | Defined$ Opponent | NumDmg$ 2 | SubAbility$ SVar=DBGainLife | SpellDescription$ CARDNAME deals 2 damage to each other player. You gain life equal to the damage dealt this way.
+A:SP$ DealDamage | Cost$ 2 B | Defined$ Opponent | NumDmg$ 2 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 2 damage to each other player. You gain life equal to the damage dealt this way.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/syphon_soul.jpg