diff --git a/res/cardsfolder/m/macabre_waltz.txt b/res/cardsfolder/m/macabre_waltz.txt
index 64f10b98654..a23bd8f4f00 100644
--- a/res/cardsfolder/m/macabre_waltz.txt
+++ b/res/cardsfolder/m/macabre_waltz.txt
@@ -2,7 +2,7 @@ Name:Macabre Waltz
 ManaCost:1 B
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return up to two target creature cards from your graveyard to your hand, then discard a card. | SubAbility$ SVar=DBDiscard
+A:SP$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return up to two target creature cards from your graveyard to your hand, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/m/magma_jet.txt b/res/cardsfolder/m/magma_jet.txt
index 9ecc85b5d83..fb9fed99ff8 100644
--- a/res/cardsfolder/m/magma_jet.txt
+++ b/res/cardsfolder/m/magma_jet.txt
@@ -2,7 +2,7 @@ Name:Magma Jet
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 1 R | Tgt$ TgtCP | NumDmg$ 2 | SubAbility$ SVar=DBScry | SpellDescription$ CARDNAME deals 2 damage to target creature or player. 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$ DealDamage | Cost$ 1 R | Tgt$ TgtCP | NumDmg$ 2 | SubAbility$ DBScry | SpellDescription$ CARDNAME deals 2 damage to target creature or player. 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:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magma_jet.jpg
diff --git a/res/cardsfolder/m/magma_spray.txt b/res/cardsfolder/m/magma_spray.txt
index 8c668c0fb38..f7826c6972a 100644
--- a/res/cardsfolder/m/magma_spray.txt
+++ b/res/cardsfolder/m/magma_spray.txt
@@ -2,7 +2,7 @@ Name:Magma Spray
 ManaCost:R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SubAbility$ SVar=DB | SpellDescription$ CARDNAME deals 2 damage to target creature. If that creature would be put into a graveyard this turn, exile it instead.
+A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SubAbility$ DB | SpellDescription$ CARDNAME deals 2 damage to target creature. If that creature would be put into a graveyard this turn, exile it instead.
 SVar:DB:DB$Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magma_spray.jpg
diff --git a/res/cardsfolder/m/magus_of_the_bazaar.txt b/res/cardsfolder/m/magus_of_the_bazaar.txt
index 6a59c87262b..f6ebe2544b0 100644
--- a/res/cardsfolder/m/magus_of_the_bazaar.txt
+++ b/res/cardsfolder/m/magus_of_the_bazaar.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Human Wizard
 Text:no text
 PT:0/1
-A:AB$ Draw | Cost$ T | NumCards$ 2 | SpellDescription$ Draw two cards, then discard three cards. | SubAbility$ SVar=DBDiscard
+A:AB$ Draw | Cost$ T | NumCards$ 2 | SpellDescription$ Draw two cards, then discard three cards. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 3 | Mode$ TgtChoose
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/m/malakir_bloodwitch.txt b/res/cardsfolder/m/malakir_bloodwitch.txt
index 13fd34838d3..44e01b4b577 100644
--- a/res/cardsfolder/m/malakir_bloodwitch.txt
+++ b/res/cardsfolder/m/malakir_bloodwitch.txt
@@ -6,7 +6,7 @@ PT:4/4
 K:Flying
 K:Protection from white
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters the battlefield, each opponent loses life equal to the number of Vampires you control. You gain life equal to the life lost this way.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ X | SubAbility$ SVar=DBGainLife
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ X | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Count$Valid Vampire.YouCtrl
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/m/malicious_advice.txt b/res/cardsfolder/m/malicious_advice.txt
index f0ca5d9020a..d4f1498bb18 100644
--- a/res/cardsfolder/m/malicious_advice.txt
+++ b/res/cardsfolder/m/malicious_advice.txt
@@ -2,7 +2,7 @@ Name:Malicious Advice
 ManaCost:X U B
 Types:Instant
 Text:no text
-A:SP$ Tap | Cost$ X U B | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SpellDescription$ Tap X target artifacts, creatures, and/or lands. You lose X life. | SubAbility$ SVar=Drain
+A:SP$ Tap | Cost$ X U B | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SpellDescription$ Tap X target artifacts, creatures, and/or lands. You lose X life. | SubAbility$ Drain
 SVar:Drain:DB$LoseLife | LifeAmount$ X
 # 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
diff --git a/res/cardsfolder/m/malignant_growth.txt b/res/cardsfolder/m/malignant_growth.txt
index 8e8b2d02cdc..3565276faa1 100644
--- a/res/cardsfolder/m/malignant_growth.txt
+++ b/res/cardsfolder/m/malignant_growth.txt
@@ -6,7 +6,7 @@ K:Cumulative upkeep:1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, put a growth counter on CARDNAME.
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ Opponent | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each opponent's draw step, that player draws an additional card for each growth counter on CARDNAME, then CARDNAME deals damage to the player equal to the number of cards he or she drew this way.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ GROWTH | CounterNum$ 1
-SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ TriggeredPlayer | NumCards$ X | SubAbility$ SVar=DBDamage
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ TriggeredPlayer | NumCards$ X | SubAbility$ DBDamage
 SVar:DBDamage:DB$DealDamage | Defined$ TriggeredPlayer | NumDmg$ X
 SVar:X:Count$CardCounters.GROWTH
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/m/manabond.txt b/res/cardsfolder/m/manabond.txt
index bd420579cb9..4e14a4484c9 100644
--- a/res/cardsfolder/m/manabond.txt
+++ b/res/cardsfolder/m/manabond.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Enchantment
 Text:no text
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChangeAll | TriggerDescription$ At the beginning of your end step, you may reveal your hand and put all land cards from it onto the battlefield. If you do, discard your hand.
-SVar:TrigChangeAll:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Land.YouCtrl | Origin$ Hand | Destination$ Battlefield | SubAbility$ SVar=DBDiscard
+SVar:TrigChangeAll:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Land.YouCtrl | Origin$ Hand | Destination$ Battlefield | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Mode$ Hand
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/m/mangara_of_corondor.txt b/res/cardsfolder/m/mangara_of_corondor.txt
index cff2faa72f3..9534a07761e 100644
--- a/res/cardsfolder/m/mangara_of_corondor.txt
+++ b/res/cardsfolder/m/mangara_of_corondor.txt
@@ -3,7 +3,7 @@ ManaCost:1 W W
 Types:Legendary Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$ ChangeZone | Cost$ T | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent | SubAbility$ SVar=DBChange | SpellDescription$ Exile CARDNAME and target permanent.
