diff --git a/res/cardsfolder/d/dakmor_ghoul.txt b/res/cardsfolder/d/dakmor_ghoul.txt
index 7569b65f732..92eb3bafbae 100644
--- a/res/cardsfolder/d/dakmor_ghoul.txt
+++ b/res/cardsfolder/d/dakmor_ghoul.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie
 Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDrain | TriggerDescription$ When CARDNAME enters the battlefield, target opponent loses 2 life and you gain 2 life.
-SVar:TrigDrain:AB$LoseLife | Cost$ 0 | ValidTgts$ Opponent | LifeAmount$ 2 | SubAbility$ SVar=DBGainLife
+SVar:TrigDrain:AB$LoseLife | Cost$ 0 | ValidTgts$ Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 2
 SVar:Rarity:Uncommon
 SVar:Picture:http://serv3.tcgimages.eu/img/cards/Starter_1999/dakmor_ghoul.jpg
diff --git a/res/cardsfolder/d/dark_offering.txt b/res/cardsfolder/d/dark_offering.txt
index e76d66d2a83..e877912aba3 100644
--- a/res/cardsfolder/d/dark_offering.txt
+++ b/res/cardsfolder/d/dark_offering.txt
@@ -2,7 +2,7 @@ Name:Dark Offering
 ManaCost:4 B B
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 4 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | SubAbility$ SVar=DBGainLife | SpellDescription$ Destroy target nonblack creature. You gain 3 life.
+A:SP$ Destroy | Cost$ 4 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | SubAbility$ DBGainLife | SpellDescription$ Destroy target nonblack creature. You gain 3 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
 SVar:Rarity:Uncommon
 SVar:Picture:http://serv2.tcgimages.eu/img/cards/Portal_Second_Age/dark_offering.jpg
diff --git a/res/cardsfolder/d/dark_temper.txt b/res/cardsfolder/d/dark_temper.txt
index 7e8728a6f1e..d463fa2b7d2 100644
--- a/res/cardsfolder/d/dark_temper.txt
+++ b/res/cardsfolder/d/dark_temper.txt
@@ -2,7 +2,7 @@ Name:Dark Temper
 ManaCost:2 R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature| TgtPrompt$ Creature | NumDmg$ 2 | SubAbility$ SVar=DBDestroy | ConditionPresent$ Permanent.Black+YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME deals 2 damage to target creature. If you control a black permanent, destroy the creature instead.
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature| TgtPrompt$ Creature | NumDmg$ 2 | SubAbility$ DBDestroy | ConditionPresent$ Permanent.Black+YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME deals 2 damage to target creature. If you control a black permanent, destroy the creature instead.
 SVar:DBDestroy:DB$ Destroy | Defined$ Targeted | ConditionPresent$ Permanent.Black+YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a black permanent,
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/d/darkwater_egg.txt b/res/cardsfolder/d/darkwater_egg.txt
index ad5ed1663dd..55c7d330c70 100644
--- a/res/cardsfolder/d/darkwater_egg.txt
+++ b/res/cardsfolder/d/darkwater_egg.txt
@@ -2,7 +2,7 @@ Name:Darkwater Egg
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ U B | SubAbility$ SVar=DBDraw | SpellDescription$ Add U B to your mana pool. Draw a card.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ U B | SubAbility$ DBDraw | SpellDescription$ Add U B to your mana pool. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/d/daybreak_ranger_nightfall_predator.txt b/res/cardsfolder/d/daybreak_ranger_nightfall_predator.txt
index 4ba178971c6..946074c3702 100644
--- a/res/cardsfolder/d/daybreak_ranger_nightfall_predator.txt
+++ b/res/cardsfolder/d/daybreak_ranger_nightfall_predator.txt
@@ -21,7 +21,7 @@ Colors:green
 Types:Creature Werewolf
 Text:no text
 PT:4/4
-A:AB$ DealDamage | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ SVar=DamageThis | SpellDescription$ CARDNAME fights target creature. (Each deals damage equal to its power to the other.)
+A:AB$ DealDamage | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ DamageThis | SpellDescription$ CARDNAME fights target creature. (Each deals damage equal to its power to the other.)
 SVar:DamageThis:DB$DealDamage | Defined$ Self | DamageSource$ Targeted | NumDmg$ Y
 SVar:X:Count$CardPower
 SVar:Y:Targeted$CardPower
diff --git a/res/cardsfolder/d/death_bomb.txt b/res/cardsfolder/d/death_bomb.txt
index 1822b798d72..7a6b2b21f0f 100644
--- a/res/cardsfolder/d/death_bomb.txt
+++ b/res/cardsfolder/d/death_bomb.txt
@@ -2,7 +2,7 @@ Name:Death Bomb
 ManaCost:3 B
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ 3 B Sac<1/Creature> | ValidTgts$ Creature.nonBlack | NoRegen$ True | TgtPrompt$ Select target nonblack creature | SubAbility$ SVar=DBDrain | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. Its controller loses 2 life.
+A:SP$ Destroy | Cost$ 3 B Sac<1/Creature> | ValidTgts$ Creature.nonBlack | NoRegen$ True | TgtPrompt$ Select target nonblack creature | SubAbility$ DBDrain | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. Its controller loses 2 life.
 SVar:DBDrain:DB$LoseLife | Defined$ TargetedController | LifeAmount$ 2
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/d/death_cloud.txt b/res/cardsfolder/d/death_cloud.txt
index 7b897d7c021..85f09cd3245 100644
--- a/res/cardsfolder/d/death_cloud.txt
+++ b/res/cardsfolder/d/death_cloud.txt
@@ -2,9 +2,9 @@ Name:Death Cloud
 ManaCost:X B B B
 Types:Sorcery
 Text:no text
-A:SP$ LoseLife | Cost$ X B B B | Defined$ Each | LifeAmount$ X | SpellDescription$ Each player loses X life, then discards X cards, then sacrifices X creatures, then sacrifices X lands. | SubAbility$ SVar=DBDiscard
-SVar:DBDiscard:DB$Discard | NumCards$ X | Mode$ TgtChoose | Defined$ Each | SubAbility$ SVar=DBSacCreature
-SVar:DBSacCreature:DB$Sacrifice | Amount$ X | SacValid$ Creature | Defined$ Each | SubAbility$ SVar=DBSacLand
+A:SP$ LoseLife | Cost$ X B B B | Defined$ Each | LifeAmount$ X | SpellDescription$ Each player loses X life, then discards X cards, then sacrifices X creatures, then sacrifices X lands. | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$Discard | NumCards$ X | Mode$ TgtChoose | Defined$ Each | SubAbility$ DBSacCreature
+SVar:DBSacCreature:DB$Sacrifice | Amount$ X | SacValid$ Creature | Defined$ Each | SubAbility$ DBSacLand
 SVar:DBSacLand:DB$Sacrifice | Amount$ X | SacValid$ Land | Defined$ Each
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/d/death_cultist.txt b/res/cardsfolder/d/death_cultist.txt
index fcc69ebaf4e..13be85e92f1 100644
--- a/res/cardsfolder/d/death_cultist.txt
+++ b/res/cardsfolder/d/death_cultist.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$ LoseLife | Cost$ Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SubAbility$ SVar=DB1 | SpellDescription$ Target player loses 1 life and you gain 1 life.
+A:AB$ LoseLife | Cost$ Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SubAbility$ DB1 | SpellDescription$ Target player loses 1 life and you gain 1 life.
 SVar:DB1:DB$GainLife | LifeAmount$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/death_cultist.jpg
