diff --git a/forge-gui/res/cardsfolder/d/desperate_gambit.txt b/forge-gui/res/cardsfolder/d/desperate_gambit.txt
index c8926a8c420..7d1ca4324a8 100644
--- a/forge-gui/res/cardsfolder/d/desperate_gambit.txt
+++ b/forge-gui/res/cardsfolder/d/desperate_gambit.txt
@@ -4,10 +4,10 @@ Types:Instant
 A:SP$ ChooseSource | Cost$ R | Choices$ Card.YouCtrl | RememberChosen$ True | SubAbility$ CoinFlip | SpellDescription$ Choose a source you control and flip a coin. If you win the flip, the next time that source would deal damage this turn, it deals double that damage instead. If you lose the flip, the next time it would deal damage this turn, prevent that damage.
 SVar:CoinFlip:DB$ FlipACoin | WinSubAbility$ CreateWinEffect | LoseSubAbility$ CreateLossEffect | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
 # Winning Effect
-SVar:CreateWinEffect:DB$ Effect | Name$ Desperate Gambit Win Effect | ReplacementEffects$ EventWinDamageDone | SVars$ DGDmgTimes2,WinX,ExileEffect | References$ EventWinDamageDone,DGDmgTimes2,WinX | RememberObjects$ Remembered
-SVar:EventWinDamageDone:Event$ DamageDone | ValidSource$ Card.IsRemembered | ReplaceWith$ DGDmgTimes2 | Description$ The next time source would deal damage this turn, it deals double that damage instead.
-SVar:DGDmgTimes2:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | NumDmg$ WinX | References$ WinX | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | SubAbility$ ExileEffect
-SVar:WinX:ReplaceCount$DamageAmount/Times.2
+SVar:CreateWinEffect:DB$ Effect | Name$ Desperate Gambit Win Effect | ReplacementEffects$ EventWinDamageDone | SVars$ DmgTwice,WinX,ExileEffect | References$ EventWinDamageDone,DGDmgTimes2,WinX | RememberObjects$ Remembered
+SVar:EventWinDamageDone:Event$ DamageDone | ValidSource$ Card.IsRemembered | ReplaceWith$ DmgTwice | Description$ The next time source would deal damage this turn, it deals double that damage instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ WinX | References$ WinX | SubAbility$ ExileEffect
+SVar:WinX:ReplaceCount$DamageAmount/Twice
 # Losing Effect
 SVar:CreateLossEffect:DB$ Effect | Name$ Desperate Gambit Loss Effect | ReplacementEffects$ EventLossDamageDone | SVars$ ExileEffect | References$ EventLossDamageDone,ExileEffect | RememberObjects$ Remembered
 SVar:EventLossDamageDone:Event$ DamageDone | ValidSource$ Card.IsRemembered | ReplaceWith$ ExileEffect | PreventionEffect$ True | Description$ The next time it would deal damage this turn, prevent that damage.
diff --git a/forge-gui/res/cardsfolder/f/furnace_of_rath.txt b/forge-gui/res/cardsfolder/f/furnace_of_rath.txt
index 54fece8e21e..be355eda9ea 100644
--- a/forge-gui/res/cardsfolder/f/furnace_of_rath.txt
+++ b/forge-gui/res/cardsfolder/f/furnace_of_rath.txt
@@ -1,10 +1,8 @@
 Name:Furnace of Rath
 ManaCost:1 R R R
 Types:Enchantment
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead.
-SVar:DmgTwice:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTwiceCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/i/impulsive_maneuvers.txt b/forge-gui/res/cardsfolder/i/impulsive_maneuvers.txt
index afcd345aa95..1007cc0bd3c 100644
--- a/forge-gui/res/cardsfolder/i/impulsive_maneuvers.txt
+++ b/forge-gui/res/cardsfolder/i/impulsive_maneuvers.txt
@@ -4,10 +4,10 @@ Types:Enchantment
 T:Mode$ Attacks | ValidCard$ Creature | Execute$ CoinFlip | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature attacks, flip a coin. If you win the flip, the next time that creature would deal combat damage this turn, it deals double that damage instead. If you lose the flip, the next time that creature would deal combat damage this turn, prevent that damage.
 SVar:CoinFlip:DB$ FlipACoin | WinSubAbility$ CreateWinEffect | LoseSubAbility$ CreateLossEffect
 # Winning Effect