+A:AB$ ChangeZone | Cost$ T | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent | SubAbility$ DBChange | SpellDescription$ Exile CARDNAME and target permanent.
 SVar:DBChange:DB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Exile
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/m/manipulate_fate.txt b/res/cardsfolder/m/manipulate_fate.txt
index 3df873bdc22..c3442a38109 100644
--- a/res/cardsfolder/m/manipulate_fate.txt
+++ b/res/cardsfolder/m/manipulate_fate.txt
@@ -2,7 +2,7 @@ Name:Manipulate Fate
 ManaCost:1 U
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 3 | Mandatory$ True | SpellDescription$ Search your library for three cards, exile them, then shuffle your library. | SubAbility$ SVar=DBDraw
+A:SP$ ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 3 | Mandatory$ True | SpellDescription$ Search your library for three cards, exile them, then shuffle your library. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/m/maralen_of_the_mornsong.txt b/res/cardsfolder/m/maralen_of_the_mornsong.txt
index 97ad52294a5..7d4ed51e178 100644
--- a/res/cardsfolder/m/maralen_of_the_mornsong.txt
+++ b/res/cardsfolder/m/maralen_of_the_mornsong.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Elf Wizard
 Text:Players can't draw cards.
 PT:2/3
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of each player's draw step, that player loses 3 life, searches his or her library for a card, puts it into his or her hand, then shuffles his or her library.
-SVar:TrigDrain:AB$ LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ 3 | SubAbility$ SVar=DBTutor
+SVar:TrigDrain:AB$ LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ 3 | SubAbility$ DBTutor
 SVar:DBTutor:DB$ ChangeZone | DefinedPlayer$ TriggeredPlayer | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/m/march_of_souls.txt b/res/cardsfolder/m/march_of_souls.txt
index ce9772e3560..bcf6a7f3bb9 100644
--- a/res/cardsfolder/m/march_of_souls.txt
+++ b/res/cardsfolder/m/march_of_souls.txt
@@ -2,9 +2,9 @@ Name:March of Souls
 ManaCost:4 W
 Types:Sorcery
 Text:no text
-A:SP$ DestroyAll | Cost$ 4 W | ValidCards$ Creature.YouCtrl | RememberDestroyed$ True | NoRegen$ True | SubAbility$ SVar=DBTokenYou | SpellDescription$ Destroy all creatures. They can't be regenerated. For each creature destroyed this way, its controller puts a 1/1 white Spirit creature token with flying onto the battlefield.
-SVar:DBTokenYou:DB$Token | TokenAmount$ X | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SubAbility$ SVar=DBDestroyOpp
-SVar:DBDestroyOpp:DB$DestroyAll | ValidCards$ Creature.YouDontCtrl | RememberDestroyed$ True | NoRegen$ True | SubAbility$ SVar=DBTokenOpp
+A:SP$ DestroyAll | Cost$ 4 W | ValidCards$ Creature.YouCtrl | RememberDestroyed$ True | NoRegen$ True | SubAbility$ DBTokenYou | SpellDescription$ Destroy all creatures. They can't be regenerated. For each creature destroyed this way, its controller puts a 1/1 white Spirit creature token with flying onto the battlefield.
+SVar:DBTokenYou:DB$Token | TokenAmount$ X | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SubAbility$ DBDestroyOpp
+SVar:DBDestroyOpp:DB$DestroyAll | ValidCards$ Creature.YouDontCtrl | RememberDestroyed$ True | NoRegen$ True | SubAbility$ DBTokenOpp
 SVar:DBTokenOpp:DB$Token | TokenAmount$ Y | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ Opponent | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:X:Remembered$Amount
 SVar:Y:Remembered$Amount
diff --git a/res/cardsfolder/m/marjhan.txt b/res/cardsfolder/m/marjhan.txt
index edb0e12047f..7e9e74be8f9 100644
--- a/res/cardsfolder/m/marjhan.txt
+++ b/res/cardsfolder/m/marjhan.txt
@@ -8,7 +8,7 @@ K:CARDNAME can't attack unless defending player controls an Island.
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Island.YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When you control no Islands, sacrifice CARDNAME.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 A:AB$ Untap | Cost$ U U Sac<1/Creature> | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Untap CARDNAME. Activate this ability only during your upkeep.
-A:AB$ DealDamage | Cost$ U U | NumDmg$ 1 | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | SubAbility$ SVar=DBPump | SpellDescription$ CARDNAME gets -1/-0 until end of turn and deals 1 damage to target attacking creature without flying.
+A:AB$ DealDamage | Cost$ U U | NumDmg$ 1 | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | SubAbility$ DBPump | SpellDescription$ CARDNAME gets -1/-0 until end of turn and deals 1 damage to target attacking creature without flying.
 SVar:DBPump:DB$Pump | NumAtt$ -1| Defined$ Self
 SVar:NeedsToPlay:Island.YouCtrl
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/m/mark_of_mutiny.txt b/res/cardsfolder/m/mark_of_mutiny.txt
index 07b05b3ea3b..a644090a753 100644
--- a/res/cardsfolder/m/mark_of_mutiny.txt
+++ b/res/cardsfolder/m/mark_of_mutiny.txt
@@ -2,7 +2,7 @@ Name:Mark of Mutiny
 ManaCost:2 R
 Types:Sorcery
 Text:no text
-A:SP$ GainControl | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SubAbility$ SVar=DBPutCounter | SpellDescription$ Gain control of target creature until end of turn. Put a +1/+1 counter on it and untap it. That creature gains haste until end of turn.
+A:SP$ GainControl | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SubAbility$ DBPutCounter | SpellDescription$ Gain control of target creature until end of turn. Put a +1/+1 counter on it and untap it. That creature gains haste until end of turn.
 SVar:DBPutCounter:DB$PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mark_of_mutiny.jpg
diff --git a/res/cardsfolder/m/mask_of_memory.txt b/res/cardsfolder/m/mask_of_memory.txt
index 9a5966cb2c3..92ea23f59cf 100644
--- a/res/cardsfolder/m/mask_of_memory.txt
+++ b/res/cardsfolder/m/mask_of_memory.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:no text
 K:eqPump 1:+0/+0
 T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, you may draw two cards. If you do, discard a card.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 2 | SubAbility$ SVar=DBDiscard
+SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 2 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mask_of_memory.jpg
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/m/matsu_tribe_birdstalker.txt b/res/cardsfolder/m/matsu_tribe_birdstalker.txt
index a457d04dcc0..3a149be8fa9 100644
--- a/res/cardsfolder/m/matsu_tribe_birdstalker.txt
+++ b/res/cardsfolder/m/matsu_tribe_birdstalker.txt
@@ -4,7 +4,7 @@ Types:Creature Snake Warrior Archer
 Text:no text
 PT:2/2
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
-SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredTarget | SubAbility$ SVar=DBPump
+SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredTarget | SubAbility$ DBPump
 SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
 A:AB$ Pump | Cost$ G | KW$ Reach | SpellDescription$ CARDNAME gains reach until end of turn. (It can block creatures with flying.)
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/m/matsu_tribe_sniper.txt b/res/cardsfolder/m/matsu_tribe_sniper.txt
index 4a87824bce8..6b88dd29a8f 100644
--- a/res/cardsfolder/m/matsu_tribe_sniper.txt
+++ b/res/cardsfolder/m/matsu_tribe_sniper.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:1/1
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature with flying.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
-SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredTarget | SubAbility$ SVar=DBPump
+SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredTarget | SubAbility$ DBPump
 SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/matsu_tribe_sniper.jpg
diff --git a/res/cardsfolder/m/mayaels_aria.txt b/res/cardsfolder/m/mayaels_aria.txt
index 37f7d70f521..abe1350b9f5 100644
--- a/res/cardsfolder/m/mayaels_aria.txt
+++ b/res/cardsfolder/m/mayaels_aria.txt
@@ -3,8 +3,8 @@ ManaCost:R G W
 Types:Enchantment
 Text:no text
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounterAll | TriggerDescription$ At the beginning of your upkeep, put a +1/+1 counter on each creature you control if you control a creature with power 5 or greater. Then you gain 10 life if you control a creature with power 10 or greater. Then you win the game if you control a creature with power 20 or greater.
-SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Creature.YouCtrl+powerGE5 | SubAbility$ SVar=DBGainLife
-SVar:DBGainLife:DB$ GainLife | LifeAmount$ 10 | Defined$ You | ConditionPresent$ Creature.YouCtrl+powerGE10 | SubAbility$ SVar=DBWinGame
+SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Creature.YouCtrl+powerGE5 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 10 | Defined$ You | ConditionPresent$ Creature.YouCtrl+powerGE10 | SubAbility$ DBWinGame
 SVar:DBWinGame:DB$ WinsGame | Defined$ You | ConditionPresent$ Creature.YouCtrl+powerGE20
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mayaels_aria.jpg
diff --git a/res/cardsfolder/m/maze_of_ith.txt b/res/cardsfolder/m/maze_of_ith.txt
index fa7dfadb4ae..5f5d1ad2df3 100644
--- a/res/cardsfolder/m/maze_of_ith.txt
+++ b/res/cardsfolder/m/maze_of_ith.txt
@@ -2,7 +2,7 @@ Name:Maze of Ith
 ManaCost:no cost
 Types:Land
 Text:no text
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | KW$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME. | SubAbility$ SVar=DBUntap | IsCurse$ True | SpellDescription$ Untap target attacking creature. Prevent all combat damage that would be dealt to and dealt by that creature this turn.
+A:AB$ Pump | Cost$ T | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | KW$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME. | SubAbility$ DBUntap | IsCurse$ True | SpellDescription$ Untap target attacking creature. Prevent all combat damage that would be dealt to and dealt by that creature this turn.
 SVar:DBUntap:DB$Untap | Defined$ Targeted
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/maze_of_ith.jpg
diff --git a/res/cardsfolder/m/maze_of_shadows.txt b/res/cardsfolder/m/maze_of_shadows.txt
index 88b0a4361dc..efc65b51dad 100644
--- a/res/cardsfolder/m/maze_of_shadows.txt
+++ b/res/cardsfolder/m/maze_of_shadows.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.attacking+withShadow | TgtPrompt$ Select target attacking creature with shadow | KW$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME. | SubAbility$ SVar=DBUntap | SpellDescription$ Untap target attacking creature with shadow. Prevent all combat damage that would be dealt to and dealt by that creature this turn.
+A:AB$ Pump | Cost$ T | ValidTgts$ Creature.attacking+withShadow | TgtPrompt$ Select target attacking creature with shadow | KW$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME. | SubAbility$ DBUntap | SpellDescription$ Untap target attacking creature with shadow. Prevent all combat damage that would be dealt to and dealt by that creature this turn.
 SVar:DBUntap:DB$Untap | Defined$ Targeted
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/m/meditate.txt b/res/cardsfolder/m/meditate.txt
index 0b5083a3930..da3a42426d5 100644
--- a/res/cardsfolder/m/meditate.txt
+++ b/res/cardsfolder/m/meditate.txt
@@ -2,7 +2,7 @@ Name:Meditate
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$ Draw | Cost$ 2 U | NumCards$ 4 | Defined$ You | SpellDescription$ Draw four cards. You skip your next turn. | SubAbility$ SVar=DBSkip
+A:SP$ Draw | Cost$ 2 U | NumCards$ 4 | Defined$ You | SpellDescription$ Draw four cards. You skip your next turn. | SubAbility$ DBSkip
 SVar:DBSkip:DB$AddTurn | Defined$ Opponent | NumTurns$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/meditate.jpg
diff --git a/res/cardsfolder/m/melt_terrain.txt b/res/cardsfolder/m/melt_terrain.txt
index 9041e0cc077..adf307f9255 100644
--- a/res/cardsfolder/m/melt_terrain.txt
+++ b/res/cardsfolder/m/melt_terrain.txt
@@ -2,7 +2,7 @@ Name:Melt Terrain
 ManaCost:2 R R
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 2 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ SVar=DBDealDamage | SpellDescription$ Destroy target land. CARDNAME deals 2 damage to that land's controller.
+A:SP$ Destroy | Cost$ 2 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDealDamage | SpellDescription$ Destroy target land. CARDNAME deals 2 damage to that land's controller.
 SVar:DBDealDamage:DB$DealDamage | NumDmg$ 2 | Defined$ TargetedController
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/melt_terrain.jpg
diff --git a/res/cardsfolder/m/mental_note.txt b/res/cardsfolder/m/mental_note.txt
index 91c3a5e5783..1aed48c6759 100644
--- a/res/cardsfolder/m/mental_note.txt
+++ b/res/cardsfolder/m/mental_note.txt
@@ -2,7 +2,7 @@ Name:Mental Note
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$ Mill | Cost$ U | NumCards$ 2 | Defined$ You | SubAbility$ SVar=DBDraw | SpellDescription$ Put the top two cards of your library into your graveyard. Draw a card.
+A:SP$ Mill | Cost$ U | NumCards$ 2 | Defined$ You | SubAbility$ DBDraw | SpellDescription$ Put the top two cards of your library into your graveyard. Draw a card.
 SVar:DBDraw:DB$Draw | Cost$ 0 | NumCards$ 1
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/m/mercurial_kite.txt b/res/cardsfolder/m/mercurial_kite.txt
index 47153279113..c729c6c6040 100644
--- a/res/cardsfolder/m/mercurial_kite.txt
+++ b/res/cardsfolder/m/mercurial_kite.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
-SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredTarget | SubAbility$ SVar=DBPump
+SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredTarget | SubAbility$ DBPump
 SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mercurial_kite.jpg