diff --git a/res/cardsfolder/d/death_grasp.txt b/res/cardsfolder/d/death_grasp.txt
index 8f9030f8246..e6ac8fe4d44 100644
--- a/res/cardsfolder/d/death_grasp.txt
+++ b/res/cardsfolder/d/death_grasp.txt
@@ -2,7 +2,7 @@ Name:Death Grasp
 ManaCost:X W B
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ X W B | Tgt$ TgtCP | NumDmg$ X | SubAbility$ SVar=DBGainLife | SpellDescription$ CARDNAME deals X damage to target creature or player. You gain X life.
+A:SP$ DealDamage | Cost$ X W B | Tgt$ TgtCP | NumDmg$ X | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals X damage to target creature or player. You gain X life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ X
 SVar:X:Count$xPaid
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/d/death_mutation.txt b/res/cardsfolder/d/death_mutation.txt
index 6302f325be7..8bdb3ab937e 100644
--- a/res/cardsfolder/d/death_mutation.txt
+++ b/res/cardsfolder/d/death_mutation.txt
@@ -2,7 +2,7 @@ Name:Death Mutation
 ManaCost:6 B G
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 6 B G | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SubAbility$ SVar=TrigToken | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost.
+A:SP$ Destroy | Cost$ 6 B G | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SubAbility$ TrigToken | SpellDescription$ Destroy target nonblack creature. It can't be regenerated. Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost.
 #X will be the Converted Mana Cost of the target of Mutation
 SVar:TrigToken:DB$Token | Cost$ 0 | TokenAmount$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:X:Targeted$CardManaCost
diff --git a/res/cardsfolder/d/death_of_a_thousand_stings.txt b/res/cardsfolder/d/death_of_a_thousand_stings.txt
index 1121bde328e..97c7e3c2c74 100644
--- a/res/cardsfolder/d/death_of_a_thousand_stings.txt
+++ b/res/cardsfolder/d/death_of_a_thousand_stings.txt
@@ -2,7 +2,7 @@ Name:Death of a Thousand Stings
 ManaCost:4 B
 Types:Instant Arcane
 Text:no text
-A:SP$ LoseLife | Cost$ 4 B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SubAbility$ SVar=DBGainLife | SpellDescription$ Target player loses 1 life and you gain 1 life.
+A:SP$ LoseLife | Cost$ 4 B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 1 life and you gain 1 life.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | IsPresent$ Card | PresentZone$ Hand | PresentPlayer$ Opponent | PresentCompare$ LTX | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if you have more cards in hand than each opponent, you may return CARDNAME from your graveyard to your hand.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
 SVar:X:Count$InYourHand
diff --git a/res/cardsfolder/d/decimate.txt b/res/cardsfolder/d/decimate.txt
index 6bb8eecfe59..ca7a83cee3b 100644
--- a/res/cardsfolder/d/decimate.txt
+++ b/res/cardsfolder/d/decimate.txt
@@ -2,9 +2,9 @@ Name:Decimate
 ManaCost:2 R G
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 2 R G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ SVar=DestroyCreature | SpellDescription$ Destroy target artifact, target creature, target enchantment, and target land.
-SVar:DestroyCreature:DB$ Destroy | Cost$ 0 | ValidTgts$ Creature | SubAbility$ SVar=DestroyEnch | TgtPrompt$ Select target creature
-SVar:DestroyEnch:DB$ Destroy | Cost$ 0 | ValidTgts$ Enchantment | SubAbility$ SVar=DestroyLand | TgtPrompt$ Select target enchantment
+A:SP$ Destroy | Cost$ 2 R G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DestroyCreature | SpellDescription$ Destroy target artifact, target creature, target enchantment, and target land.
+SVar:DestroyCreature:DB$ Destroy | Cost$ 0 | ValidTgts$ Creature | SubAbility$ DestroyEnch | TgtPrompt$ Select target creature
+SVar:DestroyEnch:DB$ Destroy | Cost$ 0 | ValidTgts$ Enchantment | SubAbility$ DestroyLand | TgtPrompt$ Select target enchantment
 SVar:DestroyLand:DB$ Destroy | Cost$ 0 | ValidTgts$ Land | TgtPrompt$ Select target land
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/decimate.jpg
diff --git a/res/cardsfolder/d/decimator_web.txt b/res/cardsfolder/d/decimator_web.txt
index 7b5a7d04449..7d27b1c3db7 100644
--- a/res/cardsfolder/d/decimator_web.txt
+++ b/res/cardsfolder/d/decimator_web.txt
@@ -2,8 +2,8 @@ Name:Decimator Web
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$ LoseLife | Cost$ 4 T | LifeAmount$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player to decimate | SubAbility$ SVar=DBPoison | SpellDescription$ Target player loses 2 life, gets a poison counter, then puts the top six cards of his or her library into his or her graveyard.
-SVar:DBPoison:DB$Poison | Num$ 1 | Defined$ Targeted | SubAbility$ SVar=DBMill
+A:AB$ LoseLife | Cost$ 4 T | LifeAmount$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player to decimate | SubAbility$ DBPoison | SpellDescription$ Target player loses 2 life, gets a poison counter, then puts the top six cards of his or her library into his or her graveyard.
+SVar:DBPoison:DB$Poison | Num$ 1 | Defined$ Targeted | SubAbility$ DBMill
 SVar:DBMill:DB$Mill | NumCards$ 6 | Defined$ Targeted
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/decimator_web.jpg
diff --git a/res/cardsfolder/d/deconstruct.txt b/res/cardsfolder/d/deconstruct.txt
index 1c4228a5baf..9ebb6b7a46a 100644
--- a/res/cardsfolder/d/deconstruct.txt
+++ b/res/cardsfolder/d/deconstruct.txt
@@ -2,7 +2,7 @@ Name:Deconstruct
 ManaCost:2 G
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ SVar=DBMana | SpellDescription$ Destroy target artifact. Add G G G to your mana pool.
+A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBMana | SpellDescription$ Destroy target artifact. Add G G G to your mana pool.
 SVar:DBMana:DB$Mana | Produced$ G | Amount$ 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deconstruct.jpg
diff --git a/res/cardsfolder/d/decree_of_annihilation.txt b/res/cardsfolder/d/decree_of_annihilation.txt
index 69e4f61a70d..cf3b3c9dca6 100644
--- a/res/cardsfolder/d/decree_of_annihilation.txt
+++ b/res/cardsfolder/d/decree_of_annihilation.txt
@@ -3,9 +3,9 @@ ManaCost:8 R R
 Types:Sorcery
 Text:no text
 K:Cycling:5 R R
-A:SP$ ChangeZoneAll | Cost$ 8 R R | ChangeType$ Artifact,Land,Creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ SVar=DBExileHand | SpellDescription$ Exile all artifacts, creatures, and lands from the battlefield, all cards from all graveyards, and all cards from all hands.
+A:SP$ ChangeZoneAll | Cost$ 8 R R | ChangeType$ Artifact,Land,Creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBExileHand | SpellDescription$ Exile all artifacts, creatures, and lands from the battlefield, all cards from all graveyards, and all cards from all hands.
 T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigDestroyAll | TriggerDescription$ When you cycle CARDNAME, destroy all lands