-SVar:CreateWinEffect:DB$ Effect | Name$ Impulsive Maneuvers Win Effect | ReplacementEffects$ EventWinDamageDone | SVars$ IMDmgTimes2,WinX,ExileEffect | References$ EventWinDamageDone,IMDmgTimes2,WinX | ImprintCards$ TriggeredAttacker
-SVar:EventWinDamageDone:Event$ DamageDone | ValidSource$ Card.IsImprinted | ReplaceWith$ IMDmgTimes2 | IsCombat$ True | Description$ The next time creature would deal combat damage this turn, it deals double that damage instead.
-SVar:IMDmgTimes2:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | NumDmg$ WinX | References$ WinX | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | SubAbility$ ExileEffect
-SVar:WinX:ReplaceCount$DamageAmount/Times.2
+SVar:CreateWinEffect:DB$ Effect | Name$ Impulsive Maneuvers Win Effect | ReplacementEffects$ EventWinDamageDone | SVars$ DmgTwice,WinX,ExileEffect | References$ EventWinDamageDone,DmgTwice,WinX | ImprintCards$ TriggeredAttacker
+SVar:EventWinDamageDone:Event$ DamageDone | ValidSource$ Card.IsImprinted | ReplaceWith$ DmgTwice | Description$ The next time creature would deal combat damage this turn, it deals double that damage instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ WinX | References$ WinX | SubAbility$ ExileEffect
+SVar:WinX:ReplaceCount$DamageAmount/Twice
 # Losing Effect
 SVar:CreateLossEffect:DB$ Effect | Name$ Impulsive Maneuvers Loss Effect | ReplacementEffects$ EventLossDamageDone | SVars$ ExileEffect | References$ EventLossDamageDone,ExileEffect | ImprintCards$ TriggeredAttacker
 SVar:EventLossDamageDone:Event$ DamageDone | ValidSource$ Card.IsImprinted | ReplaceWith$ ExileEffect | PreventionEffect$ True | IsCombat$ True | Description$ The next time creature would deal combat damage this turn, prevent that damage.
diff --git a/forge-gui/res/cardsfolder/i/inquisitors_flail.txt b/forge-gui/res/cardsfolder/i/inquisitors_flail.txt
index 619dd50cce8..471f62713fa 100644
--- a/forge-gui/res/cardsfolder/i/inquisitors_flail.txt
+++ b/forge-gui/res/cardsfolder/i/inquisitors_flail.txt
@@ -2,9 +2,9 @@ Name:Inquisitor's Flail
 ManaCost:2
 Types:Artifact Equipment
 K:Equip 2
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.EquippedBy | ReplaceWith$ DmgTimes2 | IsCombat$ True | Description$ If equipped creature would deal combat damage, it deals double that damage instead.
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Creature.EquippedBy | ValidSource$ Creature.Other | ReplaceWith$ DmgTimes2 | IsCombat$ True | Description$ If another creature would deal combat damage to equipped creature, it deals double that damage to equipped creature instead.
-SVar:DmgTimes2:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:X:ReplaceCount$DamageAmount/Times.2
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.EquippedBy | ReplaceWith$ DmgTwice | IsCombat$ True | Description$ If equipped creature would deal combat damage, it deals double that damage instead.
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Creature.EquippedBy | ValidSource$ Creature.Other | ReplaceWith$ DmgTwice | IsCombat$ True | Description$ If another creature would deal combat damage to equipped creature, it deals double that damage to equipped creature instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
+SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inquisitors_flail.jpg
 Oracle:If equipped creature would deal combat damage, it deals double that damage instead.\nIf another creature would deal combat damage to equipped creature, it deals double that damage to equipped creature instead.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/o/overblaze.txt b/forge-gui/res/cardsfolder/o/overblaze.txt
index cfe193454d0..7482538bd4f 100644
--- a/forge-gui/res/cardsfolder/o/overblaze.txt
+++ b/forge-gui/res/cardsfolder/o/overblaze.txt
@@ -2,12 +2,10 @@ Name:Overblaze
 ManaCost:3 R
 Types:Instant Arcane
 K:Splice:Arcane:2 R R
-A:SP$ Effect | Cost$ 3 R | Name$ Overblaze Effect | ValidTgts$ Permanent | RememberObjects$ Targeted | ReplacementEffects$ OverblazeEvent1,OverblazeEvent2 | SVars$ DmgTwice,DmgTwiceCombat,X | References$ OverblazeEvent1,OverblazeEvent2,DmgTwice,DmgTwiceCombat,X | SpellDescription$ Each time target permanent would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.
-SVar:OverblazeEvent1:Event$ DamageDone | ValidSource$ Permanent.IsRemembered | ValidTarget$ Creature,Player | IsCombat$ False | ReplaceWith$ DmgTwice | Description$ Each time target permanent would deal noncombat damage to a creature or player this turn, it deals double that damage to that creature or player instead.
-SVar:DmgTwice:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:OverblazeEvent2:Event$ DamageDone | ValidSource$ Permanent.IsRemembered | ValidTarget$ Creature,Player | IsCombat$ True | ReplaceWith$ DmgTwiceCombat | Description$ Each time target permanent would deal combat damage to a creature or player this turn, it deals double that damage to that creature or player instead.
-SVar:DmgTwiceCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:X:ReplaceCount$DamageAmount/Times.2
+A:SP$ Effect | Cost$ 3 R | Name$ Overblaze Effect | ValidTgts$ Permanent | RememberObjects$ Targeted | ReplacementEffects$ OverblazeEvent | SVars$ DmgTwice,X | References$ OverblazeEvent,DmgTwice,X | SpellDescription$ Each time target permanent would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.
+SVar:OverblazeEvent:Event$ DamageDone | ValidSource$ Permanent.IsRemembered | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | Description$ Each time target permanent would deal noncombat damage to a creature or player this turn, it deals double that damage to that creature or player instead.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
+SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True