diff --git a/res/cardsfolder/m/merfolk_traders.txt b/res/cardsfolder/m/merfolk_traders.txt
index e3989e9e977..8fe99105dc7 100644
--- a/res/cardsfolder/m/merfolk_traders.txt
+++ b/res/cardsfolder/m/merfolk_traders.txt
@@ -4,7 +4,7 @@ Types:Creature Merfolk
 Text:no text
 PT:1/2
 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://www.wizards.com/global/images/magic/general/merfolk_traders.jpg
diff --git a/res/cardsfolder/m/midnight_ritual.txt b/res/cardsfolder/m/midnight_ritual.txt
index 80f33ed19ca..6c79e6ebb76 100644
--- a/res/cardsfolder/m/midnight_ritual.txt
+++ b/res/cardsfolder/m/midnight_ritual.txt
@@ -2,7 +2,7 @@ Name:Midnight Ritual
 ManaCost:X 2 B
 Types:Instant
 Text:no text
-A:SP$ ChangeZone | Cost$ X 2 B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ MaxTgts | SubAbility$ SVar=DBToken | SpellDescription$ Exile X target creature cards from your graveyard. For each creature card exiled this way, put a 2/2 black Zombie creature token onto the battlefield.
+A:SP$ ChangeZone | Cost$ X 2 B | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ MaxTgts | SubAbility$ DBToken | SpellDescription$ Exile X target creature cards from your graveyard. For each creature card exiled this way, put a 2/2 black Zombie creature token onto the battlefield.
 SVar:DBToken:DB$Token | TokenImage$ B 2 2 Zombie | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ You | TokenAmount$ X
 SVar:X:Targeted$Amount
 SVar:MaxTgts:Count$TypeInYourYard.Creature
diff --git a/res/cardsfolder/m/mikokoro_center_of_the_sea.txt b/res/cardsfolder/m/mikokoro_center_of_the_sea.txt
index 51dbd14fb10..eabf2aa32d2 100644
--- a/res/cardsfolder/m/mikokoro_center_of_the_sea.txt
+++ b/res/cardsfolder/m/mikokoro_center_of_the_sea.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Legendary Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ Draw | Cost$ 2 T | NumCards$ 1 | SubAbility$ SVar=DBDraw | SpellDescription$ Each player draws a card.
+A:AB$ Draw | Cost$ 2 T | NumCards$ 1 | SubAbility$ DBDraw | SpellDescription$ Each player draws a card.
 SVar:DBDraw:DB$Draw | Defined$ Opponent | NumCards$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mikokoro_center_of_the_sea.jpg
diff --git a/res/cardsfolder/m/mind_ravel.txt b/res/cardsfolder/m/mind_ravel.txt
index 8212ed4dc36..ac2e744c50a 100644
--- a/res/cardsfolder/m/mind_ravel.txt
+++ b/res/cardsfolder/m/mind_ravel.txt
@@ -2,7 +2,7 @@ Name:Mind Ravel
 ManaCost:2 B
 Types:Sorcery
 Text:no text
-A:SP$ Discard | Cost$ 2 B | ValidTgts$ Player | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ SVar=DBDraw | SpellDescription$ Target player discards a card. Draw a card at the beginning of the next turn's upkeep.
+A:SP$ Discard | Cost$ 2 B | ValidTgts$ Player | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBDraw | SpellDescription$ Target player discards a card. Draw a card at the beginning of the next turn's upkeep.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mind_ravel.jpg
diff --git a/res/cardsfolder/m/mind_swords.txt b/res/cardsfolder/m/mind_swords.txt
index 6cab828b838..6ae563e123a 100644
--- a/res/cardsfolder/m/mind_swords.txt
+++ b/res/cardsfolder/m/mind_swords.txt
@@ -2,8 +2,8 @@ Name:Mind Swords
 ManaCost:1 B
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZone | Cost$ 1 B | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True | Mandatory$ True | SubAbility$ SVar=DBExileOpp | SpellDescription$ Each player exiles two cards from his or her hand.
-A:SP$ ChangeZone | Cost$ Sac<1/Creature> | IsPresent$ Swamp.YouCtrl | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True | Mandatory$ True | SubAbility$ SVar=DBExileOpp | CostDesc$ If you control a Swamp, you may sacrifice a creature | SpellDescription$ rather than pay CARDNAME's mana cost.
+A:SP$ ChangeZone | Cost$ 1 B | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True | Mandatory$ True | SubAbility$ DBExileOpp | SpellDescription$ Each player exiles two cards from his or her hand.
+A:SP$ ChangeZone | Cost$ Sac<1/Creature> | IsPresent$ Swamp.YouCtrl | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True | Mandatory$ True | SubAbility$ DBExileOpp | CostDesc$ If you control a Swamp, you may sacrifice a creature | SpellDescription$ rather than pay CARDNAME's mana cost.
 SVar:DBExileOpp:DB$ChangeZone | Defined$ Opponent | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Mandatory$ True | Hidden$ True
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/m/mindculling.txt b/res/cardsfolder/m/mindculling.txt
index 7f2255083bc..52db989f95c 100644
--- a/res/cardsfolder/m/mindculling.txt
+++ b/res/cardsfolder/m/mindculling.txt
@@ -2,7 +2,7 @@ Name:Mindculling
 ManaCost:5 U
 Types:Sorcery
 Text:no text
-A:SP$ Discard | Cost$ 5 U | ValidTgts$ Opponent | NumCards$ 2 | Mode$ TgtChoose | SubAbility$ SVar=DBDraw | SpellDescription$ You draw two cards and target opponent discards two cards.
+A:SP$ Discard | Cost$ 5 U | ValidTgts$ Opponent | NumCards$ 2 | Mode$ TgtChoose | SubAbility$ DBDraw | SpellDescription$ You draw two cards and target opponent discards two cards.
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mindculling.jpg
diff --git a/res/cardsfolder/m/mindslicer.txt b/res/cardsfolder/m/mindslicer.txt
index 51b9f8d6596..9c6b79d2971 100644
--- a/res/cardsfolder/m/mindslicer.txt
+++ b/res/cardsfolder/m/mindslicer.txt
@@ -4,7 +4,7 @@ Types:Creature Horror
 Text:no text
 PT:4/3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, each player discards his or her hand.
-SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ You | Mode$ Hand | SubAbility$ SVar=DBDiscard
+SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ You | Mode$ Hand | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ Opponent | Mode$ Hand
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mindslicer.jpg
diff --git a/res/cardsfolder/m/minions_murmurs.txt b/res/cardsfolder/m/minions_murmurs.txt
index a15ce89d446..f15612c8036 100644
--- a/res/cardsfolder/m/minions_murmurs.txt
+++ b/res/cardsfolder/m/minions_murmurs.txt
@@ -2,7 +2,7 @@ Name:Minions' Murmurs
 ManaCost:2 B B
 Types:Sorcery
 Text:no text
-A:SP$ Draw | Cost$ 2 B B | NumCards$ X | SpellDescription$ You draw X cards and you lose X life, where X is the number of creatures you control. | SubAbility$ SVar=DB1
+A:SP$ Draw | Cost$ 2 B B | NumCards$ X | SpellDescription$ You draw X cards and you lose X life, where X is the number of creatures you control. | SubAbility$ DB1
 SVar:DB1:DB$LoseLife | LifeAmount$ X
 SVar:X:Count$TypeYouCtrl.Creature
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/m/miraculous_recovery.txt b/res/cardsfolder/m/miraculous_recovery.txt
index 6b0525bff7f..ed0fe7db38d 100644
--- a/res/cardsfolder/m/miraculous_recovery.txt
+++ b/res/cardsfolder/m/miraculous_recovery.txt
@@ -2,7 +2,7 @@ Name:Miraculous Recovery
 ManaCost:4 W
 Types:Instant
 Text:no text
-A:SP$ ChangeZone | Cost$ 4 W | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SubAbility$ SVar=DBPutCounter| SpellDescription$ Return target creature card from your graveyard to the battlefield. Put a +1/+1 counter on it.
+A:SP$ ChangeZone | Cost$ 4 W | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SubAbility$ DBPutCounter| SpellDescription$ Return target creature card from your graveyard to the battlefield. Put a +1/+1 counter on it.
 SVar:DBPutCounter:DB$PutCounter | CounterType$ P1P1 | CounterNum$ 1 | Defined$ Targeted
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/miraculous_recovery.jpg
diff --git a/res/cardsfolder/m/misfortunes_gain.txt b/res/cardsfolder/m/misfortunes_gain.txt
index 99c0ba933ab..d5caf084573 100644
--- a/res/cardsfolder/m/misfortunes_gain.txt
+++ b/res/cardsfolder/m/misfortunes_gain.txt
@@ -2,7 +2,7 @@ Name:Misfortune's Gain
 ManaCost:3 W
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 3 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ SVar=DBGainLife | SpellDescription$ Destroy target creature. Its owner gains 4 life.
+A:SP$ Destroy | Cost$ 3 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBGainLife | SpellDescription$ Destroy target creature. Its owner gains 4 life.
 SVar:DBGainLife:DB$GainLife | Defined$ TargetedOwner | LifeAmount$ 4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/misfortunes_gain.jpg
diff --git a/res/cardsfolder/m/mistform_dreamer.txt b/res/cardsfolder/m/mistform_dreamer.txt
index a85ab735c01..1f54b5b80a7 100644
--- a/res/cardsfolder/m/mistform_dreamer.txt
+++ b/res/cardsfolder/m/mistform_dreamer.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:2/1
 K:Flying
-A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | SubAbility$ SVar=DBAnimate | SpellDescription$ CARDNAME becomes the creature type of your choice until end of turn.
+A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | SubAbility$ DBAnimate | SpellDescription$ CARDNAME becomes the creature type of your choice until end of turn.
 SVar:DBAnimate:DB$ Animate | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/m/mistform_mutant.txt b/res/cardsfolder/m/mistform_mutant.txt
index 35fb56173f6..50aafe8a034 100644
--- a/res/cardsfolder/m/mistform_mutant.txt
+++ b/res/cardsfolder/m/mistform_mutant.txt
@@ -3,7 +3,7 @@ ManaCost:4 U U
 Types:Creature Illusion Mutant
 Text:no text
 PT:3/4
-A:AB$ ChooseType | Cost$ 1 U | Defined$ You | Type$ Creature | InvalidTypes$ Wall | SubAbility$ SVar=DBAnimate | SpellDescription$ Choose a creature type other than Wall. Target creature becomes that type until end of turn.
+A:AB$ ChooseType | Cost$ 1 U | Defined$ You | Type$ Creature | InvalidTypes$ Wall | SubAbility$ DBAnimate | SpellDescription$ Choose a creature type other than Wall. Target creature becomes that type until end of turn.
 SVar:DBAnimate:DB$ Animate | ValidTgts$ Creature | TgtPrompt$ Select target creature | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/m/mistform_seaswift.txt b/res/cardsfolder/m/mistform_seaswift.txt
index e3bc10ce2e7..8541ddb7794 100644
--- a/res/cardsfolder/m/mistform_seaswift.txt
+++ b/res/cardsfolder/m/mistform_seaswift.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:3/1
 K:Flying
-A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | SubAbility$ SVar=DBAnimate | SpellDescription$ CARDNAME becomes the creature type of your choice until end of turn.
+A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | SubAbility$ DBAnimate | SpellDescription$ CARDNAME becomes the creature type of your choice until end of turn.
 SVar:DBAnimate:DB$ Animate | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True
 K:Morph:1 U
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/m/mistform_shrieker.txt b/res/cardsfolder/m/mistform_shrieker.txt
index b49d4ea05bc..4d0d73711f0 100644
--- a/res/cardsfolder/m/mistform_shrieker.txt
+++ b/res/cardsfolder/m/mistform_shrieker.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:3/3
 K:Flying
-A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | SubAbility$ SVar=DBAnimate | SpellDescription$ CARDNAME becomes the creature type of your choice until end of turn.
+A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | SubAbility$ DBAnimate | SpellDescription$ CARDNAME becomes the creature type of your choice until end of turn.
 SVar:DBAnimate:DB$ Animate | Defined$ Self | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True
 K:Morph:3 U U
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/m/mistform_skyreaver.txt b/res/cardsfolder/m/mistform_skyreaver.txt
index b36fc455da7..b0e864e36b5 100644
--- a/res/cardsfolder/m/mistform_skyreaver.txt
+++ b/res/cardsfolder/m/mistform_skyreaver.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:6/6
 K:Flying