-SVar:DBExileHand:DB$ChangeZoneAll | Cost$ 0 | ChangeType$ Card | Origin$ Hand | Destination$ Exile | SubAbility$ SVar=DBExileGraveyard
+SVar:DBExileHand:DB$ChangeZoneAll | Cost$ 0 | ChangeType$ Card | Origin$ Hand | Destination$ Exile | SubAbility$ DBExileGraveyard
 SVar:DBExileGraveyard:DB$ChangeZoneAll | Cost$ 0 | ChangeType$ Card | Origin$ Graveyard | Destination$ Exile
 SVar:TrigDestroyAll:AB$DestroyAll | Cost$ 0 | ValidCards$ Land | SpellDescription$ Destroy all lands.
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/d/defense_of_the_heart.txt b/res/cardsfolder/d/defense_of_the_heart.txt
index b5b9ebf7077..e37d184d72c 100644
--- a/res/cardsfolder/d/defense_of_the_heart.txt
+++ b/res/cardsfolder/d/defense_of_the_heart.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Enchantment
 Text:no text
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSac | IsPresent$ Creature.YouDontCtrl | PresentCompare$ GE3 | TriggerDescription$ At the beginning of your upkeep, if an opponent controls three or more creatures, sacrifice CARDNAME, search your library for up to two creature cards, and put those cards onto the battlefield. Then shuffle your library.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | SubAbility$ SVar=DBChange
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | SubAbility$ DBChange
 SVar:DBChange:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 2
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/defense_of_the_heart.jpg
diff --git a/res/cardsfolder/d/defiling_tears.txt b/res/cardsfolder/d/defiling_tears.txt
index 529b3fc48f5..d154bf0494d 100644
--- a/res/cardsfolder/d/defiling_tears.txt
+++ b/res/cardsfolder/d/defiling_tears.txt
@@ -2,7 +2,7 @@ Name:Defiling Tears
 ManaCost:2 B
 Types:Instant
 Text:no text
-A:SP$ Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ -1 | SubAbility$ SVar=DBAnimate | SpellDescription$ Until end of turn, target creature becomes black, gets +1/-1, and gains "B: Regenerate this creature."
+A:SP$ Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ -1 | SubAbility$ DBAnimate | SpellDescription$ Until end of turn, target creature becomes black, gets +1/-1, and gains "B: Regenerate this creature."
 SVar:DBAnimate:DB$Animate | Colors$ Black | OverwriteColors$ True | Abilities$ ABRegenerate | Defined$ Targeted
 SVar:ABRegenerate:AB$ Regenerate | Cost$ B | SpellDescription$ Regenerate CARDNAME.
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/d/delirium.txt b/res/cardsfolder/d/delirium.txt
index 43892383441..a6d3da84d76 100644
--- a/res/cardsfolder/d/delirium.txt
+++ b/res/cardsfolder/d/delirium.txt
@@ -2,8 +2,8 @@ Name:Delirium
 ManaCost:1 B R
 Types:Instant
 Text:no text
-A:SP$ Tap | Cost$ 1 B R | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | OpponentTurn$ True | SubAbility$ SVar=DBDamage | SpellDescription$ Cast CARDNAME only during an opponent's turn. Tap target creature that player controls. That creature deals damage equal to its power to the player. Prevent all combat damage that would be dealt to and dealt by the creature this turn.
-SVar:DBDamage:DB$DealDamage | Defined$ Opponent | NumDmg$ X | SubAbility$ SVar=DBPump
+A:SP$ Tap | Cost$ 1 B R | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | OpponentTurn$ True | SubAbility$ DBDamage | SpellDescription$ Cast CARDNAME only during an opponent's turn. Tap target creature that player controls. That creature deals damage equal to its power to the player. Prevent all combat damage that would be dealt to and dealt by the creature this turn.
+SVar:DBDamage:DB$DealDamage | Defined$ Opponent | NumDmg$ X | SubAbility$ DBPump
 SVar:DBPump:DB$Pump | Defined$ Targeted | KW$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME.
 SVar:X:Targeted$CardPower
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/d/delirium_skeins.txt b/res/cardsfolder/d/delirium_skeins.txt
index 51a907659a2..29aae19d274 100644
--- a/res/cardsfolder/d/delirium_skeins.txt
+++ b/res/cardsfolder/d/delirium_skeins.txt
@@ -2,7 +2,7 @@ Name:Delirium Skeins
 ManaCost:2 B
 Types:Sorcery
 Text:no text
-A:SP$ Discard | Cost$ 2 B | Mode$ TgtChoose | Defined$ You | NumCards$ 3 | SubAbility$ SVar=DBDiscardOpp | SpellDescription$ Each player discards three cards.
+A:SP$ Discard | Cost$ 2 B | Mode$ TgtChoose | Defined$ You | NumCards$ 3 | SubAbility$ DBDiscardOpp | SpellDescription$ Each player discards three cards.
 SVar:DBDiscardOpp:DB$Discard | Mode$ TgtChoose | Defined$ Opponent | NumCards$ 3
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/d/desecrated_earth.txt b/res/cardsfolder/d/desecrated_earth.txt
index 6f669bb7f1d..0cbdc829efe 100644
--- a/res/cardsfolder/d/desecrated_earth.txt
+++ b/res/cardsfolder/d/desecrated_earth.txt
@@ -2,7 +2,7 @@ Name:Desecrated Earth
 ManaCost:4 B
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 4 B | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ SVar=DBDiscard | SpellDescription$ Destroy target land. Its controller discards a card.
+A:SP$ Destroy | Cost$ 4 B | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDiscard | SpellDescription$ Destroy target land. Its controller discards a card.
 SVar:DBDiscard:DB$Discard | Defined$ TargetedController | NumCards$ 1 | Mode$ TgtChoose
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desecrated_earth.jpg
diff --git a/res/cardsfolder/d/desperate_ravings.txt b/res/cardsfolder/d/desperate_ravings.txt
index 01b16fb3f93..4d37f69d06d 100644
--- a/res/cardsfolder/d/desperate_ravings.txt
+++ b/res/cardsfolder/d/desperate_ravings.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Instant
 Text:no text
 K:Flashback 2 U
-A:SP$ Draw | Cost$ 1 R | NumCards$ 2 | SubAbility$ SVar=DBDiscard | SpellDescription$ Draw two cards, then discard a card at random.
+A:SP$ Draw | Cost$ 1 R | NumCards$ 2 | SubAbility$ DBDiscard | SpellDescription$ Draw two cards, then discard a card at random.
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ Random
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desperate_ravings.jpg
diff --git a/res/cardsfolder/d/despoil.txt b/res/cardsfolder/d/despoil.txt
index 18c1461bb09..d42dc4afab9 100644
--- a/res/cardsfolder/d/despoil.txt
+++ b/res/cardsfolder/d/despoil.txt
@@ -2,7 +2,7 @@ Name:Despoil
 ManaCost:3 B
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 3 B | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ SVar=DBDrain | SpellDescription$ Destroy target land. Its controller loses 2 life.
+A:SP$ Destroy | Cost$ 3 B | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDrain | SpellDescription$ Destroy target land. Its controller loses 2 life.
 SVar:DBDrain:DB$LoseLife | Defined$ TargetedController | LifeAmount$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/despoil.jpg
