diff --git a/.gitattributes b/.gitattributes
index 1b31b66613c..e8b151a2327 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3105,6 +3105,7 @@ res/cardsfolder/e/emberstrike_duo.txt svneol=native#text/plain
 res/cardsfolder/e/emberwilde_augur.txt svneol=native#text/plain
 res/cardsfolder/e/emberwilde_caliph.txt svneol=native#text/plain
 res/cardsfolder/e/emblem_of_the_warmind.txt svneol=native#text/plain
+res/cardsfolder/e/embolden.txt -text
 res/cardsfolder/e/embrace_my_diabolical_vision.txt -text
 res/cardsfolder/e/emerald_charm.txt svneol=native#text/plain
 res/cardsfolder/e/emerald_dragonfly.txt svneol=native#text/plain
@@ -5331,6 +5332,7 @@ res/cardsfolder/j/jareth_leonine_titan.txt svneol=native#text/plain
 res/cardsfolder/j/jasmine_boreal.txt svneol=native#text/plain
 res/cardsfolder/j/jasmine_seer.txt -text
 res/cardsfolder/j/jawbone_skulkin.txt svneol=native#text/plain
+res/cardsfolder/j/jaws_of_stone.txt -text
 res/cardsfolder/j/jaya_ballard_task_mage.txt svneol=native#text/plain
 res/cardsfolder/j/jayemdae_tome.txt svneol=native#text/plain
 res/cardsfolder/j/jedit_ojanen.txt svneol=native#text/plain
diff --git a/res/cardsfolder/a/arrow_volley_trap.txt b/res/cardsfolder/a/arrow_volley_trap.txt
index d032f11b154..2f7d96e2220 100644
--- a/res/cardsfolder/a/arrow_volley_trap.txt
+++ b/res/cardsfolder/a/arrow_volley_trap.txt
@@ -2,12 +2,8 @@ Name:Arrow Volley Trap
 ManaCost:3 W W
 Types:Instant Trap
 Text:no text