-A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | SubAbility$ SVar=DBAnimate | SpellDescription$ CARDNAME becomes the creature type of your choice until end of turn.
+A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | SubAbility$ DBAnimate | SpellDescription$ CARDNAME becomes the creature type of your choice until end of turn.
 SVar:DBAnimate:DB$ Animate | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/m/mistform_stalker.txt b/res/cardsfolder/m/mistform_stalker.txt
index 5e8a2cb1047..19ada7a04fb 100644
--- a/res/cardsfolder/m/mistform_stalker.txt
+++ b/res/cardsfolder/m/mistform_stalker.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Illusion
 Text:no text
 PT:1/1
-A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | SubAbility$ SVar=DBAnimate | SpellDescription$ CARDNAME becomes the creature type of your choice until end of turn.
+A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | SubAbility$ DBAnimate | SpellDescription$ CARDNAME becomes the creature type of your choice until end of turn.
 SVar:DBAnimate:DB$ Animate | Defined$ Self | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True
 A:AB$ Pump | Cost$ 2 U U | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | KW$ Flying | SpellDescription$ CARDNAME gets +2/+2 and gains flying until end of turn.
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/m/mogg_bombers.txt b/res/cardsfolder/m/mogg_bombers.txt
index c0f850a8cf2..59b32b8f851 100644
--- a/res/cardsfolder/m/mogg_bombers.txt
+++ b/res/cardsfolder/m/mogg_bombers.txt
@@ -4,7 +4,7 @@ Types:Creature Goblin
 Text:no text
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other |TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When another creature enters the battlefield, sacrifice Mogg Bombers. If you do, it deals 3 damage to target player.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ SVar=DBDamage | RememberSacrificed$ True
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ DBDamage | RememberSacrificed$ True
 SVar:DBDamage:DB$DealDamage | Cost$ 0 | Tgt$ TgtP | NumDmg$ 3 | ConditionDefined$ Remembered | ConditionPresent$ Card.Self
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mogg_bombers.jpg
diff --git a/res/cardsfolder/m/mogg_hollows.txt b/res/cardsfolder/m/mogg_hollows.txt
index 3bcc816cc77..9e33db74bc8 100644
--- a/res/cardsfolder/m/mogg_hollows.txt
+++ b/res/cardsfolder/m/mogg_hollows.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$ R | SpellDescription$ Add R to your mana pool. CARDNAME doesn't untap during your next untap step. | SubAbility$ SVar=DBPump
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool. CARDNAME doesn't untap during your next untap step. | SubAbility$ SVar=DBPump
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
 SVar:DBPump:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://magiccards.info/scans/en/br/45.jpg
diff --git a/res/cardsfolder/m/moldgraf_monstrosity.txt b/res/cardsfolder/m/moldgraf_monstrosity.txt
index e126efdfc6a..987396e0bda 100644
--- a/res/cardsfolder/m/moldgraf_monstrosity.txt
+++ b/res/cardsfolder/m/moldgraf_monstrosity.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:8/8
 K:Trample
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, exile it, then return two creature cards at random from your graveyard to the battlefield.
-SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ SVar=DBChangeZone
+SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ChangeZone | ChangeType$ Creature.YouCtrl | ChangeNum$ 2 | Hidden$ True | Origin$ Graveyard | AtRandom$ True | Destination$ Battlefield
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moldgraf_monstrosity.jpg
diff --git a/res/cardsfolder/m/molten_rain.txt b/res/cardsfolder/m/molten_rain.txt
index 3e9c575251b..6455b298934 100644
--- a/res/cardsfolder/m/molten_rain.txt
+++ b/res/cardsfolder/m/molten_rain.txt
@@ -2,7 +2,7 @@ Name:Molten Rain
 ManaCost:1 R R
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 1 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ SVar=DBDamage | SpellDescription$ Destroy target land. If that land is nonbasic, Molten Rain deals 2 damage to the land's controller.
+A:SP$ Destroy | Cost$ 1 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBDamage | SpellDescription$ Destroy target land. If that land is nonbasic, Molten Rain deals 2 damage to the land's controller.
 SVar:DBDamage:DB$ DealDamage | Defined$ TargetedController | NumDmg$ 2 | ConditionDefined$ Targeted | ConditionPresent$ Land.Basic | ConditionCompare$ EQ0 | ConditionDescription$ If that land is nonbasic,
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/mrd/en-us/card46000.jpg
diff --git a/res/cardsfolder/m/momentary_blink.txt b/res/cardsfolder/m/momentary_blink.txt
index 97425d385ae..80d8ef85016 100644
--- a/res/cardsfolder/m/momentary_blink.txt
+++ b/res/cardsfolder/m/momentary_blink.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Instant
 Text:no text
 K:Flashback 3 U
-A:SP$ChangeZone | Cost$ 1 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.YouCtrl | RememberTargets$ True | ForgetOtherTargets$ True | TgtPrompt$ Select target creature you control. | SubAbility$ SVar=DBReturn | SpellDescription$ Exile target creature you control, then return it to the battlefield under its owner's control.
+A:SP$ChangeZone | Cost$ 1 W | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.YouCtrl | RememberTargets$ True | ForgetOtherTargets$ True | TgtPrompt$ Select target creature you control. | SubAbility$ DBReturn | SpellDescription$ Exile target creature you control, then return it to the battlefield under its owner's control.
 SVar:DBReturn:DB$ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/momentary_blink.jpg
diff --git a/res/cardsfolder/m/momentous_fall.txt b/res/cardsfolder/m/momentous_fall.txt
index df5bebdfd0c..0e574e7b1a2 100644
--- a/res/cardsfolder/m/momentous_fall.txt
+++ b/res/cardsfolder/m/momentous_fall.txt
@@ -2,7 +2,7 @@ Name:Momentous Fall
 ManaCost:2 G G
 Types:Instant
 Text:no text
-A:SP$ Draw | Cost$ 2 G G Sac<1/Creature> | NumCards$ XPower | SubAbility$ SVar=DBGainLife | SpellDescription$  You draw cards equal to the sacrificed creature's power, then you gain life equal to its toughness.
+A:SP$ Draw | Cost$ 2 G G Sac<1/Creature> | NumCards$ XPower | SubAbility$ DBGainLife | SpellDescription$  You draw cards equal to the sacrificed creature's power, then you gain life equal to its toughness.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ XToughness
 SVar:XPower:Sacrificed$CardPower
 SVar:XToughness:Sacrificed$CardToughness