diff --git a/res/cardsfolder/d/destructive_force.txt b/res/cardsfolder/d/destructive_force.txt
index 3530fd58068..87cefe10269 100644
--- a/res/cardsfolder/d/destructive_force.txt
+++ b/res/cardsfolder/d/destructive_force.txt
@@ -2,7 +2,7 @@ Name:Destructive Force
 ManaCost:5 R R
 Types:Sorcery
 Text:no text
-A:SP$ Sacrifice | Cost$ 5 R R | Defined$ Each | SacValid$ Land | Amount$ 5 | SpellDescription$ Each player sacrifices five lands. CARDNAME deals 5 damage to each creature. | SubAbility$ SVar=DBDamage
+A:SP$ Sacrifice | Cost$ 5 R R | Defined$ Each | SacValid$ Land | Amount$ 5 | SpellDescription$ Each player sacrifices five lands. CARDNAME deals 5 damage to each creature. | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DamageAll | NumDmg$ 5 | ValidCards$ Creature
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/d/detonate.txt b/res/cardsfolder/d/detonate.txt
index 1e0d92e374d..11bf16f6ab1 100644
--- a/res/cardsfolder/d/detonate.txt
+++ b/res/cardsfolder/d/detonate.txt
@@ -2,7 +2,7 @@ Name:Detonate
 ManaCost:X R
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ X R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | NoRegen$ True | SubAbility$ SVar=DBDamage | SpellDescription$ Destroy target artifact with converted mana cost X. It can't be regenerated. CARDNAME deals X damage to that artifact's controller.
+A:SP$ Destroy | Cost$ X R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | NoRegen$ True | SubAbility$ DBDamage | SpellDescription$ Destroy target artifact with converted mana cost X. It can't be regenerated. CARDNAME deals X damage to that artifact's controller.
 SVar:DBDamage:DB$DealDamage | Defined$ TargetedController | NumDmg$ X
 SVar:X:Targeted$CardManaCost
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/d/devastate.txt b/res/cardsfolder/d/devastate.txt
index 4df84ab63de..5a24383aac1 100644
--- a/res/cardsfolder/d/devastate.txt
+++ b/res/cardsfolder/d/devastate.txt
@@ -2,7 +2,7 @@ Name:Devastate
 ManaCost:3 R R
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 3 R R | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ SVar=DBDamageAll | SpellDescription$ Destroy target land. CARDNAME deals 1 damage to each creature and each player.
+A:SP$ Destroy | Cost$ 3 R R | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBDamageAll | SpellDescription$ Destroy target land. CARDNAME deals 1 damage to each creature and each player.
 SVar:DBDamageAll:DB$DamageAll | NumDmg$ 1 | ValidCards$ Creature | ValidPlayers$ Each | ValidDescription$ each creature and each player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/devastate.jpg
diff --git a/res/cardsfolder/d/devastating_dreams.txt b/res/cardsfolder/d/devastating_dreams.txt
index 724d88a8e93..900734e0d12 100644
--- a/res/cardsfolder/d/devastating_dreams.txt
+++ b/res/cardsfolder/d/devastating_dreams.txt
@@ -2,7 +2,7 @@ Name:Devastating Dreams
 ManaCost:R R
 Types:Sorcery
 Text:no text
-A:SP$ Sacrifice | Cost$ R R Discard<X/Random> | Defined$ Each | SacValid$ Land | Amount$ ChosenX | SubAbility$ SVar=DBDamage | SpellDescription$ Each player sacrifices X lands. CARDNAME deals X damage to each creature.
+A:SP$ Sacrifice | Cost$ R R Discard<X/Random> | Defined$ Each | SacValid$ Land | Amount$ ChosenX | SubAbility$ DBDamage | SpellDescription$ Each player sacrifices X lands. CARDNAME deals X damage to each creature.
 SVar:DBDamage:DB$ DamageAll | NumDmg$ ChosenX | ValidCards$ Creature
 SVar:X:XChoice
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/d/devour_in_shadow.txt b/res/cardsfolder/d/devour_in_shadow.txt
index 47330392eff..e985092a805 100644
--- a/res/cardsfolder/d/devour_in_shadow.txt
+++ b/res/cardsfolder/d/devour_in_shadow.txt
@@ -2,7 +2,7 @@ Name:Devour in Shadow
 ManaCost:B B
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NoRegen$ True | SubAbility$ SVar=DBLoseLife | SpellDescription$ Destroy target creature. It can't be regenerated. You lose life equal to that creature's toughness.
+A:SP$ Destroy | Cost$ B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NoRegen$ True | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. It can't be regenerated. You lose life equal to that creature's toughness.
 SVar:DBLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardToughness
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/d/diminishing_returns.txt b/res/cardsfolder/d/diminishing_returns.txt
index 8de71ed7157..71a1e6a1c6c 100644
--- a/res/cardsfolder/d/diminishing_returns.txt
+++ b/res/cardsfolder/d/diminishing_returns.txt
@@ -2,9 +2,9 @@ Name:Diminishing Returns
 ManaCost:2 U U
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZoneAll | Cost$ 2 U U | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | SubAbility$ SVar=DBChangeHand | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library.
-SVar:DBChangeHand:DB$ChangeZoneAll | ChangeType$ Card | Origin$ Hand | Destination$ Library | Shuffle$ True | SubAbility$ SVar=DBExile
-SVar:DBExile:DB$Mill | Defined$ You | NumCards$ 10 | Destination$ Exile | SubAbility$ SVar=DBDraw | SpellDescription$ You exile the top ten cards of your library.
+A:SP$ ChangeZoneAll | Cost$ 2 U U | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | SubAbility$ DBChangeHand | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library.
+SVar:DBChangeHand:DB$ChangeZoneAll | ChangeType$ Card | Origin$ Hand | Destination$ Library | Shuffle$ True | SubAbility$ DBExile
+SVar:DBExile:DB$Mill | Defined$ You | NumCards$ 10 | Destination$ Exile | SubAbility$ DBDraw | SpellDescription$ You exile the top ten cards of your library.
 SVar:DBDraw:DB$Draw | Defined$ Each | NumCards$ 7 | SpellDescription$ Then each player draws up to seven cards.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/d/dimir_cutpurse.txt b/res/cardsfolder/d/dimir_cutpurse.txt
index cb45ccae380..a74a9b4a72f 100644
--- a/res/cardsfolder/d/dimir_cutpurse.txt
+++ b/res/cardsfolder/d/dimir_cutpurse.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:2/2
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDrawDiscard | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card and you draw a card.
-SVar:TrigDrawDiscard:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ SVar=DBDiscard
+SVar:TrigDrawDiscard:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dimir_cutpurse.jpg
diff --git a/res/cardsfolder/d/din_of_the_fireherd.txt b/res/cardsfolder/d/din_of_the_fireherd.txt
index 333fdbcd5a8..1aa209aff3f 100644
--- a/res/cardsfolder/d/din_of_the_fireherd.txt
+++ b/res/cardsfolder/d/din_of_the_fireherd.txt
@@ -2,8 +2,8 @@ Name:Din of the Fireherd
 ManaCost:5 BR BR BR
 Types:Sorcery
 Text:no text
