diff --git a/forge-gui/res/cardsfolder/f/fiery_confluence.txt b/forge-gui/res/cardsfolder/f/fiery_confluence.txt
index 35ec98b3bb2..9e8d36a26ab 100644
--- a/forge-gui/res/cardsfolder/f/fiery_confluence.txt
+++ b/forge-gui/res/cardsfolder/f/fiery_confluence.txt
@@ -1,7 +1,7 @@
 Name:Fiery Confluence
 ManaCost:2 R R
 Types:Sorcery
-A:SP$ Charm | Cost$ 2 R R | Choices$ DBDamageCreatures,DBDamageOpponents,DBDestroy | CharmNum$ 3 | CanRepeatModes$ True | SpellDescription$ Choose three. You may choose the same mode more than once. - CARDNAME deals 1 damage to each creature; CARDNAME deals 2 damage to each opponent.; Destroy target artifact.
+A:SP$ Charm | Cost$ 2 R R | Choices$ DBDamageCreatures,DBDamageOpponents,DBDestroy | CharmNum$ 3 | CanRepeatModes$ True
 SVar:DBDamageCreatures:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature | SpellDescription$ CARDNAME deals 1 damage to each creature.
 SVar:DBDamageOpponents:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 2 | AILogic$ Good | SpellDescription$ CARDNAME deals 2 damage to each opponent.
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
diff --git a/forge-gui/res/cardsfolder/m/mystic_confluence.txt b/forge-gui/res/cardsfolder/m/mystic_confluence.txt
index a34dfdf7762..59b32563934 100644
--- a/forge-gui/res/cardsfolder/m/mystic_confluence.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_confluence.txt
@@ -1,10 +1,10 @@
 Name:Mystic Confluence
 ManaCost:3 U U
 Types:Instant
-A:SP$ Charm | Cost$ 3 U U | Choices$ DBCounter,DBReturn,DBDraw | CharmNum$ 3 | CanRepeatModes$ True | SpellDescription$ Choose three. You may choose the same mode more than once. - Counter target spell unless its controller pays 3; Return target creature to its owner's hand; Draw a card.
-SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | UnlessCost$ 3 | SpellDescription$ Counter target spell unless its controller pays 3.
+A:SP$ Charm | Cost$ 3 U U | Choices$ DBCounter,DBReturn,DBDraw | CharmNum$ 3 | CanRepeatModes$ True
+SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | UnlessCost$ 3 | SpellDescription$ Counter target spell unless its controller pays {3}.
 SVar:DBReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Return target creature to its owner's hand.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mystic_confluence.jpg
-Oracle:Choose three. You may choose the same mode more than once.\n• Counter target spell unless its controller pays 3.\n• Return target creature to its owner's hand.\n• Draw a card.
\ No newline at end of file
+Oracle:Choose three. You may choose the same mode more than once.\n• Counter target spell unless its controller pays {3}.\n• Return target creature to its owner's hand.\n• Draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/r/righteous_confluence.txt b/forge-gui/res/cardsfolder/r/righteous_confluence.txt
index 2920cf94237..6c089a02b70 100644
--- a/forge-gui/res/cardsfolder/r/righteous_confluence.txt
+++ b/forge-gui/res/cardsfolder/r/righteous_confluence.txt
@@ -1,9 +1,10 @@
 Name:Righteous Confluence
 ManaCost:3 W W
 Types:Sorcery
-A:SP$ Charm | Cost$ 3 W W | Choices$ DBToken,DBChangeZone,DBGainLife | CharmNum$ 3 | CanRepeatModes$ True | SpellDescription$ Choose three. You may choose the same mode more than once. - Put a 2/2 white Knight creature token with vigilance onto the battlefield; Exile target enchantment; You gain 5 life.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | TokenImage$ w 2 2 knight c15 |SpellDescription$ Put a 2/2 white Knight creature token with vigilance onto the battlefield.
+A:SP$ Charm | Cost$ 3 W W | Choices$ DBToken,DBChangeZone,DBGainLife | CharmNum$ 3 | CanRepeatModes$ True
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | TokenImage$ w 2 2 knight c15 | SpellDescription$ Create a 2/2 white Knight creature token with vigilance.
 SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Enchantment | TgtPrompt$ Choose target enchantment | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target enchantment.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 5 | SpellDescription$ You gain 5 life.
+DeckHints:Ability$LifeGain & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/righteous_confluence.jpg
-Oracle:Choose three. You may choose the same mode more than once.\n• Put a 2/2 white Knight creature token with vigilance onto the battlefield.\n• Exile target enchantment.\n• You gain 5 life.
\ No newline at end of file
+Oracle:Choose three. You may choose the same mode more than once.\n• Create a 2/2 white Knight creature token with vigilance.\n• Exile target enchantment.\n• You gain 5 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/v/verdant_confluence.txt b/forge-gui/res/cardsfolder/v/verdant_confluence.txt
index 6287df0ff48..2192e71cb26 100644
--- a/forge-gui/res/cardsfolder/v/verdant_confluence.txt
+++ b/forge-gui/res/cardsfolder/v/verdant_confluence.txt
@@ -1,7 +1,7 @@
 Name:Verdant Confluence
 ManaCost:4 G G
 Types:Sorcery
-A:SP$ Charm | Cost$ 4 G G | Choices$ DBPutCounter,DBChangeZone1,DBChangeZone2 | CharmNum$ 3 | CanRepeatModes$ True | SpellDescription$ Choose three. You may choose the same mode more than once. - Put two +1/+1 counters on target creature; Return target permanent card from your graveyard to your hand; Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
+A:SP$ Charm | Cost$ 4 G G | Choices$ DBPutCounter,DBChangeZone1,DBChangeZone2 | CharmNum$ 3 | CanRepeatModes$ True
 SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on target creature.
 SVar:DBChangeZone1:DB$ ChangeZone | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target permanent card from your graveyard to your hand.
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/w/wretched_confluence.txt b/forge-gui/res/cardsfolder/w/wretched_confluence.txt
index 26bc2553410..58d866ce878 100644
--- a/forge-gui/res/cardsfolder/w/wretched_confluence.txt
+++ b/forge-gui/res/cardsfolder/w/wretched_confluence.txt
@@ -1,7 +1,7 @@
 Name:Wretched Confluence
 ManaCost:3 B B
 Types:Instant
-A:SP$ Charm | Cost$ 3 B B | Choices$ DBDraw,DBPump,DBChangeZone | CharmNum$ 3 | CanRepeatModes$ True | SpellDescription$ Choose three. You may choose the same mode more than once. - Target player draws a card and loses 1 life; Target creature gets -2/-2 until end of turn; Return target creature card from your graveyard to your hand.
+A:SP$ Charm | Cost$ 3 B B | Choices$ DBDraw,DBPump,DBChangeZone | CharmNum$ 3 | CanRepeatModes$ True
 SVar:DBDraw:DB$ Draw | ValidTgts$ Player | NumCards$ 1 | SubAbility$ DBLoseLife | SpellDescription$ Target player draws a card and loses 1 life.
 SVar:DBLoseLife:DB$LoseLife | LifeAmount$ 1 | Defined$ Targeted 
 SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.