diff --git a/res/cardsfolder/m/monkey_cage.txt b/res/cardsfolder/m/monkey_cage.txt
index 890a9004229..67c132b0b25 100644
--- a/res/cardsfolder/m/monkey_cage.txt
+++ b/res/cardsfolder/m/monkey_cage.txt
@@ -3,7 +3,7 @@ ManaCost:5
 Types:Artifact
 Text:no text
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature |TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When a creature enters the battlefield, sacrifice Monkey Cage and put X 2/2 green Ape creature tokens onto the battlefield, where X is that creature's converted mana cost.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ SVar=DBToken | RememberSacrificed$ True
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ DBToken | RememberSacrificed$ True
 SVar:DBToken:DB$Token | Cost$ 0 | ConditionDefined$ Remembered | ConditionPresent$ Card.Self | TokenAmount$ X | TokenName$ Ape | TokenTypes$ Creature,Ape | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2
 SVar:X:TriggeredCard$CardManaCost
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/m/moonbow_illusionist.txt b/res/cardsfolder/m/moonbow_illusionist.txt
index cc1f1c23b64..13867783ba1 100644
--- a/res/cardsfolder/m/moonbow_illusionist.txt
+++ b/res/cardsfolder/m/moonbow_illusionist.txt
@@ -4,7 +4,7 @@ Types:Creature Moonfolk Wizard
 Text:no text
 PT:2/1
 K:Flying
-A:AB$ ChooseType | Cost$ 2 Return <1/Land> | 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$ 2 Return <1/Land> | 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/m/morbid_bloom.txt b/res/cardsfolder/m/morbid_bloom.txt
index 0f421bcf128..33a38173a9b 100644
--- a/res/cardsfolder/m/morbid_bloom.txt
+++ b/res/cardsfolder/m/morbid_bloom.txt
@@ -2,7 +2,7 @@ Name:Morbid Bloom
 ManaCost:4 B G
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZone | Cost$ 4 B G | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Creature | SubAbility$ SVar=DBToken | SpellDescription$ Exile target creature card from a graveyard, then put X 1/1 green Saproling creature tokens onto the battlefield, where X is the exiled card's toughness.
+A:SP$ ChangeZone | Cost$ 4 B G | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Creature | SubAbility$ DBToken | SpellDescription$ Exile target creature card from a graveyard, then put X 1/1 green Saproling creature tokens onto the battlefield, where X is the exiled card's toughness.
 SVar:DBToken:DB$Token | Cost$ 0 | TokenAmount$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:X:Targeted$CardToughness
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/m/morbid_hunger.txt b/res/cardsfolder/m/morbid_hunger.txt
index edd4dae9955..230f91cd4fe 100644
--- a/res/cardsfolder/m/morbid_hunger.txt
+++ b/res/cardsfolder/m/morbid_hunger.txt
@@ -3,7 +3,7 @@ ManaCost:4 B B
 Types:Sorcery
 Text:no text
 K:Flashback 7 B B
-A:SP$ DealDamage | Cost$ 4 B B | Tgt$ TgtCP | NumDmg$ 3 | SubAbility$ SVar=DB | SpellDescription$ CARDNAME deals 3 damage to target creature or player. You gain 3 life.
+A:SP$ DealDamage | Cost$ 4 B B | Tgt$ TgtCP | NumDmg$ 3 | SubAbility$ DB | SpellDescription$ CARDNAME deals 3 damage to target creature or player. You gain 3 life.
 SVar:DB:DB$GainLife | LifeAmount$ 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/morbid_hunger.jpg
diff --git a/res/cardsfolder/m/moriok_replica.txt b/res/cardsfolder/m/moriok_replica.txt
index 2d427dcaa4b..3f8a9493bbd 100644
--- a/res/cardsfolder/m/moriok_replica.txt
+++ b/res/cardsfolder/m/moriok_replica.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact Creature Warrior
 Text:no text
 PT:2/2
-A:AB$ Draw | Cost$ 1 B Sac<1/CARDNAME> | NumCards$ 2 | SubAbility$ SVar=DBLoseLife | SpellDescription$ You draw two cards and lose 2 life.
+A:AB$ Draw | Cost$ 1 B Sac<1/CARDNAME> | NumCards$ 2 | SubAbility$ DBLoseLife | SpellDescription$ You draw two cards and lose 2 life.
 SVar:DBLoseLife:DB$LoseLife | LifeAmount$ 2
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/m/morsel_theft.txt b/res/cardsfolder/m/morsel_theft.txt
index 4c72fb3c4ac..7ba7847e393 100644
--- a/res/cardsfolder/m/morsel_theft.txt
+++ b/res/cardsfolder/m/morsel_theft.txt
@@ -2,9 +2,9 @@ Name:Morsel Theft
 ManaCost:2 B B
 Types:Tribal Sorcery Rogue
 Text:no text
-A:SP$ LoseLife | Cost$ 1 B | Activation$ Prowl | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | SubAbility$ SVar=DBDraw | PrecostDesc$ Prowl 1 B | SpellDescription$ (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Rogue.)
-A:SP$ LoseLife | Cost$ 2 B B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | SubAbility$ SVar=DBGainLife | SpellDescription$ Target player loses 3 life and you gain 3 life. If CARDNAME's prowl cost was paid, draw a card.
-SVar:DBDraw:DB$Draw | NumCards$ 1 | SubAbility$ SVar=DBGainLife
+A:SP$ LoseLife | Cost$ 1 B | Activation$ Prowl | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | SubAbility$ DBDraw | PrecostDesc$ Prowl 1 B | SpellDescription$ (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Rogue.)
+A:SP$ LoseLife | Cost$ 2 B B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 3 life and you gain 3 life. If CARDNAME's prowl cost was paid, draw a card.
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/morsel_theft.jpg
diff --git a/res/cardsfolder/m/mossfire_egg.txt b/res/cardsfolder/m/mossfire_egg.txt
index 81d6f802130..cf237bd438b 100644
--- a/res/cardsfolder/m/mossfire_egg.txt
+++ b/res/cardsfolder/m/mossfire_egg.txt
@@ -2,7 +2,7 @@ Name:Mossfire Egg
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ R G | SubAbility$ SVar=DBDraw | SpellDescription$ Add R G to your mana pool. Draw a card.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ R G | SubAbility$ DBDraw | SpellDescription$ Add R G to your mana pool. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/m/mtenda_griffin.txt b/res/cardsfolder/m/mtenda_griffin.txt
index f0fe60072bb..b00b67d0064 100644
--- a/res/cardsfolder/m/mtenda_griffin.txt
+++ b/res/cardsfolder/m/mtenda_griffin.txt
@@ -4,7 +4,7 @@ Types:Creature Griffin
 Text:no text
 PT:2/2
 K:Flying