-A:SP$ Token | Cost$ 5 BR BR BR | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Elemental | TokenColors$ Black,Red | TokenTypes$ Creature,Elemental | TokenPower$ 5 | TokenToughness$ 5 | SubAbility$ SVar=DBSac1 | SpellDescription$ Put a 5/5 black and red Elemental creature token onto the battlefield. Target opponent sacrifices a creature for each black creature you control, then sacrifices a land for each red creature you control.
-SVar:DBSac1:DB$Sacrifice | SacValid$ Creature | Defined$ Opponent | Amount$ X | SubAbility$ SVar=DBSac2
+A:SP$ Token | Cost$ 5 BR BR BR | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Elemental | TokenColors$ Black,Red | TokenTypes$ Creature,Elemental | TokenPower$ 5 | TokenToughness$ 5 | SubAbility$ DBSac1 | SpellDescription$ Put a 5/5 black and red Elemental creature token onto the battlefield. Target opponent sacrifices a creature for each black creature you control, then sacrifices a land for each red creature you control.
+SVar:DBSac1:DB$Sacrifice | SacValid$ Creature | Defined$ Opponent | Amount$ X | SubAbility$ DBSac2
 SVar:DBSac2:DB$Sacrifice | SacValid$ Land | Defined$ Opponent | Amount$ Y
 SVar:X:Count$Valid Creature.Black+YouCtrl
 SVar:Y:Count$Valid Creature.Red+YouCtrl
diff --git a/res/cardsfolder/d/disappear.txt b/res/cardsfolder/d/disappear.txt
index af99559fbcd..6cc7c246f51 100644
--- a/res/cardsfolder/d/disappear.txt
+++ b/res/cardsfolder/d/disappear.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 U U | ValidTgts$ Creature | AILogic$ Curse
-A:AB$ ChangeZone | Cost$ U | Defined$ Enchanted | Origin$ Battlefield | Destination$ Hand | SubAbility$ SVar=DBBounce | SpellDescription$ Return enchanted creature and CARDNAME to their owners' hands.
+A:AB$ ChangeZone | Cost$ U | Defined$ Enchanted | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBBounce | SpellDescription$ Return enchanted creature and CARDNAME to their owners' hands.
 SVar:DBBounce:DB$ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/disappear.jpg
diff --git a/res/cardsfolder/d/discombobulate.txt b/res/cardsfolder/d/discombobulate.txt
index 3e37beb626d..c679de9ca27 100644
--- a/res/cardsfolder/d/discombobulate.txt
+++ b/res/cardsfolder/d/discombobulate.txt
@@ -2,7 +2,7 @@ Name:Discombobulate
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | SubAbility$ SVar=DBRearrange | SpellDescription$ Counter target spell. Look at the top four cards of your library, then put them back in any order.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | SubAbility$ DBRearrange | SpellDescription$ Counter target spell. Look at the top four cards of your library, then put them back in any order.
 SVar:DBRearrange:DB$RearrangeTopOfLibrary | Defined$ You | NumCards$ 4
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/discombobulate.jpg
diff --git a/res/cardsfolder/d/disintegrate.txt b/res/cardsfolder/d/disintegrate.txt
index 5a2990a01f3..636335683c2 100644
--- a/res/cardsfolder/d/disintegrate.txt
+++ b/res/cardsfolder/d/disintegrate.txt
@@ -2,7 +2,7 @@ Name:Disintegrate
 ManaCost:X R
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ X R | Tgt$ TgtCP | NumDmg$ X | SubAbility$ SVar=DB | SpellDescription$ CARDNAME deals X damage to target creature or player. That creature can't be regenerated this turn. If the creature would be put into a graveyard this turn, exile it instead.
+A:SP$ DealDamage | Cost$ X R | Tgt$ TgtCP | NumDmg$ X | SubAbility$ DB | SpellDescription$ CARDNAME deals X damage to target creature or player. That creature can't be regenerated this turn. If the creature would be put into a graveyard this turn, exile it instead.
 SVar:X:Count$xPaid
 SVar:DB:DB$Pump | KW$ HIDDEN CARDNAME can't be regenerated. & HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
 SVar:Rarity:Common
diff --git a/res/cardsfolder/d/dismal_failure.txt b/res/cardsfolder/d/dismal_failure.txt
index 0cb9bca8251..d5d7d41e26d 100644
--- a/res/cardsfolder/d/dismal_failure.txt
+++ b/res/cardsfolder/d/dismal_failure.txt
@@ -2,7 +2,7 @@ Name:Dismal Failure
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | SubAbility$ SVar=DBDiscard | SpellDescription$ Counter target spell. Its controller discards a card.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Destination$ Graveyard | SubAbility$ DBDiscard | SpellDescription$ Counter target spell. Its controller discards a card.
 SVar:DBDiscard:DB$Discard | Defined$ TargetedController | NumCards$ 1 | Mode$ TgtChoose
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dismal_failure.jpg
diff --git a/res/cardsfolder/d/dismiss.txt b/res/cardsfolder/d/dismiss.txt
index 532a17690f3..ec8de4c55e9 100644
--- a/res/cardsfolder/d/dismiss.txt
+++ b/res/cardsfolder/d/dismiss.txt
@@ -2,7 +2,7 @@ Name:Dismiss
 ManaCost:2 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target spell. Draw a card.
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ DBDraw | SpellDescription$ Counter target spell. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dismiss.jpg
diff --git a/res/cardsfolder/d/dispatch.txt b/res/cardsfolder/d/dispatch.txt
index 1b5b17f582e..ecfe57aa497 100644
--- a/res/cardsfolder/d/dispatch.txt
+++ b/res/cardsfolder/d/dispatch.txt
@@ -2,7 +2,7 @@ Name:Dispatch
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$ Tap | Cost$ W | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ SVar=DBExile | SpellDescription$ Tap target creature. Metalcraft - If you control three or more artifacts, exile that creature.
+A:SP$ Tap | Cost$ W | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ DBExile | SpellDescription$ Tap target creature. Metalcraft - If you control three or more artifacts, exile that creature.
 SVar:DBExile:DB$ChangeZone | Condition$ Metalcraft | Defined$ Targeted | Origin$ Battlefield | Destination$ Exile | ConditionDescription$ If you control three or more artifacts,
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/d/disrupt.txt b/res/cardsfolder/d/disrupt.txt
index 3a445e332eb..287d8f9d537 100644
--- a/res/cardsfolder/d/disrupt.txt
+++ b/res/cardsfolder/d/disrupt.txt
@@ -2,7 +2,7 @@ Name:Disrupt
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ U | TargetType$ Spell | ValidTgts$ Instant,Sorcery  | TgtPrompt$ Select target Instant or Sorcery Spell | UnlessCost$ 1 | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target instant or sorcery spell unless its controller pays 1. Draw a card.
+A:SP$ Counter | Cost$ U | TargetType$ Spell | ValidTgts$ Instant,Sorcery  | TgtPrompt$ Select target Instant or Sorcery Spell | UnlessCost$ 1 | SubAbility$ DBDraw | SpellDescription$ Counter target instant or sorcery spell unless its controller pays 1. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/disrupt.jpg
diff --git a/res/cardsfolder/d/distant_melody.txt b/res/cardsfolder/d/distant_melody.txt
index 634dac73146..9392680392e 100644
--- a/res/cardsfolder/d/distant_melody.txt
+++ b/res/cardsfolder/d/distant_melody.txt
@@ -2,7 +2,7 @@ Name:Distant Melody
 ManaCost:3 U
 Types:Sorcery
 Text:no text