-A:SP$ DealDamage | Cost$ 3 W W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 5 damage divided as you choose among any number of target attacking creatures.
-A:SP$ DealDamage | Cost$ 1 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | IsPresent$ Creature.attacking | PresentCompare$ GE4 | CostDesc$ If four or more creatures are attacking, you may pay 1 W rather than pay CARDNAME's mana cost. | SpellDescription$  
-SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature (3) | NumDmg$ 1 | SubAbility$ DBDamage4
-SVar:DBDamage4:DB$DealDamage | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature (4) | NumDmg$ 1 | SubAbility$ DBDamage5
-SVar:DBDamage5:DB$DealDamage | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature (5) | NumDmg$ 1
+A:SP$ DealDamage | Cost$ 3 W W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature to distribute damage to | NumDmg$ 5 | TargetMin$ 1 | TargetMax$ 5 | DividedAsYouChoose$ 5 | SpellDescription$ CARDNAME deals 5 damage divided as you choose among any number of target attacking creatures.
+A:SP$ DealDamage | Cost$ 1 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature to distribute damage to | NumDmg$ 5 | TargetMin$ 1 | TargetMax$ 5 | DividedAsYouChoose$ 5 | IsPresent$ Creature.attacking | PresentCompare$ GE4 | CostDesc$ If four or more creatures are attacking, you may pay 1 W rather than pay CARDNAME's mana cost. | SpellDescription$  
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arrow_volley_trap.jpg
diff --git a/res/cardsfolder/e/embolden.txt b/res/cardsfolder/e/embolden.txt
new file mode 100644
index 00000000000..d46da9789be
--- /dev/null
+++ b/res/cardsfolder/e/embolden.txt
@@ -0,0 +1,11 @@
+Name:Embolden
+ManaCost:2 W
+Types:Instant
+Text:no text
+A:SP$ PreventDamage | Cost$ 2 W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to prevent damage to | Amount$ 4 | TargetMin$ 1 | TargetMax$ 4 | DividedAsYouChoose$ 4 | SpellDescription$ Prevent the next 4 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose.
+K:Flashback 1 W
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/embolden.jpg
+SetInfo:ODY|Common|http://magiccards.info/scans/en/od/22.jpg
+Oracle:Prevent the next 4 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose.\nFlashback {1}{W} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+End
\ No newline at end of file
diff --git a/res/cardsfolder/f/fire_at_will.txt b/res/cardsfolder/f/fire_at_will.txt
index 59b709f4e01..b0eb7b433eb 100644
--- a/res/cardsfolder/f/fire_at_will.txt
+++ b/res/cardsfolder/f/fire_at_will.txt
@@ -2,9 +2,7 @@ Name:Fire at Will
 ManaCost:RW RW RW
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ RW RW RW | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 3 damage divided as you choose among one, two, or three target attacking or blocking creatures.
-SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ target attacking or blocking creature (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ target attacking or blocking creature (3) | NumDmg$ 1
+A:SP$ DealDamage | Cost$ RW RW RW | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature to distribute damage to | NumDmg$ 3 | TargetMin$ 1 | TargetMax$ 3 | DividedAsYouChoose$ 3 | SpellDescription$ CARDNAME deals 3 damage divided as you choose among one, two, or three target attacking or blocking creatures.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fire_at_will.jpg
diff --git a/res/cardsfolder/f/flameshot.txt b/res/cardsfolder/f/flameshot.txt
index 6cd099e6236..054bbc2d2ae 100644
--- a/res/cardsfolder/f/flameshot.txt
+++ b/res/cardsfolder/f/flameshot.txt
@@ -2,9 +2,7 @@ Name:Flameshot
 ManaCost:3 R
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 3 damage divided as you choose among any number of target creatures.
-SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature (3) | NumDmg$ 1
+A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature to distribute damage to | NumDmg$ 3 | TargetMin$ 1 | TargetMax$ 3 | DividedAsYouChoose$ 3 | SpellDescription$ CARDNAME deals 3 damage divided as you choose among any number of target creatures.
 SVar:AltCost:Cost$ Discard<1/Mountain>
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/f/forked_lightning.txt b/res/cardsfolder/f/forked_lightning.txt
index 085661139de..c78a1839242 100644
--- a/res/cardsfolder/f/forked_lightning.txt
+++ b/res/cardsfolder/f/forked_lightning.txt
@@ -3,6 +3,7 @@ ManaCost:3 R
 Types:Sorcery
 Text:no text
 A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature to distribute damage to | NumDmg$ 4 | TargetMin$ 1 | TargetMax$ 3 | DividedAsYouChoose$ 4 | SpellDescription$ CARDNAME deals 4 damage divided as you choose among one, two, or three target creatures.
+SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forked_lightning.jpg
 SetInfo:POR|Rare|http://magiccards.info/scans/en/po/135.jpg
 Oracle:Forked Lightning deals 4 damage divided as you choose among one, two, or three target creatures.
diff --git a/res/cardsfolder/j/jaws_of_stone.txt b/res/cardsfolder/j/jaws_of_stone.txt
new file mode 100644
index 00000000000..06ce98bc808
--- /dev/null
+++ b/res/cardsfolder/j/jaws_of_stone.txt
@@ -0,0 +1,14 @@
+Name:Jaws of Stone
+ManaCost:5 R
+Types:Sorcery
+Text:no text
+A:SP$ DealDamage | Cost$ 5 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to distribute damage to | NumDmg$ OrigMountains | TargetMin$ Min | TargetMax$ OrigMountains | References$ OrigMountains | DividedAsYouChoose$ OrigMountains | SpellDescription$ CARDNAME deals X damage divided as you choose among any number of target creatures and/or players, where X is the number of Mountains you control as you cast CARDNAME.
+T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ Conspire | Static$ True | Execute$ CountMountainsAtCast
+SVar:CountMountainsAtCast:DB$ StoreSVar | SVar$ OrigMountains | Type$ Count | Expression$ Valid Mountain.YouCtrl
+SVar:OrigMountains:Count$Valid Mountain.YouCtrl
+SVar:Min:SVar$OrigMountains/LimitMax.1
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jaws_of_stone.jpg
+SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/97.jpg
+Oracle:Jaws of Stone deals X damage divided as you choose among any number of target creatures and/or players, where X is the number of Mountains you control as you cast Jaws of Stone.
+End
\ No newline at end of file
diff --git a/res/cardsfolder/k/kuldotha_flamefiend.txt b/res/cardsfolder/k/kuldotha_flamefiend.txt
index 25c085f55ca..9a94693e8e5 100644
--- a/res/cardsfolder/k/kuldotha_flamefiend.txt
+++ b/res/cardsfolder/k/kuldotha_flamefiend.txt
@@ -4,10 +4,7 @@ Types:Creature Elemental
 Text:no text
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, you may sacrifice an artifact. If you do, CARDNAME deals 4 damage divided as you choose among any number of target creatures and/or players.
-SVar:TrigDealDamage:AB$ DealDamage | Cost$ Sac<1/Artifact> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2
-SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1 | SubAbility$ DBDamage4
-SVar:DBDamage4:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (4) | NumDmg$ 1
+SVar:TrigDealDamage:AB$ DealDamage | Cost$ Sac<1/Artifact> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to distribute damage to | NumDmg$ 4 | TargetMin$ 1 | TargetMax$ 4 | DividedAsYouChoose$ 4
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kuldotha_flamefiend.jpg