-A:AB$ ChangeZone | Cost$ W T | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Hand | SubAbility$ SVar=DBBounce | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return CARDNAME to its owner's hand and return target Griffin card from your graveyard to your hand. Activate this ability only during your upkeep.
+A:AB$ ChangeZone | Cost$ W T | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBBounce | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return CARDNAME to its owner's hand and return target Griffin card from your graveyard to your hand. Activate this ability only during your upkeep.
 SVar:DBBounce:DB$ChangeZone | ValidTgts$ Griffin.YouCtrl | TgtPrompt$ Select target Griffin from your graveyard | Origin$ Graveyard | Destination$ Hand
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mtenda_griffin.jpg
diff --git a/res/cardsfolder/m/multanis_decree.txt b/res/cardsfolder/m/multanis_decree.txt
index a6bc4920a05..3ee514d8545 100644
--- a/res/cardsfolder/m/multanis_decree.txt
+++ b/res/cardsfolder/m/multanis_decree.txt
@@ -1,7 +1,7 @@
 Name:Multani's Decree
 ManaCost:3 G
 Types:Sorcery
-A:SP$ DestroyAll | Cost$ 3 G | ValidCards$ Enchantment | RememberDestroyed$ True | SubAbility$ SVar=DBGainLife | SpellDescription$ Destroy all enchantments. You gain 2 life for each enchantment destroyed this way.
+A:SP$ DestroyAll | Cost$ 3 G | ValidCards$ Enchantment | RememberDestroyed$ True | SubAbility$ DBGainLife | SpellDescription$ Destroy all enchantments. You gain 2 life for each enchantment destroyed this way.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ X
 SVar:X:Remembered$Amount.Twice
 SVar:Rarity:Common
diff --git a/res/cardsfolder/m/murder_of_crows.txt b/res/cardsfolder/m/murder_of_crows.txt
index 79049dafc35..856c4a2a435 100644
--- a/res/cardsfolder/m/murder_of_crows.txt
+++ b/res/cardsfolder/m/murder_of_crows.txt
@@ -5,8 +5,8 @@ Text:no text
 PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another creature dies, you may draw a card. If you do, discard a card.
-SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 1 | SubAbility$ SVar=DBDiscard | OptionalDecider$ You | RememberDrawn$ True
-SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ SVar=DBCleanup
+SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 1 | SubAbility$ DBDiscard | OptionalDecider$ You | RememberDrawn$ True
+SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/m/murmuring_bosk.txt b/res/cardsfolder/m/murmuring_bosk.txt
index 00a9a83793d..b399c544240 100644
--- a/res/cardsfolder/m/murmuring_bosk.txt
+++ b/res/cardsfolder/m/murmuring_bosk.txt
@@ -2,8 +2,8 @@ Name:Murmuring Bosk
 ManaCost:no cost
 Types:Land Forest
 Text:As CARDNAME enters the battlefield, you may reveal a Treefolk card from your hand. If you don't, CARDNAME enters the battlefield tapped.
-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
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/murmuring_bosk.jpg
diff --git a/res/cardsfolder/m/mwonvuli_acid_moss.txt b/res/cardsfolder/m/mwonvuli_acid_moss.txt
index ea58f2146bc..ed4939beeef 100644
--- a/res/cardsfolder/m/mwonvuli_acid_moss.txt
+++ b/res/cardsfolder/m/mwonvuli_acid_moss.txt
@@ -2,7 +2,7 @@ Name:Mwonvuli Acid-Moss
 ManaCost:2 G G
 Types:Sorcery
 Text:no text
-A:SP$ Destroy | Cost$ 2 G G | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ SVar=DBSearch | SpellDescription$ Destroy target land. Search your library for a Forest card and put that card onto the battlefield tapped. Then shuffle your library.
+A:SP$ Destroy | Cost$ 2 G G | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBSearch | SpellDescription$ Destroy target land. Search your library for a Forest card and put that card onto the battlefield tapped. Then shuffle your library.
 SVar:DBSearch:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest | ChangeNum$ 1 | Tapped$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mwonvuli_acid_moss.jpg
diff --git a/res/cardsfolder/m/mystic_compass.txt b/res/cardsfolder/m/mystic_compass.txt
index e85004aa76e..1f388ed677f 100644
--- a/res/cardsfolder/m/mystic_compass.txt
+++ b/res/cardsfolder/m/mystic_compass.txt
@@ -2,7 +2,7 @@ Name:Mystic Compass
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$ ChooseType | Cost$ 1 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$ 1 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:Uncommon
diff --git a/res/cardsfolder/m/mystic_melting.txt b/res/cardsfolder/m/mystic_melting.txt
index fc6c35b5707..3779d0e93c2 100644
--- a/res/cardsfolder/m/mystic_melting.txt
+++ b/res/cardsfolder/m/mystic_melting.txt
@@ -2,7 +2,7 @@ Name:Mystic Melting
 ManaCost:3 G
 Types:Instant
 Text:no text
-A:SP$ Destroy | Cost$ 3 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment. | SubAbility$ SVar=DBDraw
+A:SP$ Destroy | Cost$ 3 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mystic_melting.jpg
diff --git a/res/cardsfolder/m/mystifying_maze.txt b/res/cardsfolder/m/mystifying_maze.txt
index 3450599d11c..cadd48065ae 100644
--- a/res/cardsfolder/m/mystifying_maze.txt
+++ b/res/cardsfolder/m/mystifying_maze.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ ChangeZone | Cost$ 4 T | ValidTgts$ Creature.attacking+YouDontCtrl | TgtPrompt$ Select target attacking creature an opponent controls | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | SubAbility$ SVar=DelTrig | SpellDescription$ Exile target attacking creature an opponent controls. At the beginning of the next end step, return it to the battlefield tapped under its owner's control.
+A:AB$ ChangeZone | Cost$ 4 T | ValidTgts$ Creature.attacking+YouDontCtrl | TgtPrompt$ Select target attacking creature an opponent controls | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | SubAbility$ DelTrig | SpellDescription$ Exile target attacking creature an opponent controls. At the beginning of the next end step, return it to the battlefield tapped under its owner's control.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled card to the battlefield.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered | Tapped$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True