-A:SP$ ChooseType | Cost$ 3 U | Defined$ You | Type$ Creature | SubAbility$ SVar=DBDraw | AILogic$ MostProminentOnBattlefield | SpellDescription$ Choose a creature type. Draw a card for each permanent you control of that type.
+A:SP$ ChooseType | Cost$ 3 U | Defined$ You | Type$ Creature | SubAbility$ DBDraw | AILogic$ MostProminentOnBattlefield | SpellDescription$ Choose a creature type. Draw a card for each permanent you control of that type.
 SVar:DBDraw:DB$ Draw | Cost$ 0 | NumCards$ X
 SVar:X:Count$Valid Permanent.ChosenType+YouCtrl
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/d/divine_offering.txt b/res/cardsfolder/d/divine_offering.txt
index 5c4a8ae4da1..7d47f1742f5 100644
--- a/res/cardsfolder/d/divine_offering.txt
+++ b/res/cardsfolder/d/divine_offering.txt
@@ -2,7 +2,7 @@ Name:Divine Offering
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ 1 W | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ SVar=DBGainLife | SpellDescription$ Destroy target artifact. You gain life equal to its converted mana cost.
+A:SP$ Destroy | Cost$ 1 W | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBGainLife | SpellDescription$ Destroy target artifact. You gain life equal to its converted mana cost.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardManaCost
 SVar:Rarity:Common
diff --git a/res/cardsfolder/d/dominarias_judgment.txt b/res/cardsfolder/d/dominarias_judgment.txt
index 0ef2724a109..469c1284bac 100644
--- a/res/cardsfolder/d/dominarias_judgment.txt
+++ b/res/cardsfolder/d/dominarias_judgment.txt
@@ -2,10 +2,10 @@ Name:Dominaria's Judgment
 ManaCost:2 W
 Types:Instant
 Text:no text
-A:SP$ PumpAll | Cost$ 2 W | ValidCards$ Creature.YouCtrl | KW$ Protection from white  | ConditionPresent$ Plains.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Plains, | SubAbility$ SVar=DBBlue | SpellDescription$ Until end of turn, creatures you control gain protection from white if you control a Plains, from blue if you control an Island, from black if you control a Swamp, from red if you control a Mountain, and from green if you control a Forest.
-SVar:DBBlue:DB$PumpAll | ValidCards$ Creature.YouCtrl | KW$ Protection from blue  | ConditionPresent$ Island.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control an Island, | SubAbility$ SVar=DBBlack
-SVar:DBBlack:DB$PumpAll | ValidCards$ Creature.YouCtrl | KW$ Protection from black  | ConditionPresent$ Swamp.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control an Swamp, | SubAbility$ SVar=DBRed
-SVar:DBRed:DB$PumpAll | ValidCards$ Creature.YouCtrl | KW$ Protection from red  | ConditionPresent$ Mountain.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control an Mountain, | SubAbility$ SVar=DBGreen
+A:SP$ PumpAll | Cost$ 2 W | ValidCards$ Creature.YouCtrl | KW$ Protection from white  | ConditionPresent$ Plains.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Plains, | SubAbility$ DBBlue | SpellDescription$ Until end of turn, creatures you control gain protection from white if you control a Plains, from blue if you control an Island, from black if you control a Swamp, from red if you control a Mountain, and from green if you control a Forest.
+SVar:DBBlue:DB$PumpAll | ValidCards$ Creature.YouCtrl | KW$ Protection from blue  | ConditionPresent$ Island.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control an Island, | SubAbility$ DBBlack
+SVar:DBBlack:DB$PumpAll | ValidCards$ Creature.YouCtrl | KW$ Protection from black  | ConditionPresent$ Swamp.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control an Swamp, | SubAbility$ DBRed
+SVar:DBRed:DB$PumpAll | ValidCards$ Creature.YouCtrl | KW$ Protection from red  | ConditionPresent$ Mountain.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control an Mountain, | SubAbility$ DBGreen
 SVar:DBGreen:DB$PumpAll | ValidCards$ Creature.YouCtrl | KW$ Protection from green  | ConditionPresent$ Forest.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control an Forest,
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/d/doomsday.txt b/res/cardsfolder/d/doomsday.txt
index c47834b7c88..755718e2b43 100644
--- a/res/cardsfolder/d/doomsday.txt
+++ b/res/cardsfolder/d/doomsday.txt
@@ -2,8 +2,8 @@ Name:Doomsday
 ManaCost:B B B
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZoneAll | Cost$ B B B | Origin$ Graveyard | Destination$ Library | SubAbility$ SVar=DBDig | SpellDescription$ Search your library and graveyard for five cards and exile the rest. Put the chosen cards on top of your library in any order. You lose half your life, rounded up.
-SVar:DBDig:DB$Dig | DigNum$ X | DestinationZone$ Library | ChangeNum$ 5 | DestinationZone2$ Exile | SubAbility$ SVar=DBLoseLife
+A:SP$ ChangeZoneAll | Cost$ B B B | Origin$ Graveyard | Destination$ Library | SubAbility$ DBDig | SpellDescription$ Search your library and graveyard for five cards and exile the rest. Put the chosen cards on top of your library in any order. You lose half your life, rounded up.
+SVar:DBDig:DB$Dig | DigNum$ X | DestinationZone$ Library | ChangeNum$ 5 | DestinationZone2$ Exile | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$LoseLife | LifeAmount$ Y
 SVar:X:Count$InYourLibrary
 SVar:Y:Count$YourLifeTotal/HalfUp
diff --git a/res/cardsfolder/d/dosans_oldest_chant.txt b/res/cardsfolder/d/dosans_oldest_chant.txt
index de6500cdaa0..97aa75cc70d 100644
--- a/res/cardsfolder/d/dosans_oldest_chant.txt
+++ b/res/cardsfolder/d/dosans_oldest_chant.txt
@@ -2,7 +2,7 @@ Name:Dosan's Oldest Chant
 ManaCost:4 G
 Types:Sorcery
 Text:no text
-A:SP$ GainLife | Cost$ 4 G | LifeAmount$ 6 | SpellDescription$ You gain 6 life. | SubAbility$ SVar=DBDraw
+A:SP$ GainLife | Cost$ 4 G | LifeAmount$ 6 | SpellDescription$ You gain 6 life. | 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/dosans_oldest_chant.jpg
diff --git a/res/cardsfolder/d/douse_in_gloom.txt b/res/cardsfolder/d/douse_in_gloom.txt
index db47773cb14..a2165b8455c 100644
--- a/res/cardsfolder/d/douse_in_gloom.txt
+++ b/res/cardsfolder/d/douse_in_gloom.txt
@@ -2,7 +2,7 @@ Name:Douse in Gloom
 ManaCost:2 B
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SubAbility$ SVar=DBGainLife | SpellDescription$ Douse in Gloom deals 2 damage to target creature and you gain 2 life.
+A:SP$ DealDamage | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SubAbility$ DBGainLife | SpellDescription$ Douse in Gloom 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://resources.wizards.com/magic/cards/gpt/en-us/card97221.jpg
diff --git a/res/cardsfolder/d/dragon_mage.txt b/res/cardsfolder/d/dragon_mage.txt
index d1ac4a6b541..b505875e3f0 100644
--- a/res/cardsfolder/d/dragon_mage.txt
+++ b/res/cardsfolder/d/dragon_mage.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:5/5
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDiscardDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, each player discards his or her hand and draws seven cards.
-SVar:TrigDiscardDraw:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Card | Origin$ Hand | Destination$ Graveyard | SubAbility$ SVar=DBDraw
+SVar:TrigDiscardDraw:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Card | Origin$ Hand | Destination$ Graveyard | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | Defined$ Each | NumCards$ 7
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_mage.jpg
diff --git a/res/cardsfolder/d/dragonsoul_knight.txt b/res/cardsfolder/d/dragonsoul_knight.txt
index 20a97583b82..34ca66c93dd 100644
--- a/res/cardsfolder/d/dragonsoul_knight.txt
+++ b/res/cardsfolder/d/dragonsoul_knight.txt
@@ -4,7 +4,7 @@ Types:Creature Human Knight
 Text:no text
 PT:2/2
 K:First Strike
-A:AB$ Animate | Cost$ W U B R G | Defined$ Self | Types$ Dragon | Keywords$ Flying & Trample | SubAbility$ SVar=DBPump | SpellDescription$ Until end of turn, CARDNAME becomes a Dragon, gets +5/+3, and gains flying and trample.
+A:AB$ Animate | Cost$ W U B R G | Defined$ Self | Types$ Dragon | Keywords$ Flying & Trample | SubAbility$ DBPump | SpellDescription$ Until end of turn, CARDNAME becomes a Dragon, gets +5/+3, and gains flying and trample.
 SVar:DBPump:DB$Pump | Defined$ Self | NumAtt$ +5 | NumDef$ +3
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragonsoul_knight.jpg
diff --git a/res/cardsfolder/d/drain_the_well.txt b/res/cardsfolder/d/drain_the_well.txt
index a8f44706563..70abf10be61 100644
--- a/res/cardsfolder/d/drain_the_well.txt
+++ b/res/cardsfolder/d/drain_the_well.txt
@@ -2,7 +2,7 @@ Name:Drain the Well
 ManaCost:2 BG BG
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 2 BG BG | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ SVar=DBGainLife | SpellDescription$ Destroy target land. You gain 2 life.
+A:SP$ Destroy | Cost$ 2 BG BG | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBGainLife | SpellDescription$ Destroy target land. 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/drain_the_well.jpg
diff --git a/res/cardsfolder/d/drana_kalastria_bloodchief.txt b/res/cardsfolder/d/drana_kalastria_bloodchief.txt
index 872918f1385..ba2544f93a0 100644
--- a/res/cardsfolder/d/drana_kalastria_bloodchief.txt
+++ b/res/cardsfolder/d/drana_kalastria_bloodchief.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Vampire Shaman
 Text:no text
 PT:4/4
 K:Flying
-A:AB$ Pump | Cost$ X B B | NumDef$ -X | ValidTgts$ Creature | IsCurse$ True | TgtPrompt$ Select target creature. | SubAbility$ SVar=DBPump | SpellDescription$ Target creature gets -0/-X until end of turn and CARDNAME gets +X/+0 until end of turn.
+A:AB$ Pump | Cost$ X B B | NumDef$ -X | ValidTgts$ Creature | IsCurse$ True | TgtPrompt$ Select target creature. | SubAbility$ DBPump | SpellDescription$ Target creature gets -0/-X until end of turn and CARDNAME gets +X/+0 until end of turn.
 SVar:DBPump:DB$Pump | NumAtt$ +X | Defined$ Self
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/d/drastic_revelation.txt b/res/cardsfolder/d/drastic_revelation.txt
index 2eacbc6fbdb..238933243ec 100644
--- a/res/cardsfolder/d/drastic_revelation.txt
+++ b/res/cardsfolder/d/drastic_revelation.txt
@@ -2,8 +2,8 @@ Name:Drastic Revelation
 ManaCost:2 U B R
 Types:Sorcery
 Text:no text
-A:SP$ Discard | Cost$ 2 U B R | Mode$ Hand | SubAbility$ SVar=DBDraw | SpellDescription$ Discard your hand. Draw seven cards, then discard three cards at random.
-SVar:DBDraw:DB$Draw | NumCards$ 7 | SubAbility$ SVar=DBDiscard
+A:SP$ Discard | Cost$ 2 U B R | Mode$ Hand | SubAbility$ DBDraw | SpellDescription$ Discard your hand. Draw seven cards, then discard three cards at random.
+SVar:DBDraw:DB$Draw | NumCards$ 7 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | NumCards$ 3 | Mode$ Random
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drastic_revelation.jpg
diff --git a/res/cardsfolder/d/dream_cache.txt b/res/cardsfolder/d/dream_cache.txt
index 5c3822f044d..ae1f6ddb4d5 100644
--- a/res/cardsfolder/d/dream_cache.txt
+++ b/res/cardsfolder/d/dream_cache.txt
@@ -2,7 +2,7 @@ Name:Dream Cache
 ManaCost:2 U
 Types:Sorcery
 Text:no text
-A:SP$ Draw | Cost$ 2 U | NumCards$ 3 | SubAbility$ SVar=ChangeZoneDB | SpellDescription$ Draw three cards, then put two cards from your hand both on top of your library or both on the bottom of your library.
+A:SP$ Draw | Cost$ 2 U | NumCards$ 3 | SubAbility$ ChangeZoneDB | SpellDescription$ Draw three cards, then put two cards from your hand both on top of your library or both on the bottom of your library.
 SVar:ChangeZoneDB:DB$ChangeZone | Origin$ Hand | Destination$ Library | ChangeNum$ 2 | DestinationAlternative$ Library | LibraryPositionAlternative$ -1 | AlternativeDestinationMessage$ Would you like to put the cards on the top of your library (and not on the bottom)?
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_cache.jpg
diff --git a/res/cardsfolder/d/dream_fighter.txt b/res/cardsfolder/d/dream_fighter.txt
index ac594b18e42..47a1c80b4bb 100644
--- a/res/cardsfolder/d/dream_fighter.txt
+++ b/res/cardsfolder/d/dream_fighter.txt
@@ -5,8 +5,8 @@ Text:no text
 PT:1/1
 T:Mode$ Blocks | ValidCard$ Card.Self | TriggerZones$ Battlefield | ValidBlocked$ Creature | Execute$ TrigPhaseAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Dream Fighter and that creature phase out.
 T:Mode$ Blocks | ValidCard$ Creature | TriggerZones$ Battlefield | ValidBlocked$ Card.Self | Execute$ TrigPhaseBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, Dream Fighter and that creature phase out.
-SVar:TrigPhaseAttacker:DB$ Phases | Defined$ TriggeredAttacker | SubAbility$ SVar=DBPhaseSelf
-SVar:TrigPhaseBlocker:DB$ Phases | Defined$ TriggeredBlocker | SubAbility$ SVar=DBPhaseSelf
+SVar:TrigPhaseAttacker:DB$ Phases | Defined$ TriggeredAttacker | SubAbility$ DBPhaseSelf
+SVar:TrigPhaseBlocker:DB$ Phases | Defined$ TriggeredBlocker | SubAbility$ DBPhaseSelf
 SVar:DBPhaseSelf:DB$ Phases | Defined$ Self
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_fighter.jpg
diff --git a/res/cardsfolder/d/dream_fracture.txt b/res/cardsfolder/d/dream_fracture.txt
index 6d1285f9875..6f102fd0575 100644
--- a/res/cardsfolder/d/dream_fracture.txt
+++ b/res/cardsfolder/d/dream_fracture.txt
@@ -2,8 +2,8 @@ Name:Dream Fracture
 ManaCost:1 U U
 Types:Instant
 Text:no text
-A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ SVar=DBDraw | SpellDescription$ Counter target spell. Its controller draws a card. Draw a card.
-SVar:DBDraw:DB$Draw | Defined$ TargetedController | NumCards$ 1 | SubAbility$ SVar=DBDrawYou
+A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ DBDraw | SpellDescription$ Counter target spell. Its controller draws a card. Draw a card.
+SVar:DBDraw:DB$Draw | Defined$ TargetedController | NumCards$ 1 | SubAbility$ DBDrawYou
 SVar:DBDrawYou:DB$Draw | Defined$ You | NumCards$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_fracture.jpg
diff --git a/res/cardsfolder/d/dream_thrush.txt b/res/cardsfolder/d/dream_thrush.txt
index d116ef6172c..b739d01eda2 100644
--- a/res/cardsfolder/d/dream_thrush.txt
+++ b/res/cardsfolder/d/dream_thrush.txt
@@ -4,7 +4,7 @@ Types:Creature Bird
 Text:no text
 PT:1/1
 K:Flying
-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/d/dreams_grip.txt b/res/cardsfolder/d/dreams_grip.txt
index fb50929e902..c52e43d8050 100644
--- a/res/cardsfolder/d/dreams_grip.txt
+++ b/res/cardsfolder/d/dreams_grip.txt
@@ -4,7 +4,7 @@ Types:Instant
 Text:no text
 A:SP$ Tap | Cost$ U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to tap | SpellDescription$ Choose one: Tap target permanent;
 A:SP$ Untap | Cost$ U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to untap | SpellDescription$ or untap target permanent.
-A:SP$ Tap | Cost$ 1 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to tap | SubAbility$ SVar=DBUntap | PrecostDesc$ Entwine - | SpellDescription$ (Choose both if you pay the entwine cost.)
+A:SP$ Tap | Cost$ 1 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to tap | SubAbility$ DBUntap | PrecostDesc$ Entwine - | SpellDescription$ (Choose both if you pay the entwine cost.)
 SVar:DBUntap:DB$ Untap | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to untap
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/d/dredge.txt b/res/cardsfolder/d/dredge.txt
index f2769a87883..61665e1f64c 100644
--- a/res/cardsfolder/d/dredge.txt
+++ b/res/cardsfolder/d/dredge.txt
@@ -2,7 +2,7 @@ Name:Dredge
 ManaCost:B
 Types:Instant
 Text:no text
-A:SP$ Sacrifice | Cost$ B | SacValid$ Creature,Land | SacMessage$ Creature or Land | SpellDescription$ Sacrifice a creature or land. | SubAbility$ SVar=DBDraw
+A:SP$ Sacrifice | Cost$ B | SacValid$ Creature,Land | SacMessage$ Creature or Land | SpellDescription$ Sacrifice a creature or land. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/d/dregs_of_sorrow.txt b/res/cardsfolder/d/dregs_of_sorrow.txt
index bdff41d85e4..91624b132a7 100644
--- a/res/cardsfolder/d/dregs_of_sorrow.txt
+++ b/res/cardsfolder/d/dregs_of_sorrow.txt
@@ -2,7 +2,7 @@ Name:Dregs of Sorrow
 ManaCost:X 4 B
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ X 4 B | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonBlack creature | SpellDescription$ Destroy X target nonblack creatures. Draw X cards. | SubAbility$ SVar=DB
+A:SP$ Destroy | Cost$ X 4 B | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonBlack creature | SpellDescription$ Destroy X target nonblack creatures. Draw X cards. | SubAbility$ DB
 # It may seem wrong to not use X in the target, but since the Targets are what defines X, it's redundant (and not supported by the code)
 SVar:X:Targeted$Amount
 SVar:MaxTgts:Count$Valid Creature.nonBlack
diff --git a/res/cardsfolder/d/drooling_groodion.txt b/res/cardsfolder/d/drooling_groodion.txt
index 9671622844c..e7e2f2611d8 100644
--- a/res/cardsfolder/d/drooling_groodion.txt
+++ b/res/cardsfolder/d/drooling_groodion.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B G
 Types:Creature Beast
 Text:no text
 PT:4/3
-A:AB$ Pump | Cost$ 2 B G Sac<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature to get +2/+2: | NumAtt$ +2 | NumDef$ +2 | SubAbility$ SVar=DBPump | SpellDescription$ Target creature gets +2/+2 until end of turn. Another target creature gets -2/-2 until end of turn.
+A:AB$ Pump | Cost$ 2 B G Sac<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature to get +2/+2: | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBPump | SpellDescription$ Target creature gets +2/+2 until end of turn. Another target creature gets -2/-2 until end of turn.
 SVar:DBPump:DB$Pump | Cost$ 0 | NumAtt$ -2 | NumDef$ -2 | ValidTgts$ Creature | TgtPromp$ Select target creature to get -2/-2 | TargetUnique$ True | IsCurse$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drooling_groodion.jpg
diff --git a/res/cardsfolder/d/drowned_rusalka.txt b/res/cardsfolder/d/drowned_rusalka.txt
index b154736441a..a4b1144b455 100644
--- a/res/cardsfolder/d/drowned_rusalka.txt
+++ b/res/cardsfolder/d/drowned_rusalka.txt
@@ -3,7 +3,7 @@ ManaCost:U
 Types:Creature Spirit
 Text:no text
 PT:1/1
-A:AB$ Discard | Cost$ U Sac<1/Creature> | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ SVar=DBDraw | SpellDescription$ Discard a card, then draw a card.
+A:AB$ Discard | Cost$ U Sac<1/Creature> | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBDraw | SpellDescription$ Discard a card, then draw a card.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/d/dwarven_vigilantes.txt b/res/cardsfolder/d/dwarven_vigilantes.txt
index 624a3ceea99..815a3d2804b 100644
--- a/res/cardsfolder/d/dwarven_vigilantes.txt
+++ b/res/cardsfolder/d/dwarven_vigilantes.txt
@@ -4,7 +4,7 @@ Types:Creature Dwarf
 Text:no text
 PT:2/2
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may have it deal damage equal to its power to target creature. If you do, CARDNAME assigns no combat damage this turn.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ SVar=DBNoCombatDamage
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ DBNoCombatDamage
 SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage
 SVar:X:Count$CardPower
 SVar:Rarity:Common