diff --git a/forge-gui/res/cardsfolder/a/a_display_of_my_dark_power.txt b/forge-gui/res/cardsfolder/a/a_display_of_my_dark_power.txt
index d544f77d675..07e13d171dc 100644
--- a/forge-gui/res/cardsfolder/a/a_display_of_my_dark_power.txt
+++ b/forge-gui/res/cardsfolder/a/a_display_of_my_dark_power.txt
@@ -1,9 +1,9 @@
 Name:A Display of My Dark Power
 ManaCost:no cost
 Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DarkEffect | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, until your next turn, whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DarkEffect | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, until your next turn, whenever a player taps a land for mana, that player adds one mana of any type that land produced.
 SVar:DarkEffect:DB$ Effect | Name$ Dark Power Scheme | Duration$ UntilYourNextTurn | Triggers$ DarkPower | SVars$ DarkMana
-SVar:DarkPower:Mode$ TapsForMana | ValidCard$ Land | Execute$ DarkMana | TriggerZones$ Command | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+SVar:DarkPower:Mode$ TapsForMana | ValidCard$ Land | Execute$ DarkMana | TriggerZones$ Command | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
 SVar:DarkMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:Picture:https://downloads.cardforge.org/images/cards/ARC/A Display of My Dark Power.full.jpg
-Oracle:When you set this scheme in motion, until your next turn, whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+Oracle:When you set this scheme in motion, until your next turn, whenever a player taps a land for mana, that player adds one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/a/abandoned_outpost.txt b/forge-gui/res/cardsfolder/a/abandoned_outpost.txt
index a6cbab4f8ae..41d17da72cd 100644
--- a/forge-gui/res/cardsfolder/a/abandoned_outpost.txt
+++ b/forge-gui/res/cardsfolder/a/abandoned_outpost.txt
@@ -1,8 +1,8 @@
 Name:Abandoned Outpost
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abandoned_outpost.jpg
-Oracle:Abandoned Outpost enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\n{T}, Sacrifice Abandoned Outpost: Add one mana of any color to your mana pool.
+Oracle:Abandoned Outpost enters the battlefield tapped.\n{T}: Add {W}.\n{T}, Sacrifice Abandoned Outpost: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/a/abstruse_interference.txt b/forge-gui/res/cardsfolder/a/abstruse_interference.txt
index 4fb0377d825..bd503147fe8 100644
--- a/forge-gui/res/cardsfolder/a/abstruse_interference.txt
+++ b/forge-gui/res/cardsfolder/a/abstruse_interference.txt
@@ -3,9 +3,9 @@ ManaCost:2 U
 Types:Instant
 K:Devoid
 A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 1 | SubAbility$ DBToken | SpellDescription$ Counter target spell unless its controller pays {1}.
-SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ c 1 1 eldrazi scion ogw | TokenAltImages$ c_1_1_eldrazi_scion2_ogw,c_1_1_eldrazi_scion3_ogw,c_1_1_eldrazi_scion4_ogw,c_1_1_eldrazi_scion5_ogw,c_1_1_eldrazi_scion6_ogw | TokenAbilities$ ABMana | SpellDescription$ Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." ({C} represents colorless mana.)
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ c 1 1 eldrazi scion ogw | TokenAltImages$ c_1_1_eldrazi_scion2_ogw,c_1_1_eldrazi_scion3_ogw,c_1_1_eldrazi_scion4_ogw,c_1_1_eldrazi_scion5_ogw,c_1_1_eldrazi_scion6_ogw | TokenAbilities$ ABMana | SpellDescription$ Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abstruse_interference.jpg
-Oracle:Devoid (This card has no color.)\nCounter target spell unless its controller pays {1}. Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." ({C} represents colorless mana.)
+Oracle:Devoid (This card has no color.)\nCounter target spell unless its controller pays {1}. Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
diff --git a/forge-gui/res/cardsfolder/a/abundant_growth.txt b/forge-gui/res/cardsfolder/a/abundant_growth.txt
index 48cbccd4d4b..0378af60a4d 100644
--- a/forge-gui/res/cardsfolder/a/abundant_growth.txt
+++ b/forge-gui/res/cardsfolder/a/abundant_growth.txt
@@ -5,7 +5,7 @@ K:Enchant land
 A:SP$ Attach | Cost$ G | ValidTgts$ Land | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ FreeCard | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:FreeCard:DB$ Draw | Defined$ You | NumCards$ 1
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ AbundantGrowthTap | Description$ Enchanted land has "{T}: Add one mana of any color to your mana pool."
-SVar:AbundantGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ AbundantGrowthTap | Description$ Enchanted land has "{T}: Add one mana of any color."
+SVar:AbundantGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abundant_growth.jpg
-Oracle:Enchant land\nWhen Abundant Growth enters the battlefield, draw a card.\nEnchanted land has "{T}: Add one mana of any color to your mana pool."
+Oracle:Enchant land\nWhen Abundant Growth enters the battlefield, draw a card.\nEnchanted land has "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/a/abzan_banner.txt b/forge-gui/res/cardsfolder/a/abzan_banner.txt
index 41bbd7359ca..d0a4ae27e34 100644
--- a/forge-gui/res/cardsfolder/a/abzan_banner.txt
+++ b/forge-gui/res/cardsfolder/a/abzan_banner.txt
@@ -1,11 +1,11 @@
 Name:Abzan Banner
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Draw | Cost$ W B G T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$White|Black|Green
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abzan_banner.jpg
-Oracle:{T}: Add {W}, {B}, or {G} to your mana pool.\n{W}{B}{G}, {T}, Sacrifice Abzan Banner: Draw a card.
+Oracle:{T}: Add {W}, {B}, or {G}.\n{W}{B}{G}, {T}, Sacrifice Abzan Banner: Draw a card.
diff --git a/forge-gui/res/cardsfolder/a/academy_ruins.txt b/forge-gui/res/cardsfolder/a/academy_ruins.txt
index 9955264e910..b77c7f0c0a4 100644
--- a/forge-gui/res/cardsfolder/a/academy_ruins.txt
+++ b/forge-gui/res/cardsfolder/a/academy_ruins.txt
@@ -1,7 +1,7 @@
 Name:Academy Ruins
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 1 U T | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Library | SpellDescription$ Put target artifact card from your graveyard on top of your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_ruins.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{U}, {T}: Put target artifact card from your graveyard on top of your library.
+Oracle:{T}: Add {C}.\n{1}{U}, {T}: Put target artifact card from your graveyard on top of your library.
diff --git a/forge-gui/res/cardsfolder/a/adarkar_unicorn.txt b/forge-gui/res/cardsfolder/a/adarkar_unicorn.txt
index 8787ee3a554..0b33df070b2 100644
--- a/forge-gui/res/cardsfolder/a/adarkar_unicorn.txt
+++ b/forge-gui/res/cardsfolder/a/adarkar_unicorn.txt
@@ -2,9 +2,9 @@ Name:Adarkar Unicorn
 ManaCost:1 W W
 Types:Creature Unicorn
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ C U | RestrictValid$ CumulativeUpkeep | SpellDescription$ Add {C}{U} to your mana pool. Spend this mana only to pay cumulative upkeep costs.
-A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ CumulativeUpkeep | SpellDescription$ Add {U} to your mana pool. Spend this mana only to pay cumulative upkeep costs.
+A:AB$ Mana | Cost$ T | Produced$ C U | RestrictValid$ CumulativeUpkeep | SpellDescription$ Add {C}{U}. Spend this mana only to pay cumulative upkeep costs.
+A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ CumulativeUpkeep | SpellDescription$ Add {U}. Spend this mana only to pay cumulative upkeep costs.
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_unicorn.jpg
-Oracle:{T}: Add {U} or {C}{U} to your mana pool. Spend this mana only to pay cumulative upkeep costs.
+Oracle:{T}: Add {U} or {C}{U}. Spend this mana only to pay cumulative upkeep costs.
diff --git a/forge-gui/res/cardsfolder/a/adarkar_wastes.txt b/forge-gui/res/cardsfolder/a/adarkar_wastes.txt
index 58e833394f8..de3127fb575 100644
--- a/forge-gui/res/cardsfolder/a/adarkar_wastes.txt
+++ b/forge-gui/res/cardsfolder/a/adarkar_wastes.txt
@@ -1,9 +1,9 @@
 Name:Adarkar Wastes
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-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$ U | SubAbility$ DBPain | SpellDescription$ Add {U} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_wastes.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {W} or {U} to your mana pool. Adarkar Wastes deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {W} or {U}. Adarkar Wastes deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/a/adverse_conditions.txt b/forge-gui/res/cardsfolder/a/adverse_conditions.txt
index 4036211bffb..e9526c18f81 100644
--- a/forge-gui/res/cardsfolder/a/adverse_conditions.txt
+++ b/forge-gui/res/cardsfolder/a/adverse_conditions.txt
@@ -4,9 +4,9 @@ Types:Instant
 K:Devoid
 A:SP$ Tap | Cost$ 3 U | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature | ValidTgts$ Creature | SubAbility$ TrigPump | SpellDescription$ Tap up to two target creatures.
 SVar:TrigPump:DB$Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ DBToken | SpellDescription$ Those creatures don't untap during their controller's next untap step.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3 | TokenAbilities$ ABMana | SpellDescription$ Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3 | TokenAbilities$ ABMana | SpellDescription$ Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adverse_conditions.jpg
-Oracle:Devoid (This card has no color.)\nTap up to two target creatures. Those creatures don't untap during their controller's next untap step. Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Devoid (This card has no color.)\nTap up to two target creatures. Those creatures don't untap during their controller's next untap step. Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/a/aether_hub.txt b/forge-gui/res/cardsfolder/a/aether_hub.txt
index 1fdc2422642..564a2197cb7 100644
--- a/forge-gui/res/cardsfolder/a/aether_hub.txt
+++ b/forge-gui/res/cardsfolder/a/aether_hub.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEnergy | TriggerDescription$ When CARDNAME enters the battlefield, you get {E}.
 SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T PayEnergy<1> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T PayEnergy<1> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_hub.jpg
-Oracle:When Aether Hub enters the battlefield, you get {E} (an energy counter).\n{T}: Add {C} to your mana pool.\n{T}, Pay {E}: Add one mana of any color to your mana pool.
+Oracle:When Aether Hub enters the battlefield, you get {E} (an energy counter).\n{T}: Add {C}.\n{T}, Pay {E}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/a/agent_of_stromgald.txt b/forge-gui/res/cardsfolder/a/agent_of_stromgald.txt
index 3fc76dc105b..5c14b274661 100644
--- a/forge-gui/res/cardsfolder/a/agent_of_stromgald.txt
+++ b/forge-gui/res/cardsfolder/a/agent_of_stromgald.txt
@@ -2,7 +2,7 @@ Name:Agent of Stromgald
 ManaCost:R
 Types:Creature Human Knight
 PT:1/1
-A:AB$ Mana | Cost$ R | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ R | Produced$ B | SpellDescription$ Add {B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/agent_of_stromgald.jpg
-Oracle:{R}: Add {B} to your mana pool.
+Oracle:{R}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/a/akki_rockspeaker.txt b/forge-gui/res/cardsfolder/a/akki_rockspeaker.txt
index 2f27b520bae..68df9744404 100644
--- a/forge-gui/res/cardsfolder/a/akki_rockspeaker.txt
+++ b/forge-gui/res/cardsfolder/a/akki_rockspeaker.txt
@@ -2,7 +2,7 @@ Name:Akki Rockspeaker
 ManaCost:1 R
 Types:Creature Goblin Shaman
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add {R} to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add {R}.
 SVar:TrigMana:DB$Mana | Produced$ R | Amount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/akki_rockspeaker.jpg
-Oracle:When Akki Rockspeaker enters the battlefield, add {R} to your mana pool. 
\ No newline at end of file
+Oracle:When Akki Rockspeaker enters the battlefield, add {R}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/a/akoum_refuge.txt b/forge-gui/res/cardsfolder/a/akoum_refuge.txt
index 856dc4404a4..f747544b42c 100644
--- a/forge-gui/res/cardsfolder/a/akoum_refuge.txt
+++ b/forge-gui/res/cardsfolder/a/akoum_refuge.txt
@@ -1,10 +1,10 @@
 Name:Akoum Refuge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/akoum_refuge.jpg
-Oracle:Akoum Refuge enters the battlefield tapped.\nWhen Akoum Refuge enters the battlefield, you gain 1 life.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:Akoum Refuge enters the battlefield tapped.\nWhen Akoum Refuge enters the battlefield, you gain 1 life.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/a/alchemists_refuge.txt b/forge-gui/res/cardsfolder/a/alchemists_refuge.txt
index b5cd63816ab..cb9c1bb6e29 100644
--- a/forge-gui/res/cardsfolder/a/alchemists_refuge.txt
+++ b/forge-gui/res/cardsfolder/a/alchemists_refuge.txt
@@ -1,11 +1,11 @@
 Name:Alchemist's Refuge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Effect | Cost$ G U T | Name$ Refuge Effect | StaticAbilities$ QuickSpell | SpellDescription$ You may cast spells this turn as though they had flash.
 SVar:QuickSpell:Mode$ Continuous | EffectZone$ Command | Affected$ You | AddKeyword$ You may cast nonland cards as though they had flash. | Description$ You may cast spells this turn as though they had flash.
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/alchemists_refuge.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{G}{U}, {T}: You may cast spells this turn as though they had flash.
+Oracle:{T}: Add {C}.\n{G}{U}, {T}: You may cast spells this turn as though they had flash.
diff --git a/forge-gui/res/cardsfolder/a/alloy_myr.txt b/forge-gui/res/cardsfolder/a/alloy_myr.txt
index 52e8d469110..172fcda1a47 100644
--- a/forge-gui/res/cardsfolder/a/alloy_myr.txt
+++ b/forge-gui/res/cardsfolder/a/alloy_myr.txt
@@ -2,6 +2,6 @@ Name:Alloy Myr
 ManaCost:3
 Types:Artifact Creature Myr
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/alloy_myr.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/a/ally_encampment.txt b/forge-gui/res/cardsfolder/a/ally_encampment.txt
index 12317852c6d..fbf56ff4793 100644
--- a/forge-gui/res/cardsfolder/a/ally_encampment.txt
+++ b/forge-gui/res/cardsfolder/a/ally_encampment.txt
@@ -1,11 +1,11 @@
 Name:Ally Encampment
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Ally | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast an Ally spell.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Ally | SpellDescription$ Add one mana of any color. Spend this mana only to cast an Ally spell.
 A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | ValidTgts$ Ally.YouCtrl | TgtPrompt$ Select target Ally you control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target Ally you control to its owner's hand.
 SVar:RemRandomDeck:True
 DeckHas:Ability$Mana.Colorless
 DeckHints:Type$Ally
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ally_encampment.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast an Ally spell.\n{1}, {T}, Sacrifice Ally Encampment: Return target Ally you control to its owner's hand.
+Oracle:{T}: Add {C}.\n{T}: Add one mana of any color. Spend this mana only to cast an Ally spell.\n{1}, {T}, Sacrifice Ally Encampment: Return target Ally you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/a/altar_of_shadows.txt b/forge-gui/res/cardsfolder/a/altar_of_shadows.txt
index 5c566284828..bb9cb893f77 100644
--- a/forge-gui/res/cardsfolder/a/altar_of_shadows.txt
+++ b/forge-gui/res/cardsfolder/a/altar_of_shadows.txt
@@ -1,10 +1,10 @@
 Name:Altar of Shadows
 ManaCost:7
 Types:Artifact
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGetMana | TriggerDescription$ At the beginning of your precombat main phase, add {B} to your mana pool for each charge counter on CARDNAME.
-SVar:TrigGetMana:DB$ Mana | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {X}{B} to your mana pool
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGetMana | TriggerDescription$ At the beginning of your precombat main phase, add {B} for each charge counter on CARDNAME.
+SVar:TrigGetMana:DB$ Mana | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {X}{B}
 A:AB$ Destroy | Cost$ 7 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBPutCounter | SpellDescription$ Destroy target creature. Then put a charge counter on CARDNAME.
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
 SVar:X:Count$CardCounters.CHARGE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/altar_of_shadows.jpg
-Oracle:At the beginning of your precombat main phase, add {B} to your mana pool for each charge counter on Altar of Shadows.\n{7}, {T}: Destroy target creature. Then put a charge counter on Altar of Shadows.
+Oracle:At the beginning of your precombat main phase, add {B} for each charge counter on Altar of Shadows.\n{7}, {T}: Destroy target creature. Then put a charge counter on Altar of Shadows.
diff --git a/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt b/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt
index 7df5d4cc437..ead6575f25a 100644
--- a/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt
+++ b/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt
@@ -2,7 +2,7 @@ Name:Altar of the Lost
 ManaCost:3
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Card.wasCastFromGraveyard+withFlashback | SpellDescription$ Add two mana in any combination of colors to your mana pool. Spend this mana only to cast spells with flashback from a graveyard.
+A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Card.wasCastFromGraveyard+withFlashback | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast spells with flashback from a graveyard.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/altar_of_the_lost.jpg
-Oracle:Altar of the Lost enters the battlefield tapped.\n{T}: Add two mana in any combination of colors to your mana pool. Spend this mana only to cast spells with flashback from a graveyard.
+Oracle:Altar of the Lost enters the battlefield tapped.\n{T}: Add two mana in any combination of colors. Spend this mana only to cast spells with flashback from a graveyard.
diff --git a/forge-gui/res/cardsfolder/a/an_havva_township.txt b/forge-gui/res/cardsfolder/a/an_havva_township.txt
index 7e5e25944a9..3e961c9194d 100644
--- a/forge-gui/res/cardsfolder/a/an_havva_township.txt
+++ b/forge-gui/res/cardsfolder/a/an_havva_township.txt
@@ -1,10 +1,10 @@
 Name:An-Havva Township
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ 2 T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ 2 T | Produced$ R | SpellDescription$ Add {R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/an_havva_township.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add {G} to your mana pool.\n{2}, {T}: Add {R} or {W} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add {G}.\n{2}, {T}: Add {R} or {W}.
diff --git a/forge-gui/res/cardsfolder/a/ancient_amphitheater.txt b/forge-gui/res/cardsfolder/a/ancient_amphitheater.txt
index aa0a981c9d4..9a589d5e129 100644
--- a/forge-gui/res/cardsfolder/a/ancient_amphitheater.txt
+++ b/forge-gui/res/cardsfolder/a/ancient_amphitheater.txt
@@ -1,9 +1,9 @@
 Name:Ancient Amphitheater
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Giant> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Giant card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancient_amphitheater.jpg
-Oracle:As Ancient Amphitheater enters the battlefield, you may reveal a Giant card from your hand. If you don't, Ancient Amphitheater enters the battlefield tapped.\n{T}: Add {R} or {W} to your mana pool.
+Oracle:As Ancient Amphitheater enters the battlefield, you may reveal a Giant card from your hand. If you don't, Ancient Amphitheater enters the battlefield tapped.\n{T}: Add {R} or {W}.
diff --git a/forge-gui/res/cardsfolder/a/ancient_den.txt b/forge-gui/res/cardsfolder/a/ancient_den.txt
index 33833f0da94..55eb606000e 100644
--- a/forge-gui/res/cardsfolder/a/ancient_den.txt
+++ b/forge-gui/res/cardsfolder/a/ancient_den.txt
@@ -1,6 +1,6 @@
 Name:Ancient Den
 ManaCost:no cost
 Types:Artifact Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancient_den.jpg
-Oracle:{T}: Add {W} to your mana pool.
+Oracle:{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/a/ancient_spring.txt b/forge-gui/res/cardsfolder/a/ancient_spring.txt
index 9544b679907..6921725a074 100644
--- a/forge-gui/res/cardsfolder/a/ancient_spring.txt
+++ b/forge-gui/res/cardsfolder/a/ancient_spring.txt
@@ -2,8 +2,8 @@ Name:Ancient Spring
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ W B | SpellDescription$ Add {W}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ W B | SpellDescription$ Add {W}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancient_spring.jpg
-Oracle:Ancient Spring enters the battlefield tapped.\n{T}: Add {U} to your mana pool.\n{T}, Sacrifice Ancient Spring: Add {W}{B} to your mana pool.
+Oracle:Ancient Spring enters the battlefield tapped.\n{T}: Add {U}.\n{T}, Sacrifice Ancient Spring: Add {W}{B}.
diff --git a/forge-gui/res/cardsfolder/a/ancient_tomb.txt b/forge-gui/res/cardsfolder/a/ancient_tomb.txt
index 7a9f27819b2..a1e3911edc3 100644
--- a/forge-gui/res/cardsfolder/a/ancient_tomb.txt
+++ b/forge-gui/res/cardsfolder/a/ancient_tomb.txt
@@ -1,8 +1,8 @@
 Name:Ancient Tomb
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SubAbility$ DBPain | SpellDescription$ Add {C}{C} to your mana pool. CARDNAME deals 2 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SubAbility$ DBPain | SpellDescription$ Add {C}{C}. CARDNAME deals 2 damage to you.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 2 | Defined$ You
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancient_tomb.jpg
-Oracle:{T}: Add {C}{C} to your mana pool. Ancient Tomb deals 2 damage to you.
+Oracle:{T}: Add {C}{C}. Ancient Tomb deals 2 damage to you.
diff --git a/forge-gui/res/cardsfolder/a/ancient_ziggurat.txt b/forge-gui/res/cardsfolder/a/ancient_ziggurat.txt
index cba3461ec26..3511e1cc678 100644
--- a/forge-gui/res/cardsfolder/a/ancient_ziggurat.txt
+++ b/forge-gui/res/cardsfolder/a/ancient_ziggurat.txt
@@ -1,6 +1,6 @@
 Name:Ancient Ziggurat
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Creature | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell.
+A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Creature | SpellDescription$ Add one mana of any color. Spend this mana only to cast a creature spell.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancient_ziggurat.jpg
-Oracle:{T}: Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell.
+Oracle:{T}: Add one mana of any color. Spend this mana only to cast a creature spell.
diff --git a/forge-gui/res/cardsfolder/a/apprentice_wizard.txt b/forge-gui/res/cardsfolder/a/apprentice_wizard.txt
index b5b3ada8bc5..420a82e9a5b 100644
--- a/forge-gui/res/cardsfolder/a/apprentice_wizard.txt
+++ b/forge-gui/res/cardsfolder/a/apprentice_wizard.txt
@@ -2,6 +2,6 @@ Name:Apprentice Wizard
 ManaCost:1 U U
 Types:Creature Human Wizard
 PT:0/1
-A:AB$ Mana | Cost$ U T | Produced$ C | Amount$ 3 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {C}{C}{C} to your mana pool.
+A:AB$ Mana | Cost$ U T | Produced$ C | Amount$ 3 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {C}{C}{C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/apprentice_wizard.jpg
-Oracle:{U}, {T}: Add {C}{C}{C} to your mana pool.
+Oracle:{U}, {T}: Add {C}{C}{C}.
diff --git a/forge-gui/res/cardsfolder/a/arcane_lighthouse.txt b/forge-gui/res/cardsfolder/a/arcane_lighthouse.txt
index b01bb5c7a31..8f314aefae2 100644
--- a/forge-gui/res/cardsfolder/a/arcane_lighthouse.txt
+++ b/forge-gui/res/cardsfolder/a/arcane_lighthouse.txt
@@ -1,9 +1,9 @@
 Name:Arcane Lighthouse
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Effect | Cost$ 1 T | StaticAbilities$ STLoseAB | SpellDescription$ Until end of turn, creatures your opponents control lose hexproof and shroud and can't have hexproof or shroud.
 SVar:STLoseAB:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.OppCtrl | RemoveKeyword$ Hexproof & Shroud | AddHiddenKeyword$ CARDNAME can't have or gain Hexproof & CARDNAME can't have or gain Shroud | Description$ Until end of turn, creatures your opponents control lose hexproof and shroud and can't have hexproof or shroud.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arcane_lighthouse.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Until end of turn, creatures your opponents control lose hexproof and shroud and can't have hexproof or shroud.
+Oracle:{T}: Add {C}.\n{1}, {T}: Until end of turn, creatures your opponents control lose hexproof and shroud and can't have hexproof or shroud.
diff --git a/forge-gui/res/cardsfolder/a/arcane_sanctum.txt b/forge-gui/res/cardsfolder/a/arcane_sanctum.txt
index 51e314a9b18..926b579fa87 100644
--- a/forge-gui/res/cardsfolder/a/arcane_sanctum.txt
+++ b/forge-gui/res/cardsfolder/a/arcane_sanctum.txt
@@ -2,8 +2,8 @@ Name:Arcane Sanctum
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arcane_sanctum.jpg
-Oracle:Arcane Sanctum enters the battlefield tapped.\n{T}: Add {W}, {U}, or {B} to your mana pool.
+Oracle:Arcane Sanctum enters the battlefield tapped.\n{T}: Add {W}, {U}, or {B}.
diff --git a/forge-gui/res/cardsfolder/a/arch_of_orazca.txt b/forge-gui/res/cardsfolder/a/arch_of_orazca.txt
index 6bda9bcb351..b5314744892 100644
--- a/forge-gui/res/cardsfolder/a/arch_of_orazca.txt
+++ b/forge-gui/res/cardsfolder/a/arch_of_orazca.txt
@@ -2,7 +2,7 @@ Name:Arch of Orazca
 ManaCost:no cost
 Types:Land
 K:Ascend
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ 5 T | NumCards$ 1 | Activation$ Blessing | SpellDescription$ Draw a card. Activate this ability only if you have the city's blessing.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arch_of_orazca.jpg
-Oracle:Ascend (If you control ten or more permanents, you get the city's blessing for the rest of the game.)\n{T}: Add {C} to your mana pool.\n{5}, {T}: Draw a card. Activate this ability only if you have the city's blessing.
\ No newline at end of file
+Oracle:Ascend (If you control ten or more permanents, you get the city's blessing for the rest of the game.)\n{T}: Add {C}.\n{5}, {T}: Draw a card. Activate this ability only if you have the city's blessing.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/a/archaeological_dig.txt b/forge-gui/res/cardsfolder/a/archaeological_dig.txt
index 6082add0ebc..7536b355161 100644
--- a/forge-gui/res/cardsfolder/a/archaeological_dig.txt
+++ b/forge-gui/res/cardsfolder/a/archaeological_dig.txt
@@ -1,7 +1,7 @@
 Name:Archaeological Dig
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/archaeological_dig.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Sacrifice Archaeological Dig: Add one mana of any color to your mana pool.
+Oracle:{T}: Add {C}.\n{T}, Sacrifice Archaeological Dig: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/a/arctic_flats.txt b/forge-gui/res/cardsfolder/a/arctic_flats.txt
index 39a4b03e04e..af09494de62 100644
--- a/forge-gui/res/cardsfolder/a/arctic_flats.txt
+++ b/forge-gui/res/cardsfolder/a/arctic_flats.txt
@@ -2,7 +2,7 @@ Name:Arctic Flats
 ManaCost:no cost
 Types:Snow Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arctic_flats.jpg
-Oracle:Arctic Flats enters the battlefield tapped.\n{T}: Add {G} or {W} to your mana pool.
+Oracle:Arctic Flats enters the battlefield tapped.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/a/arguels_blood_fast_temple_of_aclazotz.txt b/forge-gui/res/cardsfolder/a/arguels_blood_fast_temple_of_aclazotz.txt
index 745d23f7ecb..5940c7af34b 100644
--- a/forge-gui/res/cardsfolder/a/arguels_blood_fast_temple_of_aclazotz.txt
+++ b/forge-gui/res/cardsfolder/a/arguels_blood_fast_temple_of_aclazotz.txt
@@ -14,8 +14,8 @@ ALTERNATE
 Name:Temple of Aclazotz
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SpellDescription$ Add {B}.
 A:AB$ GainLife | Cost$ T Sac<1/Creature> | LifeAmount$ X | References$ X | SpellDescription$ You gain life equal to the sacrificed creature's toughness.
 SVar:X:Sacrificed$CardToughness
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_aclazotz.jpg
-Oracle:(Transforms from Arguel's Blood Fast.)\n{T}: Add {B} to your mana pool.\n{T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness.
+Oracle:(Transforms from Arguel's Blood Fast.)\n{T}: Add {B}.\n{T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness.
diff --git a/forge-gui/res/cardsfolder/a/ash_barrens.txt b/forge-gui/res/cardsfolder/a/ash_barrens.txt
index 77d24cf38ef..5b297e3c16c 100644
--- a/forge-gui/res/cardsfolder/a/ash_barrens.txt
+++ b/forge-gui/res/cardsfolder/a/ash_barrens.txt
@@ -1,7 +1,7 @@
 Name:Ash Barrens
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 K:TypeCycling:Basic:1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ash_barrens.jpg
-Oracle:{T}: Add {C} to your mana pool.\nBasic landcycling {1} ({1}, Discard this card: Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library.)
+Oracle:{T}: Add {C}.\nBasic landcycling {1} ({1}, Discard this card: Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library.)
diff --git a/forge-gui/res/cardsfolder/a/ashnods_altar.txt b/forge-gui/res/cardsfolder/a/ashnods_altar.txt
index 8ebe2ff18f4..b40b1d27aed 100644
--- a/forge-gui/res/cardsfolder/a/ashnods_altar.txt
+++ b/forge-gui/res/cardsfolder/a/ashnods_altar.txt
@@ -1,8 +1,8 @@
 Name:Ashnod's Altar
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ Sac<1/Creature> | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/Creature> | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:NonStackingEffect:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ashnods_altar.jpg
-Oracle:Sacrifice a creature: Add {C}{C} to your mana pool.
+Oracle:Sacrifice a creature: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/a/astral_cornucopia.txt b/forge-gui/res/cardsfolder/a/astral_cornucopia.txt
index 13a4873bc70..e1e32d0b8fe 100644
--- a/forge-gui/res/cardsfolder/a/astral_cornucopia.txt
+++ b/forge-gui/res/cardsfolder/a/astral_cornucopia.txt
@@ -3,8 +3,8 @@ ManaCost:X X X
 Types:Artifact
 K:etbCounter:CHARGE:X
 SVar:X:Count$xPaid
-A:AB$ ChooseColor | Cost$ T | AILogic$ MostProminentInComputerDeck | SubAbility$ DBMana | SpellDescription$ Choose a color. Add one mana of that color to your mana pool for each charge counter on Astral Cornucopia.
+A:AB$ ChooseColor | Cost$ T | AILogic$ MostProminentInComputerDeck | SubAbility$ DBMana | SpellDescription$ Choose a color. Add one mana of that color for each charge counter on Astral Cornucopia.
 SVar:DBMana:DB$ Mana | Produced$ Chosen | Amount$ Y | References$ Y
 SVar:Y:Count$CardCounters.CHARGE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/astral_cornucopia.jpg
-Oracle:Astral Cornucopia enters the battlefield with X charge counters on it.\n{T}: Choose a color. Add one mana of that color to your mana pool for each charge counter on Astral Cornucopia.
+Oracle:Astral Cornucopia enters the battlefield with X charge counters on it.\n{T}: Choose a color. Add one mana of that color for each charge counter on Astral Cornucopia.
diff --git a/forge-gui/res/cardsfolder/a/astrolabe.txt b/forge-gui/res/cardsfolder/a/astrolabe.txt
index ace7dbd3582..bcef685f3cc 100644
--- a/forge-gui/res/cardsfolder/a/astrolabe.txt
+++ b/forge-gui/res/cardsfolder/a/astrolabe.txt
@@ -1,9 +1,9 @@
 Name:Astrolabe
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | Amount$ 2 | SubAbility$ DelTrigSlowtrip | SpellDescription$ Add two mana of any one color to your mana pool. Draw a card at the beginning of the next turn's upkeep.
+A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | Amount$ 2 | SubAbility$ DelTrigSlowtrip | SpellDescription$ Add two mana of any one color. Draw a card at the beginning of the next turn's upkeep.
 SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card at the beginning of the next turn's upkeep.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/astrolabe.jpg
-Oracle:{1}, {T}, Sacrifice Astrolabe: Add two mana of any one color to your mana pool. Draw a card at the beginning of the next turn's upkeep.
+Oracle:{1}, {T}, Sacrifice Astrolabe: Add two mana of any one color. Draw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/a/atarka_monument.txt b/forge-gui/res/cardsfolder/a/atarka_monument.txt
index 727685f58a2..0945055b4a1 100644
--- a/forge-gui/res/cardsfolder/a/atarka_monument.txt
+++ b/forge-gui/res/cardsfolder/a/atarka_monument.txt
@@ -1,10 +1,10 @@
 Name:Atarka Monument
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Animate | Cost$ 4 R G | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | Colors$ Red,Green | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 red and green Dragon artifact creature with flying until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Red|Green
 SVar:Picture:http://www.wizards.com/global/images/magic/general/atarka_monument.jpg
-Oracle:{T}: Add {R} or {G} to your mana pool.\n{4}{R}{G}: Atarka Monument becomes a 4/4 red and green Dragon artifact creature with flying until end of turn.
+Oracle:{T}: Add {R} or {G}.\n{4}{R}{G}: Atarka Monument becomes a 4/4 red and green Dragon artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/atzocan_seer.txt b/forge-gui/res/cardsfolder/a/atzocan_seer.txt
index 2c23e238edc..7b0a689fdae 100644
--- a/forge-gui/res/cardsfolder/a/atzocan_seer.txt
+++ b/forge-gui/res/cardsfolder/a/atzocan_seer.txt
@@ -2,8 +2,8 @@ Name:Atzocan Seer
 ManaCost:1 G W
 Types:Creature Human Druid
 PT:2/3
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | TgtPrompt$ Choose target Dinosaur card in your graveyard | ValidTgts$ Dinosaur.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target Dinosaur card from your graveyard to your hand.
 DeckHints:Type$Dinosaur
 SVar:Picture:http://www.wizards.com/global/images/magic/general/atzocan_seer.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.\nSacrifice Atzocan Seer: Return target Dinosaur card from your graveyard to your hand.
+Oracle:{T}: Add one mana of any color.\nSacrifice Atzocan Seer: Return target Dinosaur card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/a/aunties_hovel.txt b/forge-gui/res/cardsfolder/a/aunties_hovel.txt
index d6ec0da84bf..0b21eff017a 100644
--- a/forge-gui/res/cardsfolder/a/aunties_hovel.txt
+++ b/forge-gui/res/cardsfolder/a/aunties_hovel.txt
@@ -1,9 +1,9 @@
 Name:Auntie's Hovel
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Goblin> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Goblin card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aunties_hovel.jpg
-Oracle:As Auntie's Hovel enters the battlefield, you may reveal a Goblin card from your hand. If you don't, Auntie's Hovel enters the battlefield tapped.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:As Auntie's Hovel enters the battlefield, you may reveal a Goblin card from your hand. If you don't, Auntie's Hovel enters the battlefield tapped.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/a/avacyns_pilgrim.txt b/forge-gui/res/cardsfolder/a/avacyns_pilgrim.txt
index 651b015ff61..f3854ae71bc 100644
--- a/forge-gui/res/cardsfolder/a/avacyns_pilgrim.txt
+++ b/forge-gui/res/cardsfolder/a/avacyns_pilgrim.txt
@@ -2,6 +2,6 @@ Name:Avacyn's Pilgrim
 ManaCost:G
 Types:Creature Human Monk
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avacyns_pilgrim.jpg
-Oracle:{T}: Add {W} to your mana pool.
+Oracle:{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/a/avid_reclaimer.txt b/forge-gui/res/cardsfolder/a/avid_reclaimer.txt
index b003b12da5d..35131cb4d64 100644
--- a/forge-gui/res/cardsfolder/a/avid_reclaimer.txt
+++ b/forge-gui/res/cardsfolder/a/avid_reclaimer.txt
@@ -2,8 +2,8 @@ Name:Avid Reclaimer
 ManaCost:2 G
 Types:Creature Human Druid
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBGainLife | SpellDescription$ Add {U} to your mana pool. If you control a Nissa planeswalker, you gain 2 life.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBGainLife | SpellDescription$ Add {G} to your mana pool. If you control a Nissa planeswalker, you gain 2 life.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBGainLife | SpellDescription$ Add {U}. If you control a Nissa planeswalker, you gain 2 life.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBGainLife | SpellDescription$ Add {G}. If you control a Nissa planeswalker, you gain 2 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | ConditionPresent$ Planeswalker.Nissa+YouCtrl | ConditionCompare$ GE1 | LifeAmount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avid_reclaimer.jpg
-Oracle:{T}: Add {G} or {U} to your mana pool. If you control a Nissa planeswalker, you gain 2 life.
\ No newline at end of file
+Oracle:{T}: Add {G} or {U}. If you control a Nissa planeswalker, you gain 2 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/a/awakening_zone.txt b/forge-gui/res/cardsfolder/a/awakening_zone.txt
index 83d2325e7d2..606f9f89c96 100644
--- a/forge-gui/res/cardsfolder/a/awakening_zone.txt
+++ b/forge-gui/res/cardsfolder/a/awakening_zone.txt
@@ -1,10 +1,10 @@
 Name:Awakening Zone
 ManaCost:2 G
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn | TokenAltImages$ c_0_1_eldrazi_spawn2,c_0_1_eldrazi_spawn3
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/awakening_zone.jpg
-Oracle:At the beginning of your upkeep, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:At the beginning of your upkeep, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/a/axebane_guardian.txt b/forge-gui/res/cardsfolder/a/axebane_guardian.txt
index 65692eb3258..423828c8dfd 100644
--- a/forge-gui/res/cardsfolder/a/axebane_guardian.txt
+++ b/forge-gui/res/cardsfolder/a/axebane_guardian.txt
@@ -3,9 +3,9 @@ ManaCost:2 G
 Types:Creature Human Druid
 PT:0/3
 K:Defender
-A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ X | References$ X | SpellDescription$ Add X mana in any combination of colors to your mana pool, where X is the number of creatures with defender you control.
+A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ X | References$ X | SpellDescription$ Add X mana in any combination of colors, where X is the number of creatures with defender you control.
 SVar:X:Count$Valid Creature.withDefender+YouCtrl
 SVar:RemRandomDeck:True
 DeckHints:Keyword$Defender
 SVar:Picture:http://www.wizards.com/global/images/magic/general/axebane_guardian.jpg
-Oracle:Defender\n{T}: Add X mana in any combination of colors to your mana pool, where X is the number of creatures with defender you control.
+Oracle:Defender\n{T}: Add X mana in any combination of colors, where X is the number of creatures with defender you control.
diff --git a/forge-gui/res/cardsfolder/a/aysen_abbey.txt b/forge-gui/res/cardsfolder/a/aysen_abbey.txt
index 06879730f5f..0e9255da62e 100644
--- a/forge-gui/res/cardsfolder/a/aysen_abbey.txt
+++ b/forge-gui/res/cardsfolder/a/aysen_abbey.txt
@@ -1,10 +1,10 @@
 Name:Aysen Abbey
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ 2 T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ 2 T | Produced$ G | SpellDescription$ Add {G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aysen_abbey.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add {W} to your mana pool.\n{2}, {T}: Add {G} or {U} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add {W}.\n{2}, {T}: Add {G} or {U}.
diff --git a/forge-gui/res/cardsfolder/a/azorius_chancery.txt b/forge-gui/res/cardsfolder/a/azorius_chancery.txt
index 3de52a801e7..722a0e2be25 100644
--- a/forge-gui/res/cardsfolder/a/azorius_chancery.txt
+++ b/forge-gui/res/cardsfolder/a/azorius_chancery.txt
@@ -2,9 +2,9 @@ Name:Azorius Chancery
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W U | SpellDescription$ Add {W}{U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W U | SpellDescription$ Add {W}{U}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azorius_chancery.jpg
-Oracle:Azorius Chancery enters the battlefield tapped.\nWhen Azorius Chancery enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {W}{U} to your mana pool.
+Oracle:Azorius Chancery enters the battlefield tapped.\nWhen Azorius Chancery enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {W}{U}.
diff --git a/forge-gui/res/cardsfolder/a/azorius_cluestone.txt b/forge-gui/res/cardsfolder/a/azorius_cluestone.txt
index fcdc28414fc..2096d54118b 100644
--- a/forge-gui/res/cardsfolder/a/azorius_cluestone.txt
+++ b/forge-gui/res/cardsfolder/a/azorius_cluestone.txt
@@ -1,10 +1,10 @@
 Name:Azorius Cluestone
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Draw | Cost$ W U T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$White|Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azorius_cluestone.jpg
-Oracle:{T}: Add {W} or {U} to your mana pool.\n{W}{U}, {T}, Sacrifice Azorius Cluestone: Draw a card.
+Oracle:{T}: Add {W} or {U}.\n{W}{U}, {T}, Sacrifice Azorius Cluestone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/a/azorius_guildgate.txt b/forge-gui/res/cardsfolder/a/azorius_guildgate.txt
index 18b7bd74b77..a0357606014 100644
--- a/forge-gui/res/cardsfolder/a/azorius_guildgate.txt
+++ b/forge-gui/res/cardsfolder/a/azorius_guildgate.txt
@@ -2,7 +2,7 @@ Name:Azorius Guildgate
 ManaCost:no cost
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azorius_guildgate.jpg
-Oracle:Azorius Guildgate enters the battlefield tapped.\n{T}: Add {W} or {U} to your mana pool.
+Oracle:Azorius Guildgate enters the battlefield tapped.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/a/azorius_keyrune.txt b/forge-gui/res/cardsfolder/a/azorius_keyrune.txt
index aabc8a02d23..0cc330f4fb5 100644
--- a/forge-gui/res/cardsfolder/a/azorius_keyrune.txt
+++ b/forge-gui/res/cardsfolder/a/azorius_keyrune.txt
@@ -1,10 +1,10 @@
 Name:Azorius Keyrune
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Animate | Cost$ W U | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | Colors$ White,Blue | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/2 white and blue Bird artifact creature with flying until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$White|Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azorius_keyrune.jpg
-Oracle:{T}: Add {W} or {U} to your mana pool.\n{W}{U}: Azorius Keyrune becomes a 2/2 white and blue Bird artifact creature with flying until end of turn.
+Oracle:{T}: Add {W} or {U}.\n{W}{U}: Azorius Keyrune becomes a 2/2 white and blue Bird artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/azorius_signet.txt b/forge-gui/res/cardsfolder/a/azorius_signet.txt
index ce632109364..535ed729264 100644
--- a/forge-gui/res/cardsfolder/a/azorius_signet.txt
+++ b/forge-gui/res/cardsfolder/a/azorius_signet.txt
@@ -1,7 +1,7 @@
 Name:Azorius Signet
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ W U | SpellDescription$ Add {W}{U} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ W U | SpellDescription$ Add {W}{U}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azorius_signet.jpg
-Oracle:{1}, {T}: Add {W}{U} to your mana pool.
+Oracle:{1}, {T}: Add {W}{U}.
diff --git a/forge-gui/res/cardsfolder/a/azors_gateway_sanctum_of_the_sun.txt b/forge-gui/res/cardsfolder/a/azors_gateway_sanctum_of_the_sun.txt
index e1018427e82..7c42db9a011 100644
--- a/forge-gui/res/cardsfolder/a/azors_gateway_sanctum_of_the_sun.txt
+++ b/forge-gui/res/cardsfolder/a/azors_gateway_sanctum_of_the_sun.txt
@@ -21,7 +21,7 @@ Name:Sanctum of the Sun
 ManaCost:no cost
 Colors:colorless
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | References$ X | SpellDescription$ Add X mana of any one color to your mana pool, where X is your life total.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | References$ X | SpellDescription$ Add X mana of any one color, where X is your life total.
 SVar:X:Count$YourLifeTotal
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sanctum_of_the_sun.jpg
-Oracle:(Transforms from Azor's Gateway.)\n{T}: Add X mana of any one color to your mana pool, where X is your life total.
+Oracle:(Transforms from Azor's Gateway.)\n{T}: Add X mana of any one color, where X is your life total.
diff --git a/forge-gui/res/cardsfolder/b/badlands.txt b/forge-gui/res/cardsfolder/b/badlands.txt
index d225d05298b..9877fa99696 100644
--- a/forge-gui/res/cardsfolder/b/badlands.txt
+++ b/forge-gui/res/cardsfolder/b/badlands.txt
@@ -2,4 +2,4 @@ Name:Badlands
 ManaCost:no cost
 Types:Land Swamp Mountain
 SVar:Picture:http://www.wizards.com/global/images/magic/general/badlands.jpg
-Oracle:({T}: Add {B} or {R} to your mana pool.)
+Oracle:({T}: Add {B} or {R}.)
diff --git a/forge-gui/res/cardsfolder/b/balduvian_trading_post.txt b/forge-gui/res/cardsfolder/b/balduvian_trading_post.txt
index 083372ae6fd..2725057477f 100644
--- a/forge-gui/res/cardsfolder/b/balduvian_trading_post.txt
+++ b/forge-gui/res/cardsfolder/b/balduvian_trading_post.txt
@@ -1,7 +1,7 @@
 Name:Balduvian Trading Post
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C R | SpellDescription$ Add {C}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C R | SpellDescription$ Add {C}{R}.
 A:AB$ DealDamage | Cost$ 1 T | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking creature.
 R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, sacrifice an untapped Mountain instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
 SVar:PayBeforeETB:DB$ Sacrifice | SacValid$ Mountain.untapped | Defined$ You | RememberSacrificed$ True | SubAbility$ MoveToGraveyard
@@ -11,4 +11,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:NeedsToPlay:Mountain.YouCtrl+inZoneBattlefield+untapped
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_trading_post.jpg
-Oracle:If Balduvian Trading Post would enter the battlefield, sacrifice an untapped Mountain instead. If you do, put Balduvian Trading Post onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {C}{R} to your mana pool.\n{1}, {T}: Balduvian Trading Post deals 1 damage to target attacking creature.
+Oracle:If Balduvian Trading Post would enter the battlefield, sacrifice an untapped Mountain instead. If you do, put Balduvian Trading Post onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {C}{R}.\n{1}, {T}: Balduvian Trading Post deals 1 damage to target attacking creature.
diff --git a/forge-gui/res/cardsfolder/b/bant_panorama.txt b/forge-gui/res/cardsfolder/b/bant_panorama.txt
index b4466808078..9dcc1c59b88 100644
--- a/forge-gui/res/cardsfolder/b/bant_panorama.txt
+++ b/forge-gui/res/cardsfolder/b/bant_panorama.txt
@@ -1,7 +1,7 @@
 Name:Bant Panorama
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Forest+Basic,Land.Plains+Basic,Land.Island+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Forest, Plains, or Island card and put it onto the battlefield tapped. Then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bant_panorama.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}, Sacrifice Bant Panorama: Search your library for a basic Forest, Plains, or Island card and put it onto the battlefield tapped. Then shuffle your library.
+Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Bant Panorama: Search your library for a basic Forest, Plains, or Island card and put it onto the battlefield tapped. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/b/barbarian_ring.txt b/forge-gui/res/cardsfolder/b/barbarian_ring.txt
index 855a84e1284..ea8d0894244 100644
--- a/forge-gui/res/cardsfolder/b/barbarian_ring.txt
+++ b/forge-gui/res/cardsfolder/b/barbarian_ring.txt
@@ -1,8 +1,8 @@
 Name:Barbarian Ring
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R}. CARDNAME deals 1 damage to you.
 A:AB$ DealDamage | Cost$ R T Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ CARDNAME deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barbarian_ring.jpg
-Oracle:{T}: Add {R} to your mana pool. Barbarian Ring deals 1 damage to you.\nThreshold — {R}, {T}, Sacrifice Barbarian Ring: Barbarian Ring deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {R}. Barbarian Ring deals 1 damage to you.\nThreshold — {R}, {T}, Sacrifice Barbarian Ring: Barbarian Ring deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/b/barbed_sextant.txt b/forge-gui/res/cardsfolder/b/barbed_sextant.txt
index 3029b100260..2b3c2d7ef9c 100644
--- a/forge-gui/res/cardsfolder/b/barbed_sextant.txt
+++ b/forge-gui/res/cardsfolder/b/barbed_sextant.txt
@@ -1,9 +1,9 @@
 Name:Barbed Sextant
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | SubAbility$ DelTrigSlowtrip | SpellDescription$ Add one mana of any color to your mana pool. Draw a card at the beginning of the next turn's upkeep.
+A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | SubAbility$ DelTrigSlowtrip | SpellDescription$ Add one mana of any color. Draw a card at the beginning of the next turn's upkeep.
 SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$Draw | NumCards$ 1 | Defined$ You
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barbed_sextant.jpg
-Oracle:{1}, {T}, Sacrifice Barbed Sextant: Add one mana of any color to your mana pool. Draw a card at the beginning of the next turn's upkeep.
+Oracle:{1}, {T}, Sacrifice Barbed Sextant: Add one mana of any color. Draw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/b/barren_moor.txt b/forge-gui/res/cardsfolder/b/barren_moor.txt
index 1d107a1f259..2f31217e02a 100644
--- a/forge-gui/res/cardsfolder/b/barren_moor.txt
+++ b/forge-gui/res/cardsfolder/b/barren_moor.txt
@@ -2,7 +2,7 @@ Name:Barren Moor
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 K:Cycling:B
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barren_moor.jpg
-Oracle:Barren Moor enters the battlefield tapped.\n{T}: Add {B} to your mana pool.\nCycling {B} ({B}, Discard this card: Draw a card.)
+Oracle:Barren Moor enters the battlefield tapped.\n{T}: Add {B}.\nCycling {B} ({B}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/b/basal_sliver.txt b/forge-gui/res/cardsfolder/b/basal_sliver.txt
index 5fc84538b00..098c62f9313 100644
--- a/forge-gui/res/cardsfolder/b/basal_sliver.txt
+++ b/forge-gui/res/cardsfolder/b/basal_sliver.txt
@@ -2,8 +2,8 @@ Name:Basal Sliver
 ManaCost:2 B
 Types:Creature Sliver
 PT:2/2
-S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Mana | Description$ All Slivers have "Sacrifice this permanent: Add {B}{B} to your mana pool."
-SVar:Mana:AB$Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool.
+S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Mana | Description$ All Slivers have "Sacrifice this permanent: Add {B}{B}."
+SVar:Mana:AB$Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/basal_sliver.jpg
-Oracle:All Slivers have "Sacrifice this permanent: Add {B}{B} to your mana pool."
+Oracle:All Slivers have "Sacrifice this permanent: Add {B}{B}."
diff --git a/forge-gui/res/cardsfolder/b/basal_thrull.txt b/forge-gui/res/cardsfolder/b/basal_thrull.txt
index 97cedcde6a6..339c692193e 100644
--- a/forge-gui/res/cardsfolder/b/basal_thrull.txt
+++ b/forge-gui/res/cardsfolder/b/basal_thrull.txt
@@ -2,7 +2,7 @@ Name:Basal Thrull
 ManaCost:B B
 Types:Creature Thrull
 PT:1/2
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/basal_thrull.jpg
-Oracle:{T}, Sacrifice Basal Thrull: Add {B}{B} to your mana pool.
+Oracle:{T}, Sacrifice Basal Thrull: Add {B}{B}.
diff --git a/forge-gui/res/cardsfolder/b/basalt_monolith.txt b/forge-gui/res/cardsfolder/b/basalt_monolith.txt
index fd58f14ba7f..72d53836867 100644
--- a/forge-gui/res/cardsfolder/b/basalt_monolith.txt
+++ b/forge-gui/res/cardsfolder/b/basalt_monolith.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact
 K:CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ 3 | SpellDescription$ Untap CARDNAME.
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C}.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/basalt_monolith.jpg
-Oracle:Basalt Monolith doesn't untap during your untap step.\n{T}: Add {C}{C}{C} to your mana pool.\n{3}: Untap Basalt Monolith.
+Oracle:Basalt Monolith doesn't untap during your untap step.\n{T}: Add {C}{C}{C}.\n{3}: Untap Basalt Monolith.
diff --git a/forge-gui/res/cardsfolder/b/battle_hymn.txt b/forge-gui/res/cardsfolder/b/battle_hymn.txt
index 45058a97d29..f9851a80ac3 100644
--- a/forge-gui/res/cardsfolder/b/battle_hymn.txt
+++ b/forge-gui/res/cardsfolder/b/battle_hymn.txt
@@ -1,7 +1,7 @@
 Name:Battle Hymn
 ManaCost:1 R
 Types:Instant
-A:SP$ Mana | Cost$ 1 R | Produced$ R | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R} to your mana pool for each creature you control.
+A:SP$ Mana | Cost$ 1 R | Produced$ R | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R} for each creature you control.
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/battle_hymn.jpg
-Oracle:Add {R} to your mana pool for each creature you control.
+Oracle:Add {R} for each creature you control.
diff --git a/forge-gui/res/cardsfolder/b/battlefield_forge.txt b/forge-gui/res/cardsfolder/b/battlefield_forge.txt
index 4d115fcf7a0..a8cca48b791 100644
--- a/forge-gui/res/cardsfolder/b/battlefield_forge.txt
+++ b/forge-gui/res/cardsfolder/b/battlefield_forge.txt
@@ -1,9 +1,9 @@
 Name:Battlefield Forge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-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$ R | SubAbility$ DBPain | SpellDescription$ Add {R} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/battlefield_forge.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {R} or {W} to your mana pool. Battlefield Forge deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {R} or {W}. Battlefield Forge deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/b/bayou.txt b/forge-gui/res/cardsfolder/b/bayou.txt
index 9beb9db183c..c76ea933df9 100644
--- a/forge-gui/res/cardsfolder/b/bayou.txt
+++ b/forge-gui/res/cardsfolder/b/bayou.txt
@@ -2,4 +2,4 @@ Name:Bayou
 ManaCost:no cost
 Types:Land Swamp Forest
 SVar:Picture:http://resources.wizards.com/magic/cards/1e/en-us/card280.jpg
-Oracle:({T}: Add {B} or {G} to your mana pool.)
+Oracle:({T}: Add {B} or {G}.)
diff --git a/forge-gui/res/cardsfolder/b/beastcaller_savant.txt b/forge-gui/res/cardsfolder/b/beastcaller_savant.txt
index b73c5a9dce9..bb52d955103 100644
--- a/forge-gui/res/cardsfolder/b/beastcaller_savant.txt
+++ b/forge-gui/res/cardsfolder/b/beastcaller_savant.txt
@@ -3,6 +3,6 @@ ManaCost:1 G
 Types:Creature Elf Shaman Ally
 PT:1/1
 K:Haste
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Card.Creature | SpellDescription$ Add one mana of any color to your mana pool. Use this mana only to cast creature spells.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Card.Creature | SpellDescription$ Add one mana of any color. Use this mana only to cast creature spells.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/beastcaller_expert.jpg
-Oracle:Haste\n{T}: Add one mana of any color to your mana pool. Use this mana only to cast creature spells.
+Oracle:Haste\n{T}: Add one mana of any color. Use this mana only to cast creature spells.
diff --git a/forge-gui/res/cardsfolder/b/behold_my_grandeur.txt b/forge-gui/res/cardsfolder/b/behold_my_grandeur.txt
index 7c2bb0a5f9f..b9e8549c4f3 100644
--- a/forge-gui/res/cardsfolder/b/behold_my_grandeur.txt
+++ b/forge-gui/res/cardsfolder/b/behold_my_grandeur.txt
@@ -1,10 +1,10 @@
 Name:Behold My Grandeur
 ManaCost:no cost
 Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DBAddMana | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, add {U}{B}{R} to your mana pool.
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DBAddMana | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, add {U}{B}{R}.
 SVar:DBAddMana:DB$ Mana | Produced$ U B R
 T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DBSearch | TriggerZones$ Command | OptionalDecider$ You | CheckSVar$ X | SVarCompare$ GE6 | TriggerDescription$ When you set this scheme in motion, if you control six or more lands, you may search your library for a card with converted mana cost 6 or greater, reveal it, put it into your hand, then shuffle your library.
 SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.cmcGE6 | ChangeNum$ 1 | ShuffleNonMandatory$ True
 SVar:X:Count$Valid Land.YouCtrl
 SVar:Picture:https://downloads.cardforge.org/images/cards/ARC/Behold My Grandeur.full.jpg
-Oracle:When you set this scheme in motion, add {U}{B}{R} to your mana pool.\nWhen you set this scheme in motion, if you control six or more lands, you may search your library for a card with converted mana cost 6 or greater, reveal it, put it into your hand, then shuffle your library.
+Oracle:When you set this scheme in motion, add {U}{B}{R}.\nWhen you set this scheme in motion, if you control six or more lands, you may search your library for a card with converted mana cost 6 or greater, reveal it, put it into your hand, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/b/benthic_explorers.txt b/forge-gui/res/cardsfolder/b/benthic_explorers.txt
index bb4a4fd3475..ba2ae77e136 100644
--- a/forge-gui/res/cardsfolder/b/benthic_explorers.txt
+++ b/forge-gui/res/cardsfolder/b/benthic_explorers.txt
@@ -2,6 +2,6 @@ Name:Benthic Explorers
 ManaCost:3 U
 Types:Creature Merfolk Scout
 PT:2/4
-A:AB$ ManaReflected | Cost$ T untapYType<1/Land.OppCtrl/land> | ColorOrType$ Type | Valid$ Defined.Untapped | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type that land could produce to your mana pool.
+A:AB$ ManaReflected | Cost$ T untapYType<1/Land.OppCtrl/land> | ColorOrType$ Type | Valid$ Defined.Untapped | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type that land could produce.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/benthic_explorers.jpg
-Oracle:{T}, Untap a tapped land an opponent controls: Add one mana of any type that land could produce to your mana pool.
+Oracle:{T}, Untap a tapped land an opponent controls: Add one mana of any type that land could produce.
diff --git a/forge-gui/res/cardsfolder/b/birchlore_rangers.txt b/forge-gui/res/cardsfolder/b/birchlore_rangers.txt
index 87f8cac19ac..d188da726f7 100644
--- a/forge-gui/res/cardsfolder/b/birchlore_rangers.txt
+++ b/forge-gui/res/cardsfolder/b/birchlore_rangers.txt
@@ -2,8 +2,8 @@ Name:Birchlore Rangers
 ManaCost:G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ tapXType<2/Elf> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ tapXType<2/Elf> | Produced$ Any | SpellDescription$ Add one mana of any color.
 K:Morph:G
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/birchlore_rangers.jpg
-Oracle:Tap two untapped Elves you control: Add one mana of any color to your mana pool.\nMorph {G} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
+Oracle:Tap two untapped Elves you control: Add one mana of any color.\nMorph {G} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
diff --git a/forge-gui/res/cardsfolder/b/birds_of_paradise.txt b/forge-gui/res/cardsfolder/b/birds_of_paradise.txt
index 3d75eee213e..759c6c115a0 100644
--- a/forge-gui/res/cardsfolder/b/birds_of_paradise.txt
+++ b/forge-gui/res/cardsfolder/b/birds_of_paradise.txt
@@ -2,7 +2,7 @@ Name:Birds of Paradise
 ManaCost:G
 Types:Creature Bird
 PT:0/1
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 K:Flying
 SVar:Picture:http://resources.wizards.com/magic/cards/rav/en-us/card83688.jpg
-Oracle:Flying\n{T}: Add one mana of any color to your mana pool.
+Oracle:Flying\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/b/birds_of_paradise_avatar.txt b/forge-gui/res/cardsfolder/b/birds_of_paradise_avatar.txt
index 4539e524ded..3bf5791fb4a 100644
--- a/forge-gui/res/cardsfolder/b/birds_of_paradise_avatar.txt
+++ b/forge-gui/res/cardsfolder/b/birds_of_paradise_avatar.txt
@@ -2,7 +2,7 @@ Name:Birds of Paradise Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+0/-3
-S:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add one mana of any color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:https://downloads.cardforge.org/images/cards/VAN/Birds of Paradise Avatar1.full.jpg
-Oracle:Hand +0, life -3\nLands you control have "{T}: Add one mana of any color to your mana pool."
+Oracle:Hand +0, life -3\nLands you control have "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/b/birthing_hulk.txt b/forge-gui/res/cardsfolder/b/birthing_hulk.txt
index 3fadd3bd4bd..21214f3efd1 100644
--- a/forge-gui/res/cardsfolder/b/birthing_hulk.txt
+++ b/forge-gui/res/cardsfolder/b/birthing_hulk.txt
@@ -3,12 +3,12 @@ ManaCost:6 G
 Types:Creature Eldrazi Drone
 PT:5/4
 K:Devoid
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." ({C} represents colorless mana.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 A:AB$ Regenerate | Cost$ 1 C | SpellDescription$ Regenerate CARDNAME.
 DeckNeeds:Ability$Mana.Colorless
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/birthing_hulk.jpg
-Oracle:Devoid (This card has no color.)\nWhen Birthing Hulk enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." ({C} represents colorless mana.)\n{1}{C}: Regenerate Birthing Hulk.
+Oracle:Devoid (This card has no color.)\nWhen Birthing Hulk enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)\n{1}{C}: Regenerate Birthing Hulk.
diff --git a/forge-gui/res/cardsfolder/b/black_lotus.txt b/forge-gui/res/cardsfolder/b/black_lotus.txt
index 9c837a423ff..3bac0fdc838 100644
--- a/forge-gui/res/cardsfolder/b/black_lotus.txt
+++ b/forge-gui/res/cardsfolder/b/black_lotus.txt
@@ -1,6 +1,6 @@
 Name:Black Lotus
 ManaCost:0
 Types:Artifact
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 3 | AILogic$ BlackLotus | SpellDescription$ Add three mana of any one color to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 3 | AILogic$ BlackLotus | SpellDescription$ Add three mana of any one color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/black_lotus.jpg
-Oracle:{T}, Sacrifice Black Lotus: Add three mana of any one color to your mana pool.
+Oracle:{T}, Sacrifice Black Lotus: Add three mana of any one color.
diff --git a/forge-gui/res/cardsfolder/b/black_mana_battery.txt b/forge-gui/res/cardsfolder/b/black_mana_battery.txt
index 37300ec4ea7..c962cab0230 100644
--- a/forge-gui/res/cardsfolder/b/black_mana_battery.txt
+++ b/forge-gui/res/cardsfolder/b/black_mana_battery.txt
@@ -2,10 +2,10 @@ Name:Black Mana Battery
 ManaCost:4
 Types:Artifact
 A:AB$ PutCounter | Cost$ 2 T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | References$ X,Y | Produced$ B | Amount$ Y | CostDesc$ {T}, Remove any number of charge counters from CARDNAME: | SpellDescription$ Add {B} to your mana pool, then add an additional {B} to your mana pool for each charge counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | References$ X,Y | Produced$ B | Amount$ Y | CostDesc$ {T}, Remove any number of charge counters from CARDNAME: | SpellDescription$ Add {B}, then add an additional {B} for each charge counter removed this way.
 SVar:Y:Number$1/Plus.ChosenX
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/black_mana_battery.jpg
-Oracle:{2}, {T}: Put a charge counter on Black Mana Battery.\n{T}, Remove any number of charge counters from Black Mana Battery: Add {B} to your mana pool, then add an additional {B} to your mana pool for each charge counter removed this way.
+Oracle:{2}, {T}: Put a charge counter on Black Mana Battery.\n{T}, Remove any number of charge counters from Black Mana Battery: Add {B}, then add an additional {B} for each charge counter removed this way.
diff --git a/forge-gui/res/cardsfolder/b/black_market.txt b/forge-gui/res/cardsfolder/b/black_market.txt
index d778476f2f6..147962049c6 100644
--- a/forge-gui/res/cardsfolder/b/black_market.txt
+++ b/forge-gui/res/cardsfolder/b/black_market.txt
@@ -3,8 +3,8 @@ ManaCost:3 B B
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dies, put a charge counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGetMana | TriggerDescription$ At the beginning of your precombat main phase, add {B} to your mana pool for each charge counter on CARDNAME.
-SVar:TrigGetMana:DB$ Mana | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {X}{B} to your mana pool
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGetMana | TriggerDescription$ At the beginning of your precombat main phase, add {B} for each charge counter on CARDNAME.
+SVar:TrigGetMana:DB$ Mana | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {X}{B}
 SVar:X:Count$CardCounters.CHARGE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/black_market.jpg
-Oracle:Whenever a creature dies, put a charge counter on Black Market.\nAt the beginning of your precombat main phase, add {B} to your mana pool for each charge counter on Black Market.
+Oracle:Whenever a creature dies, put a charge counter on Black Market.\nAt the beginning of your precombat main phase, add {B} for each charge counter on Black Market.
diff --git a/forge-gui/res/cardsfolder/b/blackcleave_cliffs.txt b/forge-gui/res/cardsfolder/b/blackcleave_cliffs.txt
index 02890f62a19..02e45385f2e 100644
--- a/forge-gui/res/cardsfolder/b/blackcleave_cliffs.txt
+++ b/forge-gui/res/cardsfolder/b/blackcleave_cliffs.txt
@@ -5,7 +5,7 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ GT2 | References$ ETBCheckSVar2 | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar2:Count$LastStateBattlefield Land.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blackcleave_cliffs.jpg
-Oracle:Blackcleave Cliffs enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:Blackcleave Cliffs enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/b/blasted_landscape.txt b/forge-gui/res/cardsfolder/b/blasted_landscape.txt
index 70c012f8171..673bc7b947c 100644
--- a/forge-gui/res/cardsfolder/b/blasted_landscape.txt
+++ b/forge-gui/res/cardsfolder/b/blasted_landscape.txt
@@ -1,7 +1,7 @@
 Name:Blasted Landscape
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blasted_landscape.jpg
-Oracle:{T}: Add {C} to your mana pool.\nCycling {2} ({2}, Discard this card: Draw a card.)
+Oracle:{T}: Add {C}.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/b/blight_herder.txt b/forge-gui/res/cardsfolder/b/blight_herder.txt
index ead0c715e37..e546b33ac29 100644
--- a/forge-gui/res/cardsfolder/b/blight_herder.txt
+++ b/forge-gui/res/cardsfolder/b/blight_herder.txt
@@ -2,10 +2,10 @@ Name:Blight Herder
 ManaCost:5
 Types:Creature Eldrazi Processor
 PT:4/5
-T:Mode$ SpellCast | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ When you cast CARDNAME, you may put two cards your opponents own from exile into their owners' graveyards. If you do, create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ SpellCast | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ When you cast CARDNAME, you may put two cards your opponents own from exile into their owners' graveyards. If you do, create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
 SVar:TrigToken:AB$ Token | Cost$ ExiledMoveToGrave<2/Card.OppOwn/cards your opponents own> | TokenAmount$ 3 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Keyword$Ingest & Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blight_herder.jpg
-Oracle:When you cast Blight Herder, you may put two cards your opponents own from exile into their owners' graveyards. If you do, create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:When you cast Blight Herder, you may put two cards your opponents own from exile into their owners' graveyards. If you do, create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/b/blighted_cataract.txt b/forge-gui/res/cardsfolder/b/blighted_cataract.txt
index 8d020972058..ddf8919f0cf 100644
--- a/forge-gui/res/cardsfolder/b/blighted_cataract.txt
+++ b/forge-gui/res/cardsfolder/b/blighted_cataract.txt
@@ -1,9 +1,9 @@
 Name:Blighted Cataract
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ 5 U T Sac<1/CARDNAME> | NumCards$ 2 | SpellDescription$ Draw two cards.
 DeckHas:Ability$Mana.Colorless
 DeckNeeds:Color$Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blighted_cataract.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{5}{U}, {T}, Sacrifice Blighted Cataract: Draw two cards.
+Oracle:{T}: Add {C}.\n{5}{U}, {T}, Sacrifice Blighted Cataract: Draw two cards.
diff --git a/forge-gui/res/cardsfolder/b/blighted_fen.txt b/forge-gui/res/cardsfolder/b/blighted_fen.txt
index ae0a798f8c2..a4f56c30f63 100644
--- a/forge-gui/res/cardsfolder/b/blighted_fen.txt
+++ b/forge-gui/res/cardsfolder/b/blighted_fen.txt
@@ -1,9 +1,9 @@
 Name:Blighted Fen
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Sacrifice | Cost$ 4 B T Sac<1/CARDNAME> | ValidTgts$ Opponent | SacValid$ Creature | SacMessage$ Creature | Amount$ 1 | SpellDescription$ Target opponent sacrifices a creature.
 DeckHas:Ability$Mana.Colorless
 DeckNeeds:Color$Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blighted_fen.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}{B}, {T}, Sacrifice Blighted Fen: Target opponent sacrifices a creature.
+Oracle:{T}: Add {C}.\n{4}{B}, {T}, Sacrifice Blighted Fen: Target opponent sacrifices a creature.
diff --git a/forge-gui/res/cardsfolder/b/blighted_gorge.txt b/forge-gui/res/cardsfolder/b/blighted_gorge.txt
index 2b63ae832c3..91465153502 100644
--- a/forge-gui/res/cardsfolder/b/blighted_gorge.txt
+++ b/forge-gui/res/cardsfolder/b/blighted_gorge.txt
@@ -1,9 +1,9 @@
 Name:Blighted Gorge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ DealDamage | Cost$ 4 R T Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player. 
 DeckHas:Ability$Mana.Colorless
 DeckNeeds:Color$Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blighted_gorge.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}{R}, {T}, Sacrifice Blighted Gorge: Blighted Gorge deals 2 damage to target creature or player.
+Oracle:{T}: Add {C}.\n{4}{R}, {T}, Sacrifice Blighted Gorge: Blighted Gorge deals 2 damage to target creature or player.
diff --git a/forge-gui/res/cardsfolder/b/blighted_steppe.txt b/forge-gui/res/cardsfolder/b/blighted_steppe.txt
index 2f3a0740c44..6fcc7df462a 100644
--- a/forge-gui/res/cardsfolder/b/blighted_steppe.txt
+++ b/forge-gui/res/cardsfolder/b/blighted_steppe.txt
@@ -1,10 +1,10 @@
 Name:Blighted Steppe
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ GainLife | Cost$ 3 W T Sac<1/CARDNAME> | Defined$ You | LifeAmount$ X | References$ X | SpellDescription$ Gain 2 life for each creature you control.
 SVar:X:Count$TypeYouCtrl.Creature/Times.2
 DeckHas:Ability$Mana.Colorless
 DeckNeeds:Color$White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blighted_steppe.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{3}{W}, {T}, Sacrifice Blighted Steppe: Gain 2 life for each creature you control.
+Oracle:{T}: Add {C}.\n{3}{W}, {T}, Sacrifice Blighted Steppe: Gain 2 life for each creature you control.
diff --git a/forge-gui/res/cardsfolder/b/blighted_woodland.txt b/forge-gui/res/cardsfolder/b/blighted_woodland.txt
index eea105b8ad8..cdf23a6297e 100644
--- a/forge-gui/res/cardsfolder/b/blighted_woodland.txt
+++ b/forge-gui/res/cardsfolder/b/blighted_woodland.txt
@@ -1,9 +1,9 @@
 Name:Blighted Woodland
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 3 G T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for two basic land cards and put them onto the battlefield tapped. Then shuffle your library.
 DeckHas:Ability$Mana.Colorless
 DeckNeeds:Color$Green
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blighted_woodland.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{3}{G}, {T}, Sacrifice Blighted Woodland: Search your library for two basic land cards and put them onto the battlefield tapped. Then shuffle your library.
+Oracle:{T}: Add {C}.\n{3}{G}, {T}, Sacrifice Blighted Woodland: Search your library for two basic land cards and put them onto the battlefield tapped. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/b/blightsoil_druid.txt b/forge-gui/res/cardsfolder/b/blightsoil_druid.txt
index a418bbf26e6..c87bee76b35 100644
--- a/forge-gui/res/cardsfolder/b/blightsoil_druid.txt
+++ b/forge-gui/res/cardsfolder/b/blightsoil_druid.txt
@@ -2,6 +2,6 @@ Name:Blightsoil Druid
 ManaCost:1 B
 Types:Creature Elf Druid
 PT:1/2
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blightsoil_druid.jpg
-Oracle:{T}, Pay 1 life: Add {G} to your mana pool.
+Oracle:{T}, Pay 1 life: Add {G}.
diff --git a/forge-gui/res/cardsfolder/b/blinkmoth_nexus.txt b/forge-gui/res/cardsfolder/b/blinkmoth_nexus.txt
index d42aa496717..150fb2f3266 100644
--- a/forge-gui/res/cardsfolder/b/blinkmoth_nexus.txt
+++ b/forge-gui/res/cardsfolder/b/blinkmoth_nexus.txt
@@ -1,8 +1,8 @@
 Name:Blinkmoth Nexus
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Blinkmoth | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 1/1 Blinkmoth artifact creature with flying until end of turn. It's still a land.
 A:AB$ Pump | Cost$ 1 T | ValidTgts$ Creature.Blinkmoth | TgtPrompt$ Select target Blinkmoth creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target Blinkmoth creature gets +1/+1 until end of turn.
 SVar:Picture:http://resources.wizards.com/magic/cards/dst/en-us/card39439.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}: Blinkmoth Nexus becomes a 1/1 Blinkmoth artifact creature with flying until end of turn. It's still a land.\n{1}, {T}: Target Blinkmoth creature gets +1/+1 until end of turn.
+Oracle:{T}: Add {C}.\n{1}: Blinkmoth Nexus becomes a 1/1 Blinkmoth artifact creature with flying until end of turn. It's still a land.\n{1}, {T}: Target Blinkmoth creature gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/b/blinkmoth_urn.txt b/forge-gui/res/cardsfolder/b/blinkmoth_urn.txt
index f6c525433db..f3ab9bf63e7 100644
--- a/forge-gui/res/cardsfolder/b/blinkmoth_urn.txt
+++ b/forge-gui/res/cardsfolder/b/blinkmoth_urn.txt
@@ -1,9 +1,9 @@
 Name:Blinkmoth Urn
 ManaCost:5
 Types:Artifact
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self+untapped | Execute$ TrigGetMana | TriggerDescription$ At the beginning of each player's precombat main phase, if CARDNAME is untapped, that player adds {C} to his or her mana pool for each artifact he or she controls.
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self+untapped | Execute$ TrigGetMana | TriggerDescription$ At the beginning of each player's precombat main phase, if CARDNAME is untapped, that player adds {C} for each artifact he or she controls.
 SVar:TrigGetMana:DB$ Mana | Produced$ C | Amount$ X | References$ X | Defined$ TriggeredPlayer
 SVar:X:Count$Valid Artifact.ActivePlayerCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blinkmoth_urn.jpg
-Oracle:At the beginning of each player's precombat main phase, if Blinkmoth Urn is untapped, that player adds {C} to his or her mana pool for each artifact he or she controls.
+Oracle:At the beginning of each player's precombat main phase, if Blinkmoth Urn is untapped, that player adds {C} for each artifact he or she controls.
diff --git a/forge-gui/res/cardsfolder/b/blinkmoth_well.txt b/forge-gui/res/cardsfolder/b/blinkmoth_well.txt
index b3d5548b2dc..5962efd160e 100644
--- a/forge-gui/res/cardsfolder/b/blinkmoth_well.txt
+++ b/forge-gui/res/cardsfolder/b/blinkmoth_well.txt
@@ -1,8 +1,8 @@
 Name:Blinkmoth Well
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Tap | Cost$ 2 T | ValidTgts$ Artifact.nonCreature | TgtPrompt$ Select target noncreature artifact | SpellDescription$ Tap target noncreature artifact.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blinkmoth_well.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: Tap target noncreature artifact.
+Oracle:{T}: Add {C}.\n{2}, {T}: Tap target noncreature artifact.
diff --git a/forge-gui/res/cardsfolder/b/blisterpod.txt b/forge-gui/res/cardsfolder/b/blisterpod.txt
index 50eacf1a752..eddbc230226 100644
--- a/forge-gui/res/cardsfolder/b/blisterpod.txt
+++ b/forge-gui/res/cardsfolder/b/blisterpod.txt
@@ -3,11 +3,11 @@ ManaCost:G
 Types:Creature Eldrazi Drone
 K:Devoid
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 SVar:SacMe:1
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blisterpod.jpg
-Oracle:Devoid (This card has no color.)\nWhen Blisterpod dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Devoid (This card has no color.)\nWhen Blisterpod dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/b/blood_celebrant.txt b/forge-gui/res/cardsfolder/b/blood_celebrant.txt
index 8e048d5f649..48341969959 100644
--- a/forge-gui/res/cardsfolder/b/blood_celebrant.txt
+++ b/forge-gui/res/cardsfolder/b/blood_celebrant.txt
@@ -2,7 +2,7 @@ Name:Blood Celebrant
 ManaCost:B
 Types:Creature Human Cleric
 PT:1/1
-A:AB$ Mana | Cost$ B PayLife<1> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ B PayLife<1> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_celebrant.jpg
-Oracle:{B}, Pay 1 life: Add one mana of any color to your mana pool.
+Oracle:{B}, Pay 1 life: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/b/blood_crypt.txt b/forge-gui/res/cardsfolder/b/blood_crypt.txt
index 3f8fdf8bb4e..dbad291b086 100644
--- a/forge-gui/res/cardsfolder/b/blood_crypt.txt
+++ b/forge-gui/res/cardsfolder/b/blood_crypt.txt
@@ -4,4 +4,4 @@ Types:Land Swamp Mountain
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | UnlessAI$ Shockland | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://resources.wizards.com/magic/cards/dis/en-us/card97102.jpg
-Oracle:({T}: Add {B} or {R} to your mana pool.)\nAs Blood Crypt enters the battlefield, you may pay 2 life. If you don't, Blood Crypt enters the battlefield tapped.
+Oracle:({T}: Add {B} or {R}.)\nAs Blood Crypt enters the battlefield, you may pay 2 life. If you don't, Blood Crypt enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/b/blood_pet.txt b/forge-gui/res/cardsfolder/b/blood_pet.txt
index 562694beb63..9a83dd3d6d3 100644
--- a/forge-gui/res/cardsfolder/b/blood_pet.txt
+++ b/forge-gui/res/cardsfolder/b/blood_pet.txt
@@ -2,6 +2,6 @@ Name:Blood Pet
 ManaCost:B
 Types:Creature Thrull
 PT:1/1
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_pet.jpg
-Oracle:Sacrifice Blood Pet: Add {B} to your mana pool.
+Oracle:Sacrifice Blood Pet: Add {B}.
diff --git a/forge-gui/res/cardsfolder/b/blood_vassal.txt b/forge-gui/res/cardsfolder/b/blood_vassal.txt
index 5777cc744ce..8aecb32b34b 100644
--- a/forge-gui/res/cardsfolder/b/blood_vassal.txt
+++ b/forge-gui/res/cardsfolder/b/blood_vassal.txt
@@ -2,7 +2,7 @@ Name:Blood Vassal
 ManaCost:2 B
 Types:Creature Thrull
 PT:2/2
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_vassal.jpg
-Oracle:Sacrifice Blood Vassal: Add {B}{B} to your mana pool.
+Oracle:Sacrifice Blood Vassal: Add {B}{B}.
diff --git a/forge-gui/res/cardsfolder/b/bloodfell_caves.txt b/forge-gui/res/cardsfolder/b/bloodfell_caves.txt
index c23bc7d1eee..179fb629a24 100644
--- a/forge-gui/res/cardsfolder/b/bloodfell_caves.txt
+++ b/forge-gui/res/cardsfolder/b/bloodfell_caves.txt
@@ -1,10 +1,10 @@
 Name:Bloodfell Caves
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodfell_caves.jpg
-Oracle:Bloodfell Caves enters the battlefield tapped.\nWhen Bloodfell Caves enters the battlefield, you gain 1 life.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:Bloodfell Caves enters the battlefield tapped.\nWhen Bloodfell Caves enters the battlefield, you gain 1 life.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/b/bloodstone_cameo.txt b/forge-gui/res/cardsfolder/b/bloodstone_cameo.txt
index fd472f09725..f5f3707f5a5 100644
--- a/forge-gui/res/cardsfolder/b/bloodstone_cameo.txt
+++ b/forge-gui/res/cardsfolder/b/bloodstone_cameo.txt
@@ -1,9 +1,9 @@
 Name:Bloodstone Cameo
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Black|Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodstone_cameo.jpg
-Oracle:{T}: Add {B} or {R} to your mana pool.
+Oracle:{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/b/bloom_tender.txt b/forge-gui/res/cardsfolder/b/bloom_tender.txt
index 916e6dade50..7a7866bafb1 100644
--- a/forge-gui/res/cardsfolder/b/bloom_tender.txt
+++ b/forge-gui/res/cardsfolder/b/bloom_tender.txt
@@ -2,7 +2,7 @@ Name:Bloom Tender
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ W | ConditionCheckSVar$ CheckW | References$ CheckW | ConditionSVarCompare$ GE1 | SubAbility$ DBManaU | SpellDescription$ For each color among permanents you control, add one mana of that color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | ConditionCheckSVar$ CheckW | References$ CheckW | ConditionSVarCompare$ GE1 | SubAbility$ DBManaU | SpellDescription$ For each color among permanents you control, add one mana of that color.
 SVar:DBManaU:DB$ Mana | Produced$ U | ConditionCheckSVar$ CheckU | References$ CheckU | ConditionSVarCompare$ GE1 | SubAbility$ DBManaB
 SVar:DBManaB:DB$ Mana | Produced$ B | ConditionCheckSVar$ CheckB | References$ CheckB | ConditionSVarCompare$ GE1 | SubAbility$ DBManaR
 SVar:DBManaR:DB$ Mana | Produced$ R | ConditionCheckSVar$ CheckR | References$ CheckR | ConditionSVarCompare$ GE1 | SubAbility$ DBManaG
@@ -14,4 +14,4 @@ SVar:CheckR:Count$Valid Permanent.YouCtrl+Red
 SVar:CheckG:Count$Valid Permanent.YouCtrl+Green
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloom_tender.jpg
-Oracle:{T}: For each color among permanents you control, add one mana of that color to your mana pool.
+Oracle:{T}: For each color among permanents you control, add one mana of that color.
diff --git a/forge-gui/res/cardsfolder/b/blooming_marsh.txt b/forge-gui/res/cardsfolder/b/blooming_marsh.txt
index bb726a94d66..174d6971062 100644
--- a/forge-gui/res/cardsfolder/b/blooming_marsh.txt
+++ b/forge-gui/res/cardsfolder/b/blooming_marsh.txt
@@ -5,7 +5,7 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ GT2 | References$ ETBCheckSVar2 | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar2:Count$LastStateBattlefield Land.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blooming_marsh.jpg
-Oracle:Blooming Marsh enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {B} or {G} to your mana pool.
+Oracle:Blooming Marsh enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {B} or {G}.
diff --git a/forge-gui/res/cardsfolder/b/blossoming_sands.txt b/forge-gui/res/cardsfolder/b/blossoming_sands.txt
index 3baa608109c..6ec5fc73b93 100644
--- a/forge-gui/res/cardsfolder/b/blossoming_sands.txt
+++ b/forge-gui/res/cardsfolder/b/blossoming_sands.txt
@@ -1,10 +1,10 @@
 Name:Blossoming Sands
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blossoming_sands.jpg
-Oracle:Blossoming Sands enters the battlefield tapped.\nWhen Blossoming Sands enters the battlefield, you gain 1 life.\n{T}: Add {G} or {W} to your mana pool.
+Oracle:Blossoming Sands enters the battlefield tapped.\nWhen Blossoming Sands enters the battlefield, you gain 1 life.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/b/blue_mana_battery.txt b/forge-gui/res/cardsfolder/b/blue_mana_battery.txt
index f682f6b4172..7356528f814 100644
--- a/forge-gui/res/cardsfolder/b/blue_mana_battery.txt
+++ b/forge-gui/res/cardsfolder/b/blue_mana_battery.txt
@@ -2,10 +2,10 @@ Name:Blue Mana Battery
 ManaCost:4
 Types:Artifact
 A:AB$ PutCounter | Cost$ 2 T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ U | Amount$ Y | CostDesc$ {T}, Remove any number of charge counters from CARDNAME: | References$ X,Y | SpellDescription$ Add {U} to your mana pool, then add an additional {U} to your mana pool for each charge counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ U | Amount$ Y | CostDesc$ {T}, Remove any number of charge counters from CARDNAME: | References$ X,Y | SpellDescription$ Add {U}, then add an additional {U} for each charge counter removed this way.
 SVar:Y:Number$1/Plus.ChosenX
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blue_mana_battery.jpg
-Oracle:{2}, {T}: Put a charge counter on Blue Mana Battery.\n{T}, Remove any number of charge counters from Blue Mana Battery: Add {U} to your mana pool, then add an additional {U} to your mana pool for each charge counter removed this way.
+Oracle:{2}, {T}: Put a charge counter on Blue Mana Battery.\n{T}, Remove any number of charge counters from Blue Mana Battery: Add {U}, then add an additional {U} for each charge counter removed this way.
diff --git a/forge-gui/res/cardsfolder/b/bog_initiate.txt b/forge-gui/res/cardsfolder/b/bog_initiate.txt
index 4a9edf75cf2..e58c65c5aad 100644
--- a/forge-gui/res/cardsfolder/b/bog_initiate.txt
+++ b/forge-gui/res/cardsfolder/b/bog_initiate.txt
@@ -2,7 +2,7 @@ Name:Bog Initiate
 ManaCost:1 B
 Types:Creature Human Wizard
 PT:1/1
-A:AB$ Mana | Cost$ 1 | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ 1 | Produced$ B | SpellDescription$ Add {B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bog_initiate.jpg
-Oracle:{1}: Add {B} to your mana pool.
+Oracle:{1}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/b/bog_witch.txt b/forge-gui/res/cardsfolder/b/bog_witch.txt
index f9a6a99bcf8..4848b2379c3 100644
--- a/forge-gui/res/cardsfolder/b/bog_witch.txt
+++ b/forge-gui/res/cardsfolder/b/bog_witch.txt
@@ -2,7 +2,7 @@ Name:Bog Witch
 ManaCost:2 B
 Types:Creature Human Spellshaper
 PT:1/1
-A:AB$ Mana | Cost$ B T Discard<1/Card> | Produced$ B | Amount$ 3 | SpellDescription$ Add {B}{B}{B} to your mana pool.
+A:AB$ Mana | Cost$ B T Discard<1/Card> | Produced$ B | Amount$ 3 | SpellDescription$ Add {B}{B}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bog_witch.jpg
-Oracle:{B}, {T}, Discard a card: Add {B}{B}{B} to your mana pool.
+Oracle:{B}, {T}, Discard a card: Add {B}{B}{B}.
diff --git a/forge-gui/res/cardsfolder/b/bog_wreckage.txt b/forge-gui/res/cardsfolder/b/bog_wreckage.txt
index 084644628d8..bfb713b3715 100644
--- a/forge-gui/res/cardsfolder/b/bog_wreckage.txt
+++ b/forge-gui/res/cardsfolder/b/bog_wreckage.txt
@@ -1,8 +1,8 @@
 Name:Bog Wreckage
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bog_wreckage.jpg
-Oracle:Bog Wreckage enters the battlefield tapped.\n{T}: Add {B} to your mana pool.\n{T}, Sacrifice Bog Wreckage: Add one mana of any color to your mana pool.
+Oracle:Bog Wreckage enters the battlefield tapped.\n{T}: Add {B}.\n{T}, Sacrifice Bog Wreckage: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/b/bojuka_bog.txt b/forge-gui/res/cardsfolder/b/bojuka_bog.txt
index a2141116993..ce07dba25bd 100644
--- a/forge-gui/res/cardsfolder/b/bojuka_bog.txt
+++ b/forge-gui/res/cardsfolder/b/bojuka_bog.txt
@@ -2,8 +2,8 @@ Name:Bojuka Bog
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile all cards from target player's graveyard.
 SVar:TrigExile:DB$ChangeZoneAll | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | IsCurse$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bojuka_bog.jpg
-Oracle:Bojuka Bog enters the battlefield tapped.\nWhen Bojuka Bog enters the battlefield, exile all cards from target player's graveyard.\n{T}: Add {B} to your mana pool.
+Oracle:Bojuka Bog enters the battlefield tapped.\nWhen Bojuka Bog enters the battlefield, exile all cards from target player's graveyard.\n{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/b/boreal_druid.txt b/forge-gui/res/cardsfolder/b/boreal_druid.txt
index 22bec1eb0cb..349476d1153 100644
--- a/forge-gui/res/cardsfolder/b/boreal_druid.txt
+++ b/forge-gui/res/cardsfolder/b/boreal_druid.txt
@@ -2,6 +2,6 @@ Name:Boreal Druid
 ManaCost:G
 Types:Snow Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://resources.wizards.com/magic/cards/csp/en-us/card121193.jpg
-Oracle:{T}: Add {C} to your mana pool.
+Oracle:{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/b/boreal_shelf.txt b/forge-gui/res/cardsfolder/b/boreal_shelf.txt
index e1d8455c621..1cc388e2e17 100644
--- a/forge-gui/res/cardsfolder/b/boreal_shelf.txt
+++ b/forge-gui/res/cardsfolder/b/boreal_shelf.txt
@@ -2,7 +2,7 @@ Name:Boreal Shelf
 ManaCost:no cost
 Types:Snow Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boreal_shelf.jpg
-Oracle:Boreal Shelf enters the battlefield tapped.\n{T}: Add {W} or {U} to your mana pool.
+Oracle:Boreal Shelf enters the battlefield tapped.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/b/boros_cluestone.txt b/forge-gui/res/cardsfolder/b/boros_cluestone.txt
index 0b0713c72a1..017afde860c 100644
--- a/forge-gui/res/cardsfolder/b/boros_cluestone.txt
+++ b/forge-gui/res/cardsfolder/b/boros_cluestone.txt
@@ -1,10 +1,10 @@
 Name:Boros Cluestone
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Draw | Cost$ R W T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Red|White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_cluestone.jpg
-Oracle:{T}: Add {R} or {W} to your mana pool.\n{R}{W}, {T}, Sacrifice Boros Cluestone: Draw a card.
+Oracle:{T}: Add {R} or {W}.\n{R}{W}, {T}, Sacrifice Boros Cluestone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/b/boros_garrison.txt b/forge-gui/res/cardsfolder/b/boros_garrison.txt
index 78351687708..3b4a1f4a393 100644
--- a/forge-gui/res/cardsfolder/b/boros_garrison.txt
+++ b/forge-gui/res/cardsfolder/b/boros_garrison.txt
@@ -2,9 +2,9 @@ Name:Boros Garrison
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R W | SpellDescription$ Add {R}{W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R W | SpellDescription$ Add {R}{W}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_garrison.jpg
-Oracle:Boros Garrison enters the battlefield tapped.\nWhen Boros Garrison enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {R}{W} to your mana pool.
+Oracle:Boros Garrison enters the battlefield tapped.\nWhen Boros Garrison enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {R}{W}.
diff --git a/forge-gui/res/cardsfolder/b/boros_guildgate.txt b/forge-gui/res/cardsfolder/b/boros_guildgate.txt
index 03feb5f8ea3..e314527e911 100644
--- a/forge-gui/res/cardsfolder/b/boros_guildgate.txt
+++ b/forge-gui/res/cardsfolder/b/boros_guildgate.txt
@@ -2,7 +2,7 @@ Name:Boros Guildgate
 ManaCost:no cost
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_guildgate.jpg
-Oracle:Boros Guildgate enters the battlefield tapped.\n{T}: Add {R} or {W} to your mana pool.
+Oracle:Boros Guildgate enters the battlefield tapped.\n{T}: Add {R} or {W}.
diff --git a/forge-gui/res/cardsfolder/b/boros_keyrune.txt b/forge-gui/res/cardsfolder/b/boros_keyrune.txt
index 1047bf02aa6..85d5efe76c4 100644
--- a/forge-gui/res/cardsfolder/b/boros_keyrune.txt
+++ b/forge-gui/res/cardsfolder/b/boros_keyrune.txt
@@ -1,10 +1,10 @@
 Name:Boros Keyrune
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Animate | Cost$ R W | Defined$ Self | Power$ 1| Toughness$ 1 | Types$ Artifact,Creature,Soldier | Colors$ Red,White | Keywords$ Double Strike | SpellDescription$ CARDNAME becomes a 1/1 red and white Soldier artifact creature with double strike until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Red|White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_keyrune.jpg
-Oracle:{T}: Add {R} or {W} to your mana pool.\n{R}{W}: Boros Keyrune becomes a 1/1 red and white Soldier artifact creature with double strike until end of turn. (It deals both first-strike and regular combat damage.)
+Oracle:{T}: Add {R} or {W}.\n{R}{W}: Boros Keyrune becomes a 1/1 red and white Soldier artifact creature with double strike until end of turn. (It deals both first-strike and regular combat damage.)
diff --git a/forge-gui/res/cardsfolder/b/boros_signet.txt b/forge-gui/res/cardsfolder/b/boros_signet.txt
index 2ed26e75134..01b056ef7c1 100644
--- a/forge-gui/res/cardsfolder/b/boros_signet.txt
+++ b/forge-gui/res/cardsfolder/b/boros_signet.txt
@@ -1,7 +1,7 @@
 Name:Boros Signet
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ R W | SpellDescription$ Add {R}{W} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ R W | SpellDescription$ Add {R}{W}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_signet.jpg
-Oracle:{1}, {T}: Add {R}{W} to your mana pool.
+Oracle:{1}, {T}: Add {R}{W}.
diff --git a/forge-gui/res/cardsfolder/b/boseiju_who_shelters_all.txt b/forge-gui/res/cardsfolder/b/boseiju_who_shelters_all.txt
index 9aa4136a1d3..bd498b2b75c 100644
--- a/forge-gui/res/cardsfolder/b/boseiju_who_shelters_all.txt
+++ b/forge-gui/res/cardsfolder/b/boseiju_who_shelters_all.txt
@@ -2,6 +2,6 @@ Name:Boseiju, Who Shelters All
 ManaCost:no cost
 Types:Legendary Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T PayLife<2> | Produced$ C | AddsNoCounter$ !Permanent | SpellDescription$ Add {C} to your mana pool. If that mana is spent on an instant or sorcery spell, that spell can't be countered by spells or abilities.
+A:AB$ Mana | Cost$ T PayLife<2> | Produced$ C | AddsNoCounter$ !Permanent | SpellDescription$ Add {C}. If that mana is spent on an instant or sorcery spell, that spell can't be countered by spells or abilities.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boseiju_who_shelters_all.jpg
-Oracle:Boseiju, Who Shelters All enters the battlefield tapped.\n{T}, Pay 2 life: Add {C} to your mana pool. If that mana is spent on an instant or sorcery spell, that spell can't be countered by spells or abilities.
+Oracle:Boseiju, Who Shelters All enters the battlefield tapped.\n{T}, Pay 2 life: Add {C}. If that mana is spent on an instant or sorcery spell, that spell can't be countered by spells or abilities.
diff --git a/forge-gui/res/cardsfolder/b/botanical_sanctum.txt b/forge-gui/res/cardsfolder/b/botanical_sanctum.txt
index f30200851e6..e332ce4d323 100644
--- a/forge-gui/res/cardsfolder/b/botanical_sanctum.txt
+++ b/forge-gui/res/cardsfolder/b/botanical_sanctum.txt
@@ -5,7 +5,7 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ GT2 | References$ ETBCheckSVar2 | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar2:Count$LastStateBattlefield Land.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/botanical_sanctum.jpg
-Oracle:Botanical Sanctum enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {G} or {U} to your mana pool.
+Oracle:Botanical Sanctum enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {G} or {U}.
diff --git a/forge-gui/res/cardsfolder/b/bottomless_vault.txt b/forge-gui/res/cardsfolder/b/bottomless_vault.txt
index ce67eca4815..e17f0e3c158 100644
--- a/forge-gui/res/cardsfolder/b/bottomless_vault.txt
+++ b/forge-gui/res/cardsfolder/b/bottomless_vault.txt
@@ -5,9 +5,9 @@ K:CARDNAME enters the battlefield tapped.
 K:You may choose not to untap CARDNAME during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self+tapped | Execute$ TrigStore | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is tapped, put a storage counter on it.
 SVar:TrigStore:DB$PutCounter | Defined$ Self | CounterType$ STORAGE | CounterNum$ 1
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ B | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {B} to your mana pool for each storage counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ B | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {B} for each storage counter removed this way.
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bottomless_vault.jpg
-Oracle:Bottomless Vault enters the battlefield tapped.\nYou may choose not to untap Bottomless Vault during your untap step.\nAt the beginning of your upkeep, if Bottomless Vault is tapped, put a storage counter on it.\n{T}, Remove any number of storage counters from Bottomless Vault: Add {B} to your mana pool for each storage counter removed this way.
+Oracle:Bottomless Vault enters the battlefield tapped.\nYou may choose not to untap Bottomless Vault during your untap step.\nAt the beginning of your upkeep, if Bottomless Vault is tapped, put a storage counter on it.\n{T}, Remove any number of storage counters from Bottomless Vault: Add {B} for each storage counter removed this way.
diff --git a/forge-gui/res/cardsfolder/b/bounty_of_the_luxa.txt b/forge-gui/res/cardsfolder/b/bounty_of_the_luxa.txt
index 37f1924c4db..65fdf31a888 100644
--- a/forge-gui/res/cardsfolder/b/bounty_of_the_luxa.txt
+++ b/forge-gui/res/cardsfolder/b/bounty_of_the_luxa.txt
@@ -1,7 +1,7 @@
 Name:Bounty of the Luxa
 ManaCost:2 G U
 Types:Enchantment
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemove | TriggerDescription$ At the beginning of your precombat main phase, remove all flood counters from CARDNAME. If no counters were removed this way, put a flood counter on CARDNAME and draw a card. Otherwise, add {C}{G}{U} to your mana pool.
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemove | TriggerDescription$ At the beginning of your precombat main phase, remove all flood counters from CARDNAME. If no counters were removed this way, put a flood counter on CARDNAME and draw a card. Otherwise, add {C}{G}{U}.
 SVar:TrigRemove:DB$ RemoveCounter | CounterType$ FLOOD | CounterNum$ All | RememberRemoved$ True | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | ConditionCheckSVar$ X | References$ X | ConditionSVarCompare$ EQ0 | CounterType$ FLOOD | CounterNum$ 1 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionCheckSVar$ X | References$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBGetMana
@@ -9,4 +9,4 @@ SVar:DBGetMana:DB$ Mana | Produced$ C G U | ConditionCheckSVar$ X | References$
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedSize
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bounty_of_the_luxa.jpg
-Oracle:At the beginning of your precombat main phase, remove all flood counters from Bounty of the Luxa. If no counters were removed this way, put a flood counter on Bounty of the Luxa and draw a card. Otherwise, add {C}{G}{U} to your mana pool.
\ No newline at end of file
+Oracle:At the beginning of your precombat main phase, remove all flood counters from Bounty of the Luxa. If no counters were removed this way, put a flood counter on Bounty of the Luxa and draw a card. Otherwise, add {C}{G}{U}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/b/braid_of_fire.txt b/forge-gui/res/cardsfolder/b/braid_of_fire.txt
index 0be07b8fbdb..d855cf605cf 100644
--- a/forge-gui/res/cardsfolder/b/braid_of_fire.txt
+++ b/forge-gui/res/cardsfolder/b/braid_of_fire.txt
@@ -1,8 +1,8 @@
 Name:Braid of Fire
 ManaCost:1 R
 Types:Enchantment
-K:Cumulative upkeep:AddMana<1/R>:Add {R} to your mana pool.
+K:Cumulative upkeep:AddMana<1/R>:Add {R}.
 # The AI will use the upkeep mana for instants and stuff when able
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/braid_of_fire.jpg
-Oracle:Cumulative upkeep—Add {R} to your mana pool. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)
+Oracle:Cumulative upkeep—Add {R}. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)
diff --git a/forge-gui/res/cardsfolder/b/brasss_bounty.txt b/forge-gui/res/cardsfolder/b/brasss_bounty.txt
index dd345fea5fd..e865c0b964c 100644
--- a/forge-gui/res/cardsfolder/b/brasss_bounty.txt
+++ b/forge-gui/res/cardsfolder/b/brasss_bounty.txt
@@ -1,8 +1,8 @@
 Name:Brass's Bounty
 ManaCost:6 R
 Types:Sorcery
-A:SP$ Token | Cost$ 6 R | TokenAmount$ X | References$ X | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | TokenAbilities$ ABMana | References$ ABMana | SpellDescription$ For each land you control, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:SP$ Token | Cost$ 6 R | TokenAmount$ X | References$ X | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | TokenAbilities$ ABMana | References$ ABMana | SpellDescription$ For each land you control, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:X:Count$TypeYouCtrl.Land
 DeckHas:Ability$Token
-Oracle:For each land you control, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:For each land you control, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/b/brazen_freebooter.txt b/forge-gui/res/cardsfolder/b/brazen_freebooter.txt
index a0a4a3465d5..645f2b9dc73 100644
--- a/forge-gui/res/cardsfolder/b/brazen_freebooter.txt
+++ b/forge-gui/res/cardsfolder/b/brazen_freebooter.txt
@@ -2,9 +2,9 @@ Name:Brazen Freebooter
 ManaCost:3 R
 Types:Creature Human Pirate
 PT:3/3
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBToken | TriggerDescription$ When CARDNAME enters the battlefield, create a colorless Treasure artifact token with "{T}, sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBToken | TriggerDescription$ When CARDNAME enters the battlefield, create a colorless Treasure artifact token with "{T}, sacrifice this artifact: Add one mana of any color."
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brazen_freebooter.jpg
 DeckHas:Ability$Token
-Oracle:When Brazen Freebooter enters the battlefield, create a colorless Treasure artifact token with "{T}, sacrifice this artifact: Add one mana of any color to your mana pool."
\ No newline at end of file
+Oracle:When Brazen Freebooter enters the battlefield, create a colorless Treasure artifact token with "{T}, sacrifice this artifact: Add one mana of any color."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/b/breeding_pool.txt b/forge-gui/res/cardsfolder/b/breeding_pool.txt
index ea646ae1e03..73fd0214133 100644
--- a/forge-gui/res/cardsfolder/b/breeding_pool.txt
+++ b/forge-gui/res/cardsfolder/b/breeding_pool.txt
@@ -4,4 +4,4 @@ Types:Land Forest Island
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | UnlessAI$ Shockland | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://resources.wizards.com/magic/cards/dis/en-us/card97088.jpg
-Oracle:({T}: Add {G} or {U} to your mana pool.)\nAs Breeding Pool enters the battlefield, you may pay 2 life. If you don't, Breeding Pool enters the battlefield tapped.
+Oracle:({T}: Add {G} or {U}.)\nAs Breeding Pool enters the battlefield, you may pay 2 life. If you don't, Breeding Pool enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/b/brightstone_ritual.txt b/forge-gui/res/cardsfolder/b/brightstone_ritual.txt
index 7234c670af1..edda837721a 100644
--- a/forge-gui/res/cardsfolder/b/brightstone_ritual.txt
+++ b/forge-gui/res/cardsfolder/b/brightstone_ritual.txt
@@ -1,8 +1,8 @@
 Name:Brightstone Ritual
 ManaCost:R
 Types:Instant
-A:SP$ Mana | Cost$ R | Produced$ R | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R} to your mana pool for each Goblin on the battlefield.
+A:SP$ Mana | Cost$ R | Produced$ R | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R} for each Goblin on the battlefield.
 SVar:X:Count$TypeOnBattlefield.Goblin
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brightstone_ritual.jpg
-Oracle:Add {R} to your mana pool for each Goblin on the battlefield.
+Oracle:Add {R} for each Goblin on the battlefield.
diff --git a/forge-gui/res/cardsfolder/b/brood_birthing.txt b/forge-gui/res/cardsfolder/b/brood_birthing.txt
index 8d9e2d9426f..d83caa53b85 100644
--- a/forge-gui/res/cardsfolder/b/brood_birthing.txt
+++ b/forge-gui/res/cardsfolder/b/brood_birthing.txt
@@ -1,11 +1,11 @@
 Name:Brood Birthing
 ManaCost:1 R
 Types:Sorcery
-A:SP$ Token | Cost$ 1 R | TokenAmount$ X | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenOwner$ You | TokenAbilities$ ABMana | References$ X,Y | SpellDescription$ If you control an Eldrazi Spawn, create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." Otherwise, create one of those tokens.
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+A:SP$ Token | Cost$ 1 R | TokenAmount$ X | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenOwner$ You | TokenAbilities$ ABMana | References$ X,Y | SpellDescription$ If you control an Eldrazi Spawn, create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}." Otherwise, create one of those tokens.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 SVar:X:Count$Compare Y GE1.3.1
 SVar:Y:Count$Valid Card.YouCtrl+Eldrazi+Spawn
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brood_birthing.jpg
-Oracle:If you control an Eldrazi Spawn, create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." Otherwise, create one of those tokens.
+Oracle:If you control an Eldrazi Spawn, create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}." Otherwise, create one of those tokens.
diff --git a/forge-gui/res/cardsfolder/b/brood_butcher.txt b/forge-gui/res/cardsfolder/b/brood_butcher.txt
index 78d694a5ff3..710fdf6ffa4 100644
--- a/forge-gui/res/cardsfolder/b/brood_butcher.txt
+++ b/forge-gui/res/cardsfolder/b/brood_butcher.txt
@@ -3,12 +3,12 @@ ManaCost:3 B G
 Types:Creature Eldrazi Drone
 PT:3/3
 K:Devoid
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ B G Sac<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:AIPreference:SacCost$Creature.token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brood_butcher.jpg
-Oracle:Devoid (This card has no color.)\nWhen Brood Butcher enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."\n{B}{G}, Sacrifice a creature: Target creature gets -2/-2 until end of turn.
+Oracle:Devoid (This card has no color.)\nWhen Brood Butcher enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."\n{B}{G}, Sacrifice a creature: Target creature gets -2/-2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/b/brood_monitor.txt b/forge-gui/res/cardsfolder/b/brood_monitor.txt
index 1fab6a1716f..66e36b46b06 100644
--- a/forge-gui/res/cardsfolder/b/brood_monitor.txt
+++ b/forge-gui/res/cardsfolder/b/brood_monitor.txt
@@ -3,9 +3,9 @@ ManaCost:4 G G
 Types:Creature Eldrazi Drone
 K:Devoid
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 3 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brood_monitor.jpg
-Oracle:Devoid (This card has no color.)\nWhen Brood Monitor enters the battlefield, create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Devoid (This card has no color.)\nWhen Brood Monitor enters the battlefield, create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/b/brushland.txt b/forge-gui/res/cardsfolder/b/brushland.txt
index e106be0c7df..634ea28bee5 100644
--- a/forge-gui/res/cardsfolder/b/brushland.txt
+++ b/forge-gui/res/cardsfolder/b/brushland.txt
@@ -1,9 +1,9 @@
 Name:Brushland
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-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$ G | SubAbility$ DBPain | SpellDescription$ Add {G} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brushland.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {G} or {W} to your mana pool. Brushland deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {G} or {W}. Brushland deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/b/bubbling_muck.txt b/forge-gui/res/cardsfolder/b/bubbling_muck.txt
index 89d124ec799..38e01ac8fbc 100644
--- a/forge-gui/res/cardsfolder/b/bubbling_muck.txt
+++ b/forge-gui/res/cardsfolder/b/bubbling_muck.txt
@@ -1,9 +1,9 @@
 Name:Bubbling Muck
 ManaCost:B
 Types:Sorcery
-A:SP$ Effect | Cost$ B | Name$ Bubbling Muck Effect | Triggers$ SwampTrigger | SVars$ TrigMana | SpellDescription$ Until end of turn, whenever a player taps a Swamp for mana, that player adds {B} to his or her mana pool (in addition to the mana the land produces).
-SVar:SwampTrigger:Mode$ TapsForMana | ValidCard$ Swamp | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever a player taps a Swamp for mana, that player adds B to his or her mana pool (in addition to the mana the land produces).
+A:SP$ Effect | Cost$ B | Name$ Bubbling Muck Effect | Triggers$ SwampTrigger | SVars$ TrigMana | SpellDescription$ Until end of turn, whenever a player taps a Swamp for mana, that player adds an additional {B}.
+SVar:SwampTrigger:Mode$ TapsForMana | ValidCard$ Swamp | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever a player taps a Swamp for mana, that player adds an additional {B}.
 SVar:TrigMana:DB$ Mana | Produced$ B | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bubbling_muck.jpg
-Oracle:Until end of turn, whenever a player taps a Swamp for mana, that player adds {B} to his or her mana pool (in addition to the mana the land produces).
+Oracle:Until end of turn, whenever a player taps a Swamp for mana, that player adds an additional {B}.
diff --git a/forge-gui/res/cardsfolder/b/buried_ruin.txt b/forge-gui/res/cardsfolder/b/buried_ruin.txt
index 7b56421ac76..d21ffd7330d 100644
--- a/forge-gui/res/cardsfolder/b/buried_ruin.txt
+++ b/forge-gui/res/cardsfolder/b/buried_ruin.txt
@@ -1,7 +1,7 @@
 Name:Buried Ruin
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | TgtPrompt$ Select target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target artifact card from your graveyard to your hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/buried_ruin.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}, Sacrifice Buried Ruin: Return target artifact card from your graveyard to your hand.
+Oracle:{T}: Add {C}.\n{2}, {T}, Sacrifice Buried Ruin: Return target artifact card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/b/burning_tree_emissary.txt b/forge-gui/res/cardsfolder/b/burning_tree_emissary.txt
index e37d395ed40..6ff020189ff 100644
--- a/forge-gui/res/cardsfolder/b/burning_tree_emissary.txt
+++ b/forge-gui/res/cardsfolder/b/burning_tree_emissary.txt
@@ -2,8 +2,8 @@ Name:Burning-Tree Emissary
 ManaCost:RG RG
 Types:Creature Human Shaman
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add {R}{G} to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add {R}{G}.
 SVar:TrigMana:DB$ Mana | Produced$ R G
 SVar:FreeSpellAI:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/burning-tree_emissary.jpg
-Oracle:When Burning-Tree Emissary enters the battlefield, add {R}{G} to your mana pool.
+Oracle:When Burning-Tree Emissary enters the battlefield, add {R}{G}.
diff --git a/forge-gui/res/cardsfolder/b/burnt_offering.txt b/forge-gui/res/cardsfolder/b/burnt_offering.txt
index 794cf20dd97..0e2f9b95305 100644
--- a/forge-gui/res/cardsfolder/b/burnt_offering.txt
+++ b/forge-gui/res/cardsfolder/b/burnt_offering.txt
@@ -1,8 +1,8 @@
 Name:Burnt Offering
 ManaCost:B
 Types:Instant
-A:SP$ Mana | Cost$ B Sac<1/Creature> | Produced$ Combo B R | Amount$ X | References$ X | SpellDescription$ Add X mana in any combination of {B} and/or {R} to your mana pool, where X is the sacrificed creature's converted mana cost.
+A:SP$ Mana | Cost$ B Sac<1/Creature> | Produced$ Combo B R | Amount$ X | References$ X | SpellDescription$ Add X mana in any combination of {B} and/or {R}, where X is the sacrificed creature's converted mana cost.
 SVar:X:Sacrificed$CardManaCost
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/burnt_offering.jpg
-Oracle:As an additional cost to cast Burnt Offering, sacrifice a creature.\nAdd X mana in any combination of {B} and/or {R} to your mana pool, where X is the sacrificed creature's converted mana cost.
+Oracle:As an additional cost to cast Burnt Offering, sacrifice a creature.\nAdd X mana in any combination of {B} and/or {R}, where X is the sacrificed creature's converted mana cost.
diff --git a/forge-gui/res/cardsfolder/c/cabal_coffers.txt b/forge-gui/res/cardsfolder/c/cabal_coffers.txt
index 68b5ab20ccb..08043455f9c 100644
--- a/forge-gui/res/cardsfolder/c/cabal_coffers.txt
+++ b/forge-gui/res/cardsfolder/c/cabal_coffers.txt
@@ -1,8 +1,8 @@
 Name:Cabal Coffers
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ 2 T | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} to your mana pool for each Swamp you control.
+A:AB$ Mana | Cost$ 2 T | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} for each Swamp you control.
 SVar:X:Count$Valid Swamp.YouCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cabal_coffers.jpg
-Oracle:{2}, {T}: Add {B} to your mana pool for each Swamp you control.
+Oracle:{2}, {T}: Add {B} for each Swamp you control.
diff --git a/forge-gui/res/cardsfolder/c/cabal_pit.txt b/forge-gui/res/cardsfolder/c/cabal_pit.txt
index a0dc3648da3..d7f99a5f150 100644
--- a/forge-gui/res/cardsfolder/c/cabal_pit.txt
+++ b/forge-gui/res/cardsfolder/c/cabal_pit.txt
@@ -1,8 +1,8 @@
 Name:Cabal Pit
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
 A:AB$ Pump | Cost$ B T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cabal_pit.jpg
-Oracle:{T}: Add {B} to your mana pool. Cabal Pit deals 1 damage to you.\nThreshold — {B}, {T}, Sacrifice Cabal Pit: Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {B}. Cabal Pit deals 1 damage to you.\nThreshold — {B}, {T}, Sacrifice Cabal Pit: Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/c/cabal_ritual.txt b/forge-gui/res/cardsfolder/c/cabal_ritual.txt
index eef6f0a0e1c..f7cfcafde4e 100644
--- a/forge-gui/res/cardsfolder/c/cabal_ritual.txt
+++ b/forge-gui/res/cardsfolder/c/cabal_ritual.txt
@@ -1,8 +1,8 @@
 Name:Cabal Ritual
 ManaCost:1 B
 Types:Instant
-A:SP$ Mana | Cost$ 1 B | Produced$ B | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {B}{B}{B} to your mana pool. Threshold — Add {B}{B}{B}{B}{B} to your mana pool instead if seven or more cards are in your graveyard.
+A:SP$ Mana | Cost$ 1 B | Produced$ B | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {B}{B}{B}. Threshold — Add {B}{B}{B}{B}{B} instead if seven or more cards are in your graveyard.
 SVar:X:Count$Threshold.5.3
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cabal_ritual.jpg
-Oracle:Add {B}{B}{B} to your mana pool.\nThreshold — Add {B}{B}{B}{B}{B} to your mana pool instead if seven or more cards are in your graveyard.
+Oracle:Add {B}{B}{B}.\nThreshold — Add {B}{B}{B}{B}{B} instead if seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/c/cabal_stronghold.txt b/forge-gui/res/cardsfolder/c/cabal_stronghold.txt
index 51f307ae619..dadce30da29 100644
--- a/forge-gui/res/cardsfolder/c/cabal_stronghold.txt
+++ b/forge-gui/res/cardsfolder/c/cabal_stronghold.txt
@@ -2,7 +2,7 @@ Name:Cabal Stronghold
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ 3 T | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} to your mana pool for each basic Swamp you control.
+A:AB$ Mana | Cost$ 3 T | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} for each basic Swamp you control.
 SVar:X:Count$Valid Swamp.Basic+YouCtrl
 SVar:RemAIDeck:True
-Oracle:{T}: Add {C}.\n{3}, {T}: Add {B} to your mana pool for each basic Swamp you control.
+Oracle:{T}: Add {C}.\n{3}, {T}: Add {B} for each basic Swamp you control.
diff --git a/forge-gui/res/cardsfolder/c/cadaverous_bloom.txt b/forge-gui/res/cardsfolder/c/cadaverous_bloom.txt
index b3638e4f771..185f97cbf4c 100644
--- a/forge-gui/res/cardsfolder/c/cadaverous_bloom.txt
+++ b/forge-gui/res/cardsfolder/c/cadaverous_bloom.txt
@@ -1,9 +1,9 @@
 Name:Cadaverous Bloom
 ManaCost:3 B G
 Types:Enchantment
-A:AB$ Mana | Cost$ ExileFromHand<1/Card> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool.
-A:AB$ Mana | Cost$ ExileFromHand<1/Card> | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool.
+A:AB$ Mana | Cost$ ExileFromHand<1/Card> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}.
+A:AB$ Mana | Cost$ ExileFromHand<1/Card> | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
 SVar:NonStackingEffect:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cadaverous_bloom.jpg
-Oracle:Exile a card from your hand: Add {B}{B} or {G}{G} to your mana pool.
+Oracle:Exile a card from your hand: Add {B}{B} or {G}{G}.
diff --git a/forge-gui/res/cardsfolder/c/caged_sun.txt b/forge-gui/res/cardsfolder/c/caged_sun.txt
index 422fcb54fc1..75e0d4f3152 100644
--- a/forge-gui/res/cardsfolder/c/caged_sun.txt
+++ b/forge-gui/res/cardsfolder/c/caged_sun.txt
@@ -4,7 +4,7 @@ Types:Artifact
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
 S:Mode$ Continuous | Affected$ Creature.ChosenColor+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control of the chosen color get +1/+1.
-T:Mode$ TapsForMana | ValidCard$ Land | Produced$ ChosenColor | NoTapCheck$ True | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a land's ability adds one or more mana of the chosen color to your mana pool, add one additional mana of that color to your mana pool.
+T:Mode$ TapsForMana | ValidCard$ Land | Produced$ ChosenColor | NoTapCheck$ True | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a land's ability adds one or more mana of the chosen color, add one additional mana of that color.
 SVar:TrigMana:DB$ Mana | Produced$ Chosen | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/caged_sun.jpg
-Oracle:As Caged Sun enters the battlefield, choose a color.\nCreatures you control of the chosen color get +1/+1.\nWhenever a land's ability adds one or more mana of the chosen color to your mana pool, add one additional mana of that color to your mana pool.
+Oracle:As Caged Sun enters the battlefield, choose a color.\nCreatures you control of the chosen color get +1/+1.\nWhenever a land's ability adds one or more mana of the chosen color, add one additional mana of that color.
diff --git a/forge-gui/res/cardsfolder/c/calciform_pools.txt b/forge-gui/res/cardsfolder/c/calciform_pools.txt
index b99d1b66b9d..b1ddb7562e2 100644
--- a/forge-gui/res/cardsfolder/c/calciform_pools.txt
+++ b/forge-gui/res/cardsfolder/c/calciform_pools.txt
@@ -1,10 +1,10 @@
 Name:Calciform Pools
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo W U | Amount$ ChosenX | CostDesc$ {1}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of {W} and/or {U} to your mana pool.
+A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo W U | Amount$ ChosenX | CostDesc$ {1}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of {W} and/or {U}.
 SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/calciform_pools.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Put a storage counter on Calciform Pools.\n{1}, Remove X storage counters from Calciform Pools: Add X mana in any combination of {W} and/or {U} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Put a storage counter on Calciform Pools.\n{1}, Remove X storage counters from Calciform Pools: Add X mana in any combination of {W} and/or {U}.
diff --git a/forge-gui/res/cardsfolder/c/caldera_lake.txt b/forge-gui/res/cardsfolder/c/caldera_lake.txt
index 4aa76142b92..d7c275e3577 100644
--- a/forge-gui/res/cardsfolder/c/caldera_lake.txt
+++ b/forge-gui/res/cardsfolder/c/caldera_lake.txt
@@ -1,10 +1,10 @@
 Name:Caldera Lake
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U} to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/caldera_lake.jpg
-Oracle:Caldera Lake enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{T}: Add {U} or {R} to your mana pool. Caldera Lake deals 1 damage to you.
+Oracle:Caldera Lake enters the battlefield tapped.\n{T}: Add {C}.\n{T}: Add {U} or {R}. Caldera Lake deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/c/call_the_scions.txt b/forge-gui/res/cardsfolder/c/call_the_scions.txt
index 09106800310..c374f952b5f 100644
--- a/forge-gui/res/cardsfolder/c/call_the_scions.txt
+++ b/forge-gui/res/cardsfolder/c/call_the_scions.txt
@@ -2,9 +2,9 @@ Name:Call the Scions
 ManaCost:2 G
 Types:Sorcery
 K:Devoid
-A:SP$ Token | Cost$ 2 G | TokenAmount$ 2 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana | SpellDescription$ Create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+A:SP$ Token | Cost$ 2 G | TokenAmount$ 2 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana | SpellDescription$ Create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/call_the_scions.jpg
-Oracle:Devoid (This card has no color.)\nCreate two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Devoid (This card has no color.)\nCreate two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/c/canopy_vista.txt b/forge-gui/res/cardsfolder/c/canopy_vista.txt
index 1197203603f..a330c8c43c8 100644
--- a/forge-gui/res/cardsfolder/c/canopy_vista.txt
+++ b/forge-gui/res/cardsfolder/c/canopy_vista.txt
@@ -6,4 +6,4 @@ SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBChe
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar:Count$LastStateBattlefield Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/canopy_vista.jpg
-Oracle:({T}: Add {G} or {W} to your mana pool.)\nCanopy Vista enters the battlefield tapped unless you control two or more basic lands.
\ No newline at end of file
+Oracle:({T}: Add {G} or {W}.)\nCanopy Vista enters the battlefield tapped unless you control two or more basic lands.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/canyon_slough.txt b/forge-gui/res/cardsfolder/c/canyon_slough.txt
index 8201d4f043a..39db3b63006 100644
--- a/forge-gui/res/cardsfolder/c/canyon_slough.txt
+++ b/forge-gui/res/cardsfolder/c/canyon_slough.txt
@@ -4,4 +4,4 @@ Types:Land Swamp Mountain
 K:CARDNAME enters the battlefield tapped.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/canyon_slough.jpg
-Oracle:({T}: Add {B} or {R} to your mana pool.)\nCanyon Slough enters the battlefield tapped.\nCycling {2} ({2}, discard this card: Draw a card.)
\ No newline at end of file
+Oracle:({T}: Add {B} or {R}.)\nCanyon Slough enters the battlefield tapped.\nCycling {2} ({2}, discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/captain_lannery_storm.txt b/forge-gui/res/cardsfolder/c/captain_lannery_storm.txt
index ca61a4f5338..75725e6bf11 100644
--- a/forge-gui/res/cardsfolder/c/captain_lannery_storm.txt
+++ b/forge-gui/res/cardsfolder/c/captain_lannery_storm.txt
@@ -3,10 +3,10 @@ ManaCost:2 R
 Types:Creature Legendary Human Pirate
 PT:2/2
 K:Haste
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | TokenAbilities$ ABMana | References$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 T:Mode$ Sacrificed | ValidCard$ Treasure.YouCtrl | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice a treasure, CARDNAME gets +1/+0 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 0
 SVar:Picture:http://media.wizards.com/2017/xln/en_P9FMMTi6df.png
-Oracle:Haste\nWhenever Captain Lannery Storm attacks, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."\nWhenever you sacrifice a treasure, Captain Lannery Storm gets +1/+0 until end of turn.
\ No newline at end of file
+Oracle:Haste\nWhenever Captain Lannery Storm attacks, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."\nWhenever you sacrifice a treasure, Captain Lannery Storm gets +1/+0 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/carnival_of_souls.txt b/forge-gui/res/cardsfolder/c/carnival_of_souls.txt
index 21dc5b41b85..4e9bd758450 100644
--- a/forge-gui/res/cardsfolder/c/carnival_of_souls.txt
+++ b/forge-gui/res/cardsfolder/c/carnival_of_souls.txt
@@ -1,9 +1,9 @@
 Name:Carnival of Souls
 ManaCost:1 B
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature enters the battlefield, you lose 1 life and add {B} to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature enters the battlefield, you lose 1 life and add {B}.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 1 | SubAbility$ DBMana
 SVar:DBMana:DB$Mana | Produced$ B
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carnival_of_souls.jpg
-Oracle:Whenever a creature enters the battlefield, you lose 1 life and add {B} to your mana pool.
+Oracle:Whenever a creature enters the battlefield, you lose 1 life and add {B}.
diff --git a/forge-gui/res/cardsfolder/c/carpet_of_flowers.txt b/forge-gui/res/cardsfolder/c/carpet_of_flowers.txt
index a00ffc3676c..191cf5de2ec 100644
--- a/forge-gui/res/cardsfolder/c/carpet_of_flowers.txt
+++ b/forge-gui/res/cardsfolder/c/carpet_of_flowers.txt
@@ -1,7 +1,7 @@
 Name:Carpet of Flowers
 ManaCost:G
 Types:Enchantment
-T:Mode$ Phase | Phase$ Main1,Main2 | ValidPlayer$ You | CheckSVar$ CarpetX | SVarCompare$ EQ0 | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of each of your main phases, if you haven't added mana to your mana pool with this ability this turn, you may add X mana of any one color to your mana pool, where X is the number of Islands target opponent controls.
+T:Mode$ Phase | Phase$ Main1,Main2 | ValidPlayer$ You | CheckSVar$ CarpetX | SVarCompare$ EQ0 | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of each of your main phases, if you haven't added mana with this ability this turn, you may add X mana of any one color, where X is the number of Islands target opponent controls.
 SVar:TrigMana:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Select target opponent. You may add X mana, where X is the number of Islands target opponent controls | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBMana
 SVar:DBMana:DB$ Mana | Amount$ NumManaMax | References$ NumManaMax | Produced$ Any | SubAbility$ CheckPlus
 SVar:CheckPlus:DB$ StoreSVar | SVar$ CarpetX | Type$ Number | Expression$ 1 | SubAbility$ DBCleanup
@@ -14,4 +14,4 @@ SVar:CarpetX:Number$0
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carpet_of_flowers.jpg
-Oracle:At the beginning of each of your main phases, if you haven't added mana to your mana pool with this ability this turn, you may add X mana of any one color to your mana pool, where X is the number of Islands target opponent controls.
+Oracle:At the beginning of each of your main phases, if you haven't added mana with this ability this turn, you may add X mana of any one color, where X is the number of Islands target opponent controls.
diff --git a/forge-gui/res/cardsfolder/c/carrier_thrall.txt b/forge-gui/res/cardsfolder/c/carrier_thrall.txt
index cc4e4cf2fcc..4fb44ffbf74 100644
--- a/forge-gui/res/cardsfolder/c/carrier_thrall.txt
+++ b/forge-gui/res/cardsfolder/c/carrier_thrall.txt
@@ -2,11 +2,11 @@ Name:Carrier Thrall
 ManaCost:1 B
 Types:Creature Vampire
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature. Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature. Add {C}."
 SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 SVar:SacMe:1
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carrier_thrall.jpg
-Oracle:When Carrier Thrall dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature. Add {C} to your mana pool."
+Oracle:When Carrier Thrall dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature. Add {C}."
diff --git a/forge-gui/res/cardsfolder/c/cascade_bluffs.txt b/forge-gui/res/cardsfolder/c/cascade_bluffs.txt
index 81357ad57a1..e26bfb2c516 100644
--- a/forge-gui/res/cardsfolder/c/cascade_bluffs.txt
+++ b/forge-gui/res/cardsfolder/c/cascade_bluffs.txt
@@ -1,10 +1,10 @@
 Name:Cascade Bluffs
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ UR T | Produced$ U | Amount$ 2 | SpellDescription$ Add {U}{U} to your mana pool.
-A:AB$ Mana | Cost$ UR T | Produced$ U R | SpellDescription$ Add {U}{R} to your mana pool.
-A:AB$ Mana | Cost$ UR T | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ UR T | Produced$ U | Amount$ 2 | SpellDescription$ Add {U}{U}.
+A:AB$ Mana | Cost$ UR T | Produced$ U R | SpellDescription$ Add {U}{R}.
+A:AB$ Mana | Cost$ UR T | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cascade_bluffs.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{U/R}, {T}: Add {U}{U}, {U}{R}, or {R}{R} to your mana pool.
+Oracle:{T}: Add {C}.\n{U/R}, {T}: Add {U}{U}, {U}{R}, or {R}{R}.
diff --git a/forge-gui/res/cardsfolder/c/cascading_cataracts.txt b/forge-gui/res/cardsfolder/c/cascading_cataracts.txt
index 353c3ffdd9d..2ae37a29dfc 100644
--- a/forge-gui/res/cardsfolder/c/cascading_cataracts.txt
+++ b/forge-gui/res/cardsfolder/c/cascading_cataracts.txt
@@ -2,7 +2,7 @@ Name:Cascading Cataracts
 ManaCost:no cost
 Types:Land
 K:Indestructible
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 5 T | Produced$ Combo Any | Amount$ 5 | SpellDescription$ Add five mana in any combination of colors to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 5 T | Produced$ Combo Any | Amount$ 5 | SpellDescription$ Add five mana in any combination of colors.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cascading_cataracts.jpg
-Oracle:Indestructible\n{T}: Add {C} to your mana pool.\n{5}, {T}: Add five mana in any combination of colors to your mana pool.
+Oracle:Indestructible\n{T}: Add {C}.\n{5}, {T}: Add five mana in any combination of colors.
diff --git a/forge-gui/res/cardsfolder/c/castle_sengir.txt b/forge-gui/res/cardsfolder/c/castle_sengir.txt
index 38e17cf3601..6529591c94d 100644
--- a/forge-gui/res/cardsfolder/c/castle_sengir.txt
+++ b/forge-gui/res/cardsfolder/c/castle_sengir.txt
@@ -1,10 +1,10 @@
 Name:Castle Sengir
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ 2 T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ 2 T | Produced$ R | SpellDescription$ Add {R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/castle_sengir.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add {B} to your mana pool.\n{2}, {T}: Add {U} or {R} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add {B}.\n{2}, {T}: Add {U} or {R}.
diff --git a/forge-gui/res/cardsfolder/c/catacomb_sifter.txt b/forge-gui/res/cardsfolder/c/catacomb_sifter.txt
index cea54c8d797..c2bdc5c3422 100644
--- a/forge-gui/res/cardsfolder/c/catacomb_sifter.txt
+++ b/forge-gui/res/cardsfolder/c/catacomb_sifter.txt
@@ -3,12 +3,12 @@ ManaCost:1 B G
 Types:Creature Eldrazi Drone
 PT:2/3
 K:Devoid
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ Whenever another creature you control dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/catacomb_sifter.jpg
-Oracle:Devoid (This card has no color.)\nWhen Catacomb Sifter enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."\nWhenever another creature you control dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+Oracle:Devoid (This card has no color.)\nWhen Catacomb Sifter enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."\nWhenever another creature you control dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
diff --git a/forge-gui/res/cardsfolder/c/cathedral_of_war.txt b/forge-gui/res/cardsfolder/c/cathedral_of_war.txt
index 042d86633c3..d40ba960ae8 100644
--- a/forge-gui/res/cardsfolder/c/cathedral_of_war.txt
+++ b/forge-gui/res/cardsfolder/c/cathedral_of_war.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
 K:Exalted
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cathedral_of_war.jpg
-Oracle:Cathedral of War enters the battlefield tapped.\nExalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)\n{T}: Add {C} to your mana pool.
+Oracle:Cathedral of War enters the battlefield tapped.\nExalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/c/cathodion.txt b/forge-gui/res/cardsfolder/c/cathodion.txt
index 26a756d9207..eb905c9655d 100644
--- a/forge-gui/res/cardsfolder/c/cathodion.txt
+++ b/forge-gui/res/cardsfolder/c/cathodion.txt
@@ -2,7 +2,7 @@ Name:Cathodion
 ManaCost:3
 Types:Artifact Creature Construct
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigAddMana | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, add {C}{C}{C} to your mana pool.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigAddMana | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, add {C}{C}{C}.
 SVar:TrigAddMana:DB$Mana | Produced$ C | Amount$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cathodion.jpg
-Oracle:When Cathodion dies, Add {C}{C}{C} to your mana pool.
+Oracle:When Cathodion dies, Add {C}{C}{C}.
diff --git a/forge-gui/res/cardsfolder/c/cavern_of_souls.txt b/forge-gui/res/cardsfolder/c/cavern_of_souls.txt
index 49a33e654fb..8c39aef94cd 100644
--- a/forge-gui/res/cardsfolder/c/cavern_of_souls.txt
+++ b/forge-gui/res/cardsfolder/c/cavern_of_souls.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:ETBReplacement:Other:ChooseCT
 SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. | AILogic$ MostProminentInComputerDeck
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Creature.ChosenType | AddsNoCounter$ True | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell of the chosen type, and that spell can't be countered.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Creature.ChosenType | AddsNoCounter$ True | SpellDescription$ Add one mana of any color. Spend this mana only to cast a creature spell of the chosen type, and that spell can't be countered.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cavern_of_souls.jpg
-Oracle:As Cavern of Souls enters the battlefield, choose a creature type.\n{T}: Add {C} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell of the chosen type, and that spell can't be countered.
+Oracle:As Cavern of Souls enters the battlefield, choose a creature type.\n{T}: Add {C}.\n{T}: Add one mana of any color. Spend this mana only to cast a creature spell of the chosen type, and that spell can't be countered.
diff --git a/forge-gui/res/cardsfolder/c/caves_of_koilos.txt b/forge-gui/res/cardsfolder/c/caves_of_koilos.txt
index 7c66ab7b1e2..530b08dc305 100644
--- a/forge-gui/res/cardsfolder/c/caves_of_koilos.txt
+++ b/forge-gui/res/cardsfolder/c/caves_of_koilos.txt
@@ -1,9 +1,9 @@
 Name:Caves of Koilos
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-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.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/caves_of_koilos.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {W} or {B} to your mana pool. Caves of Koilos deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {W} or {B}. Caves of Koilos deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/c/celestial_colonnade.txt b/forge-gui/res/cardsfolder/c/celestial_colonnade.txt
index 26525fec6d5..a42360af987 100644
--- a/forge-gui/res/cardsfolder/c/celestial_colonnade.txt
+++ b/forge-gui/res/cardsfolder/c/celestial_colonnade.txt
@@ -2,8 +2,8 @@ Name:Celestial Colonnade
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Animate | Cost$ 3 W U | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Colors$ White,Blue | Keywords$ Flying & Vigilance | SpellDescription$ Until end of turn, CARDNAME becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/celestial_colonnade.jpg
-Oracle:Celestial Colonnade enters the battlefield tapped.\n{T}: Add {W} or {U} to your mana pool.\n{3}{W}{U}: Until end of turn, Celestial Colonnade becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land.
+Oracle:Celestial Colonnade enters the battlefield tapped.\n{T}: Add {W} or {U}.\n{3}{W}{U}: Until end of turn, Celestial Colonnade becomes a 4/4 white and blue Elemental creature with flying and vigilance. It's still a land.
diff --git a/forge-gui/res/cardsfolder/c/celestial_prism.txt b/forge-gui/res/cardsfolder/c/celestial_prism.txt
index 8bb7bdba962..9f449cd5fe7 100644
--- a/forge-gui/res/cardsfolder/c/celestial_prism.txt
+++ b/forge-gui/res/cardsfolder/c/celestial_prism.txt
@@ -1,7 +1,7 @@
 Name:Celestial Prism
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ 2 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ 2 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/celestial_prism.jpg
-Oracle:{2}, {T}: Add one mana of any color to your mana pool.
+Oracle:{2}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/c/centaur_garden.txt b/forge-gui/res/cardsfolder/c/centaur_garden.txt
index 83bb7cd23be..7c2c8e4c133 100644
--- a/forge-gui/res/cardsfolder/c/centaur_garden.txt
+++ b/forge-gui/res/cardsfolder/c/centaur_garden.txt
@@ -1,9 +1,9 @@
 Name:Centaur Garden
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you.
 A:AB$ Pump | Cost$ G T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Target creature gets +3/+3 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/centaur_garden.jpg
-Oracle:{T}: Add {G} to your mana pool. Centaur Garden deals 1 damage to you.\nThreshold — {G}, {T}, Sacrifice Centaur Garden: Target creature gets +3/+3 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {G}. Centaur Garden deals 1 damage to you.\nThreshold — {G}, {T}, Sacrifice Centaur Garden: Target creature gets +3/+3 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/c/cephalid_coliseum.txt b/forge-gui/res/cardsfolder/c/cephalid_coliseum.txt
index 8b1d4546245..65e6698ad98 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_coliseum.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_coliseum.txt
@@ -1,10 +1,10 @@
 Name:Cephalid Coliseum
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U}. CARDNAME deals 1 damage to you.
 A:AB$ Draw | Cost$ U T Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 3 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Target player draws three cards, then discards three cards. Activate this ability only if seven or more cards are in your graveyard. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | NumCards$ 3 | Mode$ TgtChoose | Defined$ Targeted
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cephalid_coliseum.jpg
-Oracle:{T}: Add {U} to your mana pool. Cephalid Coliseum deals 1 damage to you.\nThreshold — {U}, {T}, Sacrifice Cephalid Coliseum: Target player draws three cards, then discards three cards. Activate this ability only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {U}. Cephalid Coliseum deals 1 damage to you.\nThreshold — {U}, {T}, Sacrifice Cephalid Coliseum: Target player draws three cards, then discards three cards. Activate this ability only if seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/c/ceta_disciple.txt b/forge-gui/res/cardsfolder/c/ceta_disciple.txt
index f13726306a3..3d7bf28b954 100644
--- a/forge-gui/res/cardsfolder/c/ceta_disciple.txt
+++ b/forge-gui/res/cardsfolder/c/ceta_disciple.txt
@@ -3,7 +3,7 @@ ManaCost:U
 Types:Creature Merfolk Wizard
 PT:1/1
 A:AB$ Pump | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | SpellDescription$ Target creature gets +2/+0 until end of turn.
-A:AB$ Mana | Cost$ G T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ G T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ceta_disciple.jpg
-Oracle:{R}, {T}: Target creature gets +2/+0 until end of turn.\n{G}, {T}: Add one mana of any color to your mana pool.
+Oracle:{R}, {T}: Target creature gets +2/+0 until end of turn.\n{G}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/c/chancellor_of_the_tangle.txt b/forge-gui/res/cardsfolder/c/chancellor_of_the_tangle.txt
index 315d6b2b3a7..9107a113d66 100644
--- a/forge-gui/res/cardsfolder/c/chancellor_of_the_tangle.txt
+++ b/forge-gui/res/cardsfolder/c/chancellor_of_the_tangle.txt
@@ -5,10 +5,10 @@ PT:6/7
 K:MayEffectFromOpeningHand:ManaOnMain
 K:Vigilance
 K:Reach
-SVar:RevealCard:DB$ Reveal | RevealDefined$ Self | SubAbility$ ManaOnMain | SpellDescription$ You may reveal this card from your opening hand. If you do, at the beginning of your first main phase, add {G} to your mana pool.
+SVar:RevealCard:DB$ Reveal | RevealDefined$ Self | SubAbility$ ManaOnMain | SpellDescription$ You may reveal this card from your opening hand. If you do, at the beginning of your first main phase, add {G}.
 SVar:ManaOnMain:DB$ Effect | Triggers$ TrigMana | SVars$ EffMana,RemoveMe | Duration$ Permanent | Name$ Chancellor of the Tangle effect
-SVar:TrigMana:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | Execute$ EffMana | TriggerDescription$ At the beginning of your first main phase, add G to your mana pool.
+SVar:TrigMana:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | Execute$ EffMana | TriggerDescription$ At the beginning of your first main phase, add G.
 SVar:EffMana:DB$ Mana | Produced$ G | SubAbility$ RemoveMe
 SVar:RemoveMe:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chancellor_of_the_tangle.jpg
-Oracle:You may reveal this card from your opening hand. If you do, at the beginning of your first main phase, add {G} to your mana pool.\nVigilance, reach
+Oracle:You may reveal this card from your opening hand. If you do, at the beginning of your first main phase, add {G}.\nVigilance, reach
diff --git a/forge-gui/res/cardsfolder/c/chandra_torch_of_defiance.txt b/forge-gui/res/cardsfolder/c/chandra_torch_of_defiance.txt
index 3fadd5958a2..a84ca123197 100644
--- a/forge-gui/res/cardsfolder/c/chandra_torch_of_defiance.txt
+++ b/forge-gui/res/cardsfolder/c/chandra_torch_of_defiance.txt
@@ -6,10 +6,10 @@ A:AB$ Mill | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ You | N
 SVar:DBPlay:DB$ Play | Valid$ Card.nonLand+IsImprinted | ValidZone$ Exile | Controller$ You | Optional$ True | Amount$ All | RememberPlayed$ True | ShowCardToActivator$ True | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 2 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
-A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ R | Amount$ 2 | AILogic$ ManaRitual | SpellDescription$ Add {R}{R} to your mana pool.
+A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ R | Amount$ 2 | AILogic$ ManaRitual | SpellDescription$ Add {R}{R}.
 A:AB$ DealDamage | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
 A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Chandra, Torch of Defiance | Image$ emblem_chandra_torch_of_defiance | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever you cast a spell, this emblem deals 5 damage to target creature or player."
 SVar:TrigSpellCast:Mode$ SpellCast | ValidActivatingPlayer$ You | Execute$ EffSpellCast | TriggerDescription$ Whenever you cast a spell, this emblem deals 5 damage to target creature or player.
 SVar:EffSpellCast:DB$ DealDamage | ValidTgts$ Creature,Player | NumDmg$ 5
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chandra_torch_of_defiance.jpg
-Oracle:[+1]: Exile the top card of your library. You may cast that card. If you don't, Chandra, Torch of Defiance deals 2 damage to each opponent.\n[+1]: Add {R}{R} to your mana pool.\n[-3]: Chandra, Torch of Defiance deals 4 damage to target creature.\n[-7]: You get an emblem with "Whenever you cast a spell, this emblem deals 5 damage to target creature or player."
\ No newline at end of file
+Oracle:[+1]: Exile the top card of your library. You may cast that card. If you don't, Chandra, Torch of Defiance deals 2 damage to each opponent.\n[+1]: Add {R}{R}.\n[-3]: Chandra, Torch of Defiance deals 4 damage to target creature.\n[-7]: You get an emblem with "Whenever you cast a spell, this emblem deals 5 damage to target creature or player."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/channel.txt b/forge-gui/res/cardsfolder/c/channel.txt
index 16b854a43d6..ef89727da19 100644
--- a/forge-gui/res/cardsfolder/c/channel.txt
+++ b/forge-gui/res/cardsfolder/c/channel.txt
@@ -1,10 +1,10 @@
 Name:Channel
 ManaCost:G G
 Types:Sorcery
-A:SP$ Effect | Cost$ G G | Name$ Channel Effect | Abilities$ ABMana,ABMultiMana | SVars$ X | SpellDescription$ Until end of turn, any time you could activate a mana ability, you may pay 1 life. If you do, Add {C} to your mana pool.
-SVar:ABMana:AB$Mana | Cost$ PayLife<1> | ActivationZone$ Command | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
-SVar:ABMultiMana:AB$Mana | Cost$ PayLife<X> | ActivationZone$ Command | Produced$ C | Amount$ ChosenX | References$ X | SpellDescription$ Add {X} to your mana pool.
+A:SP$ Effect | Cost$ G G | Name$ Channel Effect | Abilities$ ABMana,ABMultiMana | SVars$ X | SpellDescription$ Until end of turn, any time you could activate a mana ability, you may pay 1 life. If you do, Add {C}.
+SVar:ABMana:AB$Mana | Cost$ PayLife<1> | ActivationZone$ Command | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
+SVar:ABMultiMana:AB$Mana | Cost$ PayLife<X> | ActivationZone$ Command | Produced$ C | Amount$ ChosenX | References$ X | SpellDescription$ Add {X}.
 SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/channel.jpg
-Oracle:Until end of turn, any time you could activate a mana ability, you may pay 1 life. If you do, Add {C} to your mana pool.
+Oracle:Until end of turn, any time you could activate a mana ability, you may pay 1 life. If you do, Add {C}.
diff --git a/forge-gui/res/cardsfolder/c/channel_the_suns.txt b/forge-gui/res/cardsfolder/c/channel_the_suns.txt
index 104d49af086..b45e7d287b6 100644
--- a/forge-gui/res/cardsfolder/c/channel_the_suns.txt
+++ b/forge-gui/res/cardsfolder/c/channel_the_suns.txt
@@ -1,7 +1,7 @@
 Name:Channel the Suns
 ManaCost:3 G
 Types:Sorcery
-A:SP$ Mana | Cost$ 3 G | Produced$ W U B R G | SpellDescription$ Add {W}{U}{B}{R}{G} to your mana pool.
+A:SP$ Mana | Cost$ 3 G | Produced$ W U B R G | SpellDescription$ Add {W}{U}{B}{R}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/channel_the_suns.jpg
-Oracle:Add {W}{U}{B}{R}{G} to your mana pool.
+Oracle:Add {W}{U}{B}{R}{G}.
diff --git a/forge-gui/res/cardsfolder/c/channeler_initiate.txt b/forge-gui/res/cardsfolder/c/channeler_initiate.txt
index 07eb1a428c6..ffb9831e4e9 100644
--- a/forge-gui/res/cardsfolder/c/channeler_initiate.txt
+++ b/forge-gui/res/cardsfolder/c/channeler_initiate.txt
@@ -4,6 +4,6 @@ Types:Creature Human Druid
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put three -1/-1 counters on target creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ M1M1 | IsCurse$ True | CounterNum$ 3
-A:AB$ Mana | Cost$ T SubCounter<1/M1M1> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T SubCounter<1/M1M1> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/channeler_initiate.jpg
-Oracle:When Channeler Initiate enters the battlefield, put three -1/-1 counters on target creature you control.\n{T}, Remove a -1/-1 counter from Channeler Initiate: Add one mana of any color to your mana pool.
\ No newline at end of file
+Oracle:When Channeler Initiate enters the battlefield, put three -1/-1 counters on target creature you control.\n{T}, Remove a -1/-1 counter from Channeler Initiate: Add one mana of any color.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/chaos_moon.txt b/forge-gui/res/cardsfolder/c/chaos_moon.txt
index 88de926d673..abd7369d0d8 100644
--- a/forge-gui/res/cardsfolder/c/chaos_moon.txt
+++ b/forge-gui/res/cardsfolder/c/chaos_moon.txt
@@ -1,10 +1,10 @@
 Name:Chaos Moon
 ManaCost:3 R
 Types:Enchantment
-T:Mode$Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigCount | TriggerDescription$ At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds R to his or her mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
+T:Mode$Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigCount | TriggerDescription$ At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds an additional {R}. If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
 SVar:TrigCount:DB$ Effect | Triggers$ TrigRamp | SVars$ TrigMana | StaticAbilities$ STPump | ConditionCheckSVar$ X | ConditionSVarCompare$ M21 | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ RepCurse | SVars$ ProduceColorless | StaticAbilities$ STCurse | ConditionCheckSVar$ X | ConditionSVarCompare$ M20
-SVar:TrigRamp:Mode$ TapsForMana | ValidCard$ Mountain | Execute$ TrigMana | Static$ True | TriggerZones$ Command | TriggerDescription$ Whenever a player taps a Mountain for mana, that player adds {R} to his or her mana pool.
+SVar:TrigRamp:Mode$ TapsForMana | ValidCard$ Mountain | Execute$ TrigMana | Static$ True | TriggerZones$ Command | TriggerDescription$ Whenever a player taps a Mountain for mana, that player adds {R}.
 SVar:TrigMana:DB$ Mana | Produced$ R | Amount$ 1 | Defined$ TriggeredCardController
 SVar:STPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.Red | AddPower$ 1 | AddToughness$ 1
 SVar:RepCurse:Event$ ProduceMana | ActiveZones$ Command | ValidCard$ Mountain | ManaReplacement$ ProduceColorless | Description$ If a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
@@ -14,4 +14,4 @@ SVar:X:Count$Valid Permanent
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chaos_moon.jpg
-Oracle:At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to his or her mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
+Oracle:At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds an additional {R}. If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
diff --git a/forge-gui/res/cardsfolder/c/charcoal_diamond.txt b/forge-gui/res/cardsfolder/c/charcoal_diamond.txt
index df7775ed4e2..3810244025f 100644
--- a/forge-gui/res/cardsfolder/c/charcoal_diamond.txt
+++ b/forge-gui/res/cardsfolder/c/charcoal_diamond.txt
@@ -1,7 +1,7 @@
 Name:Charcoal Diamond
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/charcoal_diamond.jpg
-Oracle:Charcoal Diamond enters the battlefield tapped.\n{T}: Add {B} to your mana pool.
+Oracle:Charcoal Diamond enters the battlefield tapped.\n{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/c/charmed_pendant.txt b/forge-gui/res/cardsfolder/c/charmed_pendant.txt
index e7118d7bb07..a55f3a37ae6 100644
--- a/forge-gui/res/cardsfolder/c/charmed_pendant.txt
+++ b/forge-gui/res/cardsfolder/c/charmed_pendant.txt
@@ -1,7 +1,7 @@
 Name:Charmed Pendant
 ManaCost:4
 Types:Artifact
-A:AB$ Mana | Cost$ T Mill<1> | Produced$ W | Amount$ ManaW | References$ ManaW | InstantSpeed$ True | SubAbility$ DBManaU | SpellDescription$ For each colored mana symbol in that card's mana cost, add one mana of that color to your mana pool. Activate this ability only any time you could cast an instant.
+A:AB$ Mana | Cost$ T Mill<1> | Produced$ W | Amount$ ManaW | References$ ManaW | InstantSpeed$ True | SubAbility$ DBManaU | SpellDescription$ For each colored mana symbol in that card's mana cost, add one mana of that color. Activate this ability only any time you could cast an instant.
 SVar:DBManaU:DB$ Mana | Produced$ U | Amount$ ManaU | References$ ManaU | SubAbility$ DBManaB
 SVar:DBManaB:DB$ Mana | Produced$ B | Amount$ ManaB | References$ ManaB | SubAbility$ DBManaR
 SVar:DBManaR:DB$ Mana | Produced$ R | Amount$ ManaR | References$ ManaR | SubAbility$ DBManaG
@@ -12,4 +12,4 @@ SVar:ManaB:Milled$ChromaSource.B
 SVar:ManaR:Milled$ChromaSource.R
 SVar:ManaG:Milled$ChromaSource.G
 SVar:Picture:http://www.wizards.com/global/images/magic/general/charmed_pendant.jpg
-Oracle:{T}, Put the top card of your library into your graveyard: For each colored mana symbol in that card's mana cost, add one mana of that color to your mana pool. Activate this ability only any time you could cast an instant.
+Oracle:{T}, Put the top card of your library into your graveyard: For each colored mana symbol in that card's mana cost, add one mana of that color. Activate this ability only any time you could cast an instant.
diff --git a/forge-gui/res/cardsfolder/c/choked_estuary.txt b/forge-gui/res/cardsfolder/c/choked_estuary.txt
index 1e3b1a96dde..9ccb82aa7e2 100644
--- a/forge-gui/res/cardsfolder/c/choked_estuary.txt
+++ b/forge-gui/res/cardsfolder/c/choked_estuary.txt
@@ -1,9 +1,9 @@
 Name:Choked Estuary
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Island,Swamp/Island or Swamp> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal an Island or Swamp card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/choked_estuary.jpg
-Oracle:As Choked Estuary enters the battlefield, you may reveal an Island or Swamp card from your hand. If you don't, Choked Estuary enters the battlefield tapped.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:As Choked Estuary enters the battlefield, you may reveal an Island or Swamp card from your hand. If you don't, Choked Estuary enters the battlefield tapped.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/c/chromatic_lantern.txt b/forge-gui/res/cardsfolder/c/chromatic_lantern.txt
index 04a7a66292d..178468c68f9 100644
--- a/forge-gui/res/cardsfolder/c/chromatic_lantern.txt
+++ b/forge-gui/res/cardsfolder/c/chromatic_lantern.txt
@@ -1,8 +1,8 @@
 Name:Chromatic Lantern
 ManaCost:3
 Types:Artifact
-S:Mode$ Continuous | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add one mana of any color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chromatic_lantern.jpg
-Oracle:Lands you control have "{T}: Add one mana of any color to your mana pool."\n{T}: Add one mana of any color to your mana pool.
+Oracle:Lands you control have "{T}: Add one mana of any color."\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/c/chromatic_sphere.txt b/forge-gui/res/cardsfolder/c/chromatic_sphere.txt
index b2b9dc8ed04..cc6c84eee84 100644
--- a/forge-gui/res/cardsfolder/c/chromatic_sphere.txt
+++ b/forge-gui/res/cardsfolder/c/chromatic_sphere.txt
@@ -1,8 +1,8 @@
 Name:Chromatic Sphere
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | SubAbility$ DBDraw | SpellDescription$ Add one mana of any color to your mana pool. Draw a card.
+A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | SubAbility$ DBDraw | SpellDescription$ Add one mana of any color. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chromatic_sphere.jpg
-Oracle:{1}, {T}, Sacrifice Chromatic Sphere: Add one mana of any color to your mana pool. Draw a card.
+Oracle:{1}, {T}, Sacrifice Chromatic Sphere: Add one mana of any color. Draw a card.
diff --git a/forge-gui/res/cardsfolder/c/chromatic_star.txt b/forge-gui/res/cardsfolder/c/chromatic_star.txt
index ebdf82c97d6..e7175e4ef18 100644
--- a/forge-gui/res/cardsfolder/c/chromatic_star.txt
+++ b/forge-gui/res/cardsfolder/c/chromatic_star.txt
@@ -1,10 +1,10 @@
 Name:Chromatic Star
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card.
 SVar:TrigDraw:DB$Draw | Defined$ TriggeredCardController | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:SacMe:1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chromatic_star.jpg
-Oracle:{1}, {T}, Sacrifice Chromatic Star: Add one mana of any color to your mana pool.\nWhen Chromatic Star is put into a graveyard from the battlefield, draw a card.
+Oracle:{1}, {T}, Sacrifice Chromatic Star: Add one mana of any color.\nWhen Chromatic Star is put into a graveyard from the battlefield, draw a card.
diff --git a/forge-gui/res/cardsfolder/c/chrome_mox.txt b/forge-gui/res/cardsfolder/c/chrome_mox.txt
index 6f80e160f45..d2de62b0bdc 100644
--- a/forge-gui/res/cardsfolder/c/chrome_mox.txt
+++ b/forge-gui/res/cardsfolder/c/chrome_mox.txt
@@ -3,11 +3,11 @@ ManaCost:0
 Types:Artifact
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Imprint — When CARDNAME enters the battlefield, you may exile a nonartifact, nonland card from your hand.
 SVar:TrigExile:DB$ChangeZone | Imprint$ True | Origin$ Hand | Destination$ Exile | ChangeType$ Card.nonArtifact+nonLand | ChangeNum$ 1
-A:AB$ ManaReflected | Cost$ T | Valid$ Defined.Imprinted | ColorOrType$ Color | ReflectProperty$ Is | SpellDescription$ Add one mana of any of the exiled card's colors to your mana pool.
+A:AB$ ManaReflected | Cost$ T | Valid$ Defined.Imprinted | ColorOrType$ Color | ReflectProperty$ Is | SpellDescription$ Add one mana of any of the exiled card's colors.
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanup | Static$ True
 T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | ValidCard$ Card.IsImprinted | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
 SVar:NeedsToPlayVar:Z GE1
 SVar:Z:Count$ValidHand Card.nonArtifact+nonColorless+nonLand+YouOwn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chrome_mox.jpg
-Oracle:Imprint — When Chrome Mox enters the battlefield, you may exile a nonartifact, nonland card from your hand.\n{T}: Add one mana of any of the exiled card's colors to your mana pool.
\ No newline at end of file
+Oracle:Imprint — When Chrome Mox enters the battlefield, you may exile a nonartifact, nonland card from your hand.\n{T}: Add one mana of any of the exiled card's colors.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/chronatog_totem.txt b/forge-gui/res/cardsfolder/c/chronatog_totem.txt
index 76fdd257484..45644795fb8 100644
--- a/forge-gui/res/cardsfolder/c/chronatog_totem.txt
+++ b/forge-gui/res/cardsfolder/c/chronatog_totem.txt
@@ -1,9 +1,9 @@
 Name:Chronatog Totem
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Animate | Cost$ 1 U | Defined$ Self | Power$ 1 | Toughness$ 2 | Types$ Creature,Artifact,Atog | Colors$ Blue | SpellDescription$ CARDNAME becomes a 1/2 blue Atog artifact creature until end of turn.
 A:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ +3 | NumDef$ +3 | IsPresent$ Card.Self+Creature | ActivationLimit$ 1 | SubAbility$ SkipTurn | SpellDescription$ CARDNAME gets +3/+3 until end of turn. You skip your next turn. Activate this ability only once each turn and only if CARDNAME is a creature.
 SVar:SkipTurn:DB$ SkipTurn | NumTurns$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chronatog_totem.jpg
-Oracle:{T}: Add {U} to your mana pool.\n{1}{U}: Chronatog Totem becomes a 1/2 blue Atog artifact creature until end of turn.\n{0}: Chronatog Totem gets +3/+3 until end of turn. You skip your next turn. Activate this ability only once each turn and only if Chronatog Totem is a creature.
+Oracle:{T}: Add {U}.\n{1}{U}: Chronatog Totem becomes a 1/2 blue Atog artifact creature until end of turn.\n{0}: Chronatog Totem gets +3/+3 until end of turn. You skip your next turn. Activate this ability only once each turn and only if Chronatog Totem is a creature.
diff --git a/forge-gui/res/cardsfolder/c/cinder_barrens.txt b/forge-gui/res/cardsfolder/c/cinder_barrens.txt
index c5877fd6947..bdf1687ca7b 100644
--- a/forge-gui/res/cardsfolder/c/cinder_barrens.txt
+++ b/forge-gui/res/cardsfolder/c/cinder_barrens.txt
@@ -2,7 +2,7 @@ Name:Cinder Barrens
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cinder_barrens.jpg
-Oracle:Cinder Barrens enters the battlefield tapped.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:Cinder Barrens enters the battlefield tapped.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/c/cinder_glade.txt b/forge-gui/res/cardsfolder/c/cinder_glade.txt
index e1247d87cfc..fe36fe35f1d 100644
--- a/forge-gui/res/cardsfolder/c/cinder_glade.txt
+++ b/forge-gui/res/cardsfolder/c/cinder_glade.txt
@@ -6,4 +6,4 @@ SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBChe
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar:Count$LastStateBattlefield Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cinder_glade.jpg
-Oracle:({T}: Add {R} or {G} to your mana pool.)\nCinder Glade enters the battlefield tapped unless you control two or more basic lands.
\ No newline at end of file
+Oracle:({T}: Add {R} or {G}.)\nCinder Glade enters the battlefield tapped unless you control two or more basic lands.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/cinder_marsh.txt b/forge-gui/res/cardsfolder/c/cinder_marsh.txt
index a031a006614..dc193116a29 100644
--- a/forge-gui/res/cardsfolder/c/cinder_marsh.txt
+++ b/forge-gui/res/cardsfolder/c/cinder_marsh.txt
@@ -1,9 +1,9 @@
 Name:Cinder Marsh
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBStayTapped | SpellDescription$ Add {B} to your mana pool. CARDNAME doesn't untap during your next untap step.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBStayTapped | SpellDescription$ Add {R} to your mana pool. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBStayTapped | SpellDescription$ Add {B}. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBStayTapped | SpellDescription$ Add {R}. CARDNAME doesn't untap during your next untap step.
 SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cinder_marsh.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {B} or {R} to your mana pool. Cinder Marsh doesn't untap during your next untap step.
+Oracle:{T}: Add {C}.\n{T}: Add {B} or {R}. Cinder Marsh doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/c/circle_of_elders.txt b/forge-gui/res/cardsfolder/c/circle_of_elders.txt
index d346949a351..3251a3313d7 100644
--- a/forge-gui/res/cardsfolder/c/circle_of_elders.txt
+++ b/forge-gui/res/cardsfolder/c/circle_of_elders.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Creature Human Shaman
 PT:2/4
 K:Vigilance
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | CheckSVar$ FormidableTest | SVarCompare$ GE8 | References$ FormidableTest | PrecostDesc$ Formidable — | SpellDescription$ Add {C}{C}{C} to your mana pool. Activate this ability only if creatures you control have total power 8 or greater.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | CheckSVar$ FormidableTest | SVarCompare$ GE8 | References$ FormidableTest | PrecostDesc$ Formidable — | SpellDescription$ Add {C}{C}{C}. Activate this ability only if creatures you control have total power 8 or greater.
 SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/circle_of_elders.jpg
-Oracle:Vigilance\nFormidable — {T}: Add {C}{C}{C} to your mana pool. Activate this ability only if creatures you control have total power 8 or greater.
+Oracle:Vigilance\nFormidable — {T}: Add {C}{C}{C}. Activate this ability only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/c/citanul_hierophants.txt b/forge-gui/res/cardsfolder/c/citanul_hierophants.txt
index 792844882a6..496321e6b93 100644
--- a/forge-gui/res/cardsfolder/c/citanul_hierophants.txt
+++ b/forge-gui/res/cardsfolder/c/citanul_hierophants.txt
@@ -2,7 +2,7 @@ Name:Citanul Hierophants
 ManaCost:3 G
 Types:Creature Human Druid
 PT:3/2
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddAbility$ Mana | Description$ Creatures you control have "{T}: Add {G} to your mana pool."
-SVar:Mana:AB$Mana | Cost$ T | Produced$ G | Amount$ 1 | SpellDescription$ Add {G} to your mana pool.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddAbility$ Mana | Description$ Creatures you control have "{T}: Add {G}."
+SVar:Mana:AB$Mana | Cost$ T | Produced$ G | Amount$ 1 | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/citanul_hierophants.jpg
-Oracle:Creatures you control have "{T}: Add {G} to your mana pool."
+Oracle:Creatures you control have "{T}: Add {G}."
diff --git a/forge-gui/res/cardsfolder/c/city_of_brass.txt b/forge-gui/res/cardsfolder/c/city_of_brass.txt
index b9768f6a335..d98f99d64b0 100644
--- a/forge-gui/res/cardsfolder/c/city_of_brass.txt
+++ b/forge-gui/res/cardsfolder/c/city_of_brass.txt
@@ -1,8 +1,8 @@
 Name:City of Brass
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 T:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes tapped, it deals 1 damage to you.
 SVar:TrigDamage:DB$DealDamage | Defined$ You | NumDmg$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/city_of_brass.jpg
-Oracle:Whenever City of Brass becomes tapped, it deals 1 damage to you.\n{T}: Add one mana of any color to your mana pool.
+Oracle:Whenever City of Brass becomes tapped, it deals 1 damage to you.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/c/city_of_shadows.txt b/forge-gui/res/cardsfolder/c/city_of_shadows.txt
index f7a6a6814bc..4888c08bf0d 100644
--- a/forge-gui/res/cardsfolder/c/city_of_shadows.txt
+++ b/forge-gui/res/cardsfolder/c/city_of_shadows.txt
@@ -2,8 +2,8 @@ Name:City of Shadows
 ManaCost:no cost
 Types:Land
 A:AB$ PutCounter | Cost$ T Exile<1/Creature> | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | References$ X | SpellDescription$ Add {C} to your mana pool for each storage counter on City of Shadows.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | References$ X | SpellDescription$ Add {C} for each storage counter on City of Shadows.
 SVar:X:Count$CardCounters.STORAGE
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/city_of_shadows.jpg
-Oracle:{T}, Exile a creature you control: Put a storage counter on City of Shadows.\n{T}: Add {C} to your mana pool for each storage counter on City of Shadows.
+Oracle:{T}, Exile a creature you control: Put a storage counter on City of Shadows.\n{T}: Add {C} for each storage counter on City of Shadows.
diff --git a/forge-gui/res/cardsfolder/c/city_of_traitors.txt b/forge-gui/res/cardsfolder/c/city_of_traitors.txt
index 0f1991e9afe..b83cd768e9b 100644
--- a/forge-gui/res/cardsfolder/c/city_of_traitors.txt
+++ b/forge-gui/res/cardsfolder/c/city_of_traitors.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 T:Mode$ LandPlayed | ValidCard$ Land.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When you play another land, sacrifice CARDNAME.
 SVar:TrigSac:DB$Sacrifice | Defined$ Self
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/city_of_traitors.jpg
-Oracle:When you play another land, sacrifice City of Traitors.\n{T}: Add {C}{C} to your mana pool.
+Oracle:When you play another land, sacrifice City of Traitors.\n{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/c/cloudcrest_lake.txt b/forge-gui/res/cardsfolder/c/cloudcrest_lake.txt
index 8dcbac80fd2..98dc209fad4 100644
--- a/forge-gui/res/cardsfolder/c/cloudcrest_lake.txt
+++ b/forge-gui/res/cardsfolder/c/cloudcrest_lake.txt
@@ -1,9 +1,9 @@
 Name:Cloudcrest Lake
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBStayTapped | SpellDescription$ Add {W} to your mana pool. CARDNAME doesn't untap during your next untap step.
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBStayTapped | SpellDescription$ Add {U} to your mana pool. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBStayTapped | SpellDescription$ Add {W}. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBStayTapped | SpellDescription$ Add {U}. CARDNAME doesn't untap during your next untap step.
 SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cloudcrest_lake.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {W} or {U} to your mana pool. Cloudcrest Lake doesn't untap during your next untap step.
+Oracle:{T}: Add {C}.\n{T}: Add {W} or {U}. Cloudcrest Lake doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/c/cloudpost.txt b/forge-gui/res/cardsfolder/c/cloudpost.txt
index 0eb317e2deb..63a74a672a7 100644
--- a/forge-gui/res/cardsfolder/c/cloudpost.txt
+++ b/forge-gui/res/cardsfolder/c/cloudpost.txt
@@ -2,8 +2,8 @@ Name:Cloudpost
 ManaCost:no cost
 Types:Land Locus
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | References$ X | SpellDescription$ Add {C} to your mana pool for each Locus on the battlefield.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | References$ X | SpellDescription$ Add {C} for each Locus on the battlefield.
 SVar:X:Count$Valid Locus
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cloudpost.jpg
-Oracle:Cloudpost enters the battlefield tapped.\n{T}: Add {C} to your mana pool for each Locus on the battlefield.
+Oracle:Cloudpost enters the battlefield tapped.\n{T}: Add {C} for each Locus on the battlefield.
diff --git a/forge-gui/res/cardsfolder/c/coal_golem.txt b/forge-gui/res/cardsfolder/c/coal_golem.txt
index 9ec4829f82e..a7a30b90d80 100644
--- a/forge-gui/res/cardsfolder/c/coal_golem.txt
+++ b/forge-gui/res/cardsfolder/c/coal_golem.txt
@@ -2,7 +2,7 @@ Name:Coal Golem
 ManaCost:5
 Types:Artifact Creature Golem
 PT:3/3
-A:AB$ Mana | Cost$ 3 Sac<1/CARDNAME> | Produced$ R | Amount$ 3 | SpellDescription$ Add {R}{R}{R} to your mana pool.
+A:AB$ Mana | Cost$ 3 Sac<1/CARDNAME> | Produced$ R | Amount$ 3 | SpellDescription$ Add {R}{R}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coal_golem.jpg
-Oracle:{3}, Sacrifice Coal Golem: Add {R}{R}{R} to your mana pool.
+Oracle:{3}, Sacrifice Coal Golem: Add {R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/c/coal_stoker.txt b/forge-gui/res/cardsfolder/c/coal_stoker.txt
index 61ec5df299e..fa1f91ec4fb 100644
--- a/forge-gui/res/cardsfolder/c/coal_stoker.txt
+++ b/forge-gui/res/cardsfolder/c/coal_stoker.txt
@@ -2,7 +2,7 @@ Name:Coal Stoker
 ManaCost:3 R
 Types:Creature Elemental
 PT:3/3
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.wasCastFromHand+Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand, add {R}{R}{R} to your mana pool.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.wasCastFromHand+Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand, add {R}{R}{R}.
 SVar:TrigMana:DB$Mana | Produced$ R | Amount$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coal_stoker.jpg
-Oracle:When Coal Stoker enters the battlefield, if you cast it from your hand, add {R}{R}{R} to your mana pool.
+Oracle:When Coal Stoker enters the battlefield, if you cast it from your hand, add {R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/c/coalition_relic.txt b/forge-gui/res/cardsfolder/c/coalition_relic.txt
index 6140718b951..078fbe45fbc 100644
--- a/forge-gui/res/cardsfolder/c/coalition_relic.txt
+++ b/forge-gui/res/cardsfolder/c/coalition_relic.txt
@@ -1,12 +1,12 @@
 Name:Coalition Relic
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 A:AB$ PutCounter | Cost$ T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemove | TriggerDescription$ At the beginning of your precombat main phase, remove all charge counters from CARDNAME. Add one mana of any color to your mana pool for each charge counter removed this way.
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemove | TriggerDescription$ At the beginning of your precombat main phase, remove all charge counters from CARDNAME. Add one mana of any color for each charge counter removed this way.
 SVar:TrigRemove:DB$ RemoveCounter | CounterType$ CHARGE | CounterNum$ All | RememberRemoved$ True | SubAbility$ TrigGetMana
 SVar:TrigGetMana:DB$ Mana | Produced$ Combo Any | Amount$ NumRemoved | References$ NumRemoved | AILogic$ MostProminentInComputerHand | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NumRemoved:Count$RememberedSize
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coalition_relic.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.\n{T}: Put a charge counter on Coalition Relic.\nAt the beginning of your precombat main phase, remove all charge counters from Coalition Relic. Add one mana of any color to your mana pool for each charge counter removed this way.
+Oracle:{T}: Add one mana of any color.\n{T}: Put a charge counter on Coalition Relic.\nAt the beginning of your precombat main phase, remove all charge counters from Coalition Relic. Add one mana of any color for each charge counter removed this way.
diff --git a/forge-gui/res/cardsfolder/c/coastal_tower.txt b/forge-gui/res/cardsfolder/c/coastal_tower.txt
index 13021dfbaa6..374617381ce 100644
--- a/forge-gui/res/cardsfolder/c/coastal_tower.txt
+++ b/forge-gui/res/cardsfolder/c/coastal_tower.txt
@@ -2,7 +2,7 @@ Name:Coastal Tower
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coastal_tower.jpg
-Oracle:Coastal Tower enters the battlefield tapped.\n{T}: Add {W} or {U} to your mana pool.
+Oracle:Coastal Tower enters the battlefield tapped.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/c/coldsteel_heart.txt b/forge-gui/res/cardsfolder/c/coldsteel_heart.txt
index 75a17b271ef..a1529184ec6 100644
--- a/forge-gui/res/cardsfolder/c/coldsteel_heart.txt
+++ b/forge-gui/res/cardsfolder/c/coldsteel_heart.txt
@@ -4,6 +4,6 @@ Types:Snow Artifact
 K:CARDNAME enters the battlefield tapped.
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
-A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coldsteel_heart.jpg
-Oracle:Coldsteel Heart enters the battlefield tapped.\nAs Coldsteel Heart enters the battlefield, choose a color.\n{T}: Add one mana of the chosen color to your mana pool.
+Oracle:Coldsteel Heart enters the battlefield tapped.\nAs Coldsteel Heart enters the battlefield, choose a color.\n{T}: Add one mana of the chosen color.
diff --git a/forge-gui/res/cardsfolder/c/command_beacon.txt b/forge-gui/res/cardsfolder/c/command_beacon.txt
index b7a583c0f51..17418a3aa75 100644
--- a/forge-gui/res/cardsfolder/c/command_beacon.txt
+++ b/forge-gui/res/cardsfolder/c/command_beacon.txt
@@ -1,9 +1,9 @@
 Name:Command Beacon
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZoneAll | Cost$ T Sac<1/CARDNAME> | ChangeType$ Card.IsCommander+YouOwn | Origin$ Command | Destination$ Hand | SpellDescription$ Put your commander into your hand from the command zone.
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/command_beacon.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Sacrifice Command Beacon: Put your commander into your hand from the command zone.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{T}, Sacrifice Command Beacon: Put your commander into your hand from the command zone.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/command_tower.txt b/forge-gui/res/cardsfolder/c/command_tower.txt
index bf0269800e4..cc90d04bf15 100644
--- a/forge-gui/res/cardsfolder/c/command_tower.txt
+++ b/forge-gui/res/cardsfolder/c/command_tower.txt
@@ -1,6 +1,6 @@
 Name:Command Tower
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Combo ColorIdentity | SpellDescription$ Add to your mana pool one mana of any color in your commander's color identity.
+A:AB$ Mana | Cost$ T | Produced$ Combo ColorIdentity | SpellDescription$ Add one mana of any color in your commander's color identity.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/command_tower.jpg
-Oracle:{T}: Add to your mana pool one mana of any color in your commander's color identity.
+Oracle:{T}: Add one mana of any color in your commander's color identity.
diff --git a/forge-gui/res/cardsfolder/c/commanders_sphere.txt b/forge-gui/res/cardsfolder/c/commanders_sphere.txt
index ef23d8c2525..6970c428fe1 100644
--- a/forge-gui/res/cardsfolder/c/commanders_sphere.txt
+++ b/forge-gui/res/cardsfolder/c/commanders_sphere.txt
@@ -1,8 +1,8 @@
 Name:Commander's Sphere
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ Combo ColorIdentity | SpellDescription$ Add to your mana pool one mana of any color in your commander's color identity.
+A:AB$ Mana | Cost$ T | Produced$ Combo ColorIdentity | SpellDescription$ Add one mana of any color in your commander's color identity.
 A:AB$ Draw | Cost$ Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/commanders_sphere.jpg
-Oracle:{T}: Add to your mana pool one mana of any color in your commander's color identity.\nSacrifice Commander's Sphere: Draw a card.
+Oracle:{T}: Add one mana of any color in your commander's color identity.\nSacrifice Commander's Sphere: Draw a card.
diff --git a/forge-gui/res/cardsfolder/c/composite_golem.txt b/forge-gui/res/cardsfolder/c/composite_golem.txt
index 71fb36e0a0e..20dcce93418 100644
--- a/forge-gui/res/cardsfolder/c/composite_golem.txt
+++ b/forge-gui/res/cardsfolder/c/composite_golem.txt
@@ -2,7 +2,7 @@ Name:Composite Golem
 ManaCost:6
 Types:Artifact Creature Golem
 PT:4/4
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ W U B R G | SpellDescription$ Add {W}{U}{B}{R}{G} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ W U B R G | SpellDescription$ Add {W}{U}{B}{R}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/composite_golem.jpg
-Oracle:Sacrifice Composite Golem: Add {W}{U}{B}{R}{G} to your mana pool.
+Oracle:Sacrifice Composite Golem: Add {W}{U}{B}{R}{G}.
diff --git a/forge-gui/res/cardsfolder/c/concealed_courtyard.txt b/forge-gui/res/cardsfolder/c/concealed_courtyard.txt
index 587f84b129a..8d33aee5c2f 100644
--- a/forge-gui/res/cardsfolder/c/concealed_courtyard.txt
+++ b/forge-gui/res/cardsfolder/c/concealed_courtyard.txt
@@ -5,7 +5,7 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ GT2 | References$ ETBCheckSVar2 | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar2:Count$LastStateBattlefield Land.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/concealed_courtyard.jpg
-Oracle:Concealed Courtyard enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {W} or {B} to your mana pool.
+Oracle:Concealed Courtyard enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {W} or {B}.
diff --git a/forge-gui/res/cardsfolder/c/conduit_of_storms_conduit_of_emrakul.txt b/forge-gui/res/cardsfolder/c/conduit_of_storms_conduit_of_emrakul.txt
index 4127268d8cd..64100b92e61 100644
--- a/forge-gui/res/cardsfolder/c/conduit_of_storms_conduit_of_emrakul.txt
+++ b/forge-gui/res/cardsfolder/c/conduit_of_storms_conduit_of_emrakul.txt
@@ -2,14 +2,14 @@ Name:Conduit of Storms
 ManaCost:2 R
 Types:Creature Werewolf Horror
 PT:2/3
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDelTrig | TriggerDescription$ Whenever CARDNAME attacks, add {R} to your mana pool at the beginning of your next main phase this turn.
-SVar:TrigDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main1,Main2 | ThisTurn$ True | ValidPlayer$ You | Execute$ AddMana | TriggerDescription$ At the beginning of your next main phase this turn, add {R} to your mana pool.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDelTrig | TriggerDescription$ Whenever CARDNAME attacks, add {R} at the beginning of your next main phase this turn.
+SVar:TrigDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main1,Main2 | ThisTurn$ True | ValidPlayer$ You | Execute$ AddMana | TriggerDescription$ At the beginning of your next main phase this turn, add {R}.
 SVar:AddMana:DB$ Mana | Produced$ R
 A:AB$SetState | Cost$ 3 R R | Defined$ Self | Mode$ Transform | SpellDescription$ Transform CARDNAME.
 SVar:HasAttackEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/conduit_of_storms.jpg
 AlternateMode:DoubleFaced
-Oracle:Whenever Conduit of Storms attacks, add {R} to your mana pool at the beginning of your next main phase this turn.\n{3}{R}{R}: Transform Conduit of Storms.
+Oracle:Whenever Conduit of Storms attacks, add {R} at the beginning of your next main phase this turn.\n{3}{R}{R}: Transform Conduit of Storms.
 
 ALTERNATE
 
@@ -17,9 +17,9 @@ Name:Conduit of Emrakul
 ManaCost:no cost
 Types:Creature Eldrazi Werewolf
 PT:5/4
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDelTrig | TriggerDescription$ Whenever CARDNAME attacks, add {C}{C} to your mana pool at the beginning of your next main phase this turn.
-SVar:TrigDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main1,Main2 | ThisTurn$ True | ValidPlayer$ You | Execute$ AddMana | TriggerDescription$ At the beginning of your next main phase this turn, add {C}{C} to your mana pool.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDelTrig | TriggerDescription$ Whenever CARDNAME attacks, add {C}{C} at the beginning of your next main phase this turn.
+SVar:TrigDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main1,Main2 | ThisTurn$ True | ValidPlayer$ You | Execute$ AddMana | TriggerDescription$ At the beginning of your next main phase this turn, add {C}{C}.
 SVar:AddMana:DB$ Mana | Produced$ C C
 SVar:HasAttackEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/conduit_of_emrakul.jpg
-Oracle:Whenever Conduit of Emrakul attacks, add {C}{C} to your mana pool at the beginning of your next main phase this turn.
+Oracle:Whenever Conduit of Emrakul attacks, add {C}{C} at the beginning of your next main phase this turn.
diff --git a/forge-gui/res/cardsfolder/c/conquerors_galleon_conquerors_foothold.txt b/forge-gui/res/cardsfolder/c/conquerors_galleon_conquerors_foothold.txt
index 4781f603d95..dfaf5970659 100644
--- a/forge-gui/res/cardsfolder/c/conquerors_galleon_conquerors_foothold.txt
+++ b/forge-gui/res/cardsfolder/c/conquerors_galleon_conquerors_foothold.txt
@@ -20,10 +20,10 @@ ALTERNATE
 Name:Conqueror's Foothold
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ 2 T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
 A:AB$ Draw | Cost$ 4 T | NumCards$ 1 | SpellDescription$ Draw a card.
 A:AB$ ChangeZone | Cost$ 6 T | TgtPrompt$ Select target card in your graveyard | ValidTgts$ Card.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target card from your graveyard to your hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/conquerors_foothold.jpg
-Oracle:(Transforms from Conqueror's Galleon.)\n{T}: Add {C} to your mana pool.\n{2}, {T}: Draw a card, then discard a card.\n{4}, {T}: Draw a card.\n{6}, {T}: Return target card from your graveyard to your hand.
+Oracle:(Transforms from Conqueror's Galleon.)\n{T}: Add {C}.\n{2}, {T}: Draw a card, then discard a card.\n{4}, {T}: Draw a card.\n{6}, {T}: Return target card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/c/contested_cliffs.txt b/forge-gui/res/cardsfolder/c/contested_cliffs.txt
index 2bf6707cd2a..6edad0a29b9 100644
--- a/forge-gui/res/cardsfolder/c/contested_cliffs.txt
+++ b/forge-gui/res/cardsfolder/c/contested_cliffs.txt
@@ -1,9 +1,9 @@
 Name:Contested Cliffs
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ R G T | ValidTgts$ Creature.Beast+YouCtrl | TgtPrompt$ Choose target Beast creature you control | SubAbility$ FightForTheCliffs | StackDescription$ None | SpellDescription$ Target Beast creature you control fights target creature an opponent controls. (Each deals damage equal to its power to the other.)
 SVar:FightForTheCliffs:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/contested_cliffs.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{R}{G}, {T}: Target Beast creature you control fights target creature an opponent controls. (Each deals damage equal to its power to the other.)
+Oracle:{T}: Add {C}.\n{R}{G}, {T}: Target Beast creature you control fights target creature an opponent controls. (Each deals damage equal to its power to the other.)
diff --git a/forge-gui/res/cardsfolder/c/contested_war_zone.txt b/forge-gui/res/cardsfolder/c/contested_war_zone.txt
index b462e2e2f55..a3bdc6e6de7 100644
--- a/forge-gui/res/cardsfolder/c/contested_war_zone.txt
+++ b/forge-gui/res/cardsfolder/c/contested_war_zone.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ You | CombatDamage$ True | Execute$ TrigControl | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature deals combat damage to you, that creature's controller gains control of CARDNAME.
 SVar:TrigControl:DB$ GainControl | Defined$ Self | NewController$ TriggeredSourceController
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PumpAll | Cost$ 1 T | ValidCards$ Creature.attacking | NumAtt$ +1 | SpellDescription$ Attacking creatures get +1/+0 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/contested_war_zone.jpg
-Oracle:Whenever a creature deals combat damage to you, that creature's controller gains control of Contested War Zone.\n{T}: Add {C} to your mana pool.\n{1}, {T}: Attacking creatures get +1/+0 until end of turn.
+Oracle:Whenever a creature deals combat damage to you, that creature's controller gains control of Contested War Zone.\n{T}: Add {C}.\n{1}, {T}: Attacking creatures get +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/contract_killing.txt b/forge-gui/res/cardsfolder/c/contract_killing.txt
index e6daaa1f0e7..57d760b42bc 100644
--- a/forge-gui/res/cardsfolder/c/contract_killing.txt
+++ b/forge-gui/res/cardsfolder/c/contract_killing.txt
@@ -1,8 +1,8 @@
 Name:Contract Killing
 ManaCost:3 B B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBTreasure | SpellDescription$ Destroy target creature. Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBTreasure | SpellDescription$ Destroy target creature. Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:DBTreasure:DB$ Token | TokenAmount$ 2 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/contract_killing.jpg
-Oracle:Destroy target creature. Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
\ No newline at end of file
+Oracle:Destroy target creature. Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/copper_myr.txt b/forge-gui/res/cardsfolder/c/copper_myr.txt
index d72505a013f..c4d8bc5f301 100644
--- a/forge-gui/res/cardsfolder/c/copper_myr.txt
+++ b/forge-gui/res/cardsfolder/c/copper_myr.txt
@@ -2,6 +2,6 @@ Name:Copper Myr
 ManaCost:2
 Types:Artifact Creature Myr
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/copper_myr.jpg
-Oracle:{T}: Add {G} to your mana pool.
+Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/c/copperline_gorge.txt b/forge-gui/res/cardsfolder/c/copperline_gorge.txt
index c9bcb83fdcb..b1f14561d53 100644
--- a/forge-gui/res/cardsfolder/c/copperline_gorge.txt
+++ b/forge-gui/res/cardsfolder/c/copperline_gorge.txt
@@ -5,7 +5,7 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ GT2 | References$ ETBCheckSVar2 | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar2:Count$LastStateBattlefield Land.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/copperline_gorge.jpg
-Oracle:Copperline Gorge enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {R} or {G} to your mana pool.
+Oracle:Copperline Gorge enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/c/coral_atoll.txt b/forge-gui/res/cardsfolder/c/coral_atoll.txt
index afcfb01479c..b3ff78924e7 100644
--- a/forge-gui/res/cardsfolder/c/coral_atoll.txt
+++ b/forge-gui/res/cardsfolder/c/coral_atoll.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return an untapped Island you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Island.untapped/untapped Island> | UnlessPayer$ You
-A:AB$ Mana | Cost$ T | Produced$ C U | SpellDescription$ Add {C}{U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C U | SpellDescription$ Add {C}{U}.
 SVar:NeedsToPlay:Land.Island+YouCtrl+inZoneBattlefield+untapped
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coral_atoll.jpg
-Oracle:Coral Atoll enters the battlefield tapped.\nWhen Coral Atoll enters the battlefield, sacrifice it unless you return an untapped Island you control to its owner's hand.\n{T}: Add {C}{U} to your mana pool.
+Oracle:Coral Atoll enters the battlefield tapped.\nWhen Coral Atoll enters the battlefield, sacrifice it unless you return an untapped Island you control to its owner's hand.\n{T}: Add {C}{U}.
diff --git a/forge-gui/res/cardsfolder/c/corpsehatch.txt b/forge-gui/res/cardsfolder/c/corpsehatch.txt
index 8eaf9c1bb49..92d13ea2cf5 100644
--- a/forge-gui/res/cardsfolder/c/corpsehatch.txt
+++ b/forge-gui/res/cardsfolder/c/corpsehatch.txt
@@ -2,9 +2,9 @@ Name:Corpsehatch
 ManaCost:3 B B
 Types:Sorcery
 A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Choose target nonblack creature. | SubAbility$ DBToken | SpellDescription$ Destroy target nonblack creature.
-SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn3 | SpellDescription$ Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn3 | SpellDescription$ Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/corpsehatch.jpg
-Oracle:Destroy target nonblack creature. Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Destroy target nonblack creature. Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/c/corrupted_crossroads.txt b/forge-gui/res/cardsfolder/c/corrupted_crossroads.txt
index 519b78e2980..29070423738 100644
--- a/forge-gui/res/cardsfolder/c/corrupted_crossroads.txt
+++ b/forge-gui/res/cardsfolder/c/corrupted_crossroads.txt
@@ -1,10 +1,10 @@
 Name:Corrupted Crossroads
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | Amount$ 1 | RestrictValid$ Card.withDevoid | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a spell with devoid.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | Amount$ 1 | RestrictValid$ Card.withDevoid | SpellDescription$ Add one mana of any color. Spend this mana only to cast a spell with devoid.
 SVar:RemRandomDeck:True
 DeckHas:Ability$Mana.Colorless
 DeckNeeds:Keyword$Devoid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/corrupted_crossroads.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Pay 1 life: Add one mana of any color to your mana pool. Spend this mana only to cast a spell with devoid.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{T}, Pay 1 life: Add one mana of any color. Spend this mana only to cast a spell with devoid.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/corrupted_grafstone.txt b/forge-gui/res/cardsfolder/c/corrupted_grafstone.txt
index bb1195d4d2d..9ea163debe5 100644
--- a/forge-gui/res/cardsfolder/c/corrupted_grafstone.txt
+++ b/forge-gui/res/cardsfolder/c/corrupted_grafstone.txt
@@ -2,7 +2,7 @@ Name:Corrupted Grafstone
 ManaCost:2
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Defined.ValidGraveyard Card.YouOwn | ReflectProperty$ Is | SpellDescription$ Choose a color of a card in your graveyard. Add one mana of that color to your mana pool.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Defined.ValidGraveyard Card.YouOwn | ReflectProperty$ Is | SpellDescription$ Choose a color of a card in your graveyard. Add one mana of that color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/corrupted_grafstone.jpg
-Oracle:Corrupted Grafstone enters the battlefield tapped.\n{T}: Choose a color of a card in your graveyard. Add one mana of that color to your mana pool.
+Oracle:Corrupted Grafstone enters the battlefield tapped.\n{T}: Choose a color of a card in your graveyard. Add one mana of that color.
diff --git a/forge-gui/res/cardsfolder/c/cradle_of_the_accursed.txt b/forge-gui/res/cardsfolder/c/cradle_of_the_accursed.txt
index 6f34cbabd49..e7faa3db716 100644
--- a/forge-gui/res/cardsfolder/c/cradle_of_the_accursed.txt
+++ b/forge-gui/res/cardsfolder/c/cradle_of_the_accursed.txt
@@ -1,8 +1,8 @@
 Name:Cradle of the Accursed
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Token | Cost$ 3 T Sac<1/CARDNAME> | SorcerySpeed$ True | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie AKH | SpellDescription$ Create a 2/2 black Zombie creature token. Activate this ability only any time you could cast a sorcery.
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cradle_of_the_accursed.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{3}, {T}, Sacrifice Cradle of the Accursed: Create a 2/2 black Zombie creature token. Activate this ability only any time you could cast a sorcery.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{3}, {T}, Sacrifice Cradle of the Accursed: Create a 2/2 black Zombie creature token. Activate this ability only any time you could cast a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/creeping_tar_pit.txt b/forge-gui/res/cardsfolder/c/creeping_tar_pit.txt
index 77f7d899e3e..58b41fca09b 100644
--- a/forge-gui/res/cardsfolder/c/creeping_tar_pit.txt
+++ b/forge-gui/res/cardsfolder/c/creeping_tar_pit.txt
@@ -2,8 +2,8 @@ Name:Creeping Tar Pit
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Animate | Cost$ 1 U B | Defined$ Self | Power$ 3 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Blue,Black | HiddenKeywords$ Unblockable | SpellDescription$ CARDNAME becomes a 3/2 blue and black Elemental creature until end of turn and can't be blocked this turn. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/creeping_tar_pit.jpg
-Oracle:Creeping Tar Pit enters the battlefield tapped.\n{T}: Add {U} or {B} to your mana pool.\n{1}{U}{B}: Creeping Tar Pit becomes a 3/2 blue and black Elemental creature until end of turn and can't be blocked this turn. It's still a land.
+Oracle:Creeping Tar Pit enters the battlefield tapped.\n{T}: Add {U} or {B}.\n{1}{U}{B}: Creeping Tar Pit becomes a 3/2 blue and black Elemental creature until end of turn and can't be blocked this turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/c/crosiss_attendant.txt b/forge-gui/res/cardsfolder/c/crosiss_attendant.txt
index 341f9b05593..d8a10127bb6 100644
--- a/forge-gui/res/cardsfolder/c/crosiss_attendant.txt
+++ b/forge-gui/res/cardsfolder/c/crosiss_attendant.txt
@@ -2,7 +2,7 @@ Name:Crosis's Attendant
 ManaCost:5
 Types:Artifact Creature Golem
 PT:3/3
-A:AB$ Mana | Cost$ 1 Sac<1/CARDNAME> | Produced$ U B R | SpellDescription$ Add {U}{B}{R} to your mana pool.
+A:AB$ Mana | Cost$ 1 Sac<1/CARDNAME> | Produced$ U B R | SpellDescription$ Add {U}{B}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crosiss_attendant.jpg
-Oracle:{1}, Sacrifice Crosis's Attendant: Add {U}{B}{R} to your mana pool.
+Oracle:{1}, Sacrifice Crosis's Attendant: Add {U}{B}{R}.
diff --git a/forge-gui/res/cardsfolder/c/crosiss_catacombs.txt b/forge-gui/res/cardsfolder/c/crosiss_catacombs.txt
index fbe77a6241f..71ba43935c1 100644
--- a/forge-gui/res/cardsfolder/c/crosiss_catacombs.txt
+++ b/forge-gui/res/cardsfolder/c/crosiss_catacombs.txt
@@ -1,11 +1,11 @@
 Name:Crosis's Catacombs
 ManaCost:no cost
 Types:Land Lair
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You
 SVar:NeedsToPlay:Land.nonLair+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crosiss_catacombs.jpg
-Oracle:When Crosis's Catacombs enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {U}, {B}, or {R} to your mana pool.
+Oracle:When Crosis's Catacombs enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {U}, {B}, or {R}.
diff --git a/forge-gui/res/cardsfolder/c/crucible_of_the_spirit_dragon.txt b/forge-gui/res/cardsfolder/c/crucible_of_the_spirit_dragon.txt
index 2b1ad6672c2..1bb2d0980a6 100644
--- a/forge-gui/res/cardsfolder/c/crucible_of_the_spirit_dragon.txt
+++ b/forge-gui/res/cardsfolder/c/crucible_of_the_spirit_dragon.txt
@@ -1,10 +1,10 @@
 Name:Crucible of the Spirit Dragon
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ Combo W U B R G | Amount$ ChosenX | RestrictValid$ Card.Dragon,Activated.Dragon | CostDesc$ {T}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of colors to your mana pool. Spend this mana only to cast Dragon spells or activate abilities of Dragons.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ Combo W U B R G | Amount$ ChosenX | RestrictValid$ Card.Dragon,Activated.Dragon | CostDesc$ {T}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of colors. Spend this mana only to cast Dragon spells or activate abilities of Dragons.
 SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crucible_of_the_spirit_dragon.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Put a storage counter on Crucible of the Spirit Dragon.\n{T}, Remove X storage counters from Crucible of the Spirit Dragon: Add X mana in any combination of colors to your mana pool. Spend this mana only to cast Dragon spells or activate abilities of Dragons.
+Oracle:{T}: Add {C}.\n{1}, {T}: Put a storage counter on Crucible of the Spirit Dragon.\n{T}, Remove X storage counters from Crucible of the Spirit Dragon: Add X mana in any combination of colors. Spend this mana only to cast Dragon spells or activate abilities of Dragons.
diff --git a/forge-gui/res/cardsfolder/c/crumbling_necropolis.txt b/forge-gui/res/cardsfolder/c/crumbling_necropolis.txt
index 705d57e88c4..f5af75cdeb8 100644
--- a/forge-gui/res/cardsfolder/c/crumbling_necropolis.txt
+++ b/forge-gui/res/cardsfolder/c/crumbling_necropolis.txt
@@ -2,8 +2,8 @@ Name:Crumbling Necropolis
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crumbling_necropolis.jpg
-Oracle:Crumbling Necropolis enters the battlefield tapped.\n{T}: Add {U}, {B}, or {R} to your mana pool.
+Oracle:Crumbling Necropolis enters the battlefield tapped.\n{T}: Add {U}, {B}, or {R}.
diff --git a/forge-gui/res/cardsfolder/c/crumbling_vestige.txt b/forge-gui/res/cardsfolder/c/crumbling_vestige.txt
index fa089a4c010..e06aa95858c 100644
--- a/forge-gui/res/cardsfolder/c/crumbling_vestige.txt
+++ b/forge-gui/res/cardsfolder/c/crumbling_vestige.txt
@@ -2,9 +2,9 @@ Name:Crumbling Vestige
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add one mana of any color to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add one mana of any color.
 SVar:TrigMana:DB$ Mana | Produced$ Any
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crumbling_vestige.jpg
-Oracle:Crumbling Vestige enters the battlefield tapped.\nWhen Crumbling Vestige enters the battlefield, add one mana of any color to your mana pool.\n{T}: Add {C} to your mana pool. ({C} represents colorless mana.)
+Oracle:Crumbling Vestige enters the battlefield tapped.\nWhen Crumbling Vestige enters the battlefield, add one mana of any color.\n{T}: Add {C}. ({C} represents colorless mana.)
diff --git a/forge-gui/res/cardsfolder/c/crypt_ghast.txt b/forge-gui/res/cardsfolder/c/crypt_ghast.txt
index 13db9ef35e8..2ec4975bfc3 100644
--- a/forge-gui/res/cardsfolder/c/crypt_ghast.txt
+++ b/forge-gui/res/cardsfolder/c/crypt_ghast.txt
@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Spirit
 PT:2/2
 K:Extort
-T:Mode$ TapsForMana | ValidCard$ Swamp.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a Swamp for mana, add {B} to your mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Swamp.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a Swamp for mana, add an additional {B}.
 SVar:TrigMana:DB$Mana | Produced$ B | Amount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crypt_ghast.jpg
-Oracle:Extort (Whenever you cast a spell, you may pay {W/B}. If you do, each opponent loses 1 life and you gain that much life.)\nWhenever you tap a Swamp for mana, add {B} to your mana pool (in addition to the mana the land produces).
+Oracle:Extort (Whenever you cast a spell, you may pay {W/B}. If you do, each opponent loses 1 life and you gain that much life.)\nWhenever you tap a Swamp for mana, add an additional {B}.
diff --git a/forge-gui/res/cardsfolder/c/crypt_of_agadeem.txt b/forge-gui/res/cardsfolder/c/crypt_of_agadeem.txt
index 18b8676b292..2df4db9adac 100644
--- a/forge-gui/res/cardsfolder/c/crypt_of_agadeem.txt
+++ b/forge-gui/res/cardsfolder/c/crypt_of_agadeem.txt
@@ -2,9 +2,9 @@ Name:Crypt of Agadeem
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} to your mana pool for each black creature card in your graveyard.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ 2 T | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} for each black creature card in your graveyard.
 SVar:X:Count$ValidGraveyard Creature.Black+YouCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crypt_of_agadeem.jpg
-Oracle:Crypt of Agadeem enters the battlefield tapped.\n{T}: Add {B} to your mana pool.\n{2}, {T}: Add {B} to your mana pool for each black creature card in your graveyard.
+Oracle:Crypt of Agadeem enters the battlefield tapped.\n{T}: Add {B}.\n{2}, {T}: Add {B} for each black creature card in your graveyard.
diff --git a/forge-gui/res/cardsfolder/c/crypt_of_the_eternals.txt b/forge-gui/res/cardsfolder/c/crypt_of_the_eternals.txt
index c05365c6145..cbd5c01935b 100644
--- a/forge-gui/res/cardsfolder/c/crypt_of_the_eternals.txt
+++ b/forge-gui/res/cardsfolder/c/crypt_of_the_eternals.txt
@@ -3,9 +3,9 @@ ManaCost:no cost
 Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ 1 T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ 1 T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crypt_of_the_eternals.jpg
-Oracle:When Crypt of the Eternals enters the battlefield, you gain 1 life.\n{T}: Add {C} to your mana pool.\n{1}, {T}: Add {U}, {B}, or {R} to your mana pool.
\ No newline at end of file
+Oracle:When Crypt of the Eternals enters the battlefield, you gain 1 life.\n{T}: Add {C}.\n{1}, {T}: Add {U}, {B}, or {R}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/cryptolith_fragment_aurora_of_emrakul.txt b/forge-gui/res/cardsfolder/c/cryptolith_fragment_aurora_of_emrakul.txt
index 8920f2718e3..b82b45a6229 100644
--- a/forge-gui/res/cardsfolder/c/cryptolith_fragment_aurora_of_emrakul.txt
+++ b/forge-gui/res/cardsfolder/c/cryptolith_fragment_aurora_of_emrakul.txt
@@ -2,14 +2,14 @@ Name:Cryptolith Fragment
 ManaCost:3
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBPain | SpellDescription$ Add one mana of any color to your mana pool. Each player loses 1 life.
+A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBPain | SpellDescription$ Add one mana of any color. Each player loses 1 life.
 SVar:DBPain:DB$ LoseLife | LifeAmount$ 1 | Defined$ Player
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ LE10 | Execute$ TrigTransform | TriggerDescription$ At the beginning of your upkeep, if each player has 10 or less life, transform CARDNAME.
 SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform
 SVar:X:PlayerCountPlayers$HighestLifeTotal
 AlternateMode:DoubleFaced
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cryptolith_fragment.jpg
-Oracle:Cryptolith Fragment enters the battlefield tapped.\n{T}: Add one mana of any color to your mana pool. Each player loses 1 life.\nAt the beginning of your upkeep, if each player has 10 or less life, transform Cryptolith Fragment.
+Oracle:Cryptolith Fragment enters the battlefield tapped.\n{T}: Add one mana of any color. Each player loses 1 life.\nAt the beginning of your upkeep, if each player has 10 or less life, transform Cryptolith Fragment.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/c/cryptolith_rite.txt b/forge-gui/res/cardsfolder/c/cryptolith_rite.txt
index f5bdc7a828e..740a4c0218b 100644
--- a/forge-gui/res/cardsfolder/c/cryptolith_rite.txt
+++ b/forge-gui/res/cardsfolder/c/cryptolith_rite.txt
@@ -1,7 +1,7 @@
 Name:Cryptolith Rite
 ManaCost:1 G
 Types:Enchantment
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddAbility$ AnyMana | Description$ Creatures you control have "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddAbility$ AnyMana | Description$ Creatures you control have "{T}: Add one mana of any color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cryptolith_rite.jpg
-Oracle:Creatures you control have "{T}: Add one mana of any color to your mana pool."
+Oracle:Creatures you control have "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/c/crystal_quarry.txt b/forge-gui/res/cardsfolder/c/crystal_quarry.txt
index 885d54a319c..4c016a3b6ac 100644
--- a/forge-gui/res/cardsfolder/c/crystal_quarry.txt
+++ b/forge-gui/res/cardsfolder/c/crystal_quarry.txt
@@ -1,8 +1,8 @@
 Name:Crystal Quarry
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 5 T | Produced$ W U B R G | SpellDescription$ Add {W}{U}{B}{R}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 5 T | Produced$ W U B R G | SpellDescription$ Add {W}{U}{B}{R}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crystal_quarry.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{5}, {T}: Add {W}{U}{B}{R}{G} to your mana pool.
+Oracle:{T}: Add {C}.\n{5}, {T}: Add {W}{U}{B}{R}{G}.
diff --git a/forge-gui/res/cardsfolder/c/crystal_vein.txt b/forge-gui/res/cardsfolder/c/crystal_vein.txt
index 7bba1255d3b..f91ea8209c0 100644
--- a/forge-gui/res/cardsfolder/c/crystal_vein.txt
+++ b/forge-gui/res/cardsfolder/c/crystal_vein.txt
@@ -1,8 +1,8 @@
 Name:Crystal Vein
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crystal_vein.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Sacrifice Crystal Vein: Add {C}{C} to your mana pool.
+Oracle:{T}: Add {C}.\n{T}, Sacrifice Crystal Vein: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/c/crystalline_crawler.txt b/forge-gui/res/cardsfolder/c/crystalline_crawler.txt
index 0e3bbee1eb5..ba532d166fe 100644
--- a/forge-gui/res/cardsfolder/c/crystalline_crawler.txt
+++ b/forge-gui/res/cardsfolder/c/crystalline_crawler.txt
@@ -4,8 +4,8 @@ Types:Artifact Creature Construct
 PT:1/1
 K:etbCounter:P1P1:X:no Condition:Converge — CARDNAME enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.
 SVar:X:Count$Converge
-A:AB$ Mana | Cost$ SubCounter<1/P1P1> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ SubCounter<1/P1P1> | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ PutCounter | Cost$ T | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crystalline_crawler.jpg
-Oracle:Converge — Crystalline Crawler enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.\nRemove a +1/+1 counter from Crystalline Crawler: Add one mana of any color to your mana pool.\n{T}: Put a +1/+1 counter on Crystalline Crawler.
+Oracle:Converge — Crystalline Crawler enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.\nRemove a +1/+1 counter from Crystalline Crawler: Add one mana of any color.\n{T}: Put a +1/+1 counter on Crystalline Crawler.
diff --git a/forge-gui/res/cardsfolder/c/culling_the_weak.txt b/forge-gui/res/cardsfolder/c/culling_the_weak.txt
index 3f1b11497f7..3e552e300cd 100644
--- a/forge-gui/res/cardsfolder/c/culling_the_weak.txt
+++ b/forge-gui/res/cardsfolder/c/culling_the_weak.txt
@@ -1,9 +1,9 @@
 Name:Culling the Weak
 ManaCost:B
 Types:Instant
-A:SP$ Mana | Cost$ B Sac<1/Creature> | Produced$ B | Amount$ 4 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {B}{B}{B}{B} to your mana pool.
+A:SP$ Mana | Cost$ B Sac<1/Creature> | Produced$ B | Amount$ 4 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {B}{B}{B}{B}.
 SVar:AIPreference:SacCost$Creature.cmcLE2
 #TODO: Improve the mana ritual AI such that it does not "misfire" from time to time, and only then remove RemAIDeck here, because otherwise sometimes the AI will just sac the creature and not cast anything.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/culling_the_weak.jpg
-Oracle:As an additional cost to cast Culling the Weak, sacrifice a creature.\nAdd {B}{B}{B}{B} to your mana pool.
+Oracle:As an additional cost to cast Culling the Weak, sacrifice a creature.\nAdd {B}{B}{B}{B}.
diff --git a/forge-gui/res/cardsfolder/c/cultivator_drone.txt b/forge-gui/res/cardsfolder/c/cultivator_drone.txt
index 291237ac99b..c7230eb7531 100644
--- a/forge-gui/res/cardsfolder/c/cultivator_drone.txt
+++ b/forge-gui/res/cardsfolder/c/cultivator_drone.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Eldrazi Drone
 PT:2/3
 K:Devoid
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 1 | RestrictValid$ Card.Colorless,Activated.Permanent+Colorless,CostContainsC | SpellDescription$ Add {C} to your mana pool. Spend this mana only to cast a colorless spell, activate an ability of a colorless permanent, or pay a cost that contains {C}. ({C} represents colorless mana.)
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 1 | RestrictValid$ Card.Colorless,Activated.Permanent+Colorless,CostContainsC | SpellDescription$ Add {C}. Spend this mana only to cast a colorless spell, activate an ability of a colorless permanent, or pay a cost that contains {C}. ({C} represents colorless mana.)
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cultivator_drone.jpg
-Oracle:Devoid (This card has no color.)\n{T}: Add {C} to your mana pool. Spend this mana only to cast a colorless spell, activate an ability of a colorless permanent, or pay a cost that contains {C}. ({C} represents colorless mana.)
+Oracle:Devoid (This card has no color.)\n{T}: Add {C}. Spend this mana only to cast a colorless spell, activate an ability of a colorless permanent, or pay a cost that contains {C}. ({C} represents colorless mana.)
diff --git a/forge-gui/res/cardsfolder/c/cultivators_caravan.txt b/forge-gui/res/cardsfolder/c/cultivators_caravan.txt
index 556cfe6023b..85f63afd159 100644
--- a/forge-gui/res/cardsfolder/c/cultivators_caravan.txt
+++ b/forge-gui/res/cardsfolder/c/cultivators_caravan.txt
@@ -2,7 +2,7 @@ Name:Cultivator's Caravan
 ManaCost:3
 Types:Artifact Vehicle
 PT:5/5
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 K:Crew:3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cultivators_caravan.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.\nCrew 3 (Tap any number of creatures you control with total power 3 or more: This vehicle becomes an artifact creature until end of turn.)
+Oracle:{T}: Add one mana of any color.\nCrew 3 (Tap any number of creatures you control with total power 3 or more: This vehicle becomes an artifact creature until end of turn.)
diff --git a/forge-gui/res/cardsfolder/c/curious_homunculus_voracious_reader.txt b/forge-gui/res/cardsfolder/c/curious_homunculus_voracious_reader.txt
index ce9d6f3531a..8919748a63a 100644
--- a/forge-gui/res/cardsfolder/c/curious_homunculus_voracious_reader.txt
+++ b/forge-gui/res/cardsfolder/c/curious_homunculus_voracious_reader.txt
@@ -2,13 +2,13 @@ Name:Curious Homunculus
 ManaCost:1 U
 Types:Creature Homunculus
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ Instant,Sorcery | SpellDescription$ Add {C} to your mana pool. Spend this mana only to cast an instant or sorcery spell.
+A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ Instant,Sorcery | SpellDescription$ Add {C}. Spend this mana only to cast an instant or sorcery spell.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Instant.YouOwn,Sorcery.YouOwn | PresentZone$ Graveyard | PresentCompare$ GE3 | Execute$ TrigTransform | TriggerDescription$ At the beginning of your upkeep, if there are three or more instant and/or sorcery cards in your graveyard, transform CARDNAME.
 SVar:TrigTransform:DB$SetState | Defined$ Self | Mode$ Transform
 AlternateMode:DoubleFaced
 DeckHints:Type$Instant|Sorcery & Ability$Graveyard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curious_homunculus.jpg
-Oracle:{T}: Add {C} to your mana pool. Spend this mana only to cast an instant or sorcery spell.\nAt the beginning of your upkeep, if there are three or more instant and/or sorcery cards in your graveyard, transform Curious Homunculus.
+Oracle:{T}: Add {C}. Spend this mana only to cast an instant or sorcery spell.\nAt the beginning of your upkeep, if there are three or more instant and/or sorcery cards in your graveyard, transform Curious Homunculus.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/c/curse_of_opulence.txt b/forge-gui/res/cardsfolder/c/curse_of_opulence.txt
index d684bd0ca0b..0720a65d58e 100644
--- a/forge-gui/res/cardsfolder/c/curse_of_opulence.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_opulence.txt
@@ -3,9 +3,9 @@ ManaCost:R
 Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | Cost$ R | ValidTgts$ Player | AILogic$ Curse
-T:Mode$ AttackersDeclared | ValidCard$ Creature | AttackedTarget$ Player.EnchantedBy | Execute$ TrigRepeat | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted player is attacked, create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color to your mana pool." Each opponent attacking that player does the same.
+T:Mode$ AttackersDeclared | ValidCard$ Creature | AttackedTarget$ Player.EnchantedBy | Execute$ TrigRepeat | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted player is attacked, create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color." Each opponent attacking that player does the same.
 SVar:TrigRepeat:DB$ RepeatEach | RepeatPlayers$ TriggeredAttackingPlayerAndYou | RepeatSubAbility$ TrigToken
 SVar:TrigToken:DB$ Token | TokenName$ Gold | TokenTypes$ Artifact | TokenColors$ Colorless | TokenOwner$ Player.IsRemembered | TokenAmount$ 1 | TokenImage$ c gold C17 | TokenAbilities$ ABMana | References$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_vitality.jpg
-Oracle:Enchant player\nWhenever enchanted player is attacked, create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color to your mana pool." Each opponent attacking that player does the same.
+Oracle:Enchant player\nWhenever enchanted player is attacked, create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color." Each opponent attacking that player does the same.
diff --git a/forge-gui/res/cardsfolder/d/dakmor_salvage.txt b/forge-gui/res/cardsfolder/d/dakmor_salvage.txt
index fe6861c4e39..144ca9731d1 100644
--- a/forge-gui/res/cardsfolder/d/dakmor_salvage.txt
+++ b/forge-gui/res/cardsfolder/d/dakmor_salvage.txt
@@ -2,8 +2,8 @@ Name:Dakmor Salvage
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 K:Dredge 2
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dakmor_salvage.jpg
-Oracle:Dakmor Salvage enters the battlefield tapped.\n{T}: Add {B} to your mana pool.\nDredge 2 (If you would draw a card, instead you may put exactly two cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)
+Oracle:Dakmor Salvage enters the battlefield tapped.\n{T}: Add {B}.\nDredge 2 (If you would draw a card, instead you may put exactly two cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)
diff --git a/forge-gui/res/cardsfolder/d/darigaazs_attendant.txt b/forge-gui/res/cardsfolder/d/darigaazs_attendant.txt
index 5f5ecb5e75f..dd28cc404d8 100644
--- a/forge-gui/res/cardsfolder/d/darigaazs_attendant.txt
+++ b/forge-gui/res/cardsfolder/d/darigaazs_attendant.txt
@@ -2,7 +2,7 @@ Name:Darigaaz's Attendant
 ManaCost:5
 Types:Artifact Creature Golem
 PT:3/3
-A:AB$ Mana | Cost$ 1 Sac<1/CARDNAME> | Produced$ B R G | SpellDescription$ Add {B}{R}{G} to your mana pool.
+A:AB$ Mana | Cost$ 1 Sac<1/CARDNAME> | Produced$ B R G | SpellDescription$ Add {B}{R}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darigaazs_attendant.jpg
-Oracle:{1}, Sacrifice Darigaaz's Attendant: Add {B}{R}{G} to your mana pool.
+Oracle:{1}, Sacrifice Darigaaz's Attendant: Add {B}{R}{G}.
diff --git a/forge-gui/res/cardsfolder/d/darigaazs_caldera.txt b/forge-gui/res/cardsfolder/d/darigaazs_caldera.txt
index 579e701e530..1f0d0390a4c 100644
--- a/forge-gui/res/cardsfolder/d/darigaazs_caldera.txt
+++ b/forge-gui/res/cardsfolder/d/darigaazs_caldera.txt
@@ -1,11 +1,11 @@
 Name:Darigaaz's Caldera
 ManaCost:no cost
 Types:Land Lair
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You
 SVar:NeedsToPlay:Land.nonLair+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darigaazs_caldera.jpg
-Oracle:When Darigaaz's Caldera enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {B}, {R}, or {G} to your mana pool.
+Oracle:When Darigaaz's Caldera enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {B}, {R}, or {G}.
diff --git a/forge-gui/res/cardsfolder/d/dark_petition.txt b/forge-gui/res/cardsfolder/d/dark_petition.txt
index 17758321bfa..c8e8dab79cf 100644
--- a/forge-gui/res/cardsfolder/d/dark_petition.txt
+++ b/forge-gui/res/cardsfolder/d/dark_petition.txt
@@ -1,10 +1,10 @@
 Name:Dark Petition
 ManaCost:3 B B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 3 B B | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SubAbility$ DBMana | SpellDescription$ Search your library for a card and put that card into your hand. Then shuffle your library. Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B} to your mana pool.
+A:SP$ ChangeZone | Cost$ 3 B B | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SubAbility$ DBMana | SpellDescription$ Search your library for a card and put that card into your hand. Then shuffle your library. Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B}.
 SVar:DBMana:DB$ Mana | ConditionCheckSVar$ X | ConditionSVarCompare$ GE2 | Produced$ B | Amount$ 3
 SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
 #TODO: Improve the tutoring logic for the AI. Currently will generally look for the most expensive castable thing in the library (which can, of course, be used to advantage in properly constructed AI decks).
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dark_petition.jpg
-Oracle:Search your library for a card and put that card into your hand. Then shuffle your library.\nSpell mastery — If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B} to your mana pool.
\ No newline at end of file
+Oracle:Search your library for a card and put that card into your hand. Then shuffle your library.\nSpell mastery — If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/dark_ritual.txt b/forge-gui/res/cardsfolder/d/dark_ritual.txt
index 03d9c2160a0..37bd8b77aa9 100644
--- a/forge-gui/res/cardsfolder/d/dark_ritual.txt
+++ b/forge-gui/res/cardsfolder/d/dark_ritual.txt
@@ -1,6 +1,6 @@
 Name:Dark Ritual
 ManaCost:B
 Types:Instant
-A:SP$ Mana | Cost$ B | Produced$ B | Amount$ 3 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {B}{B}{B} to your mana pool.
+A:SP$ Mana | Cost$ B | Produced$ B | Amount$ 3 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {B}{B}{B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dark_ritual.jpg
-Oracle:Add {B}{B}{B} to your mana pool.
+Oracle:Add {B}{B}{B}.
diff --git a/forge-gui/res/cardsfolder/d/darkslick_shores.txt b/forge-gui/res/cardsfolder/d/darkslick_shores.txt
index 2a05b17ff42..8b9cad7a559 100644
--- a/forge-gui/res/cardsfolder/d/darkslick_shores.txt
+++ b/forge-gui/res/cardsfolder/d/darkslick_shores.txt
@@ -5,7 +5,7 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ GT2 | References$ ETBCheckSVar2 | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar2:Count$LastStateBattlefield Land.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darkslick_shores.jpg
-Oracle:Darkslick Shores enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:Darkslick Shores enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/d/darksteel_ingot.txt b/forge-gui/res/cardsfolder/d/darksteel_ingot.txt
index eb82fa46f40..04be2250325 100644
--- a/forge-gui/res/cardsfolder/d/darksteel_ingot.txt
+++ b/forge-gui/res/cardsfolder/d/darksteel_ingot.txt
@@ -1,7 +1,7 @@
 Name:Darksteel Ingot
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 K:Indestructible
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darksteel_ingot.jpg
-Oracle:Indestructible\n{T}: Add one mana of any color to your mana pool.
+Oracle:Indestructible\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/d/darkwater_catacombs.txt b/forge-gui/res/cardsfolder/d/darkwater_catacombs.txt
index 24c7c546231..d07ff8acb2f 100644
--- a/forge-gui/res/cardsfolder/d/darkwater_catacombs.txt
+++ b/forge-gui/res/cardsfolder/d/darkwater_catacombs.txt
@@ -1,7 +1,7 @@
 Name:Darkwater Catacombs
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ 1 T | Produced$ U B | SpellDescription$ Add {U}{B} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ U B | SpellDescription$ Add {U}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darkwater_catacombs.jpg
-Oracle:{1}, {T}: Add {U}{B} to your mana pool.
+Oracle:{1}, {T}: Add {U}{B}.
diff --git a/forge-gui/res/cardsfolder/d/darkwater_egg.txt b/forge-gui/res/cardsfolder/d/darkwater_egg.txt
index 08c49f5bd1d..982085c1c53 100644
--- a/forge-gui/res/cardsfolder/d/darkwater_egg.txt
+++ b/forge-gui/res/cardsfolder/d/darkwater_egg.txt
@@ -1,9 +1,9 @@
 Name:Darkwater Egg
 ManaCost:1
 Types:Artifact
-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.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ U B | SubAbility$ DBDraw | SpellDescription$ Add {U}{B}. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darkwater_egg.jpg
-Oracle:{2}, {T}, Sacrifice Darkwater Egg: Add {U}{B} to your mana pool. Draw a card.
+Oracle:{2}, {T}, Sacrifice Darkwater Egg: Add {U}{B}. Draw a card.
diff --git a/forge-gui/res/cardsfolder/d/daru_encampment.txt b/forge-gui/res/cardsfolder/d/daru_encampment.txt
index 4c8d6ea04a9..3f0588ea2d4 100644
--- a/forge-gui/res/cardsfolder/d/daru_encampment.txt
+++ b/forge-gui/res/cardsfolder/d/daru_encampment.txt
@@ -1,7 +1,7 @@
 Name:Daru Encampment
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ W T | ValidTgts$ Creature.Soldier | TgtPrompt$ Select target Soldier creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target Soldier creature gets +1/+1 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/daru_encampment.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{W}, {T}: Target Soldier creature gets +1/+1 until end of turn.
+Oracle:{T}: Add {C}.\n{W}, {T}: Target Soldier creature gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/d/dawns_reflection.txt b/forge-gui/res/cardsfolder/d/dawns_reflection.txt
index d57e013a6c2..e731d1bb252 100644
--- a/forge-gui/res/cardsfolder/d/dawns_reflection.txt
+++ b/forge-gui/res/cardsfolder/d/dawns_reflection.txt
@@ -3,8 +3,8 @@ ManaCost:3 G
 Types:Enchantment Aura
 K:Enchant Land
 A:SP$ Attach | Cost$ 3 G | ValidTgts$ Land | TgtPrompt$ Select target land | AILogic$ Pump
-T:Mode$ TapsForMana | ValidCard$ Card.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds an additional two mana in any combination of colors.
 SVar:TrigMana:DB$ Mana | Produced$ Combo Any | Amount$ 2
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dawns_reflection.jpg
-Oracle:Enchant land\nWhenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to his or her mana pool (in addition to the mana the land produces).
+Oracle:Enchant land\nWhenever enchanted land is tapped for mana, its controller adds an additional two mana in any combination of colors.
diff --git a/forge-gui/res/cardsfolder/d/deadeye_plunderers.txt b/forge-gui/res/cardsfolder/d/deadeye_plunderers.txt
index 082587799fd..e808ce2ba68 100644
--- a/forge-gui/res/cardsfolder/d/deadeye_plunderers.txt
+++ b/forge-gui/res/cardsfolder/d/deadeye_plunderers.txt
@@ -3,11 +3,11 @@ ManaCost:3 U B
 Types:Creature Human Pirate
 PT:3/3
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ CARDNAME gets +1/+1 for each artifact you control.
-A:AB$ Token | Cost$ 2 U B | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3 | SpellDescription$ Create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Token | Cost$ 2 U B | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3 | SpellDescription$ Create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:BuffedBy:Artifact
 DeckHas:Ability$Token
 DeckHints:Type$Artifact
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deadeye_plunderers.jpg
-Oracle:Deadeye Plunderers gets +1/+1 for each artifact you control.\n{2}{U}{B}: Create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:Deadeye Plunderers gets +1/+1 for each artifact you control.\n{2}{U}{B}: Create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/d/deathcap_cultivator.txt b/forge-gui/res/cardsfolder/d/deathcap_cultivator.txt
index 12c888f9022..5c89f35ba51 100644
--- a/forge-gui/res/cardsfolder/d/deathcap_cultivator.txt
+++ b/forge-gui/res/cardsfolder/d/deathcap_cultivator.txt
@@ -2,10 +2,10 @@ Name:Deathcap Cultivator
 ManaCost:1 G
 Types:Creature Human Druid
 PT:2/1
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool. 
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Deathtouch | Condition$ Delirium | Description$ Delirium — CARDNAME has deathtouch as long as there are four or more card types among cards in your graveyard.
 DeckHints:Ability$Graveyard & Ability$Discard
 DeckHas:Ability$Delirium
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deathcap_cultivator.jpg
-Oracle:{T}: Add {B} or {G} to your mana pool.\nDelirium — Deathcap Cultivator has deathtouch as long as there are four or more card types among cards in your graveyard.
+Oracle:{T}: Add {B} or {G}.\nDelirium — Deathcap Cultivator has deathtouch as long as there are four or more card types among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/d/deathrite_shaman.txt b/forge-gui/res/cardsfolder/d/deathrite_shaman.txt
index e242cf8aeb8..eddc2043632 100644
--- a/forge-gui/res/cardsfolder/d/deathrite_shaman.txt
+++ b/forge-gui/res/cardsfolder/d/deathrite_shaman.txt
@@ -2,11 +2,11 @@ Name:Deathrite Shaman
 ManaCost:BG
 Types:Creature Elf Shaman
 PT:1/2
-A:AB$ ChangeZone | Cost$ T | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Land | TgtPrompt$ Select target land card in a graveyard | SubAbility$ DBMana | SpellDescription$ Exile target land card from a graveyard. Add one mana of any color to your mana pool.
+A:AB$ ChangeZone | Cost$ T | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Land | TgtPrompt$ Select target land card in a graveyard | SubAbility$ DBMana | SpellDescription$ Exile target land card from a graveyard. Add one mana of any color.
 SVar:DBMana:DB$ Mana | Produced$ Any | Amount$ 1 | AILogic$ MostProminentInComputerHand
 A:AB$ ChangeZone | Cost$ B T | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Instant,Sorcery | TgtPrompt$ Select target instant or sorcery card in a graveyard | SubAbility$ DBLoseLife | AITgtOwnCards$ True | SpellDescription$ Exile target instant or sorcery card from a graveyard. Each opponent loses 2 life.
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2
 A:AB$ ChangeZone | Cost$ G T | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Creature | TgtPrompt$ Select target creature card in a graveyard | SubAbility$ DBGainLife | AITgtOwnCards$ True | SpellDescription$ Exile target creature card from a graveyard. You gain 2 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deathrite_shaman.jpg
-Oracle:{T}: Exile target land card from a graveyard. Add one mana of any color to your mana pool.\n{B}, {T}: Exile target instant or sorcery card from a graveyard. Each opponent loses 2 life.\n{G}, {T}: Exile target creature card from a graveyard. You gain 2 life.
+Oracle:{T}: Exile target land card from a graveyard. Add one mana of any color.\n{B}, {T}: Exile target instant or sorcery card from a graveyard. Each opponent loses 2 life.\n{G}, {T}: Exile target creature card from a graveyard. You gain 2 life.
diff --git a/forge-gui/res/cardsfolder/d/deconstruct.txt b/forge-gui/res/cardsfolder/d/deconstruct.txt
index a513dee844c..a60a80ab090 100644
--- a/forge-gui/res/cardsfolder/d/deconstruct.txt
+++ b/forge-gui/res/cardsfolder/d/deconstruct.txt
@@ -1,7 +1,7 @@
 Name:Deconstruct
 ManaCost:2 G
 Types:Sorcery
-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.
+A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBMana | SpellDescription$ Destroy target artifact. Add {G}{G}{G}.
 SVar:DBMana:DB$Mana | Produced$ G | Amount$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deconstruct.jpg
-Oracle:Destroy target artifact. Add {G}{G}{G} to your mana pool.
+Oracle:Destroy target artifact. Add {G}{G}{G}.
diff --git a/forge-gui/res/cardsfolder/d/depths_of_desire.txt b/forge-gui/res/cardsfolder/d/depths_of_desire.txt
index 666bfe09ab8..a5f3c8c98e5 100644
--- a/forge-gui/res/cardsfolder/d/depths_of_desire.txt
+++ b/forge-gui/res/cardsfolder/d/depths_of_desire.txt
@@ -1,8 +1,8 @@
 Name:Depths of Desire
 ManaCost:2 U
 Types:Instant
-A:SP$ ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBTreasure | SpellDescription$ Return target creature to its owner's hand. Create a colorless Treasure token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+A:SP$ ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBTreasure | SpellDescription$ Return target creature to its owner's hand. Create a colorless Treasure token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:DBTreasure:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/depths_of_desire.jpg
-Oracle:Return target creature to its owner's hand. Create a colorless Treasure token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
\ No newline at end of file
+Oracle:Return target creature to its owner's hand. Create a colorless Treasure token with "{T}, Sacrifice this artifact: Add one mana of any color."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/deranged_assistant.txt b/forge-gui/res/cardsfolder/d/deranged_assistant.txt
index 18c297a3a2e..48fe122a2dd 100644
--- a/forge-gui/res/cardsfolder/d/deranged_assistant.txt
+++ b/forge-gui/res/cardsfolder/d/deranged_assistant.txt
@@ -2,6 +2,6 @@ Name:Deranged Assistant
 ManaCost:1 U
 Types:Creature Human Wizard
 PT:1/1
-A:AB$ Mana | Cost$ T Mill<1> | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T Mill<1> | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deranged_assistant.jpg
-Oracle:{T}, Put the top card of your library into your graveyard: Add {C} to your mana pool.
+Oracle:{T}, Put the top card of your library into your graveyard: Add {C}.
diff --git a/forge-gui/res/cardsfolder/d/desert.txt b/forge-gui/res/cardsfolder/d/desert.txt
index 0cd393a9f77..e6d530cb051 100644
--- a/forge-gui/res/cardsfolder/d/desert.txt
+++ b/forge-gui/res/cardsfolder/d/desert.txt
@@ -1,7 +1,7 @@
 Name:Desert
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking Creature | NumDmg$ 1 | ActivationPhases$ EndCombat | SpellDescription$ Desert deals 1 damage to target attacking creature. Activate this ability only during the end of combat step.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desert.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Desert deals 1 damage to target attacking creature. Activate this ability only during the end of combat step.
+Oracle:{T}: Add {C}.\n{T}: Desert deals 1 damage to target attacking creature. Activate this ability only during the end of combat step.
diff --git a/forge-gui/res/cardsfolder/d/desert_of_the_fervent.txt b/forge-gui/res/cardsfolder/d/desert_of_the_fervent.txt
index 5f1ca53e332..a6bcf4f09d0 100644
--- a/forge-gui/res/cardsfolder/d/desert_of_the_fervent.txt
+++ b/forge-gui/res/cardsfolder/d/desert_of_the_fervent.txt
@@ -2,7 +2,7 @@ Name:Desert of the Fervent
 ManaCost:no cost
 Types:Land Desert
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 K:Cycling:1 R
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desert_of_the_fervent.jpg
-Oracle:Desert of the Fervent enters the battlefield tapped.\n{T}: Add {R} to your mana pool.\nCycling {1}{R} ({1}{R}, Discard this card: Draw a card.)
+Oracle:Desert of the Fervent enters the battlefield tapped.\n{T}: Add {R}.\nCycling {1}{R} ({1}{R}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/d/desert_of_the_glorified.txt b/forge-gui/res/cardsfolder/d/desert_of_the_glorified.txt
index af3f863983e..758b23515e5 100644
--- a/forge-gui/res/cardsfolder/d/desert_of_the_glorified.txt
+++ b/forge-gui/res/cardsfolder/d/desert_of_the_glorified.txt
@@ -2,7 +2,7 @@ Name:Desert of the Glorified
 ManaCost:no cost
 Types:Land Desert
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 K:Cycling:1 B
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desert_of_the_glorified.jpg
-Oracle:Desert of the Glorified enters the battlefield tapped.\n{T}: Add {B} to your mana pool.\nCycling {1}{B} ({1}{B}, Discard this card: Draw a card.)
\ No newline at end of file
+Oracle:Desert of the Glorified enters the battlefield tapped.\n{T}: Add {B}.\nCycling {1}{B} ({1}{B}, Discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/desert_of_the_indomitable.txt b/forge-gui/res/cardsfolder/d/desert_of_the_indomitable.txt
index 31fb16717a1..1c6762abd35 100644
--- a/forge-gui/res/cardsfolder/d/desert_of_the_indomitable.txt
+++ b/forge-gui/res/cardsfolder/d/desert_of_the_indomitable.txt
@@ -2,7 +2,7 @@ Name:Desert of the Indomitable
 ManaCost:no cost
 Types:Land Desert
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 K:Cycling:1 G
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desert_of_the_indomitable.jpg
-Oracle:Desert of the Indomitable enters the battlefield tapped.\n{T}: Add {G} to your mana pool.\nCycling {1}{G} ({1}{G}, Discard this card: Draw a card.)
+Oracle:Desert of the Indomitable enters the battlefield tapped.\n{T}: Add {G}.\nCycling {1}{G} ({1}{G}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/d/desert_of_the_mindful.txt b/forge-gui/res/cardsfolder/d/desert_of_the_mindful.txt
index 6391728ae75..0e46e2bc3d2 100644
--- a/forge-gui/res/cardsfolder/d/desert_of_the_mindful.txt
+++ b/forge-gui/res/cardsfolder/d/desert_of_the_mindful.txt
@@ -2,7 +2,7 @@ Name:Desert of the Mindful
 ManaCost:no cost
 Types:Land Desert
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 K:Cycling:1 U
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desert_of_the_mindful.jpg
-Oracle:Desert of the Mindful enters the battlefield tapped.\n{T}: Add {U} to your mana pool.\nCycling {1}{U} ({1}{U}, Discard this card: Draw a card.)
+Oracle:Desert of the Mindful enters the battlefield tapped.\n{T}: Add {U}.\nCycling {1}{U} ({1}{U}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/d/desert_of_the_true.txt b/forge-gui/res/cardsfolder/d/desert_of_the_true.txt
index b89243be955..375c40246dd 100644
--- a/forge-gui/res/cardsfolder/d/desert_of_the_true.txt
+++ b/forge-gui/res/cardsfolder/d/desert_of_the_true.txt
@@ -2,7 +2,7 @@ Name:Desert of the True
 ManaCost:no cost
 Types:Land Desert
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 K:Cycling:1 W
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desert_of_the_true.jpg
-Oracle:Desert of the True enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\nCycling {1}{W} ({1}{W}, Discard this card: Draw a card.)
+Oracle:Desert of the True enters the battlefield tapped.\n{T}: Add {W}.\nCycling {1}{W} ({1}{W}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/d/deserted_temple.txt b/forge-gui/res/cardsfolder/d/deserted_temple.txt
index c81927fbe51..c610f447ca0 100644
--- a/forge-gui/res/cardsfolder/d/deserted_temple.txt
+++ b/forge-gui/res/cardsfolder/d/deserted_temple.txt
@@ -1,7 +1,7 @@
 Name:Deserted Temple
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Untap | Cost$ 1 T | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Untap target land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deserted_temple.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Untap target land.
+Oracle:{T}: Add {C}.\n{1}, {T}: Untap target land.
diff --git a/forge-gui/res/cardsfolder/d/desolate_lighthouse.txt b/forge-gui/res/cardsfolder/d/desolate_lighthouse.txt
index 86df2dc5315..1e727e5af23 100644
--- a/forge-gui/res/cardsfolder/d/desolate_lighthouse.txt
+++ b/forge-gui/res/cardsfolder/d/desolate_lighthouse.txt
@@ -1,9 +1,9 @@
 Name:Desolate Lighthouse
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ 1 U R T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desolate_lighthouse.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{U}{R}, {T}: Draw a card, then discard a card.
+Oracle:{T}: Add {C}.\n{1}{U}{R}, {T}: Draw a card, then discard a card.
diff --git a/forge-gui/res/cardsfolder/d/desperate_ritual.txt b/forge-gui/res/cardsfolder/d/desperate_ritual.txt
index df56915fa75..fb819fe30f8 100644
--- a/forge-gui/res/cardsfolder/d/desperate_ritual.txt
+++ b/forge-gui/res/cardsfolder/d/desperate_ritual.txt
@@ -2,6 +2,6 @@ Name:Desperate Ritual
 ManaCost:1 R
 Types:Instant Arcane
 K:Splice:Arcane:1 R
-A:SP$ Mana | Cost$ 1 R | Produced$ R | Amount$ 3 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R}{R}{R} to your mana pool.
+A:SP$ Mana | Cost$ 1 R | Produced$ R | Amount$ 3 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R}{R}{R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desperate_ritual.jpg
-Oracle:Add {R}{R}{R} to your mana pool.\nSplice onto Arcane {1}{R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+Oracle:Add {R}{R}{R}.\nSplice onto Arcane {1}{R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
diff --git a/forge-gui/res/cardsfolder/d/devoted_druid.txt b/forge-gui/res/cardsfolder/d/devoted_druid.txt
index d627ec17779..79cff2a61ea 100644
--- a/forge-gui/res/cardsfolder/d/devoted_druid.txt
+++ b/forge-gui/res/cardsfolder/d/devoted_druid.txt
@@ -2,8 +2,8 @@ Name:Devoted Druid
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:0/2
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Untap | Cost$ AddCounter<1/M1M1> | SpellDescription$ Untap CARDNAME.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/devoted_druid.jpg
-Oracle:{T}: Add {G} to your mana pool.\nPut a -1/-1 counter on Devoted Druid: Untap Devoted Druid.
+Oracle:{T}: Add {G}.\nPut a -1/-1 counter on Devoted Druid: Untap Devoted Druid.
diff --git a/forge-gui/res/cardsfolder/d/diamond_kaleidoscope.txt b/forge-gui/res/cardsfolder/d/diamond_kaleidoscope.txt
index 5270b09df8c..5568dcb80ff 100644
--- a/forge-gui/res/cardsfolder/d/diamond_kaleidoscope.txt
+++ b/forge-gui/res/cardsfolder/d/diamond_kaleidoscope.txt
@@ -2,6 +2,6 @@ Name:Diamond Kaleidoscope
 ManaCost:4
 Types:Artifact
 A:AB$ Token | Cost$ 3 T | TokenAmount$ 1 | TokenName$ Prism | TokenTypes$ Artifact,Creature,Prism | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | SpellDescription$ Create a 0/1 colorless Prism artifact creature token.
-A:AB$ Mana | Cost$ Sac<1/Prism.token/Prism token> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/Prism.token/Prism token> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/diamond_kaleidoscope.jpg
-Oracle:{3}, {T}: Create a 0/1 colorless Prism artifact creature token.\nSacrifice a Prism token: Add one mana of any color to your mana pool.
+Oracle:{3}, {T}: Create a 0/1 colorless Prism artifact creature token.\nSacrifice a Prism token: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/d/dictate_of_karametra.txt b/forge-gui/res/cardsfolder/d/dictate_of_karametra.txt
index 36e12dd94ce..59cbfac0bff 100644
--- a/forge-gui/res/cardsfolder/d/dictate_of_karametra.txt
+++ b/forge-gui/res/cardsfolder/d/dictate_of_karametra.txt
@@ -2,7 +2,7 @@ Name:Dictate of Karametra
 ManaCost:3 G G
 Types:Enchantment
 K:Flash
-T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
 SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dictate_of_karametra.jpg
-Oracle:Flash\nWhenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+Oracle:Flash\nWhenever a player taps a land for mana, that player adds one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/d/dimir_aqueduct.txt b/forge-gui/res/cardsfolder/d/dimir_aqueduct.txt
index bc482471b52..46d725cb608 100644
--- a/forge-gui/res/cardsfolder/d/dimir_aqueduct.txt
+++ b/forge-gui/res/cardsfolder/d/dimir_aqueduct.txt
@@ -2,9 +2,9 @@ Name:Dimir Aqueduct
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U B | SpellDescription$ Add {U}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U B | SpellDescription$ Add {U}{B}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dimir_aqueduct.jpg
-Oracle:Dimir Aqueduct enters the battlefield tapped.\nWhen Dimir Aqueduct enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {U}{B} to your mana pool.
+Oracle:Dimir Aqueduct enters the battlefield tapped.\nWhen Dimir Aqueduct enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {U}{B}.
diff --git a/forge-gui/res/cardsfolder/d/dimir_cluestone.txt b/forge-gui/res/cardsfolder/d/dimir_cluestone.txt
index 29a5f3d39fd..5ebf4dd5935 100644
--- a/forge-gui/res/cardsfolder/d/dimir_cluestone.txt
+++ b/forge-gui/res/cardsfolder/d/dimir_cluestone.txt
@@ -1,10 +1,10 @@
 Name:Dimir Cluestone
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Draw | Cost$ U B T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Blue|Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dimir_cluestone.jpg
-Oracle:{T}: Add {U} or {B} to your mana pool.\n{U}{B}, {T}, Sacrifice Dimir Cluestone: Draw a card.
+Oracle:{T}: Add {U} or {B}.\n{U}{B}, {T}, Sacrifice Dimir Cluestone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/d/dimir_guildgate.txt b/forge-gui/res/cardsfolder/d/dimir_guildgate.txt
index 1a713e4abff..5b8fa886972 100644
--- a/forge-gui/res/cardsfolder/d/dimir_guildgate.txt
+++ b/forge-gui/res/cardsfolder/d/dimir_guildgate.txt
@@ -2,7 +2,7 @@ Name:Dimir Guildgate
 ManaCost:no cost
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dimir_guildgate.jpg
-Oracle:Dimir Guildgate enters the battlefield tapped.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:Dimir Guildgate enters the battlefield tapped.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/d/dimir_keyrune.txt b/forge-gui/res/cardsfolder/d/dimir_keyrune.txt
index fef27429883..184f6eeb420 100644
--- a/forge-gui/res/cardsfolder/d/dimir_keyrune.txt
+++ b/forge-gui/res/cardsfolder/d/dimir_keyrune.txt
@@ -1,10 +1,10 @@
 Name:Dimir Keyrune
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Animate | Cost$ U B | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Horror | Colors$ Blue,Black | HiddenKeywords$ Unblockable | SpellDescription$ CARDNAME becomes a 2/2 blue and black Horror artifact creature until end of turn and can't be blocked this turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Blue|Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dimir_keyrune.jpg
-Oracle:{T}: Add {U} or {B} to your mana pool.\n{U}{B}: Dimir Keyrune becomes a 2/2 blue and black Horror artifact creature until end of turn and can't be blocked this turn.
+Oracle:{T}: Add {U} or {B}.\n{U}{B}: Dimir Keyrune becomes a 2/2 blue and black Horror artifact creature until end of turn and can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/d/dimir_signet.txt b/forge-gui/res/cardsfolder/d/dimir_signet.txt
index 409c6a8c202..e4ffbe5fce8 100644
--- a/forge-gui/res/cardsfolder/d/dimir_signet.txt
+++ b/forge-gui/res/cardsfolder/d/dimir_signet.txt
@@ -1,7 +1,7 @@
 Name:Dimir Signet
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ U B | SpellDescription$ Add {U}{B} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ U B | SpellDescription$ Add {U}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dimir_signet.jpg
-Oracle:{1}, {T}: Add {U}{B} to your mana pool.
+Oracle:{1}, {T}: Add {U}{B}.
diff --git a/forge-gui/res/cardsfolder/d/dire_fleet_hoarder.txt b/forge-gui/res/cardsfolder/d/dire_fleet_hoarder.txt
index fb3214db2e5..670d9496971 100644
--- a/forge-gui/res/cardsfolder/d/dire_fleet_hoarder.txt
+++ b/forge-gui/res/cardsfolder/d/dire_fleet_hoarder.txt
@@ -2,9 +2,9 @@ Name:Dire Fleet Hoarder
 ManaCost:1 B
 Types:Creature Human Pirate
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | TokenAbilities$ ABMana | References$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dire_fleet_hoarder.jpg
-Oracle:When Dire Fleet Hoarder dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:When Dire Fleet Hoarder dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/d/dismal_backwater.txt b/forge-gui/res/cardsfolder/d/dismal_backwater.txt
index 4a3198f06e5..a500b6b02c1 100644
--- a/forge-gui/res/cardsfolder/d/dismal_backwater.txt
+++ b/forge-gui/res/cardsfolder/d/dismal_backwater.txt
@@ -1,10 +1,10 @@
 Name:Dismal Backwater
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dismal_backwater.jpg
-Oracle:Dismal Backwater enters the battlefield tapped.\nWhen Dismal Backwater enters the battlefield, you gain 1 life.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:Dismal Backwater enters the battlefield tapped.\nWhen Dismal Backwater enters the battlefield, you gain 1 life.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/d/divergent_growth.txt b/forge-gui/res/cardsfolder/d/divergent_growth.txt
index 860c5c2d5fc..08c73d5eafe 100644
--- a/forge-gui/res/cardsfolder/d/divergent_growth.txt
+++ b/forge-gui/res/cardsfolder/d/divergent_growth.txt
@@ -1,8 +1,8 @@
 Name:Divergent Growth
 ManaCost:G
 Types:Instant
-A:SP$ AnimateAll | Cost$ G | ValidCards$ Land.YouCtrl | Abilities$ ABMana | SpellDescription$ Until end of turn, lands you control gain "{T}: Add one mana of any color to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:SP$ AnimateAll | Cost$ G | ValidCards$ Land.YouCtrl | Abilities$ ABMana | SpellDescription$ Until end of turn, lands you control gain "{T}: Add one mana of any color."
+SVar:ABMana:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/divergent_growth.jpg
-Oracle:Until end of turn, lands you control gain "{T}: Add one mana of any color to your mana pool."
+Oracle:Until end of turn, lands you control gain "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/d/dormant_volcano.txt b/forge-gui/res/cardsfolder/d/dormant_volcano.txt
index a961b79d50d..b525a5522a8 100644
--- a/forge-gui/res/cardsfolder/d/dormant_volcano.txt
+++ b/forge-gui/res/cardsfolder/d/dormant_volcano.txt
@@ -2,9 +2,9 @@ Name:Dormant Volcano
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C R | SpellDescription$ Add {C}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C R | SpellDescription$ Add {C}{R}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return an untapped Mountain you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Mountain.untapped/untapped Mountain> | UnlessPayer$ You
 SVar:NeedsToPlay:Mountain.YouCtrl+inZoneBattlefield+untapped
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dormant_volcano.jpg
-Oracle:Dormant Volcano enters the battlefield tapped.\nWhen Dormant Volcano enters the battlefield, sacrifice it unless you return an untapped Mountain you control to its owner's hand.\n{T}: Add {C}{R} to your mana pool.
+Oracle:Dormant Volcano enters the battlefield tapped.\nWhen Dormant Volcano enters the battlefield, sacrifice it unless you return an untapped Mountain you control to its owner's hand.\n{T}: Add {C}{R}.
diff --git a/forge-gui/res/cardsfolder/d/doubling_cube.txt b/forge-gui/res/cardsfolder/d/doubling_cube.txt
index 34122e88617..96e2d1050be 100644
--- a/forge-gui/res/cardsfolder/d/doubling_cube.txt
+++ b/forge-gui/res/cardsfolder/d/doubling_cube.txt
@@ -1,7 +1,7 @@
 Name:Doubling Cube
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 3 T | DoubleManaInPool$ True | ProduceNoOtherMana$ True | SpellDescription$ Double the amount of each type of mana in your mana pool.
+A:AB$ Mana | Cost$ 3 T | DoubleManaInPool$ True | ProduceNoOtherMana$ True | SpellDescription$ Double the amount of each type of unspent mana you have.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/doubling_cube.jpg
-Oracle:{3}, {T}: Double the amount of each type of mana in your mana pool.
+Oracle:{3}, {T}: Double the amount of each type of unspent mana you have.
diff --git a/forge-gui/res/cardsfolder/d/dowsing_dagger_lost_vale.txt b/forge-gui/res/cardsfolder/d/dowsing_dagger_lost_vale.txt
index cc14098e034..c6a951c122c 100644
--- a/forge-gui/res/cardsfolder/d/dowsing_dagger_lost_vale.txt
+++ b/forge-gui/res/cardsfolder/d/dowsing_dagger_lost_vale.txt
@@ -16,6 +16,6 @@ ALTERNATE
 Name:Lost Vale
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 3 | SpellDescription$ Add three mana of any one color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 3 | SpellDescription$ Add three mana of any one color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lost_vale.jpg
-Oracle:(Transforms from Dowsing Dagger.)\n{T}: Add three mana of any one color to your mana pool.
+Oracle:(Transforms from Dowsing Dagger.)\n{T}: Add three mana of any one color.
diff --git a/forge-gui/res/cardsfolder/d/dragonrage.txt b/forge-gui/res/cardsfolder/d/dragonrage.txt
index 0232ac5e3c1..9dac518384f 100644
--- a/forge-gui/res/cardsfolder/d/dragonrage.txt
+++ b/forge-gui/res/cardsfolder/d/dragonrage.txt
@@ -1,10 +1,10 @@
 Name:Dragonrage
 ManaCost:2 R
 Types:Instant
-A:SP$ Mana | Cost$ 2 R | Produced$ R | Amount$ X | References$ X | SubAbility$ DBAnimateAll | SpellDescription$ Add {R} to your mana pool for each attacking creature you control. Until end of turn, attacking creatures you control gain "{R}: This creature gets +1/+0 until end of turn."
+A:SP$ Mana | Cost$ 2 R | Produced$ R | Amount$ X | References$ X | SubAbility$ DBAnimateAll | SpellDescription$ Add {R} for each attacking creature you control. Until end of turn, attacking creatures you control gain "{R}: This creature gets +1/+0 until end of turn."
 SVar:X:Count$Valid Creature.YouCtrl+attacking
 SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.YouCtrl+attacking | Abilities$ DrAbs
 SVar:DrAbs:AB$ Pump | Cost$ R | NumAtt$ 1 | SpellDescription$ This creature gets +1/+0 until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragonrage.jpg
-Oracle:Add {R} to your mana pool for each attacking creature you control. Until end of turn, attacking creatures you control gain "{R}: This creature gets +1/+0 until end of turn."
+Oracle:Add {R} for each attacking creature you control. Until end of turn, attacking creatures you control gain "{R}: This creature gets +1/+0 until end of turn."
diff --git a/forge-gui/res/cardsfolder/d/dragonskull_summit.txt b/forge-gui/res/cardsfolder/d/dragonskull_summit.txt
index 3ba70a6bd8a..9236c084593 100644
--- a/forge-gui/res/cardsfolder/d/dragonskull_summit.txt
+++ b/forge-gui/res/cardsfolder/d/dragonskull_summit.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Swamp.YouCtrl,Mountain.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Swamp or a Mountain.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragonskull_summit.jpg
-Oracle:Dragonskull Summit enters the battlefield tapped unless you control a Swamp or a Mountain.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:Dragonskull Summit enters the battlefield tapped unless you control a Swamp or a Mountain.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/d/drain_power.txt b/forge-gui/res/cardsfolder/d/drain_power.txt
index 7fcbd50fa30..8e739a31876 100644
--- a/forge-gui/res/cardsfolder/d/drain_power.txt
+++ b/forge-gui/res/cardsfolder/d/drain_power.txt
@@ -1,7 +1,7 @@
 Name:Drain Power
 ManaCost:U U
 Types:Sorcery
-A:SP$ ActivateAbility | Cost$ U U | ValidTgts$ Player | Type$ Land | ManaAbility$ True | SubAbility$ DBDrainMana | SpellDescription$ Target player activates a mana ability of each land he or she controls. Then put all mana from that player's mana pool into yours.
+A:SP$ ActivateAbility | Cost$ U U | ValidTgts$ Player | Type$ Land | ManaAbility$ True | SubAbility$ DBDrainMana | SpellDescription$ Target player activates a mana ability of each land he or she controls. Then that player loses all unspent mana and you add the mana lost this way.
 SVar:DBDrainMana:DB$ DrainMana | Defined$ Targeted | DrainMana$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drain_power.jpg
-Oracle:Target player activates a mana ability of each land he or she controls. Then put all mana from that player's mana pool into yours.
+Oracle:Target player activates a mana ability of each land he or she controls. Then that player loses all unspent mana and you add the mana lost this way.
diff --git a/forge-gui/res/cardsfolder/d/drake_skull_cameo.txt b/forge-gui/res/cardsfolder/d/drake_skull_cameo.txt
index 92c1a881b7b..a504ad9d475 100644
--- a/forge-gui/res/cardsfolder/d/drake_skull_cameo.txt
+++ b/forge-gui/res/cardsfolder/d/drake_skull_cameo.txt
@@ -1,9 +1,9 @@
 Name:Drake-Skull Cameo
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Blue|Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drake_skull_cameo.jpg
-Oracle:{T}: Add {U} or {B} to your mana pool.
+Oracle:{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/d/dread_drone.txt b/forge-gui/res/cardsfolder/d/dread_drone.txt
index ead040957d3..1c4d50d0842 100644
--- a/forge-gui/res/cardsfolder/d/dread_drone.txt
+++ b/forge-gui/res/cardsfolder/d/dread_drone.txt
@@ -2,10 +2,10 @@ Name:Dread Drone
 ManaCost:4 B
 Types:Creature Eldrazi Drone
 PT:4/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn3
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dread_drone.jpg
-Oracle:When Dread Drone enters the battlefield, create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:When Dread Drone enters the battlefield, create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/d/dread_statuary.txt b/forge-gui/res/cardsfolder/d/dread_statuary.txt
index 2f6d7b62370..4ac03c44a3a 100644
--- a/forge-gui/res/cardsfolder/d/dread_statuary.txt
+++ b/forge-gui/res/cardsfolder/d/dread_statuary.txt
@@ -1,7 +1,7 @@
 Name:Dread Statuary
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ 4 | Defined$ Self | Power$ 4 | Toughness$ 2 | Types$ Creature,Artifact,Golem | SpellDescription$ CARDNAME becomes a 4/2 Golem artifact creature until end of turn. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dread_statuary.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}: Dread Statuary becomes a 4/2 Golem artifact creature until end of turn. It's still a land.
+Oracle:{T}: Add {C}.\n{4}: Dread Statuary becomes a 4/2 Golem artifact creature until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/d/dreadship_reef.txt b/forge-gui/res/cardsfolder/d/dreadship_reef.txt
index 8b2f7b06d2b..7abfbb3e7c5 100644
--- a/forge-gui/res/cardsfolder/d/dreadship_reef.txt
+++ b/forge-gui/res/cardsfolder/d/dreadship_reef.txt
@@ -1,10 +1,10 @@
 Name:Dreadship Reef
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo U B | Amount$ ChosenX | CostDesc$ {1}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of {U} and/or {B} to your mana pool.
+A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo U B | Amount$ ChosenX | CostDesc$ {1}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of {U} and/or {B}.
 SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dreadship_reef.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Put a storage counter on Dreadship Reef.\n{1}, Remove X storage counters from Dreadship Reef: Add X mana in any combination of {U} and/or {B} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Put a storage counter on Dreadship Reef.\n{1}, Remove X storage counters from Dreadship Reef: Add X mana in any combination of {U} and/or {B}.
diff --git a/forge-gui/res/cardsfolder/d/dreamstone_hedron.txt b/forge-gui/res/cardsfolder/d/dreamstone_hedron.txt
index 42fb7ea51aa..9a0f47b67e0 100644
--- a/forge-gui/res/cardsfolder/d/dreamstone_hedron.txt
+++ b/forge-gui/res/cardsfolder/d/dreamstone_hedron.txt
@@ -1,7 +1,7 @@
 Name:Dreamstone Hedron
 ManaCost:6
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C}.
 A:AB$ Draw | Cost$ 3 T Sac<1/CARDNAME> | NumCards$ 3 | SpellDescription$ Draw three cards.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dreamstone_hedron.jpg
-Oracle:{T}: Add {C}{C}{C} to your mana pool.\n{3}, {T}, Sacrifice Dreamstone Hedron: Draw three cards.
+Oracle:{T}: Add {C}{C}{C}.\n{3}, {T}, Sacrifice Dreamstone Hedron: Draw three cards.
diff --git a/forge-gui/res/cardsfolder/d/drifting_meadow.txt b/forge-gui/res/cardsfolder/d/drifting_meadow.txt
index 43d961e93b2..99b1585fa3e 100644
--- a/forge-gui/res/cardsfolder/d/drifting_meadow.txt
+++ b/forge-gui/res/cardsfolder/d/drifting_meadow.txt
@@ -2,7 +2,7 @@ Name:Drifting Meadow
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drifting_meadow.jpg
-Oracle:Drifting Meadow enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\nCycling {2} ({2}, Discard this card: Draw a card.)
+Oracle:Drifting Meadow enters the battlefield tapped.\n{T}: Add {W}.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/d/dromars_attendant.txt b/forge-gui/res/cardsfolder/d/dromars_attendant.txt
index 5a21b8ab03c..6b46f8f1739 100644
--- a/forge-gui/res/cardsfolder/d/dromars_attendant.txt
+++ b/forge-gui/res/cardsfolder/d/dromars_attendant.txt
@@ -2,7 +2,7 @@ Name:Dromar's Attendant
 ManaCost:5
 Types:Artifact Creature Golem
 PT:3/3
-A:AB$ Mana | Cost$ 1 Sac<1/CARDNAME> | Produced$ W U B | SpellDescription$ Add {W}{U}{B} to your mana pool.
+A:AB$ Mana | Cost$ 1 Sac<1/CARDNAME> | Produced$ W U B | SpellDescription$ Add {W}{U}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dromars_attendant.jpg
-Oracle:{1}, Sacrifice Dromar's Attendant: Add {W}{U}{B} to your mana pool.
+Oracle:{1}, Sacrifice Dromar's Attendant: Add {W}{U}{B}.
diff --git a/forge-gui/res/cardsfolder/d/dromars_cavern.txt b/forge-gui/res/cardsfolder/d/dromars_cavern.txt
index 6600bfa8463..528299438a1 100644
--- a/forge-gui/res/cardsfolder/d/dromars_cavern.txt
+++ b/forge-gui/res/cardsfolder/d/dromars_cavern.txt
@@ -1,11 +1,11 @@
 Name:Dromar's Cavern
 ManaCost:no cost
 Types:Land Lair
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You
 SVar:NeedsToPlay:Land.nonLair+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dromars_cavern.jpg
-Oracle:When Dromar's Cavern enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {W}, {U}, or {B} to your mana pool.
+Oracle:When Dromar's Cavern enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {W}, {U}, or {B}.
diff --git a/forge-gui/res/cardsfolder/d/dromoka_monument.txt b/forge-gui/res/cardsfolder/d/dromoka_monument.txt
index 9ead00ba900..1a038d8b567 100644
--- a/forge-gui/res/cardsfolder/d/dromoka_monument.txt
+++ b/forge-gui/res/cardsfolder/d/dromoka_monument.txt
@@ -1,10 +1,10 @@
 Name:Dromoka Monument
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Animate | Cost$ 4 G W | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | Colors$ Green,White | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 green and white Dragon artifact creature with flying until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Green|White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dromoka_monument.jpg
-Oracle:{T}: Add {G} or {W} to your mana pool.\n{4}{G}{W}: Dromoka Monument becomes a 4/4 green and white Dragon artifact creature with flying until end of turn.
+Oracle:{T}: Add {G} or {W}.\n{4}{G}{W}: Dromoka Monument becomes a 4/4 green and white Dragon artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/d/drover_of_the_mighty.txt b/forge-gui/res/cardsfolder/d/drover_of_the_mighty.txt
index f383c8fca21..d8bf1c494db 100644
--- a/forge-gui/res/cardsfolder/d/drover_of_the_mighty.txt
+++ b/forge-gui/res/cardsfolder/d/drover_of_the_mighty.txt
@@ -3,8 +3,8 @@ ManaCost:1 G
 Types:Creature Human Druid
 PT:1/1
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | CheckSVar$ Y | SVarCompare$ GE1 | Description$ CARDNAME gets +2/+2 as long as you control a Dinosaur.
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Y:Count$Valid Dinosaur.Other+YouCtrl
 SVar:BuffedBy:Dinosaur
 SVar:Picture:http://mythicspoiler.com/ixa/cards/droverofthemighty.jpg
-Oracle:Drover of the Mighty gets +2/+2 as long as you control a Dinosaur.\n{T}: Add one mana of any color to your mana pool.
+Oracle:Drover of the Mighty gets +2/+2 as long as you control a Dinosaur.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/d/drowned_catacomb.txt b/forge-gui/res/cardsfolder/d/drowned_catacomb.txt
index 44168a5157e..db3583d4e51 100644
--- a/forge-gui/res/cardsfolder/d/drowned_catacomb.txt
+++ b/forge-gui/res/cardsfolder/d/drowned_catacomb.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Island.YouCtrl,Swamp.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control an Island or a Swamp.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drowned_catacomb.jpg
-Oracle:Drowned Catacomb enters the battlefield tapped unless you control an Island or a Swamp.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:Drowned Catacomb enters the battlefield tapped unless you control an Island or a Swamp.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/d/drowner_of_hope.txt b/forge-gui/res/cardsfolder/d/drowner_of_hope.txt
index e131bfca705..7b30aa02b83 100644
--- a/forge-gui/res/cardsfolder/d/drowner_of_hope.txt
+++ b/forge-gui/res/cardsfolder/d/drowner_of_hope.txt
@@ -3,11 +3,11 @@ ManaCost:5 U
 Types:Creature Eldrazi
 PT:5/5
 K:Devoid
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 A:AB$ Tap | Cost$ Sac<1/Card.Eldrazi+Scion> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature. | CostDesc$ Sacrifice an Eldrazi Scion:
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drowner_of_hope.jpg
-Oracle:Devoid (This card has no color.)\nWhen Drowner of Hope enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."\nSacrifice an Eldrazi Scion: Tap target creature.
+Oracle:Devoid (This card has no color.)\nWhen Drowner of Hope enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."\nSacrifice an Eldrazi Scion: Tap target creature.
diff --git a/forge-gui/res/cardsfolder/d/drownyard_temple.txt b/forge-gui/res/cardsfolder/d/drownyard_temple.txt
index 43586a87eff..8e90ddd3c45 100644
--- a/forge-gui/res/cardsfolder/d/drownyard_temple.txt
+++ b/forge-gui/res/cardsfolder/d/drownyard_temple.txt
@@ -1,9 +1,9 @@
 Name:Drownyard Temple
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 3 | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drownyard_temple.jpg
 SVar:SacMe:4
 SVar:DiscardMe:3
-Oracle:{T}: Add {C} to your mana pool.\n{3}: Return Drownyard Temple from your graveyard to the battlefield tapped.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{3}: Return Drownyard Temple from your graveyard to the battlefield tapped.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/druid_of_the_anima.txt b/forge-gui/res/cardsfolder/d/druid_of_the_anima.txt
index 201dea5a4c9..691c7e75cc9 100644
--- a/forge-gui/res/cardsfolder/d/druid_of_the_anima.txt
+++ b/forge-gui/res/cardsfolder/d/druid_of_the_anima.txt
@@ -2,8 +2,8 @@ Name:Druid of the Anima
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/druid_of_the_anima.jpg
-Oracle:{T}: Add {R}, {G}, or {W} to your mana pool.
+Oracle:{T}: Add {R}, {G}, or {W}.
diff --git a/forge-gui/res/cardsfolder/d/druid_of_the_cowl.txt b/forge-gui/res/cardsfolder/d/druid_of_the_cowl.txt
index a331ec8086e..b84fc7c7012 100644
--- a/forge-gui/res/cardsfolder/d/druid_of_the_cowl.txt
+++ b/forge-gui/res/cardsfolder/d/druid_of_the_cowl.txt
@@ -2,6 +2,6 @@ Name:Druid of the Cowl
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:1/3
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/druid_of_the_cowl.jpg
-Oracle:{T}: Add {G} to your mana pool. 
\ No newline at end of file
+Oracle:{T}: Add {G}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/druids_repository.txt b/forge-gui/res/cardsfolder/d/druids_repository.txt
index d90c15ca863..14b997d6de3 100644
--- a/forge-gui/res/cardsfolder/d/druids_repository.txt
+++ b/forge-gui/res/cardsfolder/d/druids_repository.txt
@@ -3,7 +3,7 @@ ManaCost:1 G G
 Types:Enchantment
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPut | TriggerDescription$ Whenever a creature you control attacks, put a charge counter on CARDNAME.
 SVar:TrigPut:DB$PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
-A:AB$ Mana | Cost$ SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/druids_repository.jpg
-Oracle:Whenever a creature you control attacks, put a charge counter on Druids' Repository.\nRemove a charge counter from Druids' Repository: Add one mana of any color to your mana pool.
+Oracle:Whenever a creature you control attacks, put a charge counter on Druids' Repository.\nRemove a charge counter from Druids' Repository: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/d/drumhunter.txt b/forge-gui/res/cardsfolder/d/drumhunter.txt
index 922d68e3caa..3f7fa34722c 100644
--- a/forge-gui/res/cardsfolder/d/drumhunter.txt
+++ b/forge-gui/res/cardsfolder/d/drumhunter.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Creature Human Druid Warrior
 PT:2/2
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | IsPresent$ Creature.powerGE5+YouCtrl | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, if you control a creature with power 5 or greater, you may draw a card.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drumhunter.jpg
-Oracle:At the beginning of your end step, if you control a creature with power 5 or greater, you may draw a card.\n{T}: Add {C} to your mana pool.
+Oracle:At the beginning of your end step, if you control a creature with power 5 or greater, you may draw a card.\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/d/dryad_arbor.txt b/forge-gui/res/cardsfolder/d/dryad_arbor.txt
index 1f23b24e35e..227956d3761 100644
--- a/forge-gui/res/cardsfolder/d/dryad_arbor.txt
+++ b/forge-gui/res/cardsfolder/d/dryad_arbor.txt
@@ -4,4 +4,4 @@ Types:Land Creature Forest Dryad
 PT:1/1
 Colors:green
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card136196.jpg
-Oracle:(Dryad Arbor isn't a spell, it's affected by summoning sickness, and it has "{T}: Add {G} to your mana pool.")
+Oracle:(Dryad Arbor isn't a spell, it's affected by summoning sickness, and it has "{T}: Add {G}.")
diff --git a/forge-gui/res/cardsfolder/d/dunes_of_the_dead.txt b/forge-gui/res/cardsfolder/d/dunes_of_the_dead.txt
index 8c2de7cca10..37e3948f753 100644
--- a/forge-gui/res/cardsfolder/d/dunes_of_the_dead.txt
+++ b/forge-gui/res/cardsfolder/d/dunes_of_the_dead.txt
@@ -1,10 +1,10 @@
 Name:Dunes of the Dead
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, create a 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ TriggeredCardController | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie AKH
 SVar:SacMe:1
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dunes_of_the_dead.jpg
-Oracle:{T}: Add {C} to your mana pool.\nWhen Dunes of the Dead is put into a graveyard from the battlefield, create a 2/2 black Zombie creature token.
+Oracle:{T}: Add {C}.\nWhen Dunes of the Dead is put into a graveyard from the battlefield, create a 2/2 black Zombie creature token.
diff --git a/forge-gui/res/cardsfolder/d/duskmantle_house_of_shadow.txt b/forge-gui/res/cardsfolder/d/duskmantle_house_of_shadow.txt
index 0ab9bf86890..30de3d10526 100644
--- a/forge-gui/res/cardsfolder/d/duskmantle_house_of_shadow.txt
+++ b/forge-gui/res/cardsfolder/d/duskmantle_house_of_shadow.txt
@@ -1,7 +1,7 @@
 Name:Duskmantle, House of Shadow
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mill | Cost$ U B T | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Select target player | AILogic$ EndOfOppTurn | SpellDescription$ Target player puts the top card of his or her library into his or her graveyard.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/Duskmantle_House_of_Shadow.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{U}{B}, {T}: Target player puts the top card of his or her library into his or her graveyard.
+Oracle:{T}: Add {C}.\n{U}{B}, {T}: Target player puts the top card of his or her library into his or her graveyard.
diff --git a/forge-gui/res/cardsfolder/d/dust_bowl.txt b/forge-gui/res/cardsfolder/d/dust_bowl.txt
index 5c1b1c50dc2..4abd728d632 100644
--- a/forge-gui/res/cardsfolder/d/dust_bowl.txt
+++ b/forge-gui/res/cardsfolder/d/dust_bowl.txt
@@ -1,7 +1,7 @@
 Name:Dust Bowl
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | Cost$ 3 T Sac<1/Land> | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land | SpellDescription$ Destroy target nonbasic land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dust_bowl.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{3}, {T}, Sacrifice a land: Destroy target nonbasic land.
+Oracle:{T}: Add {C}.\n{3}, {T}, Sacrifice a land: Destroy target nonbasic land.
diff --git a/forge-gui/res/cardsfolder/d/dwarven_hold.txt b/forge-gui/res/cardsfolder/d/dwarven_hold.txt
index 059ed179bd4..54bc4af37f7 100644
--- a/forge-gui/res/cardsfolder/d/dwarven_hold.txt
+++ b/forge-gui/res/cardsfolder/d/dwarven_hold.txt
@@ -5,9 +5,9 @@ K:CARDNAME enters the battlefield tapped.
 K:You may choose not to untap CARDNAME during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self+tapped | Execute$ TrigStore | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is tapped, put a storage counter on it.
 SVar:TrigStore:DB$PutCounter | Defined$ Self | CounterType$ STORAGE | CounterNum$ 1
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ R | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {R} to your mana pool for each storage counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ R | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {R} for each storage counter removed this way.
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dwarven_hold.jpg
-Oracle:Dwarven Hold enters the battlefield tapped.\nYou may choose not to untap Dwarven Hold during your untap step.\nAt the beginning of your upkeep, if Dwarven Hold is tapped, put a storage counter on it.\n{T}, Remove any number of storage counters from Dwarven Hold: Add {R} to your mana pool for each storage counter removed this way.
+Oracle:Dwarven Hold enters the battlefield tapped.\nYou may choose not to untap Dwarven Hold during your untap step.\nAt the beginning of your upkeep, if Dwarven Hold is tapped, put a storage counter on it.\n{T}, Remove any number of storage counters from Dwarven Hold: Add {R} for each storage counter removed this way.
diff --git a/forge-gui/res/cardsfolder/d/dwarven_ruins.txt b/forge-gui/res/cardsfolder/d/dwarven_ruins.txt
index 5f6de463ba8..b9feccc5b72 100644
--- a/forge-gui/res/cardsfolder/d/dwarven_ruins.txt
+++ b/forge-gui/res/cardsfolder/d/dwarven_ruins.txt
@@ -2,8 +2,8 @@ Name:Dwarven Ruins
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dwarven_ruins.jpg
-Oracle:Dwarven Ruins enters the battlefield tapped.\n{T}: Add {R} to your mana pool.\n{T}, Sacrifice Dwarven Ruins: Add {R}{R} to your mana pool.
+Oracle:Dwarven Ruins enters the battlefield tapped.\n{T}: Add {R}.\n{T}, Sacrifice Dwarven Ruins: Add {R}{R}.
diff --git a/forge-gui/res/cardsfolder/e/ebon_stronghold.txt b/forge-gui/res/cardsfolder/e/ebon_stronghold.txt
index f660fb02e3c..a51aee46394 100644
--- a/forge-gui/res/cardsfolder/e/ebon_stronghold.txt
+++ b/forge-gui/res/cardsfolder/e/ebon_stronghold.txt
@@ -2,8 +2,8 @@ Name:Ebon Stronghold
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ebon_stronghold.jpg
-Oracle:Ebon Stronghold enters the battlefield tapped.\n{T}: Add {B} to your mana pool.\n{T}, Sacrifice Ebon Stronghold: Add {B}{B} to your mana pool.
+Oracle:Ebon Stronghold enters the battlefield tapped.\n{T}: Add {B}.\n{T}, Sacrifice Ebon Stronghold: Add {B}{B}.
diff --git a/forge-gui/res/cardsfolder/e/eiganjo_castle.txt b/forge-gui/res/cardsfolder/e/eiganjo_castle.txt
index f3071f03bfb..ef44b308444 100644
--- a/forge-gui/res/cardsfolder/e/eiganjo_castle.txt
+++ b/forge-gui/res/cardsfolder/e/eiganjo_castle.txt
@@ -1,7 +1,7 @@
 Name:Eiganjo Castle
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ PreventDamage | Cost$ W T | ValidTgts$ Creature.Legendary | Amount$ 2 | TgtPrompt$ Select target legendary creature | SpellDescription$ Prevent the next 2 damage that would be dealt to target legendary creature this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eiganjo_castle.jpg
-Oracle:{T}: Add {W} to your mana pool.\n{W}, {T}: Prevent the next 2 damage that would be dealt to target legendary creature this turn.
+Oracle:{T}: Add {W}.\n{W}, {T}: Prevent the next 2 damage that would be dealt to target legendary creature this turn.
diff --git a/forge-gui/res/cardsfolder/e/eladamri_lord_of_leaves_avatar.txt b/forge-gui/res/cardsfolder/e/eladamri_lord_of_leaves_avatar.txt
index 8ffdf7cd54e..a3b390f1459 100644
--- a/forge-gui/res/cardsfolder/e/eladamri_lord_of_leaves_avatar.txt
+++ b/forge-gui/res/cardsfolder/e/eladamri_lord_of_leaves_avatar.txt
@@ -2,8 +2,8 @@ Name:Eladamri, Lord of Leaves Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:-1/+2
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ Player | TriggerZones$ Command | Execute$ TrigAddMana | TriggerDescription$ At the beginning of each player's precombat main phase, that player adds {G}{G} to his or her mana pool.
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ Player | TriggerZones$ Command | Execute$ TrigAddMana | TriggerDescription$ At the beginning of each player's precombat main phase, that player adds {G}{G}.
 SVar:TrigAddMana:DB$ Mana | Produced$ G | Amount$ 2 | Defined$ TriggeredPlayer
 SVar:RemRandomDeck:True
 SVar:Picture:https://downloads.cardforge.org/images/cards/VAN/Eladamri, Lord of Leaves Avatar.full.jpg
-Oracle:Hand -1, life +2\nAt the beginning of each player's precombat main phase, that player adds {G}{G} to his or her mana pool.
+Oracle:Hand -1, life +2\nAt the beginning of each player's precombat main phase, that player adds {G}{G}.
diff --git a/forge-gui/res/cardsfolder/e/eladamris_vineyard.txt b/forge-gui/res/cardsfolder/e/eladamris_vineyard.txt
index c11a1f41a34..edc403094b1 100644
--- a/forge-gui/res/cardsfolder/e/eladamris_vineyard.txt
+++ b/forge-gui/res/cardsfolder/e/eladamris_vineyard.txt
@@ -1,7 +1,7 @@
 Name:Eladamri's Vineyard
 ManaCost:G
 Types:Enchantment
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of each player's precombat main phase, add {G}{G} to that player's mana pool.
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of each player's precombat main phase, that player adds {G}{G}.
 SVar:TrigMana:DB$Mana | Produced$ G | Amount$ 2 | Defined$ TriggeredPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eladamris_vineyard.jpg
-Oracle:At the beginning of each player's precombat main phase, add {G}{G} to that player's mana pool.
+Oracle:At the beginning of each player's precombat main phase, that player adds {G}{G}.
diff --git a/forge-gui/res/cardsfolder/e/eldrazi_skyspawner.txt b/forge-gui/res/cardsfolder/e/eldrazi_skyspawner.txt
index 456cc4ce17b..68d5d298e06 100644
--- a/forge-gui/res/cardsfolder/e/eldrazi_skyspawner.txt
+++ b/forge-gui/res/cardsfolder/e/eldrazi_skyspawner.txt
@@ -4,10 +4,10 @@ Types:Creature Eldrazi Drone
 PT:2/1
 K:Devoid
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eldrazi_skyspawner.jpg
-Oracle:Devoid (This card has no color.)\nFlying\nWhen Eldrazi Skyspawner enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Devoid (This card has no color.)\nFlying\nWhen Eldrazi Skyspawner enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/e/eldrazi_temple.txt b/forge-gui/res/cardsfolder/e/eldrazi_temple.txt
index 3b048d4ce49..b9840862fb6 100644
--- a/forge-gui/res/cardsfolder/e/eldrazi_temple.txt
+++ b/forge-gui/res/cardsfolder/e/eldrazi_temple.txt
@@ -1,8 +1,8 @@
 Name:Eldrazi Temple
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Card.Eldrazi+Colorless,Activated.Eldrazi+Colorless | SpellDescription$ Add {C}{C} to your mana pool. Spend this mana only to cast colorless Eldrazi spells or activate abilities of colorless Eldrazi.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Card.Eldrazi+Colorless,Activated.Eldrazi+Colorless | SpellDescription$ Add {C}{C}. Spend this mana only to cast colorless Eldrazi spells or activate abilities of colorless Eldrazi.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eldrazi_temple.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {C}{C} to your mana pool. Spend this mana only to cast colorless Eldrazi spells or activate abilities of colorless Eldrazi.
+Oracle:{T}: Add {C}.\n{T}: Add {C}{C}. Spend this mana only to cast colorless Eldrazi spells or activate abilities of colorless Eldrazi.
diff --git a/forge-gui/res/cardsfolder/e/elemental_resonance.txt b/forge-gui/res/cardsfolder/e/elemental_resonance.txt
index a25125a0b58..66246d65b80 100644
--- a/forge-gui/res/cardsfolder/e/elemental_resonance.txt
+++ b/forge-gui/res/cardsfolder/e/elemental_resonance.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Enchantment Aura
 K:Enchant permanent
 A:SP$ Attach | Cost$ 2 G G | ValidTgts$ Permanent | AILogic$ Pump
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of your precombat main phase, add mana equal to enchanted permanent's mana cost to your mana pool. (Mana cost includes color. If a mana symbol has multiple colors, choose one.)
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of your precombat main phase, add mana equal to enchanted permanent's mana cost. (Mana cost includes color. If a mana symbol has multiple colors, choose one.)
 SVar:TrigMana:DB$ Mana | Produced$ Special EnchantedManaCost
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elemental_resonance.jpg
-Oracle:Enchant permanent\nAt the beginning of your precombat main phase, add mana equal to enchanted permanent's mana cost to your mana pool. (Mana cost includes color. If a mana symbol has multiple colors, choose one.)
+Oracle:Enchant permanent\nAt the beginning of your precombat main phase, add mana equal to enchanted permanent's mana cost. (Mana cost includes color. If a mana symbol has multiple colors, choose one.)
diff --git a/forge-gui/res/cardsfolder/e/elephant_graveyard.txt b/forge-gui/res/cardsfolder/e/elephant_graveyard.txt
index fefe00a2dbc..ec6c750710f 100644
--- a/forge-gui/res/cardsfolder/e/elephant_graveyard.txt
+++ b/forge-gui/res/cardsfolder/e/elephant_graveyard.txt
@@ -1,7 +1,7 @@
 Name:Elephant Graveyard
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Regenerate | ValidTgts$ Creature.Elephant | TgtPrompt$ Select target Elephant | Cost$ T | SpellDescription$ Regenerate target Elephant.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elephant_graveyard.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Regenerate target Elephant.
+Oracle:{T}: Add {C}.\n{T}: Regenerate target Elephant.
diff --git a/forge-gui/res/cardsfolder/e/elfhame_palace.txt b/forge-gui/res/cardsfolder/e/elfhame_palace.txt
index d47fd616bca..19c9aefcd22 100644
--- a/forge-gui/res/cardsfolder/e/elfhame_palace.txt
+++ b/forge-gui/res/cardsfolder/e/elfhame_palace.txt
@@ -2,7 +2,7 @@ Name:Elfhame Palace
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elfhame_palace.jpg
-Oracle:Elfhame Palace enters the battlefield tapped.\n{T}: Add {G} or {W} to your mana pool.
+Oracle:Elfhame Palace enters the battlefield tapped.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/e/eloren_wilds.txt b/forge-gui/res/cardsfolder/e/eloren_wilds.txt
index 2d82ea74620..5493db87546 100644
--- a/forge-gui/res/cardsfolder/e/eloren_wilds.txt
+++ b/forge-gui/res/cardsfolder/e/eloren_wilds.txt
@@ -1,7 +1,7 @@
 Name:Eloren Wilds
 ManaCost:no cost
 Types:Plane Shandalar
-T:Mode$ TapsForMana | ValidCard$ Permanent | Execute$ TrigMana | TriggerZones$ Command | Static$ True | TriggerDescription$ Whenever a player taps a permanent for mana, that player adds one mana to his or her mana pool of any type that permanent produced.
+T:Mode$ TapsForMana | ValidCard$ Permanent | Execute$ TrigMana | TriggerZones$ Command | Static$ True | TriggerDescription$ Whenever a player taps a permanent for mana, that player adds one mana of any type that permanent produced.
 SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, target player can't cast spells until a player planeswalks.
 SVar:RolledChaos:DB$ Effect | ValidTgts$ Player | IsCurse$ True | Name$ Eloren Wilds Effect | StaticAbilities$ STCantCast | Triggers$ TrigPlaneswalk | SVars$ ExileSelf | RememberObjects$ Targeted | Duration$ Permanent
@@ -10,4 +10,4 @@ SVar:TrigPlaneswalk:Mode$ PlaneswalkedFrom | Execute$ ExileSelf | Static$ True
 SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:AIRollPlanarDieParams:Mode$ Always
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eloren_wilds.jpg
-Oracle:Whenever a player taps a permanent for mana, that player adds one mana to his or her mana pool of any type that permanent produced.\nWhenever you roll {CHAOS}, target player can't cast spells until a player planeswalks.
+Oracle:Whenever a player taps a permanent for mana, that player adds one mana of any type that permanent produced.\nWhenever you roll {CHAOS}, target player can't cast spells until a player planeswalks.
diff --git a/forge-gui/res/cardsfolder/e/elves_of_deep_shadow.txt b/forge-gui/res/cardsfolder/e/elves_of_deep_shadow.txt
index 811f8ea65ce..d064e330543 100644
--- a/forge-gui/res/cardsfolder/e/elves_of_deep_shadow.txt
+++ b/forge-gui/res/cardsfolder/e/elves_of_deep_shadow.txt
@@ -2,7 +2,7 @@ Name:Elves of Deep Shadow
 ManaCost:G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elves_of_deep_shadow.jpg
-Oracle:{T}: Add {B} to your mana pool. Elves of Deep Shadow deals 1 damage to you.
+Oracle:{T}: Add {B}. Elves of Deep Shadow deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/e/elvish_champion_avatar.txt b/forge-gui/res/cardsfolder/e/elvish_champion_avatar.txt
index c3d0269621d..fafdc15ef9e 100644
--- a/forge-gui/res/cardsfolder/e/elvish_champion_avatar.txt
+++ b/forge-gui/res/cardsfolder/e/elvish_champion_avatar.txt
@@ -2,8 +2,8 @@ Name:Elvish Champion Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+0/-5
-T:Mode$ NewGame | TriggerZones$ Command | Execute$ TrigToken | Static$ True | TriggerDescription$ You begin the game with a 1/1 green Elf creature token on the battlefield. It has "{T}: Add {G} to your mana pool."
+T:Mode$ NewGame | TriggerZones$ Command | Execute$ TrigToken | Static$ True | TriggerDescription$ You begin the game with a 1/1 green Elf creature token on the battlefield. It has "{T}: Add {G}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Elf | TokenTypes$ Creature,Elf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenAbilities$ DBMana
-SVar:DBMana:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+SVar:DBMana:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:https://downloads.cardforge.org/images/cards/VAN/Elvish Champion Avatar.full.jpg
-Oracle:Hand +0, life -5\nYou begin the game with a 1/1 green Elf creature token on the battlefield. It has "{T}: Add {G} to your mana pool."
+Oracle:Hand +0, life -5\nYou begin the game with a 1/1 green Elf creature token on the battlefield. It has "{T}: Add {G}."
diff --git a/forge-gui/res/cardsfolder/e/elvish_guidance.txt b/forge-gui/res/cardsfolder/e/elvish_guidance.txt
index 86c700519de..2dc64ccc643 100644
--- a/forge-gui/res/cardsfolder/e/elvish_guidance.txt
+++ b/forge-gui/res/cardsfolder/e/elvish_guidance.txt
@@ -3,9 +3,9 @@ ManaCost:2 G
 Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool for each Elf on the battlefield (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds an additional {G} for each Elf on the battlefield.
 SVar:TrigMana:DB$Mana | Produced$ G | Amount$ X | Defined$ TriggeredCardController | References$ X
 SVar:X:Count$Valid Elf
 DeckNeeds:Type$Elf
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_guidance.jpg
-Oracle:Enchant land\nWhenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool for each Elf on the battlefield (in addition to the mana the land produces).
+Oracle:Enchant land\nWhenever enchanted land is tapped for mana, its controller adds an additional {G} for each Elf on the battlefield.
diff --git a/forge-gui/res/cardsfolder/e/elvish_harbinger.txt b/forge-gui/res/cardsfolder/e/elvish_harbinger.txt
index 70cb8d9d2e5..7a26529c6c0 100644
--- a/forge-gui/res/cardsfolder/e/elvish_harbinger.txt
+++ b/forge-gui/res/cardsfolder/e/elvish_harbinger.txt
@@ -2,9 +2,9 @@ Name:Elvish Harbinger
 ManaCost:2 G
 Types:Creature Elf Druid
 PT:1/2
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for an Elf card, reveal it, then shuffle your library and put that card on top of it.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Card.Elf | ChangeNum$ 1 | ShuffleNonMandatory$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_harbinger.jpg
-Oracle:When Elvish Harbinger enters the battlefield, you may search your library for an Elf card, reveal it, then shuffle your library and put that card on top of it.\n{T}: Add one mana of any color to your mana pool.
+Oracle:When Elvish Harbinger enters the battlefield, you may search your library for an Elf card, reveal it, then shuffle your library and put that card on top of it.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/e/elvish_spirit_guide.txt b/forge-gui/res/cardsfolder/e/elvish_spirit_guide.txt
index c5df8c63962..243bbf166bf 100644
--- a/forge-gui/res/cardsfolder/e/elvish_spirit_guide.txt
+++ b/forge-gui/res/cardsfolder/e/elvish_spirit_guide.txt
@@ -2,6 +2,6 @@ Name:Elvish Spirit Guide
 ManaCost:2 G
 Types:Creature Elf Spirit
 PT:2/2
-A:AB$ Mana | Cost$ ExileFromHand<1/CARDNAME> | Produced$ G | ActivationZone$ Hand | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ ExileFromHand<1/CARDNAME> | Produced$ G | ActivationZone$ Hand | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_spirit_guide.jpg
-Oracle:Exile Elvish Spirit Guide from your hand: Add {G} to your mana pool.
+Oracle:Exile Elvish Spirit Guide from your hand: Add {G}.
diff --git a/forge-gui/res/cardsfolder/e/emeria_the_sky_ruin.txt b/forge-gui/res/cardsfolder/e/emeria_the_sky_ruin.txt
index 506f4c4b3d7..e3341bbbb95 100644
--- a/forge-gui/res/cardsfolder/e/emeria_the_sky_ruin.txt
+++ b/forge-gui/res/cardsfolder/e/emeria_the_sky_ruin.txt
@@ -2,8 +2,8 @@ Name:Emeria, the Sky Ruin
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | IsPresent$ Card.Plains+YouCtrl | PresentCompare$ GE7 | TriggerDescription$ At the beginning of your upkeep, if you control seven or more Plains, you may return target creature card from your graveyard to the battlefield.
 SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | Cost$ 0
 SVar:Picture:http://www.wizards.com/global/images/magic/general/emeria_the_sky_ruin.jpg
-Oracle:Emeria, the Sky Ruin enters the battlefield tapped.\nAt the beginning of your upkeep, if you control seven or more Plains, you may return target creature card from your graveyard to the battlefield.\n{T}: Add {W} to your mana pool.
+Oracle:Emeria, the Sky Ruin enters the battlefield tapped.\nAt the beginning of your upkeep, if you control seven or more Plains, you may return target creature card from your graveyard to the battlefield.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/e/emrakuls_hatcher.txt b/forge-gui/res/cardsfolder/e/emrakuls_hatcher.txt
index ba70f139dc4..19f07b24250 100644
--- a/forge-gui/res/cardsfolder/e/emrakuls_hatcher.txt
+++ b/forge-gui/res/cardsfolder/e/emrakuls_hatcher.txt
@@ -2,10 +2,10 @@ Name:Emrakul's Hatcher
 ManaCost:4 R
 Types:Creature Eldrazi Drone
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 3 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn2
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/emrakuls_hatcher.jpg
-Oracle:When Emrakul's Hatcher enters the battlefield, create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:When Emrakul's Hatcher enters the battlefield, create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/e/encroaching_wastes.txt b/forge-gui/res/cardsfolder/e/encroaching_wastes.txt
index 00e9668321f..32b3f262c63 100644
--- a/forge-gui/res/cardsfolder/e/encroaching_wastes.txt
+++ b/forge-gui/res/cardsfolder/e/encroaching_wastes.txt
@@ -1,7 +1,7 @@
 Name:Encroaching Wastes
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land. | Cost$ 4 T Sac<1/CARDNAME> | SpellDescription$ Destroy target nonbasic land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/encroaching_wastes.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}, {T}, Sacrifice Encroaching Wastes: Destroy target nonbasic land.
+Oracle:{T}: Add {C}.\n{4}, {T}, Sacrifice Encroaching Wastes: Destroy target nonbasic land.
diff --git a/forge-gui/res/cardsfolder/e/endless_sands.txt b/forge-gui/res/cardsfolder/e/endless_sands.txt
index 6c80a4c96ba..703cb3af83e 100644
--- a/forge-gui/res/cardsfolder/e/endless_sands.txt
+++ b/forge-gui/res/cardsfolder/e/endless_sands.txt
@@ -1,7 +1,7 @@
 Name:Endless Sands
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | RememberTargets$ True | SpellDescription$ Exile target creature you control.
 A:AB$ ChangeZoneAll | Cost$ 4 T Sac<1/CARDNAME> | ChangeType$ Card.Creature+IsRemembered+ExiledWithSource | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup | SpellDescription$ Return each creature card exiled with CARDNAME to the battlefield under its owner's control.
 T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered+ExiledWithSource | Execute$ DBForget
@@ -9,4 +9,4 @@ SVar:DBForget:DB$ Pump | ForgetObjects$ TriggeredCard
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.Self | Execute$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/endless_sands.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: Exile target creature you control.\n{4}, {T}, Sacrifice Endless Sands: Return each creature card exiled with Endless Sands to the battlefield under its owner's control.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{2}, {T}: Exile target creature you control.\n{4}, {T}, Sacrifice Endless Sands: Return each creature card exiled with Endless Sands to the battlefield under its owner's control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/e/energy_tap.txt b/forge-gui/res/cardsfolder/e/energy_tap.txt
index 6ed8b3a7c79..25a5689e024 100644
--- a/forge-gui/res/cardsfolder/e/energy_tap.txt
+++ b/forge-gui/res/cardsfolder/e/energy_tap.txt
@@ -1,9 +1,9 @@
 Name:Energy Tap
 ManaCost:U
 Types:Sorcery
-A:SP$ Tap | Cost$ U | TgtPrompt$ Select target untapped creature you control | ValidTgts$ Creature.untapped+YouCtrl | SubAbility$ DBMana | SpellDescription$ Tap target untapped creature you control. If you do, add an amount of {C} to your mana pool equal to that creature's converted mana cost.
+A:SP$ Tap | Cost$ U | TgtPrompt$ Select target untapped creature you control | ValidTgts$ Creature.untapped+YouCtrl | SubAbility$ DBMana | SpellDescription$ Tap target untapped creature you control. If you do, add an amount of {C} equal to that creature's converted mana cost.
 SVar:DBMana:DB$Mana | Produced$ C | Amount$ X | References$ X
 SVar:X:Targeted$CardManaCost
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/energy_tap.jpg
-Oracle:Tap target untapped creature you control. If you do, add an amount of {C} to your mana pool equal to that creature's converted mana cost.
+Oracle:Tap target untapped creature you control. If you do, add an amount of {C} equal to that creature's converted mana cost.
diff --git a/forge-gui/res/cardsfolder/e/esper_panorama.txt b/forge-gui/res/cardsfolder/e/esper_panorama.txt
index 856c3aa42e0..ab2658de7b4 100644
--- a/forge-gui/res/cardsfolder/e/esper_panorama.txt
+++ b/forge-gui/res/cardsfolder/e/esper_panorama.txt
@@ -1,7 +1,7 @@
 Name:Esper Panorama
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Plains+Basic,Land.Island+Basic,Land.Swamp+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Plains, Island, or Swamp card and put it onto the battlefield tapped. Then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/esper_panorama.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}, Sacrifice Esper Panorama: Search your library for a basic Plains, Island, or Swamp card and put it onto the battlefield tapped. Then shuffle your library.
+Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Esper Panorama: Search your library for a basic Plains, Island, or Swamp card and put it onto the battlefield tapped. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/e/essence_feed.txt b/forge-gui/res/cardsfolder/e/essence_feed.txt
index ac977af351e..a98ed69d1bd 100644
--- a/forge-gui/res/cardsfolder/e/essence_feed.txt
+++ b/forge-gui/res/cardsfolder/e/essence_feed.txt
@@ -1,11 +1,11 @@
 Name:Essence Feed
 ManaCost:5 B
 Types:Sorcery
-A:SP$ LoseLife | Cost$ 5 B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 3 life. You gain 3 life and create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+A:SP$ LoseLife | Cost$ 5 B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 3 life. You gain 3 life and create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3 | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenAmount$ 3 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn3
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token & Ability$LifeGain
 SVar:Picture:http://www.wizards.com/global/images/magic/general/essence_feed.jpg
-Oracle:Target player loses 3 life. You gain 3 life and create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Target player loses 3 life. You gain 3 life and create three 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/e/everflowing_chalice.txt b/forge-gui/res/cardsfolder/e/everflowing_chalice.txt
index 649f6889ce0..3ef45b2ad49 100644
--- a/forge-gui/res/cardsfolder/e/everflowing_chalice.txt
+++ b/forge-gui/res/cardsfolder/e/everflowing_chalice.txt
@@ -3,11 +3,11 @@ ManaCost:0
 Types:Artifact
 K:Multikicker:2
 K:etbCounter:CHARGE:XKicked:no condition:CARDNAME enters the battlefield with a charge counter on it for each time it was kicked.
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | References$ X | SpellDescription$ Add {C} to your mana pool for each charge counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | References$ X | SpellDescription$ Add {C} for each charge counter on CARDNAME.
 SVar:X:Count$CardCounters.CHARGE
 SVar:XKicked:Count$TimesKicked
 DeckHas:Ability$Counters
 SVar:NeedsToPlayVar:Z GE4
 SVar:Z:Count$Valid Land.YouCtrl+untapped
 SVar:Picture:http://www.wizards.com/global/images/magic/general/everflowing_chalice.jpg
-Oracle:Multikicker {2} (You may pay an additional {2} any number of times as you cast this spell.)\nEverflowing Chalice enters the battlefield with a charge counter on it for each time it was kicked.\n{T}: Add {C} to your mana pool for each charge counter on Everflowing Chalice.
+Oracle:Multikicker {2} (You may pay an additional {2} any number of times as you cast this spell.)\nEverflowing Chalice enters the battlefield with a charge counter on it for each time it was kicked.\n{T}: Add {C} for each charge counter on Everflowing Chalice.
diff --git a/forge-gui/res/cardsfolder/e/everglades.txt b/forge-gui/res/cardsfolder/e/everglades.txt
index 6b9456cf5f9..2a606ee66ee 100644
--- a/forge-gui/res/cardsfolder/e/everglades.txt
+++ b/forge-gui/res/cardsfolder/e/everglades.txt
@@ -2,9 +2,9 @@ Name:Everglades
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C B | SpellDescription$ Add {C}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C B | SpellDescription$ Add {C}{B}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return an untapped Swamp you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Swamp.untapped/untapped Swamp> | UnlessPayer$ You
 SVar:NeedsToPlay:Swamp.YouCtrl+inZoneBattlefield+untapped
 SVar:Picture:http://www.wizards.com/global/images/magic/general/everglades.jpg
-Oracle:Everglades enters the battlefield tapped.\nWhen Everglades enters the battlefield, sacrifice it unless you return an untapped Swamp you control to its owner's hand.\n{T}: Add {C}{B} to your mana pool.
+Oracle:Everglades enters the battlefield tapped.\nWhen Everglades enters the battlefield, sacrifice it unless you return an untapped Swamp you control to its owner's hand.\n{T}: Add {C}{B}.
diff --git a/forge-gui/res/cardsfolder/e/exotic_orchard.txt b/forge-gui/res/cardsfolder/e/exotic_orchard.txt
index 40a32a31785..04285603947 100644
--- a/forge-gui/res/cardsfolder/e/exotic_orchard.txt
+++ b/forge-gui/res/cardsfolder/e/exotic_orchard.txt
@@ -1,6 +1,6 @@
 Name:Exotic Orchard
 ManaCost:no cost
 Types:Land
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.OppCtrl | ReflectProperty$ Produce | SpellDescription$ Add to your mana pool one mana of any color that a land an opponent controls could produce.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.OppCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any color that a land an opponent controls could produce.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/exotic_orchard.jpg
-Oracle:{T}: Add to your mana pool one mana of any color that a land an opponent controls could produce.
+Oracle:{T}: Add one mana of any color that a land an opponent controls could produce.
diff --git a/forge-gui/res/cardsfolder/e/extraplanar_lens.txt b/forge-gui/res/cardsfolder/e/extraplanar_lens.txt
index 6a81dafbc46..0979f7664bd 100644
--- a/forge-gui/res/cardsfolder/e/extraplanar_lens.txt
+++ b/forge-gui/res/cardsfolder/e/extraplanar_lens.txt
@@ -3,11 +3,11 @@ ManaCost:3
 Types:Artifact
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Imprint — When CARDNAME enters the battlefield, you may exile target land you control.
 SVar:TrigExile:DB$ ChangeZone | Imprint$ True | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select a target land you control | AILogic$ ExtraplanarLens
-T:Mode$ TapsForMana | ValidCard$ Land.sharesNameWith Imprinted | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a land with the same name as the exiled card is tapped for mana, its controller adds one mana to his or her mana pool of any type that land produced.
+T:Mode$ TapsForMana | ValidCard$ Land.sharesNameWith Imprinted | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a land with the same name as the exiled card is tapped for mana, its controller adds one mana of any type that land produced.
 SVar:TrigMana:DB$ ManaReflected | Valid$ Defined.Triggered | ColorOrType$ Type | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/extraplanar_lens.jpg
-Oracle:Imprint — When Extraplanar Lens enters the battlefield, you may exile target land you control.\nWhenever a land with the same name as the exiled card is tapped for mana, its controller adds one mana to his or her mana pool of any type that land produced.
+Oracle:Imprint — When Extraplanar Lens enters the battlefield, you may exile target land you control.\nWhenever a land with the same name as the exiled card is tapped for mana, its controller adds one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/e/exuberant_firestoker.txt b/forge-gui/res/cardsfolder/e/exuberant_firestoker.txt
index dac2e131580..bb888e6846c 100644
--- a/forge-gui/res/cardsfolder/e/exuberant_firestoker.txt
+++ b/forge-gui/res/cardsfolder/e/exuberant_firestoker.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Human Druid Shaman
 PT:1/1
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | IsPresent$ Creature.powerGE5+YouCtrl | Execute$ TrigDamage | TriggerDescription$ At the beginning of your end step, if you control a creature with power 5 or greater, you may have CARDNAME deal 2 damage to target player.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:TrigDamage:DB$DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/exuberant_firestoker.jpg
-Oracle:At the beginning of your end step, if you control a creature with power 5 or greater, you may have Exuberant Firestoker deal 2 damage to target player.\n{T}: Add {C} to your mana pool.
+Oracle:At the beginning of your end step, if you control a creature with power 5 or greater, you may have Exuberant Firestoker deal 2 damage to target player.\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/e/eye_of_ramos.txt b/forge-gui/res/cardsfolder/e/eye_of_ramos.txt
index 8c324019871..0f9b1e0c7ec 100644
--- a/forge-gui/res/cardsfolder/e/eye_of_ramos.txt
+++ b/forge-gui/res/cardsfolder/e/eye_of_ramos.txt
@@ -1,8 +1,8 @@
 Name:Eye of Ramos
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ U | SpellDescription$ Add {U}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eye_of_ramos.jpg
-Oracle:{T}: Add {U} to your mana pool.\nSacrifice Eye of Ramos: Add {U} to your mana pool.
+Oracle:{T}: Add {U}.\nSacrifice Eye of Ramos: Add {U}.
diff --git a/forge-gui/res/cardsfolder/e/eyeless_watcher.txt b/forge-gui/res/cardsfolder/e/eyeless_watcher.txt
index 1847b02ae6c..d911dd0557f 100644
--- a/forge-gui/res/cardsfolder/e/eyeless_watcher.txt
+++ b/forge-gui/res/cardsfolder/e/eyeless_watcher.txt
@@ -3,10 +3,10 @@ ManaCost:3 G
 Types:Creature Eldrazi Drone
 K:Devoid
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eyeless_watcher.jpg
-Oracle:Devoid (This card has no color.)\nWhen Eyeless Watcher enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Devoid (This card has no color.)\nWhen Eyeless Watcher enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/f/faerie_conclave.txt b/forge-gui/res/cardsfolder/f/faerie_conclave.txt
index 6206df27963..e9c86771fa4 100644
--- a/forge-gui/res/cardsfolder/f/faerie_conclave.txt
+++ b/forge-gui/res/cardsfolder/f/faerie_conclave.txt
@@ -2,7 +2,7 @@ Name:Faerie Conclave
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Animate | Cost$ 1 U | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Creature,Faerie | Colors$ Blue | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/1 blue Faerie creature with flying until end of turn. It's still a land. (It can't be blocked except by creatures with flying or reach.)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/faerie_conclave.jpg
-Oracle:Faerie Conclave enters the battlefield tapped.\n{T}: Add {U} to your mana pool.\n{1}{U}: Faerie Conclave becomes a 2/1 blue Faerie creature with flying until end of turn. It's still a land.
+Oracle:Faerie Conclave enters the battlefield tapped.\n{T}: Add {U}.\n{1}{U}: Faerie Conclave becomes a 2/1 blue Faerie creature with flying until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/f/false_dawn.txt b/forge-gui/res/cardsfolder/f/false_dawn.txt
index c72b9ff8f98..b9e6a741287 100644
--- a/forge-gui/res/cardsfolder/f/false_dawn.txt
+++ b/forge-gui/res/cardsfolder/f/false_dawn.txt
@@ -1,12 +1,12 @@
 Name:False Dawn
 ManaCost:1 W
 Types:Sorcery
-A:SP$ Effect | Cost$ 1 W | ReplacementEffects$ FDRep | StaticAbilities$ FDManaConvertion | SVars$ ProduceW | SubAbility$ DBDraw | SpellDescription$ Until end of turn, spells and abilities you control that would add colored mana to your mana pool add that much white mana instead. Until end of turn, you may spend white mana as though it were mana of any color. Draw a card.
+A:SP$ Effect | Cost$ 1 W | ReplacementEffects$ FDRep | StaticAbilities$ FDManaConvertion | SVars$ ProduceW | SubAbility$ DBDraw | SpellDescription$ Until end of turn, spells and abilities you control that would add colored mana add that much white mana instead. Until end of turn, you may spend white mana as though it were mana of any color. Draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1
-SVar:FDRep:Event$ ProduceMana | ActiveZones$ Command | ValidCard$ Card.YouCtrl | NoTapCheck$ True | ManaReplacement$ ProduceW | Description$ Spells and abilities you control that would add colored mana to your mana pool add that much white mana instead.
+SVar:FDRep:Event$ ProduceMana | ActiveZones$ Command | ValidCard$ Card.YouCtrl | NoTapCheck$ True | ManaReplacement$ ProduceW | Description$ Spells and abilities you control that would add colored mana add that much white mana instead.
 SVar:ProduceW:R->W & B->W & U->W & G->W
 SVar:FDManaConvertion:Mode$ Continuous | EffectZone$ Command | Affected$ You | ManaColorConversion$ Additive | WhiteConversion$ All | Description$ You may spend white mana as though it were mana of any color.
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/false_dawn.jpg
-Oracle:Until end of turn, spells and abilities you control that would add colored mana to your mana pool add that much white mana instead. Until end of turn, you may spend white mana as though it were mana of any color.\nDraw a card.
+Oracle:Until end of turn, spells and abilities you control that would add colored mana add that much white mana instead. Until end of turn, you may spend white mana as though it were mana of any color.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/f/farrelite_priest.txt b/forge-gui/res/cardsfolder/f/farrelite_priest.txt
index 27cff37d01a..6ff2c2be677 100644
--- a/forge-gui/res/cardsfolder/f/farrelite_priest.txt
+++ b/forge-gui/res/cardsfolder/f/farrelite_priest.txt
@@ -2,8 +2,8 @@ Name:Farrelite Priest
 ManaCost:1 W W
 Types:Creature Human Cleric
 PT:1/3
-A:AB$ Mana | Cost$ 1 | Produced$ W | ActivationNumberSacrifice$ GE4 | ActivationResolveSub$ DBPump | SpellDescription$ Add {W} to your mana pool. If this ability has been activated four or more times this turn, sacrifice CARDNAME at the beginning of the next end step.
+A:AB$ Mana | Cost$ 1 | Produced$ W | ActivationNumberSacrifice$ GE4 | ActivationResolveSub$ DBPump | SpellDescription$ Add {W}. If this ability has been activated four or more times this turn, sacrifice CARDNAME at the beginning of the next end step.
 SVar:DBPump:DB$ Pump | AtEOT$ Sacrifice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/farrelite_priest.jpg
-Oracle:{1}: Add {W} to your mana pool. If this ability has been activated four or more times this turn, sacrifice Farrelite Priest at the beginning of the next end step.
+Oracle:{1}: Add {W}. If this ability has been activated four or more times this turn, sacrifice Farrelite Priest at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/f/fellwar_stone.txt b/forge-gui/res/cardsfolder/f/fellwar_stone.txt
index d66da82bbb4..e8810a34a2c 100644
--- a/forge-gui/res/cardsfolder/f/fellwar_stone.txt
+++ b/forge-gui/res/cardsfolder/f/fellwar_stone.txt
@@ -1,6 +1,6 @@
 Name:Fellwar Stone
 ManaCost:2
 Types:Artifact
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.OppCtrl | ReflectProperty$ Produce | SpellDescription$ Add to your mana pool one mana of any color that a land an opponent controls could produce.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.OppCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any color that a land an opponent controls could produce.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fellwar_stone.jpg
-Oracle:{T}: Add to your mana pool one mana of any color that a land an opponent controls could produce.
+Oracle:{T}: Add one mana of any color that a land an opponent controls could produce.
diff --git a/forge-gui/res/cardsfolder/f/fertile_ground.txt b/forge-gui/res/cardsfolder/f/fertile_ground.txt
index 765edc311a6..921004dbbfc 100644
--- a/forge-gui/res/cardsfolder/f/fertile_ground.txt
+++ b/forge-gui/res/cardsfolder/f/fertile_ground.txt
@@ -3,8 +3,8 @@ ManaCost:1 G
 Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Land | AILogic$ Pump
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.
 SVar:TrigMana:DB$ Mana | Produced$ Any | Amount$ 1 | Defined$ TriggeredCardController
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fertile_ground.jpg
-Oracle:Enchant land\nWhenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool (in addition to the mana the land produces).
+Oracle:Enchant land\nWhenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.
diff --git a/forge-gui/res/cardsfolder/f/fertile_thicket.txt b/forge-gui/res/cardsfolder/f/fertile_thicket.txt
index c13991be972..d39817d2b67 100644
--- a/forge-gui/res/cardsfolder/f/fertile_thicket.txt
+++ b/forge-gui/res/cardsfolder/f/fertile_thicket.txt
@@ -4,6 +4,6 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may look at the top five cards of your library. If you do, reveal up to one basic land card from among them, then put that card on top of your library and the rest on the bottom in any order.
 SVar:TrigDig:DB$Dig | DigNum$ 5 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Land.Basic | DestinationZone$ Library | LibraryPosition$ 0
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fertile_thicket.jpg
-Oracle:Fertile Thicket enters the battlefield tapped.\nWhen Fertile Thicket enters the battlefield, you may look at the top five cards of your library. If you do, reveal up to one basic land card from among them, then put that card on top of your library and the rest on the bottom in any order.\n{T}: Add {G} to your mana pool.
+Oracle:Fertile Thicket enters the battlefield tapped.\nWhen Fertile Thicket enters the battlefield, you may look at the top five cards of your library. If you do, reveal up to one basic land card from among them, then put that card on top of your library and the rest on the bottom in any order.\n{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/f/fetid_heath.txt b/forge-gui/res/cardsfolder/f/fetid_heath.txt
index 1acb3a0d2fa..22a32f572aa 100644
--- a/forge-gui/res/cardsfolder/f/fetid_heath.txt
+++ b/forge-gui/res/cardsfolder/f/fetid_heath.txt
@@ -1,10 +1,10 @@
 Name:Fetid Heath
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ WB T | Produced$ W | Amount$ 2 | SpellDescription$ Add {W}{W} to your mana pool.
-A:AB$ Mana | Cost$ WB T | Produced$ W B | SpellDescription$ Add {W}{B} to your mana pool.
-A:AB$ Mana | Cost$ WB T | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ WB T | Produced$ W | Amount$ 2 | SpellDescription$ Add {W}{W}.
+A:AB$ Mana | Cost$ WB T | Produced$ W B | SpellDescription$ Add {W}{B}.
+A:AB$ Mana | Cost$ WB T | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fetid_heath.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{W/B}, {T}: Add {W}{W}, {W}{B}, or {B}{B} to your mana pool.
+Oracle:{T}: Add {C}.\n{W/B}, {T}: Add {W}{W}, {W}{B}, or {B}{B}.
diff --git a/forge-gui/res/cardsfolder/f/fetid_pools.txt b/forge-gui/res/cardsfolder/f/fetid_pools.txt
index 76e5afee92d..23760ec9094 100644
--- a/forge-gui/res/cardsfolder/f/fetid_pools.txt
+++ b/forge-gui/res/cardsfolder/f/fetid_pools.txt
@@ -4,4 +4,4 @@ Types:Land Island Swamp
 K:CARDNAME enters the battlefield tapped.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fetid_pools.jpg
-Oracle:({T}: Add {U} or {B} to your mana pool.)\nFetid Pools enters the battlefield tapped.\nCycling {2} ({2}, discard this card: Draw a card.)
\ No newline at end of file
+Oracle:({T}: Add {U} or {B}.)\nFetid Pools enters the battlefield tapped.\nCycling {2} ({2}, discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/field_of_ruin.txt b/forge-gui/res/cardsfolder/f/field_of_ruin.txt
index 13abf9c6778..ad3789103fc 100644
--- a/forge-gui/res/cardsfolder/f/field_of_ruin.txt
+++ b/forge-gui/res/cardsfolder/f/field_of_ruin.txt
@@ -1,9 +1,9 @@
 Name:Field of Ruin
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | Cost$ 2 T Sac<1/CARDNAME> | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land. | SubAbility$ DBSearch | AILogic$ GhostQuarter | SpellDescription$ Destroy target nonbasic land. Each player searches his or her library for a basic land card, puts it onto the battlefield, then shuffles his or her library.
 SVar:DBSearch:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ Player | ChangeType$ Land.Basic | ChangeNum$ 1
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/field_of_ruin.jpg
-Oracle:{T}: Add {C} to your mana pool\n{2}, {T}, Sacrifice Field of Ruin: Destroy target nonbasic land. Each player searches his or her library for a basic land card, puts it onto the battlefield, then shuffles his or her library.
\ No newline at end of file
+Oracle:{T}: Add {C}\n{2}, {T}, Sacrifice Field of Ruin: Destroy target nonbasic land. Each player searches his or her library for a basic land card, puts it onto the battlefield, then shuffles his or her library.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/fieldmist_borderpost.txt b/forge-gui/res/cardsfolder/f/fieldmist_borderpost.txt
index 2c632a69583..cd08bb7eabf 100644
--- a/forge-gui/res/cardsfolder/f/fieldmist_borderpost.txt
+++ b/forge-gui/res/cardsfolder/f/fieldmist_borderpost.txt
@@ -2,8 +2,8 @@ Name:Fieldmist Borderpost
 ManaCost:1 W U
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:AltCost:Cost$ 1 Return<1/Land.Basic> | Description$ You may pay {1} and return a basic land you control to its owner's hand rather than pay Fieldmist Borderpost's mana cost.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fieldmist_borderpost.jpg
-Oracle:You may pay {1} and return a basic land you control to its owner's hand rather than pay Fieldmist Borderpost's mana cost.\nFieldmist Borderpost enters the battlefield tapped.\n{T}: Add {W} or {U} to your mana pool.
+Oracle:You may pay {1} and return a basic land you control to its owner's hand rather than pay Fieldmist Borderpost's mana cost.\nFieldmist Borderpost enters the battlefield tapped.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/f/fire_diamond.txt b/forge-gui/res/cardsfolder/f/fire_diamond.txt
index 23204f5fe5e..d4befd79972 100644
--- a/forge-gui/res/cardsfolder/f/fire_diamond.txt
+++ b/forge-gui/res/cardsfolder/f/fire_diamond.txt
@@ -1,7 +1,7 @@
 Name:Fire Diamond
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fire_diamond.jpg
-Oracle:Fire Diamond enters the battlefield tapped.\n{T}: Add {R} to your mana pool.
+Oracle:Fire Diamond enters the battlefield tapped.\n{T}: Add {R}.
diff --git a/forge-gui/res/cardsfolder/f/fire_lit_thicket.txt b/forge-gui/res/cardsfolder/f/fire_lit_thicket.txt
index 0dd6e08646b..2c9ef0527fd 100644
--- a/forge-gui/res/cardsfolder/f/fire_lit_thicket.txt
+++ b/forge-gui/res/cardsfolder/f/fire_lit_thicket.txt
@@ -1,10 +1,10 @@
 Name:Fire-Lit Thicket
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ RG T | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R} to your mana pool.
-A:AB$ Mana | Cost$ RG T | Produced$ R G | SpellDescription$ Add {R}{G} to your mana pool.
-A:AB$ Mana | Cost$ RG T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ RG T | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
+A:AB$ Mana | Cost$ RG T | Produced$ R G | SpellDescription$ Add {R}{G}.
+A:AB$ Mana | Cost$ RG T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fire_lit_thicket.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{R/G}, {T}: Add {R}{R}, {R}{G}, or {G}{G} to your mana pool.
+Oracle:{T}: Add {C}.\n{R/G}, {T}: Add {R}{R}, {R}{G}, or {G}{G}.
diff --git a/forge-gui/res/cardsfolder/f/fire_sprites.txt b/forge-gui/res/cardsfolder/f/fire_sprites.txt
index b6c1b44dc52..4b14e814206 100644
--- a/forge-gui/res/cardsfolder/f/fire_sprites.txt
+++ b/forge-gui/res/cardsfolder/f/fire_sprites.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Faerie
 PT:1/1
 K:Flying
-A:AB$ Mana | Cost$ G T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ G T | Produced$ R | SpellDescription$ Add {R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fire_sprites.jpg
-Oracle:Flying\n{G}, {T}: Add {R} to your mana pool.
+Oracle:Flying\n{G}, {T}: Add {R}.
diff --git a/forge-gui/res/cardsfolder/f/firewild_borderpost.txt b/forge-gui/res/cardsfolder/f/firewild_borderpost.txt
index 6b89e0e7f41..b5870f9282f 100644
--- a/forge-gui/res/cardsfolder/f/firewild_borderpost.txt
+++ b/forge-gui/res/cardsfolder/f/firewild_borderpost.txt
@@ -2,8 +2,8 @@ Name:Firewild Borderpost
 ManaCost:1 R G
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:AltCost:Cost$ 1 Return<1/Land.Basic> | Description$ You may pay {1} and return a basic land you control to its owner's hand rather than pay Firewild Borderpost's mana cost.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/firewild_borderpost.jpg
-Oracle:You may pay {1} and return a basic land you control to its owner's hand rather than pay Firewild Borderpost's mana cost.\nFirewild Borderpost enters the battlefield tapped.\n{T}: Add {R} or {G} to your mana pool.
+Oracle:You may pay {1} and return a basic land you control to its owner's hand rather than pay Firewild Borderpost's mana cost.\nFirewild Borderpost enters the battlefield tapped.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/f/flagstones_of_trokair.txt b/forge-gui/res/cardsfolder/f/flagstones_of_trokair.txt
index 28fb6bcf0f0..f9ffa94678c 100644
--- a/forge-gui/res/cardsfolder/f/flagstones_of_trokair.txt
+++ b/forge-gui/res/cardsfolder/f/flagstones_of_trokair.txt
@@ -1,9 +1,9 @@
 Name:Flagstones of Trokair
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may search your library for a Plains card and put it onto the battlefield tapped. If you do, shuffle your library.
 SVar:TrigChange:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.Plains | ChangeNum$ 1 | ShuffleNonMandatory$ True
 SVar:SacMe:3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flagstones_of_trokair.jpg
-Oracle:{T}: Add {W} to your mana pool.\nWhen Flagstones of Trokair is put into a graveyard from the battlefield, you may search your library for a Plains card and put it onto the battlefield tapped. If you do, shuffle your library.
+Oracle:{T}: Add {W}.\nWhen Flagstones of Trokair is put into a graveyard from the battlefield, you may search your library for a Plains card and put it onto the battlefield tapped. If you do, shuffle your library.
diff --git a/forge-gui/res/cardsfolder/f/flamekin_village.txt b/forge-gui/res/cardsfolder/f/flamekin_village.txt
index 68421eb9cd5..f39ddc23ff9 100644
--- a/forge-gui/res/cardsfolder/f/flamekin_village.txt
+++ b/forge-gui/res/cardsfolder/f/flamekin_village.txt
@@ -2,7 +2,7 @@ Name:Flamekin Village
 Types:Land
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Elemental> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal an Elemental card from your hand. If you don't, CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Pump | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SpellDescription$ Target creature gains haste until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flamekin_village.jpg
-Oracle:As Flamekin Village enters the battlefield, you may reveal an Elemental card from your hand. If you don't, Flamekin Village enters the battlefield tapped.\n{T}: Add {R} to your mana pool.\n{R}, {T}: Target creature gains haste until end of turn.
+Oracle:As Flamekin Village enters the battlefield, you may reveal an Elemental card from your hand. If you don't, Flamekin Village enters the battlefield tapped.\n{T}: Add {R}.\n{R}, {T}: Target creature gains haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/f/flooded_grove.txt b/forge-gui/res/cardsfolder/f/flooded_grove.txt
index 5310cd77fe4..7c7f99596af 100644
--- a/forge-gui/res/cardsfolder/f/flooded_grove.txt
+++ b/forge-gui/res/cardsfolder/f/flooded_grove.txt
@@ -1,10 +1,10 @@
 Name:Flooded Grove
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ GU T | Produced$ U | Amount$ 2 | SpellDescription$ Add {U}{U} to your mana pool.
-A:AB$ Mana | Cost$ GU T | Produced$ G U | SpellDescription$ Add {G}{U} to your mana pool.
-A:AB$ Mana | Cost$ GU T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ GU T | Produced$ U | Amount$ 2 | SpellDescription$ Add {U}{U}.
+A:AB$ Mana | Cost$ GU T | Produced$ G U | SpellDescription$ Add {G}{U}.
+A:AB$ Mana | Cost$ GU T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flooded_grove.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{G/U}, {T}: Add {G}{G}, {G}{U}, or {U}{U} to your mana pool.
+Oracle:{T}: Add {C}.\n{G/U}, {T}: Add {G}{G}, {G}{U}, or {U}{U}.
diff --git a/forge-gui/res/cardsfolder/f/food_chain.txt b/forge-gui/res/cardsfolder/f/food_chain.txt
index 23cc024a6f2..9dfff7b22a8 100644
--- a/forge-gui/res/cardsfolder/f/food_chain.txt
+++ b/forge-gui/res/cardsfolder/f/food_chain.txt
@@ -1,9 +1,9 @@
 Name:Food Chain
 ManaCost:2 G
 Types:Enchantment
-A:AB$ Mana | Cost$ Exile<1/Creature> | Produced$ Any | Amount$ X | RestrictValid$ Card.Creature | References$ X | SpellDescription$ Add X mana of any one color to your mana pool, where X is the exiled creature's converted mana cost plus one. Spend this mana only to cast creature spells.
+A:AB$ Mana | Cost$ Exile<1/Creature> | Produced$ Any | Amount$ X | RestrictValid$ Card.Creature | References$ X | SpellDescription$ Add X mana of any one color, where X is the exiled creature's converted mana cost plus one. Spend this mana only to cast creature spells.
 SVar:X:Exiled$CardManaCost/Plus.1
 SVar:NonStackingEffect:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/food_chain.jpg
-Oracle:Exile a creature you control: Add X mana of any one color to your mana pool, where X is the exiled creature's converted mana cost plus one. Spend this mana only to cast creature spells.
+Oracle:Exile a creature you control: Add X mana of any one color, where X is the exiled creature's converted mana cost plus one. Spend this mana only to cast creature spells.
diff --git a/forge-gui/res/cardsfolder/f/forbidden_orchard.txt b/forge-gui/res/cardsfolder/f/forbidden_orchard.txt
index 3a70f92ac24..d35cececfd0 100644
--- a/forge-gui/res/cardsfolder/f/forbidden_orchard.txt
+++ b/forge-gui/res/cardsfolder/f/forbidden_orchard.txt
@@ -1,8 +1,8 @@
 Name:Forbidden Orchard
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 T:Mode$ TapsForMana | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever you tap CARDNAME for mana, target opponent creates a 1/1 colorless Spirit creature token.
 SVar:TrigToken:DB$ Token | ValidTgts$ Opponent | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenOwner$ Targeted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forbidden_orchard.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.\nWhenever you tap Forbidden Orchard for mana, target opponent creates a 1/1 colorless Spirit creature token. 
\ No newline at end of file
+Oracle:{T}: Add one mana of any color.\nWhenever you tap Forbidden Orchard for mana, target opponent creates a 1/1 colorless Spirit creature token.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/forbidding_watchtower.txt b/forge-gui/res/cardsfolder/f/forbidding_watchtower.txt
index afd94a7b381..d00ef20755c 100644
--- a/forge-gui/res/cardsfolder/f/forbidding_watchtower.txt
+++ b/forge-gui/res/cardsfolder/f/forbidding_watchtower.txt
@@ -2,7 +2,7 @@ Name:Forbidding Watchtower
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Animate | Cost$ 1 W | Defined$ Self | Power$ 1 | Toughness$ 5 | Types$ Creature,Soldier | Colors$ White | SpellDescription$ CARDNAME becomes a 1/5 white Soldier creature until end of turn. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forbidding_watchtower.jpg
-Oracle:Forbidding Watchtower enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\n{1}{W}: Forbidding Watchtower becomes a 1/5 white Soldier creature until end of turn. It's still a land.
+Oracle:Forbidding Watchtower enters the battlefield tapped.\n{T}: Add {W}.\n{1}{W}: Forbidding Watchtower becomes a 1/5 white Soldier creature until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/f/foreboding_ruins.txt b/forge-gui/res/cardsfolder/f/foreboding_ruins.txt
index 85b936a1c8a..560e6b85af8 100644
--- a/forge-gui/res/cardsfolder/f/foreboding_ruins.txt
+++ b/forge-gui/res/cardsfolder/f/foreboding_ruins.txt
@@ -1,9 +1,9 @@
 Name:Foreboding Ruins
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Swamp,Mountain/Swamp or Mountain> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Swamp or Mountain card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foreboding_ruins.jpg
-Oracle:As Foreboding Ruins enters the battlefield, you may reveal a Swamp or Mountain card from your hand. If you don't, Foreboding Ruins enters the battlefield tapped.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:As Foreboding Ruins enters the battlefield, you may reveal a Swamp or Mountain card from your hand. If you don't, Foreboding Ruins enters the battlefield tapped.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/f/forgotten_cave.txt b/forge-gui/res/cardsfolder/f/forgotten_cave.txt
index aaf6eedc07f..72c2588f022 100644
--- a/forge-gui/res/cardsfolder/f/forgotten_cave.txt
+++ b/forge-gui/res/cardsfolder/f/forgotten_cave.txt
@@ -2,7 +2,7 @@ Name:Forgotten Cave
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 K:Cycling:R
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forgotten_cave.jpg
-Oracle:Forgotten Cave enters the battlefield tapped.\n{T}: Add {R} to your mana pool.\nCycling {R} ({R}, Discard this card: Draw a card.)
+Oracle:Forgotten Cave enters the battlefield tapped.\n{T}: Add {R}.\nCycling {R} ({R}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/f/foriysian_totem.txt b/forge-gui/res/cardsfolder/f/foriysian_totem.txt
index 4c7be9819ba..fd96f56d4ed 100644
--- a/forge-gui/res/cardsfolder/f/foriysian_totem.txt
+++ b/forge-gui/res/cardsfolder/f/foriysian_totem.txt
@@ -1,10 +1,10 @@
 Name:Foriysian Totem
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Animate | Cost$ 4 R | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Giant | Colors$ Red | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 4/4 red Giant artifact creature with trample until end of turn.
 S:Mode$ Continuous | Affected$ Creature.Self | AddHiddenKeyword$ CARDNAME can block an additional creature each combat. | Description$ As long as CARDNAME is a creature, it can block an additional creature each combat.
 DeckNeeds:Color$Red
 #TODO: The AI won't block multiple creatures yet, it seems. Can be improved.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foriysian_totem.jpg
-Oracle:{T}: Add {R} to your mana pool.\n{4}{R}: Foriysian Totem becomes a 4/4 red Giant artifact creature with trample until end of turn.\nAs long as Foriysian Totem is a creature, it can block an additional creature each combat.
+Oracle:{T}: Add {R}.\n{4}{R}: Foriysian Totem becomes a 4/4 red Giant artifact creature with trample until end of turn.\nAs long as Foriysian Totem is a creature, it can block an additional creature each combat.
diff --git a/forge-gui/res/cardsfolder/f/forsaken_city.txt b/forge-gui/res/cardsfolder/f/forsaken_city.txt
index f46d79cad84..6984b40d017 100644
--- a/forge-gui/res/cardsfolder/f/forsaken_city.txt
+++ b/forge-gui/res/cardsfolder/f/forsaken_city.txt
@@ -2,9 +2,9 @@ Name:Forsaken City
 ManaCost:no cost
 Types:Land
 K:CARDNAME doesn't untap during your untap step.
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may exile a card from your hand. If you do, untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ ExileFromHand<1/Card> | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forsaken_city.jpg
-Oracle:Forsaken City doesn't untap during your untap step.\nAt the beginning of your upkeep, you may exile a card from your hand. If you do, untap Forsaken City.\n{T}: Add one mana of any color to your mana pool.
+Oracle:Forsaken City doesn't untap during your untap step.\nAt the beginning of your upkeep, you may exile a card from your hand. If you do, untap Forsaken City.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/f/forsaken_sanctuary.txt b/forge-gui/res/cardsfolder/f/forsaken_sanctuary.txt
index 82449ce34d8..340dd71f397 100644
--- a/forge-gui/res/cardsfolder/f/forsaken_sanctuary.txt
+++ b/forge-gui/res/cardsfolder/f/forsaken_sanctuary.txt
@@ -2,7 +2,7 @@ Name:Forsaken Sanctuary
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forsaken_sanctuary.jpg
-Oracle:Forsaken Sanctuary enters the battlefield tapped.\n{T}: Add {W} or {B} to your mana pool. 
\ No newline at end of file
+Oracle:Forsaken Sanctuary enters the battlefield tapped.\n{T}: Add {W} or {B}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/fortified_village.txt b/forge-gui/res/cardsfolder/f/fortified_village.txt
index 6c0c979e637..53b8451fa15 100644
--- a/forge-gui/res/cardsfolder/f/fortified_village.txt
+++ b/forge-gui/res/cardsfolder/f/fortified_village.txt
@@ -1,9 +1,9 @@
 Name:Fortified Village
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Forest,Plains/Forest or Plains> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Forest or Plains card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fortified_village.jpg
-Oracle:As Fortified Village enters the battlefield, you may reveal a Forest or Plains card from your hand. If you don't, Fortified Village enters the battlefield tapped.\n{T}: Add {G} or {W} to your mana pool.
+Oracle:As Fortified Village enters the battlefield, you may reveal a Forest or Plains card from your hand. If you don't, Fortified Village enters the battlefield tapped.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/f/foul_orchard.txt b/forge-gui/res/cardsfolder/f/foul_orchard.txt
index 666b77d0d93..36bfc163fd6 100644
--- a/forge-gui/res/cardsfolder/f/foul_orchard.txt
+++ b/forge-gui/res/cardsfolder/f/foul_orchard.txt
@@ -2,7 +2,7 @@ Name:Foul Orchard
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foul_orchard.jpg
-Oracle:Foul Orchard enters the battlefield tapped.\n{T}: Add {B} or {G} to your mana pool. 
\ No newline at end of file
+Oracle:Foul Orchard enters the battlefield tapped.\n{T}: Add {B} or {G}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/fountain_of_cho.txt b/forge-gui/res/cardsfolder/f/fountain_of_cho.txt
index a8fafd7510f..36aa61aea28 100644
--- a/forge-gui/res/cardsfolder/f/fountain_of_cho.txt
+++ b/forge-gui/res/cardsfolder/f/fountain_of_cho.txt
@@ -3,9 +3,9 @@ ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
 A:AB$ PutCounter | Cost$ T | Defined$ Self | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ W | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {W} to your mana pool for each storage counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ W | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {W} for each storage counter removed this way.
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fountain_of_cho.jpg
-Oracle:Fountain of Cho enters the battlefield tapped.\n{T}: Put a storage counter on Fountain of Cho.\n{T}, Remove any number of storage counters from Fountain of Cho: Add {W} to your mana pool for each storage counter removed this way.
+Oracle:Fountain of Cho enters the battlefield tapped.\n{T}: Put a storage counter on Fountain of Cho.\n{T}, Remove any number of storage counters from Fountain of Cho: Add {W} for each storage counter removed this way.
diff --git a/forge-gui/res/cardsfolder/f/fractured_powerstone.txt b/forge-gui/res/cardsfolder/f/fractured_powerstone.txt
index f230282c90c..ab3c63cabb5 100644
--- a/forge-gui/res/cardsfolder/f/fractured_powerstone.txt
+++ b/forge-gui/res/cardsfolder/f/fractured_powerstone.txt
@@ -1,8 +1,8 @@
 Name:Fractured Powerstone
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ RollPlanarDice | Cost$ T | SorcerySpeed$ True | SpellDescription$ Roll the planar die. Activate this ability only any time you could cast a sorcery.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fractured_powerstone.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Roll the planar die. Activate this ability only any time you could cast a sorcery.
+Oracle:{T}: Add {C}.\n{T}: Roll the planar die. Activate this ability only any time you could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/f/freyalise_llanowars_fury.txt b/forge-gui/res/cardsfolder/f/freyalise_llanowars_fury.txt
index 27c89474a3b..4a7cd2258b1 100644
--- a/forge-gui/res/cardsfolder/f/freyalise_llanowars_fury.txt
+++ b/forge-gui/res/cardsfolder/f/freyalise_llanowars_fury.txt
@@ -3,10 +3,10 @@ ManaCost:3 G G
 Types:Legendary Planeswalker Freyalise
 Loyalty:3
 Text:CARDNAME can be your commander.
-A:AB$ Token | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenName$ Elf Druid | TokenTypes$ Creature,Elf,Druid | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenAbilities$ DBMana | SpellDescription$ Create a 1/1 green Elf Druid creature token with "{T}: Add {G} to your mana pool."
-SVar:DBMana:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Token | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenName$ Elf Druid | TokenTypes$ Creature,Elf,Druid | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenAbilities$ DBMana | SpellDescription$ Create a 1/1 green Elf Druid creature token with "{T}: Add {G}."
+SVar:DBMana:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Destroy | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 A:AB$ Draw | Cost$ SubCounter<6/LOYALTY> | NumCards$ X | Planeswalker$ True | Ultimate$ True | Defined$ You | References$ X | SpellDescription$ Draw a card for each green creature you control.
 SVar:X:Count$Valid Creature.Green+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/freyalise_llanowars_fury.jpg
-Oracle:[+2]: Create a 1/1 green Elf Druid creature token with "{T}: Add {G} to your mana pool."\n[-2]: Destroy target artifact or enchantment.\n[-6]: Draw a card for each green creature you control.\nFreyalise, Llanowar's Fury can be your commander.
+Oracle:[+2]: Create a 1/1 green Elf Druid creature token with "{T}: Add {G}."\n[-2]: Destroy target artifact or enchantment.\n[-6]: Draw a card for each green creature you control.\nFreyalise, Llanowar's Fury can be your commander.
diff --git a/forge-gui/res/cardsfolder/f/from_beyond.txt b/forge-gui/res/cardsfolder/f/from_beyond.txt
index 10d3134461b..7143384f8f1 100644
--- a/forge-gui/res/cardsfolder/f/from_beyond.txt
+++ b/forge-gui/res/cardsfolder/f/from_beyond.txt
@@ -2,11 +2,11 @@ Name:From Beyond
 ManaCost:3 G
 Types:Enchantment
 K:Devoid
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 1 G Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Eldrazi | ChangeNum$ 1 | SpellDescription$ Search your library for an Eldrazi card, reveal it, put it into your hand, then shuffle your library.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/from_beyond.jpg
-Oracle:Devoid (This card has no color.)\nAt the beginning of your upkeep, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."\n{1}{G}, Sacrifice From Beyond: Search your library for an Eldrazi card, reveal it, put it into your hand, then shuffle your library.
+Oracle:Devoid (This card has no color.)\nAt the beginning of your upkeep, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."\n{1}{G}, Sacrifice From Beyond: Search your library for an Eldrazi card, reveal it, put it into your hand, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/f/frontier_bivouac.txt b/forge-gui/res/cardsfolder/f/frontier_bivouac.txt
index 377249ee745..7df17d74017 100644
--- a/forge-gui/res/cardsfolder/f/frontier_bivouac.txt
+++ b/forge-gui/res/cardsfolder/f/frontier_bivouac.txt
@@ -2,8 +2,8 @@ Name:Frontier Bivouac
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frontier_bivouac.jpg
-Oracle:Frontier Bivouac enters the battlefield tapped.\n{T}: Add {G}, {U}, or {R} to your mana pool.
+Oracle:Frontier Bivouac enters the battlefield tapped.\n{T}: Add {G}, {U}, or {R}.
diff --git a/forge-gui/res/cardsfolder/f/frontier_siege.txt b/forge-gui/res/cardsfolder/f/frontier_siege.txt
index 584ea2ea325..d76ba6a27ba 100644
--- a/forge-gui/res/cardsfolder/f/frontier_siege.txt
+++ b/forge-gui/res/cardsfolder/f/frontier_siege.txt
@@ -1,13 +1,13 @@
 Name:Frontier Siege
 ManaCost:3 G
 Types:Enchantment
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ SiegeChoice | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose Khans or Dragons. Khans — At the beginning of each of your main phases, add {G}{G} to your mana pool. Dragons — Whenever a creature with flying enters the battlefield under your control, you may have it fight target creature you don't control.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ SiegeChoice | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose Khans or Dragons. Khans — At the beginning of each of your main phases, add {G}{G}. Dragons — Whenever a creature with flying enters the battlefield under your control, you may have it fight target creature you don't control.
 SVar:SiegeChoice:DB$ GenericChoice | Choices$ Khans,Dragons | Defined$ You | SetChosenMode$ True | AILogic$ Khans | ShowChoice$ ExceptSelf
 SVar:Khans:DB$ Animate | Defined$ Self | Triggers$ KhansTrigger | Permanent$ True | SpellDescription$ Khans
-SVar:KhansTrigger:Mode$ Phase | Phase$ Main1,Main2 | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ ManaGain | TriggerDescription$ At the beginning of each of your main phases, add {G}{G} to your mana pool.
+SVar:KhansTrigger:Mode$ Phase | Phase$ Main1,Main2 | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ ManaGain | TriggerDescription$ At the beginning of each of your main phases, add {G}{G}.
 SVar:ManaGain:DB$ Mana | Produced$ G G
 SVar:Dragons:DB$ Animate | Defined$ Self | Triggers$ DragonsTrigger | Permanent$ True | SpellDescription$ Dragons
 SVar:DragonsTrigger:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+withFlying | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ AirFight | TriggerDescription$ Whenever a creature with flying enters the battlefield under your control, you may have it fight target creature you don't control.
 SVar:AirFight:DB$ Fight | Defined$ TriggeredCard | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control | ConditionDefined$ TriggeredCard | ConditionPresent$ Creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frontier_siege.jpg
-Oracle:As Frontier Siege enters the battlefield, choose Khans or Dragons.\n• Khans — At the beginning of each of your main phases, add {G}{G} to your mana pool.\n• Dragons — Whenever a creature with flying enters the battlefield under your control, you may have it fight target creature you don't control.
+Oracle:As Frontier Siege enters the battlefield, choose Khans or Dragons.\n• Khans — At the beginning of each of your main phases, add {G}{G}.\n• Dragons — Whenever a creature with flying enters the battlefield under your control, you may have it fight target creature you don't control.
diff --git a/forge-gui/res/cardsfolder/f/frost_marsh.txt b/forge-gui/res/cardsfolder/f/frost_marsh.txt
index 1131f59f19f..156eee83ae6 100644
--- a/forge-gui/res/cardsfolder/f/frost_marsh.txt
+++ b/forge-gui/res/cardsfolder/f/frost_marsh.txt
@@ -2,7 +2,7 @@ Name:Frost Marsh
 ManaCost:no cost
 Types:Snow Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frost_marsh.jpg
-Oracle:Frost Marsh enters the battlefield tapped.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:Frost Marsh enters the battlefield tapped.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/f/fungal_reaches.txt b/forge-gui/res/cardsfolder/f/fungal_reaches.txt
index 25215dcd0fd..dafd6494bea 100644
--- a/forge-gui/res/cardsfolder/f/fungal_reaches.txt
+++ b/forge-gui/res/cardsfolder/f/fungal_reaches.txt
@@ -1,10 +1,10 @@
 Name:Fungal Reaches
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo R G | Amount$ ChosenX | CostDesc$ {1}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of {R} and/or {G} to your mana pool.
+A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo R G | Amount$ ChosenX | CostDesc$ {1}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of {R} and/or {G}.
 SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fungal_reaches.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Put a storage counter on Fungal Reaches.\n{1}, Remove X storage counters from Fungal Reaches: Add X mana in any combination of {R} and/or {G} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Put a storage counter on Fungal Reaches.\n{1}, Remove X storage counters from Fungal Reaches: Add X mana in any combination of {R} and/or {G}.
diff --git a/forge-gui/res/cardsfolder/f/fyndhorn_elder.txt b/forge-gui/res/cardsfolder/f/fyndhorn_elder.txt
index 826cdb72577..18a1567903f 100644
--- a/forge-gui/res/cardsfolder/f/fyndhorn_elder.txt
+++ b/forge-gui/res/cardsfolder/f/fyndhorn_elder.txt
@@ -2,6 +2,6 @@ Name:Fyndhorn Elder
 ManaCost:2 G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fyndhorn_elder.jpg
-Oracle:{T}: Add {G}{G} to your mana pool.
+Oracle:{T}: Add {G}{G}.
diff --git a/forge-gui/res/cardsfolder/f/fyndhorn_elves.txt b/forge-gui/res/cardsfolder/f/fyndhorn_elves.txt
index ab9272b4339..6f591a74af5 100644
--- a/forge-gui/res/cardsfolder/f/fyndhorn_elves.txt
+++ b/forge-gui/res/cardsfolder/f/fyndhorn_elves.txt
@@ -2,6 +2,6 @@ Name:Fyndhorn Elves
 ManaCost:G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://resources.wizards.com/magic/cards/ia/en-us/card2568.jpg
-Oracle:{T}: Add {G} to your mana pool.
+Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/g/gaeas_cradle.txt b/forge-gui/res/cardsfolder/g/gaeas_cradle.txt
index 5c841792abc..8c125059b74 100644
--- a/forge-gui/res/cardsfolder/g/gaeas_cradle.txt
+++ b/forge-gui/res/cardsfolder/g/gaeas_cradle.txt
@@ -1,7 +1,7 @@
 Name:Gaea's Cradle
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} to your mana pool for each Creature you control.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} for each Creature you control.
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gaeas_cradle.jpg
-Oracle:{T}: Add {G} to your mana pool for each creature you control.
+Oracle:{T}: Add {G} for each creature you control.
diff --git a/forge-gui/res/cardsfolder/g/gaeas_touch.txt b/forge-gui/res/cardsfolder/g/gaeas_touch.txt
index d10e5f265c8..d6acdfbc187 100644
--- a/forge-gui/res/cardsfolder/g/gaeas_touch.txt
+++ b/forge-gui/res/cardsfolder/g/gaeas_touch.txt
@@ -1,7 +1,7 @@
 Name:Gaea's Touch
 ManaCost:G G
 Types:Enchantment
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ G G | SpellDescription$ Add {G}{G} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ G G | SpellDescription$ Add {G}{G}.
 A:AB$ ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Forest.Basic+YouCtrl | ChangeNum$ 1 | SorcerySpeed$ True | ActivationLimit$ 1 | SpellDescription$ You may put a basic Forest card from your hand onto the battlefield. Activate this ability only any time you could cast a sorcery and only once each turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gaeas_touch.jpg
-Oracle:{0}: You may put a basic Forest card from your hand onto the battlefield. Activate this ability only any time you could cast a sorcery and only once each turn.\nSacrifice Gaea's Touch: Add {G}{G} to your mana pool.
+Oracle:{0}: You may put a basic Forest card from your hand onto the battlefield. Activate this ability only any time you could cast a sorcery and only once each turn.\nSacrifice Gaea's Touch: Add {G}{G}.
diff --git a/forge-gui/res/cardsfolder/g/game_trail.txt b/forge-gui/res/cardsfolder/g/game_trail.txt
index be4bbf8d71e..93b20b4fd7c 100644
--- a/forge-gui/res/cardsfolder/g/game_trail.txt
+++ b/forge-gui/res/cardsfolder/g/game_trail.txt
@@ -1,9 +1,9 @@
 Name:Game Trail
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Mountain,Forest/Mountain or Forest> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Mountain or Forest card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/game_trail.jpg
-Oracle:As Game Trail enters the battlefield, you may reveal a Mountain or Forest card from your hand. If you don't, Game Trail enters the battlefield tapped.\n{T}: Add {R} or {G} to your mana pool.
+Oracle:As Game Trail enters the battlefield, you may reveal a Mountain or Forest card from your hand. If you don't, Game Trail enters the battlefield tapped.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/g/gargoyle_castle.txt b/forge-gui/res/cardsfolder/g/gargoyle_castle.txt
index 138273d6292..6f16b211407 100644
--- a/forge-gui/res/cardsfolder/g/gargoyle_castle.txt
+++ b/forge-gui/res/cardsfolder/g/gargoyle_castle.txt
@@ -1,7 +1,7 @@
 Name:Gargoyle Castle
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Token | Cost$ 5 T Sac<1/CARDNAME> | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Gargoyle | TokenTypes$ Artifact,Creature,Gargoyle | TokenColors$ Colorless | TokenPower$ 3 | TokenToughness$ 4 | TokenKeywords$ Flying | SpellDescription$ Create a 3/4 colorless Gargoyle artifact creature token with flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gargoyle_castle.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{5}, {T}, Sacrifice Gargoyle Castle: Create a 3/4 colorless Gargoyle artifact creature token with flying.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{5}, {T}, Sacrifice Gargoyle Castle: Create a 3/4 colorless Gargoyle artifact creature token with flying.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/gauntlet_of_might.txt b/forge-gui/res/cardsfolder/g/gauntlet_of_might.txt
index 40dd8c43104..43285a2bedf 100644
--- a/forge-gui/res/cardsfolder/g/gauntlet_of_might.txt
+++ b/forge-gui/res/cardsfolder/g/gauntlet_of_might.txt
@@ -2,9 +2,9 @@ Name:Gauntlet of Might
 ManaCost:4
 Types:Artifact
 S:Mode$ Continuous | Affected$ Creature.Red | AddPower$ 1 | AddToughness$ 1 | Description$ Red creatures get +1/+1.
-T:Mode$ TapsForMana | ValidCard$ Mountain | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a Mountain is tapped for mana, its controller adds {R} to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Mountain | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a Mountain is tapped for mana, its controller adds an additional {R}.
 SVar:TrigMana:DB$ Mana | Produced$ R | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gauntlet_of_might.jpg
-Oracle:Red creatures get +1/+1.\nWhenever a Mountain is tapped for mana, its controller adds {R} to his or her mana pool (in addition to the mana the land produces).
+Oracle:Red creatures get +1/+1.\nWhenever a Mountain is tapped for mana, its controller adds an additional {R}.
diff --git a/forge-gui/res/cardsfolder/g/gauntlet_of_power.txt b/forge-gui/res/cardsfolder/g/gauntlet_of_power.txt
index 9adbe7afdc4..40420362905 100644
--- a/forge-gui/res/cardsfolder/g/gauntlet_of_power.txt
+++ b/forge-gui/res/cardsfolder/g/gauntlet_of_power.txt
@@ -4,7 +4,7 @@ Types:Artifact
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
 S:Mode$ Continuous | Affected$ Creature.ChosenColor | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures of the chosen color get +1/+1.
-T:Mode$ TapsForMana | ValidCard$ Land.Basic | Produced$ ChosenColor | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a basic land is tapped for mana of the chosen color, its controller adds one mana of that color to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Land.Basic | Produced$ ChosenColor | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a basic land is tapped for mana of the chosen color, its controller adds an additional one mana of that color.
 SVar:TrigMana:DB$ Mana | Produced$ Chosen | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gauntlet_of_power.jpg
-Oracle:As Gauntlet of Power enters the battlefield, choose a color.\nCreatures of the chosen color get +1/+1.\nWhenever a basic land is tapped for mana of the chosen color, its controller adds one mana of that color to his or her mana pool (in addition to the mana the land produces).
+Oracle:As Gauntlet of Power enters the battlefield, choose a color.\nCreatures of the chosen color get +1/+1.\nWhenever a basic land is tapped for mana of the chosen color, its controller adds an additional one mana of that color.
diff --git a/forge-gui/res/cardsfolder/g/gavony_township.txt b/forge-gui/res/cardsfolder/g/gavony_township.txt
index b246b2347bb..27e1d30bd1e 100644
--- a/forge-gui/res/cardsfolder/g/gavony_township.txt
+++ b/forge-gui/res/cardsfolder/g/gavony_township.txt
@@ -1,7 +1,7 @@
 Name:Gavony Township
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounterAll | Cost$ 2 G W T | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | AILogic$ AtEOTOrBlock | SpellDescription$ Put a +1/+1 counter on each creature you control.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gavony_township.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}{G}{W}, {T}: Put a +1/+1 counter on each creature you control.
+Oracle:{T}: Add {C}.\n{2}{G}{W}, {T}: Put a +1/+1 counter on each creature you control.
diff --git a/forge-gui/res/cardsfolder/g/geier_reach_sanitarium.txt b/forge-gui/res/cardsfolder/g/geier_reach_sanitarium.txt
index d6c2a3f62fa..9d21a4f428e 100644
--- a/forge-gui/res/cardsfolder/g/geier_reach_sanitarium.txt
+++ b/forge-gui/res/cardsfolder/g/geier_reach_sanitarium.txt
@@ -1,8 +1,8 @@
 Name:Geier Reach Sanitarium
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ 2 T | Defined$ Player | SpellDescription$ Each player draws a card, then discards a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | NumCards$ 1 | Mode$ TgtChoose | Defined$ Player 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/geier_reach_sanitarium.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: Each player draws a card, then discards a card. 
+Oracle:{T}: Add {C}.\n{2}, {T}: Each player draws a card, then discards a card.
diff --git a/forge-gui/res/cardsfolder/g/gemhide_sliver.txt b/forge-gui/res/cardsfolder/g/gemhide_sliver.txt
index 382429a8ea5..d82c8ea358d 100644
--- a/forge-gui/res/cardsfolder/g/gemhide_sliver.txt
+++ b/forge-gui/res/cardsfolder/g/gemhide_sliver.txt
@@ -2,8 +2,8 @@ Name:Gemhide Sliver
 ManaCost:1 G
 Types:Creature Sliver
 PT:1/1
-S:Mode$ Continuous | Affected$ Sliver | AddAbility$ AnyMana | Description$ All Slivers have "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Sliver | AddAbility$ AnyMana | Description$ All Slivers have "{T}: Add one mana of any color."
+SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gemhide_sliver.jpg
-Oracle:All Slivers have "{T}: Add one mana of any color to your mana pool."
+Oracle:All Slivers have "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/g/gemstone_array.txt b/forge-gui/res/cardsfolder/g/gemstone_array.txt
index 389c31cac4e..de47b02c3ed 100644
--- a/forge-gui/res/cardsfolder/g/gemstone_array.txt
+++ b/forge-gui/res/cardsfolder/g/gemstone_array.txt
@@ -2,6 +2,6 @@ Name:Gemstone Array
 ManaCost:4
 Types:Artifact
 A:AB$ PutCounter | Cost$ 2 | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-A:AB$ Mana | Cost$ SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gemstone_array.jpg
-Oracle:{2}: Put a charge counter on Gemstone Array.\nRemove a charge counter from Gemstone Array: Add one mana of any color to your mana pool.
+Oracle:{2}: Put a charge counter on Gemstone Array.\nRemove a charge counter from Gemstone Array: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/g/gemstone_caverns.txt b/forge-gui/res/cardsfolder/g/gemstone_caverns.txt
index adae0dd08b5..1d436da011a 100644
--- a/forge-gui/res/cardsfolder/g/gemstone_caverns.txt
+++ b/forge-gui/res/cardsfolder/g/gemstone_caverns.txt
@@ -5,10 +5,10 @@ K:MayEffectFromOpeningHand:FromOpeningHand:!PlayFirst
 SVar:FromOpeningHand:DB$ ChangeZone | Defined$ Self | Origin$ Hand | Destination$ Battlefield | SubAbility$ LuckCounter | SpellDescription$ If CARDNAME is in your opening hand and you're not playing first, you may begin the game with CARDNAME on the battlefield with a luck counter on it.
 SVar:LuckCounter:DB$ PutCounter | CounterType$ LUCK | CounterNum$ 1 | Defined$ Self | SubAbility$ ExileFromHand
 SVar:ExileFromHand:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SpellDescription$ If you do, exile a card from your hand.
-A:AB$ Mana | Cost$ T | Produced$ C | ConditionCheckSVar$ CheckCounter | ConditionSVarCompare$ EQ0 | SubAbility$ DBMana | References$ CheckCounter | SpellDescription$ Add {C} to your mana pool. If CARDNAME has a luck counter on it, instead add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | ConditionCheckSVar$ CheckCounter | ConditionSVarCompare$ EQ0 | SubAbility$ DBMana | References$ CheckCounter | SpellDescription$ Add {C}. If CARDNAME has a luck counter on it, instead add one mana of any color.
 SVar:DBMana:DB$ Mana | Produced$ Any | ConditionCheckSVar$ CheckCounter | ConditionSVarCompare$ GE1 | References$ CheckCounter
 SVar:CheckCounter:Count$CardCounters.LUCK
 #TODO: The AI is not yet fully aware that this card can generate any color of mana at any time if it has a luck counter on it.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gemstone_caverns.jpg
-Oracle:If Gemstone Caverns is in your opening hand and you're not playing first, you may begin the game with Gemstone Caverns on the battlefield with a luck counter on it. If you do, exile a card from your hand.\n{T}: Add {C} to your mana pool. If Gemstone Caverns has a luck counter on it, instead add one mana of any color to your mana pool.
+Oracle:If Gemstone Caverns is in your opening hand and you're not playing first, you may begin the game with Gemstone Caverns on the battlefield with a luck counter on it. If you do, exile a card from your hand.\n{T}: Add {C}. If Gemstone Caverns has a luck counter on it, instead add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/g/gemstone_mine.txt b/forge-gui/res/cardsfolder/g/gemstone_mine.txt
index 88835d238a8..673106ee112 100644
--- a/forge-gui/res/cardsfolder/g/gemstone_mine.txt
+++ b/forge-gui/res/cardsfolder/g/gemstone_mine.txt
@@ -2,8 +2,8 @@ Name:Gemstone Mine
 ManaCost:no cost
 Types:Land
 K:etbCounter:MINING:3
-A:AB$ Mana | Cost$ T SubCounter<1/MINING> | Produced$ Any | SubAbility$ DBSac | SpellDescription$ Add one mana of any color to your mana pool. If there are no mining counters on Gemstone Mine, sacrifice it.
+A:AB$ Mana | Cost$ T SubCounter<1/MINING> | Produced$ Any | SubAbility$ DBSac | SpellDescription$ Add one mana of any color. If there are no mining counters on Gemstone Mine, sacrifice it.
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionPresent$ Card.Self+counters_EQ0_MINING
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gemstone_mine.jpg
-Oracle:Gemstone Mine enters the battlefield with three mining counters on it.\n{T}, Remove a mining counter from Gemstone Mine: Add one mana of any color to your mana pool. If there are no mining counters on Gemstone Mine, sacrifice it.
+Oracle:Gemstone Mine enters the battlefield with three mining counters on it.\n{T}, Remove a mining counter from Gemstone Mine: Add one mana of any color. If there are no mining counters on Gemstone Mine, sacrifice it.
diff --git a/forge-gui/res/cardsfolder/g/generator_servant.txt b/forge-gui/res/cardsfolder/g/generator_servant.txt
index 2268f4069ff..574a30f4d78 100644
--- a/forge-gui/res/cardsfolder/g/generator_servant.txt
+++ b/forge-gui/res/cardsfolder/g/generator_servant.txt
@@ -2,7 +2,7 @@ Name:Generator Servant
 ManaCost:1 R
 Types:Creature Elemental
 PT:2/1
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ C | Amount$ 2 | AddsKeywords$ Haste | AddsKeywordsType$ Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {C}{C} to your mana pool. If that mana is spent on a creature spell, it gains haste until end of turn.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ C | Amount$ 2 | AddsKeywords$ Haste | AddsKeywordsType$ Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {C}{C}. If that mana is spent on a creature spell, it gains haste until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/generator_servant.jpg
-Oracle:{T}, Sacrifice Generator Servant: Add {C}{C} to your mana pool. If that mana is spent on a creature spell, it gains haste until end of turn. (That creature can attack and {T} as soon as it comes under your control.)
+Oracle:{T}, Sacrifice Generator Servant: Add {C}{C}. If that mana is spent on a creature spell, it gains haste until end of turn. (That creature can attack and {T} as soon as it comes under your control.)
diff --git a/forge-gui/res/cardsfolder/g/geosurge.txt b/forge-gui/res/cardsfolder/g/geosurge.txt
index 97549057044..4186f190837 100644
--- a/forge-gui/res/cardsfolder/g/geosurge.txt
+++ b/forge-gui/res/cardsfolder/g/geosurge.txt
@@ -1,6 +1,6 @@
 Name:Geosurge
 ManaCost:R R R R
 Types:Sorcery
-A:SP$ Mana | Cost$ R R R R | Produced$ R | Amount$ 7 | RestrictValid$ Card.Artifact,Card.Creature | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R}{R}{R}{R}{R}{R}{R} to your mana pool. Spend this mana only to cast artifact or creature spells.
+A:SP$ Mana | Cost$ R R R R | Produced$ R | Amount$ 7 | RestrictValid$ Card.Artifact,Card.Creature | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R}{R}{R}{R}{R}{R}{R}. Spend this mana only to cast artifact or creature spells.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/geosurge.jpg
-Oracle:Add {R}{R}{R}{R}{R}{R}{R} to your mana pool. Spend this mana only to cast artifact or creature spells.
+Oracle:Add {R}{R}{R}{R}{R}{R}{R}. Spend this mana only to cast artifact or creature spells.
diff --git a/forge-gui/res/cardsfolder/g/geothermal_crevice.txt b/forge-gui/res/cardsfolder/g/geothermal_crevice.txt
index 96e7708bfbe..a8b0827e812 100644
--- a/forge-gui/res/cardsfolder/g/geothermal_crevice.txt
+++ b/forge-gui/res/cardsfolder/g/geothermal_crevice.txt
@@ -2,8 +2,8 @@ Name:Geothermal Crevice
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ B G | SpellDescription$ Add {B}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ B G | SpellDescription$ Add {B}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/geothermal_crevice.jpg
-Oracle:Geothermal Crevice enters the battlefield tapped.\n{T}: Add {R} to your mana pool.\n{T}, Sacrifice Geothermal Crevice: Add {B}{G} to your mana pool.
+Oracle:Geothermal Crevice enters the battlefield tapped.\n{T}: Add {R}.\n{T}, Sacrifice Geothermal Crevice: Add {B}{G}.
diff --git a/forge-gui/res/cardsfolder/g/ghitu_encampment.txt b/forge-gui/res/cardsfolder/g/ghitu_encampment.txt
index 69b2075702b..124d6303b43 100644
--- a/forge-gui/res/cardsfolder/g/ghitu_encampment.txt
+++ b/forge-gui/res/cardsfolder/g/ghitu_encampment.txt
@@ -2,7 +2,7 @@ Name:Ghitu Encampment
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Animate | Cost$ 1 R | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Creature,Warrior | Colors$ Red | Keywords$ First Strike | SpellDescription$ CARDNAME becomes a 2/1 red Warrior creature with first strike until end of turn. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghitu_encampment.jpg
-Oracle:Ghitu Encampment enters the battlefield tapped.\n{T}: Add {R} to your mana pool.\n{1}{R}: Ghitu Encampment becomes a 2/1 red Warrior creature with first strike until end of turn. It's still a land.
\ No newline at end of file
+Oracle:Ghitu Encampment enters the battlefield tapped.\n{T}: Add {R}.\n{1}{R}: Ghitu Encampment becomes a 2/1 red Warrior creature with first strike until end of turn. It's still a land.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/ghost_quarter.txt b/forge-gui/res/cardsfolder/g/ghost_quarter.txt
index e2c2d371506..81272945137 100644
--- a/forge-gui/res/cardsfolder/g/ghost_quarter.txt
+++ b/forge-gui/res/cardsfolder/g/ghost_quarter.txt
@@ -1,9 +1,9 @@
 Name:Ghost Quarter
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBChange | AILogic$ GhostQuarter | AITgts$ Land.nonBasic | SpellDescription$ Destroy target land. Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library.
 SVar:DBChange:DB$ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghost_quarter.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Sacrifice Ghost Quarter: Destroy target land. Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library.
+Oracle:{T}: Add {C}.\n{T}, Sacrifice Ghost Quarter: Destroy target land. Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library.
diff --git a/forge-gui/res/cardsfolder/g/ghost_town.txt b/forge-gui/res/cardsfolder/g/ghost_town.txt
index 5851e9721ed..32e1807c59c 100644
--- a/forge-gui/res/cardsfolder/g/ghost_town.txt
+++ b/forge-gui/res/cardsfolder/g/ghost_town.txt
@@ -1,7 +1,7 @@
 Name:Ghost Town
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | OpponentTurn$ True | SpellDescription$ Return CARDNAME to its owner's hand. Activate this ability only if it's not your turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghost_town.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{0}: Return Ghost Town to its owner's hand. Activate this ability only if it's not your turn.
+Oracle:{T}: Add {C}.\n{0}: Return Ghost Town to its owner's hand. Activate this ability only if it's not your turn.
diff --git a/forge-gui/res/cardsfolder/g/gift_of_paradise.txt b/forge-gui/res/cardsfolder/g/gift_of_paradise.txt
index 9305d68d408..614ee8b1ad4 100644
--- a/forge-gui/res/cardsfolder/g/gift_of_paradise.txt
+++ b/forge-gui/res/cardsfolder/g/gift_of_paradise.txt
@@ -5,7 +5,7 @@ K:Enchant land
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 3 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ AbundantGrowthTap | Description$ Enchanted land has "{T}: Add two mana of any one color to your mana pool."
-SVar:AbundantGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ AbundantGrowthTap | Description$ Enchanted land has "{T}: Add two mana of any one color."
+SVar:AbundantGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gift_of_paradise.jpg
-Oracle:Enchant land\nWhen Gift of Paradise enters the battlefield, you gain 3 life.\nEnchanted land has "{T}: Add two mana of any one color to your mana pool."
\ No newline at end of file
+Oracle:Enchant land\nWhen Gift of Paradise enters the battlefield, you gain 3 life.\nEnchanted land has "{T}: Add two mana of any one color."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/gild.txt b/forge-gui/res/cardsfolder/g/gild.txt
index 239d5bfa74e..5d524cdd062 100644
--- a/forge-gui/res/cardsfolder/g/gild.txt
+++ b/forge-gui/res/cardsfolder/g/gild.txt
@@ -1,8 +1,8 @@
 Name:Gild
 ManaCost:3 B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 3 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | SpellDescription$ Exile target creature. Create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color to your mana pool."
+A:SP$ ChangeZone | Cost$ 3 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | SpellDescription$ Exile target creature. Create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color."
 SVar:DBToken:DB$ Token | TokenName$ Gold | TokenTypes$ Artifact | TokenColors$ Colorless | TokenOwner$ You | TokenAmount$ 1 | TokenImage$ c gold | TokenAbilities$ ABMana | References$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gild.jpg
-Oracle:Exile target creature. Create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:Exile target creature. Create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/g/gilded_lotus.txt b/forge-gui/res/cardsfolder/g/gilded_lotus.txt
index da471c36a4d..b04f70f945a 100644
--- a/forge-gui/res/cardsfolder/g/gilded_lotus.txt
+++ b/forge-gui/res/cardsfolder/g/gilded_lotus.txt
@@ -1,6 +1,6 @@
 Name:Gilded Lotus
 ManaCost:5
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 3 | SpellDescription$ Add three mana of any one color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 3 | SpellDescription$ Add three mana of any one color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gilded_lotus.jpg
 Oracle:{T}: Add three mana of any one color.
diff --git a/forge-gui/res/cardsfolder/g/gilt_leaf_palace.txt b/forge-gui/res/cardsfolder/g/gilt_leaf_palace.txt
index c60bb8c5917..0cc9accd232 100644
--- a/forge-gui/res/cardsfolder/g/gilt_leaf_palace.txt
+++ b/forge-gui/res/cardsfolder/g/gilt_leaf_palace.txt
@@ -1,10 +1,10 @@
 Name:Gilt-Leaf Palace
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:RemRandomDeck:True
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Elf> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal an Elf card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gilt_leaf_palace.jpg
-Oracle:As Gilt-Leaf Palace enters the battlefield, you may reveal an Elf card from your hand. If you don't, Gilt-Leaf Palace enters the battlefield tapped.\n{T}: Add {B} or {G} to your mana pool.
+Oracle:As Gilt-Leaf Palace enters the battlefield, you may reveal an Elf card from your hand. If you don't, Gilt-Leaf Palace enters the battlefield tapped.\n{T}: Add {B} or {G}.
diff --git a/forge-gui/res/cardsfolder/g/glacial_fortress.txt b/forge-gui/res/cardsfolder/g/glacial_fortress.txt
index ae33f09887a..6134c9e0123 100644
--- a/forge-gui/res/cardsfolder/g/glacial_fortress.txt
+++ b/forge-gui/res/cardsfolder/g/glacial_fortress.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Plains.YouCtrl,Island.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Plains or an Island.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glacial_fortress.jpg
-Oracle:Glacial Fortress enters the battlefield tapped unless you control a Plains or an Island.\n{T}: Add {W} or {U} to your mana pool.
+Oracle:Glacial Fortress enters the battlefield tapped unless you control a Plains or an Island.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/g/gleaming_barrier.txt b/forge-gui/res/cardsfolder/g/gleaming_barrier.txt
index be9bfefa04c..acba96c0cf9 100644
--- a/forge-gui/res/cardsfolder/g/gleaming_barrier.txt
+++ b/forge-gui/res/cardsfolder/g/gleaming_barrier.txt
@@ -3,9 +3,9 @@ ManaCost:2
 Types:Artifact Creature Wall
 PT:0/4
 K:Defender
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | TokenAbilities$ ABMana | References$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gleaming_barrier.jpg
-Oracle:Defender\nWhen Gleaming Barrier dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
\ No newline at end of file
+Oracle:Defender\nWhen Gleaming Barrier dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/glimmerpost.txt b/forge-gui/res/cardsfolder/g/glimmerpost.txt
index daa1a3c3979..884398841ba 100644
--- a/forge-gui/res/cardsfolder/g/glimmerpost.txt
+++ b/forge-gui/res/cardsfolder/g/glimmerpost.txt
@@ -1,9 +1,9 @@
 Name:Glimmerpost
 ManaCost:no cost
 Types:Land Locus
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life for each Locus on the battlefield.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ X | References$ X
 SVar:X:Count$TypeOnBattlefield.Locus
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glimmerpost.jpg
-Oracle:When Glimmerpost enters the battlefield, you gain 1 life for each Locus on the battlefield.\n{T}: Add {C} to your mana pool.
+Oracle:When Glimmerpost enters the battlefield, you gain 1 life for each Locus on the battlefield.\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/g/glimmervoid.txt b/forge-gui/res/cardsfolder/g/glimmervoid.txt
index bc7b7e4bda6..7327955a123 100644
--- a/forge-gui/res/cardsfolder/g/glimmervoid.txt
+++ b/forge-gui/res/cardsfolder/g/glimmervoid.txt
@@ -1,10 +1,10 @@
 Name:Glimmervoid
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | IsPresent$ Artifact.YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if you control no artifacts, sacrifice CARDNAME.
 SVar:TrigSac:DB$Sacrifice | Defined$ Self
 SVar:NeedsToPlay:Artifact.YouCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glimmervoid.jpg
-Oracle:At the beginning of the end step, if you control no artifacts, sacrifice Glimmervoid.\n{T}: Add one mana of any color to your mana pool.
+Oracle:At the beginning of the end step, if you control no artifacts, sacrifice Glimmervoid.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/g/glissa_sunseeker.txt b/forge-gui/res/cardsfolder/g/glissa_sunseeker.txt
index fcab7a2283f..867c1a6c28f 100644
--- a/forge-gui/res/cardsfolder/g/glissa_sunseeker.txt
+++ b/forge-gui/res/cardsfolder/g/glissa_sunseeker.txt
@@ -3,10 +3,10 @@ ManaCost:2 G G
 Types:Legendary Creature Elf
 PT:3/2
 K:First Strike
-A:AB$ Destroy | Cost$ T | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | ConditionCheckSVar$ Y | ConditionSVarCompare$ EQX | References$ X,Y | SpellDescription$ Destroy target artifact if its converted mana cost is equal to the amount of mana in your mana pool.
+A:AB$ Destroy | Cost$ T | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | ConditionCheckSVar$ Y | ConditionSVarCompare$ EQX | References$ X,Y | SpellDescription$ Destroy target artifact if its converted mana cost is equal to the amount of unspent mana you have.
 SVar:X:Count$ManaPool:All
 SVar:Y:Targeted$CardManaCost
 #AI won't specifically put mana in pool to activate the ability
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glissa_sunseeker.jpg
-Oracle:First strike\n{T}: Destroy target artifact if its converted mana cost is equal to the amount of mana in your mana pool.
+Oracle:First strike\n{T}: Destroy target artifact if its converted mana cost is equal to the amount of unspent mana you have.
diff --git a/forge-gui/res/cardsfolder/g/gnarlroot_trapper.txt b/forge-gui/res/cardsfolder/g/gnarlroot_trapper.txt
index 517eb95619e..6ea11bfed06 100644
--- a/forge-gui/res/cardsfolder/g/gnarlroot_trapper.txt
+++ b/forge-gui/res/cardsfolder/g/gnarlroot_trapper.txt
@@ -2,7 +2,7 @@ Name:Gnarlroot Trapper
 ManaCost:B
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ G | RestrictValid$ Creature.Elf | SpellDescription$ Add {G} to your mana pool. Spend this mana only to cast an Elf creature spell.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ G | RestrictValid$ Creature.Elf | SpellDescription$ Add {G}. Spend this mana only to cast an Elf creature spell.
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature.YouCtrl+Elf+attacking | TgtPrompt$ Select target attacking Elf you control | KW$ Deathtouch | SpellDescription$ Target attacking Elf you control gains deathtouch until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gnarlroot_trapper.jpg
-Oracle:{T}, Pay 1 life: Add {G} to your mana pool. Spend this mana only to cast an Elf creature spell.\n{T}: Target attacking Elf you control gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.)
\ No newline at end of file
+Oracle:{T}, Pay 1 life: Add {G}. Spend this mana only to cast an Elf creature spell.\n{T}: Target attacking Elf you control gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/goblin_burrows.txt b/forge-gui/res/cardsfolder/g/goblin_burrows.txt
index e89133d0e34..3b47170f4f2 100644
--- a/forge-gui/res/cardsfolder/g/goblin_burrows.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_burrows.txt
@@ -1,7 +1,7 @@
 Name:Goblin Burrows
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ 1 R T | ValidTgts$ Creature.Goblin | TgtPrompt$ Select target Goblin creature | NumAtt$ +2 | SpellDescription$ Target Goblin creature gets +2/+0 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_burrows.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{R}, {T}: Target Goblin creature gets +2/+0 until end of turn.
+Oracle:{T}: Add {C}.\n{1}{R}, {T}: Target Goblin creature gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/goblin_clearcutter.txt b/forge-gui/res/cardsfolder/g/goblin_clearcutter.txt
index 8ed2e28f09f..c5c2a0523df 100644
--- a/forge-gui/res/cardsfolder/g/goblin_clearcutter.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_clearcutter.txt
@@ -2,7 +2,7 @@ Name:Goblin Clearcutter
 ManaCost:3 R
 Types:Creature Goblin
 PT:3/3
-A:AB$ Mana | Cost$ T Sac<1/Forest> | Produced$ Combo R G | Amount$ 3 | SpellDescription$ Add three mana in any combination of {R} and/or {G} to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/Forest> | Produced$ Combo R G | Amount$ 3 | SpellDescription$ Add three mana in any combination of {R} and/or {G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_clearcutter.jpg
-Oracle:{T}, Sacrifice a Forest: Add three mana in any combination of {R} and/or {G} to your mana pool.
+Oracle:{T}, Sacrifice a Forest: Add three mana in any combination of {R} and/or {G}.
diff --git a/forge-gui/res/cardsfolder/g/godless_shrine.txt b/forge-gui/res/cardsfolder/g/godless_shrine.txt
index 2f0f4425f8d..420eabd5d4c 100644
--- a/forge-gui/res/cardsfolder/g/godless_shrine.txt
+++ b/forge-gui/res/cardsfolder/g/godless_shrine.txt
@@ -4,4 +4,4 @@ Types:Land Plains Swamp
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | UnlessAI$ Shockland | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://resources.wizards.com/magic/cards/gpt/en-us/card96935.jpg
-Oracle:({T}: Add {W} or {B} to your mana pool.)\nAs Godless Shrine enters the battlefield, you may pay 2 life. If you don't, Godless Shrine enters the battlefield tapped.
+Oracle:({T}: Add {W} or {B}.)\nAs Godless Shrine enters the battlefield, you may pay 2 life. If you don't, Godless Shrine enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/g/gods_eye_gate_to_the_reikai.txt b/forge-gui/res/cardsfolder/g/gods_eye_gate_to_the_reikai.txt
index a955b12629e..292383e2ab6 100644
--- a/forge-gui/res/cardsfolder/g/gods_eye_gate_to_the_reikai.txt
+++ b/forge-gui/res/cardsfolder/g/gods_eye_gate_to_the_reikai.txt
@@ -1,9 +1,9 @@
 Name:Gods' Eye, Gate to the Reikai
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, create a 1/1 colorless Spirit creature token.
 SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenOwner$ TriggeredCardController
 SVar:SacMe:1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gods_eye_gate_to_the_reikai.jpg
-Oracle:{T}: Add {C} to your mana pool.\nWhen Gods' Eye, Gate to the Reikai is put into a graveyard from the battlefield, create a 1/1 colorless Spirit creature token.
+Oracle:{T}: Add {C}.\nWhen Gods' Eye, Gate to the Reikai is put into a graveyard from the battlefield, create a 1/1 colorless Spirit creature token.
diff --git a/forge-gui/res/cardsfolder/g/gold_myr.txt b/forge-gui/res/cardsfolder/g/gold_myr.txt
index 50b1427ec63..6b3ef50d76c 100644
--- a/forge-gui/res/cardsfolder/g/gold_myr.txt
+++ b/forge-gui/res/cardsfolder/g/gold_myr.txt
@@ -2,6 +2,6 @@ Name:Gold Myr
 ManaCost:2
 Types:Artifact Creature Myr
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gold_myr.jpg
-Oracle:{T}: Add {W} to your mana pool.
+Oracle:{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/g/golden_guardian.txt b/forge-gui/res/cardsfolder/g/golden_guardian.txt
index 3f81959b4c3..a99905c7296 100644
--- a/forge-gui/res/cardsfolder/g/golden_guardian.txt
+++ b/forge-gui/res/cardsfolder/g/golden_guardian.txt
@@ -21,7 +21,7 @@ ALTERNATE
 Name:Gold-Forge Garrison
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 A:AB$ Token | Cost$ 4 T | TokenAmount$ 1 | TokenName$ Golem | TokenTypes$ Artifact,Creature,Golem | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 4 | TokenToughness$ 4 | TokenImage$ c 4 4 golem RIX | SpellDescription$ Create a 4/4 colorless Golem artifact creature token.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gold-forge_garrison.jpg
-Oracle:{T}: Add two mana of any one color to your mana pool.\n{4}, {T}: Create a 4/4 colorless Golem artifact creature token.
+Oracle:{T}: Add two mana of any one color.\n{4}, {T}: Create a 4/4 colorless Golem artifact creature token.
diff --git a/forge-gui/res/cardsfolder/g/golden_hind.txt b/forge-gui/res/cardsfolder/g/golden_hind.txt
index 835fbe2fd95..2247ee957ce 100644
--- a/forge-gui/res/cardsfolder/g/golden_hind.txt
+++ b/forge-gui/res/cardsfolder/g/golden_hind.txt
@@ -2,6 +2,6 @@ Name:Golden Hind
 ManaCost:1 G
 Types:Creature Elk
 PT:2/1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golden_hind.jpg
-Oracle:{T}: Add {G} to your mana pool.
+Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/g/golgari_cluestone.txt b/forge-gui/res/cardsfolder/g/golgari_cluestone.txt
index 2145a90cf7a..8bf8256037a 100644
--- a/forge-gui/res/cardsfolder/g/golgari_cluestone.txt
+++ b/forge-gui/res/cardsfolder/g/golgari_cluestone.txt
@@ -1,10 +1,10 @@
 Name:Golgari Cluestone
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Draw | Cost$ B G T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Black|Green
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golgari_cluestone.jpg
-Oracle:{T}: Add {B} or {G} to your mana pool.\n{B}{G}, {T}, Sacrifice Golgari Cluestone: Draw a card.
+Oracle:{T}: Add {B} or {G}.\n{B}{G}, {T}, Sacrifice Golgari Cluestone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/g/golgari_guildgate.txt b/forge-gui/res/cardsfolder/g/golgari_guildgate.txt
index 4b4d75c0308..89d993f1dd2 100644
--- a/forge-gui/res/cardsfolder/g/golgari_guildgate.txt
+++ b/forge-gui/res/cardsfolder/g/golgari_guildgate.txt
@@ -2,7 +2,7 @@ Name:Golgari Guildgate
 ManaCost:no cost
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golgari_guildgate.jpg
-Oracle:Golgari Guildgate enters the battlefield tapped.\n{T}: Add {B} or {G} to your mana pool.
+Oracle:Golgari Guildgate enters the battlefield tapped.\n{T}: Add {B} or {G}.
diff --git a/forge-gui/res/cardsfolder/g/golgari_keyrune.txt b/forge-gui/res/cardsfolder/g/golgari_keyrune.txt
index 0fd17c8f6de..298867cf733 100644
--- a/forge-gui/res/cardsfolder/g/golgari_keyrune.txt
+++ b/forge-gui/res/cardsfolder/g/golgari_keyrune.txt
@@ -1,10 +1,10 @@
 Name:Golgari Keyrune
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Animate | Cost$ B G | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Insect | Colors$ Black,Green | Keywords$ Deathtouch | SpellDescription$ CARDNAME becomes a 2/2 black and green Insect artifact creature with deathtouch until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Black|Green
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golgari_keyrune.jpg
-Oracle:{T}: Add {B} or {G} to your mana pool.\n{B}{G}: Golgari Keyrune becomes a 2/2 black and green Insect artifact creature with deathtouch until end of turn.
+Oracle:{T}: Add {B} or {G}.\n{B}{G}: Golgari Keyrune becomes a 2/2 black and green Insect artifact creature with deathtouch until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/golgari_rot_farm.txt b/forge-gui/res/cardsfolder/g/golgari_rot_farm.txt
index 78188670574..92a3912abbc 100644
--- a/forge-gui/res/cardsfolder/g/golgari_rot_farm.txt
+++ b/forge-gui/res/cardsfolder/g/golgari_rot_farm.txt
@@ -2,9 +2,9 @@ Name:Golgari Rot Farm
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B G | SpellDescription$ Add {B}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B G | SpellDescription$ Add {B}{G}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golgari_rot_farm.jpg
-Oracle:Golgari Rot Farm enters the battlefield tapped.\nWhen Golgari Rot Farm enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {B}{G} to your mana pool.
+Oracle:Golgari Rot Farm enters the battlefield tapped.\nWhen Golgari Rot Farm enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {B}{G}.
diff --git a/forge-gui/res/cardsfolder/g/golgari_signet.txt b/forge-gui/res/cardsfolder/g/golgari_signet.txt
index dcfa1443277..ef39cdff6b7 100644
--- a/forge-gui/res/cardsfolder/g/golgari_signet.txt
+++ b/forge-gui/res/cardsfolder/g/golgari_signet.txt
@@ -1,7 +1,7 @@
 Name:Golgari Signet
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ B G | SpellDescription$ Add {B}{G} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ B G | SpellDescription$ Add {B}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golgari_signet.jpg
-Oracle:{1}, {T}: Add {B}{G} to your mana pool.
+Oracle:{1}, {T}: Add {B}{G}.
diff --git a/forge-gui/res/cardsfolder/g/grand_architect.txt b/forge-gui/res/cardsfolder/g/grand_architect.txt
index 8ad9cb9554c..869579f7b3e 100644
--- a/forge-gui/res/cardsfolder/g/grand_architect.txt
+++ b/forge-gui/res/cardsfolder/g/grand_architect.txt
@@ -4,7 +4,7 @@ Types:Creature Vedalken Artificer
 PT:1/3
 S:Mode$ Continuous | Affected$ Creature.Blue+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other blue creatures you control get +1/+1.
 A:AB$ Animate | Cost$ U | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature | Colors$ Blue | OverwriteColors$ True | SpellDescription$ Target artifact creature becomes blue until end of turn.
-A:AB$ Mana | Cost$ tapXType<1/Creature.Blue> | Produced$ C | Amount$ 2 | RestrictValid$ Card.Artifact,Activated.Artifact | SpellDescription$ Add {C}{C} to your mana pool. Spend this mana only to cast artifact spells or activate abilities of artifacts.
+A:AB$ Mana | Cost$ tapXType<1/Creature.Blue> | Produced$ C | Amount$ 2 | RestrictValid$ Card.Artifact,Activated.Artifact | SpellDescription$ Add {C}{C}. Spend this mana only to cast artifact spells or activate abilities of artifacts.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grand_architect.jpg
-Oracle:Other blue creatures you control get +1/+1.\n{U}: Target artifact creature becomes blue until end of turn.\nTap an untapped blue creature you control: Add {C}{C} to your mana pool. Spend this mana only to cast artifact spells or activate abilities of artifacts.
+Oracle:Other blue creatures you control get +1/+1.\n{U}: Target artifact creature becomes blue until end of turn.\nTap an untapped blue creature you control: Add {C}{C}. Spend this mana only to cast artifact spells or activate abilities of artifacts.
diff --git a/forge-gui/res/cardsfolder/g/grand_coliseum.txt b/forge-gui/res/cardsfolder/g/grand_coliseum.txt
index 3456b3d4520..5cff724b20b 100644
--- a/forge-gui/res/cardsfolder/g/grand_coliseum.txt
+++ b/forge-gui/res/cardsfolder/g/grand_coliseum.txt
@@ -1,9 +1,9 @@
 Name:Grand Coliseum
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBPain | SpellDescription$ Add one mana of any color to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBPain | SpellDescription$ Add one mana of any color. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grand_coliseum.jpg
-Oracle:Grand Coliseum enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Grand Coliseum deals 1 damage to you.
+Oracle:Grand Coliseum enters the battlefield tapped.\n{T}: Add {C}.\n{T}: Add one mana of any color. Grand Coliseum deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/g/grasping_dunes.txt b/forge-gui/res/cardsfolder/g/grasping_dunes.txt
index 626a64905d7..da0e4ccd6ca 100644
--- a/forge-gui/res/cardsfolder/g/grasping_dunes.txt
+++ b/forge-gui/res/cardsfolder/g/grasping_dunes.txt
@@ -1,8 +1,8 @@
 Name:Grasping Dunes
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ 1 T Sac<1/CARDNAME> | IsCurse$ True | ValidTgts$ Creature | TgtPrompt$ Select target Creature | CounterType$ M1M1 | CounterNum$ 1 | SorcerySpeed$ True | SpellDescription$ Put a -1/-1 counter on target creature. Activate this ability only any time you could cast a sorcery.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grasping_dunes.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}, Sacrifice Grasping Dunes: Put a -1/-1 counter on target creature. Activate this ability only any time you could cast a sorcery.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Grasping Dunes: Put a -1/-1 counter on target creature. Activate this ability only any time you could cast a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/grave_birthing.txt b/forge-gui/res/cardsfolder/g/grave_birthing.txt
index a6bfe100f39..813f089ab22 100644
--- a/forge-gui/res/cardsfolder/g/grave_birthing.txt
+++ b/forge-gui/res/cardsfolder/g/grave_birthing.txt
@@ -3,10 +3,10 @@ ManaCost:2 B
 Types:Instant
 K:Devoid
 A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Opponent | DefinedPlayer$ Targeted | Mandatory$ True | ChangeType$ Card | ChangeNum$ 1 | Hidden$ True | IsCurse$ True | Chooser$ Targeted | SubAbility$ DBToken | SpellDescription$ Target opponent exiles a card from his or her graveyard.
-SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana | SubAbility$ DBDraw | SpellDescription$ You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana | SubAbility$ DBDraw | SpellDescription$ You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 DeckHints:Type$Eldrazi & Keyword$Ingest
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grave_birthing.jpg
-Oracle:Devoid (This card has no color.)\nTarget opponent exiles a card from his or her graveyard. You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."\nDraw a card.
+Oracle:Devoid (This card has no color.)\nTarget opponent exiles a card from his or her graveyard. You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/g/graven_cairns.txt b/forge-gui/res/cardsfolder/g/graven_cairns.txt
index 5a16939163e..cba0c6a7e6f 100644
--- a/forge-gui/res/cardsfolder/g/graven_cairns.txt
+++ b/forge-gui/res/cardsfolder/g/graven_cairns.txt
@@ -1,10 +1,10 @@
 Name:Graven Cairns
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ BR T | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool.
-A:AB$ Mana | Cost$ BR T | Produced$ B R | SpellDescription$ Add {B}{R} to your mana pool.
-A:AB$ Mana | Cost$ BR T | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ BR T | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}.
+A:AB$ Mana | Cost$ BR T | Produced$ B R | SpellDescription$ Add {B}{R}.
+A:AB$ Mana | Cost$ BR T | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/graven_cairns.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{B/R}, {T}: Add {B}{B}, {B}{R}, or {R}{R} to your mana pool.
+Oracle:{T}: Add {C}.\n{B/R}, {T}: Add {B}{B}, {B}{R}, or {R}{R}.
diff --git a/forge-gui/res/cardsfolder/g/graypelt_refuge.txt b/forge-gui/res/cardsfolder/g/graypelt_refuge.txt
index da8d0ea4eb5..9fe9fe46498 100644
--- a/forge-gui/res/cardsfolder/g/graypelt_refuge.txt
+++ b/forge-gui/res/cardsfolder/g/graypelt_refuge.txt
@@ -1,10 +1,10 @@
 Name:Graypelt Refuge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/graypelt_refuge.jpg
-Oracle:Graypelt Refuge enters the battlefield tapped.\nWhen Graypelt Refuge enters the battlefield, you gain 1 life.\n{T}: Add {G} or {W} to your mana pool.
+Oracle:Graypelt Refuge enters the battlefield tapped.\nWhen Graypelt Refuge enters the battlefield, you gain 1 life.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/g/green_mana_battery.txt b/forge-gui/res/cardsfolder/g/green_mana_battery.txt
index d5006d76644..e5bc61d216a 100644
--- a/forge-gui/res/cardsfolder/g/green_mana_battery.txt
+++ b/forge-gui/res/cardsfolder/g/green_mana_battery.txt
@@ -2,10 +2,10 @@ Name:Green Mana Battery
 ManaCost:4
 Types:Artifact
 A:AB$ PutCounter | Cost$ 2 T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ G | Amount$ Y | CostDesc$ {T}, Remove any number of charge counters from CARDNAME: | References$ X,Y | SpellDescription$ Add {G} to your mana pool, then add an additional {G} to your mana pool for each charge counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ G | Amount$ Y | CostDesc$ {T}, Remove any number of charge counters from CARDNAME: | References$ X,Y | SpellDescription$ Add {G}, then add an additional {G} for each charge counter removed this way.
 SVar:Y:Number$1/Plus.ChosenX
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/green_mana_battery.jpg
-Oracle:{2}, {T}: Put a charge counter on Green Mana Battery.\n{T}, Remove any number of charge counters from Green Mana Battery: Add {G} to your mana pool, then add an additional {G} to your mana pool for each charge counter removed this way.
+Oracle:{2}, {T}: Put a charge counter on Green Mana Battery.\n{T}, Remove any number of charge counters from Green Mana Battery: Add {G}, then add an additional {G} for each charge counter removed this way.
diff --git a/forge-gui/res/cardsfolder/g/greenweaver_druid.txt b/forge-gui/res/cardsfolder/g/greenweaver_druid.txt
index 989e509bc6c..c4e235a0d03 100644
--- a/forge-gui/res/cardsfolder/g/greenweaver_druid.txt
+++ b/forge-gui/res/cardsfolder/g/greenweaver_druid.txt
@@ -2,6 +2,6 @@ Name:Greenweaver Druid
 ManaCost:2 G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/greenweaver_druid.jpg
-Oracle:{T}: Add {G}{G} to your mana pool.
+Oracle:{T}: Add {G}{G}.
diff --git a/forge-gui/res/cardsfolder/g/griffin_canyon.txt b/forge-gui/res/cardsfolder/g/griffin_canyon.txt
index 9d88fd4ede0..684e5eacf0d 100644
--- a/forge-gui/res/cardsfolder/g/griffin_canyon.txt
+++ b/forge-gui/res/cardsfolder/g/griffin_canyon.txt
@@ -1,9 +1,9 @@
 Name:Griffin Canyon
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Untap | Cost$ T | ValidTgts$ Griffin | TgtPrompt$ Select target Griffin | SubAbility$ DBPump | SpellDescription$ Untap target Griffin. If it's a creature, it gets +1/+1 until end of turn.
 SVar:DBPump:DB$Pump | NumAtt$ +1 | NumDef$ +1 | Defined$ Targeted
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/griffin_canyon.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Untap target Griffin. If it's a creature, it gets +1/+1 until end of turn.
+Oracle:{T}: Add {C}.\n{T}: Untap target Griffin. If it's a creature, it gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/grim_backwoods.txt b/forge-gui/res/cardsfolder/g/grim_backwoods.txt
index 8b8796bc5e7..662f54f17ae 100644
--- a/forge-gui/res/cardsfolder/g/grim_backwoods.txt
+++ b/forge-gui/res/cardsfolder/g/grim_backwoods.txt
@@ -1,7 +1,7 @@
 Name:Grim Backwoods
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ 2 B G T Sac<1/Creature> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grim_backwoods.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}{B}{G}, {T}, Sacrifice a creature: Draw a card.
+Oracle:{T}: Add {C}.\n{2}{B}{G}, {T}, Sacrifice a creature: Draw a card.
diff --git a/forge-gui/res/cardsfolder/g/grim_monolith.txt b/forge-gui/res/cardsfolder/g/grim_monolith.txt
index 5fc26780ab3..8bb293f6252 100644
--- a/forge-gui/res/cardsfolder/g/grim_monolith.txt
+++ b/forge-gui/res/cardsfolder/g/grim_monolith.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact
 K:CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ 4 | AILogic$ EOT | SpellDescription$ Untap CARDNAME.
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C}.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grim_monolith.jpg
-Oracle:Grim Monolith doesn't untap during your untap step.\n{T}: Add {C}{C}{C} to your mana pool.\n{4}: Untap Grim Monolith.
+Oracle:Grim Monolith doesn't untap during your untap step.\n{T}: Add {C}{C}{C}.\n{4}: Untap Grim Monolith.
diff --git a/forge-gui/res/cardsfolder/g/grinning_ignus.txt b/forge-gui/res/cardsfolder/g/grinning_ignus.txt
index b9fe4264368..dfbbe0c6561 100644
--- a/forge-gui/res/cardsfolder/g/grinning_ignus.txt
+++ b/forge-gui/res/cardsfolder/g/grinning_ignus.txt
@@ -2,7 +2,7 @@ Name:Grinning Ignus
 ManaCost:2 R
 Types:Creature Elemental
 PT:2/2
-A:AB$ Mana | Cost$ R Return<1/CARDNAME> | Produced$ C C R | Amount$ 1 | SorcerySpeed$ True | SpellDescription$ Add {C}{C}{R} to your mana pool. Activate this ability only any time you could cast a sorcery.
+A:AB$ Mana | Cost$ R Return<1/CARDNAME> | Produced$ C C R | Amount$ 1 | SorcerySpeed$ True | SpellDescription$ Add {C}{C}{R}. Activate this ability only any time you could cast a sorcery.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grinning_ignus.jpg
-Oracle:{R}, Return Grinning Ignus to its owner's hand: Add {C}{C}{R} to your mana pool. Activate this ability only any time you could cast a sorcery.
+Oracle:{R}, Return Grinning Ignus to its owner's hand: Add {C}{C}{R}. Activate this ability only any time you could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/g/grixis_panorama.txt b/forge-gui/res/cardsfolder/g/grixis_panorama.txt
index 07d52bdcdf1..3b8b5b8da76 100644
--- a/forge-gui/res/cardsfolder/g/grixis_panorama.txt
+++ b/forge-gui/res/cardsfolder/g/grixis_panorama.txt
@@ -1,7 +1,7 @@
 Name:Grixis Panorama
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Island+Basic,Land.Swamp+Basic,Land.Mountain+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Island, Swamp, or Mountain card and put it onto the battlefield tapped. Then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grixis_panorama.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}, Sacrifice Grixis Panorama: Search your library for a basic Island, Swamp, or Mountain card and put it onto the battlefield tapped. Then shuffle your library.
+Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Grixis Panorama: Search your library for a basic Island, Swamp, or Mountain card and put it onto the battlefield tapped. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/g/grove_of_the_burnwillows.txt b/forge-gui/res/cardsfolder/g/grove_of_the_burnwillows.txt
index 52915b1eb79..28dbeb7715c 100644
--- a/forge-gui/res/cardsfolder/g/grove_of_the_burnwillows.txt
+++ b/forge-gui/res/cardsfolder/g/grove_of_the_burnwillows.txt
@@ -1,9 +1,9 @@
 Name:Grove of the Burnwillows
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBLife | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBLife | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBLife | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBLife | SpellDescription$ Add {R}.
 SVar:DBLife:DB$ GainLife | LifeAmount$ 1 | Defined$ Player.Opponent | SpellDescription$ Each opponent gains 1 life.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grove_of_the_burnwillows.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {R} or {G} to your mana pool. Each opponent gains 1 life.
+Oracle:{T}: Add {C}.\n{T}: Add {R} or {G}. Each opponent gains 1 life.
diff --git a/forge-gui/res/cardsfolder/g/grove_of_the_guardian.txt b/forge-gui/res/cardsfolder/g/grove_of_the_guardian.txt
index f1e9e41d181..63ded641584 100644
--- a/forge-gui/res/cardsfolder/g/grove_of_the_guardian.txt
+++ b/forge-gui/res/cardsfolder/g/grove_of_the_guardian.txt
@@ -1,8 +1,8 @@
 Name:Grove of the Guardian
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Token | Cost$ 3 G W T tapXType<2/Creature> Sac<1/CARDNAME> | CostDesc$ {3}{G}{W}, {T}, Tap two untapped creatures you control, Sacrifice CARDNAME: | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 8 | TokenToughness$ 8 | TokenKeywords$ Vigilance | TokenImage$ gw 8 8 elemental rtr | SpellDescription$ Create an 8/8 green and white Elemental creature token with vigilance.
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grove_of_the_guardian.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{3}{G}{W}, {T}, Tap two untapped creatures you control, Sacrifice Grove of the Guardian: Create an 8/8 green and white Elemental creature token with vigilance.
+Oracle:{T}: Add {C}.\n{3}{G}{W}, {T}, Tap two untapped creatures you control, Sacrifice Grove of the Guardian: Create an 8/8 green and white Elemental creature token with vigilance.
diff --git a/forge-gui/res/cardsfolder/g/growing_rites_of_itlimoc_itlimoc_cradle_of_the_sun.txt b/forge-gui/res/cardsfolder/g/growing_rites_of_itlimoc_itlimoc_cradle_of_the_sun.txt
index 5dea0bb47a7..e9542001922 100644
--- a/forge-gui/res/cardsfolder/g/growing_rites_of_itlimoc_itlimoc_cradle_of_the_sun.txt
+++ b/forge-gui/res/cardsfolder/g/growing_rites_of_itlimoc_itlimoc_cradle_of_the_sun.txt
@@ -15,8 +15,8 @@ ALTERNATE
 Name:Itlimoc, Cradle of the Sun
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 1 | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} to your mana pool for each creature you control.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 1 | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} for each creature you control.
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/itlimoc_cradle_of_the_sun.jpg
-Oracle:(Transforms from Growing Rites of Itlimoc.)\n{T}: Add {G} to your mana pool.\n{T}: Add {G} to your mana pool for each creature you control.
+Oracle:(Transforms from Growing Rites of Itlimoc.)\n{T}: Add {G}.\n{T}: Add {G} for each creature you control.
diff --git a/forge-gui/res/cardsfolder/g/growth_spasm.txt b/forge-gui/res/cardsfolder/g/growth_spasm.txt
index 287fbf7bcd3..50bdfc04dbe 100644
--- a/forge-gui/res/cardsfolder/g/growth_spasm.txt
+++ b/forge-gui/res/cardsfolder/g/growth_spasm.txt
@@ -2,9 +2,9 @@ Name:Growth Spasm
 ManaCost:2 G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 2 G | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | SpellDescription$ Create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | SpellDescription$ Create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/growth_spasm.jpg
-Oracle:Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. Create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. Create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/g/gruul_cluestone.txt b/forge-gui/res/cardsfolder/g/gruul_cluestone.txt
index 55b65a21db5..c584b092496 100644
--- a/forge-gui/res/cardsfolder/g/gruul_cluestone.txt
+++ b/forge-gui/res/cardsfolder/g/gruul_cluestone.txt
@@ -1,10 +1,10 @@
 Name:Gruul Cluestone
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Draw | Cost$ R G T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Red|Green
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruul_cluestone.jpg
-Oracle:{T}: Add {R} or {G} to your mana pool.\n{R}{G}, {T}, Sacrifice Gruul Cluestone: Draw a card.
+Oracle:{T}: Add {R} or {G}.\n{R}{G}, {T}, Sacrifice Gruul Cluestone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/g/gruul_guildgate.txt b/forge-gui/res/cardsfolder/g/gruul_guildgate.txt
index 738749815b2..514466d6743 100644
--- a/forge-gui/res/cardsfolder/g/gruul_guildgate.txt
+++ b/forge-gui/res/cardsfolder/g/gruul_guildgate.txt
@@ -2,7 +2,7 @@ Name:Gruul Guildgate
 ManaCost:no cost
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruul_guildgate.jpg
-Oracle:Gruul Guildgate enters the battlefield tapped.\n{T}: Add {R} or {G} to your mana pool.
+Oracle:Gruul Guildgate enters the battlefield tapped.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/g/gruul_keyrune.txt b/forge-gui/res/cardsfolder/g/gruul_keyrune.txt
index 066d85337a0..9170c9dcc0d 100644
--- a/forge-gui/res/cardsfolder/g/gruul_keyrune.txt
+++ b/forge-gui/res/cardsfolder/g/gruul_keyrune.txt
@@ -1,10 +1,10 @@
 Name:Gruul Keyrune
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Animate | Cost$ R G | Defined$ Self | Power$ 3 | Toughness$ 2 | Types$ Artifact,Creature,Beast | Colors$ Red,Green | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 3/2 red and green Beast artifact creature with trample until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Red|Green
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruul_keyrune.jpg
-Oracle:{T}: Add {R} or {G} to your mana pool.\n{R}{G}: Gruul Keyrune becomes a 3/2 red and green Beast artifact creature with trample until end of turn.
+Oracle:{T}: Add {R} or {G}.\n{R}{G}: Gruul Keyrune becomes a 3/2 red and green Beast artifact creature with trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/gruul_signet.txt b/forge-gui/res/cardsfolder/g/gruul_signet.txt
index 0f93cb2640c..6e8fdd7024f 100644
--- a/forge-gui/res/cardsfolder/g/gruul_signet.txt
+++ b/forge-gui/res/cardsfolder/g/gruul_signet.txt
@@ -1,7 +1,7 @@
 Name:Gruul Signet
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ R G | SpellDescription$ Add {R}{G} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ R G | SpellDescription$ Add {R}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruul_signet.jpg
-Oracle:{1}, {T}: Add {R}{G} to your mana pool.
+Oracle:{1}, {T}: Add {R}{G}.
diff --git a/forge-gui/res/cardsfolder/g/gruul_turf.txt b/forge-gui/res/cardsfolder/g/gruul_turf.txt
index feab258d230..0bda6867a3a 100644
--- a/forge-gui/res/cardsfolder/g/gruul_turf.txt
+++ b/forge-gui/res/cardsfolder/g/gruul_turf.txt
@@ -2,9 +2,9 @@ Name:Gruul Turf
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R G | SpellDescription$ Add {R}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R G | SpellDescription$ Add {R}{G}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruul_turf.jpg
-Oracle:Gruul Turf enters the battlefield tapped.\nWhen Gruul Turf enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {R}{G} to your mana pool.
+Oracle:Gruul Turf enters the battlefield tapped.\nWhen Gruul Turf enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {R}{G}.
diff --git a/forge-gui/res/cardsfolder/g/guardian_idol.txt b/forge-gui/res/cardsfolder/g/guardian_idol.txt
index 39f65d1098f..dc51a2d0dc6 100644
--- a/forge-gui/res/cardsfolder/g/guardian_idol.txt
+++ b/forge-gui/res/cardsfolder/g/guardian_idol.txt
@@ -2,7 +2,7 @@ Name:Guardian Idol
 ManaCost:2
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Golem | SpellDescription$ CARDNAME becomes a 2/2 Golem artifact creature until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/guardian_idol.jpg
-Oracle:Guardian Idol enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{2}: Guardian Idol becomes a 2/2 Golem artifact creature until end of turn.
+Oracle:Guardian Idol enters the battlefield tapped.\n{T}: Add {C}.\n{2}: Guardian Idol becomes a 2/2 Golem artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/gyre_sage.txt b/forge-gui/res/cardsfolder/g/gyre_sage.txt
index 8b9245c2cab..cf74b3b7a74 100644
--- a/forge-gui/res/cardsfolder/g/gyre_sage.txt
+++ b/forge-gui/res/cardsfolder/g/gyre_sage.txt
@@ -3,9 +3,9 @@ ManaCost:1 G
 Types:Creature Elf Druid
 PT:1/2
 K:Evolve
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} to your mana pool for each +1/+1 counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} for each +1/+1 counter on CARDNAME.
 SVar:X:Count$CardCounters.P1P1
 DeckHas:Ability$Counters
 DeckHints:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gyre_sage.jpg
-Oracle:Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)\n{T}: Add {G} to your mana pool for each +1/+1 counter on Gyre Sage.
+Oracle:Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)\n{T}: Add {G} for each +1/+1 counter on Gyre Sage.
diff --git a/forge-gui/res/cardsfolder/h/hadanas_climb_winged_temple_of_orazca.txt b/forge-gui/res/cardsfolder/h/hadanas_climb_winged_temple_of_orazca.txt
index b0c7463c49f..d91dbd13758 100644
--- a/forge-gui/res/cardsfolder/h/hadanas_climb_winged_temple_of_orazca.txt
+++ b/forge-gui/res/cardsfolder/h/hadanas_climb_winged_temple_of_orazca.txt
@@ -13,9 +13,9 @@ ALTERNATE
 Name:Winged Temple of Orazca
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 A:AB$ Pump | Cost$ 1 G U T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | NumDef$ X | References$ X | KW$ Flying | SpellDescription$ Target creature you control gains flying and gets +X/+X until end of turn, where X is its power.
 SVar:X:Targeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/winged_temple_of_orazca.jpg
-Oracle:(Transforms from Hadana's Climb.)\n{T}: Add one mana of any color to your mana pool.\n{1}{G}{U}, {T}: Target creature you control gains flying and gets +X/+X until end of turn, where X is its power.
+Oracle:(Transforms from Hadana's Climb.)\n{T}: Add one mana of any color.\n{1}{G}{U}, {T}: Target creature you control gains flying and gets +X/+X until end of turn, where X is its power.
 
diff --git a/forge-gui/res/cardsfolder/h/halimar_depths.txt b/forge-gui/res/cardsfolder/h/halimar_depths.txt
index 33ae13d4641..7c45544022f 100644
--- a/forge-gui/res/cardsfolder/h/halimar_depths.txt
+++ b/forge-gui/res/cardsfolder/h/halimar_depths.txt
@@ -2,8 +2,8 @@ Name:Halimar Depths
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRearrange | TriggerDescription$ When Halimar Depths enters the battlefield, look at the top three cards of your library, then put them back in any order.
 SVar:TrigRearrange:DB$RearrangeTopOfLibrary | Defined$ You | NumCards$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/halimar_depths.jpg
-Oracle:Halimar Depths enters the battlefield tapped.\nWhen Halimar Depths enters the battlefield, look at the top three cards of your library, then put them back in any order.\n{T}: Add {U} to your mana pool.
+Oracle:Halimar Depths enters the battlefield tapped.\nWhen Halimar Depths enters the battlefield, look at the top three cards of your library, then put them back in any order.\n{T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt b/forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt
index 19e19bcaa56..34ba6655ee5 100644
--- a/forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt
+++ b/forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt
@@ -2,6 +2,6 @@ Name:Hall of the Bandit Lord
 ManaCost:no cost
 Types:Legendary Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T PayLife<3> | Produced$ C | AddsKeywords$ Haste | AddsKeywordsType$ Creature | SpellDescription$ Add {C} to your mana pool. If that mana is spent on a creature spell, it gains haste.
+A:AB$ Mana | Cost$ T PayLife<3> | Produced$ C | AddsKeywords$ Haste | AddsKeywordsType$ Creature | SpellDescription$ Add {C}. If that mana is spent on a creature spell, it gains haste.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hall_of_the_bandit_lord.jpg
-Oracle:Hall of the Bandit Lord enters the battlefield tapped.\n{T}, Pay 3 life: Add {C} to your mana pool. If that mana is spent on a creature spell, it gains haste.
+Oracle:Hall of the Bandit Lord enters the battlefield tapped.\n{T}, Pay 3 life: Add {C}. If that mana is spent on a creature spell, it gains haste.
diff --git a/forge-gui/res/cardsfolder/h/hallowed_fountain.txt b/forge-gui/res/cardsfolder/h/hallowed_fountain.txt
index 60a11a95050..2afcc93ea7d 100644
--- a/forge-gui/res/cardsfolder/h/hallowed_fountain.txt
+++ b/forge-gui/res/cardsfolder/h/hallowed_fountain.txt
@@ -4,4 +4,4 @@ Types:Land Plains Island
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | UnlessAI$ Shockland | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://resources.wizards.com/magic/cards/dis/en-us/card97071.jpg
-Oracle:({T}: Add {W} or {U} to your mana pool.)\nAs Hallowed Fountain enters the battlefield, you may pay 2 life. If you don't, Hallowed Fountain enters the battlefield tapped.
+Oracle:({T}: Add {W} or {U}.)\nAs Hallowed Fountain enters the battlefield, you may pay 2 life. If you don't, Hallowed Fountain enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/h/hammerheim.txt b/forge-gui/res/cardsfolder/h/hammerheim.txt
index ae99f9fb596..8b64e20bea3 100644
--- a/forge-gui/res/cardsfolder/h/hammerheim.txt
+++ b/forge-gui/res/cardsfolder/h/hammerheim.txt
@@ -1,8 +1,8 @@
 Name:Hammerheim
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Debuff | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | AllSuffixKeywords$ walk | SpellDescription$ Target creature loses all landwalk abilities until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hammerheim.jpg
-Oracle:{T}: Add {R} to your mana pool.\n{T}: Target creature loses all landwalk abilities until end of turn.
+Oracle:{T}: Add {R}.\n{T}: Target creature loses all landwalk abilities until end of turn.
diff --git a/forge-gui/res/cardsfolder/h/hanweir_battlements_hanweir_the_writhing_township.txt b/forge-gui/res/cardsfolder/h/hanweir_battlements_hanweir_the_writhing_township.txt
index 7c5ed6b3c43..0a203c9664d 100644
--- a/forge-gui/res/cardsfolder/h/hanweir_battlements_hanweir_the_writhing_township.txt
+++ b/forge-gui/res/cardsfolder/h/hanweir_battlements_hanweir_the_writhing_township.txt
@@ -1,7 +1,7 @@
 Name:Hanweir Battlements
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SpellDescription$ Target creature gains haste until end of turn.
 A:AB$ Meld | Cost$ 3 R R T | ConditionPresent$ Card.Self+YouCtrl+YouOwn | ConditionCheckSVar$ X | References$ X | Name$ Hanweir, the Writhing Township | Primary$ Hanweir Battlements | Secondary$ Hanweir Garrison | SpellDescription$ If you both own and control CARDNAME and a creature named Hanweir Garrison, exile them, then meld them into Hanweir, the Writhing Township.
 SVar:X:Count$Valid Creature.YouCtrl+YouOwn+namedHanweir Garrison
@@ -10,7 +10,7 @@ DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hanweir_battlements.jpg
 MeldPair:Hanweir Garrison
 AlternateMode:Meld
-Oracle:{T}: Add {C} to your mana pool.\n{R}, {T}: Target creature gains haste until end of turn.\n{3}{R}{R}{R}, {T}: If you both own and control Hanweir Battlements and a creature named Hanweir Garrison, exile them, then meld them into Hanweir, the Writhing Township.
+Oracle:{T}: Add {C}.\n{R}, {T}: Target creature gains haste until end of turn.\n{3}{R}{R}{R}, {T}: If you both own and control Hanweir Battlements and a creature named Hanweir Garrison, exile them, then meld them into Hanweir, the Writhing Township.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/h/harabaz_druid.txt b/forge-gui/res/cardsfolder/h/harabaz_druid.txt
index d924cf1b3af..cd8940b8b54 100644
--- a/forge-gui/res/cardsfolder/h/harabaz_druid.txt
+++ b/forge-gui/res/cardsfolder/h/harabaz_druid.txt
@@ -2,7 +2,7 @@ Name:Harabaz Druid
 ManaCost:1 G
 Types:Creature Human Druid Ally
 PT:0/1
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | References$ X | SpellDescription$ Add X mana of any one color to your mana pool, where X is the number of Allies you control.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | References$ X | SpellDescription$ Add X mana of any one color, where X is the number of Allies you control.
 SVar:X:Count$Valid Ally.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/harabaz_druid.jpg
-Oracle:{T}: Add X mana of any one color to your mana pool, where X is the number of Allies you control.
+Oracle:{T}: Add X mana of any one color, where X is the number of Allies you control.
diff --git a/forge-gui/res/cardsfolder/h/harvester_druid.txt b/forge-gui/res/cardsfolder/h/harvester_druid.txt
index 277f2731908..81984622dfe 100644
--- a/forge-gui/res/cardsfolder/h/harvester_druid.txt
+++ b/forge-gui/res/cardsfolder/h/harvester_druid.txt
@@ -2,6 +2,6 @@ Name:Harvester Druid
 ManaCost:1 G
 Types:Creature Human Druid
 PT:1/1
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add to your mana pool one mana of any color that a land you control could produce.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any color that a land you control could produce.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/harvester_druid.jpg
-Oracle:{T}: Add to your mana pool one mana of any color that a land you control could produce.
+Oracle:{T}: Add one mana of any color that a land you control could produce.
diff --git a/forge-gui/res/cardsfolder/h/hashep_oasis.txt b/forge-gui/res/cardsfolder/h/hashep_oasis.txt
index 6b66c188752..8ed5d9e0588 100644
--- a/forge-gui/res/cardsfolder/h/hashep_oasis.txt
+++ b/forge-gui/res/cardsfolder/h/hashep_oasis.txt
@@ -1,8 +1,8 @@
 Name:Hashep Oasis
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Pump | Cost$ 1 G G T Sac<1/Desert> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | SorcerySpeed$ True | SpellDescription$ Target creature gets +3/+3 until end of turn. Activate this ability only any time you could cast a sorcery.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hashep_oasis.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Pay 1 life: Add {G} to your mana pool.\n{1}{G}{G}, {T}, Sacrifice a Desert: Target creature gets +3/+3 until end of turn. Activate this ability only any time you could cast a sorcery.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{T}, Pay 1 life: Add {G}.\n{1}{G}{G}, {T}, Sacrifice a Desert: Target creature gets +3/+3 until end of turn. Activate this ability only any time you could cast a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/haunted_fengraf.txt b/forge-gui/res/cardsfolder/h/haunted_fengraf.txt
index cf0aa3fa9f4..9ba1f3c0853 100644
--- a/forge-gui/res/cardsfolder/h/haunted_fengraf.txt
+++ b/forge-gui/res/cardsfolder/h/haunted_fengraf.txt
@@ -1,7 +1,7 @@
 Name:Haunted Fengraf
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 3 T Sac<1/CARDNAME> | ChangeType$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Hand | Hidden$ True | AtRandom$ True | SpellDescription$ Return a creature card at random from your graveyard to your hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/haunted_fengraf.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{3}, {T}, Sacrifice Haunted Fengraf: Return a creature card at random from your graveyard to your hand.
+Oracle:{T}: Add {C}.\n{3}, {T}, Sacrifice Haunted Fengraf: Return a creature card at random from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/h/haven_of_the_spirit_dragon.txt b/forge-gui/res/cardsfolder/h/haven_of_the_spirit_dragon.txt
index e2f598e94f3..f57b387bec4 100644
--- a/forge-gui/res/cardsfolder/h/haven_of_the_spirit_dragon.txt
+++ b/forge-gui/res/cardsfolder/h/haven_of_the_spirit_dragon.txt
@@ -1,9 +1,9 @@
 Name:Haven of the Spirit Dragon
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Creature.Dragon | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a Dragon creature spell.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Creature.Dragon | SpellDescription$ Add one mana of any color. Spend this mana only to cast a Dragon creature spell.
 A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | TgtPrompt$ Select target Dragon creature card or Ugin planeswalker card in your graveyard | ValidTgts$ Creature.Dragon+YouCtrl,Planeswalker.Ugin+YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target Dragon creature card or Ugin planeswalker card from your graveyard to your hand.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/haven_of_the_spirit_dragon.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast a Dragon creature spell.\n{2}, {T}, Sacrifice Haven of the Spirit Dragon: Return target Dragon creature card or Ugin planeswalker card from your graveyard to your hand.
+Oracle:{T}: Add {C}.\n{T}: Add one mana of any color. Spend this mana only to cast a Dragon creature spell.\n{2}, {T}, Sacrifice Haven of the Spirit Dragon: Return target Dragon creature card or Ugin planeswalker card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/h/havenwood_battleground.txt b/forge-gui/res/cardsfolder/h/havenwood_battleground.txt
index bc0825f8f26..f59e560bc32 100644
--- a/forge-gui/res/cardsfolder/h/havenwood_battleground.txt
+++ b/forge-gui/res/cardsfolder/h/havenwood_battleground.txt
@@ -2,8 +2,8 @@ Name:Havenwood Battleground
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ G | Amount$ 2 |SpellDescription$ Add {G}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ G | Amount$ 2 |SpellDescription$ Add {G}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/havenwood_battleground.jpg
-Oracle:Havenwood Battleground enters the battlefield tapped.\n{T}: Add {G} to your mana pool.\n{T}, Sacrifice Havenwood Battleground: Add {G}{G} to your mana pool.
+Oracle:Havenwood Battleground enters the battlefield tapped.\n{T}: Add {G}.\n{T}, Sacrifice Havenwood Battleground: Add {G}{G}.
diff --git a/forge-gui/res/cardsfolder/h/heart_of_ramos.txt b/forge-gui/res/cardsfolder/h/heart_of_ramos.txt
index 36fb838efbf..367aeaf6dc1 100644
--- a/forge-gui/res/cardsfolder/h/heart_of_ramos.txt
+++ b/forge-gui/res/cardsfolder/h/heart_of_ramos.txt
@@ -1,8 +1,8 @@
 Name:Heart of Ramos
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ R | SpellDescription$ Add {R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heart_of_ramos.jpg
-Oracle:{T}: Add {R} to your mana pool.\nSacrifice Heart of Ramos: Add {R} to your mana pool.
+Oracle:{T}: Add {R}.\nSacrifice Heart of Ramos: Add {R}.
diff --git a/forge-gui/res/cardsfolder/h/heart_of_yavimaya.txt b/forge-gui/res/cardsfolder/h/heart_of_yavimaya.txt
index 3e2adee82f9..c335b8c13b6 100644
--- a/forge-gui/res/cardsfolder/h/heart_of_yavimaya.txt
+++ b/forge-gui/res/cardsfolder/h/heart_of_yavimaya.txt
@@ -1,7 +1,7 @@
 Name:Heart of Yavimaya
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target creature gets +1/+1 until end of turn.
 R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, sacrifice a Forest instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
 SVar:PayBeforeETB:DB$ Sacrifice | SacValid$ Forest | Defined$ You | RememberSacrificed$ True | SubAbility$ MoveToGraveyard
@@ -11,4 +11,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:NeedsToPlay:Forest.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heart_of_yavimaya.jpg
-Oracle:If Heart of Yavimaya would enter the battlefield, sacrifice a Forest instead. If you do, put Heart of Yavimaya onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {G} to your mana pool.\n{T}: Target creature gets +1/+1 until end of turn.
+Oracle:If Heart of Yavimaya would enter the battlefield, sacrifice a Forest instead. If you do, put Heart of Yavimaya onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {G}.\n{T}: Target creature gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/h/heart_warden.txt b/forge-gui/res/cardsfolder/h/heart_warden.txt
index 354a69143ca..d7495313d01 100644
--- a/forge-gui/res/cardsfolder/h/heart_warden.txt
+++ b/forge-gui/res/cardsfolder/h/heart_warden.txt
@@ -2,8 +2,8 @@ Name:Heart Warden
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heart_warden.jpg
-Oracle:{T}: Add {G} to your mana pool.\n{2}, Sacrifice Heart Warden: Draw a card.
+Oracle:{T}: Add {G}.\n{2}, Sacrifice Heart Warden: Draw a card.
diff --git a/forge-gui/res/cardsfolder/h/heartbeat_of_spring.txt b/forge-gui/res/cardsfolder/h/heartbeat_of_spring.txt
index ef6707607a0..91fa6adff1e 100644
--- a/forge-gui/res/cardsfolder/h/heartbeat_of_spring.txt
+++ b/forge-gui/res/cardsfolder/h/heartbeat_of_spring.txt
@@ -1,8 +1,8 @@
 Name:Heartbeat of Spring
 ManaCost:2 G
 Types:Enchantment
-T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
 SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heartbeat_of_spring.jpg
-Oracle:Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+Oracle:Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/h/heartless_pillage.txt b/forge-gui/res/cardsfolder/h/heartless_pillage.txt
index a0624e689d6..5b9e3e8c4ab 100644
--- a/forge-gui/res/cardsfolder/h/heartless_pillage.txt
+++ b/forge-gui/res/cardsfolder/h/heartless_pillage.txt
@@ -1,9 +1,9 @@
 Name:Heartless Pillage
 ManaCost:2 B
 Types:Sorcery
-A:SP$ Discard | Cost$ 2 B | ValidTgts$ Opponent | Mode$ TgtChoose | NumCards$ 2 | TgtPrompt$ Select target opponent | SubAbility$ DBTreasure | SpellDescription$ Target opponent discards two cards. Raid — If you attacked with a creature this turn, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+A:SP$ Discard | Cost$ 2 B | ValidTgts$ Opponent | Mode$ TgtChoose | NumCards$ 2 | TgtPrompt$ Select target opponent | SubAbility$ DBTreasure | SpellDescription$ Target opponent discards two cards. Raid — If you attacked with a creature this turn, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:DBTreasure:DB$ Token | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1 | References$ RaidTest | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:RaidTest:Count$AttackersDeclared
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heartless_pillage.jpg
-Oracle:Target opponent discards two cards.\nRaid — If you attacked with a creature this turn, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
\ No newline at end of file
+Oracle:Target opponent discards two cards.\nRaid — If you attacked with a creature this turn, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hedron_archive.txt b/forge-gui/res/cardsfolder/h/hedron_archive.txt
index e0d33e801d6..71166ebeed9 100644
--- a/forge-gui/res/cardsfolder/h/hedron_archive.txt
+++ b/forge-gui/res/cardsfolder/h/hedron_archive.txt
@@ -1,8 +1,8 @@
 Name:Hedron Archive
 ManaCost:4
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 A:AB$ Draw | Cost$ 2 T Sac<1/CARDNAME> | NumCards$ 2 | SpellDescription$ Draw two cards.
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hedron_archive.jpg
-Oracle:{T}: Add {C}{C} to your mana pool.\n{2}, {T}, Sacrifice Hedron Archive: Draw two cards.
\ No newline at end of file
+Oracle:{T}: Add {C}{C}.\n{2}, {T}, Sacrifice Hedron Archive: Draw two cards.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hedron_crawler.txt b/forge-gui/res/cardsfolder/h/hedron_crawler.txt
index 7d14ad0be2b..97a9933f188 100644
--- a/forge-gui/res/cardsfolder/h/hedron_crawler.txt
+++ b/forge-gui/res/cardsfolder/h/hedron_crawler.txt
@@ -2,7 +2,7 @@ Name:Hedron Crawler
 ManaCost:2
 Types:Artifact Creature Construct
 PT:0/1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hedron_crawler.jpg
-Oracle:{T}: Add {C} to your mana pool. ({C} represents colorless mana.)
+Oracle:{T}: Add {C}. ({C} represents colorless mana.)
diff --git a/forge-gui/res/cardsfolder/h/helionaut.txt b/forge-gui/res/cardsfolder/h/helionaut.txt
index d612172afa4..f595471c35f 100644
--- a/forge-gui/res/cardsfolder/h/helionaut.txt
+++ b/forge-gui/res/cardsfolder/h/helionaut.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Human Soldier
 PT:1/2
 K:Flying
-A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/helionaut.jpg
-Oracle:Flying\n{1}, {T}: Add one mana of any color to your mana pool.
+Oracle:Flying\n{1}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/h/hellion_crucible.txt b/forge-gui/res/cardsfolder/h/hellion_crucible.txt
index 5c74b38cd20..b2d67a4cfa8 100644
--- a/forge-gui/res/cardsfolder/h/hellion_crucible.txt
+++ b/forge-gui/res/cardsfolder/h/hellion_crucible.txt
@@ -1,8 +1,8 @@
 Name:Hellion Crucible
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ 1 R T | CounterType$ PRESSURE | CounterNum$ 1 | SpellDescription$ Put a pressure counter on CARDNAME.
 A:AB$ Token | Cost$ 1 R T SubCounter<2/PRESSURE> Sac<1/CARDNAME> | TokenAmount$ 1 | TokenName$ Hellion | TokenTypes$ Creature,Hellion | TokenOwner$ You | TokenColors$ Red | TokenPower$ 4 | TokenToughness$ 4 | TokenImage$ r 4 4 hellion M13 | TokenKeywords$ Haste | SpellDescription$ Create a 4/4 red Hellion creature token with haste.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hellion_crucible.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{R}, {T}: Put a pressure counter on Hellion Crucible.\n{1}{R}, {T}, Remove two pressure counters from Hellion Crucible and sacrifice it: Create a 4/4 red Hellion creature token with haste. (It can attack and {T} as soon as it comes under your control.)
+Oracle:{T}: Add {C}.\n{1}{R}, {T}: Put a pressure counter on Hellion Crucible.\n{1}{R}, {T}, Remove two pressure counters from Hellion Crucible and sacrifice it: Create a 4/4 red Hellion creature token with haste. (It can attack and {T} as soon as it comes under your control.)
diff --git a/forge-gui/res/cardsfolder/h/henge_of_ramos.txt b/forge-gui/res/cardsfolder/h/henge_of_ramos.txt
index 942b1737ae1..4af98241b5b 100644
--- a/forge-gui/res/cardsfolder/h/henge_of_ramos.txt
+++ b/forge-gui/res/cardsfolder/h/henge_of_ramos.txt
@@ -1,8 +1,8 @@
 Name:Henge of Ramos
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 2 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/henge_of_ramos.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add {C}.\n{2}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/h/heritage_druid.txt b/forge-gui/res/cardsfolder/h/heritage_druid.txt
index dfa985f2c22..a3b84d01f8a 100644
--- a/forge-gui/res/cardsfolder/h/heritage_druid.txt
+++ b/forge-gui/res/cardsfolder/h/heritage_druid.txt
@@ -2,7 +2,7 @@ Name:Heritage Druid
 ManaCost:G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ tapXType<3/Elf> | Produced$ G | Amount$ 3 | SpellDescription$ Add {G}{G}{G} to your mana pool.
+A:AB$ Mana | Cost$ tapXType<3/Elf> | Produced$ G | Amount$ 3 | SpellDescription$ Add {G}{G}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heritage_druid.jpg
-Oracle:Tap three untapped Elves you control: Add {G}{G}{G} to your mana pool.
+Oracle:Tap three untapped Elves you control: Add {G}{G}{G}.
diff --git a/forge-gui/res/cardsfolder/h/hickory_woodlot.txt b/forge-gui/res/cardsfolder/h/hickory_woodlot.txt
index fe79a8c4e3e..c9ad66076de 100644
--- a/forge-gui/res/cardsfolder/h/hickory_woodlot.txt
+++ b/forge-gui/res/cardsfolder/h/hickory_woodlot.txt
@@ -4,8 +4,8 @@ Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two depletion counters on it.
 SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | ETB$ True | CounterType$ DEPLETION | CounterNum$ 2
-A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ G | SubAbility$ DBSac | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool. If there are no depletion counters on CARDNAME, sacrifice it.
+A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ G | SubAbility$ DBSac | Amount$ 2 | SpellDescription$ Add {G}{G}. If there are no depletion counters on CARDNAME, sacrifice it.
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionPresent$ Card.Self+counters_EQ0_DEPLETION
 SVar:RemRandomDeck:True
 SVar:Picture:http://wizards.com/global/images/magic/general/hickory_woodlot.jpg
-Oracle:Hickory Woodlot enters the battlefield tapped with two depletion counters on it.\n{T}, Remove a depletion counter from Hickory Woodlot: Add {G}{G} to your mana pool. If there are no depletion counters on Hickory Woodlot, sacrifice it.
+Oracle:Hickory Woodlot enters the battlefield tapped with two depletion counters on it.\n{T}, Remove a depletion counter from Hickory Woodlot: Add {G}{G}. If there are no depletion counters on Hickory Woodlot, sacrifice it.
diff --git a/forge-gui/res/cardsfolder/h/hidden_herbalists.txt b/forge-gui/res/cardsfolder/h/hidden_herbalists.txt
index 51a3978289a..65408138d2a 100644
--- a/forge-gui/res/cardsfolder/h/hidden_herbalists.txt
+++ b/forge-gui/res/cardsfolder/h/hidden_herbalists.txt
@@ -2,8 +2,8 @@ Name:Hidden Herbalists
 ManaCost:1 G
 Types:Creature Human Druid
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Revolt$ True | Execute$ TrigMana | TriggerDescription$ Revolt — When CARDNAME enters the battlefield, if a permanent you controlled left the battlefield this turn, add {G}{G} to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Revolt$ True | Execute$ TrigMana | TriggerDescription$ Revolt — When CARDNAME enters the battlefield, if a permanent you controlled left the battlefield this turn, add {G}{G}.
 SVar:TrigMana:DB$ Mana | Produced$ G G
 SVar:FreeSpellAI:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hidden_herbalists.jpg
-Oracle:Revolt — When Hidden Herbalists enters the battlefield, if a permanent you controlled left the battlefield this turn, add {G}{G} to your mana pool.
\ No newline at end of file
+Oracle:Revolt — When Hidden Herbalists enters the battlefield, if a permanent you controlled left the battlefield this turn, add {G}{G}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hierophants_chalice.txt b/forge-gui/res/cardsfolder/h/hierophants_chalice.txt
index 052e4a323d2..2d0f4df46ad 100644
--- a/forge-gui/res/cardsfolder/h/hierophants_chalice.txt
+++ b/forge-gui/res/cardsfolder/h/hierophants_chalice.txt
@@ -4,6 +4,6 @@ Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDrain | TriggerDescription$ When CARDNAME enters the battlefield, target opponent loses 1 life and you gain 1 life.
 SVar:TrigDrain:DB$LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1 
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hierophants_chalice.jpg
-Oracle:When Hierophant's Chalice enters the battlefield, target opponent loses 1 life and you gain 1 life.\n{T}: Add {C} to your mana pool.
\ No newline at end of file
+Oracle:When Hierophant's Chalice enters the battlefield, target opponent loses 1 life and you gain 1 life.\n{T}: Add {C}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/high_market.txt b/forge-gui/res/cardsfolder/h/high_market.txt
index afccd1a18d6..e16f6636dec 100644
--- a/forge-gui/res/cardsfolder/h/high_market.txt
+++ b/forge-gui/res/cardsfolder/h/high_market.txt
@@ -1,8 +1,8 @@
 Name:High Market
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ GainLife | Cost$ T Sac<1/Creature> | LifeAmount$ 1 | SpellDescription$ You gain 1 life.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/high_market.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Sacrifice a creature: You gain 1 life.
+Oracle:{T}: Add {C}.\n{T}, Sacrifice a creature: You gain 1 life.
diff --git a/forge-gui/res/cardsfolder/h/high_tide.txt b/forge-gui/res/cardsfolder/h/high_tide.txt
index 783da9b2c2f..a23bbd23855 100644
--- a/forge-gui/res/cardsfolder/h/high_tide.txt
+++ b/forge-gui/res/cardsfolder/h/high_tide.txt
@@ -1,9 +1,9 @@
 Name:High Tide
 ManaCost:U
 Types:Instant
-A:SP$ Effect | Cost$ U | Name$ High Tide Effect | Triggers$ IslandTrigger | SVars$ TrigMana | SpellDescription$ Until end of turn, whenever a player taps an Island for mana, that player adds {U} to his or her mana pool (in addition to the mana the land produces).
-SVar:IslandTrigger:Mode$ TapsForMana | ValidCard$ Island | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever a player taps an Island for mana, that player adds U to his or her mana pool (in addition to the mana the land produces).
+A:SP$ Effect | Cost$ U | Name$ High Tide Effect | Triggers$ IslandTrigger | SVars$ TrigMana | SpellDescription$ Until end of turn, whenever a player taps an Island for mana, that player adds an additional {U}.
+SVar:IslandTrigger:Mode$ TapsForMana | ValidCard$ Island | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever a player taps an Island for mana, that player adds an additional {U}.
 SVar:TrigMana:DB$ Mana | Produced$ U | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/high_tide.jpg
-Oracle:Until end of turn, whenever a player taps an Island for mana, that player adds {U} to his or her mana pool (in addition to the mana the land produces).
+Oracle:Until end of turn, whenever a player taps an Island for mana, that player adds an additional {U}.
diff --git a/forge-gui/res/cardsfolder/h/highland_lake.txt b/forge-gui/res/cardsfolder/h/highland_lake.txt
index 23a1aede898..1db741e0224 100644
--- a/forge-gui/res/cardsfolder/h/highland_lake.txt
+++ b/forge-gui/res/cardsfolder/h/highland_lake.txt
@@ -2,7 +2,7 @@ Name:Highland Lake
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/highland_lake.jpg
-Oracle:Highland Lake enters the battlefield tapped.\n{T}: Add {U} or {R} to your mana pool. 
\ No newline at end of file
+Oracle:Highland Lake enters the battlefield tapped.\n{T}: Add {U} or {R}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/highland_weald.txt b/forge-gui/res/cardsfolder/h/highland_weald.txt
index 78d1863605d..9586617f91f 100644
--- a/forge-gui/res/cardsfolder/h/highland_weald.txt
+++ b/forge-gui/res/cardsfolder/h/highland_weald.txt
@@ -2,7 +2,7 @@ Name:Highland Weald
 ManaCost:no cost
 Types:Snow Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/highland_weald.jpg
-Oracle:Highland Weald enters the battlefield tapped.\n{T}: Add {R} or {G} to your mana pool.
+Oracle:Highland Weald enters the battlefield tapped.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/h/hissing_quagmire.txt b/forge-gui/res/cardsfolder/h/hissing_quagmire.txt
index ddb349bfe36..f99f0f26ae3 100644
--- a/forge-gui/res/cardsfolder/h/hissing_quagmire.txt
+++ b/forge-gui/res/cardsfolder/h/hissing_quagmire.txt
@@ -2,8 +2,8 @@ Name:Hissing Quagmire
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Animate | Cost$ 1 B G | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Black,Green | Keywords$ Deathtouch | SpellDescription$ CARDNAME becomes a 2/2 black and green Elemental creature with deathtouch until end of turn. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hissing_quagmire.jpg
-Oracle:Hissing Quagmire enters the battlefield tapped.\n{T}: Add {B} or {G} to your mana pool.\n{1}{B}{G}: Hissing Quagmire becomes a 2/2 black and green Elemental creature with deathtouch until end of turn. It's still a land.
+Oracle:Hissing Quagmire enters the battlefield tapped.\n{T}: Add {B} or {G}.\n{1}{B}{G}: Hissing Quagmire becomes a 2/2 black and green Elemental creature with deathtouch until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/h/holdout_settlement.txt b/forge-gui/res/cardsfolder/h/holdout_settlement.txt
index 9825035dbda..d99b7e5b442 100644
--- a/forge-gui/res/cardsfolder/h/holdout_settlement.txt
+++ b/forge-gui/res/cardsfolder/h/holdout_settlement.txt
@@ -1,8 +1,8 @@
 Name:Holdout Settlement
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T tapXType<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T tapXType<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/holdout_settlement.jpg
-Oracle:{T}: Add {C} to your mana pool. ({C} represents colorless mana.)\n{T}, Tap an untapped creature you control: Add one mana of any color to your mana pool.
+Oracle:{T}: Add {C}. ({C} represents colorless mana.)\n{T}, Tap an untapped creature you control: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/h/hollow_trees.txt b/forge-gui/res/cardsfolder/h/hollow_trees.txt
index ce309c55b4f..1d4d2edf113 100644
--- a/forge-gui/res/cardsfolder/h/hollow_trees.txt
+++ b/forge-gui/res/cardsfolder/h/hollow_trees.txt
@@ -5,9 +5,9 @@ K:CARDNAME enters the battlefield tapped.
 K:You may choose not to untap CARDNAME during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self+tapped | Execute$ TrigStore | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is tapped, put a storage counter on it.
 SVar:TrigStore:DB$PutCounter | Defined$ Self | CounterType$ STORAGE | CounterNum$ 1
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ G | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {G} to your mana pool for each storage counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ G | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {G} for each storage counter removed this way.
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hollow_trees.jpg
-Oracle:Hollow Trees enters the battlefield tapped.\nYou may choose not to untap Hollow Trees during your untap step.\nAt the beginning of your upkeep, if Hollow Trees is tapped, put a storage counter on it.\n{T}, Remove any number of storage counters from Hollow Trees: Add {G} to your mana pool for each storage counter removed this way.
+Oracle:Hollow Trees enters the battlefield tapped.\nYou may choose not to untap Hollow Trees during your untap step.\nAt the beginning of your upkeep, if Hollow Trees is tapped, put a storage counter on it.\n{T}, Remove any number of storage counters from Hollow Trees: Add {G} for each storage counter removed this way.
diff --git a/forge-gui/res/cardsfolder/h/homeward_path.txt b/forge-gui/res/cardsfolder/h/homeward_path.txt
index 038e8905827..145873c5122 100644
--- a/forge-gui/res/cardsfolder/h/homeward_path.txt
+++ b/forge-gui/res/cardsfolder/h/homeward_path.txt
@@ -1,8 +1,8 @@
 Name:Homeward Path
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ RepeatEach | Cost$ T | RepeatPlayers$ Player | AILogic$ GainControlOwns | RepeatSubAbility$ DBGainControl | SpellDescription$ Each player gains control of all creatures he or she owns.
 SVar:DBGainControl:DB$ GainControl | AllValid$ Creature.RememberedPlayerOwn | NewController$ Player.IsRemembered
 SVar:Picture:http://www.wizards.com/global/images/magic/general/homeward_path.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Each player gains control of all creatures he or she owns.
+Oracle:{T}: Add {C}.\n{T}: Each player gains control of all creatures he or she owns.
diff --git a/forge-gui/res/cardsfolder/h/honor_worn_shaku.txt b/forge-gui/res/cardsfolder/h/honor_worn_shaku.txt
index 4ebfb77f809..a80ffee6c18 100644
--- a/forge-gui/res/cardsfolder/h/honor_worn_shaku.txt
+++ b/forge-gui/res/cardsfolder/h/honor_worn_shaku.txt
@@ -1,8 +1,8 @@
 Name:Honor-Worn Shaku
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Untap | Cost$ tapXType<1/Permanent.Legendary> | CostDesc$ Tap an untapped legendary permanent you control: | SpellDescription$ Untap CARDNAME.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/honor_worn_shaku.jpg
-Oracle:{T}: Add {C} to your mana pool.\nTap an untapped legendary permanent you control: Untap Honor-Worn Shaku.
+Oracle:{T}: Add {C}.\nTap an untapped legendary permanent you control: Untap Honor-Worn Shaku.
diff --git a/forge-gui/res/cardsfolder/h/honored_hierarch.txt b/forge-gui/res/cardsfolder/h/honored_hierarch.txt
index 05d45f3a9bf..3b15dde4b02 100644
--- a/forge-gui/res/cardsfolder/h/honored_hierarch.txt
+++ b/forge-gui/res/cardsfolder/h/honored_hierarch.txt
@@ -3,8 +3,8 @@ ManaCost:G
 Types:Creature Human Druid
 PT:1/1
 K:Renown:1
-S:Mode$ Continuous | Affected$ Card.Self+IsRenowned | AddKeyword$ Vigilance | AddAbility$ ManaTap | Description$ As long as CARDNAME is renowned, it has vigilance and "{T}: Add one mana of any color to your mana pool."
-SVar:ManaTap:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool. 
+S:Mode$ Continuous | Affected$ Card.Self+IsRenowned | AddKeyword$ Vigilance | AddAbility$ ManaTap | Description$ As long as CARDNAME is renowned, it has vigilance and "{T}: Add one mana of any color."
+SVar:ManaTap:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/honored_hierarch.jpg
-Oracle:Renown 1 (When this creature deals combat damage to a player, if it isn't renowned, put a +1/+1 counter on it and it becomes renowned.)\nAs long as Honored Hierarch is renowned, it has vigilance and "{T}: Add one mana of any color to your mana pool."
+Oracle:Renown 1 (When this creature deals combat damage to a player, if it isn't renowned, put a +1/+1 counter on it and it becomes renowned.)\nAs long as Honored Hierarch is renowned, it has vigilance and "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/h/horizon_canopy.txt b/forge-gui/res/cardsfolder/h/horizon_canopy.txt
index 0766e6c73a4..21b979264b8 100644
--- a/forge-gui/res/cardsfolder/h/horizon_canopy.txt
+++ b/forge-gui/res/cardsfolder/h/horizon_canopy.txt
@@ -1,8 +1,8 @@
 Name:Horizon Canopy
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Draw | Cost$ 1 T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/horizon_canopy.jpg
-Oracle:{T}, Pay 1 life: Add {G} or {W} to your mana pool.\n{1}, {T}, Sacrifice Horizon Canopy: Draw a card.
+Oracle:{T}, Pay 1 life: Add {G} or {W}.\n{1}, {T}, Sacrifice Horizon Canopy: Draw a card.
diff --git a/forge-gui/res/cardsfolder/h/horn_of_ramos.txt b/forge-gui/res/cardsfolder/h/horn_of_ramos.txt
index 593e4792382..a5c227e0400 100644
--- a/forge-gui/res/cardsfolder/h/horn_of_ramos.txt
+++ b/forge-gui/res/cardsfolder/h/horn_of_ramos.txt
@@ -1,8 +1,8 @@
 Name:Horn of Ramos
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$Sac<1/CARDNAME> | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$Sac<1/CARDNAME> | Produced$ G | SpellDescription$ Add {G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/horn_of_ramos.jpg
-Oracle:{T}: Add {G} to your mana pool.\nSacrifice Horn of Ramos: Add {G} to your mana pool.
+Oracle:{T}: Add {G}.\nSacrifice Horn of Ramos: Add {G}.
diff --git a/forge-gui/res/cardsfolder/h/hornswoggle.txt b/forge-gui/res/cardsfolder/h/hornswoggle.txt
index 040fb5af4e2..f35492ffead 100644
--- a/forge-gui/res/cardsfolder/h/hornswoggle.txt
+++ b/forge-gui/res/cardsfolder/h/hornswoggle.txt
@@ -3,6 +3,6 @@ ManaCost:2 U
 Types:Instant
 A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SubAbility$ DBTreasure | SpellDescription$ Counter target creature spell.
 SVar:DBTreasure:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hornswoggle.jpg
-Oracle:Counter target creature spell. You create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
\ No newline at end of file
+Oracle:Counter target creature spell. You create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hostile_desert.txt b/forge-gui/res/cardsfolder/h/hostile_desert.txt
index 74413d71baf..01f8d51e3b0 100644
--- a/forge-gui/res/cardsfolder/h/hostile_desert.txt
+++ b/forge-gui/res/cardsfolder/h/hostile_desert.txt
@@ -1,7 +1,7 @@
 Name:Hostile Desert
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ 2 ExileFromGrave<1/Land> | Defined$ Self | Power$ 3 | Toughness$ 4 | Types$ Creature,Elemental | SpellDescription$ CARDNAME becomes a 3/4 Elemental creature until end of turn. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hostile_desert.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, Exile a land card from your graveyard: Hostile Desert becomes a 3/4 Elemental creature until end of turn. It's still a land.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{2}, Exile a land card from your graveyard: Hostile Desert becomes a 3/4 Elemental creature until end of turn. It's still a land.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/howltooth_hollow.txt b/forge-gui/res/cardsfolder/h/howltooth_hollow.txt
index e0aede13494..67ba406056c 100644
--- a/forge-gui/res/cardsfolder/h/howltooth_hollow.txt
+++ b/forge-gui/res/cardsfolder/h/howltooth_hollow.txt
@@ -2,9 +2,9 @@ Name:Howltooth Hollow
 ManaCost:no cost
 Types:Land
 K:Hideaway
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Play | Cost$ B T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ Hands | ConditionSVarCompare$ EQ0 | ForgetRemembered$ True | References$ Hands | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if each player has no cards in hand.
 SVar:Hands:Count$NumInAllHands
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/howltooth_hollow.jpg
-Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {B} to your mana pool.\n{B}, {T}: You may play the exiled card without paying its mana cost if each player has no cards in hand.
+Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {B}.\n{B}, {T}: You may play the exiled card without paying its mana cost if each player has no cards in hand.
diff --git a/forge-gui/res/cardsfolder/i/icatian_store.txt b/forge-gui/res/cardsfolder/i/icatian_store.txt
index 7790f2aa68d..eb88a28921d 100644
--- a/forge-gui/res/cardsfolder/i/icatian_store.txt
+++ b/forge-gui/res/cardsfolder/i/icatian_store.txt
@@ -5,9 +5,9 @@ K:CARDNAME enters the battlefield tapped.
 K:You may choose not to untap CARDNAME during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self+tapped | Execute$ TrigStore | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is tapped, put a storage counter on it.
 SVar:TrigStore:DB$PutCounter | Defined$ Self | CounterType$ STORAGE | CounterNum$ 1
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ W | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {W} to your mana pool for each storage counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ W | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {W} for each storage counter removed this way.
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/icatian_store.jpg
-Oracle:Icatian Store enters the battlefield tapped.\nYou may choose not to untap Icatian Store during your untap step.\nAt the beginning of your upkeep, if Icatian Store is tapped, put a storage counter on it.\n{T}, Remove any number of storage counters from Icatian Store: Add {W} to your mana pool for each storage counter removed this way.
+Oracle:Icatian Store enters the battlefield tapped.\nYou may choose not to untap Icatian Store during your untap step.\nAt the beginning of your upkeep, if Icatian Store is tapped, put a storage counter on it.\n{T}, Remove any number of storage counters from Icatian Store: Add {W} for each storage counter removed this way.
diff --git a/forge-gui/res/cardsfolder/i/iceberg.txt b/forge-gui/res/cardsfolder/i/iceberg.txt
index d0b749e7998..0a9db367317 100644
--- a/forge-gui/res/cardsfolder/i/iceberg.txt
+++ b/forge-gui/res/cardsfolder/i/iceberg.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 K:etbCounter:ICE:X
 SVar:X:Count$xPaid
 A:AB$ PutCounter | Cost$ 3 | CounterType$ ICE | CounterNum$ 1 | SpellDescription$ Put an ice counter on CARDNAME.
-A:AB$ Mana | Cost$ SubCounter<1/ICE> | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ SubCounter<1/ICE> | Produced$ C | SpellDescription$ Add {C}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/iceberg.jpg
-Oracle:Iceberg enters the battlefield with X ice counters on it.\n{3}: Put an ice counter on Iceberg.\nRemove an ice counter from Iceberg: Add {C} to your mana pool.
+Oracle:Iceberg enters the battlefield with X ice counters on it.\n{3}: Put an ice counter on Iceberg.\nRemove an ice counter from Iceberg: Add {C}.
diff --git a/forge-gui/res/cardsfolder/i/ifnir_deadlands.txt b/forge-gui/res/cardsfolder/i/ifnir_deadlands.txt
index 11657aed73f..8d7a25f4be9 100644
--- a/forge-gui/res/cardsfolder/i/ifnir_deadlands.txt
+++ b/forge-gui/res/cardsfolder/i/ifnir_deadlands.txt
@@ -1,9 +1,9 @@
 Name:Ifnir Deadlands
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ PutCounter | Cost$ 2 B B T Sac<1/Desert> | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | IsCurse$ True | CounterType$ M1M1 | CounterNum$ 2 | SorcerySpeed$ True | SpellDescription$ Put two -1/-1 counters on target creature an opponent controls. Activate this ability only any time you could cast a sorcery.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ifnir_deadlands.jpg
 DeckHas:Ability$Counters
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Pay 1 life: Add {B} to your mana pool.\n{2}{B}{B}, {T}, Sacrifice a Desert: Put two -1/-1 counters on target creature an opponent controls. Activate this ability only any time you could cast a sorcery.
+Oracle:{T}: Add {C}.\n{T}, Pay 1 life: Add {B}.\n{2}{B}{B}, {T}, Sacrifice a Desert: Put two -1/-1 counters on target creature an opponent controls. Activate this ability only any time you could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/i/implements_of_sacrifice.txt b/forge-gui/res/cardsfolder/i/implements_of_sacrifice.txt
index 30df6bf3021..18d0525db8c 100644
--- a/forge-gui/res/cardsfolder/i/implements_of_sacrifice.txt
+++ b/forge-gui/res/cardsfolder/i/implements_of_sacrifice.txt
@@ -1,7 +1,7 @@
 Name:Implements of Sacrifice
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
+A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/implements_of_sacrifice.jpg
-Oracle:{1}, {T}, Sacrifice Implements of Sacrifice: Add two mana of any one color to your mana pool.
+Oracle:{1}, {T}, Sacrifice Implements of Sacrifice: Add two mana of any one color.
diff --git a/forge-gui/res/cardsfolder/i/imprisoned_in_the_moon.txt b/forge-gui/res/cardsfolder/i/imprisoned_in_the_moon.txt
index 1a456f5f937..a5b2395fc0a 100644
--- a/forge-gui/res/cardsfolder/i/imprisoned_in_the_moon.txt
+++ b/forge-gui/res/cardsfolder/i/imprisoned_in_the_moon.txt
@@ -3,8 +3,8 @@ ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant creature, land, or planeswalker
 A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature,Land,Planeswalker | AILogic$ Curse | AITgts$ Card.cmcGE3
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | SetColor$ Colorless | AddType$ Land | RemoveCardTypes$ True | RemoveSubTypes$ True | RemoveAllAbilities$ True | AddAbility$ ABMana | Description$ Enchanted permanent is a colorless land with "{T}: Add {C} to your mana pool" and loses all other card types and abilities.
-SVar:ABMana:AB$Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool. 
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | SetColor$ Colorless | AddType$ Land | RemoveCardTypes$ True | RemoveSubTypes$ True | RemoveAllAbilities$ True | AddAbility$ ABMana | Description$ Enchanted permanent is a colorless land with "{T}: Add {C}" and loses all other card types and abilities.
+SVar:ABMana:AB$Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:NonStackingAttachEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/imprisoned_in_the_moon.jpg
-Oracle:Enchant creature, land, or planeswalker\nEnchanted permanent is a colorless land with "{T}: Add {C} to your mana pool" and loses all other card types and abilities.
+Oracle:Enchant creature, land, or planeswalker\nEnchanted permanent is a colorless land with "{T}: Add {C}" and loses all other card types and abilities.
diff --git a/forge-gui/res/cardsfolder/i/incubator_drone.txt b/forge-gui/res/cardsfolder/i/incubator_drone.txt
index 9e681f0f9e9..5ba4bd0a785 100644
--- a/forge-gui/res/cardsfolder/i/incubator_drone.txt
+++ b/forge-gui/res/cardsfolder/i/incubator_drone.txt
@@ -3,10 +3,10 @@ ManaCost:3 U
 Types:Creature Eldrazi Drone
 PT:2/3
 K:Devoid
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/incubator_drone.jpg
-Oracle:Devoid (This card has no color.)\nWhen Incubator Drone enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Devoid (This card has no color.)\nWhen Incubator Drone enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/i/infernal_plunge.txt b/forge-gui/res/cardsfolder/i/infernal_plunge.txt
index 20dcfa05177..b24c4179c07 100644
--- a/forge-gui/res/cardsfolder/i/infernal_plunge.txt
+++ b/forge-gui/res/cardsfolder/i/infernal_plunge.txt
@@ -1,7 +1,7 @@
 Name:Infernal Plunge
 ManaCost:R
 Types:Sorcery
-A:SP$ Mana | Cost$ R Sac<1/Creature> | Produced$ R | Amount$ 3 | SpellDescription$ Add {R}{R}{R} to your mana pool.
+A:SP$ Mana | Cost$ R Sac<1/Creature> | Produced$ R | Amount$ 3 | SpellDescription$ Add {R}{R}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/infernal_plunge.jpg
-Oracle:As an additional cost to cast Infernal Plunge, sacrifice a creature.\nAdd {R}{R}{R} to your mana pool.
+Oracle:As an additional cost to cast Infernal Plunge, sacrifice a creature.\nAdd {R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/i/initiates_of_the_ebon_hand.txt b/forge-gui/res/cardsfolder/i/initiates_of_the_ebon_hand.txt
index cc25a3343b3..cf84ffa7bcd 100644
--- a/forge-gui/res/cardsfolder/i/initiates_of_the_ebon_hand.txt
+++ b/forge-gui/res/cardsfolder/i/initiates_of_the_ebon_hand.txt
@@ -2,8 +2,8 @@ Name:Initiates of the Ebon Hand
 ManaCost:B
 Types:Creature Cleric
 PT:1/1
-A:AB$ Mana | Cost$ 1 | Produced$ B | ActivationNumberSacrifice$ GE4 | ActivationResolveSub$ DBPump | SpellDescription$ Add {B} to your mana pool. If this ability has been activated four or more times this turn, sacrifice CARDNAME at the beginning of the next end step.
+A:AB$ Mana | Cost$ 1 | Produced$ B | ActivationNumberSacrifice$ GE4 | ActivationResolveSub$ DBPump | SpellDescription$ Add {B}. If this ability has been activated four or more times this turn, sacrifice CARDNAME at the beginning of the next end step.
 SVar:DBPump:DB$ Pump | AtEOT$ Sacrifice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/initiates_of_the_ebon_hand.jpg
-Oracle:{1}: Add {B} to your mana pool. If this ability has been activated four or more times this turn, sacrifice Initiates of the Ebon Hand at the beginning of the next end step.
+Oracle:{1}: Add {B}. If this ability has been activated four or more times this turn, sacrifice Initiates of the Ebon Hand at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/i/inkmoth_nexus.txt b/forge-gui/res/cardsfolder/i/inkmoth_nexus.txt
index 538a7294e62..cac53969a29 100644
--- a/forge-gui/res/cardsfolder/i/inkmoth_nexus.txt
+++ b/forge-gui/res/cardsfolder/i/inkmoth_nexus.txt
@@ -1,7 +1,7 @@
 Name:Inkmoth Nexus
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Blinkmoth | Keywords$ Flying & Infect | SpellDescription$ CARDNAME becomes a 1/1 Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inkmoth_nexus.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}: Inkmoth Nexus becomes a 1/1 Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
+Oracle:{T}: Add {C}.\n{1}: Inkmoth Nexus becomes a 1/1 Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
diff --git a/forge-gui/res/cardsfolder/i/inner_fire.txt b/forge-gui/res/cardsfolder/i/inner_fire.txt
index d692fef3d90..d94f22239a6 100644
--- a/forge-gui/res/cardsfolder/i/inner_fire.txt
+++ b/forge-gui/res/cardsfolder/i/inner_fire.txt
@@ -1,7 +1,7 @@
 Name:Inner Fire
 ManaCost:3 R
 Types:Sorcery
-A:SP$ Mana | Cost$ 3 R | Produced$ R | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R} to your mana pool for each card in your hand.
+A:SP$ Mana | Cost$ 3 R | Produced$ R | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R} for each card in your hand.
 SVar:X:Count$CardsInYourHand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inner_fire.jpg
-Oracle:Add {R} to your mana pool for each card in your hand.
+Oracle:Add {R} for each card in your hand.
diff --git a/forge-gui/res/cardsfolder/i/inspiring_vantage.txt b/forge-gui/res/cardsfolder/i/inspiring_vantage.txt
index bac833eca11..0e2be37b2b7 100644
--- a/forge-gui/res/cardsfolder/i/inspiring_vantage.txt
+++ b/forge-gui/res/cardsfolder/i/inspiring_vantage.txt
@@ -5,7 +5,7 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ GT2 | References$ ETBCheckSVar2 | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar2:Count$LastStateBattlefield Land.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inspiring_vantage.jpg
-Oracle:Inspiring Vantage enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {R} or {W} to your mana pool.
+Oracle:Inspiring Vantage enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {R} or {W}.
diff --git a/forge-gui/res/cardsfolder/i/inventors_fair.txt b/forge-gui/res/cardsfolder/i/inventors_fair.txt
index 305f5a8ae14..23fca5e09cc 100644
--- a/forge-gui/res/cardsfolder/i/inventors_fair.txt
+++ b/forge-gui/res/cardsfolder/i/inventors_fair.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Legendary Land
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Metalcraft$ True | Execute$ TrigGainLife | TriggerDescription$ At the beginning of your upkeep, if you control three or more artifacts, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 4 T Sac<1/CARDNAME> | Activation$ Metalcraft | Origin$ Library | Destination$ Hand | ChangeType$ Artifact | ChangeNum$ 1 | SpellDescription$ Search your library for an artifact card, reveal it, put it into your hand, then shuffle your library. Activate this ability only if you control three or more artifacts.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inventors_fair.jpg
-Oracle:At the beginning of your upkeep, if you control three or more artifacts, you gain 1 life.\n{T}: Add {C} to your mana pool.\n{4}, {T}, Sacrifice Inventors' Fair: Search your library for an artifact card, reveal it, put it into your hand, then shuffle your library. Activate this ability only if you control three or more artifacts. 
+Oracle:At the beginning of your upkeep, if you control three or more artifacts, you gain 1 life.\n{T}: Add {C}.\n{4}, {T}, Sacrifice Inventors' Fair: Search your library for an artifact card, reveal it, put it into your hand, then shuffle your library. Activate this ability only if you control three or more artifacts.
diff --git a/forge-gui/res/cardsfolder/i/ipnu_rivulet.txt b/forge-gui/res/cardsfolder/i/ipnu_rivulet.txt
index b2c51718ba0..2c5239f4966 100644
--- a/forge-gui/res/cardsfolder/i/ipnu_rivulet.txt
+++ b/forge-gui/res/cardsfolder/i/ipnu_rivulet.txt
@@ -1,8 +1,8 @@
 Name:Ipnu Rivulet
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Mill | Cost$ 1 U T Sac<1/Desert> | NumCards$ 4 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top four cards of his or her library into his or her graveyard.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ipnu_rivulet.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Pay 1 life: Add {U} to your mana pool.\n{1}{U}, {T}, Sacrifice a Desert: Target player puts the top four cards of his or her library into his or her graveyard.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{T}, Pay 1 life: Add {U}.\n{1}{U}, {T}, Sacrifice a Desert: Target player puts the top four cards of his or her library into his or her graveyard.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/i/iron_myr.txt b/forge-gui/res/cardsfolder/i/iron_myr.txt
index e8ec60a6c0f..330ffff0ce5 100644
--- a/forge-gui/res/cardsfolder/i/iron_myr.txt
+++ b/forge-gui/res/cardsfolder/i/iron_myr.txt
@@ -2,7 +2,7 @@ Name:Iron Myr
 ManaCost:2
 Types:Artifact Creature Myr
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 DeckNeeds:Color$Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/iron_myr.jpg
-Oracle:{T}: Add {R} to your mana pool.
+Oracle:{T}: Add {R}.
diff --git a/forge-gui/res/cardsfolder/i/irrigated_farmland.txt b/forge-gui/res/cardsfolder/i/irrigated_farmland.txt
index df5199f5db8..7308e5197fa 100644
--- a/forge-gui/res/cardsfolder/i/irrigated_farmland.txt
+++ b/forge-gui/res/cardsfolder/i/irrigated_farmland.txt
@@ -4,4 +4,4 @@ Types:Land Plains Island
 K:CARDNAME enters the battlefield tapped.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/irrigated_farmland.jpg
-Oracle:({T}: Add {W} or {U} to your mana pool.)\nIrrigated Farmland enters the battlefield tapped.\nCycling {2} ({2}, discard this card: Draw a card.)
\ No newline at end of file
+Oracle:({T}: Add {W} or {U}.)\nIrrigated Farmland enters the battlefield tapped.\nCycling {2} ({2}, discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/i/irrigation_ditch.txt b/forge-gui/res/cardsfolder/i/irrigation_ditch.txt
index dc473483516..f05a2e33e48 100644
--- a/forge-gui/res/cardsfolder/i/irrigation_ditch.txt
+++ b/forge-gui/res/cardsfolder/i/irrigation_ditch.txt
@@ -2,8 +2,8 @@ Name:Irrigation Ditch
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ G U | SpellDescription$ Add {G}{U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ G U | SpellDescription$ Add {G}{U}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/irrigation_ditch.jpg
-Oracle:Irrigation Ditch enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\n{T}, Sacrifice Irrigation Ditch: Add {G}{U} to your mana pool.
+Oracle:Irrigation Ditch enters the battlefield tapped.\n{T}: Add {W}.\n{T}, Sacrifice Irrigation Ditch: Add {G}{U}.
diff --git a/forge-gui/res/cardsfolder/i/izzet_boilerworks.txt b/forge-gui/res/cardsfolder/i/izzet_boilerworks.txt
index 4b3e473166d..88e57bc32d8 100644
--- a/forge-gui/res/cardsfolder/i/izzet_boilerworks.txt
+++ b/forge-gui/res/cardsfolder/i/izzet_boilerworks.txt
@@ -2,9 +2,9 @@ Name:Izzet Boilerworks
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U R | SpellDescription$ Add {U}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U R | SpellDescription$ Add {U}{R}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/izzet_boilerworks.jpg
-Oracle:Izzet Boilerworks enters the battlefield tapped.\nWhen Izzet Boilerworks enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {U}{R} to your mana pool.
+Oracle:Izzet Boilerworks enters the battlefield tapped.\nWhen Izzet Boilerworks enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {U}{R}.
diff --git a/forge-gui/res/cardsfolder/i/izzet_cluestone.txt b/forge-gui/res/cardsfolder/i/izzet_cluestone.txt
index a2eb67f3db4..87aa186ee39 100644
--- a/forge-gui/res/cardsfolder/i/izzet_cluestone.txt
+++ b/forge-gui/res/cardsfolder/i/izzet_cluestone.txt
@@ -1,10 +1,10 @@
 Name:Izzet Cluestone
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Draw | Cost$ U R T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Blue|Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/izzet_cluestone.jpg
-Oracle:{T}: Add {U} or {R} to your mana pool.\n{U}{R}, {T}, Sacrifice Izzet Cluestone: Draw a card.
+Oracle:{T}: Add {U} or {R}.\n{U}{R}, {T}, Sacrifice Izzet Cluestone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/i/izzet_guildgate.txt b/forge-gui/res/cardsfolder/i/izzet_guildgate.txt
index 1718ea0eb6a..4033f98bd65 100644
--- a/forge-gui/res/cardsfolder/i/izzet_guildgate.txt
+++ b/forge-gui/res/cardsfolder/i/izzet_guildgate.txt
@@ -2,7 +2,7 @@ Name:Izzet Guildgate
 ManaCost:no cost
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/izzet_guildgate.jpg
-Oracle:Izzet Guildgate enters the battlefield tapped.\n{T}: Add {U} or {R} to your mana pool.
+Oracle:Izzet Guildgate enters the battlefield tapped.\n{T}: Add {U} or {R}.
diff --git a/forge-gui/res/cardsfolder/i/izzet_keyrune.txt b/forge-gui/res/cardsfolder/i/izzet_keyrune.txt
index a7326fe8778..58efa6386e1 100644
--- a/forge-gui/res/cardsfolder/i/izzet_keyrune.txt
+++ b/forge-gui/res/cardsfolder/i/izzet_keyrune.txt
@@ -1,8 +1,8 @@
 Name:Izzet Keyrune
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Animate | Cost$ U R | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Artifact,Creature,Elemental | Colors$ Blue,Red | SpellDescription$ Until end of turn, CARDNAME becomes a 2/1 blue and red Elemental artifact creature.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoot | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card. If you do, discard a card.
 SVar:TrigLoot:DB$Draw | NumCards$ 1 | SubAbility$ DBDiscard
@@ -10,4 +10,4 @@ SVar:DBDiscard:DB$Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Blue|Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/izzet_keyrune.jpg
-Oracle:{T}: Add {U} or {R} to your mana pool.\n{U}{R}: Until end of turn, Izzet Keyrune becomes a 2/1 blue and red Elemental artifact creature.\nWhenever Izzet Keyrune deals combat damage to a player, you may draw a card. If you do, discard a card.
+Oracle:{T}: Add {U} or {R}.\n{U}{R}: Until end of turn, Izzet Keyrune becomes a 2/1 blue and red Elemental artifact creature.\nWhenever Izzet Keyrune deals combat damage to a player, you may draw a card. If you do, discard a card.
diff --git a/forge-gui/res/cardsfolder/i/izzet_signet.txt b/forge-gui/res/cardsfolder/i/izzet_signet.txt
index 3985dd4bbea..aa868382101 100644
--- a/forge-gui/res/cardsfolder/i/izzet_signet.txt
+++ b/forge-gui/res/cardsfolder/i/izzet_signet.txt
@@ -1,7 +1,7 @@
 Name:Izzet Signet
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ U R | SpellDescription$ Add {U}{R} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ U R | SpellDescription$ Add {U}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/izzet_signet.jpg
-Oracle:{1}, {T}: Add {U}{R} to your mana pool.
+Oracle:{1}, {T}: Add {U}{R}.
diff --git a/forge-gui/res/cardsfolder/j/jeskai_banner.txt b/forge-gui/res/cardsfolder/j/jeskai_banner.txt
index bfefa7cb99e..12c4a6b1a89 100644
--- a/forge-gui/res/cardsfolder/j/jeskai_banner.txt
+++ b/forge-gui/res/cardsfolder/j/jeskai_banner.txt
@@ -1,11 +1,11 @@
 Name:Jeskai Banner
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Draw | Cost$ U R W T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Blue|Red|White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jeskai_banner.jpg
-Oracle:{T}: Add {U}, {R}, or {W} to your mana pool.\n{U}{R}{W}, {T}, Sacrifice Jeskai Banner: Draw a card.
+Oracle:{T}: Add {U}, {R}, or {W}.\n{U}{R}{W}, {T}, Sacrifice Jeskai Banner: Draw a card.
diff --git a/forge-gui/res/cardsfolder/j/jeweled_amulet.txt b/forge-gui/res/cardsfolder/j/jeweled_amulet.txt
index 18094096f92..cfdf9ab7dbc 100644
--- a/forge-gui/res/cardsfolder/j/jeweled_amulet.txt
+++ b/forge-gui/res/cardsfolder/j/jeweled_amulet.txt
@@ -3,7 +3,7 @@ ManaCost:0
 Types:Artifact
 A:AB$ PutCounter | Cost$ 1 T | RememberCostMana$ True | CounterType$ CHARGE | CounterNum$ 1 | CheckSVar$ X | SVarCompare$ EQ0 | References$ X | SpellDescription$ Put a charge counter on CARDNAME. Note the type of mana spent to pay this activation cost. Activate this ability only if there are no charge counters on CARDNAME.
 SVar:X:Count$CardCounters.CHARGE
-A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Special LastNotedType | SpellDescription$ Add one mana of CARDNAME's last noted type to your mana pool.
+A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Special LastNotedType | SpellDescription$ Add one mana of CARDNAME's last noted type.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jeweled_amulet.jpg
-Oracle:{1}, {T}: Put a charge counter on Jeweled Amulet. Note the type of mana spent to pay this activation cost. Activate this ability only if there are no charge counters on Jeweled Amulet.\n{T}, Remove a charge counter from Jeweled Amulet: Add one mana of Jeweled Amulet's last noted type to your mana pool.
+Oracle:{1}, {T}: Put a charge counter on Jeweled Amulet. Note the type of mana spent to pay this activation cost. Activate this ability only if there are no charge counters on Jeweled Amulet.\n{T}, Remove a charge counter from Jeweled Amulet: Add one mana of Jeweled Amulet's last noted type.
diff --git a/forge-gui/res/cardsfolder/j/joiner_adept.txt b/forge-gui/res/cardsfolder/j/joiner_adept.txt
index f3eb264af63..348ca3c78b5 100644
--- a/forge-gui/res/cardsfolder/j/joiner_adept.txt
+++ b/forge-gui/res/cardsfolder/j/joiner_adept.txt
@@ -2,7 +2,7 @@ Name:Joiner Adept
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:2/1
-S:Mode$ Continuous | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add one mana of any color."
+SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/joiner_adept.jpg
-Oracle:Lands you control have "{T}: Add one mana of any color to your mana pool."
+Oracle:Lands you control have "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/j/joraga_treespeaker.txt b/forge-gui/res/cardsfolder/j/joraga_treespeaker.txt
index e5f6fb55197..84b81f302ab 100644
--- a/forge-gui/res/cardsfolder/j/joraga_treespeaker.txt
+++ b/forge-gui/res/cardsfolder/j/joraga_treespeaker.txt
@@ -4,11 +4,11 @@ Types:Creature Elf Druid
 PT:1/1
 K:Level up:1 G
 SVar:maxLevel:5
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 2 | AddAbility$ Mana | CheckSVar$ X | SVarCompare$ EQ1 | Description$ LEVEL 1-4 1/2 CARDNAME has "{T}: Add {G}{G} to your mana pool."
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 4 | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 5+ 1/4 Elves you control have "{T}: Add {G}{G} to your mana pool."
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 2 | AddAbility$ Mana | CheckSVar$ X | SVarCompare$ EQ1 | Description$ LEVEL 1-4 1/2 CARDNAME has "{T}: Add {G}{G}."
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 4 | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 5+ 1/4 Elves you control have "{T}: Add {G}{G}."
 S:Mode$ Continuous | Affected$ Card.Elf+YouCtrl | AddAbility$ Mana | CheckSVar$ Y | SVarCompare$ EQ1
-SVar:Mana:AB$Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool.
+SVar:Mana:AB$Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
 SVar:X:Count$Valid Card.Self+counters_GE1_LEVEL+counters_LT5_LEVEL
 SVar:Y:Count$Valid Card.Self+counters_GE5_LEVEL
 SVar:Picture:http://www.wizards.com/global/images/magic/general/joraga_treespeaker.jpg
-Oracle:Level up {1}{G} ({1}{G}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-4\n1/2\n{T}: Add {G}{G} to your mana pool.\nLEVEL 5+\n1/4\nElves you control have "{T}: Add {G}{G} to your mana pool."
+Oracle:Level up {1}{G} ({1}{G}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-4\n1/2\n{T}: Add {G}{G}.\nLEVEL 5+\n1/4\nElves you control have "{T}: Add {G}{G}."
diff --git a/forge-gui/res/cardsfolder/j/journey_to_eternity_atzal_cave_of_eternity.txt b/forge-gui/res/cardsfolder/j/journey_to_eternity_atzal_cave_of_eternity.txt
index ec71b57fb26..61fbc6824cb 100644
--- a/forge-gui/res/cardsfolder/j/journey_to_eternity_atzal_cave_of_eternity.txt
+++ b/forge-gui/res/cardsfolder/j/journey_to_eternity_atzal_cave_of_eternity.txt
@@ -17,7 +17,7 @@ ALTERNATE
 Name:Atzal, Cave of Eternity
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 A:AB$ ChangeZone | Cost$ 3 B G T | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature card in your graveyard | SpellDescription$ Return target creature card from your graveyard to the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/atzal_cave_of_eternity.jpg
-Oracle:(Transforms from Journey to Eternity.)\n{T}: Add one mana of any color to your mana pool.\n{3}{B}{G}, {T}: Return target creature card from your graveyard to the battlefield.
+Oracle:(Transforms from Journey to Eternity.)\n{T}: Add one mana of any color.\n{3}{B}{G}, {T}: Return target creature card from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/j/jund_panorama.txt b/forge-gui/res/cardsfolder/j/jund_panorama.txt
index bf4993996ef..a017e4270e8 100644
--- a/forge-gui/res/cardsfolder/j/jund_panorama.txt
+++ b/forge-gui/res/cardsfolder/j/jund_panorama.txt
@@ -1,7 +1,7 @@
 Name:Jund Panorama
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Swamp+Basic,Land.Mountain+Basic,Land.Forest+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Swamp, Mountain, or Forest card and put it onto the battlefield tapped. Then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jund_panorama.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}, Sacrifice Jund Panorama: Search your library for a basic Swamp, Mountain, or Forest card and put it onto the battlefield tapped. Then shuffle your library.
+Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Jund Panorama: Search your library for a basic Swamp, Mountain, or Forest card and put it onto the battlefield tapped. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/j/jungle_basin.txt b/forge-gui/res/cardsfolder/j/jungle_basin.txt
index 919576eedda..d365fcaeafe 100644
--- a/forge-gui/res/cardsfolder/j/jungle_basin.txt
+++ b/forge-gui/res/cardsfolder/j/jungle_basin.txt
@@ -2,9 +2,9 @@ Name:Jungle Basin
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C G | SpellDescription$ Add {C}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C G | SpellDescription$ Add {C}{G}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return an untapped Forest you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Forest.untapped/untapped Forest> | UnlessPayer$ You
 SVar:NeedsToPlay:Forest.YouCtrl+inZoneBattlefield+untapped
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_basin.jpg
-Oracle:Jungle Basin enters the battlefield tapped.\nWhen Jungle Basin enters the battlefield, sacrifice it unless you return an untapped Forest you control to its owner's hand.\n{T}: Add {C}{G} to your mana pool.
+Oracle:Jungle Basin enters the battlefield tapped.\nWhen Jungle Basin enters the battlefield, sacrifice it unless you return an untapped Forest you control to its owner's hand.\n{T}: Add {C}{G}.
diff --git a/forge-gui/res/cardsfolder/j/jungle_hollow.txt b/forge-gui/res/cardsfolder/j/jungle_hollow.txt
index 4e32c3aa4e9..206b30d14b7 100644
--- a/forge-gui/res/cardsfolder/j/jungle_hollow.txt
+++ b/forge-gui/res/cardsfolder/j/jungle_hollow.txt
@@ -1,10 +1,10 @@
 Name:Jungle Hollow
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_hollow.jpg
-Oracle:Jungle Hollow enters the battlefield tapped.\nWhen Jungle Hollow enters the battlefield, you gain 1 life.\n{T}: Add {B} or {G} to your mana pool.
+Oracle:Jungle Hollow enters the battlefield tapped.\nWhen Jungle Hollow enters the battlefield, you gain 1 life.\n{T}: Add {B} or {G}.
diff --git a/forge-gui/res/cardsfolder/j/jungle_patrol.txt b/forge-gui/res/cardsfolder/j/jungle_patrol.txt
index 80903a17776..e66670e2a8c 100644
--- a/forge-gui/res/cardsfolder/j/jungle_patrol.txt
+++ b/forge-gui/res/cardsfolder/j/jungle_patrol.txt
@@ -3,6 +3,6 @@ ManaCost:3 G
 Types:Creature Human Soldier
 PT:3/2
 A:AB$ Token | Cost$ 1 G T | TokenAmount$ 1 | TokenName$ Wood | TokenTypes$ Creature,Wall | TokenOwner$ You | TokenColors$ Green | TokenPower$ 0 | TokenToughness$ 1 | TokenKeywords$ Defender | SpellDescription$ Create a 0/1 green Wall creature token with defender named Wood.
-A:AB$ Mana | Cost$ Sac<1/Permanent.token+namedWood/token named Wood> | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/Permanent.token+namedWood/token named Wood> | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_patrol.jpg
-Oracle:{1}{G}, {T}: Create a 0/1 green Wall creature token with defender named Wood.\nSacrifice a token named Wood: Add {R} to your mana pool.
+Oracle:{1}{G}, {T}: Create a 0/1 green Wall creature token with defender named Wood.\nSacrifice a token named Wood: Add {R}.
diff --git a/forge-gui/res/cardsfolder/j/jungle_shrine.txt b/forge-gui/res/cardsfolder/j/jungle_shrine.txt
index 2f86140cd05..5cfb8c1af9d 100644
--- a/forge-gui/res/cardsfolder/j/jungle_shrine.txt
+++ b/forge-gui/res/cardsfolder/j/jungle_shrine.txt
@@ -2,8 +2,8 @@ Name:Jungle Shrine
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_shrine.jpg
-Oracle:Jungle Shrine enters the battlefield tapped.\n{T}: Add {R}, {G}, or {W} to your mana pool.
+Oracle:Jungle Shrine enters the battlefield tapped.\n{T}: Add {R}, {G}, or {W}.
diff --git a/forge-gui/res/cardsfolder/j/jwar_isle_refuge.txt b/forge-gui/res/cardsfolder/j/jwar_isle_refuge.txt
index 20378abfdc6..95282524ea9 100644
--- a/forge-gui/res/cardsfolder/j/jwar_isle_refuge.txt
+++ b/forge-gui/res/cardsfolder/j/jwar_isle_refuge.txt
@@ -1,10 +1,10 @@
 Name:Jwar Isle Refuge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jwar_isle_refuge.jpg
-Oracle:Jwar Isle Refuge enters the battlefield tapped.\nWhen Jwar Isle Refuge enters the battlefield, you gain 1 life.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:Jwar Isle Refuge enters the battlefield tapped.\nWhen Jwar Isle Refuge enters the battlefield, you gain 1 life.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/k/kabira_crossroads.txt b/forge-gui/res/cardsfolder/k/kabira_crossroads.txt
index c1c3547f191..8c2b541a04e 100644
--- a/forge-gui/res/cardsfolder/k/kabira_crossroads.txt
+++ b/forge-gui/res/cardsfolder/k/kabira_crossroads.txt
@@ -1,9 +1,9 @@
 Name:Kabira Crossroads
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 2 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kabira_crossroads.jpg
-Oracle:Kabira Crossroads enters the battlefield tapped.\nWhen Kabira Crossroads enters the battlefield, you gain 2 life.\n{T}: Add {W} to your mana pool.
+Oracle:Kabira Crossroads enters the battlefield tapped.\nWhen Kabira Crossroads enters the battlefield, you gain 2 life.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/k/kaleidostone.txt b/forge-gui/res/cardsfolder/k/kaleidostone.txt
index 8473b3ee1aa..dcbd54a65b6 100644
--- a/forge-gui/res/cardsfolder/k/kaleidostone.txt
+++ b/forge-gui/res/cardsfolder/k/kaleidostone.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 1
-A:AB$ Mana | Cost$ 5 T Sac<1/CARDNAME> | Produced$ W U B R G | SpellDescription$ Add {W}{U}{B}{R}{G} to your mana pool.
+A:AB$ Mana | Cost$ 5 T Sac<1/CARDNAME> | Produced$ W U B R G | SpellDescription$ Add {W}{U}{B}{R}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kaleidostone.jpg
-Oracle:When Kaleidostone enters the battlefield, draw a card.\n{5}, {T}, Sacrifice Kaleidostone: Add {W}{U}{B}{R}{G} to your mana pool.
+Oracle:When Kaleidostone enters the battlefield, draw a card.\n{5}, {T}, Sacrifice Kaleidostone: Add {W}{U}{B}{R}{G}.
diff --git a/forge-gui/res/cardsfolder/k/karakas.txt b/forge-gui/res/cardsfolder/k/karakas.txt
index e72c29e46e5..61c871f7792 100644
--- a/forge-gui/res/cardsfolder/k/karakas.txt
+++ b/forge-gui/res/cardsfolder/k/karakas.txt
@@ -1,7 +1,7 @@
 Name:Karakas
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ ChangeZone | Cost$ T | ValidTgts$ Creature.Legendary | TgtPrompt$ Select target legendary creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target legendary creature to its owner's hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/karakas.jpg
-Oracle:{T}: Add {W} to your mana pool.\n{T}: Return target legendary creature to its owner's hand.
+Oracle:{T}: Add {W}.\n{T}: Return target legendary creature to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/k/karametras_acolyte.txt b/forge-gui/res/cardsfolder/k/karametras_acolyte.txt
index f953223baf4..b91fff5bcf7 100644
--- a/forge-gui/res/cardsfolder/k/karametras_acolyte.txt
+++ b/forge-gui/res/cardsfolder/k/karametras_acolyte.txt
@@ -2,7 +2,7 @@ Name:Karametra's Acolyte
 ManaCost:3 G
 Types:Creature Human Druid
 PT:1/4
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add an amount of {G} to your mana pool equal to your devotion to green. (Each {G} in the mana costs of permanents you control counts towards your devotion to green.)
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add an amount of {G} equal to your devotion to green. (Each {G} in the mana costs of permanents you control counts towards your devotion to green.)
 SVar:X:Count$Devotion.Green
 SVar:Picture:http://www.wizards.com/global/images/magic/general/karametras_acolyte.jpg
-Oracle:{T}: Add an amount of {G} to your mana pool equal to your devotion to green. (Each {G} in the mana costs of permanents you control counts toward your devotion to green.)
+Oracle:{T}: Add an amount of {G} equal to your devotion to green. (Each {G} in the mana costs of permanents you control counts toward your devotion to green.)
diff --git a/forge-gui/res/cardsfolder/k/karametras_favor.txt b/forge-gui/res/cardsfolder/k/karametras_favor.txt
index f35d2f8df73..036e80f95d3 100644
--- a/forge-gui/res/cardsfolder/k/karametras_favor.txt
+++ b/forge-gui/res/cardsfolder/k/karametras_favor.txt
@@ -5,8 +5,8 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ AnyMana | Description$ Enchanted creature has "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ AnyMana | Description$ Enchanted creature has "{T}: Add one mana of any color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:NonStackingAttachEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/karametras_favor.jpg
-Oracle:Enchant creature\nWhen Karametra's Favor enters the battlefield, draw a card.\nEnchanted creature has "{T}: Add one mana of any color to your mana pool."
+Oracle:Enchant creature\nWhen Karametra's Favor enters the battlefield, draw a card.\nEnchanted creature has "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/k/karoo.txt b/forge-gui/res/cardsfolder/k/karoo.txt
index eec70203c3d..8d0b918d46f 100644
--- a/forge-gui/res/cardsfolder/k/karoo.txt
+++ b/forge-gui/res/cardsfolder/k/karoo.txt
@@ -2,9 +2,9 @@ Name:Karoo
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C W | SpellDescription$ Add {C}{W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C W | SpellDescription$ Add {C}{W}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return an untapped Plains you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Plains.untapped/untapped Plains> | UnlessPayer$ You
 SVar:NeedsToPlay:Plains.YouCtrl+inZoneBattlefield+untapped
 SVar:Picture:http://www.wizards.com/global/images/magic/general/karoo.jpg
-Oracle:Karoo enters the battlefield tapped.\nWhen Karoo enters the battlefield, sacrifice it unless you return an untapped Plains you control to its owner's hand.\n{T}: Add {C}{W} to your mana pool.
+Oracle:Karoo enters the battlefield tapped.\nWhen Karoo enters the battlefield, sacrifice it unless you return an untapped Plains you control to its owner's hand.\n{T}: Add {C}{W}.
diff --git a/forge-gui/res/cardsfolder/k/karplusan_forest.txt b/forge-gui/res/cardsfolder/k/karplusan_forest.txt
index fd1c8be2e93..fea51adc7ad 100644
--- a/forge-gui/res/cardsfolder/k/karplusan_forest.txt
+++ b/forge-gui/res/cardsfolder/k/karplusan_forest.txt
@@ -1,9 +1,9 @@
 Name:Karplusan Forest
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R} to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/karplusan_forest.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {R} or {G} to your mana pool. Karplusan Forest deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {R} or {G}. Karplusan Forest deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/k/kazandu_refuge.txt b/forge-gui/res/cardsfolder/k/kazandu_refuge.txt
index e069a5dee64..3ff2d2e17ca 100644
--- a/forge-gui/res/cardsfolder/k/kazandu_refuge.txt
+++ b/forge-gui/res/cardsfolder/k/kazandu_refuge.txt
@@ -1,10 +1,10 @@
 Name:Kazandu Refuge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kazandu_refuge.jpg
-Oracle:Kazandu Refuge enters the battlefield tapped.\nWhen Kazandu Refuge enters the battlefield, you gain 1 life.\n{T}: Add {R} or {G} to your mana pool.
+Oracle:Kazandu Refuge enters the battlefield tapped.\nWhen Kazandu Refuge enters the battlefield, you gain 1 life.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/k/keeper_of_progenitus.txt b/forge-gui/res/cardsfolder/k/keeper_of_progenitus.txt
index 20458bc0a7f..eb311f9af0c 100644
--- a/forge-gui/res/cardsfolder/k/keeper_of_progenitus.txt
+++ b/forge-gui/res/cardsfolder/k/keeper_of_progenitus.txt
@@ -2,8 +2,8 @@ Name:Keeper of Progenitus
 ManaCost:3 G
 Types:Creature Elf Druid
 PT:1/3
-T:Mode$ TapsForMana | ValidCard$ Mountain,Forest,Plains | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a Mountain, Forest, or Plains for mana, that player adds one mana to his or her mana pool of any type that land produced.
+T:Mode$ TapsForMana | ValidCard$ Mountain,Forest,Plains | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a Mountain, Forest, or Plains for mana, that player adds one mana of any type that land produced.
 SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/keeper_of_progenitus.jpg
-Oracle:Whenever a player taps a Mountain, Forest, or Plains for mana, that player adds one mana to his or her mana pool of any type that land produced.
+Oracle:Whenever a player taps a Mountain, Forest, or Plains for mana, that player adds one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/k/keldon_megaliths.txt b/forge-gui/res/cardsfolder/k/keldon_megaliths.txt
index 7863822a202..fb5a00caf92 100644
--- a/forge-gui/res/cardsfolder/k/keldon_megaliths.txt
+++ b/forge-gui/res/cardsfolder/k/keldon_megaliths.txt
@@ -2,7 +2,7 @@ Name:Keldon Megaliths
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ DealDamage | Cost$ 1 R T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | Activation$ Hellbent | PrecostDesc$ Hellbent — | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Activate this ability only if you have no cards in hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/keldon_megaliths.jpg
-Oracle:Keldon Megaliths enters the battlefield tapped.\n{T}: Add {R} to your mana pool.\nHellbent — {1}{R}, {T}: Keldon Megaliths deals 1 damage to target creature or player. Activate this ability only if you have no cards in hand.
+Oracle:Keldon Megaliths enters the battlefield tapped.\n{T}: Add {R}.\nHellbent — {1}{R}, {T}: Keldon Megaliths deals 1 damage to target creature or player. Activate this ability only if you have no cards in hand.
diff --git a/forge-gui/res/cardsfolder/k/keldon_necropolis.txt b/forge-gui/res/cardsfolder/k/keldon_necropolis.txt
index 5ce25cadea9..9130f23850c 100644
--- a/forge-gui/res/cardsfolder/k/keldon_necropolis.txt
+++ b/forge-gui/res/cardsfolder/k/keldon_necropolis.txt
@@ -1,8 +1,8 @@
 Name:Keldon Necropolis
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ DealDamage | Cost$ 4 R T Sac<1/Creature> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/keldon_necropolis.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}{R}, {T}, Sacrifice a creature: Keldon Necropolis deals 2 damage to target creature or player.
+Oracle:{T}: Add {C}.\n{4}{R}, {T}, Sacrifice a creature: Keldon Necropolis deals 2 damage to target creature or player.
diff --git a/forge-gui/res/cardsfolder/k/kessig_wolf_run.txt b/forge-gui/res/cardsfolder/k/kessig_wolf_run.txt
index 4dc9744abf2..a0ae94d957f 100644
--- a/forge-gui/res/cardsfolder/k/kessig_wolf_run.txt
+++ b/forge-gui/res/cardsfolder/k/kessig_wolf_run.txt
@@ -1,8 +1,8 @@
 Name:Kessig Wolf Run
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ X R G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | KW$ Trample | References$ X | SpellDescription$ Target creature gets +X/+0 and gains trample until end of turn.
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kessig_wolf_run.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{X}{R}{G}, {T}: Target creature gets +X/+0 and gains trample until end of turn.
+Oracle:{T}: Add {C}.\n{X}{R}{G}, {T}: Target creature gets +X/+0 and gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/k/khalni_garden.txt b/forge-gui/res/cardsfolder/k/khalni_garden.txt
index 70ef4dae9ff..c1e32cbcec6 100644
--- a/forge-gui/res/cardsfolder/k/khalni_garden.txt
+++ b/forge-gui/res/cardsfolder/k/khalni_garden.txt
@@ -4,6 +4,6 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 0/1 green Plant creature token.
 SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenName$ Plant | TokenTypes$ Creature,Plant | TokenOwner$ You | TokenColors$ Green | TokenPower$ 0 | TokenToughness$ 1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/khalni_garden.jpg
-Oracle:Khalni Garden enters the battlefield tapped.\nWhen Khalni Garden enters the battlefield, create a 0/1 green Plant creature token.\n{T}: Add {G} to your mana pool.
+Oracle:Khalni Garden enters the battlefield tapped.\nWhen Khalni Garden enters the battlefield, create a 0/1 green Plant creature token.\n{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/k/khalni_gem.txt b/forge-gui/res/cardsfolder/k/khalni_gem.txt
index 59d58f57563..b852cd5cafd 100644
--- a/forge-gui/res/cardsfolder/k/khalni_gem.txt
+++ b/forge-gui/res/cardsfolder/k/khalni_gem.txt
@@ -1,10 +1,10 @@
 Name:Khalni Gem
 ManaCost:4
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, return two lands you control to their owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Mandatory$ True | ChangeType$ Land.YouCtrl | ChangeNum$ 2 | Hidden$ True | TgtPrompt$ Select 2 target lands you control
 SVar:NeedsToPlayVar:Z GE2
 SVar:Z:Count$Valid Land.YouCtrl+inZoneBattlefield
 SVar:Picture:http://www.wizards.com/global/images/magic/general/khalni_gem.jpg
-Oracle:When Khalni Gem enters the battlefield, return two lands you control to their owner's hand.\n{T}: Add two mana of any one color to your mana pool.
+Oracle:When Khalni Gem enters the battlefield, return two lands you control to their owner's hand.\n{T}: Add two mana of any one color.
diff --git a/forge-gui/res/cardsfolder/k/kher_keep.txt b/forge-gui/res/cardsfolder/k/kher_keep.txt
index 9d5f451ac8a..c05653b39fc 100644
--- a/forge-gui/res/cardsfolder/k/kher_keep.txt
+++ b/forge-gui/res/cardsfolder/k/kher_keep.txt
@@ -1,7 +1,7 @@
 Name:Kher Keep
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Token | Cost$ 1 R T | TokenAmount$ 1 | TokenName$ Kobolds of Kher Keep | TokenTypes$ Creature,Kobold | TokenOwner$ You | TokenColors$ Red | TokenPower$ 0 | TokenToughness$ 1 | SpellDescription$ Create a 0/1 red Kobold creature token named Kobolds of Kher Keep.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kher_keep.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{R}, {T}: Create a 0/1 red Kobold creature token named Kobolds of Kher Keep.
+Oracle:{T}: Add {C}.\n{1}{R}, {T}: Create a 0/1 red Kobold creature token named Kobolds of Kher Keep.
diff --git a/forge-gui/res/cardsfolder/k/kilnspire_district.txt b/forge-gui/res/cardsfolder/k/kilnspire_district.txt
index 23128cdc0f7..0d52c9219f5 100644
--- a/forge-gui/res/cardsfolder/k/kilnspire_district.txt
+++ b/forge-gui/res/cardsfolder/k/kilnspire_district.txt
@@ -1,8 +1,8 @@
 Name:Kilnspire District
 ManaCost:no cost
 Types:Plane Ravnica
-T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | TriggerZones$ Command | Execute$ PutCounter | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your precombat main phase, put a charge counter on CARDNAME, then add {R} to your mana pool for each charge counter on it.
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Command | Execute$ PutCounter | Secondary$ True | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your precombat main phase, put a charge counter on CARDNAME, then add {R} to your mana pool for each charge counter on it.
+T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | TriggerZones$ Command | Execute$ PutCounter | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your precombat main phase, put a charge counter on CARDNAME, then add {R} for each charge counter on it.
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Command | Execute$ PutCounter | Secondary$ True | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your precombat main phase, put a charge counter on CARDNAME, then add {R} for each charge counter on it.
 SVar:PutCounter:DB$PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 | SubAbility$ DBMana
 SVar:DBMana:DB$ Mana | Produced$ R | Amount$ Y | References$ Y
 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ DBPay | TriggerDescription$ Whenever you roll {CHAOS}, you may pay {X}. If you do, CARDNAME deals X damage to target creature or player.
@@ -12,4 +12,4 @@ SVar:PaidChaos:Count$ChosenNumber
 SVar:Y:Count$CardCounters.CHARGE
 SVar:AIRollPlanarDieParams:Mode$ Always
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kilnspire_district.jpg
-Oracle:When you planeswalk to Kilnspire District or at the beginning of your precombat main phase, put a charge counter on Kilnspire District, then add {R} to your mana pool for each charge counter on it.\nWhenever you roll {CHAOS}, you may pay {X}. If you do, Kilnspire District deals X damage to target creature or player.
+Oracle:When you planeswalk to Kilnspire District or at the beginning of your precombat main phase, put a charge counter on Kilnspire District, then add {R} for each charge counter on it.\nWhenever you roll {CHAOS}, you may pay {X}. If you do, Kilnspire District deals X damage to target creature or player.
diff --git a/forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt b/forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt
index db10cdd7aa2..48f27ede905 100644
--- a/forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt
+++ b/forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt
@@ -2,11 +2,11 @@ Name:King Macar, the Gold-Cursed
 ManaCost:2 B B
 Types:Legendary Creature Human
 PT:2/3
-T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Inspired — Whenever CARDNAME becomes untapped, you may exile target creature. If you do, create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Inspired — Whenever CARDNAME becomes untapped, you may exile target creature. If you do, create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color."
 SVar:TrigExile:DB$ ChangeZone | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenName$ Gold | TokenTypes$ Artifact | TokenColors$ Colorless | TokenOwner$ You | TokenAmount$ 1 | TokenAbilities$ ABMana | TokenImage$ c gold | References$ ABMana | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/king_macar_the_gold_cursed.jpg
-Oracle:Inspired — Whenever King Macar, the Gold-Cursed becomes untapped, you may exile target creature. If you do, create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:Inspired — Whenever King Macar, the Gold-Cursed becomes untapped, you may exile target creature. If you do, create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/k/kjeldoran_outpost.txt b/forge-gui/res/cardsfolder/k/kjeldoran_outpost.txt
index 483775f0825..9e456430602 100644
--- a/forge-gui/res/cardsfolder/k/kjeldoran_outpost.txt
+++ b/forge-gui/res/cardsfolder/k/kjeldoran_outpost.txt
@@ -1,7 +1,7 @@
 Name:Kjeldoran Outpost
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Token | Cost$ 1 W T | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Create a 1/1 white Soldier creature token.
 R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, sacrifice a Plains instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
 SVar:PayBeforeETB:DB$ Sacrifice | SacValid$ Plains | Defined$ You | RememberSacrificed$ True | SubAbility$ MoveToGraveyard
@@ -11,4 +11,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:NeedsToPlay:Plains.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kjeldoran_outpost.jpg
-Oracle:If Kjeldoran Outpost would enter the battlefield, sacrifice a Plains instead. If you do, put Kjeldoran Outpost onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {W} to your mana pool.\n{1}{W}, {T}: Create a 1/1 white Soldier creature token.
+Oracle:If Kjeldoran Outpost would enter the battlefield, sacrifice a Plains instead. If you do, put Kjeldoran Outpost onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {W}.\n{1}{W}, {T}: Create a 1/1 white Soldier creature token.
diff --git a/forge-gui/res/cardsfolder/k/knotvine_mystic.txt b/forge-gui/res/cardsfolder/k/knotvine_mystic.txt
index f5875702017..ca80670cbfd 100644
--- a/forge-gui/res/cardsfolder/k/knotvine_mystic.txt
+++ b/forge-gui/res/cardsfolder/k/knotvine_mystic.txt
@@ -2,7 +2,7 @@ Name:Knotvine Mystic
 ManaCost:R G W
 Types:Creature Elf Druid
 PT:2/2
-A:AB$ Mana | Cost$ 1 T | Produced$ R G W | SpellDescription$ Add {R}{G}{W} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ R G W | SpellDescription$ Add {R}{G}{W}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/knotvine_mystic.jpg
-Oracle:{1}, {T}: Add {R}{G}{W} to your mana pool.
+Oracle:{1}, {T}: Add {R}{G}{W}.
diff --git a/forge-gui/res/cardsfolder/k/kolaghan_monument.txt b/forge-gui/res/cardsfolder/k/kolaghan_monument.txt
index b6698ed5c16..74c9abb4be4 100644
--- a/forge-gui/res/cardsfolder/k/kolaghan_monument.txt
+++ b/forge-gui/res/cardsfolder/k/kolaghan_monument.txt
@@ -1,10 +1,10 @@
 Name:Kolaghan Monument
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Animate | Cost$ 4 B R | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | Colors$ Black,Red | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 black and red Dragon artifact creature with flying until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Black|Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kolaghan_monument.jpg
-Oracle:{T}: Add {B} or {R} to your mana pool.\n{4}{B}{R}: Kolaghan Monument becomes a 4/4 black and red Dragon artifact creature with flying until end of turn.
+Oracle:{T}: Add {B} or {R}.\n{4}{B}{R}: Kolaghan Monument becomes a 4/4 black and red Dragon artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/k/kor_haven.txt b/forge-gui/res/cardsfolder/k/kor_haven.txt
index fd2d932656b..75ad63eec10 100644
--- a/forge-gui/res/cardsfolder/k/kor_haven.txt
+++ b/forge-gui/res/cardsfolder/k/kor_haven.txt
@@ -1,8 +1,8 @@
 Name:Kor Haven
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ 1 W T | KW$ Prevent all combat damage that would be dealt by CARDNAME. | IsCurse$ True | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | SpellDescription$ Prevent all combat damage that would be dealt by target attacking creature this turn.
 DeckNeeds:Color$White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_haven.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{W}, {T}: Prevent all combat damage that would be dealt by target attacking creature this turn.
+Oracle:{T}: Add {C}.\n{1}{W}, {T}: Prevent all combat damage that would be dealt by target attacking creature this turn.
diff --git a/forge-gui/res/cardsfolder/k/koskun_keep.txt b/forge-gui/res/cardsfolder/k/koskun_keep.txt
index c53f59c7c29..d883b845dbc 100644
--- a/forge-gui/res/cardsfolder/k/koskun_keep.txt
+++ b/forge-gui/res/cardsfolder/k/koskun_keep.txt
@@ -1,10 +1,10 @@
 Name:Koskun Keep
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ 2 T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ 2 T | Produced$ G | SpellDescription$ Add {G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/koskun_keep.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add {R} to your mana pool.\n{2}, {T}: Add {B} or {G} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add {R}.\n{2}, {T}: Add {B} or {G}.
diff --git a/forge-gui/res/cardsfolder/k/koth_of_the_hammer.txt b/forge-gui/res/cardsfolder/k/koth_of_the_hammer.txt
index cdb0724bab9..bf75d040481 100644
--- a/forge-gui/res/cardsfolder/k/koth_of_the_hammer.txt
+++ b/forge-gui/res/cardsfolder/k/koth_of_the_hammer.txt
@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Koth
 Loyalty:3
 A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Mountain | TgtPrompt$ Select target Mountain | SubAbility$ DBAnimate | SpellDescription$ Untap target Mountain. It becomes a 4/4 red Elemental creature until end of turn. It's still a land.
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Colors$ Red
-A:AB$ Mana | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Produced$ R | Amount$ X | References$ X | SpellDescription$ Add {R} to your mana pool for each Mountain you control.
+A:AB$ Mana | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Produced$ R | Amount$ X | References$ X | SpellDescription$ Add {R} for each Mountain you control.
 A:AB$ Effect | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Koth of the Hammer | Image$ emblem_koth_of_the_hammer | StaticAbilities$ STDamage | SVars$ ABDealDamage | Stackable$ False | Duration$ Permanent | SpellDescription$ You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player."
 SVar:STDamage:Mode$ Continuous | EffectZone$ Command | Affected$ Mountain.YouCtrl | AddAbility$ ABDealDamage | AffectedZone$ Battlefield | Description$ Mountains you control have "{T}: This land deals 1 damage to target creature or player."
 SVar:ABDealDamage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ Deal 1 damage to target creature or player
@@ -12,4 +12,4 @@ SVar:X:Count$Valid Mountain.YouCtrl
 SVar:PlayMain1:ALWAYS
 DeckNeeds:Type$Mountain
 SVar:Picture:http://www.wizards.com/global/images/magic/general/koth_of_the_hammer.jpg
-Oracle:[+1]: Untap target Mountain. It becomes a 4/4 red Elemental creature until end of turn. It's still a land.\n[-2]: Add {R} to your mana pool for each Mountain you control.\n[-5]: You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player.'"
+Oracle:[+1]: Untap target Mountain. It becomes a 4/4 red Elemental creature until end of turn. It's still a land.\n[-2]: Add {R} for each Mountain you control.\n[-5]: You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player.'"
diff --git a/forge-gui/res/cardsfolder/k/kozileks_channeler.txt b/forge-gui/res/cardsfolder/k/kozileks_channeler.txt
index c4e95bf7486..b46f130ee6d 100644
--- a/forge-gui/res/cardsfolder/k/kozileks_channeler.txt
+++ b/forge-gui/res/cardsfolder/k/kozileks_channeler.txt
@@ -2,7 +2,7 @@ Name:Kozilek's Channeler
 ManaCost:5
 Types:Creature Eldrazi
 PT:4/4
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kozileks_channeler.jpg
-Oracle:{T}: Add {C}{C} to your mana pool.
\ No newline at end of file
+Oracle:{T}: Add {C}{C}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/k/kozileks_predator.txt b/forge-gui/res/cardsfolder/k/kozileks_predator.txt
index 55e78ed42e5..9a81df7da8f 100644
--- a/forge-gui/res/cardsfolder/k/kozileks_predator.txt
+++ b/forge-gui/res/cardsfolder/k/kozileks_predator.txt
@@ -2,10 +2,10 @@ Name:Kozilek's Predator
 ManaCost:3 G
 Types:Creature Eldrazi Drone
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn3
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kozileks_predator.jpg
-Oracle:When Kozilek's Predator enters the battlefield, create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:When Kozilek's Predator enters the battlefield, create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/k/kozileks_translator.txt b/forge-gui/res/cardsfolder/k/kozileks_translator.txt
index 36cb61308f0..c81a165529a 100644
--- a/forge-gui/res/cardsfolder/k/kozileks_translator.txt
+++ b/forge-gui/res/cardsfolder/k/kozileks_translator.txt
@@ -3,7 +3,7 @@ ManaCost:4 B
 Types:Creature Eldrazi Drone
 PT:3/5
 K:Devoid
-A:AB$ Mana | Cost$ PayLife<1> | Produced$ C | ActivationLimit$ 1 | SpellDescription$ Add {C} to your mana pool. Activate this ability only once each turn. ({C} represents colorless mana.)
+A:AB$ Mana | Cost$ PayLife<1> | Produced$ C | ActivationLimit$ 1 | SpellDescription$ Add {C}. Activate this ability only once each turn. ({C} represents colorless mana.)
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kozileks_translator.jpg
-Oracle:Devoid (This card has no color.)\nPay 1 life: Add {C} to your mana pool. Activate this ability only once each turn. ({C} represents colorless mana.)
+Oracle:Devoid (This card has no color.)\nPay 1 life: Add {C}. Activate this ability only once each turn. ({C} represents colorless mana.)
diff --git a/forge-gui/res/cardsfolder/k/krark_clan_ironworks.txt b/forge-gui/res/cardsfolder/k/krark_clan_ironworks.txt
index bc00c2b0173..9d5d5cb0ec4 100644
--- a/forge-gui/res/cardsfolder/k/krark_clan_ironworks.txt
+++ b/forge-gui/res/cardsfolder/k/krark_clan_ironworks.txt
@@ -1,7 +1,7 @@
 Name:Krark-Clan Ironworks
 ManaCost:4
 Types:Artifact
-A:AB$ Mana | Cost$ Sac<1/Artifact> | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/Artifact> | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/krark_clan_ironworks.jpg
-Oracle:Sacrifice an artifact: Add {C}{C} to your mana pool.
+Oracle:Sacrifice an artifact: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/k/krark_clan_stoker.txt b/forge-gui/res/cardsfolder/k/krark_clan_stoker.txt
index 1b0e6be1f4e..22bacdb4c57 100644
--- a/forge-gui/res/cardsfolder/k/krark_clan_stoker.txt
+++ b/forge-gui/res/cardsfolder/k/krark_clan_stoker.txt
@@ -2,7 +2,7 @@ Name:Krark-Clan Stoker
 ManaCost:2 R
 Types:Creature Goblin Shaman
 PT:2/2
-A:AB$ Mana | Cost$ T Sac<1/Artifact> | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R} to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/Artifact> | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/krark_clan_stoker.jpg
-Oracle:{T}, Sacrifice an artifact: Add {R}{R} to your mana pool.
+Oracle:{T}, Sacrifice an artifact: Add {R}{R}.
diff --git a/forge-gui/res/cardsfolder/k/krosa.txt b/forge-gui/res/cardsfolder/k/krosa.txt
index 2c416f8f971..f8b6376510b 100644
--- a/forge-gui/res/cardsfolder/k/krosa.txt
+++ b/forge-gui/res/cardsfolder/k/krosa.txt
@@ -2,8 +2,8 @@ Name:Krosa
 ManaCost:no cost
 Types:Plane Dominaria
 S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature | AddPower$ 2 | AddToughness$ 2 | Description$ All Creatures get +2/+2.
-T:Mode$ PlanarDice | Result$ Chaos | OptionalDecider$ You | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, you may add {W}{U}{B}{R}{G} to your mana pool.
+T:Mode$ PlanarDice | Result$ Chaos | OptionalDecider$ You | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, you may add {W}{U}{B}{R}{G}.
 SVar:RolledChaos:DB$ Mana | Produced$ W U B R G
 SVar:Picture:http://www.wizards.com/global/images/magic/general/krosa.jpg
 SVar:AIRollPlanarDieParams:Mode$ Always | RollInMain1$ True
-Oracle:All creatures get +2/+2.\nWhenever you roll {CHAOS}, you may add {W}{U}{B}{R}{G} to your mana pool.
+Oracle:All creatures get +2/+2.\nWhenever you roll {CHAOS}, you may add {W}{U}{B}{R}{G}.
diff --git a/forge-gui/res/cardsfolder/k/krosan_verge.txt b/forge-gui/res/cardsfolder/k/krosan_verge.txt
index 54ee15d89df..64d8d0408a0 100644
--- a/forge-gui/res/cardsfolder/k/krosan_verge.txt
+++ b/forge-gui/res/cardsfolder/k/krosan_verge.txt
@@ -2,8 +2,8 @@ Name:Krosan Verge
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest | Tapped$ True | ChangeNum$ 1 | Shuffle$ False | SubAbility$ DBPlains | SpellDescription$ Search your library for a Forest card and a Plains card and put them onto the battlefield tapped. Then shuffle your library.
 SVar:DBPlains:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains | Tapped$ True | ChangeNum$ 1 | Shuffle$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/krosan_verge.jpg
-Oracle:Krosan Verge enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{2}, {T}, Sacrifice Krosan Verge: Search your library for a Forest card and a Plains card and put them onto the battlefield tapped. Then shuffle your library.
+Oracle:Krosan Verge enters the battlefield tapped.\n{T}: Add {C}.\n{2}, {T}, Sacrifice Krosan Verge: Search your library for a Forest card and a Plains card and put them onto the battlefield tapped. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/k/kruphix_god_of_horizons.txt b/forge-gui/res/cardsfolder/k/kruphix_god_of_horizons.txt
index 458a2036025..e99e227ae22 100644
--- a/forge-gui/res/cardsfolder/k/kruphix_god_of_horizons.txt
+++ b/forge-gui/res/cardsfolder/k/kruphix_god_of_horizons.txt
@@ -6,7 +6,7 @@ K:Indestructible
 S:Mode$ Continuous | Affected$ Card.Self | RemoveType$ Creature | RemoveCreatureTypes$ True | CheckSVar$ X | SVarCompare$ LT7 | References$ X | Description$ As long as your devotion to green and blue is less than seven, CARDNAME isn't a creature.
 SVar:X:Count$DevotionDual.Green.Blue
 S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
-S:Mode$ Continuous | Affected$ You | AddKeyword$ Convert unused mana to Colorless | Description$ If unused mana would empty from your mana pool, that mana becomes colorless instead.
+S:Mode$ Continuous | Affected$ You | AddKeyword$ Convert unused mana to Colorless | Description$ If you would lose unspent mana, that mana becomes colorless instead.
 SVar:BuffedBy:Permanent.Green,Permanent.Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kruphix_god_of_horizons.jpg
-Oracle:Indestructible\nAs long as your devotion to green and blue is less than seven, Kruphix isn't a creature.\nYou have no maximum hand size.\nIf unused mana would empty from your mana pool, that mana becomes colorless instead.
+Oracle:Indestructible\nAs long as your devotion to green and blue is less than seven, Kruphix isn't a creature.\nYou have no maximum hand size.\nIf you would lose unspent mana, that mana becomes colorless instead.
diff --git a/forge-gui/res/cardsfolder/k/kydele_chosen_of_kruphix.txt b/forge-gui/res/cardsfolder/k/kydele_chosen_of_kruphix.txt
index 1a7f30ec09a..8c3f6a1d9e8 100644
--- a/forge-gui/res/cardsfolder/k/kydele_chosen_of_kruphix.txt
+++ b/forge-gui/res/cardsfolder/k/kydele_chosen_of_kruphix.txt
@@ -2,9 +2,9 @@ Name:Kydele, Chosen of Kruphix
 ManaCost:2 G U
 Types:Legendary Creature Human Wizard
 PT:2/3
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | References$ X | SpellDescription$ Add {C} to your mana pool for each card you've drawn this turn.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | References$ X | SpellDescription$ Add {C} for each card you've drawn this turn.
 SVar:X:Count$YouDrewThisTurn 
 K:Partner
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kydele_chosen_of_kruphix.jpg
-Oracle:{T}: Add {C} to your mana pool for each card you've drawn this turn.\nPartner (You can have two commanders if both have partner.)
\ No newline at end of file
+Oracle:{T}: Add {C} for each card you've drawn this turn.\nPartner (You can have two commanders if both have partner.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/k/kyren_toy.txt b/forge-gui/res/cardsfolder/k/kyren_toy.txt
index 1fe1cb1f372..56195b70fb2 100644
--- a/forge-gui/res/cardsfolder/k/kyren_toy.txt
+++ b/forge-gui/res/cardsfolder/k/kyren_toy.txt
@@ -2,9 +2,9 @@ Name:Kyren Toy
 ManaCost:3
 Types:Artifact
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ C | Amount$ Y | References$ X,Y | SpellDescription$ Add {C} to your mana pool equal to one plus the amount of counters removed.
+A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ C | Amount$ Y | References$ X,Y | SpellDescription$ Add {C} equal to one plus the amount of counters removed.
 SVar:Y:Number$1/Plus.ChosenX
 SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kyren_toy.jpg
-Oracle:{1}, {T}: Put a charge counter on Kyren Toy.\n{T}, Remove X charge counters from Kyren Toy: Add {C} to your mana pool equal to one plus the amount of counters removed.
+Oracle:{1}, {T}: Put a charge counter on Kyren Toy.\n{T}, Remove X charge counters from Kyren Toy: Add {C} equal to one plus the amount of counters removed.
diff --git a/forge-gui/res/cardsfolder/l/lake_of_the_dead.txt b/forge-gui/res/cardsfolder/l/lake_of_the_dead.txt
index 410418bf5e4..28b1da3d15c 100644
--- a/forge-gui/res/cardsfolder/l/lake_of_the_dead.txt
+++ b/forge-gui/res/cardsfolder/l/lake_of_the_dead.txt
@@ -1,8 +1,8 @@
 Name:Lake of the Dead
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/Swamp> | Produced$ B | Amount$ 4 | SpellDescription$ Add {B}{B}{B}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T Sac<1/Swamp> | Produced$ B | Amount$ 4 | SpellDescription$ Add {B}{B}{B}{B}.
 R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, sacrifice a Swamp instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
 SVar:PayBeforeETB:DB$ Sacrifice | SacValid$ Swamp | Defined$ You | RememberSacrificed$ True | SubAbility$ MoveToGraveyard
 SVar:MoveToGraveyard:DB$ ChangeZone | Origin$ All | Destination$ Graveyard | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ MoveToBattlefield
@@ -11,4 +11,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lake_of_the_dead.jpg
-Oracle:If Lake of the Dead would enter the battlefield, sacrifice a Swamp instead. If you do, put Lake of the Dead onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {B} to your mana pool.\n{T}, Sacrifice a Swamp: Add {B}{B}{B}{B} to your mana pool.
+Oracle:If Lake of the Dead would enter the battlefield, sacrifice a Swamp instead. If you do, put Lake of the Dead onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {B}.\n{T}, Sacrifice a Swamp: Add {B}{B}{B}{B}.
diff --git a/forge-gui/res/cardsfolder/l/land_cap.txt b/forge-gui/res/cardsfolder/l/land_cap.txt
index c52283da662..e7e91665ca0 100644
--- a/forge-gui/res/cardsfolder/l/land_cap.txt
+++ b/forge-gui/res/cardsfolder/l/land_cap.txt
@@ -2,10 +2,10 @@ Name:Land Cap
 ManaCost:no cost
 Types:Land
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_DEPLETION | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ CARDNAME doesn't untap during your untap step if it has a depletion counter on it.
-A:AB$ Mana | Cost$ T | Produced$ W | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {W} to your mana pool. Put a depletion counter on CARDNAME.
-A:AB$ Mana | Cost$ T | Produced$ U | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {U} to your mana pool. Put a depletion counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ W | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {W}. Put a depletion counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ U | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {U}. Put a depletion counter on CARDNAME.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSubCounter | TriggerDescription$ At the beginning of your upkeep, remove a depletion counter from CARDNAME.
 SVar:TrigSubCounter:DB$RemoveCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 1
 SVar:AddCounter:DB$PutCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/land_cap.jpg
-Oracle:Land Cap doesn't untap during your untap step if it has a depletion counter on it.\nAt the beginning of your upkeep, remove a depletion counter from Land Cap.\n{T}: Add {W} or {U} to your mana pool. Put a depletion counter on Land Cap.
+Oracle:Land Cap doesn't untap during your untap step if it has a depletion counter on it.\nAt the beginning of your upkeep, remove a depletion counter from Land Cap.\n{T}: Add {W} or {U}. Put a depletion counter on Land Cap.
diff --git a/forge-gui/res/cardsfolder/l/lantern_lit_graveyard.txt b/forge-gui/res/cardsfolder/l/lantern_lit_graveyard.txt
index a43f8add173..8b9faaaa4d0 100644
--- a/forge-gui/res/cardsfolder/l/lantern_lit_graveyard.txt
+++ b/forge-gui/res/cardsfolder/l/lantern_lit_graveyard.txt
@@ -1,9 +1,9 @@
 Name:Lantern-Lit Graveyard
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBStayTapped | SpellDescription$ Add {B} to your mana pool. CARDNAME doesn't untap during your next untap step.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBStayTapped | SpellDescription$ Add {R} to your mana pool. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBStayTapped | SpellDescription$ Add {B}. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBStayTapped | SpellDescription$ Add {R}. CARDNAME doesn't untap during your next untap step.
 SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lantern_lit_graveyard.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {B} or {R} to your mana pool. Lantern-Lit Graveyard doesn't untap during your next untap step.
+Oracle:{T}: Add {C}.\n{T}: Add {B} or {R}. Lantern-Lit Graveyard doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/l/lava_tubes.txt b/forge-gui/res/cardsfolder/l/lava_tubes.txt
index eaa4bcdc94a..36772b0d0ff 100644
--- a/forge-gui/res/cardsfolder/l/lava_tubes.txt
+++ b/forge-gui/res/cardsfolder/l/lava_tubes.txt
@@ -2,10 +2,10 @@ Name:Lava Tubes
 ManaCost:no cost
 Types:Land
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_DEPLETION | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ CARDNAME doesn't untap during your untap step if it has a depletion counter on it.
-A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {B} to your mana pool. Put a depletion counter on CARDNAME.
-A:AB$ Mana | Cost$ T | Produced$ R | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {R} to your mana pool. Put a depletion counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {B}. Put a depletion counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ R | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {R}. Put a depletion counter on CARDNAME.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSubCounter | TriggerDescription$ At the beginning of your upkeep, remove a depletion counter from CARDNAME.
 SVar:TrigSubCounter:DB$RemoveCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 1
 SVar:AddCounter:DB$PutCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lava_tubes.jpg
-Oracle:Lava Tubes doesn't untap during your untap step if it has a depletion counter on it.\nAt the beginning of your upkeep, remove a depletion counter from Lava Tubes.\n{T}: Add {B} or {R} to your mana pool. Put a depletion counter on Lava Tubes.
+Oracle:Lava Tubes doesn't untap during your untap step if it has a depletion counter on it.\nAt the beginning of your upkeep, remove a depletion counter from Lava Tubes.\n{T}: Add {B} or {R}. Put a depletion counter on Lava Tubes.
diff --git a/forge-gui/res/cardsfolder/l/lavaclaw_reaches.txt b/forge-gui/res/cardsfolder/l/lavaclaw_reaches.txt
index 27f3d5171a3..a97b06b68c5 100644
--- a/forge-gui/res/cardsfolder/l/lavaclaw_reaches.txt
+++ b/forge-gui/res/cardsfolder/l/lavaclaw_reaches.txt
@@ -2,10 +2,10 @@ Name:Lavaclaw Reaches
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Animate | Cost$ 1 B R | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Elemental | Colors$ Black,Red | Abilities$ ABPump | SpellDescription$ Until end of turn, CARDNAME becomes a 2/2 black and red Elemental creature with "{X}: This creature gets +X/+0 until end of turn." It's still a land.
 SVar:ABPump:AB$Pump | Cost$ X | Defined$ Self | NumAtt$ +X | References$ X | SpellDescription$ This creature gets +X/+0 until end of turn.
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lavaclaw_reaches.jpg
-Oracle:Lavaclaw Reaches enters the battlefield tapped.\n{T}: Add {B} or {R} to your mana pool.\n{1}{B}{R}: Until end of turn, Lavaclaw Reaches becomes a 2/2 black and red Elemental creature with "{X}: This creature gets +X/+0 until end of turn." It's still a land.
+Oracle:Lavaclaw Reaches enters the battlefield tapped.\n{T}: Add {B} or {R}.\n{1}{B}{R}: Until end of turn, Lavaclaw Reaches becomes a 2/2 black and red Elemental creature with "{X}: This creature gets +X/+0 until end of turn." It's still a land.
diff --git a/forge-gui/res/cardsfolder/l/leaden_myr.txt b/forge-gui/res/cardsfolder/l/leaden_myr.txt
index 56853a44947..ba5d6d5da9b 100644
--- a/forge-gui/res/cardsfolder/l/leaden_myr.txt
+++ b/forge-gui/res/cardsfolder/l/leaden_myr.txt
@@ -2,6 +2,6 @@ Name:Leaden Myr
 ManaCost:2
 Types:Artifact Creature Myr
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/leaden_myr.jpg
-Oracle:{T}: Add {B} to your mana pool.
+Oracle:{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/l/leechridden_swamp.txt b/forge-gui/res/cardsfolder/l/leechridden_swamp.txt
index 1753995a39c..4d8b9f59dec 100644
--- a/forge-gui/res/cardsfolder/l/leechridden_swamp.txt
+++ b/forge-gui/res/cardsfolder/l/leechridden_swamp.txt
@@ -4,4 +4,4 @@ Types:Land Swamp
 K:CARDNAME enters the battlefield tapped.
 A:AB$ LoseLife | Cost$ B T | IsPresent$ Permanent.Black+YouCtrl | PresentCompare$ GE2 | Defined$ Player.Opponent | LifeAmount$ 1 | SpellDescription$ Each opponent loses 1 life. Activate this ability only if you control two or more black permanents.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/leechridden_swamp.jpg
-Oracle:({T}: Add {B} to your mana pool.)\nLeechridden Swamp enters the battlefield tapped.\n{B}, {T}: Each opponent loses 1 life. Activate this ability only if you control two or more black permanents.
+Oracle:({T}: Add {B}.)\nLeechridden Swamp enters the battlefield tapped.\n{B}, {T}: Each opponent loses 1 life. Activate this ability only if you control two or more black permanents.
diff --git a/forge-gui/res/cardsfolder/l/legions_landing_adanto_the_first_fort.txt b/forge-gui/res/cardsfolder/l/legions_landing_adanto_the_first_fort.txt
index 49d322c20c4..a3ced4f16da 100644
--- a/forge-gui/res/cardsfolder/l/legions_landing_adanto_the_first_fort.txt
+++ b/forge-gui/res/cardsfolder/l/legions_landing_adanto_the_first_fort.txt
@@ -15,7 +15,7 @@ ALTERNATE
 Name:Adanto, the First Fort
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ W | Amount$ 1 | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | Amount$ 1 | SpellDescription$ Add {W}.
 A:AB$ Token | Cost$ 2 W T | TokenAmount$ 1 | TokenImage$ w 1 1 vampire | TokenName$ Vampire | TokenTypes$ Creature,Vampire | TokenColors$ White | TokenOwner$ You | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Lifelink | SpellDescription$ Create a 1/1 white Vampire creature token with lifelink.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adanto_the_first_fort.jpg
-Oracle:(Transforms from Legion's Landing.)\n{T}: Add {W} to your mana pool.\n{2}{W}, {T}: Create a 1/1 white Vampire creature token with lifelink.
+Oracle:(Transforms from Legion's Landing.)\n{T}: Add {W}.\n{2}{W}, {T}: Create a 1/1 white Vampire creature token with lifelink.
diff --git a/forge-gui/res/cardsfolder/l/library_of_alexandria.txt b/forge-gui/res/cardsfolder/l/library_of_alexandria.txt
index c8f94ae5e49..e79fc3d56e7 100644
--- a/forge-gui/res/cardsfolder/l/library_of_alexandria.txt
+++ b/forge-gui/res/cardsfolder/l/library_of_alexandria.txt
@@ -1,7 +1,7 @@
 Name:Library of Alexandria
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ T | NumCards$ 1 | ActivationCardsInHand$ 7 | SpellDescription$ Draw a card. Activate this ability only if you have exactly seven cards in hand.
 SVar:Picture:http://resources.wizards.com/magic/cards/an/en-us/card990.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Draw a card. Activate this ability only if you have exactly seven cards in hand.
+Oracle:{T}: Add {C}.\n{T}: Draw a card. Activate this ability only if you have exactly seven cards in hand.
diff --git a/forge-gui/res/cardsfolder/l/lifespring_druid.txt b/forge-gui/res/cardsfolder/l/lifespring_druid.txt
index 153b5706442..5058281ea7b 100644
--- a/forge-gui/res/cardsfolder/l/lifespring_druid.txt
+++ b/forge-gui/res/cardsfolder/l/lifespring_druid.txt
@@ -2,6 +2,6 @@ Name:Lifespring Druid
 ManaCost:2 G
 Types:Creature Elf Druid
 PT:2/1
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lifespring_druid.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt b/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt
index 5aa553071f0..3e4791c0b3a 100644
--- a/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt
+++ b/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt
@@ -4,12 +4,12 @@ Types:Legendary Planeswalker Liliana
 Loyalty:3
 A:AB$ ChangeZone | Cost$ AddCounter<1/LOYALTY> | Origin$ Library | Destination$ Hand | Planeswalker$ True | NumCards$ 1 | ChangeType$ Swamp | Mandatory$ True | SpellDescription$ Search your library for a swamp card, reveal it, and put it into your hand. Then shuffle your library.
 A:AB$ Pump | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ ABChoice | SpellDescription$ Target creature gets +X/+X or -X/-X until end of turn, where X is the number of swamps you control. | StackDescription$ Target creature gets +X/+X or -X/-X until end of turn, where X is the number of swamps you control.
-A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Liliana Of The Dark Realms | Image$ emblem_liliana_of_the_dark_realms | StaticAbilities$ SwampBoost | SVars$ BlackTap | Stackable$ False | Duration$ Permanent | SpellDescription$ You get an emblem with "Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'".
+A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Liliana Of The Dark Realms | Image$ emblem_liliana_of_the_dark_realms | StaticAbilities$ SwampBoost | SVars$ BlackTap | Stackable$ False | Duration$ Permanent | SpellDescription$ You get an emblem with "Swamps you control have '{T}: Add {B}{B}{B}{B}.'".
 SVar:X:Count$Valid Swamp.YouCtrl
 SVar:ABChoice:DB$ GenericChoice | Defined$ You | Choices$ ABPump1,ABPump2
 SVar:ABPump1:DB$ Pump | Defined$ Targeted | NumAtt$ +X | NumDef$ +X | References$ X | SpellDescription$ +X/+X
 SVar:ABPump2:DB$ Pump | Defined$ Targeted | NumAtt$ -X | NumDef$ -X | References$ X | SpellDescription$ -X/-X
-SVar:SwampBoost:Mode$ Continuous | EffectZone$ Command | Affected$ Swamp.YouCtrl | AffectedZone$ Battlefield | AddAbility$ BlackTap | Description$ Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'
-SVar:BlackTap:AB$ Mana | Cost$ T | Produced$ B | Amount$ 4 | SpellDescription$ Add {B}{B}{B}{B} to your mana pool.
+SVar:SwampBoost:Mode$ Continuous | EffectZone$ Command | Affected$ Swamp.YouCtrl | AffectedZone$ Battlefield | AddAbility$ BlackTap | Description$ Swamps you control have '{T}: Add {B}{B}{B}{B}.'
+SVar:BlackTap:AB$ Mana | Cost$ T | Produced$ B | Amount$ 4 | SpellDescription$ Add {B}{B}{B}{B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/liliana_of_the_dark_realms.jpg
-Oracle:[+1]: Search your library for a Swamp card, reveal it, and put it into your hand. Then shuffle your library.\n[-3]: Target creature gets +X/+X or -X/-X until end of turn, where X is the number of Swamps you control.\n[-6]: You get an emblem with "Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'"
+Oracle:[+1]: Search your library for a Swamp card, reveal it, and put it into your hand. Then shuffle your library.\n[-3]: Target creature gets +X/+X or -X/-X until end of turn, where X is the number of Swamps you control.\n[-6]: You get an emblem with "Swamps you control have '{T}: Add {B}{B}{B}{B}.'"
diff --git a/forge-gui/res/cardsfolder/l/lions_eye_diamond.txt b/forge-gui/res/cardsfolder/l/lions_eye_diamond.txt
index 35b32ec877a..5aae51857e7 100644
--- a/forge-gui/res/cardsfolder/l/lions_eye_diamond.txt
+++ b/forge-gui/res/cardsfolder/l/lions_eye_diamond.txt
@@ -1,7 +1,7 @@
 Name:Lion's Eye Diamond
 ManaCost:0
 Types:Artifact
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> Discard<0/Hand> | Produced$ Any | Amount$ 3 | InstantSpeed$ True | SpellDescription$ Add three mana of any one color to your mana pool. Activate this ability only any time you could cast an instant.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> Discard<0/Hand> | Produced$ Any | Amount$ 3 | InstantSpeed$ True | SpellDescription$ Add three mana of any one color. Activate this ability only any time you could cast an instant.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lions_eye_diamond.jpg
-Oracle:Sacrifice Lion's Eye Diamond, Discard your hand: Add three mana of any one color to your mana pool. Activate this ability only any time you could cast an instant.
+Oracle:Sacrifice Lion's Eye Diamond, Discard your hand: Add three mana of any one color. Activate this ability only any time you could cast an instant.
diff --git a/forge-gui/res/cardsfolder/l/liturgy_of_blood.txt b/forge-gui/res/cardsfolder/l/liturgy_of_blood.txt
index 5209edbaee7..3252e174c90 100644
--- a/forge-gui/res/cardsfolder/l/liturgy_of_blood.txt
+++ b/forge-gui/res/cardsfolder/l/liturgy_of_blood.txt
@@ -1,7 +1,7 @@
 Name:Liturgy of Blood
 ManaCost:3 B B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBMana | SpellDescription$ Destroy target creature. Add {B}{B}{B} to your mana pool.
+A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBMana | SpellDescription$ Destroy target creature. Add {B}{B}{B}.
 SVar:DBMana:DB$Mana | Produced$ B | Amount$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/liturgy_of_blood.jpg
-Oracle:Destroy target creature. Add {B}{B}{B} to your mana pool.
+Oracle:Destroy target creature. Add {B}{B}{B}.
diff --git a/forge-gui/res/cardsfolder/l/llanowar.txt b/forge-gui/res/cardsfolder/l/llanowar.txt
index 902b550cba5..1c20ef64765 100644
--- a/forge-gui/res/cardsfolder/l/llanowar.txt
+++ b/forge-gui/res/cardsfolder/l/llanowar.txt
@@ -1,10 +1,10 @@
 Name:Llanowar
 ManaCost:no cost
 Types:Plane Dominaria
-S:Mode$ Continuous | Affected$ Creature | EffectZone$ Command | AddAbility$ LlanowarAb | Description$ All creatures have "{T}: Add {G}{G} to your mana pool.".
-SVar:LlanowarAb:AB$ Mana | Cost$ T | Amount$ 2 | Produced$ G | SpellDescription$ Add {G}{G} to your mana pool.
+S:Mode$ Continuous | Affected$ Creature | EffectZone$ Command | AddAbility$ LlanowarAb | Description$ All creatures have "{T}: Add {G}{G}.".
+SVar:LlanowarAb:AB$ Mana | Cost$ T | Amount$ 2 | Produced$ G | SpellDescription$ Add {G}{G}.
 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, untap all creatures you control.
 SVar:RolledChaos:DB$ UntapAll | ValidCards$ Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/llanowar.jpg
 SVar:AIRollPlanarDieParams:Mode$ Always | HasCreatureInPlay$ True
-Oracle:All creatures have "{T}: Add {G}{G} to your mana pool."\nWhenever you roll {CHAOS}, untap all creatures you control.
+Oracle:All creatures have "{T}: Add {G}{G}."\nWhenever you roll {CHAOS}, untap all creatures you control.
diff --git a/forge-gui/res/cardsfolder/l/llanowar_dead.txt b/forge-gui/res/cardsfolder/l/llanowar_dead.txt
index 25caef3ef38..59eb1453887 100644
--- a/forge-gui/res/cardsfolder/l/llanowar_dead.txt
+++ b/forge-gui/res/cardsfolder/l/llanowar_dead.txt
@@ -2,6 +2,6 @@ Name:Llanowar Dead
 ManaCost:B G
 Types:Creature Zombie Elf
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://resources.wizards.com/magic/cards/ap/en-us/card26759.jpg
-Oracle:{T}: Add {B} to your mana pool.
+Oracle:{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/l/llanowar_elves.txt b/forge-gui/res/cardsfolder/l/llanowar_elves.txt
index 5e9893c1664..c5272e71cfe 100644
--- a/forge-gui/res/cardsfolder/l/llanowar_elves.txt
+++ b/forge-gui/res/cardsfolder/l/llanowar_elves.txt
@@ -2,6 +2,6 @@ Name:Llanowar Elves
 ManaCost:G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83515.jpg
-Oracle:{T}: Add {G} to your mana pool.
+Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/l/llanowar_mentor.txt b/forge-gui/res/cardsfolder/l/llanowar_mentor.txt
index c668b45726e..7bddb2871fd 100644
--- a/forge-gui/res/cardsfolder/l/llanowar_mentor.txt
+++ b/forge-gui/res/cardsfolder/l/llanowar_mentor.txt
@@ -2,7 +2,7 @@ Name:Llanowar Mentor
 ManaCost:G
 Types:Creature Elf Spellshaper
 PT:1/1
-A:AB$ Token | Cost$ G T Discard<1/Card> | TokenAmount$ 1 | TokenName$ Llanowar Elves | TokenTypes$ Creature,Elf,Druid | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenAbilities$ ABMana | SpellDescription$ Create a 1/1 green Elf Druid creature token named Llanowar Elves. It has "{T}: Add {G} to your mana pool."
-SVar:ABMana:AB$Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Token | Cost$ G T Discard<1/Card> | TokenAmount$ 1 | TokenName$ Llanowar Elves | TokenTypes$ Creature,Elf,Druid | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenAbilities$ ABMana | SpellDescription$ Create a 1/1 green Elf Druid creature token named Llanowar Elves. It has "{T}: Add {G}."
+SVar:ABMana:AB$Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card126166.jpg
-Oracle:{G}, {T}, Discard a card: Create a 1/1 green Elf Druid creature token named Llanowar Elves. It has "{T}: Add {G} to your mana pool."
+Oracle:{G}, {T}, Discard a card: Create a 1/1 green Elf Druid creature token named Llanowar Elves. It has "{T}: Add {G}."
diff --git a/forge-gui/res/cardsfolder/l/llanowar_reborn.txt b/forge-gui/res/cardsfolder/l/llanowar_reborn.txt
index 3e3803f1db2..cd31136cdb4 100644
--- a/forge-gui/res/cardsfolder/l/llanowar_reborn.txt
+++ b/forge-gui/res/cardsfolder/l/llanowar_reborn.txt
@@ -2,8 +2,8 @@ Name:Llanowar Reborn
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 K:Graft:1
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/llanowar_reborn.jpg
-Oracle:Llanowar Reborn enters the battlefield tapped.\n{T}: Add {G} to your mana pool.\nGraft 1 (This land enters the battlefield with a +1/+1 counter on it. Whenever a creature enters the battlefield, you may move a +1/+1 counter from this land onto it.)
+Oracle:Llanowar Reborn enters the battlefield tapped.\n{T}: Add {G}.\nGraft 1 (This land enters the battlefield with a +1/+1 counter on it. Whenever a creature enters the battlefield, you may move a +1/+1 counter from this land onto it.)
diff --git a/forge-gui/res/cardsfolder/l/llanowar_wastes.txt b/forge-gui/res/cardsfolder/l/llanowar_wastes.txt
index ebdf072ce68..2406f2f2367 100644
--- a/forge-gui/res/cardsfolder/l/llanowar_wastes.txt
+++ b/forge-gui/res/cardsfolder/l/llanowar_wastes.txt
@@ -1,9 +1,9 @@
 Name:Llanowar Wastes
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B} to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/llanowar_wastes.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {B} or {G} to your mana pool. Llanowar Wastes deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {B} or {G}. Llanowar Wastes deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/l/loam_dryad.txt b/forge-gui/res/cardsfolder/l/loam_dryad.txt
index 773466706d5..bf3b046e863 100644
--- a/forge-gui/res/cardsfolder/l/loam_dryad.txt
+++ b/forge-gui/res/cardsfolder/l/loam_dryad.txt
@@ -2,7 +2,7 @@ Name:Loam Dryad
 ManaCost:G
 Types:Creature Dryad Horror
 PT:1/2
-A:AB$ Mana | Cost$ T tapXType<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T tapXType<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/loam_dryad.jpg
-Oracle:{T}, Tap an untapped creature you control: Add one mana of any color to your mana pool.
+Oracle:{T}, Tap an untapped creature you control: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/l/lonely_sandbar.txt b/forge-gui/res/cardsfolder/l/lonely_sandbar.txt
index 9b60dbe92f5..4e8ee5ffe15 100644
--- a/forge-gui/res/cardsfolder/l/lonely_sandbar.txt
+++ b/forge-gui/res/cardsfolder/l/lonely_sandbar.txt
@@ -2,7 +2,7 @@ Name:Lonely Sandbar
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 K:Cycling:U
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lonely_sandbar.jpg
-Oracle:Lonely Sandbar enters the battlefield tapped.\n{T}: Add {U} to your mana pool.\nCycling {U} ({U}, Discard this card: Draw a card.)
+Oracle:Lonely Sandbar enters the battlefield tapped.\n{T}: Add {U}.\nCycling {U} ({U}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/l/looming_spires.txt b/forge-gui/res/cardsfolder/l/looming_spires.txt
index 7d2da2a0202..a3b887399e7 100644
--- a/forge-gui/res/cardsfolder/l/looming_spires.txt
+++ b/forge-gui/res/cardsfolder/l/looming_spires.txt
@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +1/+1 and gains first strike until end of turn.
 SVar:TrigPump:DB$Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | KW$ First Strike
 SVar:PlayMain1:TRUE
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/looming_spires.jpg
-Oracle:Looming Spires enters the battlefield tapped.\nWhen Looming Spires enters the battlefield, target creature gets +1/+1 and gains first strike until end of turn.\n{T}: Add {R} to your mana pool.
+Oracle:Looming Spires enters the battlefield tapped.\nWhen Looming Spires enters the battlefield, target creature gets +1/+1 and gains first strike until end of turn.\n{T}: Add {R}.
diff --git a/forge-gui/res/cardsfolder/l/lotus_bloom.txt b/forge-gui/res/cardsfolder/l/lotus_bloom.txt
index a1fa275316b..5a78f6abd74 100644
--- a/forge-gui/res/cardsfolder/l/lotus_bloom.txt
+++ b/forge-gui/res/cardsfolder/l/lotus_bloom.txt
@@ -2,6 +2,6 @@ Name:Lotus Bloom
 ManaCost:no cost
 Types:Artifact
 K:Suspend:3:0
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 3 | AILogic$ BlackLotus | SpellDescription$ Add three mana of any one color to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 3 | AILogic$ BlackLotus | SpellDescription$ Add three mana of any one color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lotus_bloom.jpg
-Oracle:Suspend 3—{0} (Rather than cast this card from your hand, pay {0} and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\n{T}, Sacrifice Lotus Bloom: Add three mana of any one color to your mana pool.
+Oracle:Suspend 3—{0} (Rather than cast this card from your hand, pay {0} and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\n{T}, Sacrifice Lotus Bloom: Add three mana of any one color.
diff --git a/forge-gui/res/cardsfolder/l/lotus_blossom.txt b/forge-gui/res/cardsfolder/l/lotus_blossom.txt
index 8e1673eba3e..196275c7f17 100644
--- a/forge-gui/res/cardsfolder/l/lotus_blossom.txt
+++ b/forge-gui/res/cardsfolder/l/lotus_blossom.txt
@@ -2,9 +2,9 @@ Name:Lotus Blossom
 ManaCost:2
 Types:Artifact
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ During your upkeep, you may put a petal counter on CARDNAME.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ X | References$ X | SpellDescription$ Add X mana of any one color to your mana pool, where X is the number of petal counters on Lotus Blossom.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ X | References$ X | SpellDescription$ Add X mana of any one color, where X is the number of petal counters on Lotus Blossom.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ PETAL | CounterNum$ 1
 SVar:X:Count$CardCounters.PETAL
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lotus_blossom.jpg
-Oracle:At the beginning of your upkeep, you may put a petal counter on Lotus Blossom.\n{T}, Sacrifice Lotus Blossom: Add X mana of any one color to your mana pool, where X is the number of petal counters on Lotus Blossom.
+Oracle:At the beginning of your upkeep, you may put a petal counter on Lotus Blossom.\n{T}, Sacrifice Lotus Blossom: Add X mana of any one color, where X is the number of petal counters on Lotus Blossom.
diff --git a/forge-gui/res/cardsfolder/l/lotus_cobra.txt b/forge-gui/res/cardsfolder/l/lotus_cobra.txt
index 21f16b0cd4e..a2cc5697383 100644
--- a/forge-gui/res/cardsfolder/l/lotus_cobra.txt
+++ b/forge-gui/res/cardsfolder/l/lotus_cobra.txt
@@ -2,8 +2,8 @@ Name:Lotus Cobra
 ManaCost:1 G
 Types:Creature Snake
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMana | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may add one mana of any color to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMana | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may add one mana of any color.
 SVar:TrigMana:DB$ Mana | Produced$ Any | AILogic$ MostProminentInComputerHand
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lotus_cobra.jpg
-Oracle:Landfall — Whenever a land enters the battlefield under your control, you may add one mana of any color to your mana pool.
+Oracle:Landfall — Whenever a land enters the battlefield under your control, you may add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/l/lotus_guardian.txt b/forge-gui/res/cardsfolder/l/lotus_guardian.txt
index bf3d1c3eb82..b34d633a4c7 100644
--- a/forge-gui/res/cardsfolder/l/lotus_guardian.txt
+++ b/forge-gui/res/cardsfolder/l/lotus_guardian.txt
@@ -3,6 +3,6 @@ ManaCost:7
 Types:Artifact Creature Dragon
 PT:4/4
 K:Flying
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://resources.wizards.com/magic/cards/in/en-us/card23233.jpg
-Oracle:Flying\n{T}: Add one mana of any color to your mana pool.
+Oracle:Flying\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/l/lotus_petal.txt b/forge-gui/res/cardsfolder/l/lotus_petal.txt
index 7b8cb2829ef..bdae2e0126f 100644
--- a/forge-gui/res/cardsfolder/l/lotus_petal.txt
+++ b/forge-gui/res/cardsfolder/l/lotus_petal.txt
@@ -1,7 +1,7 @@
 Name:Lotus Petal
 ManaCost:0
 Types:Artifact
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lotus_petal.jpg
-Oracle:{T}, Sacrifice Lotus Petal: Add one mana of any color to your mana pool.
+Oracle:{T}, Sacrifice Lotus Petal: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/l/lotus_vale.txt b/forge-gui/res/cardsfolder/l/lotus_vale.txt
index e1dc415679c..0b60ee818ea 100644
--- a/forge-gui/res/cardsfolder/l/lotus_vale.txt
+++ b/forge-gui/res/cardsfolder/l/lotus_vale.txt
@@ -1,7 +1,7 @@
 Name:Lotus Vale
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 3 | SpellDescription$ Add three mana of any one color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 3 | SpellDescription$ Add three mana of any one color.
 R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, sacrifice two untapped lands instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
 SVar:PayBeforeETB:DB$ Sacrifice | SacValid$ Land.untapped | Defined$ You | RememberSacrificed$ True | Amount$ 2 | StrictAmount$ True | SubAbility$ MoveToGraveyard
 SVar:MoveToGraveyard:DB$ ChangeZone | Origin$ All | Destination$ Graveyard | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ LT2 | SubAbility$ MoveToBattlefield
@@ -11,4 +11,4 @@ SVar:X:Remembered$Amount
 SVar:NeedsToPlayVar:Z GE2
 SVar:Z:Count$Valid Land.YouCtrl+untapped+inZoneBattlefield
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lotus_vale.jpg
-Oracle:If Lotus Vale would enter the battlefield, sacrifice two untapped lands instead. If you do, put Lotus Vale onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add three mana of any one color to your mana pool.
+Oracle:If Lotus Vale would enter the battlefield, sacrifice two untapped lands instead. If you do, put Lotus Vale onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add three mana of any one color.
diff --git a/forge-gui/res/cardsfolder/l/lumbering_falls.txt b/forge-gui/res/cardsfolder/l/lumbering_falls.txt
index f61211486b9..c3dc14fd2e0 100644
--- a/forge-gui/res/cardsfolder/l/lumbering_falls.txt
+++ b/forge-gui/res/cardsfolder/l/lumbering_falls.txt
@@ -2,8 +2,8 @@ Name:Lumbering Falls
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Animate | Cost$ 2 G U | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Colors$ Green,Blue | Keywords$ Hexproof | SpellDescription$ CARDNAME becomes a 3/3 green and blue Elemental creature with hexproof until end of turn. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lumbering_falls.jpg
-Oracle:Lumbering Falls enters the battlefield tapped.\n{T}: Add {G} or {U} to your mana pool.\n{2}{G}{U}: Lumbering Falls becomes a 3/3 green and blue Elemental creature with hexproof until end of turn. It's still a land.
\ No newline at end of file
+Oracle:Lumbering Falls enters the battlefield tapped.\n{T}: Add {G} or {U}.\n{2}{G}{U}: Lumbering Falls becomes a 3/3 green and blue Elemental creature with hexproof until end of turn. It's still a land.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/madblind_mountain.txt b/forge-gui/res/cardsfolder/m/madblind_mountain.txt
index 75636be0a7b..47ebf9c85fb 100644
--- a/forge-gui/res/cardsfolder/m/madblind_mountain.txt
+++ b/forge-gui/res/cardsfolder/m/madblind_mountain.txt
@@ -5,4 +5,4 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Shuffle | Cost$ R T | Defined$ You | IsPresent$ Permanent.Red+YouCtrl | PresentCompare$ GE2 | SpellDescription$ Shuffle your library. Activate this ability only if you control two or more red permanents.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/madblind_mountain.jpg
-Oracle:({T}: Add {R} to your mana pool.)\nMadblind Mountain enters the battlefield tapped.\n{R}, {T}: Shuffle your library. Activate this ability only if you control two or more red permanents.
+Oracle:({T}: Add {R}.)\nMadblind Mountain enters the battlefield tapped.\n{R}, {T}: Shuffle your library. Activate this ability only if you control two or more red permanents.
diff --git a/forge-gui/res/cardsfolder/m/mage_ring_network.txt b/forge-gui/res/cardsfolder/m/mage_ring_network.txt
index b0ddc7ceed8..4e5dde20bd4 100644
--- a/forge-gui/res/cardsfolder/m/mage_ring_network.txt
+++ b/forge-gui/res/cardsfolder/m/mage_ring_network.txt
@@ -1,10 +1,10 @@
 Name:Mage-Ring Network
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ C | Amount$ ChosenX | CostDesc$ {T}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add {C} to your mana pool equal to the amount of counters removed.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ C | Amount$ ChosenX | CostDesc$ {T}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add {C} equal to the amount of counters removed.
 SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mage_ring_network.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Put a storage counter on Mage-Ring Network.\n{T}, Remove X storage counters from Mage-Ring Network: Add {C} to your mana pool equal to the amount of counters removed.
+Oracle:{T}: Add {C}.\n{1}, {T}: Put a storage counter on Mage-Ring Network.\n{T}, Remove X storage counters from Mage-Ring Network: Add {C} equal to the amount of counters removed.
diff --git a/forge-gui/res/cardsfolder/m/magnifying_glass.txt b/forge-gui/res/cardsfolder/m/magnifying_glass.txt
index 2c184b4413c..9b43d0b3a47 100644
--- a/forge-gui/res/cardsfolder/m/magnifying_glass.txt
+++ b/forge-gui/res/cardsfolder/m/magnifying_glass.txt
@@ -1,9 +1,9 @@
 Name:Magnifying Glass
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Token | Cost$ 4 T | TokenAmount$ 1 | TokenName$ Clue | TokenTypes$ Artifact,Clue | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c clue | TokenAbilities$ ABDraw | SpellDescription$ Investigate (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.") | TokenAltImages$ c_clue2,c_clue3,c_clue4,c_clue5,c_clue6
 SVar:ABDraw:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 DeckHas:Ability$Investigate & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magnifying_glass.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}, {T}: Investigate (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
+Oracle:{T}: Add {C}.\n{4}, {T}: Investigate (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
diff --git a/forge-gui/res/cardsfolder/m/magosi_the_waterveil.txt b/forge-gui/res/cardsfolder/m/magosi_the_waterveil.txt
index 012a45eb0ee..538cf68f909 100644
--- a/forge-gui/res/cardsfolder/m/magosi_the_waterveil.txt
+++ b/forge-gui/res/cardsfolder/m/magosi_the_waterveil.txt
@@ -2,11 +2,11 @@ Name:Magosi, the Waterveil
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ PutCounter | Cost$ U T | Defined$ Self | CounterType$ EON | CounterNum$ 1 | SubAbility$ DBSkipTurn | SpellDescription$ Put an eon counter on CARDNAME. Skip your next turn.
 A:AB$ AddTurn | Cost$ T SubCounter<1/EON> | NumTurns$ 1 | Defined$ You | SubAbility$ DBBounce | SpellDescription$ Take an extra turn after this one.
 SVar:DBSkipTurn:DB$ SkipTurn | NumTurns$ 1 | Defined$ You
 SVar:DBBounce:DB$ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magosi_the_waterveil.jpg
-Oracle:Magosi, the Waterveil enters the battlefield tapped.\n{T}: Add {U} to your mana pool.\n{U}, {T}: Put an eon counter on Magosi, the Waterveil. Skip your next turn.\n{T}, Remove an eon counter from Magosi, the Waterveil and return it to its owner's hand: Take an extra turn after this one.
+Oracle:Magosi, the Waterveil enters the battlefield tapped.\n{T}: Add {U}.\n{U}, {T}: Put an eon counter on Magosi, the Waterveil. Skip your next turn.\n{T}, Remove an eon counter from Magosi, the Waterveil and return it to its owner's hand: Take an extra turn after this one.
diff --git a/forge-gui/res/cardsfolder/m/magus_of_the_coffers.txt b/forge-gui/res/cardsfolder/m/magus_of_the_coffers.txt
index 23e60c60117..6d6b6aed9e7 100644
--- a/forge-gui/res/cardsfolder/m/magus_of_the_coffers.txt
+++ b/forge-gui/res/cardsfolder/m/magus_of_the_coffers.txt
@@ -2,8 +2,8 @@ Name:Magus of the Coffers
 ManaCost:4 B
 Types:Creature Human Wizard
 PT:4/4
-A:AB$ Mana | Cost$ 2 T | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} to your mana pool for each Swamp you control.
+A:AB$ Mana | Cost$ 2 T | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} for each Swamp you control.
 SVar:X:Count$Valid Swamp.YouCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_coffers.jpg
-Oracle:{2}, {T}: Add {B} to your mana pool for each Swamp you control.
+Oracle:{2}, {T}: Add {B} for each Swamp you control.
diff --git a/forge-gui/res/cardsfolder/m/magus_of_the_library.txt b/forge-gui/res/cardsfolder/m/magus_of_the_library.txt
index b7379d91737..79665b0a6c3 100644
--- a/forge-gui/res/cardsfolder/m/magus_of_the_library.txt
+++ b/forge-gui/res/cardsfolder/m/magus_of_the_library.txt
@@ -2,8 +2,8 @@ Name:Magus of the Library
 ManaCost:G G
 Types:Creature Human Wizard
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ T | NumCards$ 1 | ActivationCardsInHand$ 7 | SpellDescription$ Draw a card. Activate this ability only if you have exactly seven cards in hand.
 SVar:RemRandomDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/plc/en-us/card134741.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Draw a card. Activate this ability only if you have exactly seven cards in hand.
+Oracle:{T}: Add {C}.\n{T}: Draw a card. Activate this ability only if you have exactly seven cards in hand.
diff --git a/forge-gui/res/cardsfolder/m/magus_of_the_vineyard.txt b/forge-gui/res/cardsfolder/m/magus_of_the_vineyard.txt
index e5e59ca0e72..dedb15ef1ea 100644
--- a/forge-gui/res/cardsfolder/m/magus_of_the_vineyard.txt
+++ b/forge-gui/res/cardsfolder/m/magus_of_the_vineyard.txt
@@ -2,7 +2,7 @@ Name:Magus of the Vineyard
 ManaCost:G
 Types:Creature Human Wizard
 PT:1/1
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ Player | Execute$ TrigMana | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's precombat main phase, add {G}{G} to that player's mana pool.
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ Player | Execute$ TrigMana | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's precombat main phase, that player adds {G}{G}.
 SVar:TrigMana:DB$Mana | Produced$ G | Amount$ 2 | Defined$ TriggeredPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_vineyard.jpg
-Oracle:At the beginning of each player's precombat main phase, add {G}{G} to that player's mana pool.
+Oracle:At the beginning of each player's precombat main phase, that player adds {G}{G}.
diff --git a/forge-gui/res/cardsfolder/m/mana_bloom.txt b/forge-gui/res/cardsfolder/m/mana_bloom.txt
index 7e004d4c32d..218ac77fdfe 100644
--- a/forge-gui/res/cardsfolder/m/mana_bloom.txt
+++ b/forge-gui/res/cardsfolder/m/mana_bloom.txt
@@ -2,10 +2,10 @@ Name:Mana Bloom
 ManaCost:X G
 Types:Enchantment
 K:etbCounter:CHARGE:X
-A:AB$ Mana | Cost$ SubCounter<1/CHARGE> | Produced$ Any | Amount$ 1 | ActivationLimit$ 1 | SpellDescription$ Add one mana of any color to your mana pool. Activate this ability only once each turn.
+A:AB$ Mana | Cost$ SubCounter<1/CHARGE> | Produced$ Any | Amount$ 1 | ActivationLimit$ 1 | SpellDescription$ Add one mana of any color. Activate this ability only once each turn.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ NoCharge | SVarCompare$ EQ0 | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if CARDNAME has no charge counters on it, return it to its owner's hand.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:NoCharge:Count$CardCounters.CHARGE
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_bloom.jpg
-Oracle:Mana Bloom enters the battlefield with X charge counters on it.\nRemove a charge counter from Mana Bloom: Add one mana of any color to your mana pool. Activate this ability only once each turn.\nAt the beginning of your upkeep, if Mana Bloom has no charge counters on it, return it to its owner's hand.
+Oracle:Mana Bloom enters the battlefield with X charge counters on it.\nRemove a charge counter from Mana Bloom: Add one mana of any color. Activate this ability only once each turn.\nAt the beginning of your upkeep, if Mana Bloom has no charge counters on it, return it to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/m/mana_confluence.txt b/forge-gui/res/cardsfolder/m/mana_confluence.txt
index 832ebb6a094..205e69216a1 100644
--- a/forge-gui/res/cardsfolder/m/mana_confluence.txt
+++ b/forge-gui/res/cardsfolder/m/mana_confluence.txt
@@ -1,6 +1,6 @@
 Name:Mana Confluence
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_confluence.jpg
-Oracle:{T}, Pay 1 life: Add one mana of any color to your mana pool.
+Oracle:{T}, Pay 1 life: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/m/mana_crypt.txt b/forge-gui/res/cardsfolder/m/mana_crypt.txt
index 72f84b7b6df..fdce5eac479 100644
--- a/forge-gui/res/cardsfolder/m/mana_crypt.txt
+++ b/forge-gui/res/cardsfolder/m/mana_crypt.txt
@@ -4,7 +4,7 @@ Types:Artifact
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigFlip | TriggerDescription$ At the beginning of your upkeep, flip a coin. If you lose the flip, CARDNAME deals 3 damage to you.
 SVar:TrigFlip:DB$ FlipACoin | Defined$ You | LoseSubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | Defined$ You | NumDmg$ 3
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_crypt.jpg
-Oracle:At the beginning of your upkeep, flip a coin. If you lose the flip, Mana Crypt deals 3 damage to you.\n{T}: Add {C}{C} to your mana pool.
+Oracle:At the beginning of your upkeep, flip a coin. If you lose the flip, Mana Crypt deals 3 damage to you.\n{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/m/mana_cylix.txt b/forge-gui/res/cardsfolder/m/mana_cylix.txt
index dfd066703b5..1aee50e5984 100644
--- a/forge-gui/res/cardsfolder/m/mana_cylix.txt
+++ b/forge-gui/res/cardsfolder/m/mana_cylix.txt
@@ -1,7 +1,7 @@
 Name:Mana Cylix
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_cylix.jpg
-Oracle:{1}, {T}: Add one mana of any color to your mana pool.
+Oracle:{1}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/m/mana_drain.txt b/forge-gui/res/cardsfolder/m/mana_drain.txt
index 48b386a30a4..085b7acf2a7 100644
--- a/forge-gui/res/cardsfolder/m/mana_drain.txt
+++ b/forge-gui/res/cardsfolder/m/mana_drain.txt
@@ -1,10 +1,10 @@
 Name:Mana Drain
 ManaCost:U U
 Types:Instant
-A:SP$ Counter | Cost$ U U | TargetType$ Spell | RememberCounteredCMC$ True | ValidTgts$ Card | SubAbility$ DBDelTrig | SpellDescription$ Counter target spell. At the beginning of your next main phase, add {X} to your mana pool, where X is that spell's converted mana cost.
-SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main1,Main2 | ValidPlayer$ You | Execute$ AddMana | TriggerDescription$ At the beginning of your next main phase, add an amount of {C} to your mana pool equal to that spell's converted mana cost. | RememberNumber$ True | SubAbility$ DBCleanup
+A:SP$ Counter | Cost$ U U | TargetType$ Spell | RememberCounteredCMC$ True | ValidTgts$ Card | SubAbility$ DBDelTrig | SpellDescription$ Counter target spell. At the beginning of your next main phase, add {X}, where X is that spell's converted mana cost.
+SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main1,Main2 | ValidPlayer$ You | Execute$ AddMana | TriggerDescription$ At the beginning of your next main phase, add an amount of {C} equal to that spell's converted mana cost. | RememberNumber$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:AddMana:DB$ Mana | Produced$ C | Amount$ X | References$ X
 SVar:X:Count$TriggerRememberAmount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_drain.jpg
-Oracle:Counter target spell. At the beginning of your next main phase, add an amount of {C} to your mana pool equal to that spell's converted mana cost.
+Oracle:Counter target spell. At the beginning of your next main phase, add an amount of {C} equal to that spell's converted mana cost.
diff --git a/forge-gui/res/cardsfolder/m/mana_echoes.txt b/forge-gui/res/cardsfolder/m/mana_echoes.txt
index 83b24980413..d4c38667f5b 100644
--- a/forge-gui/res/cardsfolder/m/mana_echoes.txt
+++ b/forge-gui/res/cardsfolder/m/mana_echoes.txt
@@ -1,11 +1,11 @@
 Name:Mana Echoes
 ManaCost:2 R R
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | TriggerController$ You | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever a creature enters the battlefield, you may add an amount of {C} to your mana pool equal to the number of creatures you control that share a creature type with it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | TriggerController$ You | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever a creature enters the battlefield, you may add an amount of {C} equal to the number of creatures you control that share a creature type with it.
 SVar:TrigPump:DB$ Pump | Defined$ TriggeredCard | RememberObjects$ TriggeredCard | AILogic$ MimicVat | SubAbility$ DBMana
 SVar:DBMana:DB$ Mana | Produced$ C | Defined$ You | Amount$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Creature.sharesCreatureTypeWith Remembered+YouCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_echoes.jpg
-Oracle:Whenever a creature enters the battlefield, you may add an amount of {C} to your mana pool equal to the number of creatures you control that share a creature type with it.
\ No newline at end of file
+Oracle:Whenever a creature enters the battlefield, you may add an amount of {C} equal to the number of creatures you control that share a creature type with it.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/mana_flare.txt b/forge-gui/res/cardsfolder/m/mana_flare.txt
index a03fe347ab5..5410caf9d2a 100644
--- a/forge-gui/res/cardsfolder/m/mana_flare.txt
+++ b/forge-gui/res/cardsfolder/m/mana_flare.txt
@@ -1,7 +1,7 @@
 Name:Mana Flare
 ManaCost:2 R
 Types:Enchantment
-T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
 SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_flare.jpg
-Oracle:Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+Oracle:Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/m/mana_geyser.txt b/forge-gui/res/cardsfolder/m/mana_geyser.txt
index 15d46b95226..cf204724b6e 100644
--- a/forge-gui/res/cardsfolder/m/mana_geyser.txt
+++ b/forge-gui/res/cardsfolder/m/mana_geyser.txt
@@ -1,7 +1,7 @@
 Name:Mana Geyser
 ManaCost:3 R R
 Types:Sorcery
-A:SP$ Mana | Cost$ 3 R R | Produced$ R | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R} to your mana pool for each tapped land your opponents control.
+A:SP$ Mana | Cost$ 3 R R | Produced$ R | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R} for each tapped land your opponents control.
 SVar:X:Count$Valid Land.tapped+OppCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_geyser.jpg
-Oracle:Add {R} to your mana pool for each tapped land your opponents control.
+Oracle:Add {R} for each tapped land your opponents control.
diff --git a/forge-gui/res/cardsfolder/m/mana_prism.txt b/forge-gui/res/cardsfolder/m/mana_prism.txt
index ef0bb5f6fe7..22060a00e0f 100644
--- a/forge-gui/res/cardsfolder/m/mana_prism.txt
+++ b/forge-gui/res/cardsfolder/m/mana_prism.txt
@@ -1,8 +1,8 @@
 Name:Mana Prism
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_prism.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/m/mana_seism.txt b/forge-gui/res/cardsfolder/m/mana_seism.txt
index 792eb4c08e5..1e2e7ff5b2f 100644
--- a/forge-gui/res/cardsfolder/m/mana_seism.txt
+++ b/forge-gui/res/cardsfolder/m/mana_seism.txt
@@ -1,11 +1,11 @@
 Name:Mana Seism
 ManaCost:1 R
 Types:Sorcery
-A:SP$ Sacrifice | Cost$ 1 R | Defined$ You | Amount$ SacX | References$ SacX | SacValid$ Land | RememberSacrificed$ True | Optional$ True | SubAbility$ DBMana | SpellDescription$ Sacrifice any number of lands. Add {C} to your mana pool for each land sacrificed this way.
+A:SP$ Sacrifice | Cost$ 1 R | Defined$ You | Amount$ SacX | References$ SacX | SacValid$ Land | RememberSacrificed$ True | Optional$ True | SubAbility$ DBMana | SpellDescription$ Sacrifice any number of lands. Add {C} for each land sacrificed this way.
 SVar:DBMana:DB$ Mana | Produced$ C | Amount$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:SacX:Count$Valid Land.YouCtrl
 SVar:X:Remembered$Amount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_seism.jpg
-Oracle:Sacrifice any number of lands. Add {C} to your mana pool for each land sacrificed this way.
+Oracle:Sacrifice any number of lands. Add {C} for each land sacrificed this way.
diff --git a/forge-gui/res/cardsfolder/m/mana_short.txt b/forge-gui/res/cardsfolder/m/mana_short.txt
index 582527e3971..7ad5ae466c4 100644
--- a/forge-gui/res/cardsfolder/m/mana_short.txt
+++ b/forge-gui/res/cardsfolder/m/mana_short.txt
@@ -1,8 +1,8 @@
 Name:Mana Short
 ManaCost:2 U
 Types:Instant
-A:SP$ TapAll | Cost$ 2 U | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land | SubAbility$ DrainMana | SpellDescription$ Tap all lands target player controls and empty his or her mana pool.
+A:SP$ TapAll | Cost$ 2 U | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land | SubAbility$ DrainMana | SpellDescription$ Tap all lands target player controls and that player loses all unspent mana.
 SVar:DrainMana:DB$ DrainMana | Defined$ Targeted
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_short.jpg
-Oracle:Tap all lands target player controls and empty his or her mana pool.
+Oracle:Tap all lands target player controls and that player loses all unspent mana.
diff --git a/forge-gui/res/cardsfolder/m/mana_vault.txt b/forge-gui/res/cardsfolder/m/mana_vault.txt
index 6ad9b1c8f8e..b3eb8967469 100644
--- a/forge-gui/res/cardsfolder/m/mana_vault.txt
+++ b/forge-gui/res/cardsfolder/m/mana_vault.txt
@@ -1,7 +1,7 @@
 Name:Mana Vault
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C}.
 K:CARDNAME doesn't untap during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may pay {4}. If you do, untap CARDNAME.
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | IsPresent$ Card.Self+tapped | Execute$ TrigDamage | TriggerDescription$ At the beginning of your draw step, if CARDNAME is tapped, it deals 1 damage to you.
@@ -10,4 +10,4 @@ SVar:TrigDamage:DB$DealDamage | Defined$ You | NumDmg$ 1
 #TODO: The AI will untap this with Voltaic Key and will correctly untap it when it has enough available mana. Might improve the logic for when the AI actually taps it for mana, perhaps.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_vault.jpg
-Oracle:Mana Vault doesn't untap during your untap step.\nAt the beginning of your upkeep, you may pay {4}. If you do, untap Mana Vault.\nAt the beginning of your draw step, if Mana Vault is tapped, it deals 1 damage to you.\n{T}: Add {C}{C}{C} to your mana pool.
+Oracle:Mana Vault doesn't untap during your untap step.\nAt the beginning of your upkeep, you may pay {4}. If you do, untap Mana Vault.\nAt the beginning of your draw step, if Mana Vault is tapped, it deals 1 damage to you.\n{T}: Add {C}{C}{C}.
diff --git a/forge-gui/res/cardsfolder/m/manaforge_cinder.txt b/forge-gui/res/cardsfolder/m/manaforge_cinder.txt
index 9b22f782328..b41afb18c63 100644
--- a/forge-gui/res/cardsfolder/m/manaforge_cinder.txt
+++ b/forge-gui/res/cardsfolder/m/manaforge_cinder.txt
@@ -2,6 +2,6 @@ Name:Manaforge Cinder
 ManaCost:BR
 Types:Creature Elemental Shaman
 PT:1/1
-A:AB$ Mana | Cost$ 1 | Produced$ Combo B R | Amount$ 1 | ActivationLimit$ 3 | SpellDescription$ Add {B} or {R} to your mana pool. Activate this ability no more than three times each turn.
+A:AB$ Mana | Cost$ 1 | Produced$ Combo B R | Amount$ 1 | ActivationLimit$ 3 | SpellDescription$ Add {B} or {R}. Activate this ability no more than three times each turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/manaforge_cinder.jpg
-Oracle:{1}: Add {B} or {R} to your mana pool. Activate this ability no more than three times each turn.
+Oracle:{1}: Add {B} or {R}. Activate this ability no more than three times each turn.
diff --git a/forge-gui/res/cardsfolder/m/manakin.txt b/forge-gui/res/cardsfolder/m/manakin.txt
index c3aa1606843..00383adb05c 100644
--- a/forge-gui/res/cardsfolder/m/manakin.txt
+++ b/forge-gui/res/cardsfolder/m/manakin.txt
@@ -2,6 +2,6 @@ Name:Manakin
 ManaCost:2
 Types:Artifact Creature Construct
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/manakin.jpg
-Oracle:{T}: Add {C} to your mana pool.
+Oracle:{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/m/manalith.txt b/forge-gui/res/cardsfolder/m/manalith.txt
index 56a15a117c0..5566b80f018 100644
--- a/forge-gui/res/cardsfolder/m/manalith.txt
+++ b/forge-gui/res/cardsfolder/m/manalith.txt
@@ -1,6 +1,6 @@
 Name:Manalith
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/manalith.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/m/manamorphose.txt b/forge-gui/res/cardsfolder/m/manamorphose.txt
index 32141f1551b..88d16d28620 100644
--- a/forge-gui/res/cardsfolder/m/manamorphose.txt
+++ b/forge-gui/res/cardsfolder/m/manamorphose.txt
@@ -1,8 +1,8 @@
 Name:Manamorphose
 ManaCost:1 RG
 Types:Instant
-A:SP$ Mana | Cost$ 1 RG | Produced$ Combo Any | Amount$ 2 | AILogic$ MostProminentInComputerHand | SubAbility$ DBDraw | SpellDescription$ Add two mana in any combination of colors to your mana pool. Draw a card.
+A:SP$ Mana | Cost$ 1 RG | Produced$ Combo Any | Amount$ 2 | AILogic$ MostProminentInComputerHand | SubAbility$ DBDraw | SpellDescription$ Add two mana in any combination of colors. Draw a card.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/manamorphose.jpg
-Oracle:Add two mana in any combination of colors to your mana pool.\nDraw a card.
+Oracle:Add two mana in any combination of colors.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/m/manaweft_sliver.txt b/forge-gui/res/cardsfolder/m/manaweft_sliver.txt
index 86c711db214..4fe9ebe495c 100644
--- a/forge-gui/res/cardsfolder/m/manaweft_sliver.txt
+++ b/forge-gui/res/cardsfolder/m/manaweft_sliver.txt
@@ -2,8 +2,8 @@ Name:Manaweft Sliver
 ManaCost:1 G
 Types:Creature Sliver
 PT:1/1
-S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddAbility$ AnyMana | Description$ Sliver creatures you control have "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddAbility$ AnyMana | Description$ Sliver creatures you control have "{T}: Add one mana of any color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/manaweft_sliver.jpg
-Oracle:Sliver creatures you control have "{T}: Add one mana of any color to your mana pool."
+Oracle:Sliver creatures you control have "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/m/marble_diamond.txt b/forge-gui/res/cardsfolder/m/marble_diamond.txt
index c8ba9341e55..560438d4985 100644
--- a/forge-gui/res/cardsfolder/m/marble_diamond.txt
+++ b/forge-gui/res/cardsfolder/m/marble_diamond.txt
@@ -1,7 +1,7 @@
 Name:Marble Diamond
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/marble_diamond.jpg
-Oracle:Marble Diamond enters the battlefield tapped.\n{T}: Add {W} to your mana pool.
+Oracle:Marble Diamond enters the battlefield tapped.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/m/mardu_banner.txt b/forge-gui/res/cardsfolder/m/mardu_banner.txt
index 5309b96b0d7..711094fe2cd 100644
--- a/forge-gui/res/cardsfolder/m/mardu_banner.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_banner.txt
@@ -1,11 +1,11 @@
 Name:Mardu Banner
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Draw | Cost$ R W B T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Red|White|Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_banner.jpg
-Oracle:{T}: Add {R}, {W}, or {B} to your mana pool.\n{R}{W}{B}, {T}, Sacrifice Mardu Banner: Draw a card.
+Oracle:{T}: Add {R}, {W}, or {B}.\n{R}{W}{B}, {T}, Sacrifice Mardu Banner: Draw a card.
diff --git a/forge-gui/res/cardsfolder/m/mardu_warshrieker.txt b/forge-gui/res/cardsfolder/m/mardu_warshrieker.txt
index 7631daf8945..ea442f22a7e 100644
--- a/forge-gui/res/cardsfolder/m/mardu_warshrieker.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_warshrieker.txt
@@ -2,8 +2,8 @@ Name:Mardu Warshrieker
 ManaCost:3 R
 Types:Creature Orc Shaman
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ ABMana | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B} to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ ABMana | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B}.
 SVar:RaidTest:Count$AttackersDeclared
 SVar:ABMana:DB$ Mana | Produced$ R W B
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_warshrieker.jpg
-Oracle:Raid — When Mardu Warshrieker enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B} to your mana pool.
+Oracle:Raid — When Mardu Warshrieker enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B}.
diff --git a/forge-gui/res/cardsfolder/m/mark_of_sakiko.txt b/forge-gui/res/cardsfolder/m/mark_of_sakiko.txt
index 284dac8f5e1..b45bb610a4d 100644
--- a/forge-gui/res/cardsfolder/m/mark_of_sakiko.txt
+++ b/forge-gui/res/cardsfolder/m/mark_of_sakiko.txt
@@ -3,9 +3,9 @@ ManaCost:1 G
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ SakikoTrig | AddSVar$ SakuraManaSingle & SakuraX | Description$ Enchanted creature has "Whenever this creature deals combat damage to a player, add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end."
-SVar:SakikoTrig:Mode$ DamageDone | ValidSource$ Creature.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ SakuraManaSingle | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage to a player, add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ SakikoTrig | AddSVar$ SakuraManaSingle & SakuraX | Description$ Enchanted creature has "Whenever this creature deals combat damage to a player, add that much {G}. Until end of turn, you don't lose this mana as phases and steps end."
+SVar:SakikoTrig:Mode$ DamageDone | ValidSource$ Creature.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ SakuraManaSingle | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage to a player, add that much {G}. Until end of turn, you don't lose this mana as steps and phases end.
 SVar:SakuraManaSingle:DB$ Mana | Produced$ G | Amount$ SakuraX | References$ SakuraX | PersistentMana$ True
 SVar:SakuraX:TriggerCount$DamageAmount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mark_of_sakiko.jpg
-Oracle:Enchant creature\nEnchanted creature has "Whenever this creature deals combat damage to a player, add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end."
+Oracle:Enchant creature\nEnchanted creature has "Whenever this creature deals combat damage to a player, add that much {G}. Until end of turn, you don't lose this mana as steps and phases end."
diff --git a/forge-gui/res/cardsfolder/m/market_festival.txt b/forge-gui/res/cardsfolder/m/market_festival.txt
index afc4ecf48b6..54ccbdac866 100644
--- a/forge-gui/res/cardsfolder/m/market_festival.txt
+++ b/forge-gui/res/cardsfolder/m/market_festival.txt
@@ -3,8 +3,8 @@ ManaCost:3 G
 Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ 3 G | ValidTgts$ Land | AILogic$ Pump
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds an additional two mana in any combination of colors.
 SVar:TrigMana:DB$ Mana | Produced$ Combo Any | Amount$ 2 | Defined$ TriggeredCardController
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/market_festival.jpg
-Oracle:Enchant land\nWhenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to his or her mana pool (in addition to the mana the land produces).
+Oracle:Enchant land\nWhenever enchanted land is tapped for mana, its controller adds an additional two mana in any combination of colors.
diff --git a/forge-gui/res/cardsfolder/m/maze_of_shadows.txt b/forge-gui/res/cardsfolder/m/maze_of_shadows.txt
index f152203655e..e53453d2a49 100644
--- a/forge-gui/res/cardsfolder/m/maze_of_shadows.txt
+++ b/forge-gui/res/cardsfolder/m/maze_of_shadows.txt
@@ -1,9 +1,9 @@
 Name:Maze of Shadows
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature.attacking+withShadow | TgtPrompt$ Select target attacking creature with shadow | KW$ 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:Picture:http://www.wizards.com/global/images/magic/general/maze_of_shadows.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Untap target attacking creature with shadow. Prevent all combat damage that would be dealt to and dealt by that creature this turn.
+Oracle:{T}: Add {C}.\n{T}: Untap target attacking creature with shadow. Prevent all combat damage that would be dealt to and dealt by that creature this turn.
diff --git a/forge-gui/res/cardsfolder/m/mazes_end.txt b/forge-gui/res/cardsfolder/m/mazes_end.txt
index 4898e9c7529..9240d71e5a7 100644
--- a/forge-gui/res/cardsfolder/m/mazes_end.txt
+++ b/forge-gui/res/cardsfolder/m/mazes_end.txt
@@ -2,10 +2,10 @@ Name:Maze's End
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 3 T Return<1/CARDNAME> | ChangeType$ Gate | ChangeNum$ 1 | Origin$ Library | Destination$ Battlefield | SubAbility$ DBWin | SpellDescription$ Search your library for a Gate card, put it onto the battlefield, then shuffle your library. If you control ten or more Gates with different names, you win the game.
 SVar:DBWin:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ MazeGate | ConditionSVarCompare$ GE10 | References$ MazeGate
 SVar:MazeGate:Count$DifferentCardNames_Gate.YouCtrl+inZoneBattlefield
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mazes_end.jpg
-Oracle:Maze's End enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{3}, {T}, Return Maze's End to its owner's hand: Search your library for a Gate card, put it onto the battlefield, then shuffle your library. If you control ten or more Gates with different names, you win the game.
+Oracle:Maze's End enters the battlefield tapped.\n{T}: Add {C}.\n{3}, {T}, Return Maze's End to its owner's hand: Search your library for a Gate card, put it onto the battlefield, then shuffle your library. If you control ten or more Gates with different names, you win the game.
diff --git a/forge-gui/res/cardsfolder/m/mercadian_bazaar.txt b/forge-gui/res/cardsfolder/m/mercadian_bazaar.txt
index fe42652dd0e..db318c9b96e 100644
--- a/forge-gui/res/cardsfolder/m/mercadian_bazaar.txt
+++ b/forge-gui/res/cardsfolder/m/mercadian_bazaar.txt
@@ -3,9 +3,9 @@ ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
 A:AB$ PutCounter | Cost$ T | Defined$ Self | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ R | Amount$ ChosenX | References$ X | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | SpellDescription$ Add {R} to your mana pool for each storage counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ R | Amount$ ChosenX | References$ X | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | SpellDescription$ Add {R} for each storage counter removed this way.
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mercadian_bazaar.jpg
-Oracle:Mercadian Bazaar enters the battlefield tapped.\n{T}: Put a storage counter on Mercadian Bazaar.\n{T}, Remove any number of storage counters from Mercadian Bazaar: Add {R} to your mana pool for each storage counter removed this way.
+Oracle:Mercadian Bazaar enters the battlefield tapped.\n{T}: Put a storage counter on Mercadian Bazaar.\n{T}, Remove any number of storage counters from Mercadian Bazaar: Add {R} for each storage counter removed this way.
diff --git a/forge-gui/res/cardsfolder/m/metalworker.txt b/forge-gui/res/cardsfolder/m/metalworker.txt
index b18266254f1..c50df02a5a3 100644
--- a/forge-gui/res/cardsfolder/m/metalworker.txt
+++ b/forge-gui/res/cardsfolder/m/metalworker.txt
@@ -2,11 +2,11 @@ Name:Metalworker
 ManaCost:3
 Types:Artifact Creature Construct
 PT:1/2
-A:AB$ Reveal | Cost$ T | RevealValid$ Card.Artifact+YouCtrl | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBMetalWorkerMana | SpellDescription$ Reveal any number of artifact cards in your hand. Add {C}{C} to your mana pool for each card revealed this way.
+A:AB$ Reveal | Cost$ T | RevealValid$ Card.Artifact+YouCtrl | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBMetalWorkerMana | SpellDescription$ Reveal any number of artifact cards in your hand. Add {C}{C} for each card revealed this way.
 SVar:DBMetalWorkerMana:DB$ Mana | Produced$ C | Amount$ MetalWorkerX | References$ MetalWorkerX,X | SubAbility$ DBMetalWorkerCleanup
 SVar:DBMetalWorkerCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:MetalWorkerX:Remembered$Amount.Twice
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/metalworker.jpg
-Oracle:{T}: Reveal any number of artifact cards in your hand. Add {C}{C} to your mana pool for each card revealed this way.
+Oracle:{T}: Reveal any number of artifact cards in your hand. Add {C}{C} for each card revealed this way.
diff --git a/forge-gui/res/cardsfolder/m/metamorphosis.txt b/forge-gui/res/cardsfolder/m/metamorphosis.txt
index 311cc4b8d12..7fc5de85f66 100644
--- a/forge-gui/res/cardsfolder/m/metamorphosis.txt
+++ b/forge-gui/res/cardsfolder/m/metamorphosis.txt
@@ -1,8 +1,8 @@
 Name:Metamorphosis
 ManaCost:G
 Types:Sorcery
-A:SP$ Mana | Cost$ G Sac<1/Creature> | Produced$ Any | Amount$ X | References$ X | RestrictValid$ Card.Creature | SpellDescription$ Add X mana of any one color to your mana pool, where X is one plus the sacrificed creature's converted mana cost. Spend this mana only to cast creature spells.
+A:SP$ Mana | Cost$ G Sac<1/Creature> | Produced$ Any | Amount$ X | References$ X | RestrictValid$ Card.Creature | SpellDescription$ Add X mana of any one color, where X is one plus the sacrificed creature's converted mana cost. Spend this mana only to cast creature spells.
 SVar:X:Sacrificed$CardManaCost/Plus.1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/metamorphosis.jpg
-Oracle:As an additional cost to cast Metamorphosis, sacrifice a creature.\nAdd X mana of any one color to your mana pool, where X is one plus the sacrificed creature's converted mana cost. Spend this mana only to cast creature spells.
+Oracle:As an additional cost to cast Metamorphosis, sacrifice a creature.\nAdd X mana of any one color, where X is one plus the sacrificed creature's converted mana cost. Spend this mana only to cast creature spells.
diff --git a/forge-gui/res/cardsfolder/m/meteor_crater.txt b/forge-gui/res/cardsfolder/m/meteor_crater.txt
index 675e04c64ac..ae90f4df15d 100644
--- a/forge-gui/res/cardsfolder/m/meteor_crater.txt
+++ b/forge-gui/res/cardsfolder/m/meteor_crater.txt
@@ -1,7 +1,7 @@
 Name:Meteor Crater
 ManaCost:no cost
 Types:Land
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Permanent.YouCtrl | ReflectProperty$ Is | SpellDescription$ Choose a color of a permanent you control. Add one mana of that color to your mana pool.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Permanent.YouCtrl | ReflectProperty$ Is | SpellDescription$ Choose a color of a permanent you control. Add one mana of that color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/meteor_crater.jpg
-Oracle:{T}: Choose a color of a permanent you control. Add one mana of that color to your mana pool.
+Oracle:{T}: Choose a color of a permanent you control. Add one mana of that color.
diff --git a/forge-gui/res/cardsfolder/m/meteorite.txt b/forge-gui/res/cardsfolder/m/meteorite.txt
index 3c7879c87c1..9eac95a012a 100644
--- a/forge-gui/res/cardsfolder/m/meteorite.txt
+++ b/forge-gui/res/cardsfolder/m/meteorite.txt
@@ -3,7 +3,7 @@ ManaCost:5
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 2 damage to target creature or player.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/meteorite.jpg
-Oracle:When Meteorite enters the battlefield, it deals 2 damage to target creature or player.\n{T}: Add one mana of any color to your mana pool.
+Oracle:When Meteorite enters the battlefield, it deals 2 damage to target creature or player.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/m/mikokoro_center_of_the_sea.txt b/forge-gui/res/cardsfolder/m/mikokoro_center_of_the_sea.txt
index 6d91fa5dcb8..21be5ad40b7 100644
--- a/forge-gui/res/cardsfolder/m/mikokoro_center_of_the_sea.txt
+++ b/forge-gui/res/cardsfolder/m/mikokoro_center_of_the_sea.txt
@@ -1,7 +1,7 @@
 Name:Mikokoro, Center of the Sea
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ 2 T | NumCards$ 1 | Defined$ Player | SpellDescription$ Each player draws a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mikokoro_center_of_the_sea.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: Each player draws a card.
+Oracle:{T}: Add {C}.\n{2}, {T}: Each player draws a card.
diff --git a/forge-gui/res/cardsfolder/m/millikin.txt b/forge-gui/res/cardsfolder/m/millikin.txt
index 2332de19fb0..311cf558a31 100644
--- a/forge-gui/res/cardsfolder/m/millikin.txt
+++ b/forge-gui/res/cardsfolder/m/millikin.txt
@@ -2,6 +2,6 @@ Name:Millikin
 ManaCost:2
 Types:Artifact Creature Construct
 PT:0/1
-A:AB$ Mana | Cost$ T Mill<1> | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T Mill<1> | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/millikin.jpg
-Oracle:{T}, Put the top card of your library into your graveyard: Add {C} to your mana pool.
+Oracle:{T}, Put the top card of your library into your graveyard: Add {C}.
diff --git a/forge-gui/res/cardsfolder/m/minamo_school_at_waters_edge.txt b/forge-gui/res/cardsfolder/m/minamo_school_at_waters_edge.txt
index 0379ce44219..d4540f7f7a2 100644
--- a/forge-gui/res/cardsfolder/m/minamo_school_at_waters_edge.txt
+++ b/forge-gui/res/cardsfolder/m/minamo_school_at_waters_edge.txt
@@ -1,8 +1,8 @@
 Name:Minamo, School at Water's Edge
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Untap | Cost$ U T | ValidTgts$ Permanent.Legendary | TgtPrompt$ Select target legendary permanent | SpellDescription$ Untap target legendary permanent.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/minamo_school_at_waters_edge.jpg
-Oracle:{T}: Add {U} to your mana pool.\n{U}, {T}: Untap target legendary permanent.
+Oracle:{T}: Add {U}.\n{U}, {T}: Untap target legendary permanent.
diff --git a/forge-gui/res/cardsfolder/m/mind_stone.txt b/forge-gui/res/cardsfolder/m/mind_stone.txt
index 0a86d5a67c5..2481805f4e0 100644
--- a/forge-gui/res/cardsfolder/m/mind_stone.txt
+++ b/forge-gui/res/cardsfolder/m/mind_stone.txt
@@ -1,7 +1,7 @@
 Name:Mind Stone
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ 1 T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mind_stone.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}, Sacrifice Mind Stone: Draw a card.
+Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Mind Stone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/m/miraris_wake.txt b/forge-gui/res/cardsfolder/m/miraris_wake.txt
index a50aece65ca..b0824cc90a1 100644
--- a/forge-gui/res/cardsfolder/m/miraris_wake.txt
+++ b/forge-gui/res/cardsfolder/m/miraris_wake.txt
@@ -2,7 +2,7 @@ Name:Mirari's Wake
 ManaCost:3 G W
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control get +1/+1.
-T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana of any type that land produced.
 SVar:TrigMana:DB$ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/miraris_wake.jpg
-Oracle:Creatures you control get +1/+1.\nWhenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+Oracle:Creatures you control get +1/+1.\nWhenever you tap a land for mana, add one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/m/miren_the_moaning_well.txt b/forge-gui/res/cardsfolder/m/miren_the_moaning_well.txt
index 4bf60c34aa4..6b17f83a393 100644
--- a/forge-gui/res/cardsfolder/m/miren_the_moaning_well.txt
+++ b/forge-gui/res/cardsfolder/m/miren_the_moaning_well.txt
@@ -1,9 +1,9 @@
 Name:Miren, the Moaning Well
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ GainLife | Cost$ 3 T Sac<1/Creature> | LifeAmount$ X | References$ X | SpellDescription$ You gain life equal to the sacrificed creature's toughness.
 SVar:X:Sacrificed$CardToughness
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/miren_the_moaning_well.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{3}, {T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness.
+Oracle:{T}: Add {C}.\n{3}, {T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness.
diff --git a/forge-gui/res/cardsfolder/m/mirrodins_core.txt b/forge-gui/res/cardsfolder/m/mirrodins_core.txt
index 3f17097b041..38f34cccaad 100644
--- a/forge-gui/res/cardsfolder/m/mirrodins_core.txt
+++ b/forge-gui/res/cardsfolder/m/mirrodins_core.txt
@@ -1,8 +1,8 @@
 Name:Mirrodin's Core
 ManaCost:no cost
 Types:Land
-A:AB$Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$PutCounter | Cost$ T | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-A:AB$Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mirrodins_core.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Put a charge counter on Mirrodin's Core.\n{T}, Remove a charge counter from Mirrodin's Core: Add one mana of any color to your mana pool.
+Oracle:{T}: Add {C}.\n{T}: Put a charge counter on Mirrodin's Core.\n{T}, Remove a charge counter from Mirrodin's Core: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/m/mirrorpool.txt b/forge-gui/res/cardsfolder/m/mirrorpool.txt
index 3eee28015a2..b48756c568b 100644
--- a/forge-gui/res/cardsfolder/m/mirrorpool.txt
+++ b/forge-gui/res/cardsfolder/m/mirrorpool.txt
@@ -2,8 +2,8 @@ Name:Mirrorpool
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ CopySpellAbility | Cost$ 2 C T Sac<1/CARDNAME> | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TargetType$ Spell | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy.
 A:AB$ CopyPermanent | Cost$ 4 C T Sac<1/CARDNAME> | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumCopies$ 1 | SpellDescription$ Create a token that's a copy of target creature you control.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mirrorpool.jpg
-Oracle:Mirrorpool enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{2}{C}, {T}, Sacrifice Mirrorpool: Copy target instant or sorcery spell you control. You may choose new targets for the copy.\n{4}{C}, {T}, Sacrifice Mirrorpool: Create a token that's a copy of target creature you control.
+Oracle:Mirrorpool enters the battlefield tapped.\n{T}: Add {C}.\n{2}{C}, {T}, Sacrifice Mirrorpool: Copy target instant or sorcery spell you control. You may choose new targets for the copy.\n{4}{C}, {T}, Sacrifice Mirrorpool: Create a token that's a copy of target creature you control.
diff --git a/forge-gui/res/cardsfolder/m/mishras_factory.txt b/forge-gui/res/cardsfolder/m/mishras_factory.txt
index bb145fbc7bc..5ba94213818 100644
--- a/forge-gui/res/cardsfolder/m/mishras_factory.txt
+++ b/forge-gui/res/cardsfolder/m/mishras_factory.txt
@@ -1,8 +1,8 @@
 Name:Mishra's Factory
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Assembly-Worker | RemoveCreatureTypes$ True | SpellDescription$ CARDNAME becomes a 2/2 Assembly-Worker artifact creature until end of turn. It's still a land.
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature.Assembly-Worker | TgtPrompt$ Select target Assembly-Worker creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target Assembly-Worker creature gets +1/+1 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mishras_factory.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}: Mishra's Factory becomes a 2/2 Assembly-Worker artifact creature until end of turn. It's still a land.\n{T}: Target Assembly-Worker creature gets +1/+1 until end of turn.
+Oracle:{T}: Add {C}.\n{1}: Mishra's Factory becomes a 2/2 Assembly-Worker artifact creature until end of turn. It's still a land.\n{T}: Target Assembly-Worker creature gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/m/mishras_workshop.txt b/forge-gui/res/cardsfolder/m/mishras_workshop.txt
index 2d6522cef7c..4c72005248c 100644
--- a/forge-gui/res/cardsfolder/m/mishras_workshop.txt
+++ b/forge-gui/res/cardsfolder/m/mishras_workshop.txt
@@ -1,7 +1,7 @@
 Name:Mishra's Workshop
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | RestrictValid$ Artifact | SpellDescription$ Add {C}{C}{C} to your mana pool. Spend this mana only to cast artifact spells.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | RestrictValid$ Artifact | SpellDescription$ Add {C}{C}{C}. Spend this mana only to cast artifact spells.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mishras_workshop.jpg
-Oracle:{T}: Add {C}{C}{C} to your mana pool. Spend this mana only to cast artifact spells.
+Oracle:{T}: Add {C}{C}{C}. Spend this mana only to cast artifact spells.
diff --git a/forge-gui/res/cardsfolder/m/mistveil_plains.txt b/forge-gui/res/cardsfolder/m/mistveil_plains.txt
index 307e89410bc..015b74b2455 100644
--- a/forge-gui/res/cardsfolder/m/mistveil_plains.txt
+++ b/forge-gui/res/cardsfolder/m/mistveil_plains.txt
@@ -4,4 +4,4 @@ Types:Land Plains
 K:CARDNAME enters the battlefield tapped.
 A:AB$ ChangeZone | Cost$ W T | IsPresent$ Permanent.White+YouCtrl | PresentCompare$ GE2 | ValidTgts$ Card.YouCtrl | TgtPrompt$ Select target card in your graveyard | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1 | ChangeNum$ 1 | SpellDescription$ Put target card from your graveyard on the bottom of your library. Activate this ability only if you control two or more white permanents.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mistveil_plains.jpg
-Oracle:({T}: Add {W} to your mana pool.)\nMistveil Plains enters the battlefield tapped.\n{W}, {T}: Put target card from your graveyard on the bottom of your library. Activate this ability only if you control two or more white permanents.
+Oracle:({T}: Add {W}.)\nMistveil Plains enters the battlefield tapped.\n{W}, {T}: Put target card from your graveyard on the bottom of your library. Activate this ability only if you control two or more white permanents.
diff --git a/forge-gui/res/cardsfolder/m/mistvein_borderpost.txt b/forge-gui/res/cardsfolder/m/mistvein_borderpost.txt
index b7b83817315..7afd37d6b84 100644
--- a/forge-gui/res/cardsfolder/m/mistvein_borderpost.txt
+++ b/forge-gui/res/cardsfolder/m/mistvein_borderpost.txt
@@ -2,8 +2,8 @@ Name:Mistvein Borderpost
 ManaCost:1 U B
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:AltCost:Cost$ 1 Return<1/Land.Basic> | Description$ You may pay {1} and return a basic land you control to its owner's hand rather than pay Mistvein Borderpost's mana cost.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mistvein_borderpost.jpg
-Oracle:You may pay {1} and return a basic land you control to its owner's hand rather than pay Mistvein Borderpost's mana cost.\nMistvein Borderpost enters the battlefield tapped.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:You may pay {1} and return a basic land you control to its owner's hand rather than pay Mistvein Borderpost's mana cost.\nMistvein Borderpost enters the battlefield tapped.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/m/mogg_hollows.txt b/forge-gui/res/cardsfolder/m/mogg_hollows.txt
index 1d6d81d3856..26f800ac13a 100644
--- a/forge-gui/res/cardsfolder/m/mogg_hollows.txt
+++ b/forge-gui/res/cardsfolder/m/mogg_hollows.txt
@@ -1,9 +1,9 @@
 Name:Mogg Hollows
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} 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$ 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
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}. 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:Picture:http://magiccards.info/scans/en/br/45.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {R} or {G} to your mana pool. Mogg Hollows doesn't untap during your next untap step.
+Oracle:{T}: Add {C}.\n{T}: Add {R} or {G}. Mogg Hollows doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/m/molten_slagheap.txt b/forge-gui/res/cardsfolder/m/molten_slagheap.txt
index 0b2d3a3a6e8..c44abb721aa 100644
--- a/forge-gui/res/cardsfolder/m/molten_slagheap.txt
+++ b/forge-gui/res/cardsfolder/m/molten_slagheap.txt
@@ -1,10 +1,10 @@
 Name:Molten Slagheap
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo B R | Amount$ ChosenX | CostDesc$ {1}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of {B} and/or {R} to your mana pool.
+A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo B R | Amount$ ChosenX | CostDesc$ {1}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of {B} and/or {R}.
 SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/molten_slagheap.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Put a storage counter on Molten Slagheap.\n{1}, Remove X storage counters from Molten Slagheap: Add X mana in any combination of {B} and/or {R} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Put a storage counter on Molten Slagheap.\n{1}, Remove X storage counters from Molten Slagheap: Add X mana in any combination of {B} and/or {R}.
diff --git a/forge-gui/res/cardsfolder/m/moonring_island.txt b/forge-gui/res/cardsfolder/m/moonring_island.txt
index 2507ae54974..457236819c2 100644
--- a/forge-gui/res/cardsfolder/m/moonring_island.txt
+++ b/forge-gui/res/cardsfolder/m/moonring_island.txt
@@ -5,4 +5,4 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Dig | Cost$ U T | ValidTgts$ Player | TgtPrompt$ Select target player | DigNum$ 1 | DestinationZone$ Library | LibraryPosition$ 0 | IsPresent$ Permanent.Blue+YouCtrl | PresentCompare$ GE2 | SpellDescription$ Look at the top card of target player's library. Activate this ability only if you control two or more blue permanents.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moonring_island.jpg
-Oracle:({T}: Add {U} to your mana pool.)\nMoonring Island enters the battlefield tapped.\n{U}, {T}: Look at the top card of target player's library. Activate this ability only if you control two or more blue permanents.
+Oracle:({T}: Add {U}.)\nMoonring Island enters the battlefield tapped.\n{U}, {T}: Look at the top card of target player's library. Activate this ability only if you control two or more blue permanents.
diff --git a/forge-gui/res/cardsfolder/m/moorland_haunt.txt b/forge-gui/res/cardsfolder/m/moorland_haunt.txt
index 18b34061697..f436449cfe0 100644
--- a/forge-gui/res/cardsfolder/m/moorland_haunt.txt
+++ b/forge-gui/res/cardsfolder/m/moorland_haunt.txt
@@ -1,9 +1,9 @@
 Name:Moorland Haunt
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Token | Cost$ W U T ExileFromGrave<1/Creature> | TokenImage$ w 1 1 spirit ISD | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Create a 1/1 white Spirit creature token with flying.
 DeckNeeds:Color$White|Blue
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moorland_haunt.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{W}{U}, {T}, Exile a creature card from your graveyard: Create a 1/1 white Spirit creature token with flying.
+Oracle:{T}: Add {C}.\n{W}{U}, {T}, Exile a creature card from your graveyard: Create a 1/1 white Spirit creature token with flying.
diff --git a/forge-gui/res/cardsfolder/m/morgue_toad.txt b/forge-gui/res/cardsfolder/m/morgue_toad.txt
index 9ac9b621717..7413920722c 100644
--- a/forge-gui/res/cardsfolder/m/morgue_toad.txt
+++ b/forge-gui/res/cardsfolder/m/morgue_toad.txt
@@ -2,8 +2,8 @@ Name:Morgue Toad
 ManaCost:2 B
 Types:Creature Frog
 PT:2/2
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ U R | SpellDescription$ Add {U}{R} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ U R | SpellDescription$ Add {U}{R}.
 DeckNeeds:Color$Blue|Red
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/morgue_toad.jpg
-Oracle:Sacrifice Morgue Toad: Add {U}{R} to your mana pool.
+Oracle:Sacrifice Morgue Toad: Add {U}{R}.
diff --git a/forge-gui/res/cardsfolder/m/morselhoarder.txt b/forge-gui/res/cardsfolder/m/morselhoarder.txt
index 6811c98ee8d..f995f5595c9 100644
--- a/forge-gui/res/cardsfolder/m/morselhoarder.txt
+++ b/forge-gui/res/cardsfolder/m/morselhoarder.txt
@@ -3,6 +3,6 @@ ManaCost:4 RG RG
 Types:Creature Elemental
 PT:6/4
 K:etbCounter:M1M1:2
-A:AB$ Mana | Cost$ SubCounter<1/M1M1> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ SubCounter<1/M1M1> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/morselhoarder.jpg
-Oracle:Morselhoarder enters the battlefield with two -1/-1 counters on it.\nRemove a -1/-1 counter from Morselhoarder: Add one mana of any color to your mana pool.
+Oracle:Morselhoarder enters the battlefield with two -1/-1 counters on it.\nRemove a -1/-1 counter from Morselhoarder: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/m/mortuary_mire.txt b/forge-gui/res/cardsfolder/m/mortuary_mire.txt
index c08660d27ef..44218ae1d9c 100644
--- a/forge-gui/res/cardsfolder/m/mortuary_mire.txt
+++ b/forge-gui/res/cardsfolder/m/mortuary_mire.txt
@@ -2,8 +2,8 @@ Name:Mortuary Mire
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may put target creature card from your graveyard on top of your library.
 SVar:TrigChange:DB$ ChangeZone | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredCardController | Origin$ Graveyard | Destination$ Library | SpellDescription$ You may put target creature card from your graveyard on top of your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mortuary_mire.jpg
-Oracle:Mortuary Mire enters the battlefield tapped.\nWhen Mortuary Mire enters the battlefield, you may put target creature card from your graveyard on top of your library.\n{T}: Add {B} to your mana pool.
+Oracle:Mortuary Mire enters the battlefield tapped.\nWhen Mortuary Mire enters the battlefield, you may put target creature card from your graveyard on top of your library.\n{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/m/moss_diamond.txt b/forge-gui/res/cardsfolder/m/moss_diamond.txt
index 6020ea05427..b3081ece7c3 100644
--- a/forge-gui/res/cardsfolder/m/moss_diamond.txt
+++ b/forge-gui/res/cardsfolder/m/moss_diamond.txt
@@ -1,7 +1,7 @@
 Name:Moss Diamond
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moss_diamond.jpg
-Oracle:Moss Diamond enters the battlefield tapped.\n{T}: Add {G} to your mana pool.
+Oracle:Moss Diamond enters the battlefield tapped.\n{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/m/mossfire_egg.txt b/forge-gui/res/cardsfolder/m/mossfire_egg.txt
index 9ef1ff80ebe..85196400caa 100644
--- a/forge-gui/res/cardsfolder/m/mossfire_egg.txt
+++ b/forge-gui/res/cardsfolder/m/mossfire_egg.txt
@@ -1,9 +1,9 @@
 Name:Mossfire Egg
 ManaCost:1
 Types:Artifact
-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.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ R G | SubAbility$ DBDraw | SpellDescription$ Add {R}{G}. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mossfire_egg.jpg
-Oracle:{2}, {T}, Sacrifice Mossfire Egg: Add {R}{G} to your mana pool. Draw a card.
+Oracle:{2}, {T}, Sacrifice Mossfire Egg: Add {R}{G}. Draw a card.
diff --git a/forge-gui/res/cardsfolder/m/mossfire_valley.txt b/forge-gui/res/cardsfolder/m/mossfire_valley.txt
index 6a217c3c19a..091644d14f1 100644
--- a/forge-gui/res/cardsfolder/m/mossfire_valley.txt
+++ b/forge-gui/res/cardsfolder/m/mossfire_valley.txt
@@ -1,7 +1,7 @@
 Name:Mossfire Valley
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ 1 T | Produced$ R G | SpellDescription$ Add {R}{G} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ R G | SpellDescription$ Add {R}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mossfire_valley.jpg
-Oracle:{1}, {T}: Add {R}{G} to your mana pool.
+Oracle:{1}, {T}: Add {R}{G}.
diff --git a/forge-gui/res/cardsfolder/m/mosswort_bridge.txt b/forge-gui/res/cardsfolder/m/mosswort_bridge.txt
index 6c31fa30960..7f4c4773350 100644
--- a/forge-gui/res/cardsfolder/m/mosswort_bridge.txt
+++ b/forge-gui/res/cardsfolder/m/mosswort_bridge.txt
@@ -2,8 +2,8 @@ Name:Mosswort Bridge
 ManaCost:no cost
 Types:Land
 K:Hideaway
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Play | Cost$ G T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | References$ X | ConditionCheckSVar$ X | ConditionSVarCompare$ GE10 | ForgetRemembered$ True | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if creatures you control have total power 10 or greater.
 SVar:X:Count$SumPower_Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mosswort_bridge.jpg
-Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {G} to your mana pool.\n{G}, {T}: You may play the exiled card without paying its mana cost if creatures you control have total power 10 or greater.
+Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {G}.\n{G}, {T}: You may play the exiled card without paying its mana cost if creatures you control have total power 10 or greater.
diff --git a/forge-gui/res/cardsfolder/m/mouth_of_ronom.txt b/forge-gui/res/cardsfolder/m/mouth_of_ronom.txt
index d52efec988d..f6ca6bcd0aa 100644
--- a/forge-gui/res/cardsfolder/m/mouth_of_ronom.txt
+++ b/forge-gui/res/cardsfolder/m/mouth_of_ronom.txt
@@ -1,8 +1,8 @@
 Name:Mouth of Ronom
 ManaCost:no cost
 Types:Snow Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ DealDamage | Cost$ 4 S T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mouth_of_ronom.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}{S}, {T}, Sacrifice Mouth of Ronom: Mouth of Ronom deals 4 damage to target creature. ({S} can be paid with one mana from a snow permanent.)
+Oracle:{T}: Add {C}.\n{4}{S}, {T}, Sacrifice Mouth of Ronom: Mouth of Ronom deals 4 damage to target creature. ({S} can be paid with one mana from a snow permanent.)
diff --git a/forge-gui/res/cardsfolder/m/mox_diamond.txt b/forge-gui/res/cardsfolder/m/mox_diamond.txt
index a60d421dc90..896b6f9e674 100644
--- a/forge-gui/res/cardsfolder/m/mox_diamond.txt
+++ b/forge-gui/res/cardsfolder/m/mox_diamond.txt
@@ -1,7 +1,7 @@
 Name:Mox Diamond
 ManaCost:0
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, you may discard a land card instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
 SVar:PayBeforeETB:DB$ Discard | DiscardValid$ Land | Mode$ TgtChoose | RememberDiscarded$ True | Optional$ True | AILogic$ Always | SubAbility$ MoveToGraveyard
 SVar:MoveToGraveyard:DB$ ChangeZone | Origin$ All | Destination$ Graveyard | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X | SubAbility$ MoveToBattlefield
@@ -12,4 +12,4 @@ SVar:NeedsToPlayVar:Y GE1
 SVar:Y:Count$ValidHand Land.YouCtrl
 SVar:PlayBeforeLandDrop:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mox_diamond.jpg
-Oracle:If Mox Diamond would enter the battlefield, you may discard a land card instead. If you do, put Mox Diamond onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add one mana of any color to your mana pool.
+Oracle:If Mox Diamond would enter the battlefield, you may discard a land card instead. If you do, put Mox Diamond onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/m/mox_emerald.txt b/forge-gui/res/cardsfolder/m/mox_emerald.txt
index aed68de6281..336111e0da9 100644
--- a/forge-gui/res/cardsfolder/m/mox_emerald.txt
+++ b/forge-gui/res/cardsfolder/m/mox_emerald.txt
@@ -1,7 +1,7 @@
 Name:Mox Emerald
 ManaCost:0
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://resources.wizards.com/magic/cards/2u/en-us/card629.jpg
-Oracle:{T}: Add {G} to your mana pool.
+Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/m/mox_jet.txt b/forge-gui/res/cardsfolder/m/mox_jet.txt
index 1b8c4c4b5ae..b88f2a5f4c1 100644
--- a/forge-gui/res/cardsfolder/m/mox_jet.txt
+++ b/forge-gui/res/cardsfolder/m/mox_jet.txt
@@ -1,7 +1,7 @@
 Name:Mox Jet
 ManaCost:0
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://resources.wizards.com/magic/cards/2u/en-us/card630.jpg
-Oracle:{T}: Add {B} to your mana pool.
+Oracle:{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/m/mox_opal.txt b/forge-gui/res/cardsfolder/m/mox_opal.txt
index 569f0443b97..8e9adcbad22 100644
--- a/forge-gui/res/cardsfolder/m/mox_opal.txt
+++ b/forge-gui/res/cardsfolder/m/mox_opal.txt
@@ -1,7 +1,7 @@
 Name:Mox Opal
 ManaCost:0
 Types:Legendary Artifact
-A:AB$ Mana | Cost$ T | Produced$ Any | Activation$ Metalcraft | PrecostDesc$ Metalcraft — | SpellDescription$ Add one mana of any color to your mana pool. Activate this ability only if you control three or more artifacts.
+A:AB$ Mana | Cost$ T | Produced$ Any | Activation$ Metalcraft | PrecostDesc$ Metalcraft — | SpellDescription$ Add one mana of any color. Activate this ability only if you control three or more artifacts.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mox_opal.jpg
-Oracle:Metalcraft — {T}: Add one mana of any color to your mana pool. Activate this ability only if you control three or more artifacts.
+Oracle:Metalcraft — {T}: Add one mana of any color. Activate this ability only if you control three or more artifacts.
diff --git a/forge-gui/res/cardsfolder/m/mox_pearl.txt b/forge-gui/res/cardsfolder/m/mox_pearl.txt
index d626d0c60ed..85ffb016f0e 100644
--- a/forge-gui/res/cardsfolder/m/mox_pearl.txt
+++ b/forge-gui/res/cardsfolder/m/mox_pearl.txt
@@ -1,7 +1,7 @@
 Name:Mox Pearl
 ManaCost:0
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://resources.wizards.com/magic/cards/2u/en-us/card631.jpg
-Oracle:{T}: Add {W} to your mana pool.
+Oracle:{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/m/mox_ruby.txt b/forge-gui/res/cardsfolder/m/mox_ruby.txt
index ddab64e1877..7d2863a4354 100644
--- a/forge-gui/res/cardsfolder/m/mox_ruby.txt
+++ b/forge-gui/res/cardsfolder/m/mox_ruby.txt
@@ -1,7 +1,7 @@
 Name:Mox Ruby
 ManaCost:0
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://resources.wizards.com/magic/cards/2u/en-us/card632.jpg
-Oracle:{T}: Add {R} to your mana pool.
+Oracle:{T}: Add {R}.
diff --git a/forge-gui/res/cardsfolder/m/mox_sapphire.txt b/forge-gui/res/cardsfolder/m/mox_sapphire.txt
index b4de56cef91..2a4d8d8ea80 100644
--- a/forge-gui/res/cardsfolder/m/mox_sapphire.txt
+++ b/forge-gui/res/cardsfolder/m/mox_sapphire.txt
@@ -1,7 +1,7 @@
 Name:Mox Sapphire
 ManaCost:0
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://resources.wizards.com/magic/cards/2u/en-us/card633.jpg
-Oracle:{T}: Add {U} to your mana pool.
+Oracle:{T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/m/mul_daya_channelers.txt b/forge-gui/res/cardsfolder/m/mul_daya_channelers.txt
index a5d0a0fe50b..b183a252539 100644
--- a/forge-gui/res/cardsfolder/m/mul_daya_channelers.txt
+++ b/forge-gui/res/cardsfolder/m/mul_daya_channelers.txt
@@ -4,7 +4,7 @@ Types:Creature Elf Druid Shaman
 PT:2/2
 S:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library | MayLookAt$ Player | Description$ Play with the top card of your library revealed.
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | TopCardOfLibraryIs$ Creature | Description$ As long as the top card of your library is a creature card, CARDNAME gets +3/+3.
-S:Mode$ Continuous | Affected$ Card.Self | AddAbility$ AnyMana | TopCardOfLibraryIs$ Land | Description$ As long as the top card of your library is a land card, CARDNAME has "{T}: Add two mana of any one color to your mana pool."
-SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
+S:Mode$ Continuous | Affected$ Card.Self | AddAbility$ AnyMana | TopCardOfLibraryIs$ Land | Description$ As long as the top card of your library is a land card, CARDNAME has "{T}: Add two mana of any one color."
+SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mul_daya_channelers.jpg
-Oracle:Play with the top card of your library revealed.\nAs long as the top card of your library is a creature card, Mul Daya Channelers gets +3/+3.\nAs long as the top card of your library is a land card, Mul Daya Channelers has "{T}: Add two mana of any one color to your mana pool."
+Oracle:Play with the top card of your library revealed.\nAs long as the top card of your library is a creature card, Mul Daya Channelers gets +3/+3.\nAs long as the top card of your library is a land card, Mul Daya Channelers has "{T}: Add two mana of any one color."
diff --git a/forge-gui/res/cardsfolder/m/multanis_harmony.txt b/forge-gui/res/cardsfolder/m/multanis_harmony.txt
index 22d2a4621f0..ad594ee6f01 100644
--- a/forge-gui/res/cardsfolder/m/multanis_harmony.txt
+++ b/forge-gui/res/cardsfolder/m/multanis_harmony.txt
@@ -3,8 +3,8 @@ ManaCost:G
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ G | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ AnyMana | Description$ Enchanted creature has "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ AnyMana | Description$ Enchanted creature has "{T}: Add one mana of any color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:NonStackingAttachEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/multanis_harmony.jpg
-Oracle:Enchant creature\nEnchanted creature has "{T}: Add one mana of any color to your mana pool."
+Oracle:Enchant creature\nEnchanted creature has "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/m/murmuring_bosk.txt b/forge-gui/res/cardsfolder/m/murmuring_bosk.txt
index 27baed5d518..b51d77b007e 100644
--- a/forge-gui/res/cardsfolder/m/murmuring_bosk.txt
+++ b/forge-gui/res/cardsfolder/m/murmuring_bosk.txt
@@ -1,10 +1,10 @@
 Name:Murmuring Bosk
 ManaCost:no cost
 Types:Land Forest
-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.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Treefolk> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Treefolk card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/murmuring_bosk.jpg
-Oracle:({T}: Add {G} to your mana pool.)\nAs Murmuring Bosk enters the battlefield, you may reveal a Treefolk card from your hand. If you don't, Murmuring Bosk enters the battlefield tapped.\n{T}: Add {W} or {B} to your mana pool. Murmuring Bosk deals 1 damage to you.
+Oracle:({T}: Add {G}.)\nAs Murmuring Bosk enters the battlefield, you may reveal a Treefolk card from your hand. If you don't, Murmuring Bosk enters the battlefield tapped.\n{T}: Add {W} or {B}. Murmuring Bosk deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/m/mutavault.txt b/forge-gui/res/cardsfolder/m/mutavault.txt
index aa4feebfb63..0b7ba92fa73 100644
--- a/forge-gui/res/cardsfolder/m/mutavault.txt
+++ b/forge-gui/res/cardsfolder/m/mutavault.txt
@@ -1,7 +1,7 @@
 Name:Mutavault
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,AllCreatureTypes | SpellDescription$ CARDNAME becomes a 2/2 creature with all creature types until end of turn. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mutavault.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}: Mutavault becomes a 2/2 creature with all creature types until end of turn. It's still a land.
+Oracle:{T}: Add {C}.\n{1}: Mutavault becomes a 2/2 creature with all creature types until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/m/myr_moonvessel.txt b/forge-gui/res/cardsfolder/m/myr_moonvessel.txt
index 1bad3611ced..b8a58589af2 100644
--- a/forge-gui/res/cardsfolder/m/myr_moonvessel.txt
+++ b/forge-gui/res/cardsfolder/m/myr_moonvessel.txt
@@ -2,7 +2,7 @@ Name:Myr Moonvessel
 ManaCost:1
 Types:Artifact Creature Myr
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigAddMana | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, add {C} to your mana pool.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigAddMana | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, add {C}.
 SVar:TrigAddMana:DB$Mana | Produced$ C
 SVar:Picture:http://www.wizards.com/global/images/magic/general/myr_moonvessel.jpg
-Oracle:When Myr Moonvessel dies, Add {C} to your mana pool.
+Oracle:When Myr Moonvessel dies, Add {C}.
diff --git a/forge-gui/res/cardsfolder/m/myr_reservoir.txt b/forge-gui/res/cardsfolder/m/myr_reservoir.txt
index 7a3a0f0af48..3a039c67eb2 100644
--- a/forge-gui/res/cardsfolder/m/myr_reservoir.txt
+++ b/forge-gui/res/cardsfolder/m/myr_reservoir.txt
@@ -1,8 +1,8 @@
 Name:Myr Reservoir
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Myr,Activated.Myr | SpellDescription$ Add {C}{C} to your mana pool. Spend this mana only to cast Myr spells or activate abilities of Myr.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Myr,Activated.Myr | SpellDescription$ Add {C}{C}. Spend this mana only to cast Myr spells or activate abilities of Myr.
 A:AB$ ChangeZone | Cost$ 3 T | TgtPrompt$ Choose target Myr card in your graveyard | ValidTgts$ Card.Myr+YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target Myr card from your graveyard to your hand.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/myr_reservoir.jpg
-Oracle:{T}: Add {C}{C} to your mana pool. Spend this mana only to cast Myr spells or activate abilities of Myr.\n{3}, {T}: Return target Myr card from your graveyard to your hand.
+Oracle:{T}: Add {C}{C}. Spend this mana only to cast Myr spells or activate abilities of Myr.\n{3}, {T}: Return target Myr card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/m/myriad_landscape.txt b/forge-gui/res/cardsfolder/m/myriad_landscape.txt
index 75e58426aeb..a9aeb2f50df 100644
--- a/forge-gui/res/cardsfolder/m/myriad_landscape.txt
+++ b/forge-gui/res/cardsfolder/m/myriad_landscape.txt
@@ -2,7 +2,7 @@ Name:Myriad Landscape
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 2 | ShareLandType$ True | SpellDescription$ Search your library for up to two basic land cards that share a land type, put them onto the battlefield tapped, then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/myriad_landscape.jpg
-Oracle:Myriad Landscape enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{2}, {T}, Sacrifice Myriad Landscape: Search your library for up to two basic land cards that share a land type, put them onto the battlefield tapped, then shuffle your library.
+Oracle:Myriad Landscape enters the battlefield tapped.\n{T}: Add {C}.\n{2}, {T}, Sacrifice Myriad Landscape: Search your library for up to two basic land cards that share a land type, put them onto the battlefield tapped, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/m/mystic_gate.txt b/forge-gui/res/cardsfolder/m/mystic_gate.txt
index 118cb11715c..f1f860338b2 100644
--- a/forge-gui/res/cardsfolder/m/mystic_gate.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_gate.txt
@@ -1,10 +1,10 @@
 Name:Mystic Gate
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ WU T | Produced$ W | Amount$2 | SpellDescription$ Add {W}{W} to your mana pool.
-A:AB$ Mana | Cost$ WU T | Produced$ W U | SpellDescription$ Add {W}{U} to your mana pool.
-A:AB$ Mana | Cost$ WU T | Produced$ U | Amount$2 | SpellDescription$ Add {U}{U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ WU T | Produced$ W | Amount$2 | SpellDescription$ Add {W}{W}.
+A:AB$ Mana | Cost$ WU T | Produced$ W U | SpellDescription$ Add {W}{U}.
+A:AB$ Mana | Cost$ WU T | Produced$ U | Amount$2 | SpellDescription$ Add {U}{U}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mystic_gate.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{W/U}, {T}: Add {W}{W}, {W}{U}, or {U}{U} to your mana pool.
+Oracle:{T}: Add {C}.\n{W/U}, {T}: Add {W}{W}, {W}{U}, or {U}{U}.
diff --git a/forge-gui/res/cardsfolder/m/mystic_monastery.txt b/forge-gui/res/cardsfolder/m/mystic_monastery.txt
index 9eeaf0822d5..eb0816a2c1b 100644
--- a/forge-gui/res/cardsfolder/m/mystic_monastery.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_monastery.txt
@@ -2,8 +2,8 @@ Name:Mystic Monastery
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mystic_monastery.jpg
-Oracle:Mystic Monastery enters the battlefield tapped.\n{T}: Add {U}, {R}, or {W} to your mana pool.
+Oracle:Mystic Monastery enters the battlefield tapped.\n{T}: Add {U}, {R}, or {W}.
diff --git a/forge-gui/res/cardsfolder/m/mystifying_maze.txt b/forge-gui/res/cardsfolder/m/mystifying_maze.txt
index a8f5954002d..82dd1b9676c 100644
--- a/forge-gui/res/cardsfolder/m/mystifying_maze.txt
+++ b/forge-gui/res/cardsfolder/m/mystifying_maze.txt
@@ -1,10 +1,10 @@
 Name:Mystifying Maze
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 4 T | ValidTgts$ Creature.attacking+OppCtrl | TgtPrompt$ Select target attacking creature an opponent controls | Origin$ Battlefield | Destination$ Exile | RememberChanged$ 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 | RememberObjects$ Remembered | TriggerDescription$ Return exiled card to the battlefield. | SubAbility$ DBCleanup
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRemembered | Tapped$ True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mystifying_maze.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}, {T}: 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.
+Oracle:{T}: Add {C}.\n{4}, {T}: 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.
diff --git a/forge-gui/res/cardsfolder/n/naga_vitalist.txt b/forge-gui/res/cardsfolder/n/naga_vitalist.txt
index 2902a95f87b..a48980f286b 100644
--- a/forge-gui/res/cardsfolder/n/naga_vitalist.txt
+++ b/forge-gui/res/cardsfolder/n/naga_vitalist.txt
@@ -2,6 +2,6 @@ Name:Naga Vitalist
 ManaCost:1 G
 Types:Creature Naga Druid
 PT:1/2
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add to your mana pool one mana of any type that a land you control could produce.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type that a land you control could produce.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naga_vitalist.jpg
-Oracle:{T}: Add to your mana pool one mana of any type that a land you control could produce.
\ No newline at end of file
+Oracle:{T}: Add one mana of any type that a land you control could produce.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/n/nantuko_elder.txt b/forge-gui/res/cardsfolder/n/nantuko_elder.txt
index 223f5fa96c2..d9aa759bf99 100644
--- a/forge-gui/res/cardsfolder/n/nantuko_elder.txt
+++ b/forge-gui/res/cardsfolder/n/nantuko_elder.txt
@@ -2,6 +2,6 @@ Name:Nantuko Elder
 ManaCost:2 G
 Types:Creature Insect Druid
 PT:1/2
-A:AB$ Mana | Cost$ T | Produced$ C G | SpellDescription$ Add {C}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C G | SpellDescription$ Add {C}{G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_elder.jpg
-Oracle:{T}: Add {C}{G} to your mana pool.
+Oracle:{T}: Add {C}{G}.
diff --git a/forge-gui/res/cardsfolder/n/nantuko_monastery.txt b/forge-gui/res/cardsfolder/n/nantuko_monastery.txt
index 2259d4cd8f2..dc573a26b03 100644
--- a/forge-gui/res/cardsfolder/n/nantuko_monastery.txt
+++ b/forge-gui/res/cardsfolder/n/nantuko_monastery.txt
@@ -1,8 +1,8 @@
 Name:Nantuko Monastery
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ G W | Activation$ Threshold | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Insect,Monk | Colors$ Green,White | Keywords$ First Strike | SpellDescription$ CARDNAME becomes a 4/4 green and white Insect Monk creature with first strike until end of turn. It's still a land. Activate this ability only if seven or more cards are in your graveyard. | PrecostDesc$ Threshold —
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_monastery.jpg
-Oracle:{T}: Add {C} to your mana pool.\nThreshold — {G}{W}: Nantuko Monastery becomes a 4/4 green and white Insect Monk creature with first strike until end of turn. It's still a land. Activate this ability only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {C}.\nThreshold — {G}{W}: Nantuko Monastery becomes a 4/4 green and white Insect Monk creature with first strike until end of turn. It's still a land. Activate this ability only if seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/n/naya_panorama.txt b/forge-gui/res/cardsfolder/n/naya_panorama.txt
index 2c5cebbd8f0..b9b1e786bd1 100644
--- a/forge-gui/res/cardsfolder/n/naya_panorama.txt
+++ b/forge-gui/res/cardsfolder/n/naya_panorama.txt
@@ -1,7 +1,7 @@
 Name:Naya Panorama
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Mountain+Basic,Land.Forest+Basic,Land.Plains+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Mountain, Forest, or Plains card and put it onto the battlefield tapped. Then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naya_panorama.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}, Sacrifice Naya Panorama: Search your library for a basic Mountain, Forest, or Plains card and put it onto the battlefield tapped. Then shuffle your library.
+Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Naya Panorama: Search your library for a basic Mountain, Forest, or Plains card and put it onto the battlefield tapped. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/n/necra_disciple.txt b/forge-gui/res/cardsfolder/n/necra_disciple.txt
index 7a44c958628..8098edca1e7 100644
--- a/forge-gui/res/cardsfolder/n/necra_disciple.txt
+++ b/forge-gui/res/cardsfolder/n/necra_disciple.txt
@@ -3,6 +3,6 @@ ManaCost:B
 Types:Creature Human Wizard
 PT:1/1
 A:AB$ PreventDamage | Cost$ W T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to target creature or player this turn.
-A:AB$ Mana | Cost$ G T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ G T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necra_disciple.jpg
-Oracle:{G}, {T}: Add one mana of any color to your mana pool.\n{W}, {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.
+Oracle:{G}, {T}: Add one mana of any color.\n{W}, {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.
diff --git a/forge-gui/res/cardsfolder/n/needle_spires.txt b/forge-gui/res/cardsfolder/n/needle_spires.txt
index 55af2d68c6f..ba36aaf7d06 100644
--- a/forge-gui/res/cardsfolder/n/needle_spires.txt
+++ b/forge-gui/res/cardsfolder/n/needle_spires.txt
@@ -2,8 +2,8 @@ Name:Needle Spires
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Animate | Cost$ 2 R W | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Creature,Elemental | Colors$ Red,White | Keywords$ Double Strike | SpellDescription$ CARDNAME becomes a 2/1 red and white Elemental creature with double strike until end of turn. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/needle_spires.jpg
-Oracle:Needle Spires enters the battlefield tapped.\n{T}: Add {R} or {W} to your mana pool.\n{2}{R}{W}: Needle Spires becomes a 2/1 red and white Elemental creature with double strike until end of turn. It's still a land.
+Oracle:Needle Spires enters the battlefield tapped.\n{T}: Add {R} or {W}.\n{2}{R}{W}: Needle Spires becomes a 2/1 red and white Elemental creature with double strike until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/n/neheb_the_eternal.txt b/forge-gui/res/cardsfolder/n/neheb_the_eternal.txt
index 35fbd0a2253..cb04673050c 100644
--- a/forge-gui/res/cardsfolder/n/neheb_the_eternal.txt
+++ b/forge-gui/res/cardsfolder/n/neheb_the_eternal.txt
@@ -3,9 +3,9 @@ ManaCost:3 R R
 Types:Legendary Creature Zombie Minotaur Warrior
 PT:4/6
 K:Afflict 3
-T:Mode$ Phase | Phase$ Main2 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of your postcombat main phase, add {R} to your mana pool for each 1 life your opponents have lost this turn.
+T:Mode$ Phase | Phase$ Main2 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of your postcombat main phase, add {R} for each 1 life your opponents have lost this turn.
 SVar:TrigMana:DB$Mana | Produced$ R | Amount$ X | References$ X
 SVar:X:Count$LifeOppsLostThisTurn
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neheb_the_eternal.jpg
-Oracle:Afflict 3 (Whenever this creature becomes blocked, defending player loses 3 life.)\nAt the beginning of your postcombat main phase, add {R} to your mana pool for each 1 life your opponents have lost this turn.
+Oracle:Afflict 3 (Whenever this creature becomes blocked, defending player loses 3 life.)\nAt the beginning of your postcombat main phase, add {R} for each 1 life your opponents have lost this turn.
diff --git a/forge-gui/res/cardsfolder/n/nephalia_academy.txt b/forge-gui/res/cardsfolder/n/nephalia_academy.txt
index 6192ec056db..96883033135 100644
--- a/forge-gui/res/cardsfolder/n/nephalia_academy.txt
+++ b/forge-gui/res/cardsfolder/n/nephalia_academy.txt
@@ -1,10 +1,10 @@
 Name:Nephalia Academy
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 R:Event$ Discard | ActiveZones$ Battlefield | ValidCard$ Card.YouCtrl | ValidSource$ Card.OppCtrl | ReplaceWith$ DBReveal | Optional$ True | DiscardFromEffect$ True | Description$ If a spell or ability an opponent controls causes you to discard a card, you may reveal that card and put it on top of your library instead of putting it anywhere else.
 SVar:DBReveal:DB$ Reveal | Defined$ You | RevealDefined$ ReplacedCard | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ ReplacedPlayer | Mode$ Defined | DefinedCards$ ReplacedCard | Cause$ ReplacedSource | DiscardToTopOfLibrary$ True
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nephalia_academy.jpg
-Oracle:If a spell or ability an opponent controls causes you to discard a card, you may reveal that card and put it on top of your library instead of putting it anywhere else.\n{T}: Add {C} to your mana pool.
+Oracle:If a spell or ability an opponent controls causes you to discard a card, you may reveal that card and put it on top of your library instead of putting it anywhere else.\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/n/nephalia_drownyard.txt b/forge-gui/res/cardsfolder/n/nephalia_drownyard.txt
index 3de72dc9f82..7300b4b6eec 100644
--- a/forge-gui/res/cardsfolder/n/nephalia_drownyard.txt
+++ b/forge-gui/res/cardsfolder/n/nephalia_drownyard.txt
@@ -1,7 +1,7 @@
 Name:Nephalia Drownyard
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mill | Cost$ 1 U B T | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top three cards of his or her library into his or her graveyard.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nephalia_drownyard.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{U}{B}, {T}: Target player puts the top three cards of his or her library into his or her graveyard.
+Oracle:{T}: Add {C}.\n{1}{U}{B}, {T}: Target player puts the top three cards of his or her library into his or her graveyard.
diff --git a/forge-gui/res/cardsfolder/n/nest_invader.txt b/forge-gui/res/cardsfolder/n/nest_invader.txt
index 170d97baefe..3c213f1e3b1 100644
--- a/forge-gui/res/cardsfolder/n/nest_invader.txt
+++ b/forge-gui/res/cardsfolder/n/nest_invader.txt
@@ -2,10 +2,10 @@ Name:Nest Invader
 ManaCost:1 G
 Types:Creature Eldrazi Drone
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn2
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nest_invader.jpg
-Oracle:When Nest Invader enters the battlefield, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:When Nest Invader enters the battlefield, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/n/new_benalia.txt b/forge-gui/res/cardsfolder/n/new_benalia.txt
index f32e7475c3f..4420309f699 100644
--- a/forge-gui/res/cardsfolder/n/new_benalia.txt
+++ b/forge-gui/res/cardsfolder/n/new_benalia.txt
@@ -2,8 +2,8 @@ Name:New Benalia
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/new_benalia.jpg
-Oracle:New Benalia enters the battlefield tapped.\nWhen New Benalia enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {W} to your mana pool.
+Oracle:New Benalia enters the battlefield tapped.\nWhen New Benalia enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/n/new_horizons.txt b/forge-gui/res/cardsfolder/n/new_horizons.txt
index 0d7b1234f7e..250961a9f3c 100644
--- a/forge-gui/res/cardsfolder/n/new_horizons.txt
+++ b/forge-gui/res/cardsfolder/n/new_horizons.txt
@@ -5,7 +5,7 @@ K:Enchant land
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on target creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1 
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ NewHorizonsTap | Description$ Enchanted land has "{T}: Add two mana of any one color to your mana pool."
-SVar:NewHorizonsTap:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ NewHorizonsTap | Description$ Enchanted land has "{T}: Add two mana of any one color."
+SVar:NewHorizonsTap:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/new_horizons.jpg
-Oracle:Enchant land\nWhen New Horizons enters the battlefield, put a +1/+1 counter on target creature you control.\nEnchanted land has "{T}: Add two mana of any one color to your mana pool."
\ No newline at end of file
+Oracle:Enchant land\nWhen New Horizons enters the battlefield, put a +1/+1 counter on target creature you control.\nEnchanted land has "{T}: Add two mana of any one color."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/n/nimbus_maze.txt b/forge-gui/res/cardsfolder/n/nimbus_maze.txt
index 3074dafbe29..c12cf9d02ab 100644
--- a/forge-gui/res/cardsfolder/n/nimbus_maze.txt
+++ b/forge-gui/res/cardsfolder/n/nimbus_maze.txt
@@ -1,8 +1,8 @@
 Name:Nimbus Maze
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | IsPresent$ Island.YouCtrl | SpellDescription$ Add {W} to your mana pool. Activate this ability only if you control an Island.
-A:AB$ Mana | Cost$ T | Produced$ U | IsPresent$ Plains.YouCtrl | SpellDescription$ Add {U} to your mana pool. Activate this ability only if you control a Plains.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | IsPresent$ Island.YouCtrl | SpellDescription$ Add {W}. Activate this ability only if you control an Island.
+A:AB$ Mana | Cost$ T | Produced$ U | IsPresent$ Plains.YouCtrl | SpellDescription$ Add {U}. Activate this ability only if you control a Plains.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nimbus_maze.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {W} to your mana pool. Activate this ability only if you control an Island.\n{T}: Add {U} to your mana pool. Activate this ability only if you control a Plains.
+Oracle:{T}: Add {C}.\n{T}: Add {W}. Activate this ability only if you control an Island.\n{T}: Add {U}. Activate this ability only if you control a Plains.
diff --git a/forge-gui/res/cardsfolder/n/nirkana_revenant.txt b/forge-gui/res/cardsfolder/n/nirkana_revenant.txt
index cbe29079fa2..25d69b82369 100644
--- a/forge-gui/res/cardsfolder/n/nirkana_revenant.txt
+++ b/forge-gui/res/cardsfolder/n/nirkana_revenant.txt
@@ -3,7 +3,7 @@ ManaCost:4 B B
 Types:Creature Vampire Shade
 PT:4/4
 A:AB$ Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
-T:Mode$ TapsForMana | ValidCard$ Swamp.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a Swamp for mana, add {B} to your mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Swamp.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a Swamp for mana, add an additional {B}.
 SVar:TrigMana:DB$Mana | Produced$ B | Amount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nirkana_revenant.jpg
-Oracle:Whenever you tap a Swamp for mana, add {B} to your mana pool (in addition to the mana the land produces).\n{B}: Nirkana Revenant gets +1/+1 until end of turn.
+Oracle:Whenever you tap a Swamp for mana, add an additional {B}.\n{B}: Nirkana Revenant gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/n/nivix_aerie_of_the_firemind.txt b/forge-gui/res/cardsfolder/n/nivix_aerie_of_the_firemind.txt
index 4a1f56962ca..80877a61c96 100644
--- a/forge-gui/res/cardsfolder/n/nivix_aerie_of_the_firemind.txt
+++ b/forge-gui/res/cardsfolder/n/nivix_aerie_of_the_firemind.txt
@@ -1,11 +1,11 @@
 Name:Nivix, Aerie of the Firemind
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mill | Cost$ T 2 U R | Defined$ You | NumCards$ 1 | Destination$ Exile | RememberMilled$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of your library. Until your next turn, you may cast that card if it's an instant or sorcery.
 SVar:DBEffect:DB$Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile | Duration$ UntilYourNextTurn
 SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Instant.IsRemembered,Sorcery.IsRemembered | AffectedZone$ Exile | Description$ You may play remembered card.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nivix_aerie_of_the_firemind.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}{U}{R}, {T}: Exile the top card of your library. Until your next turn, you may cast that card if it's an instant or sorcery.
+Oracle:{T}: Add {C}.\n{2}{U}{R}, {T}: Exile the top card of your library. Until your next turn, you may cast that card if it's an instant or sorcery.
diff --git a/forge-gui/res/cardsfolder/n/noble_hierarch.txt b/forge-gui/res/cardsfolder/n/noble_hierarch.txt
index 7154ad4a770..7518919410f 100644
--- a/forge-gui/res/cardsfolder/n/noble_hierarch.txt
+++ b/forge-gui/res/cardsfolder/n/noble_hierarch.txt
@@ -2,9 +2,9 @@ Name:Noble Hierarch
 ManaCost:G
 Types:Creature Human Druid
 PT:0/1
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 K:Exalted
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_hierarch.jpg
-Oracle:Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)\n{T}: Add {G}, {W}, or {U} to your mana pool.
+Oracle:Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)\n{T}: Add {G}, {W}, or {U}.
diff --git a/forge-gui/res/cardsfolder/n/nomad_outpost.txt b/forge-gui/res/cardsfolder/n/nomad_outpost.txt
index d485a9aec66..98a0504c2c4 100644
--- a/forge-gui/res/cardsfolder/n/nomad_outpost.txt
+++ b/forge-gui/res/cardsfolder/n/nomad_outpost.txt
@@ -2,8 +2,8 @@ Name:Nomad Outpost
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nomad_outpost.jpg
-Oracle:Nomad Outpost enters the battlefield tapped.\n{T}: Add {R}, {W}, or {B} to your mana pool.
+Oracle:Nomad Outpost enters the battlefield tapped.\n{T}: Add {R}, {W}, or {B}.
diff --git a/forge-gui/res/cardsfolder/n/nomad_stadium.txt b/forge-gui/res/cardsfolder/n/nomad_stadium.txt
index 1b8bf70c3da..b84b6300973 100644
--- a/forge-gui/res/cardsfolder/n/nomad_stadium.txt
+++ b/forge-gui/res/cardsfolder/n/nomad_stadium.txt
@@ -1,9 +1,9 @@
 Name:Nomad Stadium
 ManaCost:no cost
 Types:Land
-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$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
 A:AB$ GainLife | Cost$ W T Sac<1/CARDNAME> | LifeAmount$ 4 | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ You gain 4 life. Activate this ability only if seven or more cards are in your graveyard.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nomad_stadium.jpg
-Oracle:{T}: Add {W} to your mana pool. Nomad Stadium deals 1 damage to you.\nThreshold — {W}, {T}, Sacrifice Nomad Stadium: You gain 4 life. Activate this ability only if seven or more cards are in your graveyard.
+Oracle:{T}: Add {W}. Nomad Stadium deals 1 damage to you.\nThreshold — {W}, {T}, Sacrifice Nomad Stadium: You gain 4 life. Activate this ability only if seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/n/nomadic_elf.txt b/forge-gui/res/cardsfolder/n/nomadic_elf.txt
index 72726981521..bad2b1c240b 100644
--- a/forge-gui/res/cardsfolder/n/nomadic_elf.txt
+++ b/forge-gui/res/cardsfolder/n/nomadic_elf.txt
@@ -2,7 +2,7 @@ Name:Nomadic Elf
 ManaCost:1 G
 Types:Creature Elf Nomad
 PT:2/2
-A:AB$ Mana | Cost$ 1 G | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ 1 G | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nomadic_elf.jpg
-Oracle:{1}{G}: Add one mana of any color to your mana pool.
+Oracle:{1}{G}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/n/novijen_heart_of_progress.txt b/forge-gui/res/cardsfolder/n/novijen_heart_of_progress.txt
index 48cd4a7cf97..bca5977fb60 100644
--- a/forge-gui/res/cardsfolder/n/novijen_heart_of_progress.txt
+++ b/forge-gui/res/cardsfolder/n/novijen_heart_of_progress.txt
@@ -1,7 +1,7 @@
 Name:Novijen, Heart of Progress
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounterAll | Cost$ G U T | CounterType$ P1P1 | CounterNum$ 1 | ValidCards$ Creature.enteredBattlefieldThisTurn | SpellDescription$ Put a +1/+1 counter on each creature that entered the battlefield this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/novijen_heart_of_progress.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{G}{U}, {T}: Put a +1/+1 counter on each creature that entered the battlefield this turn.
+Oracle:{T}: Add {C}.\n{G}{U}, {T}: Put a +1/+1 counter on each creature that entered the battlefield this turn.
diff --git a/forge-gui/res/cardsfolder/n/nykthos_shrine_to_nyx.txt b/forge-gui/res/cardsfolder/n/nykthos_shrine_to_nyx.txt
index 53c17a39a18..4879b4e86e3 100644
--- a/forge-gui/res/cardsfolder/n/nykthos_shrine_to_nyx.txt
+++ b/forge-gui/res/cardsfolder/n/nykthos_shrine_to_nyx.txt
@@ -1,9 +1,9 @@
 Name:Nykthos, Shrine to Nyx
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ ChooseColor | Cost$ 2 T | SubAbility$ DBMana | AILogic$ MostProminentComputerControls | AINoRecursiveCheck$ True | SpellDescription$ Choose a color. Add to your mana pool an amount of mana of that color equal to your devotion to that color. (Your devotion to a color is the number of mana symbols of that color in the mana costs of permanents you control.)
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ ChooseColor | Cost$ 2 T | SubAbility$ DBMana | AILogic$ MostProminentComputerControls | AINoRecursiveCheck$ True | SpellDescription$ Choose a color. Add an amount of mana of that color equal to your devotion to that color. (Your devotion to a color is the number of mana symbols of that color in the mana costs of permanents you control.)
 SVar:DBMana:DB$ Mana | Produced$ Chosen | Amount$ X | References$ X
 SVar:X:Count$Devotion.Chosen
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nykthos_shrine_to_nyx.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: Choose a color. Add to your mana pool an amount of mana of that color equal to your devotion to that color. (Your devotion to a color is the number of mana symbols of that color in the mana costs of permanents you control.)
+Oracle:{T}: Add {C}.\n{2}, {T}: Choose a color. Add an amount of mana of that color equal to your devotion to that color. (Your devotion to a color is the number of mana symbols of that color in the mana costs of permanents you control.)
diff --git a/forge-gui/res/cardsfolder/o/oasis_ritualist.txt b/forge-gui/res/cardsfolder/o/oasis_ritualist.txt
index 9d4916a5153..a281f931acb 100644
--- a/forge-gui/res/cardsfolder/o/oasis_ritualist.txt
+++ b/forge-gui/res/cardsfolder/o/oasis_ritualist.txt
@@ -2,7 +2,7 @@ Name:Oasis Ritualist
 ManaCost:3 G
 Types:Creature Naga Druid
 PT:2/4
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
-A:AB$ Mana | Cost$ T Exert<1/CARDNAME> | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool. (An exerted creature won't untap during your next untap step.)
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+A:AB$ Mana | Cost$ T Exert<1/CARDNAME> | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color. (An exerted creature won't untap during your next untap step.)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oasis_ritualist.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.\n{T}, Exert Oasis Ritualist: Add two mana of any one color to your mana pool. (An exerted creature won't untap during your next untap step.)
+Oracle:{T}: Add one mana of any color.\n{T}, Exert Oasis Ritualist: Add two mana of any one color. (An exerted creature won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/o/obelisk_of_bant.txt b/forge-gui/res/cardsfolder/o/obelisk_of_bant.txt
index 8deb4610f79..91c9f6c07cf 100644
--- a/forge-gui/res/cardsfolder/o/obelisk_of_bant.txt
+++ b/forge-gui/res/cardsfolder/o/obelisk_of_bant.txt
@@ -1,8 +1,8 @@
 Name:Obelisk of Bant
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_bant.jpg
-Oracle:{T}: Add {G}, {W}, or {U} to your mana pool.
+Oracle:{T}: Add {G}, {W}, or {U}.
diff --git a/forge-gui/res/cardsfolder/o/obelisk_of_esper.txt b/forge-gui/res/cardsfolder/o/obelisk_of_esper.txt
index f105726ca89..449ffd6c20b 100644
--- a/forge-gui/res/cardsfolder/o/obelisk_of_esper.txt
+++ b/forge-gui/res/cardsfolder/o/obelisk_of_esper.txt
@@ -1,8 +1,8 @@
 Name:Obelisk of Esper
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_esper.jpg
-Oracle:{T}: Add {W}, {U}, or {B} to your mana pool.
+Oracle:{T}: Add {W}, {U}, or {B}.
diff --git a/forge-gui/res/cardsfolder/o/obelisk_of_grixis.txt b/forge-gui/res/cardsfolder/o/obelisk_of_grixis.txt
index c2382314e27..a43a9f8017f 100644
--- a/forge-gui/res/cardsfolder/o/obelisk_of_grixis.txt
+++ b/forge-gui/res/cardsfolder/o/obelisk_of_grixis.txt
@@ -1,8 +1,8 @@
 Name:Obelisk of Grixis
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_grixis.jpg
-Oracle:{T}: Add {U}, {B}, or {R} to your mana pool.
+Oracle:{T}: Add {U}, {B}, or {R}.
diff --git a/forge-gui/res/cardsfolder/o/obelisk_of_jund.txt b/forge-gui/res/cardsfolder/o/obelisk_of_jund.txt
index b671d8e88f0..6be51e91aea 100644
--- a/forge-gui/res/cardsfolder/o/obelisk_of_jund.txt
+++ b/forge-gui/res/cardsfolder/o/obelisk_of_jund.txt
@@ -1,8 +1,8 @@
 Name:Obelisk of Jund
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_jund.jpg
-Oracle:{T}: Add {B}, {R}, or {G} to your mana pool.
+Oracle:{T}: Add {B}, {R}, or {G}.
diff --git a/forge-gui/res/cardsfolder/o/obelisk_of_naya.txt b/forge-gui/res/cardsfolder/o/obelisk_of_naya.txt
index c9a6f9b5f4e..681abfb0815 100644
--- a/forge-gui/res/cardsfolder/o/obelisk_of_naya.txt
+++ b/forge-gui/res/cardsfolder/o/obelisk_of_naya.txt
@@ -1,8 +1,8 @@
 Name:Obelisk of Naya
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_naya.jpg
-Oracle:{T}: Add {R}, {G}, or {W} to your mana pool.
+Oracle:{T}: Add {R}, {G}, or {W}.
diff --git a/forge-gui/res/cardsfolder/o/oboro_palace_in_the_clouds.txt b/forge-gui/res/cardsfolder/o/oboro_palace_in_the_clouds.txt
index cbae676ec8f..14398005b0e 100644
--- a/forge-gui/res/cardsfolder/o/oboro_palace_in_the_clouds.txt
+++ b/forge-gui/res/cardsfolder/o/oboro_palace_in_the_clouds.txt
@@ -1,7 +1,7 @@
 Name:Oboro, Palace in the Clouds
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ ChangeZone | Cost$ 1 | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oboro_palace_in_the_clouds.jpg
-Oracle:{T}: Add {U} to your mana pool.\n{1}: Return Oboro, Palace in the Clouds to its owner's hand.
+Oracle:{T}: Add {U}.\n{1}: Return Oboro, Palace in the Clouds to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/o/ojutai_monument.txt b/forge-gui/res/cardsfolder/o/ojutai_monument.txt
index 1eacab1d098..a073897e425 100644
--- a/forge-gui/res/cardsfolder/o/ojutai_monument.txt
+++ b/forge-gui/res/cardsfolder/o/ojutai_monument.txt
@@ -1,10 +1,10 @@
 Name:Ojutai Monument
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Animate | Cost$ 4 W U | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | Colors$ White,Blue | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 white and blue Dragon artifact creature with flying until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$White|Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ojutai_monument.jpg
-Oracle:{T}: Add {W} or {U} to your mana pool.\n{4}{W}{U}: Ojutai Monument becomes a 4/4 white and blue Dragon artifact creature with flying until end of turn.
+Oracle:{T}: Add {W} or {U}.\n{4}{W}{U}: Ojutai Monument becomes a 4/4 white and blue Dragon artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/o/okina_temple_to_the_grandfathers.txt b/forge-gui/res/cardsfolder/o/okina_temple_to_the_grandfathers.txt
index 55f70c94b7d..bb0e365c7a1 100644
--- a/forge-gui/res/cardsfolder/o/okina_temple_to_the_grandfathers.txt
+++ b/forge-gui/res/cardsfolder/o/okina_temple_to_the_grandfathers.txt
@@ -1,7 +1,7 @@
 Name:Okina, Temple to the Grandfathers
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Pump | Cost$ G T | ValidTgts$ Creature.Legendary | TgtPrompt$ Select target legendary creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target legendary creature gets +1/+1 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/okina_temple_to_the_grandfathers.jpg
-Oracle:{T}: Add {G} to your mana pool.\n{G}, {T}: Target legendary creature gets +1/+1 until end of turn.
+Oracle:{T}: Add {G}.\n{G}, {T}: Target legendary creature gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/o/omnath_locus_of_mana.txt b/forge-gui/res/cardsfolder/o/omnath_locus_of_mana.txt
index 4e2466b4855..9f82b7ddd2c 100644
--- a/forge-gui/res/cardsfolder/o/omnath_locus_of_mana.txt
+++ b/forge-gui/res/cardsfolder/o/omnath_locus_of_mana.txt
@@ -2,9 +2,9 @@ Name:Omnath, Locus of Mana
 ManaCost:2 G
 Types:Legendary Creature Elemental
 PT:1/1
-S:Mode$ Continuous | Affected$ You | AddKeyword$ Green mana doesn't empty from your mana pool as steps and phases end. | Description$ Green mana doesn't empty from your mana pool as steps and phases end.
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | References$ X | Description$ CARDNAME gets +1/+1 for each green mana in your mana pool.
+S:Mode$ Continuous | Affected$ You | AddKeyword$ Green mana doesn't empty from your mana pool as steps and phases end. | Description$ You don't lose green mana as steps and phases end..
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | References$ X | Description$ CARDNAME gets +1/+1 for each unspent green mana you have.
 SVar:X:Count$ManaPool:green
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omnath_locus_of_mana.jpg
-Oracle:Green mana doesn't empty from your mana pool as steps and phases end.\nOmnath, Locus of Mana gets +1/+1 for each green mana in your mana pool.
+Oracle:You don't lose green mana as steps and phases end.\nOmnath, Locus of Mana gets +1/+1 for each unspent green mana you have.
diff --git a/forge-gui/res/cardsfolder/o/opal_palace.txt b/forge-gui/res/cardsfolder/o/opal_palace.txt
index b898c60a791..3be97979600 100644
--- a/forge-gui/res/cardsfolder/o/opal_palace.txt
+++ b/forge-gui/res/cardsfolder/o/opal_palace.txt
@@ -1,10 +1,10 @@
 Name:Opal Palace
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ Combo ColorIdentity | AddsCounters$ Card.IsCommander_P1P1_ManaAddsCounterNum | SpellDescription$ Add to your mana pool one mana of any color in your commander's color identity. If you spend this mana to cast your commander, it enters the battlefield with a number of additional +1/+1 counters on it equal to the number of times it's been cast from the command zone this game.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ Combo ColorIdentity | AddsCounters$ Card.IsCommander_P1P1_ManaAddsCounterNum | SpellDescription$ Add one mana of any color in your commander's color identity. If you spend this mana to cast your commander, it enters the battlefield with a number of additional +1/+1 counters on it equal to the number of times it's been cast from the command zone this game.
 SVar:ManaAddsCounterNum:Count$CommanderCastFromCommandZone
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_palace.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add to your mana pool one mana of any color in your commander's color identity. If you spend this mana to cast your commander, it enters the battlefield with a number of additional +1/+1 counters on it equal to the number of times it's been cast from the command zone this game.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add one mana of any color in your commander's color identity. If you spend this mana to cast your commander, it enters the battlefield with a number of additional +1/+1 counters on it equal to the number of times it's been cast from the command zone this game.
diff --git a/forge-gui/res/cardsfolder/o/opaline_unicorn.txt b/forge-gui/res/cardsfolder/o/opaline_unicorn.txt
index 04f3a351006..6e0c4e96410 100644
--- a/forge-gui/res/cardsfolder/o/opaline_unicorn.txt
+++ b/forge-gui/res/cardsfolder/o/opaline_unicorn.txt
@@ -2,6 +2,6 @@ Name:Opaline Unicorn
 ManaCost:3
 Types:Artifact Creature Unicorn
 PT:1/2
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opaline_unicorn.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/o/opulent_palace.txt b/forge-gui/res/cardsfolder/o/opulent_palace.txt
index 64288858e28..db734db5b7a 100644
--- a/forge-gui/res/cardsfolder/o/opulent_palace.txt
+++ b/forge-gui/res/cardsfolder/o/opulent_palace.txt
@@ -2,8 +2,8 @@ Name:Opulent Palace
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opulent_palace.jpg
-Oracle:Opulent Palace enters the battlefield tapped.\n{T}: Add {B}, {G}, or {U} to your mana pool.
+Oracle:Opulent Palace enters the battlefield tapped.\n{T}: Add {B}, {G}, or {U}.
diff --git a/forge-gui/res/cardsfolder/o/orazca_relic.txt b/forge-gui/res/cardsfolder/o/orazca_relic.txt
index 9574eb191ad..6a7e79d31ea 100644
--- a/forge-gui/res/cardsfolder/o/orazca_relic.txt
+++ b/forge-gui/res/cardsfolder/o/orazca_relic.txt
@@ -2,8 +2,8 @@ Name:Orazca Relic
 ManaCost:3
 Types:Artifact
 K:Ascend
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ GainLife | Cost$ T Sac<1/CARDNAME> | Defined$ You | LifeAmount$ 3 | Activation$ Blessing | SubAbility$ DBDraw | SpellDescription$ You gain 3 life and draw a card. Activate this ability only if you have the city's blessing.
 SVar:DBDraw:DB$ Draw | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orazca_relic.jpg
-Oracle:Ascend (If you control ten or more permanents, you gain the city's blessing for the rest of the game.)\n{T}: Add {C} to your mana pool.\n{T}, Sacrifice Orazca Relic: You gain 3 life and draw a card. Activate this ability only if you have the city's blessing.
+Oracle:Ascend (If you control ten or more permanents, you gain the city's blessing for the rest of the game.)\n{T}: Add {C}.\n{T}, Sacrifice Orazca Relic: You gain 3 life and draw a card. Activate this ability only if you have the city's blessing.
diff --git a/forge-gui/res/cardsfolder/o/orcish_lumberjack.txt b/forge-gui/res/cardsfolder/o/orcish_lumberjack.txt
index b2b89af4810..143191e532c 100644
--- a/forge-gui/res/cardsfolder/o/orcish_lumberjack.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_lumberjack.txt
@@ -2,7 +2,7 @@ Name:Orcish Lumberjack
 ManaCost:R
 Types:Creature Orc
 PT:1/1
-A:AB$ Mana | Cost$ T Sac<1/Forest> | Produced$ Combo R G | Amount$ 3 | SpellDescription$ Add three mana in any combination of {R} and/or {G} to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/Forest> | Produced$ Combo R G | Amount$ 3 | SpellDescription$ Add three mana in any combination of {R} and/or {G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_lumberjack.jpg
-Oracle:{T}, Sacrifice a Forest: Add three mana in any combination of {R} and/or {G} to your mana pool.
+Oracle:{T}, Sacrifice a Forest: Add three mana in any combination of {R} and/or {G}.
diff --git a/forge-gui/res/cardsfolder/o/orcish_squatters_avatar.txt b/forge-gui/res/cardsfolder/o/orcish_squatters_avatar.txt
index 86fef9dc028..88b31cd5a14 100644
--- a/forge-gui/res/cardsfolder/o/orcish_squatters_avatar.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_squatters_avatar.txt
@@ -2,10 +2,10 @@ Name:Orcish Squatters Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:-1/-1
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigGetMana | TriggerDescription$ At the beginning of your precombat main phase, add an amount of {C} to your mana pool equal to the number of lands target opponent controls.
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigGetMana | TriggerDescription$ At the beginning of your precombat main phase, add an amount of {C} equal to the number of lands target opponent controls.
 SVar:TrigGetMana:DB$ Pump | ValidTgts$ Player | RememberObjects$ Targeted | SubAbility$ DBMana
 SVar:DBMana:DB$ Mana | Produced$ C | Amount$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Land.RememberedPlayerCtrl
 SVar:Picture:https://downloads.cardforge.org/images/cards/VAN/Orcish Squatters Avatar.full.jpg
-Oracle:Hand -1, life -1\nAt the beginning of your precombat main phase, add an amount of {C} to your mana pool equal to the number of lands target opponent controls.
+Oracle:Hand -1, life -1\nAt the beginning of your precombat main phase, add an amount of {C} equal to the number of lands target opponent controls.
diff --git a/forge-gui/res/cardsfolder/o/orochi_leafcaller.txt b/forge-gui/res/cardsfolder/o/orochi_leafcaller.txt
index a263c894c76..a84dd316615 100644
--- a/forge-gui/res/cardsfolder/o/orochi_leafcaller.txt
+++ b/forge-gui/res/cardsfolder/o/orochi_leafcaller.txt
@@ -2,7 +2,7 @@ Name:Orochi Leafcaller
 ManaCost:G
 Types:Creature Snake Shaman
 PT:1/1
-A:AB$ Mana | Cost$ G | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ G | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orochi_leafcaller.jpg
-Oracle:{G}: Add one mana of any color to your mana pool.
+Oracle:{G}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/o/orochi_sustainer.txt b/forge-gui/res/cardsfolder/o/orochi_sustainer.txt
index aa2ca694526..0fbffa623ed 100644
--- a/forge-gui/res/cardsfolder/o/orochi_sustainer.txt
+++ b/forge-gui/res/cardsfolder/o/orochi_sustainer.txt
@@ -2,6 +2,6 @@ Name:Orochi Sustainer
 ManaCost:1 G
 Types:Creature Snake Shaman
 PT:1/2
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card75403.jpg
-Oracle:{T}: Add {G} to your mana pool.
+Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_basilica.txt b/forge-gui/res/cardsfolder/o/orzhov_basilica.txt
index c35180d18bf..cfc11a81eab 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_basilica.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_basilica.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
-A:AB$ Mana | Cost$ T | Produced$ W B | SpellDescription$ Add {W}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W B | SpellDescription$ Add {W}{B}.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_basilica.jpg
-Oracle:Orzhov Basilica enters the battlefield tapped.\nWhen Orzhov Basilica enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {W}{B} to your mana pool.
+Oracle:Orzhov Basilica enters the battlefield tapped.\nWhen Orzhov Basilica enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {W}{B}.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_cluestone.txt b/forge-gui/res/cardsfolder/o/orzhov_cluestone.txt
index 590183b7ecf..8923cad0acf 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_cluestone.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_cluestone.txt
@@ -1,10 +1,10 @@
 Name:Orzhov Cluestone
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Draw | Cost$ W B T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$White|Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_cluestone.jpg
-Oracle:{T}: Add {W} or {B} to your mana pool.\n{W}{B}, {T}, Sacrifice Orzhov Cluestone: Draw a card.
+Oracle:{T}: Add {W} or {B}.\n{W}{B}, {T}, Sacrifice Orzhov Cluestone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_guildgate.txt b/forge-gui/res/cardsfolder/o/orzhov_guildgate.txt
index 9ee4bf10aa3..b9afb9fc0b2 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_guildgate.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_guildgate.txt
@@ -2,7 +2,7 @@ Name:Orzhov Guildgate
 ManaCost:no cost
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_guildgate.jpg
-Oracle:Orzhov Guildgate enters the battlefield tapped.\n{T}: Add {W} or {B} to your mana pool.
+Oracle:Orzhov Guildgate enters the battlefield tapped.\n{T}: Add {W} or {B}.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_keyrune.txt b/forge-gui/res/cardsfolder/o/orzhov_keyrune.txt
index 5b41e491be2..456c4e3cd6a 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_keyrune.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_keyrune.txt
@@ -1,10 +1,10 @@
 Name:Orzhov Keyrune
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Animate | Cost$ W B | Defined$ Self | Power$ 1 | Toughness$ 4 | Types$ Artifact,Creature,Thrull | Colors$ White,Black | Keywords$ Lifelink | SpellDescription$ CARDNAME becomes a 1/4 white and black Thrull artifact creature with lifelink until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$White|Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_keyrune.jpg
-Oracle:{T}: Add {W} or {B} to your mana pool.\n{W}{B}: Orzhov Keyrune becomes a 1/4 white and black Thrull artifact creature with lifelink until end of turn.
+Oracle:{T}: Add {W} or {B}.\n{W}{B}: Orzhov Keyrune becomes a 1/4 white and black Thrull artifact creature with lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_signet.txt b/forge-gui/res/cardsfolder/o/orzhov_signet.txt
index 08f671abff3..a69ce0a40de 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_signet.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_signet.txt
@@ -1,7 +1,7 @@
 Name:Orzhov Signet
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ W B | SpellDescription$ Add {W}{B} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ W B | SpellDescription$ Add {W}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_signet.jpg
-Oracle:{1}, {T}: Add {W}{B} to your mana pool.
+Oracle:{1}, {T}: Add {W}{B}.
diff --git a/forge-gui/res/cardsfolder/o/orzhova_the_church_of_deals.txt b/forge-gui/res/cardsfolder/o/orzhova_the_church_of_deals.txt
index 2a704822753..d5729bdac67 100644
--- a/forge-gui/res/cardsfolder/o/orzhova_the_church_of_deals.txt
+++ b/forge-gui/res/cardsfolder/o/orzhova_the_church_of_deals.txt
@@ -1,8 +1,8 @@
 Name:Orzhova, the Church of Deals
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ LoseLife | Cost$ 3 W B T | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 1 life and you gain 1 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhova_the_church_of_deals.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{3}{W}{B}, {T}: Target player loses 1 life and you gain 1 life.
+Oracle:{T}: Add {C}.\n{3}{W}{B}, {T}: Target player loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/o/overabundance.txt b/forge-gui/res/cardsfolder/o/overabundance.txt
index c7e1c140b14..9f39b769e34 100644
--- a/forge-gui/res/cardsfolder/o/overabundance.txt
+++ b/forge-gui/res/cardsfolder/o/overabundance.txt
@@ -1,9 +1,9 @@
 Name:Overabundance
 ManaCost:1 R G
 Types:Enchantment
-T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigDmg | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced, and CARDNAME deals 1 damage to him or her.
+T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigDmg | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana of any type that land produced, and CARDNAME deals 1 damage to him or her.
 SVar:TrigDmg:DB$ DealDamage | Defined$ TriggeredCardController | NumDmg$ 1 | SubAbility$ DBMana
 SVar:DBMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredCardController
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overabundance.jpg
-Oracle:Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced, and Overabundance deals 1 damage to him or her.
+Oracle:Whenever a player taps a land for mana, that player adds one mana of any type that land produced, and Overabundance deals 1 damage to him or her.
diff --git a/forge-gui/res/cardsfolder/o/overeager_apprentice.txt b/forge-gui/res/cardsfolder/o/overeager_apprentice.txt
index c0351cdb8c2..b5425fc3d09 100644
--- a/forge-gui/res/cardsfolder/o/overeager_apprentice.txt
+++ b/forge-gui/res/cardsfolder/o/overeager_apprentice.txt
@@ -2,7 +2,7 @@ Name:Overeager Apprentice
 ManaCost:2 B
 Types:Creature Human Minion
 PT:1/2
-A:AB$ Mana | Cost$ Discard<1/Card> Sac<1/CARDNAME> | Produced$ B | Amount$ 3 | SpellDescription$ Add {B}{B}{B} to your mana pool.
+A:AB$ Mana | Cost$ Discard<1/Card> Sac<1/CARDNAME> | Produced$ B | Amount$ 3 | SpellDescription$ Add {B}{B}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overeager_apprentice.jpg
-Oracle:Discard a card, Sacrifice Overeager Apprentice: Add {B}{B}{B} to your mana pool.
+Oracle:Discard a card, Sacrifice Overeager Apprentice: Add {B}{B}{B}.
diff --git a/forge-gui/res/cardsfolder/o/overgrown_battlement.txt b/forge-gui/res/cardsfolder/o/overgrown_battlement.txt
index 4356be89e8f..6b4892dba9b 100644
--- a/forge-gui/res/cardsfolder/o/overgrown_battlement.txt
+++ b/forge-gui/res/cardsfolder/o/overgrown_battlement.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Wall
 PT:0/4
 K:Defender
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} to your mana pool for each Creature with defender you control.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} for each Creature with defender you control.
 SVar:X:Count$Valid Creature.withDefender+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overgrown_battlement.jpg
-Oracle:Defender\n{T}: Add {G} to your mana pool for each creature with defender you control.
+Oracle:Defender\n{T}: Add {G} for each creature with defender you control.
diff --git a/forge-gui/res/cardsfolder/o/overgrown_tomb.txt b/forge-gui/res/cardsfolder/o/overgrown_tomb.txt
index 89f64aa4e5b..e8516dc238c 100644
--- a/forge-gui/res/cardsfolder/o/overgrown_tomb.txt
+++ b/forge-gui/res/cardsfolder/o/overgrown_tomb.txt
@@ -4,4 +4,4 @@ Types:Land Swamp Forest
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | UnlessAI$ Shockland | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://resources.wizards.com/magic/cards/rav/en-us/card89072.jpg
-Oracle:({T}: Add {B} or {G} to your mana pool.)\nAs Overgrown Tomb enters the battlefield, you may pay 2 life. If you don't, Overgrown Tomb enters the battlefield tapped.
+Oracle:({T}: Add {B} or {G}.)\nAs Overgrown Tomb enters the battlefield, you may pay 2 life. If you don't, Overgrown Tomb enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/o/overgrowth.txt b/forge-gui/res/cardsfolder/o/overgrowth.txt
index 233a1c30e03..373b274946a 100644
--- a/forge-gui/res/cardsfolder/o/overgrowth.txt
+++ b/forge-gui/res/cardsfolder/o/overgrowth.txt
@@ -3,9 +3,9 @@ ManaCost:2 G
 Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds {G}{G} to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds an additional {G}{G}.
 SVar:TrigMana:DB$ Mana | Produced$ G | Amount$ 2 | Defined$ TriggeredCardController
 #TODO: Mana prediction for lands that produce additional mana (Overgrowth, Mana Flare, etc.)
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overgrowth.jpg
-Oracle:Enchant land (Target a land as you cast this. This card enters the battlefield attached to that land.)\nWhenever enchanted land is tapped for mana, its controller adds {G}{G} to his or her mana pool (in addition to the mana the land produces).
+Oracle:Enchant land (Target a land as you cast this. This card enters the battlefield attached to that land.)\nWhenever enchanted land is tapped for mana, its controller adds an additional {G}{G}.
diff --git a/forge-gui/res/cardsfolder/o/overlaid_terrain.txt b/forge-gui/res/cardsfolder/o/overlaid_terrain.txt
index b3dd8827d0e..0410ab154d1 100644
--- a/forge-gui/res/cardsfolder/o/overlaid_terrain.txt
+++ b/forge-gui/res/cardsfolder/o/overlaid_terrain.txt
@@ -3,9 +3,9 @@ ManaCost:2 G G
 Types:Enchantment
 K:ETBReplacement:Other:TrigSac
 SVar:TrigSac:DB$ SacrificeAll | ValidCards$ Land.YouCtrl | SpellDescription$ As CARDNAME enters the battlefield, sacrifice all lands you control.
-S:Mode$ Continuous | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add two mana of any one color to your mana pool."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
+S:Mode$ Continuous | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add two mana of any one color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overlaid_terrain.jpg
-Oracle:As Overlaid Terrain enters the battlefield, sacrifice all lands you control.\nLands you control have "{T}: Add two mana of any one color to your mana pool."
+Oracle:As Overlaid Terrain enters the battlefield, sacrifice all lands you control.\nLands you control have "{T}: Add two mana of any one color."
diff --git a/forge-gui/res/cardsfolder/p/painted_bluffs.txt b/forge-gui/res/cardsfolder/p/painted_bluffs.txt
index ab74eaba963..9620600f543 100644
--- a/forge-gui/res/cardsfolder/p/painted_bluffs.txt
+++ b/forge-gui/res/cardsfolder/p/painted_bluffs.txt
@@ -1,8 +1,8 @@
 Name:Painted Bluffs
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/painted_bluffs.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add one mana of any color to your mana pool. 
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{1}, {T}: Add one mana of any color.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/palladium_myr.txt b/forge-gui/res/cardsfolder/p/palladium_myr.txt
index f478487634e..5bed9592b2c 100644
--- a/forge-gui/res/cardsfolder/p/palladium_myr.txt
+++ b/forge-gui/res/cardsfolder/p/palladium_myr.txt
@@ -2,6 +2,6 @@ Name:Palladium Myr
 ManaCost:3
 Types:Artifact Creature Myr
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/palladium_myr.jpg
-Oracle:{T}: Add {C}{C} to your mana pool.
+Oracle:{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/p/paradise_mantle.txt b/forge-gui/res/cardsfolder/p/paradise_mantle.txt
index 3643bc8de1b..9b25db8b87c 100644
--- a/forge-gui/res/cardsfolder/p/paradise_mantle.txt
+++ b/forge-gui/res/cardsfolder/p/paradise_mantle.txt
@@ -2,8 +2,8 @@ Name:Paradise Mantle
 ManaCost:0
 Types:Artifact Equipment
 K:Equip 1
-S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ AnyMana | Description$ Equipped creature has "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ AnyMana | Description$ Equipped creature has "{T}: Add one mana of any color."
+SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:NonStackingAttachEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/paradise_mantle.jpg
-Oracle:Equipped creature has "{T}: Add one mana of any color to your mana pool."\nEquip {1}
+Oracle:Equipped creature has "{T}: Add one mana of any color."\nEquip {1}
diff --git a/forge-gui/res/cardsfolder/p/paradise_plume.txt b/forge-gui/res/cardsfolder/p/paradise_plume.txt
index c2ce721ba20..9445db675be 100644
--- a/forge-gui/res/cardsfolder/p/paradise_plume.txt
+++ b/forge-gui/res/cardsfolder/p/paradise_plume.txt
@@ -5,6 +5,6 @@ K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentInComputerDeck
 T:Mode$ SpellCast | ValidCard$ Card.ChosenColor | OptionalDecider$ You | Execute$ TrigGainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts a spell of the chosen color, you may gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1
-A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/paradise_plume.jpg
-Oracle:As Paradise Plume enters the battlefield, choose a color.\nWhenever a player casts a spell of the chosen color, you may gain 1 life.\n{T}: Add one mana of the chosen color to your mana pool.
+Oracle:As Paradise Plume enters the battlefield, choose a color.\nWhenever a player casts a spell of the chosen color, you may gain 1 life.\n{T}: Add one mana of the chosen color.
diff --git a/forge-gui/res/cardsfolder/p/path_of_ancestry.txt b/forge-gui/res/cardsfolder/p/path_of_ancestry.txt
index 1035b76340f..24b8f32cace 100644
--- a/forge-gui/res/cardsfolder/p/path_of_ancestry.txt
+++ b/forge-gui/res/cardsfolder/p/path_of_ancestry.txt
@@ -2,8 +2,8 @@ Name:Path of Ancestry
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ Combo ColorIdentity | TriggersWhenSpent$ TrigScry | SpellDescription$ Add to your mana pool one mana of any color in your commander's color identity. When that mana is spent to cast a creature spell that shares a creature type with your commander, scry 1.
+A:AB$ Mana | Cost$ T | Produced$ Combo ColorIdentity | TriggersWhenSpent$ TrigScry | SpellDescription$ Add one mana of any color in your commander's color identity. When that mana is spent to cast a creature spell that shares a creature type with your commander, scry 1.
 SVar:TrigScry:Mode$ SpellCast | ValidCard$ Creature.sharesCreatureTypeWith Commander | ValidActivatingPlayer$ You | OneOff$ True | Execute$ DBScry | TriggerDescription$ When mana produced by CARDNAME is spent to cast a creature spell that shares a creature type with your commander, scry 1.
 SVar:DBScry:DB$ Scry | ScryNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/command_tower.jpg
-Oracle:Path of Ancestry enters the battlefield tapped.\n{T}: Add to your mana pool one mana of any color in your commander's color identity. When that mana is spent to cast a creature spell that shares a creature type with your commander, scry 1.
+Oracle:Path of Ancestry enters the battlefield tapped.\n{T}: Add one mana of any color in your commander's color identity. When that mana is spent to cast a creature spell that shares a creature type with your commander, scry 1.
diff --git a/forge-gui/res/cardsfolder/p/path_of_mettle_metzali_tower_of_triumph.txt b/forge-gui/res/cardsfolder/p/path_of_mettle_metzali_tower_of_triumph.txt
index d4a89967fb7..7b2a69f54ab 100644
--- a/forge-gui/res/cardsfolder/p/path_of_mettle_metzali_tower_of_triumph.txt
+++ b/forge-gui/res/cardsfolder/p/path_of_mettle_metzali_tower_of_triumph.txt
@@ -15,9 +15,9 @@ ALTERNATE
 Name:Metzali, Tower of Triumph
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool. 
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 A:AB$ DamageAll | Cost$ 1 R T | ValidPlayers$ Opponent | ValidDescription$ each opponent. | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to each opponent.
 A:AB$ ChooseCard| Cost$ 2 W T | AtRandom$ True | Choices$ Creature.attackedThisTurn | SubAbility$ DBDestroy | SpellDescription$ Choose a creature at random that attacked this turn. Destroy that creature.
 SVar:DBDestroy:DB$Destroy | Defined$ ChosenCard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/metzali_tower_of_triumph.jpg
-Oracle:(Transforms from Path of Mettle.)\n{T}: Add one mana of any color to your mana pool.\n{1}{R}, {T}: Metzali, Tower of Triumph deals 2 damage to each opponent.\n{2}{W}, {T}: Choose a creature at random that attacked this turn. Destroy that creature.
+Oracle:(Transforms from Path of Mettle.)\n{T}: Add one mana of any color.\n{1}{R}, {T}: Metzali, Tower of Triumph deals 2 damage to each opponent.\n{2}{W}, {T}: Choose a creature at random that attacked this turn. Destroy that creature.
diff --git a/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt b/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt
index d00546b6c97..734df301d04 100644
--- a/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt
+++ b/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt
@@ -2,11 +2,11 @@ Name:Pawn of Ulamog
 ManaCost:1 B B
 Types:Creature Vampire Shaman
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+nonToken+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ You | Secondary$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+nonToken+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ You | Secondary$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pawn_of_ulamog.jpg
-Oracle:Whenever Pawn of Ulamog or another nontoken creature you control dies, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Whenever Pawn of Ulamog or another nontoken creature you control dies, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/p/peat_bog.txt b/forge-gui/res/cardsfolder/p/peat_bog.txt
index f59d76dc380..8de73ac0f3e 100644
--- a/forge-gui/res/cardsfolder/p/peat_bog.txt
+++ b/forge-gui/res/cardsfolder/p/peat_bog.txt
@@ -4,9 +4,9 @@ Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two depletion counters on it.
 SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | ETB$ True | CounterType$ DEPLETION | CounterNum$ 2
-A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ B | SubAbility$ DBSac | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool. If there are no depletion counters on CARDNAME, sacrifice it.
+A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ B | SubAbility$ DBSac | Amount$ 2 | SpellDescription$ Add {B}{B}. If there are no depletion counters on CARDNAME, sacrifice it.
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionPresent$ Card.Self+counters_EQ0_DEPLETION
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://wizards.com/global/images/magic/general/peat_bog.jpg
-Oracle:Peat Bog enters the battlefield tapped with two depletion counters on it.\n{T}, Remove a depletion counter from Peat Bog: Add {B}{B} to your mana pool. If there are no depletion counters on Peat Bog, sacrifice it.
+Oracle:Peat Bog enters the battlefield tapped with two depletion counters on it.\n{T}, Remove a depletion counter from Peat Bog: Add {B}{B}. If there are no depletion counters on Peat Bog, sacrifice it.
diff --git a/forge-gui/res/cardsfolder/p/pendelhaven.txt b/forge-gui/res/cardsfolder/p/pendelhaven.txt
index 56dba12ce4d..837124440bc 100644
--- a/forge-gui/res/cardsfolder/p/pendelhaven.txt
+++ b/forge-gui/res/cardsfolder/p/pendelhaven.txt
@@ -1,8 +1,8 @@
 Name:Pendelhaven
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Pump | Cost$ T | NumAtt$ +1 | NumDef$ +2 | ValidTgts$ Creature.powerEQ1+toughnessEQ1 | TgtPrompt$ Select target 1/1 Creature | SpellDescription$ Target 1/1 creature gets +1/+2 until end of turn.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pendelhaven.jpg
-Oracle:{T}: Add {G} to your mana pool.\n{T}: Target 1/1 creature gets +1/+2 until end of turn.
+Oracle:{T}: Add {G}.\n{T}: Target 1/1 creature gets +1/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/p/pentad_prism.txt b/forge-gui/res/cardsfolder/p/pentad_prism.txt
index 95f008daeef..0b0696f8c76 100644
--- a/forge-gui/res/cardsfolder/p/pentad_prism.txt
+++ b/forge-gui/res/cardsfolder/p/pentad_prism.txt
@@ -2,9 +2,9 @@ Name:Pentad Prism
 ManaCost:2
 Types:Artifact
 K:Sunburst
-A:AB$ Mana | Cost$ SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:NeedsToPlayVar:Z GE2
 SVar:Z:Count$UniqueManaColorsProduced.ByUntappedSources
 DeckHints:Ability$Proliferate
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pentad_prism.jpg
-Oracle:Sunburst (This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)\nRemove a charge counter from Pentad Prism: Add one mana of any color to your mana pool.
+Oracle:Sunburst (This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)\nRemove a charge counter from Pentad Prism: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/p/petalmane_baku.txt b/forge-gui/res/cardsfolder/p/petalmane_baku.txt
index a77a0ce0b4c..49b0256a14b 100644
--- a/forge-gui/res/cardsfolder/p/petalmane_baku.txt
+++ b/forge-gui/res/cardsfolder/p/petalmane_baku.txt
@@ -5,9 +5,9 @@ PT:1/2
 T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may put a ki counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ KI | CounterNum$ 1
 #ChosenX SVar created by Cost payment
-A:AB$ Mana | Cost$ 1 SubCounter<X/KI> | Produced$ Any | Amount$ ChosenX | References$ X | AILogic$ ManaRitual | SpellDescription$ Add X mana of any one color to your mana pool.
+A:AB$ Mana | Cost$ 1 SubCounter<X/KI> | Produced$ Any | Amount$ ChosenX | References$ X | AILogic$ ManaRitual | SpellDescription$ Add X mana of any one color.
 SVar:X:XChoice
 SVar:RemRandomDeck:True
 DeckHints:Type$Spirit|Arcane
 SVar:Picture:http://www.wizards.com/global/images/magic/general/petalmane_baku.jpg
-Oracle:Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Petalmane Baku.\n{1}, Remove X ki counters from Petalmane Baku: Add X mana of any one color to your mana pool.
+Oracle:Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Petalmane Baku.\n{1}, Remove X ki counters from Petalmane Baku: Add X mana of any one color.
diff --git a/forge-gui/res/cardsfolder/p/petrified_field.txt b/forge-gui/res/cardsfolder/p/petrified_field.txt
index 29396712946..83e33c484fe 100644
--- a/forge-gui/res/cardsfolder/p/petrified_field.txt
+++ b/forge-gui/res/cardsfolder/p/petrified_field.txt
@@ -1,8 +1,8 @@
 Name:Petrified Field
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target land card in your graveyard | ValidTgts$ Land.YouCtrl | SpellDescription$ Return target land card from your graveyard to your hand.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/petrified_field.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Sacrifice Petrified Field: Return target land card from your graveyard to your hand.
+Oracle:{T}: Add {C}.\n{T}, Sacrifice Petrified Field: Return target land card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_altar.txt b/forge-gui/res/cardsfolder/p/phyrexian_altar.txt
index 0590cfedd1a..4681edea1a3 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_altar.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_altar.txt
@@ -1,7 +1,7 @@
 Name:Phyrexian Altar
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ Sac<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/phyrexian_altar.jpg
-Oracle:Sacrifice a creature: Add one mana of any color to your mana pool.
+Oracle:Sacrifice a creature: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_lens.txt b/forge-gui/res/cardsfolder/p/phyrexian_lens.txt
index 2e819d7a4c7..08cea26b578 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_lens.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_lens.txt
@@ -1,6 +1,6 @@
 Name:Phyrexian Lens
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/phyrexian_lens.jpg
-Oracle:{T}, Pay 1 life: Add one mana of any color to your mana pool.
+Oracle:{T}, Pay 1 life: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_totem.txt b/forge-gui/res/cardsfolder/p/phyrexian_totem.txt
index 12041cd2b13..51cf7827e32 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_totem.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_totem.txt
@@ -1,11 +1,11 @@
 Name:Phyrexian Totem
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SpellDescription$ Add {B}.
 A:AB$ Animate | Cost$ 2 B | Defined$ Self | Power$ 5 | Toughness$ 5 | Types$ Creature,Artifact,Horror | Colors$ Black | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 5/5 black Horror artifact creature with trample until end of turn.
 T:Mode$ DamageDoneOnce | ValidTarget$ Creature.Self | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME is dealt damage, if it's a creature, sacrifice that many permanents.
 SVar:TrigSac:DB$Sacrifice | SacValid$ Permanent | Amount$ X | References$ X
 SVar:X:TriggerCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/phyrexian_totem.jpg
-Oracle:{T}: Add {B} to your mana pool.\n{2}{B}: Phyrexian Totem becomes a 5/5 black Horror artifact creature with trample until end of turn.\nWhenever Phyrexian Totem is dealt damage, if it's a creature, sacrifice that many permanents.
+Oracle:{T}: Add {B}.\n{2}{B}: Phyrexian Totem becomes a 5/5 black Horror artifact creature with trample until end of turn.\nWhenever Phyrexian Totem is dealt damage, if it's a creature, sacrifice that many permanents.
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_tower.txt b/forge-gui/res/cardsfolder/p/phyrexian_tower.txt
index 9869f760338..a65d1def01b 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_tower.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_tower.txt
@@ -1,8 +1,8 @@
 Name:Phyrexian Tower
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/Creature> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T Sac<1/Creature> | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/phyrexian_tower.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Sacrifice a creature: Add {B}{B} to your mana pool.
+Oracle:{T}: Add {C}.\n{T}, Sacrifice a creature: Add {B}{B}.
diff --git a/forge-gui/res/cardsfolder/p/pili_pala.txt b/forge-gui/res/cardsfolder/p/pili_pala.txt
index 2acc6cb32c9..fe9f202f6c0 100644
--- a/forge-gui/res/cardsfolder/p/pili_pala.txt
+++ b/forge-gui/res/cardsfolder/p/pili_pala.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact Creature Scarecrow
 PT:1/1
 K:Flying
-A:AB$ Mana | Cost$ 2 Q | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ 2 Q | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pili_pala.jpg
-Oracle:Flying\n{2}, {Q}: Add one mana of any color to your mana pool. ({Q} is the untap symbol.)
+Oracle:Flying\n{2}, {Q}: Add one mana of any color. ({Q} is the untap symbol.)
diff --git a/forge-gui/res/cardsfolder/p/pillar_of_origins.txt b/forge-gui/res/cardsfolder/p/pillar_of_origins.txt
index 596594f742b..3adeeda3ce7 100644
--- a/forge-gui/res/cardsfolder/p/pillar_of_origins.txt
+++ b/forge-gui/res/cardsfolder/p/pillar_of_origins.txt
@@ -3,6 +3,6 @@ ManaCost:2
 Types:Artifact
 K:ETBReplacement:Other:ChooseCT
 SVar:ChooseCT:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type.
-A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Creature.ChosenType | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell of the chosen type.
+A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Creature.ChosenType | SpellDescription$ Add one mana of any color. Spend this mana only to cast a creature spell of the chosen type.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pillar_of_origins.jpg
-Oracle:As Pillar of Origins enters the battlefield, choose a creature type.\n{T}:Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell of the chosen type.
+Oracle:As Pillar of Origins enters the battlefield, choose a creature type.\n{T}:Add one mana of any color. Spend this mana only to cast a creature spell of the chosen type.
diff --git a/forge-gui/res/cardsfolder/p/pillar_of_the_paruns.txt b/forge-gui/res/cardsfolder/p/pillar_of_the_paruns.txt
index ca19867f0e8..b19ecb2415e 100644
--- a/forge-gui/res/cardsfolder/p/pillar_of_the_paruns.txt
+++ b/forge-gui/res/cardsfolder/p/pillar_of_the_paruns.txt
@@ -1,7 +1,7 @@
 Name:Pillar of the Paruns
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Card.MultiColor | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a multicolored spell.
+A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Card.MultiColor | SpellDescription$ Add one mana of any color. Spend this mana only to cast a multicolored spell.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pillar_of_the_paruns.jpg
-Oracle:{T}: Add one mana of any color to your mana pool. Spend this mana only to cast a multicolored spell.
+Oracle:{T}: Add one mana of any color. Spend this mana only to cast a multicolored spell.
diff --git a/forge-gui/res/cardsfolder/p/pine_barrens.txt b/forge-gui/res/cardsfolder/p/pine_barrens.txt
index 7f4b9a7ca22..616cd17fc89 100644
--- a/forge-gui/res/cardsfolder/p/pine_barrens.txt
+++ b/forge-gui/res/cardsfolder/p/pine_barrens.txt
@@ -1,10 +1,10 @@
 Name:Pine Barrens
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B} to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pine_barrens.jpg
-Oracle:Pine Barrens enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{T}: Add {B} or {G} to your mana pool. Pine Barrens deals 1 damage to you.
+Oracle:Pine Barrens enters the battlefield tapped.\n{T}: Add {C}.\n{T}: Add {B} or {G}. Pine Barrens deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/p/pinecrest_ridge.txt b/forge-gui/res/cardsfolder/p/pinecrest_ridge.txt
index e54be2d04fe..63a73bd6530 100644
--- a/forge-gui/res/cardsfolder/p/pinecrest_ridge.txt
+++ b/forge-gui/res/cardsfolder/p/pinecrest_ridge.txt
@@ -1,9 +1,9 @@
 Name:Pinecrest Ridge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBStayTapped | SpellDescription$ Add {R} to your mana pool. CARDNAME doesn't untap during your next untap step.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBStayTapped | SpellDescription$ Add {G} to your mana pool. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBStayTapped | SpellDescription$ Add {R}. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBStayTapped | SpellDescription$ Add {G}. CARDNAME doesn't untap during your next untap step.
 SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pinecrest_ridge.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {R} or {G} to your mana pool. Pinecrest Ridge doesn't untap during your next untap step.
+Oracle:{T}: Add {C}.\n{T}: Add {R} or {G}. Pinecrest Ridge doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/p/piranha_marsh.txt b/forge-gui/res/cardsfolder/p/piranha_marsh.txt
index 29226fbac58..caaf7e579d5 100644
--- a/forge-gui/res/cardsfolder/p/piranha_marsh.txt
+++ b/forge-gui/res/cardsfolder/p/piranha_marsh.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters the battlefield, target player loses 1 life.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:TrigLoseLife:DB$LoseLife | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/piranha_marsh.jpg
-Oracle:Piranha Marsh enters the battlefield tapped.\nWhen Piranha Marsh enters the battlefield, target player loses 1 life.\n{T}: Add {B} to your mana pool.
+Oracle:Piranha Marsh enters the battlefield tapped.\nWhen Piranha Marsh enters the battlefield, target player loses 1 life.\n{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/p/pirates_pillage.txt b/forge-gui/res/cardsfolder/p/pirates_pillage.txt
index 7e0c5402178..a6b84bc45e1 100644
--- a/forge-gui/res/cardsfolder/p/pirates_pillage.txt
+++ b/forge-gui/res/cardsfolder/p/pirates_pillage.txt
@@ -1,10 +1,10 @@
 Name:Pirate's Pillage
 ManaCost:3 R
 Types:Sorcery
-A:SP$ Draw | Cost$ 3 R Discard<1/Card> | CostDesc$ As an additional cost to cast CARDNAME, discard a card. | NumCards$ 2 | Defined$ You | SubAbility$ DBToken | SpellDescription$ Draw two cards and create two colorless Treasure artifacts with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+A:SP$ Draw | Cost$ 3 R Discard<1/Card> | CostDesc$ As an additional cost to cast CARDNAME, discard a card. | NumCards$ 2 | Defined$ You | SubAbility$ DBToken | SpellDescription$ Draw two cards and create two colorless Treasure artifacts with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool. 
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Discard
 DeckHints:Keyword$Madness & Ability$Delirium
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pirates_pillage.jpg
-Oracle:As an additional cost to cast Pirate's Pillage, discard a card.\nDraw two cards and create two colorless Treasure artifacts with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:As an additional cost to cast Pirate's Pillage, discard a card.\nDraw two cards and create two colorless Treasure artifacts with "{T}, Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/p/pirates_prize.txt b/forge-gui/res/cardsfolder/p/pirates_prize.txt
index 2f52ae974b1..f992fa0217f 100644
--- a/forge-gui/res/cardsfolder/p/pirates_prize.txt
+++ b/forge-gui/res/cardsfolder/p/pirates_prize.txt
@@ -1,8 +1,8 @@
 Name:Pirate's Prize
 ManaCost:3 U
 Types:Sorcery
-A:SP$ Draw | Cost$ 3 U | NumCards$ 2 | SubAbility$ DBTreasure | SpellDescription$ Draw two cards. Create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+A:SP$ Draw | Cost$ 3 U | NumCards$ 2 | SubAbility$ DBTreasure | SpellDescription$ Draw two cards. Create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:DBTreasure:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pirates_prize.jpg
-Oracle:Draw two cards. Create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
\ No newline at end of file
+Oracle:Draw two cards. Create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/pitiless_plunderer.txt b/forge-gui/res/cardsfolder/p/pitiless_plunderer.txt
index 286e7ce7a77..8ff46ce3609 100644
--- a/forge-gui/res/cardsfolder/p/pitiless_plunderer.txt
+++ b/forge-gui/res/cardsfolder/p/pitiless_plunderer.txt
@@ -2,9 +2,9 @@ Name:Pitiless Plunderer
 ManaCost:3 B
 Types:Creature Human Pirate
 PT:1/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another creature you control dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another creature you control dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | TokenAbilities$ ABMana | References$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pitiless_plunderer.jpg
-Oracle:Whenever another creature you control dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:Whenever another creature you control dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/p/plague_myr.txt b/forge-gui/res/cardsfolder/p/plague_myr.txt
index 2ac84ee3c56..b2dec704d1e 100644
--- a/forge-gui/res/cardsfolder/p/plague_myr.txt
+++ b/forge-gui/res/cardsfolder/p/plague_myr.txt
@@ -3,6 +3,6 @@ ManaCost:2
 Types:Artifact Creature Myr
 PT:1/1
 K:Infect
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/plague_myr.jpg
-Oracle:Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)\n{T}: Add {C} to your mana pool.
+Oracle:Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/p/plasm_capture.txt b/forge-gui/res/cardsfolder/p/plasm_capture.txt
index 0eb1003fea9..18a9e61c5dd 100644
--- a/forge-gui/res/cardsfolder/p/plasm_capture.txt
+++ b/forge-gui/res/cardsfolder/p/plasm_capture.txt
@@ -1,10 +1,10 @@
 Name:Plasm Capture
 ManaCost:G G U U
 Types:Instant
-A:SP$ Counter | Cost$ G G U U | TargetType$ Spell | RememberCounteredCMC$ True | ValidTgts$ Card | SubAbility$ DBDelTrig | SpellDescription$ Counter target spell. At the beginning of your next precombat main phase, add X mana in any combination of colors to your mana pool, where X is that spell's converted mana cost.
-SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | Execute$ AddMana | TriggerDescription$ At the beginning of your next precombat main phase, add X mana in any combination of colors to your mana pool, where X is that spell's converted mana cost. | RememberNumber$ True | SubAbility$ DBCleanup
+A:SP$ Counter | Cost$ G G U U | TargetType$ Spell | RememberCounteredCMC$ True | ValidTgts$ Card | SubAbility$ DBDelTrig | SpellDescription$ Counter target spell. At the beginning of your next precombat main phase, add X mana in any combination of colors, where X is that spell's converted mana cost.
+SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | Execute$ AddMana | TriggerDescription$ At the beginning of your next precombat main phase, add X mana in any combination of colors, where X is that spell's converted mana cost. | RememberNumber$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:AddMana:DB$ Mana | Produced$ Combo Any | Amount$ X | References$ X | AILogic$ MostProminentInComputerHand
 SVar:X:Count$TriggerRememberAmount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/plasm_capture.jpg
-Oracle:Counter target spell. At the beginning of your next precombat main phase, add X mana in any combination of colors to your mana pool, where X is that spell's converted mana cost.
+Oracle:Counter target spell. At the beginning of your next precombat main phase, add X mana in any combination of colors, where X is that spell's converted mana cost.
diff --git a/forge-gui/res/cardsfolder/p/plateau.txt b/forge-gui/res/cardsfolder/p/plateau.txt
index 6dcd6134675..6d2bc0ec4c3 100644
--- a/forge-gui/res/cardsfolder/p/plateau.txt
+++ b/forge-gui/res/cardsfolder/p/plateau.txt
@@ -2,4 +2,4 @@ Name:Plateau
 ManaCost:no cost
 Types:Land Mountain Plains
 SVar:Picture:http://www.wizards.com/global/images/magic/general/plateau.jpg
-Oracle:({T}: Add {R} or {W} to your mana pool.)
+Oracle:({T}: Add {R} or {W}.)
diff --git a/forge-gui/res/cardsfolder/p/polluted_mire.txt b/forge-gui/res/cardsfolder/p/polluted_mire.txt
index 17bb15f6352..5521361ac24 100644
--- a/forge-gui/res/cardsfolder/p/polluted_mire.txt
+++ b/forge-gui/res/cardsfolder/p/polluted_mire.txt
@@ -2,7 +2,7 @@ Name:Polluted Mire
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/polluted_mire.jpg
-Oracle:Polluted Mire enters the battlefield tapped.\n{T}: Add {B} to your mana pool.\nCycling {2} ({2}, Discard this card: Draw a card.)
+Oracle:Polluted Mire enters the battlefield tapped.\n{T}: Add {B}.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/p/port_town.txt b/forge-gui/res/cardsfolder/p/port_town.txt
index 67b7e6faf81..15b8524b8a0 100644
--- a/forge-gui/res/cardsfolder/p/port_town.txt
+++ b/forge-gui/res/cardsfolder/p/port_town.txt
@@ -1,9 +1,9 @@
 Name:Port Town
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Plains,Island/Plains or Island> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Plains or Island card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/port_town.jpg
-Oracle:As Port Town enters the battlefield, you may reveal a Plains or Island card from your hand. If you don't, Port Town enters the battlefield tapped.\n{T}: Add {W} or {U} to your mana pool.
+Oracle:As Port Town enters the battlefield, you may reveal a Plains or Island card from your hand. If you don't, Port Town enters the battlefield tapped.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/p/power_sink.txt b/forge-gui/res/cardsfolder/p/power_sink.txt
index 80aa4872837..0e708ce39bd 100644
--- a/forge-gui/res/cardsfolder/p/power_sink.txt
+++ b/forge-gui/res/cardsfolder/p/power_sink.txt
@@ -1,9 +1,9 @@
 Name:Power Sink
 ManaCost:X U
 Types:Instant
-A:SP$ Counter | Cost$ X U | References$ X | UnlessCost$ X | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ TapLands | UnlessResolveSubs$ WhenNotPaid | SpellDescription$ Counter target spell unless its controller pays {X}. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties his or her mana pool. | StackDescription$ Countering [{s:Targeted}] unless {p:TargetedController} pays X.
+A:SP$ Counter | Cost$ X U | References$ X | UnlessCost$ X | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ TapLands | UnlessResolveSubs$ WhenNotPaid | SpellDescription$ Counter target spell unless its controller pays {X}. If that player doesn't, they tap all lands with mana abilities they control and lose all unspent mana. | StackDescription$ Countering [{s:Targeted}] unless {p:TargetedController} pays X.
 SVar:TapLands:DB$ TapAll | ValidCards$ Land.hasManaAbility | Defined$ TargetedController | SubAbility$ ManaLose | StackDescription$ If {p:TargetedController} doesn't, that player taps all lands with mana abilities he or she controls and
 SVar:ManaLose:DB$ DrainMana | Defined$ TargetedController
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/power_sink.jpg
-Oracle:Counter target spell unless its controller pays {X}. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties his or her mana pool.
+Oracle:Counter target spell unless its controller pays {X}. If that player doesn't, they tap all lands with mana abilities they control and lose all unspent mana.
diff --git a/forge-gui/res/cardsfolder/p/prahv_spires_of_order.txt b/forge-gui/res/cardsfolder/p/prahv_spires_of_order.txt
index f297ddedf36..634c2d4fdad 100644
--- a/forge-gui/res/cardsfolder/p/prahv_spires_of_order.txt
+++ b/forge-gui/res/cardsfolder/p/prahv_spires_of_order.txt
@@ -1,10 +1,10 @@
 Name:Prahv, Spires of Order
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChooseSource | Cost$ 4 W U T | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ Prevent all damage a source of your choice would deal this turn.
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPreventNextFromSource | RememberObjects$ Remembered | SVars$ RPreventNextFromSource | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
 SVar:RPreventNextFromSource:Event$ DamageDone | ValidSource$ Card.IsRemembered | Prevent$ True | PreventionEffect$ True | Description$ Prevent all damage the chosen source would deal this turn.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/prahv_spires_of_order.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}{W}{U}, {T}: Prevent all damage a source of your choice would deal this turn.
+Oracle:{T}: Add {C}.\n{4}{W}{U}, {T}: Prevent all damage a source of your choice would deal this turn.
diff --git a/forge-gui/res/cardsfolder/p/prairie_stream.txt b/forge-gui/res/cardsfolder/p/prairie_stream.txt
index 0dea687e96b..d341aa1f2b0 100644
--- a/forge-gui/res/cardsfolder/p/prairie_stream.txt
+++ b/forge-gui/res/cardsfolder/p/prairie_stream.txt
@@ -6,4 +6,4 @@ SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBChe
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar:Count$LastStateBattlefield Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/prairie_stream.jpg
-Oracle:({T}: Add {W} or {U} to your mana pool.)\nPrairie Stream enters the battlefield tapped unless you control two or more basic lands.
\ No newline at end of file
+Oracle:({T}: Add {W} or {U}.)\nPrairie Stream enters the battlefield tapped unless you control two or more basic lands.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/priest_of_gix.txt b/forge-gui/res/cardsfolder/p/priest_of_gix.txt
index f536d30e33d..9d6bceb1781 100644
--- a/forge-gui/res/cardsfolder/p/priest_of_gix.txt
+++ b/forge-gui/res/cardsfolder/p/priest_of_gix.txt
@@ -2,8 +2,8 @@ Name:Priest of Gix
 ManaCost:2 B
 Types:Creature Human Cleric Minion
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add {B}{B}{B} to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add {B}{B}{B}.
 SVar:TrigMana:DB$Mana | Produced$ B | Amount$ 3
 SVar:FreeSpellAI:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/priest_of_gix.jpg
-Oracle:When Priest of Gix enters the battlefield, add {B}{B}{B} to your mana pool.
+Oracle:When Priest of Gix enters the battlefield, add {B}{B}{B}.
diff --git a/forge-gui/res/cardsfolder/p/priest_of_titania.txt b/forge-gui/res/cardsfolder/p/priest_of_titania.txt
index f861d771b4a..f79fdcf31db 100644
--- a/forge-gui/res/cardsfolder/p/priest_of_titania.txt
+++ b/forge-gui/res/cardsfolder/p/priest_of_titania.txt
@@ -2,7 +2,7 @@ Name:Priest of Titania
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} to your mana pool for each Elf on the battlefield.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} for each Elf on the battlefield.
 SVar:X:Count$Valid Elf
 SVar:Picture:http://www.wizards.com/global/images/magic/general/priest_of_titania.jpg
-Oracle:{T}: Add {G} to your mana pool for each Elf on the battlefield.
+Oracle:{T}: Add {G} for each Elf on the battlefield.
diff --git a/forge-gui/res/cardsfolder/p/priest_of_urabrask.txt b/forge-gui/res/cardsfolder/p/priest_of_urabrask.txt
index f487597e3f8..a4c21a6a48f 100644
--- a/forge-gui/res/cardsfolder/p/priest_of_urabrask.txt
+++ b/forge-gui/res/cardsfolder/p/priest_of_urabrask.txt
@@ -2,8 +2,8 @@ Name:Priest of Urabrask
 ManaCost:2 R
 Types:Creature Human Cleric
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add {R}{R}{R} to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add {R}{R}{R}.
 SVar:TrigMana:DB$Mana | Produced$ R | Amount$ 3
 SVar:FreeSpellAI:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/priest_of_urabrask.jpg
-Oracle:When Priest of Urabrask enters the battlefield, add {R}{R}{R} to your mana pool.
+Oracle:When Priest of Urabrask enters the battlefield, add {R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/p/priest_of_yawgmoth.txt b/forge-gui/res/cardsfolder/p/priest_of_yawgmoth.txt
index 4583697c4f1..16eeed9301b 100644
--- a/forge-gui/res/cardsfolder/p/priest_of_yawgmoth.txt
+++ b/forge-gui/res/cardsfolder/p/priest_of_yawgmoth.txt
@@ -2,8 +2,8 @@ Name:Priest of Yawgmoth
 ManaCost:1 B
 Types:Creature Human Cleric
 PT:1/2
-A:AB$ Mana | Cost$ T Sac<1/Artifact> | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add to your mana pool an amount of black mana equal to the sacrificed artifact's converted mana cost.
+A:AB$ Mana | Cost$ T Sac<1/Artifact> | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add an amount of black mana equal to the sacrificed artifact's converted mana cost.
 SVar:X:Sacrificed$CardManaCost
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/priest_of_yawgmoth.jpg
-Oracle:{T}, Sacrifice an artifact: Add to your mana pool an amount of {B} equal to the sacrificed artifact's converted mana cost.
+Oracle:{T}, Sacrifice an artifact: Add an amount of {B} equal to the sacrificed artifact's converted mana cost.
diff --git a/forge-gui/res/cardsfolder/p/primal_amulet_primal_wellspring.txt b/forge-gui/res/cardsfolder/p/primal_amulet_primal_wellspring.txt
index 2eabfce30bd..51900199f54 100644
--- a/forge-gui/res/cardsfolder/p/primal_amulet_primal_wellspring.txt
+++ b/forge-gui/res/cardsfolder/p/primal_amulet_primal_wellspring.txt
@@ -21,8 +21,8 @@ ALTERNATE
 Name:Primal Wellspring
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | TriggersWhenSpent$ TrigCopy | SpellDescription$ Add one mana of any color to your mana pool. When that mana is spent to cast an instant or sorcery spell, copy that spell and you may choose new targets for the copy.
+A:AB$ Mana | Cost$ T | Produced$ Any | TriggersWhenSpent$ TrigCopy | SpellDescription$ Add one mana of any color. When that mana is spent to cast an instant or sorcery spell, copy that spell and you may choose new targets for the copy.
 SVar:TrigCopy:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | OneOff$ True | Execute$ TrigCopyMain | TriggerDescription$ When that mana is spent to cast an instant or sorcery spell, copy that spell and you may choose new targets for the copy.
 SVar:TrigCopyMain:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility
 SVar:Picture:http://www.wizards.com/global/images/magic/general/primal_wellspring.jpg
-Oracle:(Transforms from Primal Amulet.)\n{T}: Add one mana of any color to your mana pool. When that mana is spent to cast an instant or sorcery spell, copy that spell and you may choose new targets for the copy.
+Oracle:(Transforms from Primal Amulet.)\n{T}: Add one mana of any color. When that mana is spent to cast an instant or sorcery spell, copy that spell and you may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/p/primal_beyond.txt b/forge-gui/res/cardsfolder/p/primal_beyond.txt
index b06f17485cd..2eb532e34ec 100644
--- a/forge-gui/res/cardsfolder/p/primal_beyond.txt
+++ b/forge-gui/res/cardsfolder/p/primal_beyond.txt
@@ -1,10 +1,10 @@
 Name:Primal Beyond
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Card.Elemental,Activated.Elemental | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast an Elemental spell or activate an ability of an Elemental.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Card.Elemental,Activated.Elemental | SpellDescription$ Add one mana of any color. Spend this mana only to cast an Elemental spell or activate an ability of an Elemental.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Elemental> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal an Elemental card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/primal_beyond.jpg
-Oracle:As Primal Beyond enters the battlefield, you may reveal an Elemental card from your hand. If you don't, Primal Beyond enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast an Elemental spell or activate an ability of an Elemental.
+Oracle:As Primal Beyond enters the battlefield, you may reveal an Elemental card from your hand. If you don't, Primal Beyond enters the battlefield tapped.\n{T}: Add {C}.\n{T}: Add one mana of any color. Spend this mana only to cast an Elemental spell or activate an ability of an Elemental.
diff --git a/forge-gui/res/cardsfolder/p/princess_lucrezia.txt b/forge-gui/res/cardsfolder/p/princess_lucrezia.txt
index 02cb1055270..f5af0768caa 100644
--- a/forge-gui/res/cardsfolder/p/princess_lucrezia.txt
+++ b/forge-gui/res/cardsfolder/p/princess_lucrezia.txt
@@ -2,6 +2,6 @@ Name:Princess Lucrezia
 ManaCost:3 U U B
 Types:Legendary Creature Human Wizard
 PT:5/4
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://resources.wizards.com/magic/cards/le/en-us/card1675.jpg
-Oracle:{T}: Add {U} to your mana pool.
+Oracle:{T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/p/prismatic_geoscope.txt b/forge-gui/res/cardsfolder/p/prismatic_geoscope.txt
index ca6ea78ef9c..524df5dfdaa 100644
--- a/forge-gui/res/cardsfolder/p/prismatic_geoscope.txt
+++ b/forge-gui/res/cardsfolder/p/prismatic_geoscope.txt
@@ -2,6 +2,6 @@ Name:Prismatic Geoscope
 ManaCost:5
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ X | References$ X | PrecostDesc$ Domain — | SpellDescription$ Add X mana in any combination of colors to your mana pool, where X is the number of basic land types among lands you control.
+A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ X | References$ X | PrecostDesc$ Domain — | SpellDescription$ Add X mana in any combination of colors, where X is the number of basic land types among lands you control.
 SVar:X:Count$Domain SVar:Picture:http://www.wizards.com/global/images/magic/general/prismatic_geoscope.jpg
-Oracle:Prismatic Geoscope enters the battlefield tapped.\nDomain — {T}: Add X mana in any combination of colors to your mana pool, where X is the number of basic land types among lands you control.
\ No newline at end of file
+Oracle:Prismatic Geoscope enters the battlefield tapped.\nDomain — {T}: Add X mana in any combination of colors, where X is the number of basic land types among lands you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/prismatic_lens.txt b/forge-gui/res/cardsfolder/p/prismatic_lens.txt
index 797a32fdc97..4356bafda10 100644
--- a/forge-gui/res/cardsfolder/p/prismatic_lens.txt
+++ b/forge-gui/res/cardsfolder/p/prismatic_lens.txt
@@ -1,8 +1,8 @@
 Name:Prismatic Lens
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/prismatic_lens.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/p/pristine_talisman.txt b/forge-gui/res/cardsfolder/p/pristine_talisman.txt
index dd6aa44cc22..fdb96f79cd1 100644
--- a/forge-gui/res/cardsfolder/p/pristine_talisman.txt
+++ b/forge-gui/res/cardsfolder/p/pristine_talisman.txt
@@ -1,7 +1,7 @@
 Name:Pristine Talisman
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SubAbility$ DBGainLife | SpellDescription$ Add {C} to your mana pool. You gain 1 life.
+A:AB$ Mana | Cost$ T | Produced$ C | SubAbility$ DBGainLife | SpellDescription$ Add {C}. You gain 1 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pristine_talisman.jpg
-Oracle:{T}: Add {C} to your mana pool. You gain 1 life.
+Oracle:{T}: Add {C}. You gain 1 life.
diff --git a/forge-gui/res/cardsfolder/p/profane_procession_tomb_of_the_dusk_rose.txt b/forge-gui/res/cardsfolder/p/profane_procession_tomb_of_the_dusk_rose.txt
index 48ade9cf511..2b2dc12afa6 100644
--- a/forge-gui/res/cardsfolder/p/profane_procession_tomb_of_the_dusk_rose.txt
+++ b/forge-gui/res/cardsfolder/p/profane_procession_tomb_of_the_dusk_rose.txt
@@ -13,8 +13,8 @@ ALTERNATE
 Name:Tomb of the Dusk Rose
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool. 
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 A:AB$ ChooseCard | Cost$ 2 W B T | Choices$ Creature.IsRemembered+ExiledWithSource | ChoiceZone$ Exile | SubAbility$ DBChangeZone | SpellDescription$ Put a creature card exiled with this permanent onto the battlefield under your control.
 SVar:DBChangeZone:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Exile | Destination$ Battlefield | ChangeType$ Creature.IsRemembered+ExiledWithSource | ChangeNum$ 1 | GainControl$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tomb_of_the_dusk_rose.jpg
-Oracle:(Transforms from Profane Procession.)\n{T}: Add one mana of any color to your mana pool.\n{2}{W}{B}，{T}: Put a creature card exiled with this permanent onto the battlefield under your control.
\ No newline at end of file
+Oracle:(Transforms from Profane Procession.)\n{T}: Add one mana of any color.\n{2}{W}{B}，{T}: Put a creature card exiled with this permanent onto the battlefield under your control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/prophetic_prism.txt b/forge-gui/res/cardsfolder/p/prophetic_prism.txt
index 88b42d4d704..0b3748db2d0 100644
--- a/forge-gui/res/cardsfolder/p/prophetic_prism.txt
+++ b/forge-gui/res/cardsfolder/p/prophetic_prism.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 1
-A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/prophetic_prism.jpg
-Oracle:When Prophetic Prism enters the battlefield, draw a card.\n{1}, {T}: Add one mana of any color to your mana pool.
+Oracle:When Prophetic Prism enters the battlefield, draw a card.\n{1}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/p/prosperous_pirates.txt b/forge-gui/res/cardsfolder/p/prosperous_pirates.txt
index 475a824525d..e96879b7cdf 100644
--- a/forge-gui/res/cardsfolder/p/prosperous_pirates.txt
+++ b/forge-gui/res/cardsfolder/p/prosperous_pirates.txt
@@ -2,9 +2,9 @@ Name:Prosperous Pirates
 ManaCost:4 U
 Types:Creature Human Pirate
 PT:3/4
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBTreasureTokens | TriggerDescription$ When CARDNAME enters the battlefield, create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBTreasureTokens | TriggerDescription$ When CARDNAME enters the battlefield, create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:DBTreasureTokens:DB$ Token | TokenAmount$ 2 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/prosperous_pirates.jpg
 DeckHas:Ability$Token
-Oracle:When Prosperous Pirates enters the battlefield, create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:When Prosperous Pirates enters the battlefield, create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/p/prying_blade.txt b/forge-gui/res/cardsfolder/p/prying_blade.txt
index 129cd61e053..196efb8c9cc 100644
--- a/forge-gui/res/cardsfolder/p/prying_blade.txt
+++ b/forge-gui/res/cardsfolder/p/prying_blade.txt
@@ -2,9 +2,9 @@ Name:Prying Blade
 ManaCost:1
 Types:Artifact Equipment
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | Description$ Equipped creature gets +1/+0.
-T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigTreasure | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigTreasure | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:TrigTreasure:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 K:Equip 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/prying_blade.jpg
-Oracle:Equipped creature gets +1/+0.\nWhenever equipped creature deals combat damage to a player, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
+Oracle:Equipped creature gets +1/+0.\nWhenever equipped creature deals combat damage to a player, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/pygmy_hippo.txt b/forge-gui/res/cardsfolder/p/pygmy_hippo.txt
index 1b991ebcec8..8041c683dd9 100644
--- a/forge-gui/res/cardsfolder/p/pygmy_hippo.txt
+++ b/forge-gui/res/cardsfolder/p/pygmy_hippo.txt
@@ -2,14 +2,14 @@ Name:Pygmy Hippo
 ManaCost:G U
 Types:Creature Hippo
 PT:2/2
-T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigActivateManaAbility | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may have defending player activate a mana ability of each land he or she controls and empty his or her mana pool. If you do, CARDNAME assigns no combat damage this turn and at the beginning of your postcombat main phase, you add an amount of {C} to your mana pool equal to the amount of mana emptied from defending player's mana pool this way.
+T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigActivateManaAbility | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may have defending player activate a mana ability of each land they control and lose all unspent mana. If you do, CARDNAME assigns no combat damage this turn and at the beginning of your postcombat main phase, you add an amount of {C} equal to the amount of mana that player lost this way.
 SVar:TrigActivateManaAbility:DB$ ActivateAbility | Defined$ DefendingPlayer | Type$ Land | ManaAbility$ True | SubAbility$ DBEmptyPool
 SVar:DBEmptyPool:DB$ DrainMana | Defined$ DefendingPlayer | SubAbility$ DBPump | RememberDrainedMana$ True
 SVar:DBPump:DB$ Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage | SubAbility$ DBDelTrig
-SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main2 | Execute$ TrigAddMana | TriggerDescription$ At the beginning of your postcombat main phase, you add an amount of {C} to your mana pool equal to the amount of mana emptied from defending player's mana pool this way | SubAbility$ DBCleanup | RememberNumber$ True
+SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main2 | Execute$ TrigAddMana | TriggerDescription$ At the beginning of your postcombat main phase, you add an amount of {C} equal to the amount of mana the defending player lost this way | SubAbility$ DBCleanup | RememberNumber$ True
 SVar:TrigAddMana:DB$ Mana | Produced$ C | Amount$ X | References$ X
 SVar:X:Count$TriggerRememberAmount
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pygmy_hippo.jpg
-Oracle:Whenever Pygmy Hippo attacks and isn't blocked, you may have defending player activate a mana ability of each land he or she controls and empty his or her mana pool. If you do, Pygmy Hippo assigns no combat damage this turn and at the beginning of your postcombat main phase, you add an amount of {C} to your mana pool equal to the amount of mana emptied from defending player's mana pool this way.
+Oracle:Whenever Pygmy Hippo attacks and isn't blocked, you may have defending player activate a mana ability of each land they control and lose all unspent mana. If you do, Pygmy Hippo assigns no combat damage this turn and at the beginning of your next main phase this turn, you add an amount of {C} equal to the amount of mana that player lost this way.
diff --git a/forge-gui/res/cardsfolder/p/pyramid_of_the_pantheon.txt b/forge-gui/res/cardsfolder/p/pyramid_of_the_pantheon.txt
index 95b220330b7..fde08eb0048 100644
--- a/forge-gui/res/cardsfolder/p/pyramid_of_the_pantheon.txt
+++ b/forge-gui/res/cardsfolder/p/pyramid_of_the_pantheon.txt
@@ -1,9 +1,9 @@
 Name:Pyramid of the Pantheon
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ 2 T | Produced$ Any | SubAbility$ DBPutCounter | SpellDescription$ Add one mana of any color to your mana pool. Put a brick counter on CARDNAME.
+A:AB$ Mana | Cost$ 2 T | Produced$ Any | SubAbility$ DBPutCounter | SpellDescription$ Add one mana of any color. Put a brick counter on CARDNAME.
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ BRICK | CounterNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 3 | CheckSVar$ X | SVarCompare$ GE3 | References$ X | SpellDescription$ Add three mana of any one color to your mana pool. Activate this ability only if there are three or more brick counters on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 3 | CheckSVar$ X | SVarCompare$ GE3 | References$ X | SpellDescription$ Add three mana of any one color. Activate this ability only if there are three or more brick counters on CARDNAME.
 SVar:X:Count$CardCounters.BRICK
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pyramid_of_the_pantheon.jpg
-Oracle:{2}, {T}: Add one mana of any color to your mana pool. Put a brick counter on Pyramid of the Pantheon.\n{T}: Add three mana of any one color to your mana pool. Activate this ability only if there are three or more brick counters on Pyramid of the Pantheon.
\ No newline at end of file
+Oracle:{2}, {T}: Add one mana of any color. Put a brick counter on Pyramid of the Pantheon.\n{T}: Add three mana of any one color. Activate this ability only if there are three or more brick counters on Pyramid of the Pantheon.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/pyretic_ritual.txt b/forge-gui/res/cardsfolder/p/pyretic_ritual.txt
index ccd4507d583..1cea9ca9cfc 100644
--- a/forge-gui/res/cardsfolder/p/pyretic_ritual.txt
+++ b/forge-gui/res/cardsfolder/p/pyretic_ritual.txt
@@ -1,6 +1,6 @@
 Name:Pyretic Ritual
 ManaCost:1 R
 Types:Instant
-A:SP$ Mana | Cost$ 1 R | Produced$ R | Amount$ 3 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R}{R}{R} to your mana pool.
+A:SP$ Mana | Cost$ 1 R | Produced$ R | Amount$ 3 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R}{R}{R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pyretic_ritual.jpg
-Oracle:Add {R}{R}{R} to your mana pool.
+Oracle:Add {R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/p/pyromancers_goggles.txt b/forge-gui/res/cardsfolder/p/pyromancers_goggles.txt
index e003bd3a977..f44a6f5cc23 100644
--- a/forge-gui/res/cardsfolder/p/pyromancers_goggles.txt
+++ b/forge-gui/res/cardsfolder/p/pyromancers_goggles.txt
@@ -1,8 +1,8 @@
 Name:Pyromancer's Goggles
 ManaCost:5
 Types:Legendary Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | TriggersWhenSpent$ TrigCopy | SpellDescription$ Add {R} to your mana pool. When that mana is spent to cast a red instant or sorcery spell, copy that spell and you may choose new targets for the copy.
+A:AB$ Mana | Cost$ T | Produced$ R | TriggersWhenSpent$ TrigCopy | SpellDescription$ Add {R}. When that mana is spent to cast a red instant or sorcery spell, copy that spell and you may choose new targets for the copy.
 SVar:TrigCopy:Mode$ SpellCast | ValidCard$ Instant.Red,Sorcery.Red | ValidActivatingPlayer$ You | OneOff$ True | Execute$ TrigCopyMain | TriggerDescription$ When that mana is spent to cast a red instant or sorcery spell, copy that spell and you may choose new targets for the copy.
 SVar:TrigCopyMain:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pyromancers_goggles.jpg
-Oracle:{T}: Add {R} to your mana pool. When that mana is spent to cast a red instant or sorcery spell, copy that spell and you may choose new targets for the copy.
\ No newline at end of file
+Oracle:{T}: Add {R}. When that mana is spent to cast a red instant or sorcery spell, copy that spell and you may choose new targets for the copy.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/q/qarsi_deceiver.txt b/forge-gui/res/cardsfolder/q/qarsi_deceiver.txt
index af6d7d8803f..52d5b122bfc 100644
--- a/forge-gui/res/cardsfolder/q/qarsi_deceiver.txt
+++ b/forge-gui/res/cardsfolder/q/qarsi_deceiver.txt
@@ -2,7 +2,7 @@ Name:Qarsi Deceiver
 ManaCost:1 U
 Types:Creature Naga Wizard
 PT:0/4
-A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ MorphOrManifest | SpellDescription$ Add {C} to your mana pool. Spend this mana only to cast a face-down creature spell, pay a mana cost to turn a manifested creature face up, or pay a morph cost.
+A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ MorphOrManifest | SpellDescription$ Add {C}. Spend this mana only to cast a face-down creature spell, pay a mana cost to turn a manifested creature face up, or pay a morph cost.
 DeckHints:Keyword$Morph|Megamorph
 SVar:Picture:http://www.wizards.com/global/images/magic/general/qarsi_deceiver.jpg
-Oracle:{T}: Add {C} to your mana pool. Spend this mana only to cast a face-down creature spell, pay a mana cost to turn a manifested creature face up, or pay a morph cost. (A megamorph cost is a morph cost.)
+Oracle:{T}: Add {C}. Spend this mana only to cast a face-down creature spell, pay a mana cost to turn a manifested creature face up, or pay a morph cost. (A megamorph cost is a morph cost.)
diff --git a/forge-gui/res/cardsfolder/q/quicksand.txt b/forge-gui/res/cardsfolder/q/quicksand.txt
index 7253b130c01..adfc9fc77c9 100644
--- a/forge-gui/res/cardsfolder/q/quicksand.txt
+++ b/forge-gui/res/cardsfolder/q/quicksand.txt
@@ -1,7 +1,7 @@
 Name:Quicksand
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ T Sac<1/CARDNAME> | NumAtt$ -1 | NumDef$ -2 | IsCurse$ True | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | SpellDescription$ Target attacking creature without flying gets -1/-2 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quicksand.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Sacrifice Quicksand: Target attacking creature without flying gets -1/-2 until end of turn.
+Oracle:{T}: Add {C}.\n{T}, Sacrifice Quicksand: Target attacking creature without flying gets -1/-2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/q/quirion_elves.txt b/forge-gui/res/cardsfolder/q/quirion_elves.txt
index 39e7b965967..fbbff6cc6b8 100644
--- a/forge-gui/res/cardsfolder/q/quirion_elves.txt
+++ b/forge-gui/res/cardsfolder/q/quirion_elves.txt
@@ -4,7 +4,7 @@ Types:Creature Elf Druid
 PT:1/1
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeckButGreen | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quirion_elves.jpg
-Oracle:As Quirion Elves enters the battlefield, choose a color.\n{T}: Add {G} to your mana pool.\n{T}: Add one mana of the chosen color to your mana pool.
+Oracle:As Quirion Elves enters the battlefield, choose a color.\n{T}: Add {G}.\n{T}: Add one mana of the chosen color.
diff --git a/forge-gui/res/cardsfolder/q/quirion_explorer.txt b/forge-gui/res/cardsfolder/q/quirion_explorer.txt
index 5fbd1fd7bcf..ba1756506ce 100644
--- a/forge-gui/res/cardsfolder/q/quirion_explorer.txt
+++ b/forge-gui/res/cardsfolder/q/quirion_explorer.txt
@@ -2,6 +2,6 @@ Name:Quirion Explorer
 ManaCost:1 G
 Types:Creature Elf Druid Scout
 PT:1/1
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.OppCtrl | ReflectProperty$ Produce | SpellDescription$ Add to your mana pool one mana of any color that a land an opponent controls could produce.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.OppCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any color that a land an opponent controls could produce.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quirion_explorer.jpg
-Oracle:{T}: Add to your mana pool one mana of any color that a land an opponent controls could produce.
+Oracle:{T}: Add one mana of any color that a land an opponent controls could produce.
diff --git a/forge-gui/res/cardsfolder/q/quirion_sentinel.txt b/forge-gui/res/cardsfolder/q/quirion_sentinel.txt
index 6c1a8a3a7e2..9401f51c005 100644
--- a/forge-gui/res/cardsfolder/q/quirion_sentinel.txt
+++ b/forge-gui/res/cardsfolder/q/quirion_sentinel.txt
@@ -2,7 +2,7 @@ Name:Quirion Sentinel
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:2/1
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add one mana of any color to your mana pool.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add one mana of any color.
 SVar:TrigMana:DB$ Mana | Produced$ Any | Amount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quirion_sentinel.jpg
-Oracle:When Quirion Sentinel enters the battlefield, add one mana of any color to your mana pool.
+Oracle:When Quirion Sentinel enters the battlefield, add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/r/radha_heir_to_keld.txt b/forge-gui/res/cardsfolder/r/radha_heir_to_keld.txt
index 0a000e1cd00..60eb6345786 100644
--- a/forge-gui/res/cardsfolder/r/radha_heir_to_keld.txt
+++ b/forge-gui/res/cardsfolder/r/radha_heir_to_keld.txt
@@ -2,8 +2,8 @@ Name:Radha, Heir to Keld
 ManaCost:R G
 Types:Legendary Creature Elf Warrior
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ Whenever CARDNAME attacks, add R R to your mana pool.
-SVar:TrigMana:DB$ Mana | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ Whenever CARDNAME attacks, add R R.
+SVar:TrigMana:DB$ Mana | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/radha_heir_to_keld.jpg
-Oracle:Whenever Radha, Heir to Keld attacks, you may add {R}{R} to your mana pool.\n{T}: Add {G} to your mana pool.
+Oracle:Whenever Radha, Heir to Keld attacks, you may add {R}{R}.\n{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/r/radiant_fountain.txt b/forge-gui/res/cardsfolder/r/radiant_fountain.txt
index 5fb2ea7953f..dc30917f3a2 100644
--- a/forge-gui/res/cardsfolder/r/radiant_fountain.txt
+++ b/forge-gui/res/cardsfolder/r/radiant_fountain.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 2 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 2
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/radiant_fountain.jpg
-Oracle:When Radiant Fountain enters the battlefield, you gain 2 life.\n{T}: Add {C} to your mana pool.
+Oracle:When Radiant Fountain enters the battlefield, you gain 2 life.\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/r/raging_ravine.txt b/forge-gui/res/cardsfolder/r/raging_ravine.txt
index 1a0b357d90c..3248af9557f 100644
--- a/forge-gui/res/cardsfolder/r/raging_ravine.txt
+++ b/forge-gui/res/cardsfolder/r/raging_ravine.txt
@@ -2,10 +2,10 @@ Name:Raging Ravine
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Animate | Cost$ 2 R G | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Colors$ Red,Green | Triggers$ TrigAttack | SpellDescription$ Until end of turn, CARDNAME becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land.
 SVar:TrigAttack:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME attacks, put a +1/+1 counter on it.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/raging_ravine.jpg
-Oracle:Raging Ravine enters the battlefield tapped.\n{T}: Add {R} or {G} to your mana pool.\n{2}{R}{G}: Until end of turn, Raging Ravine becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land.
+Oracle:Raging Ravine enters the battlefield tapped.\n{T}: Add {R} or {G}.\n{2}{R}{G}: Until end of turn, Raging Ravine becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land.
diff --git a/forge-gui/res/cardsfolder/r/rain_of_filth.txt b/forge-gui/res/cardsfolder/r/rain_of_filth.txt
index 1c99ed26931..5dce8f447bb 100644
--- a/forge-gui/res/cardsfolder/r/rain_of_filth.txt
+++ b/forge-gui/res/cardsfolder/r/rain_of_filth.txt
@@ -1,8 +1,8 @@
 Name:Rain of Filth
 ManaCost:B
 Types:Instant
-A:SP$ AnimateAll | Cost$ B | ValidCards$ Land.YouCtrl | Abilities$ ABMana | SpellDescription$ Until end of turn, lands you control gain "Sacrifice this land: Add {B} to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:SP$ AnimateAll | Cost$ B | ValidCards$ Land.YouCtrl | Abilities$ ABMana | SpellDescription$ Until end of turn, lands you control gain "Sacrifice this land: Add {B}."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | SpellDescription$ Add {B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rain_of_filth.jpg
-Oracle:Until end of turn, lands you control gain "Sacrifice this land: Add {B} to your mana pool."
+Oracle:Until end of turn, lands you control gain "Sacrifice this land: Add {B}."
diff --git a/forge-gui/res/cardsfolder/r/rainbow_vale.txt b/forge-gui/res/cardsfolder/r/rainbow_vale.txt
index 601200446f4..64b02c61863 100644
--- a/forge-gui/res/cardsfolder/r/rainbow_vale.txt
+++ b/forge-gui/res/cardsfolder/r/rainbow_vale.txt
@@ -1,10 +1,10 @@
 Name:Rainbow Vale
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ ValeTrig | SpellDescription$ Add one mana of any color to your mana pool. An opponent gains control of CARDNAME at the beginning of the next end step.
+A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ ValeTrig | SpellDescription$ Add one mana of any color. An opponent gains control of CARDNAME at the beginning of the next end step.
 SVar:ValeTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ ChooseOpp | TriggerDescription$ An opponent gains control of CARDNAME at the beginning of the next end step.
 SVar:ChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to give control to: | AILogic$ Curse | SubAbility$ DonateTheVale
 SVar:DonateTheVale:DB$ GainControl | Defined$ Self | NewController$ Player.Chosen
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rainbow_vale.jpg
-Oracle:{T}: Add one mana of any color to your mana pool. An opponent gains control of Rainbow Vale at the beginning of the next end step.
+Oracle:{T}: Add one mana of any color. An opponent gains control of Rainbow Vale at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/r/rakdos_carnarium.txt b/forge-gui/res/cardsfolder/r/rakdos_carnarium.txt
index 1cad140ca3c..60dddf67d73 100644
--- a/forge-gui/res/cardsfolder/r/rakdos_carnarium.txt
+++ b/forge-gui/res/cardsfolder/r/rakdos_carnarium.txt
@@ -2,9 +2,9 @@ Name:Rakdos Carnarium
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B R | SpellDescription$ Add {B}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B R | SpellDescription$ Add {B}{R}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_carnarium.jpg
-Oracle:Rakdos Carnarium enters the battlefield tapped.\nWhen Rakdos Carnarium enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {B}{R} to your mana pool.
+Oracle:Rakdos Carnarium enters the battlefield tapped.\nWhen Rakdos Carnarium enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {B}{R}.
diff --git a/forge-gui/res/cardsfolder/r/rakdos_cluestone.txt b/forge-gui/res/cardsfolder/r/rakdos_cluestone.txt
index 6154f8ef5e7..f32a7e712fc 100644
--- a/forge-gui/res/cardsfolder/r/rakdos_cluestone.txt
+++ b/forge-gui/res/cardsfolder/r/rakdos_cluestone.txt
@@ -1,10 +1,10 @@
 Name:Rakdos Cluestone
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Draw | Cost$ B R T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Black|Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_cluestone.jpg
-Oracle:{T}: Add {B} or {R} to your mana pool.\n{B}{R}, {T}, Sacrifice Rakdos Cluestone: Draw a card.
+Oracle:{T}: Add {B} or {R}.\n{B}{R}, {T}, Sacrifice Rakdos Cluestone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/r/rakdos_guildgate.txt b/forge-gui/res/cardsfolder/r/rakdos_guildgate.txt
index f911ff17ae9..03799853093 100644
--- a/forge-gui/res/cardsfolder/r/rakdos_guildgate.txt
+++ b/forge-gui/res/cardsfolder/r/rakdos_guildgate.txt
@@ -2,7 +2,7 @@ Name:Rakdos Guildgate
 ManaCost:no cost
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_guildgate.jpg
-Oracle:Rakdos Guildgate enters the battlefield tapped.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:Rakdos Guildgate enters the battlefield tapped.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/r/rakdos_keyrune.txt b/forge-gui/res/cardsfolder/r/rakdos_keyrune.txt
index 653d7c7c7ad..57b67a6e267 100644
--- a/forge-gui/res/cardsfolder/r/rakdos_keyrune.txt
+++ b/forge-gui/res/cardsfolder/r/rakdos_keyrune.txt
@@ -1,10 +1,10 @@
 Name:Rakdos Keyrune
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Animate | Cost$ B R | Defined$ Self | Power$ 3 | Toughness$ 1 | Types$ Artifact,Creature,Devil | Colors$ Black,Red | Keywords$ First Strike | SpellDescription$ CARDNAME becomes a 3/1 black and red Devil artifact creature with first strike until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Black|Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_keyrune.jpg
-Oracle:{T}: Add {B} or {R} to your mana pool.\n{B}{R}: Rakdos Keyrune becomes a 3/1 black and red Devil artifact creature with first strike until end of turn.
+Oracle:{T}: Add {B} or {R}.\n{B}{R}: Rakdos Keyrune becomes a 3/1 black and red Devil artifact creature with first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/r/rakdos_signet.txt b/forge-gui/res/cardsfolder/r/rakdos_signet.txt
index b2e33f7fd7f..f7f30d36de4 100644
--- a/forge-gui/res/cardsfolder/r/rakdos_signet.txt
+++ b/forge-gui/res/cardsfolder/r/rakdos_signet.txt
@@ -1,7 +1,7 @@
 Name:Rakdos Signet
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ B R | SpellDescription$ Add {B}{R} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ B R | SpellDescription$ Add {B}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_signet.jpg
-Oracle:{1}, {T}: Add {B}{R} to your mana pool.
+Oracle:{1}, {T}: Add {B}{R}.
diff --git a/forge-gui/res/cardsfolder/r/ramos_dragon_engine.txt b/forge-gui/res/cardsfolder/r/ramos_dragon_engine.txt
index aa91aaa481b..07b0157aee1 100644
--- a/forge-gui/res/cardsfolder/r/ramos_dragon_engine.txt
+++ b/forge-gui/res/cardsfolder/r/ramos_dragon_engine.txt
@@ -6,6 +6,6 @@ K:Flying
 T:Mode$ SpellCast | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell, put a +1/+1 counter on CARDNAME for each of that spell's colors.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | References$ X
 SVar:X:TriggeredCard$ColorsCtrl Card.Self
-A:AB$ Mana | Cost$ SubCounter<5/P1P1> | Produced$ W W U U B B R R G G | ActivationLimit$ 1 | SpellDescription$ Add {W}{W}{U}{U}{B}{B}{R}{R}{G}{G} to your mana pool. Activate this ability only once each turn.
+A:AB$ Mana | Cost$ SubCounter<5/P1P1> | Produced$ W W U U B B R R G G | ActivationLimit$ 1 | SpellDescription$ Add {W}{W}{U}{U}{B}{B}{R}{R}{G}{G}. Activate this ability only once each turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ramos_dragon_engine.jpg
-Oracle:Flying\nWhenever you cast a spell, put a +1/+1 counter on Ramos, Dragon Engine for each of that spell's colors.\nRemove five +1/+1 counters from Ramos: Add {W}{W}{U}{U}{B}{B}{R}{R}{G}{G} to your mana pool. Activate this ability only once each turn.
+Oracle:Flying\nWhenever you cast a spell, put a +1/+1 counter on Ramos, Dragon Engine for each of that spell's colors.\nRemove five +1/+1 counters from Ramos: Add {W}{W}{U}{U}{B}{B}{R}{R}{G}{G}. Activate this ability only once each turn.
diff --git a/forge-gui/res/cardsfolder/r/ramunap_ruins.txt b/forge-gui/res/cardsfolder/r/ramunap_ruins.txt
index 99a0acf150a..a2ccd9bc73a 100644
--- a/forge-gui/res/cardsfolder/r/ramunap_ruins.txt
+++ b/forge-gui/res/cardsfolder/r/ramunap_ruins.txt
@@ -1,8 +1,8 @@
 Name:Ramunap Ruins
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ DealDamage | Cost$ 2 R R T Sac<1/Desert> | Defined$ Player.Opponent | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to each opponent.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ramunap_ruins.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Pay 1 life: Add {R} to your mana pool.\n{2}{R}{R}, {T}, Sacrifice a Desert: Ramunap Ruins deals 2 damage to each opponent.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{T}, Pay 1 life: Add {R}.\n{2}{R}{R}, {T}, Sacrifice a Desert: Ramunap Ruins deals 2 damage to each opponent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/r/rapacious_one.txt b/forge-gui/res/cardsfolder/r/rapacious_one.txt
index 97c776a56cf..a93e48b0cc8 100644
--- a/forge-gui/res/cardsfolder/r/rapacious_one.txt
+++ b/forge-gui/res/cardsfolder/r/rapacious_one.txt
@@ -3,11 +3,11 @@ ManaCost:5 R
 Types:Creature Eldrazi Drone
 PT:5/4
 K:Trample
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | References$ X | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, pcreate that many 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | References$ X | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, pcreate that many 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ X | References$ X | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn3
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 SVar:X:TriggerCount$DamageAmount
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rapacious_one.jpg
-Oracle:Trample\nWhenever Rapacious One deals combat damage to a player, create that many 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Trample\nWhenever Rapacious One deals combat damage to a player, create that many 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/r/rasputin_dreamweaver.txt b/forge-gui/res/cardsfolder/r/rasputin_dreamweaver.txt
index 59dbd6f7736..602e58120cc 100644
--- a/forge-gui/res/cardsfolder/r/rasputin_dreamweaver.txt
+++ b/forge-gui/res/cardsfolder/r/rasputin_dreamweaver.txt
@@ -4,9 +4,9 @@ Types:Legendary Creature Human Wizard
 PT:4/1
 K:etbCounter:DREAM:7
 K:CARDNAME can't have more than seven dream counters on it.
-A:AB$ Mana | Cost$ SubCounter<1/DREAM> | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ SubCounter<1/DREAM> | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PreventDamage | Cost$ SubCounter<1/DREAM> | Defined$ Self | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to CARDNAME this turn.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | IsPresent$ Card.Self+startedTheTurnUntapped | TriggerDescription$ At the beginning of your upkeep, if CARDNAME started the turn untapped, put a dream counter on it.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ DREAM | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rasputin_dreamweaver.jpg
-Oracle:Rasputin Dreamweaver enters the battlefield with seven dream counters on it.\nRemove a dream counter from Rasputin: Add {C} to your mana pool.\nRemove a dream counter from Rasputin: Prevent the next 1 damage that would be dealt to Rasputin this turn.\nAt the beginning of your upkeep, if Rasputin started the turn untapped, put a dream counter on it.\nRasputin can't have more than seven dream counters on it.
+Oracle:Rasputin Dreamweaver enters the battlefield with seven dream counters on it.\nRemove a dream counter from Rasputin: Add {C}.\nRemove a dream counter from Rasputin: Prevent the next 1 damage that would be dealt to Rasputin this turn.\nAt the beginning of your upkeep, if Rasputin started the turn untapped, put a dream counter on it.\nRasputin can't have more than seven dream counters on it.
diff --git a/forge-gui/res/cardsfolder/r/raths_edge.txt b/forge-gui/res/cardsfolder/r/raths_edge.txt
index 8e9d8b541ea..ab11f187a89 100644
--- a/forge-gui/res/cardsfolder/r/raths_edge.txt
+++ b/forge-gui/res/cardsfolder/r/raths_edge.txt
@@ -1,8 +1,8 @@
 Name:Rath's Edge
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ DealDamage | Cost$ 4 T Sac<1/Land> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/raths_edge.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}, {T}, Sacrifice a land: Rath's Edge deals 1 damage to target creature or player.
+Oracle:{T}: Add {C}.\n{4}, {T}, Sacrifice a land: Rath's Edge deals 1 damage to target creature or player.
diff --git a/forge-gui/res/cardsfolder/r/rattleclaw_mystic.txt b/forge-gui/res/cardsfolder/r/rattleclaw_mystic.txt
index 31735334138..725096ab436 100644
--- a/forge-gui/res/cardsfolder/r/rattleclaw_mystic.txt
+++ b/forge-gui/res/cardsfolder/r/rattleclaw_mystic.txt
@@ -3,10 +3,10 @@ ManaCost:1 G
 Types:Creature Human Shaman
 PT:2/1
 K:Morph:2
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigMana | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, add {G}{U}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigMana | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, add {G}{U}{R}.
 SVar:TrigMana:DB$ Mana | Produced$ G U R
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rattleclaw_mystic.jpg
-Oracle:{T}: Add {G}, {U}, or {R} to your mana pool.\nMorph {2} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhen Rattleclaw Mystic is turned face up, add {G}{U}{R} to your mana pool.
+Oracle:{T}: Add {G}, {U}, or {R}.\nMorph {2} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhen Rattleclaw Mystic is turned face up, add {G}{U}{R}.
diff --git a/forge-gui/res/cardsfolder/r/ravaged_highlands.txt b/forge-gui/res/cardsfolder/r/ravaged_highlands.txt
index 19ccc6cfd56..ac258bc8c99 100644
--- a/forge-gui/res/cardsfolder/r/ravaged_highlands.txt
+++ b/forge-gui/res/cardsfolder/r/ravaged_highlands.txt
@@ -1,8 +1,8 @@
 Name:Ravaged Highlands
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ravaged_highlands.jpg
-Oracle:Ravaged Highlands enters the battlefield tapped.\n{T}: Add {R} to your mana pool.\n{T}, Sacrifice Ravaged Highlands: Add one mana of any color to your mana pool.
+Oracle:Ravaged Highlands enters the battlefield tapped.\n{T}: Add {R}.\n{T}, Sacrifice Ravaged Highlands: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/r/razorverge_thicket.txt b/forge-gui/res/cardsfolder/r/razorverge_thicket.txt
index ebe06726704..2ab085a4c32 100644
--- a/forge-gui/res/cardsfolder/r/razorverge_thicket.txt
+++ b/forge-gui/res/cardsfolder/r/razorverge_thicket.txt
@@ -5,7 +5,7 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ GT2 | References$ ETBCheckSVar2 | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar2:Count$LastStateBattlefield Land.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/razorverge_thicket.jpg
-Oracle:Razorverge Thicket enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {G} or {W} to your mana pool.
+Oracle:Razorverge Thicket enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/r/red_mana_battery.txt b/forge-gui/res/cardsfolder/r/red_mana_battery.txt
index b710e1a4ad0..7dd070427b8 100644
--- a/forge-gui/res/cardsfolder/r/red_mana_battery.txt
+++ b/forge-gui/res/cardsfolder/r/red_mana_battery.txt
@@ -2,10 +2,10 @@ Name:Red Mana Battery
 ManaCost:4
 Types:Artifact
 A:AB$ PutCounter | Cost$ 2 T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ R | Amount$ Y | References$ X,Y | CostDesc$ {T}, Remove any number of charge counters from CARDNAME: | SpellDescription$ Add {R} to your mana pool, then add an additional {R} to your mana pool for each charge counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ R | Amount$ Y | References$ X,Y | CostDesc$ {T}, Remove any number of charge counters from CARDNAME: | SpellDescription$ Add {R}, then add an additional {R} for each charge counter removed this way.
 SVar:Y:Number$1/Plus.ChosenX
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/red_mana_battery.jpg
-Oracle:{2}, {T}: Put a charge counter on Red Mana Battery.\n{T}, Remove any number of charge counters from Red Mana Battery: Add {R} to your mana pool, then add an additional {R} to your mana pool for each charge counter removed this way.
+Oracle:{2}, {T}: Put a charge counter on Red Mana Battery.\n{T}, Remove any number of charge counters from Red Mana Battery: Add {R}, then add an additional {R} for each charge counter removed this way.
diff --git a/forge-gui/res/cardsfolder/r/reflecting_pool.txt b/forge-gui/res/cardsfolder/r/reflecting_pool.txt
index 1d801fbdbe2..4cb8cfdb8c8 100644
--- a/forge-gui/res/cardsfolder/r/reflecting_pool.txt
+++ b/forge-gui/res/cardsfolder/r/reflecting_pool.txt
@@ -1,7 +1,7 @@
 Name:Reflecting Pool
 ManaCost:no cost
 Types:Land
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add to your mana pool one mana of any type that a land you control could produce.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type that a land you control could produce.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reflecting_pool.jpg
-Oracle:{T}: Add to your mana pool one mana of any type that a land you control could produce.
+Oracle:{T}: Add one mana of any type that a land you control could produce.
diff --git a/forge-gui/res/cardsfolder/r/regal_behemoth.txt b/forge-gui/res/cardsfolder/r/regal_behemoth.txt
index bc884b3860e..17622a1a20b 100644
--- a/forge-gui/res/cardsfolder/r/regal_behemoth.txt
+++ b/forge-gui/res/cardsfolder/r/regal_behemoth.txt
@@ -5,7 +5,7 @@ PT:5/5
 K:Trample
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
-T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | CheckDefinedPlayer$ You.isMonarch | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a land for mana while you're the monarch, add one mana of any color to your mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | CheckDefinedPlayer$ You.isMonarch | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a land for mana while you're the monarch, add an additional one mana of any color.
 SVar:TrigMana:DB$ Mana | Produced$ Combo Any | Amount$ 1 | AILogic$ MostProminentInComputerHand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/regal_behemoth.jpg
-Oracle:Trample\nWhen Regal Behemoth enters the battlefield, you become the monarch.\nWhenever you tap a land for mana while you're the monarch, add one mana of any color to your mana pool (in addition to the mana the land produces).
\ No newline at end of file
+Oracle:Trample\nWhen Regal Behemoth enters the battlefield, you become the monarch.\nWhenever you tap a land for mana while you're the monarch, add an additional one mana of any color.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/r/reliquary_tower.txt b/forge-gui/res/cardsfolder/r/reliquary_tower.txt
index 4252c02e73c..2ea67411b6a 100644
--- a/forge-gui/res/cardsfolder/r/reliquary_tower.txt
+++ b/forge-gui/res/cardsfolder/r/reliquary_tower.txt
@@ -2,6 +2,6 @@ Name:Reliquary Tower
 ManaCost:no cost
 Types:Land
 S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reliquary_tower.jpg
-Oracle:You have no maximum hand size.\n{T}: Add {C} to your mana pool.
+Oracle:You have no maximum hand size.\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/r/remote_farm.txt b/forge-gui/res/cardsfolder/r/remote_farm.txt
index ca8fa34d095..946d9ad8daf 100644
--- a/forge-gui/res/cardsfolder/r/remote_farm.txt
+++ b/forge-gui/res/cardsfolder/r/remote_farm.txt
@@ -4,8 +4,8 @@ Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two depletion counters on it.
 SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | ETB$ True | CounterType$ DEPLETION | CounterNum$ 2
-A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ W | SubAbility$ DBSac | Amount$ 2 | SpellDescription$ Add {W}{W} to your mana pool. If there are no depletion counters on CARDNAME, sacrifice it.
+A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ W | SubAbility$ DBSac | Amount$ 2 | SpellDescription$ Add {W}{W}. If there are no depletion counters on CARDNAME, sacrifice it.
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionPresent$ Card.Self+counters_EQ0_DEPLETION
 SVar:RemRandomDeck:True
 SVar:Picture:http://wizards.com/global/images/magic/general/remote_farm.jpg
-Oracle:Remote Farm enters the battlefield tapped with two depletion counters on it.\n{T}, Remove a depletion counter from Remote Farm: Add {W}{W} to your mana pool. If there are no depletion counters on Remote Farm, sacrifice it.
+Oracle:Remote Farm enters the battlefield tapped with two depletion counters on it.\n{T}, Remove a depletion counter from Remote Farm: Add {W}{W}. If there are no depletion counters on Remote Farm, sacrifice it.
diff --git a/forge-gui/res/cardsfolder/r/remote_isle.txt b/forge-gui/res/cardsfolder/r/remote_isle.txt
index 3e715ed3106..9fa97e0509b 100644
--- a/forge-gui/res/cardsfolder/r/remote_isle.txt
+++ b/forge-gui/res/cardsfolder/r/remote_isle.txt
@@ -2,7 +2,7 @@ Name:Remote Isle
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/remote_isle.jpg
-Oracle:Remote Isle enters the battlefield tapped.\n{T}: Add {U} to your mana pool.\nCycling {2} ({2}, Discard this card: Draw a card.)
+Oracle:Remote Isle enters the battlefield tapped.\n{T}: Add {U}.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/r/renowned_weaponsmith.txt b/forge-gui/res/cardsfolder/r/renowned_weaponsmith.txt
index fa315b1eade..1f0320ec0ea 100644
--- a/forge-gui/res/cardsfolder/r/renowned_weaponsmith.txt
+++ b/forge-gui/res/cardsfolder/r/renowned_weaponsmith.txt
@@ -2,9 +2,9 @@ Name:Renowned Weaponsmith
 ManaCost:1 U
 Types:Creature Human Artificer
 PT:1/3
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Card.Artifact,Activated.Artifact | SpellDescription$ Add {C}{C} to your mana pool. Spend this mana only to cast artifact spells or activate abilities of artifacts.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Card.Artifact,Activated.Artifact | SpellDescription$ Add {C}{C}. Spend this mana only to cast artifact spells or activate abilities of artifacts.
 A:AB$ ChangeZone | Cost$ U T | Origin$ Library | Destination$ Hand| ChangeType$ Card.namedHeart-Piercer Bow,Card.namedVial of Dragonfire | ChangeNum$ 1 | StackDescription$ SpellDescription | SpellDescription$ Search your library for a card named Heart-Piercer Bow or Vial of Dragonfire, put it into your hand, then shuffle your library.
 DeckHints:Name$Heart-Piercer Bow|Vial of Dragonfire
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/renowned_weaponsmith.jpg
-Oracle:{T}: Add {C}{C} to your mana pool. Spend this mana only to cast artifact spells or activate abilities of artifacts.\n{U}, {T}: Search your library for a card named Heart-Piercer Bow or Vial of Dragonfire, reveal it, put it into your hand, then shuffle your library.
+Oracle:{T}: Add {C}{C}. Spend this mana only to cast artifact spells or activate abilities of artifacts.\n{U}, {T}: Search your library for a card named Heart-Piercer Bow or Vial of Dragonfire, reveal it, put it into your hand, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/r/revel_in_riches.txt b/forge-gui/res/cardsfolder/r/revel_in_riches.txt
index 4f9ac312deb..7b42629bb92 100644
--- a/forge-gui/res/cardsfolder/r/revel_in_riches.txt
+++ b/forge-gui/res/cardsfolder/r/revel_in_riches.txt
@@ -1,11 +1,11 @@
 Name:Revel in Riches
 ManaCost:4 B
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ DBTreasure | TriggerDescription$ Whenever a creature an opponent controls dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
-SVar:DBTreasure:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | SpellDescription$ Create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ DBTreasure | TriggerDescription$ Whenever a creature an opponent controls dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
+SVar:DBTreasure:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | SpellDescription$ Create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | PresentCompare$ GE10 | IsPresent$ Treasure.YouCtrl | Execute$ TrigWinsGame | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if you control ten or more Treasures, you win the game.
 SVar:TrigWinsGame:DB$WinsGame | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/revel_in_riches.jpg
 DeckHas:Ability$Token
-Oracle:Whenever a creature an opponent controls dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."\nAt the beginning of your upkeep, if you control ten or more Treasures, you win the game.
+Oracle:Whenever a creature an opponent controls dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."\nAt the beginning of your upkeep, if you control ten or more Treasures, you win the game.
diff --git a/forge-gui/res/cardsfolder/r/rhystic_cave.txt b/forge-gui/res/cardsfolder/r/rhystic_cave.txt
index 3badd043da1..d8a1f189cb3 100644
--- a/forge-gui/res/cardsfolder/r/rhystic_cave.txt
+++ b/forge-gui/res/cardsfolder/r/rhystic_cave.txt
@@ -1,8 +1,8 @@
 Name:Rhystic Cave
 ManaCost:no cost
 Types:Land
-A:AB$ ChooseColor | Cost$ T | AILogic$ MostProminentInComputerDeck | SubAbility$ DBMana | InstantSpeed$ True | SpellDescription$ Choose a color. Add one mana of that color to your mana pool unless any player pays {1}. Activate this ability only any time you could cast an instant.
-SVar:DBMana:DB$ Mana | Produced$ Chosen | UnlessCost$ 1 | UnlessPayer$ Player | SpellDescription$ Add one mana of the chosen color to your mana pool.
+A:AB$ ChooseColor | Cost$ T | AILogic$ MostProminentInComputerDeck | SubAbility$ DBMana | InstantSpeed$ True | SpellDescription$ Choose a color. Add one mana of that color unless any player pays {1}. Activate this ability only any time you could cast an instant.
+SVar:DBMana:DB$ Mana | Produced$ Chosen | UnlessCost$ 1 | UnlessPayer$ Player | SpellDescription$ Add one mana of the chosen color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rhystic_cave.jpg
-Oracle:{T}: Choose a color. Add one mana of that color to your mana pool unless any player pays {1}. Activate this ability only any time you could cast an instant.
+Oracle:{T}: Choose a color. Add one mana of that color unless any player pays {1}. Activate this ability only any time you could cast an instant.
diff --git a/forge-gui/res/cardsfolder/r/riftstone_portal.txt b/forge-gui/res/cardsfolder/r/riftstone_portal.txt
index 839003d0ab9..0257995cde4 100644
--- a/forge-gui/res/cardsfolder/r/riftstone_portal.txt
+++ b/forge-gui/res/cardsfolder/r/riftstone_portal.txt
@@ -1,9 +1,9 @@
 Name:Riftstone Portal
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-S:Mode$ Continuous | EffectZone$ Graveyard | Affected$ Land.YouCtrl | AddAbility$ ManaG & ManaW | Description$ As long as Riftstone Portal is in your graveyard, lands you control have "{T}: Add {G} or {W} to your mana pool."
-SVar:ManaG:AB$Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-SVar:ManaW:AB$Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+S:Mode$ Continuous | EffectZone$ Graveyard | Affected$ Land.YouCtrl | AddAbility$ ManaG & ManaW | Description$ As long as Riftstone Portal is in your graveyard, lands you control have "{T}: Add {G} or {W}."
+SVar:ManaG:AB$Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+SVar:ManaW:AB$Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/riftstone_portal.jpg
-Oracle:{T}: Add {C} to your mana pool.\nAs long as Riftstone Portal is in your graveyard, lands you control have "{T}: Add {G} or {W} to your mana pool."
+Oracle:{T}: Add {C}.\nAs long as Riftstone Portal is in your graveyard, lands you control have "{T}: Add {G} or {W}."
diff --git a/forge-gui/res/cardsfolder/r/riptide_laboratory.txt b/forge-gui/res/cardsfolder/r/riptide_laboratory.txt
index 3acd033b720..016f927187c 100644
--- a/forge-gui/res/cardsfolder/r/riptide_laboratory.txt
+++ b/forge-gui/res/cardsfolder/r/riptide_laboratory.txt
@@ -1,8 +1,8 @@
 Name:Riptide Laboratory
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 1 U T | ValidTgts$ Card.Wizard+YouCtrl | TgtPrompt$ Select target Wizard you control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target Wizard you control to its owner's hand.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/riptide_laboratory.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{U}, {T}: Return target Wizard you control to its owner's hand.
+Oracle:{T}: Add {C}.\n{1}{U}, {T}: Return target Wizard you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/r/rishadan_port.txt b/forge-gui/res/cardsfolder/r/rishadan_port.txt
index ec94ec5da82..1380c242e49 100644
--- a/forge-gui/res/cardsfolder/r/rishadan_port.txt
+++ b/forge-gui/res/cardsfolder/r/rishadan_port.txt
@@ -1,8 +1,8 @@
 Name:Rishadan Port
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Tap | Cost$ 1 T | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Tap target land.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rishadan_port.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Tap target land.
+Oracle:{T}: Add {C}.\n{1}, {T}: Tap target land.
diff --git a/forge-gui/res/cardsfolder/r/rishkar_peema_renegade.txt b/forge-gui/res/cardsfolder/r/rishkar_peema_renegade.txt
index 9ce4e73f8bc..da5e52cc411 100644
--- a/forge-gui/res/cardsfolder/r/rishkar_peema_renegade.txt
+++ b/forge-gui/res/cardsfolder/r/rishkar_peema_renegade.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Elf Druid
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on each of up to two target creatures.
 SVar:TrigPut:DB$PutCounter | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+HasCounters | AddAbility$ Mana | Description$ Each creature you control with a counter on it has "{T}: Add {G} to your mana pool."
-SVar:Mana:AB$Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool. 
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+HasCounters | AddAbility$ Mana | Description$ Each creature you control with a counter on it has "{T}: Add {G}."
+SVar:Mana:AB$Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rishkar_peema_renegade.jpg
-Oracle:When Rishkar, Peema Renegade enters the battlefield, put a +1/+1 counter on each of up to two target creatures.\nEach creature you control with a counter on it has "{T}: Add {G} to your mana pool."
+Oracle:When Rishkar, Peema Renegade enters the battlefield, put a +1/+1 counter on each of up to two target creatures.\nEach creature you control with a counter on it has "{T}: Add {G}."
diff --git a/forge-gui/res/cardsfolder/r/rite_of_flame.txt b/forge-gui/res/cardsfolder/r/rite_of_flame.txt
index 1d123dbdaca..197b29dd6ef 100644
--- a/forge-gui/res/cardsfolder/r/rite_of_flame.txt
+++ b/forge-gui/res/cardsfolder/r/rite_of_flame.txt
@@ -1,8 +1,8 @@
 Name:Rite of Flame
 ManaCost:R
 Types:Sorcery
-A:SP$ Mana | Cost$ R | Produced$ R | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R}{R} to your mana pool, then add {R} to your mana pool for each card named CARDNAME in each graveyard.
+A:SP$ Mana | Cost$ R | Produced$ R | Amount$ X | References$ X | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R}{R}, then add {R} for each card named CARDNAME in each graveyard.
 SVar:X:Count$NamedInAllYards.Rite of Flame/Plus.2
 DeckHints:Name$Rite of Flame
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rite_of_flame.jpg
-Oracle:Add {R}{R} to your mana pool, then add {R} to your mana pool for each card named Rite of Flame in each graveyard.
+Oracle:Add {R}{R}, then add {R} for each card named Rite of Flame in each graveyard.
diff --git a/forge-gui/res/cardsfolder/r/riths_attendant.txt b/forge-gui/res/cardsfolder/r/riths_attendant.txt
index 4cf9f2dd29c..62030f37010 100644
--- a/forge-gui/res/cardsfolder/r/riths_attendant.txt
+++ b/forge-gui/res/cardsfolder/r/riths_attendant.txt
@@ -2,7 +2,7 @@ Name:Rith's Attendant
 ManaCost:5
 Types:Artifact Creature Golem
 PT:3/3
-A:AB$ Mana | Cost$ 1 Sac<1/CARDNAME> | Produced$ R G W | SpellDescription$ Add {R}{G}{W} to your mana pool.
+A:AB$ Mana | Cost$ 1 Sac<1/CARDNAME> | Produced$ R G W | SpellDescription$ Add {R}{G}{W}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/riths_attendant.jpg
-Oracle:{1}, Sacrifice Rith's Attendant: Add {R}{G}{W} to your mana pool.
+Oracle:{1}, Sacrifice Rith's Attendant: Add {R}{G}{W}.
diff --git a/forge-gui/res/cardsfolder/r/riths_grove.txt b/forge-gui/res/cardsfolder/r/riths_grove.txt
index cc29e732eab..6a69e45aef2 100644
--- a/forge-gui/res/cardsfolder/r/riths_grove.txt
+++ b/forge-gui/res/cardsfolder/r/riths_grove.txt
@@ -1,11 +1,11 @@
 Name:Rith's Grove
 ManaCost:no cost
 Types:Land Lair
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You
 SVar:NeedsToPlay:Land.nonLair+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/riths_grove.jpg
-Oracle:When Rith's Grove enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {R}, {G}, or {W} to your mana pool.
+Oracle:When Rith's Grove enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {R}, {G}, or {W}.
diff --git a/forge-gui/res/cardsfolder/r/riven_turnbull.txt b/forge-gui/res/cardsfolder/r/riven_turnbull.txt
index 9938df19020..3c709210b46 100644
--- a/forge-gui/res/cardsfolder/r/riven_turnbull.txt
+++ b/forge-gui/res/cardsfolder/r/riven_turnbull.txt
@@ -2,6 +2,6 @@ Name:Riven Turnbull
 ManaCost:5 U B
 Types:Legendary Creature Human Advisor
 PT:5/7
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://resources.wizards.com/magic/cards/le/en-us/card1680.jpg
-Oracle:{T}: Add {B} to your mana pool.
+Oracle:{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/r/river_delta.txt b/forge-gui/res/cardsfolder/r/river_delta.txt
index 82cfa9da8cc..9a3f5141d2b 100644
--- a/forge-gui/res/cardsfolder/r/river_delta.txt
+++ b/forge-gui/res/cardsfolder/r/river_delta.txt
@@ -2,10 +2,10 @@ Name:River Delta
 ManaCost:no cost
 Types:Land
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_DEPLETION | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ CARDNAME doesn't untap during your untap step if it has a depletion counter on it.
-A:AB$ Mana | Cost$ T | Produced$ U | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {U} to your mana pool. Put a depletion counter on CARDNAME.
-A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {B} to your mana pool. Put a depletion counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ U | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {U}. Put a depletion counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {B}. Put a depletion counter on CARDNAME.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSubCounter | TriggerDescription$ At the beginning of your upkeep, remove a depletion counter from CARDNAME.
 SVar:TrigSubCounter:DB$RemoveCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 1
 SVar:AddCounter:DB$PutCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/river_delta.jpg
-Oracle:River Delta doesn't untap during your untap step if it has a depletion counter on it.\nAt the beginning of your upkeep, remove a depletion counter from River Delta.\n{T}: Add {U} or {B} to your mana pool. Put a depletion counter on River Delta.
+Oracle:River Delta doesn't untap during your untap step if it has a depletion counter on it.\nAt the beginning of your upkeep, remove a depletion counter from River Delta.\n{T}: Add {U} or {B}. Put a depletion counter on River Delta.
diff --git a/forge-gui/res/cardsfolder/r/river_of_tears.txt b/forge-gui/res/cardsfolder/r/river_of_tears.txt
index a757a603007..a724b2ca4cb 100644
--- a/forge-gui/res/cardsfolder/r/river_of_tears.txt
+++ b/forge-gui/res/cardsfolder/r/river_of_tears.txt
@@ -1,8 +1,8 @@
 Name:River of Tears
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ U | ReplaceIfLandPlayed$ B | SpellDescription$ Add {U} to your mana pool. If you played a land this turn, add {B} to your mana pool instead.
+A:AB$ Mana | Cost$ T | Produced$ U | ReplaceIfLandPlayed$ B | SpellDescription$ Add {U}. If you played a land this turn, add {B} instead.
 SVar:RemRandomDeck:True
 DeckHints:Color$Blue|Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/river_of_tears.jpg
-Oracle:{T}: Add {U} to your mana pool. If you played a land this turn, add {B} to your mana pool instead.
+Oracle:{T}: Add {U}. If you played a land this turn, add {B} instead.
diff --git a/forge-gui/res/cardsfolder/r/rix_maadi_dungeon_palace.txt b/forge-gui/res/cardsfolder/r/rix_maadi_dungeon_palace.txt
index 2b99bd5f747..2a9364e08c0 100644
--- a/forge-gui/res/cardsfolder/r/rix_maadi_dungeon_palace.txt
+++ b/forge-gui/res/cardsfolder/r/rix_maadi_dungeon_palace.txt
@@ -1,7 +1,7 @@
 Name:Rix Maadi, Dungeon Palace
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Discard | Cost$ 1 B R T | NumCards$ 1 | Mode$ TgtChoose | Defined$ Player | SorcerySpeed$ True | SpellDescription$ Each player discards a card. Activate this ability only any time you could cast a sorcery.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rix_maadi_dungeon_palace.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{B}{R}, {T}: Each player discards a card. Activate this ability only any time you could cast a sorcery.
+Oracle:{T}: Add {C}.\n{1}{B}{R}, {T}: Each player discards a card. Activate this ability only any time you could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/r/rofellos_llanowar_emissary.txt b/forge-gui/res/cardsfolder/r/rofellos_llanowar_emissary.txt
index 77400b1f677..91c49aa73e4 100644
--- a/forge-gui/res/cardsfolder/r/rofellos_llanowar_emissary.txt
+++ b/forge-gui/res/cardsfolder/r/rofellos_llanowar_emissary.txt
@@ -2,7 +2,7 @@ Name:Rofellos, Llanowar Emissary
 ManaCost:G G
 Types:Legendary Creature Elf Druid
 PT:2/1
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} to your mana pool for each Forest you control.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add {G} for each Forest you control.
 SVar:X:Count$Valid Forest.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rofellos_llanowar_emissary.jpg
-Oracle:{T}: Add {G} to your mana pool for each Forest you control.
+Oracle:{T}: Add {G} for each Forest you control.
diff --git a/forge-gui/res/cardsfolder/r/rogues_passage.txt b/forge-gui/res/cardsfolder/r/rogues_passage.txt
index 727ea2f5571..8a216abb310 100644
--- a/forge-gui/res/cardsfolder/r/rogues_passage.txt
+++ b/forge-gui/res/cardsfolder/r/rogues_passage.txt
@@ -1,7 +1,7 @@
 Name:Rogue's Passage
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ 4 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rogues_passage.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}, {T}: Target creature can't be blocked this turn.
+Oracle:{T}: Add {C}.\n{4}, {T}: Target creature can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/r/rootbound_crag.txt b/forge-gui/res/cardsfolder/r/rootbound_crag.txt
index 7e4933a623e..33f3b69615e 100644
--- a/forge-gui/res/cardsfolder/r/rootbound_crag.txt
+++ b/forge-gui/res/cardsfolder/r/rootbound_crag.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Mountain.YouCtrl,Forest.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Mountain or a Forest.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rootbound_crag.jpg
-Oracle:Rootbound Crag enters the battlefield tapped unless you control a Mountain or a Forest.\n{T}: Add {R} or {G} to your mana pool.
+Oracle:Rootbound Crag enters the battlefield tapped unless you control a Mountain or a Forest.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/r/rootwater_depths.txt b/forge-gui/res/cardsfolder/r/rootwater_depths.txt
index 750992ece70..b67b053d7d1 100644
--- a/forge-gui/res/cardsfolder/r/rootwater_depths.txt
+++ b/forge-gui/res/cardsfolder/r/rootwater_depths.txt
@@ -1,9 +1,9 @@
 Name:Rootwater Depths
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}. 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:Picture:http://magiccards.info/scans/en/tp/329.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {U} or {B} to your mana pool. Rootwater Depths doesn't untap during your next untap step.
+Oracle:{T}: Add {C}.\n{T}: Add {U} or {B}. Rootwater Depths doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/r/rosheen_meanderer.txt b/forge-gui/res/cardsfolder/r/rosheen_meanderer.txt
index d9beffe02d0..edc7f688dc7 100644
--- a/forge-gui/res/cardsfolder/r/rosheen_meanderer.txt
+++ b/forge-gui/res/cardsfolder/r/rosheen_meanderer.txt
@@ -2,6 +2,6 @@ Name:Rosheen Meanderer
 ManaCost:3 RG
 Types:Legendary Creature Giant Shaman
 PT:4/4
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 4 | RestrictValid$ CostContainsX | SpellDescription$ Add {C}{C}{C}{C} to your mana pool. Spend this mana only on costs that contain {X}.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 4 | RestrictValid$ CostContainsX | SpellDescription$ Add {C}{C}{C}{C}. Spend this mana only on costs that contain {X}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rosheen_meanderer.jpg
-Oracle:{T}: Add {C}{C}{C}{C} to your mana pool. Spend this mana only on costs that contain {X}.
+Oracle:{T}: Add {C}{C}{C}{C}. Spend this mana only on costs that contain {X}.
diff --git a/forge-gui/res/cardsfolder/r/rugged_highlands.txt b/forge-gui/res/cardsfolder/r/rugged_highlands.txt
index 64cda963582..796e361355e 100644
--- a/forge-gui/res/cardsfolder/r/rugged_highlands.txt
+++ b/forge-gui/res/cardsfolder/r/rugged_highlands.txt
@@ -1,10 +1,10 @@
 Name:Rugged Highlands
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rugged_highlands.jpg
-Oracle:Rugged Highlands enters the battlefield tapped.\nWhen Rugged Highlands enters the battlefield, you gain 1 life.\n{T}: Add {R} or {G} to your mana pool.
+Oracle:Rugged Highlands enters the battlefield tapped.\nWhen Rugged Highlands enters the battlefield, you gain 1 life.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/r/rugged_prairie.txt b/forge-gui/res/cardsfolder/r/rugged_prairie.txt
index baf7596fbf2..c71474e1d50 100644
--- a/forge-gui/res/cardsfolder/r/rugged_prairie.txt
+++ b/forge-gui/res/cardsfolder/r/rugged_prairie.txt
@@ -1,10 +1,10 @@
 Name:Rugged Prairie
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ RW T | Produced$ W | Amount$ 2 | SpellDescription$ Add {W}{W} to your mana pool.
-A:AB$ Mana | Cost$ RW T | Produced$ R W | SpellDescription$ Add {R}{W} to your mana pool.
-A:AB$ Mana | Cost$ RW T | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ RW T | Produced$ W | Amount$ 2 | SpellDescription$ Add {W}{W}.
+A:AB$ Mana | Cost$ RW T | Produced$ R W | SpellDescription$ Add {R}{W}.
+A:AB$ Mana | Cost$ RW T | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rugged_prairie.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{R/W}, {T}: Add {R}{R}, {R}{W}, or {W}{W} to your mana pool.
+Oracle:{T}: Add {C}.\n{R/W}, {T}: Add {R}{R}, {R}{W}, or {W}{W}.
diff --git a/forge-gui/res/cardsfolder/r/ruins_of_oran_rief.txt b/forge-gui/res/cardsfolder/r/ruins_of_oran_rief.txt
index 5af264bfd16..3f1fabac1d7 100644
--- a/forge-gui/res/cardsfolder/r/ruins_of_oran_rief.txt
+++ b/forge-gui/res/cardsfolder/r/ruins_of_oran_rief.txt
@@ -2,9 +2,9 @@ Name:Ruins of Oran-Rief
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ T | ValidTgts$ Creature.Colorless+enteredBattlefieldThisTurn | TgtPrompt$ Select target colorless creature that entered the battlefield this turn | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target colorless creature that entered the battlefield this turn.
 DeckHas:Ability$Mana.Colorless
 DeckHints:Color$Colorless & Keyword$Devoid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ruins_of_oran_rief.jpg
-Oracle:Ruins of Oran-Rief enters the battlefield tapped.\n{T}: Add {C} to your mana pool. ({C} represents colorless mana.)\n{T}: Put a +1/+1 counter on target colorless creature that entered the battlefield this turn.
+Oracle:Ruins of Oran-Rief enters the battlefield tapped.\n{T}: Add {C}. ({C} represents colorless mana.)\n{T}: Put a +1/+1 counter on target colorless creature that entered the battlefield this turn.
diff --git a/forge-gui/res/cardsfolder/r/ruins_of_trokair.txt b/forge-gui/res/cardsfolder/r/ruins_of_trokair.txt
index c7a39459bb4..d1b1902eee3 100644
--- a/forge-gui/res/cardsfolder/r/ruins_of_trokair.txt
+++ b/forge-gui/res/cardsfolder/r/ruins_of_trokair.txt
@@ -2,8 +2,8 @@ Name:Ruins of Trokair
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ W | Amount$ 2 | SpellDescription$ Add {W}{W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ W | Amount$ 2 | SpellDescription$ Add {W}{W}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ruins_of_trokair.jpg
-Oracle:Ruins of Trokair enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\n{T}, Sacrifice Ruins of Trokair: Add {W}{W} to your mana pool.
+Oracle:Ruins of Trokair enters the battlefield tapped.\n{T}: Add {W}.\n{T}, Sacrifice Ruins of Trokair: Add {W}{W}.
diff --git a/forge-gui/res/cardsfolder/r/rupture_spire.txt b/forge-gui/res/cardsfolder/r/rupture_spire.txt
index 2f9d7c2dd6d..6b20c885dd1 100644
--- a/forge-gui/res/cardsfolder/r/rupture_spire.txt
+++ b/forge-gui/res/cardsfolder/r/rupture_spire.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you pay {1}.
 SVar:TrigSac:DB$Sacrifice | Defined$ Self | UnlessCost$ 1 | UnlessPayer$ You
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:NeedsToPlay:Land.untapped+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rupture_spire.jpg
-Oracle:Rupture Spire enters the battlefield tapped.\nWhen Rupture Spire enters the battlefield, sacrifice it unless you pay {1}.\n{T}: Add one mana of any color to your mana pool.
+Oracle:Rupture Spire enters the battlefield tapped.\nWhen Rupture Spire enters the battlefield, sacrifice it unless you pay {1}.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/r/rushwood_grove.txt b/forge-gui/res/cardsfolder/r/rushwood_grove.txt
index 19f7582cc59..f68dd537758 100644
--- a/forge-gui/res/cardsfolder/r/rushwood_grove.txt
+++ b/forge-gui/res/cardsfolder/r/rushwood_grove.txt
@@ -3,9 +3,9 @@ ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
 A:AB$ PutCounter | Cost$ T | Defined$ Self | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ G | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {G} to your mana pool for each storage counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ G | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {G} for each storage counter removed this way.
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rushwood_grove.jpg
-Oracle:Rushwood Grove enters the battlefield tapped.\n{T}: Put a storage counter on Rushwood Grove.\n{T}, Remove any number of storage counters from Rushwood Grove: Add {G} to your mana pool for each storage counter removed this way.
+Oracle:Rushwood Grove enters the battlefield tapped.\n{T}: Put a storage counter on Rushwood Grove.\n{T}, Remove any number of storage counters from Rushwood Grove: Add {G} for each storage counter removed this way.
diff --git a/forge-gui/res/cardsfolder/r/rustic_clachan.txt b/forge-gui/res/cardsfolder/r/rustic_clachan.txt
index ab699ce548a..6c6ba964170 100644
--- a/forge-gui/res/cardsfolder/r/rustic_clachan.txt
+++ b/forge-gui/res/cardsfolder/r/rustic_clachan.txt
@@ -2,11 +2,11 @@ Name:Rustic Clachan
 ManaCost:no cost
 Types:Land
 K:Reinforce:1:1 W
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Kithkin> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Kithkin card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 DeckHints:Type$Kithkin
 DeckHas:Ability$Counters
 DeckNeeds:Type$Creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rustic_clachan.jpg
-Oracle:As Rustic Clachan enters the battlefield, you may reveal a Kithkin card from your hand. If you don't, Rustic Clachan enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\nReinforce 1—{1}{W} ({1}{W}, Discard this card: Put a +1/+1 counter on target creature.)
+Oracle:As Rustic Clachan enters the battlefield, you may reveal a Kithkin card from your hand. If you don't, Rustic Clachan enters the battlefield tapped.\n{T}: Add {W}.\nReinforce 1—{1}{W} ({1}{W}, Discard this card: Put a +1/+1 counter on target creature.)
diff --git a/forge-gui/res/cardsfolder/r/ruthless_knave.txt b/forge-gui/res/cardsfolder/r/ruthless_knave.txt
index eb919c83efe..ff8593c8aba 100644
--- a/forge-gui/res/cardsfolder/r/ruthless_knave.txt
+++ b/forge-gui/res/cardsfolder/r/ruthless_knave.txt
@@ -2,10 +2,10 @@ Name:Ruthless Knave
 ManaCost:2 B
 Types:Creature Orc Pirate
 PT:3/2
-A:AB$ Token | Cost$ 2 B Sac<1/Creature> | TokenAmount$ 2 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3 | SpellDescription$ Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Token | Cost$ 2 B Sac<1/Creature> | TokenAmount$ 2 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3 | SpellDescription$ Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color."
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 A:AB$ Draw | Cost$ Sac<3/Treasure> | NumCards$ 1 | SpellDescription$ Draw a card
 SVar:DBDiscard:DB$Discard | Defined$ You | Mode$ TgtChoose | DiscardValid$ Card.IsRemembered | NumCards$ 1 | SubAbility$ DBCleanup
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ruthless_knave.jpg
 DeckHas:Ability$Token
-Oracle:{2}{B}, Sacrifice a creature: Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."\nSacrifice three Treasures: Draw a card.
+Oracle:{2}{B}, Sacrifice a creature: Create two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color."\nSacrifice three Treasures: Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/sacellum_godspeaker.txt b/forge-gui/res/cardsfolder/s/sacellum_godspeaker.txt
index 64363d14574..ca398257f41 100644
--- a/forge-gui/res/cardsfolder/s/sacellum_godspeaker.txt
+++ b/forge-gui/res/cardsfolder/s/sacellum_godspeaker.txt
@@ -2,10 +2,10 @@ Name:Sacellum Godspeaker
 ManaCost:2 G
 Types:Creature Elf Druid
 PT:2/2
-A:AB$ Reveal | Cost$ T | RevealValid$ Creature.powerGE5+YouCtrl | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBspeakerMana | SpellDescription$ Reveal any number of creature cards with power 5 or greater from your hand. Add {G} to your mana pool for each card revealed this way.
+A:AB$ Reveal | Cost$ T | RevealValid$ Creature.powerGE5+YouCtrl | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBspeakerMana | SpellDescription$ Reveal any number of creature cards with power 5 or greater from your hand. Add {G} for each card revealed this way.
 SVar:DBspeakerMana:DB$ Mana | Produced$ G | Amount$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sacellum_godspeaker.jpg
-Oracle:{T}: Reveal any number of creature cards with power 5 or greater from your hand. Add {G} to your mana pool for each card revealed this way.
+Oracle:{T}: Reveal any number of creature cards with power 5 or greater from your hand. Add {G} for each card revealed this way.
diff --git a/forge-gui/res/cardsfolder/s/sachi_daughter_of_seshiro.txt b/forge-gui/res/cardsfolder/s/sachi_daughter_of_seshiro.txt
index 040ea679b1c..00d58e752a2 100644
--- a/forge-gui/res/cardsfolder/s/sachi_daughter_of_seshiro.txt
+++ b/forge-gui/res/cardsfolder/s/sachi_daughter_of_seshiro.txt
@@ -3,8 +3,8 @@ ManaCost:2 G G
 Types:Legendary Creature Snake Shaman
 PT:1/3
 S:Mode$ Continuous | Affected$ Creature.Snake+Other+YouCtrl | AddToughness$ 1 | Description$ Other Snake creatures you control get +0/+1.
-S:Mode$ Continuous | Affected$ Card.Shaman+YouCtrl | AddAbility$ Mana | Description$ Shamans you control have "{T}: Add {G}{G} to your mana pool."
-SVar:Mana:AB$Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool.
+S:Mode$ Continuous | Affected$ Card.Shaman+YouCtrl | AddAbility$ Mana | Description$ Shamans you control have "{T}: Add {G}{G}."
+SVar:Mana:AB$Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
 DeckHints:Type$Snake|Shaman
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sachi_daughter_of_seshiro.jpg
-Oracle:Other Snake creatures you control get +0/+1.\nShamans you control have "{T}: Add {G}{G} to your mana pool."
+Oracle:Other Snake creatures you control get +0/+1.\nShamans you control have "{T}: Add {G}{G}."
diff --git a/forge-gui/res/cardsfolder/s/sacred_foundry.txt b/forge-gui/res/cardsfolder/s/sacred_foundry.txt
index 3aed0e3c65c..fb01dfd626a 100644
--- a/forge-gui/res/cardsfolder/s/sacred_foundry.txt
+++ b/forge-gui/res/cardsfolder/s/sacred_foundry.txt
@@ -4,4 +4,4 @@ Types:Land Mountain Plains
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | UnlessAI$ Shockland | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://resources.wizards.com/magic/cards/rav/en-us/card89066.jpg
-Oracle:({T}: Add {R} or {W} to your mana pool.)\nAs Sacred Foundry enters the battlefield, you may pay 2 life. If you don't, Sacred Foundry enters the battlefield tapped.
+Oracle:({T}: Add {R} or {W}.)\nAs Sacred Foundry enters the battlefield, you may pay 2 life. If you don't, Sacred Foundry enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/s/sacrifice.txt b/forge-gui/res/cardsfolder/s/sacrifice.txt
index e5a545a7662..bf76abb216f 100644
--- a/forge-gui/res/cardsfolder/s/sacrifice.txt
+++ b/forge-gui/res/cardsfolder/s/sacrifice.txt
@@ -1,8 +1,8 @@
 Name:Sacrifice
 ManaCost:B
 Types:Instant
-A:SP$ Mana | Cost$ B Sac<1/Creature> | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add to your mana pool an amount of black mana equal to the sacrificed creature's converted mana cost.
+A:SP$ Mana | Cost$ B Sac<1/Creature> | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add an amount of black mana equal to the sacrificed creature's converted mana cost.
 SVar:X:Sacrificed$CardManaCost
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sacrifice.jpg
-Oracle:As an additional cost to cast Sacrifice, sacrifice a creature.\nAdd to your mana pool an amount of {B} equal to the sacrificed creature's converted mana cost.
+Oracle:As an additional cost to cast Sacrifice, sacrifice a creature.\nAdd an amount of {B} equal to the sacrificed creature's converted mana cost.
diff --git a/forge-gui/res/cardsfolder/s/sailor_of_means.txt b/forge-gui/res/cardsfolder/s/sailor_of_means.txt
index 162b575f36e..06f0f42f54c 100644
--- a/forge-gui/res/cardsfolder/s/sailor_of_means.txt
+++ b/forge-gui/res/cardsfolder/s/sailor_of_means.txt
@@ -2,8 +2,8 @@ Name:Sailor of Means
 ManaCost:2 U
 Types:Creature Human Pirate
 PT:1/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTreasure | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME enters the battlefield, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTreasure | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME enters the battlefield, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:TrigTreasure:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sailor_of_means.jpg
-Oracle:When Sailor of Means enters the battlefield, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
\ No newline at end of file
+Oracle:When Sailor of Means enters the battlefield, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/sakiko_mother_of_summer.txt b/forge-gui/res/cardsfolder/s/sakiko_mother_of_summer.txt
index 6f184319467..585d71153a6 100644
--- a/forge-gui/res/cardsfolder/s/sakiko_mother_of_summer.txt
+++ b/forge-gui/res/cardsfolder/s/sakiko_mother_of_summer.txt
@@ -2,8 +2,8 @@ Name:Sakiko, Mother of Summer
 ManaCost:4 G G
 Types:Legendary Creature Snake Shaman
 PT:3/3
-T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ SakuraManaSingle | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control deals combat damage to a player, add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
+T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ SakuraManaSingle | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control deals combat damage to a player, add that much {G}. Until end of turn, you don't lose this mana as steps and phases end.
 SVar:SakuraManaSingle:DB$ Mana | Produced$ G | Amount$ SakuraX | References$ SakuraX | PersistentMana$ True
 SVar:SakuraX:TriggerCount$DamageAmount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sakiko_mother_of_summer.jpg
-Oracle:Whenever a creature you control deals combat damage to a player, add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
+Oracle:Whenever a creature you control deals combat damage to a player, add that much {G}. Until end of turn, you don't lose this mana as steps and phases end.
diff --git a/forge-gui/res/cardsfolder/s/sakura_tribe_springcaller.txt b/forge-gui/res/cardsfolder/s/sakura_tribe_springcaller.txt
index 94cb77b707a..b9f20cfea6b 100644
--- a/forge-gui/res/cardsfolder/s/sakura_tribe_springcaller.txt
+++ b/forge-gui/res/cardsfolder/s/sakura_tribe_springcaller.txt
@@ -2,7 +2,7 @@ Name:Sakura-Tribe Springcaller
 ManaCost:3 G
 Types:Creature Snake Shaman
 PT:2/4
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ SakuraManaSingle | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, add {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ SakuraManaSingle | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, add {G}. Until end of turn, you don't lose this mana as steps and phases end.
 SVar:SakuraManaSingle:DB$ Mana | Produced$ G | PersistentMana$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sakura_tribe_springcaller.jpg
-Oracle:At the beginning of your upkeep, add {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
+Oracle:At the beginning of your upkeep, add {G}. Until end of turn, you don't lose this mana as steps and phases end.
diff --git a/forge-gui/res/cardsfolder/s/salt_flats.txt b/forge-gui/res/cardsfolder/s/salt_flats.txt
index 2b93bc70da0..84484b261ce 100644
--- a/forge-gui/res/cardsfolder/s/salt_flats.txt
+++ b/forge-gui/res/cardsfolder/s/salt_flats.txt
@@ -1,10 +1,10 @@
 Name:Salt Flats
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-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.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/salt_flats.jpg
-Oracle:Salt Flats enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{T}: Add {W} or {B} to your mana pool. Salt Flats deals 1 damage to you.
+Oracle:Salt Flats enters the battlefield tapped.\n{T}: Add {C}.\n{T}: Add {W} or {B}. Salt Flats deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/s/salt_marsh.txt b/forge-gui/res/cardsfolder/s/salt_marsh.txt
index 5f5725bf9a8..11587f2783e 100644
--- a/forge-gui/res/cardsfolder/s/salt_marsh.txt
+++ b/forge-gui/res/cardsfolder/s/salt_marsh.txt
@@ -2,7 +2,7 @@ Name:Salt Marsh
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/salt_marsh.jpg
-Oracle:Salt Marsh enters the battlefield tapped.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:Salt Marsh enters the battlefield tapped.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/s/saltcrusted_steppe.txt b/forge-gui/res/cardsfolder/s/saltcrusted_steppe.txt
index d453c70faf9..4c9a12b54ef 100644
--- a/forge-gui/res/cardsfolder/s/saltcrusted_steppe.txt
+++ b/forge-gui/res/cardsfolder/s/saltcrusted_steppe.txt
@@ -1,10 +1,10 @@
 Name:Saltcrusted Steppe
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PutCounter | Cost$ 1 T | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo G W | Amount$ ChosenX | CostDesc$ {1}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of {G} and/or {W} to your mana pool.
+A:AB$ Mana | Cost$ 1 SubCounter<X/STORAGE> | Produced$ Combo G W | Amount$ ChosenX | CostDesc$ {1}, Remove X storage counters from CARDNAME: | References$ X | SpellDescription$ Add X mana in any combination of {G} and/or {W}.
 SVar:X:XChoice
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/saltcrusted_steppe.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Put a storage counter on Saltcrusted Steppe.\n{1}, Remove X storage counters from Saltcrusted Steppe: Add X mana in any combination of {G} and/or {W} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Put a storage counter on Saltcrusted Steppe.\n{1}, Remove X storage counters from Saltcrusted Steppe: Add X mana in any combination of {G} and/or {W}.
diff --git a/forge-gui/res/cardsfolder/s/sanctum_of_ugin.txt b/forge-gui/res/cardsfolder/s/sanctum_of_ugin.txt
index 84c1249fc6f..9f4baeac278 100644
--- a/forge-gui/res/cardsfolder/s/sanctum_of_ugin.txt
+++ b/forge-gui/res/cardsfolder/s/sanctum_of_ugin.txt
@@ -1,9 +1,9 @@
 Name:Sanctum of Ugin
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 T:Mode$ SpellCast | ValidCard$ Card.Colorless+cmcGE7 | ValidActivatingPlayer$ You | Execute$ TrigSearch | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a colorless spell with converted mana cost 7 or greater, you may sacrifice CARDNAME. If you do, search your library for a colorless creature card, reveal it, put it into your hand, then shuffle your library.
 SVar:TrigSearch:AB$ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Colorless | ChangeNum$ 1
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sanctum_of_ugin.jpg
-Oracle:{T}: Add {C} to your mana pool.\nWhenever you cast a colorless spell with converted mana cost 7 or greater, you may sacrifice Sanctum of Ugin. If you do, search your library for a colorless creature card, reveal it, put it into your hand, then shuffle your library.
+Oracle:{T}: Add {C}.\nWhenever you cast a colorless spell with converted mana cost 7 or greater, you may sacrifice Sanctum of Ugin. If you do, search your library for a colorless creature card, reveal it, put it into your hand, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/s/sand_silos.txt b/forge-gui/res/cardsfolder/s/sand_silos.txt
index 24e08119a91..1889c253ded 100644
--- a/forge-gui/res/cardsfolder/s/sand_silos.txt
+++ b/forge-gui/res/cardsfolder/s/sand_silos.txt
@@ -5,9 +5,9 @@ K:CARDNAME enters the battlefield tapped.
 K:You may choose not to untap CARDNAME during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self+tapped | Execute$ TrigStore | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is tapped, put a storage counter on it.
 SVar:TrigStore:DB$PutCounter | Defined$ Self | CounterType$ STORAGE | CounterNum$ 1
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ U | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {U} to your mana pool for each storage counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ U | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {U} for each storage counter removed this way.
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sand_silos.jpg
-Oracle:Sand Silos enters the battlefield tapped.\nYou may choose not to untap Sand Silos during your untap step.\nAt the beginning of your upkeep, if Sand Silos is tapped, put a storage counter on it.\n{T}, Remove any number of storage counters from Sand Silos: Add {U} to your mana pool for each storage counter removed this way.
+Oracle:Sand Silos enters the battlefield tapped.\nYou may choose not to untap Sand Silos during your untap step.\nAt the beginning of your upkeep, if Sand Silos is tapped, put a storage counter on it.\n{T}, Remove any number of storage counters from Sand Silos: Add {U} for each storage counter removed this way.
diff --git a/forge-gui/res/cardsfolder/s/sandsteppe_citadel.txt b/forge-gui/res/cardsfolder/s/sandsteppe_citadel.txt
index d02b7e698b0..3947cfbffc4 100644
--- a/forge-gui/res/cardsfolder/s/sandsteppe_citadel.txt
+++ b/forge-gui/res/cardsfolder/s/sandsteppe_citadel.txt
@@ -2,8 +2,8 @@ Name:Sandsteppe Citadel
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sandsteppe_citadel.jpg
-Oracle:Sandsteppe Citadel enters the battlefield tapped.\n{T}: Add {W}, {B}, or {G} to your mana pool.
+Oracle:Sandsteppe Citadel enters the battlefield tapped.\n{T}: Add {W}, {B}, or {G}.
diff --git a/forge-gui/res/cardsfolder/s/sandstone_bridge.txt b/forge-gui/res/cardsfolder/s/sandstone_bridge.txt
index d6e12187ab8..b6d2f60f11b 100644
--- a/forge-gui/res/cardsfolder/s/sandstone_bridge.txt
+++ b/forge-gui/res/cardsfolder/s/sandstone_bridge.txt
@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +1/+1 and gains vigilance until end of turn.
 SVar:TrigPump:DB$Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | KW$ Vigilance
 SVar:PlayMain1:TRUE
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sandstone_bridge.jpg
-Oracle:Sandstone Bridge enters the battlefield tapped.\nWhen Sandstone Bridge enters the battlefield, target creature gets +1/+1 and gains vigilance until end of turn.\n{T}: Add {W} to your mana pool.
+Oracle:Sandstone Bridge enters the battlefield tapped.\nWhen Sandstone Bridge enters the battlefield, target creature gets +1/+1 and gains vigilance until end of turn.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/s/sandstone_needle.txt b/forge-gui/res/cardsfolder/s/sandstone_needle.txt
index 2b1bc47c25d..c8d73416ac1 100644
--- a/forge-gui/res/cardsfolder/s/sandstone_needle.txt
+++ b/forge-gui/res/cardsfolder/s/sandstone_needle.txt
@@ -4,9 +4,9 @@ Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two depletion counters on it.
 SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | ETB$ True | CounterType$ DEPLETION | CounterNum$ 2
-A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ R | SubAbility$ DBSac | Amount$ 2 | SpellDescription$ Add {R}{R} to your mana pool. If there are no depletion counters on CARDNAME, sacrifice it.
+A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ R | SubAbility$ DBSac | Amount$ 2 | SpellDescription$ Add {R}{R}. If there are no depletion counters on CARDNAME, sacrifice it.
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionPresent$ Card.Self+counters_EQ0_DEPLETION
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://wizards.com/global/images/magic/general/sandstone_needle.jpg
-Oracle:Sandstone Needle enters the battlefield tapped with two depletion counters on it.\n{T}, Remove a depletion counter from Sandstone Needle: Add {R}{R} to your mana pool. If there are no depletion counters on Sandstone Needle, sacrifice it.
+Oracle:Sandstone Needle enters the battlefield tapped with two depletion counters on it.\n{T}, Remove a depletion counter from Sandstone Needle: Add {R}{R}. If there are no depletion counters on Sandstone Needle, sacrifice it.
diff --git a/forge-gui/res/cardsfolder/s/saprazzan_cove.txt b/forge-gui/res/cardsfolder/s/saprazzan_cove.txt
index d4a39959051..e8b3440db9b 100644
--- a/forge-gui/res/cardsfolder/s/saprazzan_cove.txt
+++ b/forge-gui/res/cardsfolder/s/saprazzan_cove.txt
@@ -3,9 +3,9 @@ ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
 A:AB$ PutCounter | Cost$ T | Defined$ Self | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ U | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {U} to your mana pool for each storage counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ U | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {U} for each storage counter removed this way.
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/saprazzan_cove.jpg
-Oracle:Saprazzan Cove enters the battlefield tapped.\n{T}: Put a storage counter on Saprazzan Cove.\n{T}, Remove any number of storage counters from Saprazzan Cove: Add {U} to your mana pool for each storage counter removed this way.
+Oracle:Saprazzan Cove enters the battlefield tapped.\n{T}: Put a storage counter on Saprazzan Cove.\n{T}, Remove any number of storage counters from Saprazzan Cove: Add {U} for each storage counter removed this way.
diff --git a/forge-gui/res/cardsfolder/s/saprazzan_skerry.txt b/forge-gui/res/cardsfolder/s/saprazzan_skerry.txt
index ffd99d9f5ee..faee71457e9 100644
--- a/forge-gui/res/cardsfolder/s/saprazzan_skerry.txt
+++ b/forge-gui/res/cardsfolder/s/saprazzan_skerry.txt
@@ -4,9 +4,9 @@ Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two depletion counters on it.
 SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | ETB$ True | CounterType$ DEPLETION | CounterNum$ 2
-A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ U | SubAbility$ DBSac | Amount$ 2 | SpellDescription$ Add {U}{U} to your mana pool. If there are no depletion counters on CARDNAME, sacrifice it.
+A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ U | SubAbility$ DBSac | Amount$ 2 | SpellDescription$ Add {U}{U}. If there are no depletion counters on CARDNAME, sacrifice it.
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionPresent$ Card.Self+counters_EQ0_DEPLETION
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://wizards.com/global/images/magic/general/saprazzan_skerry.jpg
-Oracle:Saprazzan Skerry enters the battlefield tapped with two depletion counters on it.\n{T}, Remove a depletion counter from Saprazzan Skerry: Add {U}{U} to your mana pool. If there are no depletion counters on Saprazzan Skerry, sacrifice it.
+Oracle:Saprazzan Skerry enters the battlefield tapped with two depletion counters on it.\n{T}, Remove a depletion counter from Saprazzan Skerry: Add {U}{U}. If there are no depletion counters on Saprazzan Skerry, sacrifice it.
diff --git a/forge-gui/res/cardsfolder/s/sapseep_forest.txt b/forge-gui/res/cardsfolder/s/sapseep_forest.txt
index ec5e7196b66..4aae6911207 100644
--- a/forge-gui/res/cardsfolder/s/sapseep_forest.txt
+++ b/forge-gui/res/cardsfolder/s/sapseep_forest.txt
@@ -4,4 +4,4 @@ Types:Land Forest
 K:CARDNAME enters the battlefield tapped.
 A:AB$ GainLife | Cost$ G T | LifeAmount$ 1 | IsPresent$ Permanent.Green+YouCtrl | PresentCompare$ GE2 | SpellDescription$ You gain 1 life. Activate this ability only if you control two or more green permanents.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sapseep_forest.jpg
-Oracle:({T}: Add {G} to your mana pool.)\nSapseep Forest enters the battlefield tapped.\n{G}, {T}: You gain 1 life. Activate this ability only if you control two or more green permanents.
+Oracle:({T}: Add {G}.)\nSapseep Forest enters the battlefield tapped.\n{G}, {T}: You gain 1 life. Activate this ability only if you control two or more green permanents.
diff --git a/forge-gui/res/cardsfolder/s/sarkhan_unbroken.txt b/forge-gui/res/cardsfolder/s/sarkhan_unbroken.txt
index 5921fc177ab..605259b2391 100644
--- a/forge-gui/res/cardsfolder/s/sarkhan_unbroken.txt
+++ b/forge-gui/res/cardsfolder/s/sarkhan_unbroken.txt
@@ -2,10 +2,10 @@ Name:Sarkhan Unbroken
 ManaCost:2 G U R
 Types:Legendary Planeswalker Sarkhan
 Loyalty:4
-A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Defined$ You | SubAbility$ DBMana | Planeswalker$ True | SpellDescription$ Draw a card, then add one mana of any color to your mana pool.
+A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Defined$ You | SubAbility$ DBMana | Planeswalker$ True | SpellDescription$ Draw a card, then add one mana of any color.
 SVar:DBMana:DB$Mana | Produced$ Any | AILogic$ MostProminentInComputerHand
 A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ You | TokenColors$ Red | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenImage$ r 4 4 dragon DTK | Planeswalker$ True | SpellDescription$ Create a 4/4 red Dragon creature token with flying.
 A:AB$ ChangeZone | Cost$ SubCounter<8/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Dragon | ChangeNum$ XFetch | Planeswalker$ True | Ultimate$ True | StackDescription$ SpellDescription | References$ XFetch | SpellDescription$ Search your library for any number of Dragon creature cards and put them onto the battlefield. Then shuffle your library.
 SVar:XFetch:Count$TypeInYourLibrary.Dragon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sarkhan_unbroken.jpg
-Oracle:[+1]: Draw a card, then add one mana of any color to your mana pool.\n[-2]: Create a 4/4 red Dragon creature token with flying.\n[-8]: Search your library for any number of Dragon creature cards and put them onto the battlefield. Then shuffle your library.
+Oracle:[+1]: Draw a card, then add one mana of any color.\n[-2]: Create a 4/4 red Dragon creature token with flying.\n[-8]: Search your library for any number of Dragon creature cards and put them onto the battlefield. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt b/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt
index ebfd40ba34b..7a5bec76bc6 100644
--- a/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt
+++ b/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt
@@ -14,10 +14,10 @@ Name:Sasaya's Essence
 ManaCost:1 G G
 Colors:green
 Types:Legendary Enchantment
-T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever a land you control is tapped for mana, for each other land you control with the same name, add one mana to your mana pool of any type that land produced.
+T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever a land you control is tapped for mana, for each other land you control with the same name, add one mana of any type that land produced.
 SVar:TrigMana:DB$ Pump | RememberObjects$ TriggeredCard | SubAbility$ DBRepeat
 SVar:DBRepeat:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Land.YouCtrl+IsNotRemembered+sharesNameWith Remembered | RepeatSubAbility$ DBManaReflect | SubAbility$ DBCleanup
 SVar:DBManaReflect:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Imprinted | ReflectProperty$ Produced | Defined$ You
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sasayas_essence.jpg
-Oracle:Whenever a land you control is tapped for mana, for each other land you control with the same name, add one mana to your mana pool of any type that land produced.
+Oracle:Whenever a land you control is tapped for mana, for each other land you control with the same name, add one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/s/satyr_hedonist.txt b/forge-gui/res/cardsfolder/s/satyr_hedonist.txt
index dd4dc2ef5c7..cbe6e2823bd 100644
--- a/forge-gui/res/cardsfolder/s/satyr_hedonist.txt
+++ b/forge-gui/res/cardsfolder/s/satyr_hedonist.txt
@@ -2,6 +2,6 @@ Name:Satyr Hedonist
 ManaCost:1 G
 Types:Creature Satyr
 PT:2/1
-A:AB$ Mana | Cost$ R Sac<1/CARDNAME> | Produced$ R | Amount$ 3 | AILogic$ ManaRitual | SpellDescription$ Add {R}{R}{R} to your mana pool.
+A:AB$ Mana | Cost$ R Sac<1/CARDNAME> | Produced$ R | Amount$ 3 | AILogic$ ManaRitual | SpellDescription$ Add {R}{R}{R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/satyr_hedonist.jpg
-Oracle:{R}, Sacrifice Satyr Hedonist: Add {R}{R}{R} to your mana pool.
+Oracle:{R}, Sacrifice Satyr Hedonist: Add {R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/s/savage_lands.txt b/forge-gui/res/cardsfolder/s/savage_lands.txt
index 1d463d8adaf..a503dea3143 100644
--- a/forge-gui/res/cardsfolder/s/savage_lands.txt
+++ b/forge-gui/res/cardsfolder/s/savage_lands.txt
@@ -2,8 +2,8 @@ Name:Savage Lands
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/savage_lands.jpg
-Oracle:Savage Lands enters the battlefield tapped.\n{T}: Add {B}, {R}, or {G} to your mana pool.
+Oracle:Savage Lands enters the battlefield tapped.\n{T}: Add {B}, {R}, or {G}.
diff --git a/forge-gui/res/cardsfolder/s/savage_ventmaw.txt b/forge-gui/res/cardsfolder/s/savage_ventmaw.txt
index cbe5360a8bb..60fe3f0a023 100644
--- a/forge-gui/res/cardsfolder/s/savage_ventmaw.txt
+++ b/forge-gui/res/cardsfolder/s/savage_ventmaw.txt
@@ -3,7 +3,7 @@ ManaCost:4 R G
 Types:Creature Dragon
 PT:4/4
 K:Flying
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ Whenever CARDNAME attacks, add {R}{R}{R}{G}{G}{G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
-SVar:TrigMana:DB$ Mana | Produced$ R R R G G G | PersistentMana$ True | SpellDescription$ Add {R}{R}{R}{G}{G}{G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ Whenever CARDNAME attacks, add {R}{R}{R}{G}{G}{G}. Until end of turn, you don't lose this mana as steps and phases end.
+SVar:TrigMana:DB$ Mana | Produced$ R R R G G G | PersistentMana$ True | SpellDescription$ Add {R}{R}{R}{G}{G}{G}. Until end of turn, you don't lose this mana as steps and phases end.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/savage_ventmaw.jpg
-Oracle:Flying\nWhenever Savage Ventmaw attacks, add {R}{R}{R}{G}{G}{G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
+Oracle:Flying\nWhenever Savage Ventmaw attacks, add {R}{R}{R}{G}{G}{G}. Until end of turn, you don't lose this mana as steps and phases end.
diff --git a/forge-gui/res/cardsfolder/s/savannah.txt b/forge-gui/res/cardsfolder/s/savannah.txt
index f164e79b025..d2edc1865fb 100644
--- a/forge-gui/res/cardsfolder/s/savannah.txt
+++ b/forge-gui/res/cardsfolder/s/savannah.txt
@@ -2,4 +2,4 @@ Name:Savannah
 ManaCost:no cost
 Types:Land Forest Plains
 SVar:Picture:http://www.wizards.com/global/images/magic/general/savannah.jpg
-Oracle:({T}: Add {G} or {W} to your mana pool.)
+Oracle:({T}: Add {G} or {W}.)
diff --git a/forge-gui/res/cardsfolder/s/scabland.txt b/forge-gui/res/cardsfolder/s/scabland.txt
index 5a398cc1957..6b616b03815 100644
--- a/forge-gui/res/cardsfolder/s/scabland.txt
+++ b/forge-gui/res/cardsfolder/s/scabland.txt
@@ -1,10 +1,10 @@
 Name:Scabland
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-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$ R | SubAbility$ DBPain | SpellDescription$ Add {R} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R}. CARDNAME deals 1 damage to you.
 K:CARDNAME enters the battlefield tapped.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scabland.jpg
-Oracle:Scabland enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{T}: Add {R} or {W} to your mana pool. Scabland deals 1 damage to you.
+Oracle:Scabland enters the battlefield tapped.\n{T}: Add {C}.\n{T}: Add {R} or {W}. Scabland deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/s/scattered_groves.txt b/forge-gui/res/cardsfolder/s/scattered_groves.txt
index ef8b72aba85..dc2059ea99e 100644
--- a/forge-gui/res/cardsfolder/s/scattered_groves.txt
+++ b/forge-gui/res/cardsfolder/s/scattered_groves.txt
@@ -4,4 +4,4 @@ Types:Land Forest Plains
 K:CARDNAME enters the battlefield tapped.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scattered_groves.jpg
-Oracle:({T}: Add {G} or {W} to your mana pool.)\nScattered Groves enters the battlefield tapped.\nCycling {2} ({2}, discard this card: Draw a card.)
\ No newline at end of file
+Oracle:({T}: Add {G} or {W}.)\nScattered Groves enters the battlefield tapped.\nCycling {2} ({2}, discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/scattering_stroke.txt b/forge-gui/res/cardsfolder/s/scattering_stroke.txt
index f5eca70571c..38fe71f5d74 100644
--- a/forge-gui/res/cardsfolder/s/scattering_stroke.txt
+++ b/forge-gui/res/cardsfolder/s/scattering_stroke.txt
@@ -1,11 +1,11 @@
 Name:Scattering Stroke
 ManaCost:2 U U
 Types:Instant
-A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | ValidTgts$ Card | RememberCounteredCMC$ True | SubAbility$ DBClash | SpellDescription$ Counter target spell. Clash with an opponent. If you win, at the beginning of your next main phase, you may add an amount of {C} to your mana pool equal to that spell's converted mana cost. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | ValidTgts$ Card | RememberCounteredCMC$ True | SubAbility$ DBClash | SpellDescription$ Counter target spell. Clash with an opponent. If you win, at the beginning of your next main phase, you may add an amount of {C} equal to that spell's converted mana cost. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
 SVar:DBClash:DB$ Clash | WinSubAbility$ DBDelTrig
-SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main1,Main2 | ValidPlayer$ You | Execute$ AddMana | OptionalDecider$ You | TriggerDescription$ At the beginning of your next main phase, you may add an amount of {C} to your mana pool equal to that spell's converted mana cost. | RememberNumber$ True | SubAbility$ DBCleanup
+SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Main1,Main2 | ValidPlayer$ You | Execute$ AddMana | OptionalDecider$ You | TriggerDescription$ At the beginning of your next main phase, you may add an amount of {C} equal to that spell's converted mana cost. | RememberNumber$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:AddMana:DB$ Mana | Produced$ C | Amount$ X | References$ X
 SVar:X:Count$TriggerRememberAmount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scattering_stroke.jpg
-Oracle:Counter target spell. Clash with an opponent. If you win, at the beginning of your next main phase, you may add an amount of {C} to your mana pool equal to that spell's converted mana cost.. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
+Oracle:Counter target spell. Clash with an opponent. If you win, at the beginning of your next main phase, you may add an amount of {C} equal to that spell's converted mana cost.. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
diff --git a/forge-gui/res/cardsfolder/s/scavenger_grounds.txt b/forge-gui/res/cardsfolder/s/scavenger_grounds.txt
index 96c61e01d1a..3c602c441bb 100644
--- a/forge-gui/res/cardsfolder/s/scavenger_grounds.txt
+++ b/forge-gui/res/cardsfolder/s/scavenger_grounds.txt
@@ -1,8 +1,8 @@
 Name:Scavenger Grounds
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZoneAll | Cost$ 2 T Sac<1/Desert> | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | AILogic$ ExileGraveyards | SpellDescription$ Exile all cards from all graveyards.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scavenger_grounds.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}, Sacrifice a Desert: Exile all cards from all graveyards.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{2}, {T}, Sacrifice a Desert: Exile all cards from all graveyards.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/school_of_the_unseen.txt b/forge-gui/res/cardsfolder/s/school_of_the_unseen.txt
index 9e74b262b1a..6d51cdf6350 100644
--- a/forge-gui/res/cardsfolder/s/school_of_the_unseen.txt
+++ b/forge-gui/res/cardsfolder/s/school_of_the_unseen.txt
@@ -1,8 +1,8 @@
 Name:School of the Unseen
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 2 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/school_of_the_unseen.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add {C}.\n{2}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/s/scion_summoner.txt b/forge-gui/res/cardsfolder/s/scion_summoner.txt
index 6cf343ac7c3..7ab797ace37 100644
--- a/forge-gui/res/cardsfolder/s/scion_summoner.txt
+++ b/forge-gui/res/cardsfolder/s/scion_summoner.txt
@@ -3,10 +3,10 @@ ManaCost:2 G
 Types:Creature Eldrazi Drone
 PT:2/2
 K:Devoid
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scion_summoner.jpg
-Oracle:Devoid (This card has no color.)\nWhen Scion Summoner enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Devoid (This card has no color.)\nWhen Scion Summoner enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/s/scorched_ruins.txt b/forge-gui/res/cardsfolder/s/scorched_ruins.txt
index 099dd99c457..c50cb2013d3 100644
--- a/forge-gui/res/cardsfolder/s/scorched_ruins.txt
+++ b/forge-gui/res/cardsfolder/s/scorched_ruins.txt
@@ -1,7 +1,7 @@
 Name:Scorched Ruins
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 4 | SpellDescription$ Add {C}{C}{C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 4 | SpellDescription$ Add {C}{C}{C}{C}.
 R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, sacrifice two untapped lands instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
 SVar:PayBeforeETB:DB$ Sacrifice | SacValid$ Land.untapped | Defined$ You | RememberSacrificed$ True | Amount$ 2 | StrictAmount$ True | SubAbility$ MoveToGraveyard
 SVar:MoveToGraveyard:DB$ ChangeZone | Origin$ All | Destination$ Graveyard | Defined$ ReplacedCard | ConditionCheckSVar$ X | References$ X | ConditionSVarCompare$ LT2 | SubAbility$ MoveToBattlefield
@@ -12,4 +12,4 @@ SVar:NeedsToPlayVar:Y GE2
 SVar:Y:Count$Valid Land.YouCtrl+untapped
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scorched_ruins.jpg
-Oracle:If Scorched Ruins would enter the battlefield, sacrifice two untapped lands instead. If you do, put Scorched Ruins onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {C}{C}{C}{C} to your mana pool.
+Oracle:If Scorched Ruins would enter the battlefield, sacrifice two untapped lands instead. If you do, put Scorched Ruins onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {C}{C}{C}{C}.
diff --git a/forge-gui/res/cardsfolder/s/scorned_villager_moonscarred_werewolf.txt b/forge-gui/res/cardsfolder/s/scorned_villager_moonscarred_werewolf.txt
index 623bca4deb5..9787bbafe8d 100644
--- a/forge-gui/res/cardsfolder/s/scorned_villager_moonscarred_werewolf.txt
+++ b/forge-gui/res/cardsfolder/s/scorned_villager_moonscarred_werewolf.txt
@@ -2,12 +2,12 @@ Name:Scorned Villager
 ManaCost:1 G
 Types:Creature Human Werewolf
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 T:Mode$Phase | Phase$ Upkeep | WerewolfTransformCondition$ True | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of each upkeep, if no spells were cast last turn, transform CARDNAME.
 SVar:TrigTransform:DB$SetState | Defined$ Self | Mode$ Transform
 AlternateMode:DoubleFaced
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scorned_villager.jpg
-Oracle:{T}: Add {G} to your mana pool.\nAt the beginning of each upkeep, if no spells were cast last turn, transform Scorned Villager.
+Oracle:{T}: Add {G}.\nAt the beginning of each upkeep, if no spells were cast last turn, transform Scorned Villager.
 
 ALTERNATE
 
@@ -17,8 +17,8 @@ Colors:green
 Types:Creature Werewolf
 PT:2/2
 K:Vigilance
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
 T:Mode$Phase | Phase$ Upkeep | WerewolfUntransformCondition$ True | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of each upkeep, if a player cast two or more spells last turn, transform CARDNAME.
 SVar:TrigTransform:DB$SetState | Defined$ Self | Mode$ Transform
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moonscarred_werewolf.jpg
-Oracle:Vigilance\n{T}: Add {G}{G} to your mana pool.\nAt the beginning of each upkeep, if a player cast two or more spells last turn, transform Moonscarred Werewolf.
+Oracle:Vigilance\n{T}: Add {G}{G}.\nAt the beginning of each upkeep, if a player cast two or more spells last turn, transform Moonscarred Werewolf.
diff --git a/forge-gui/res/cardsfolder/s/scoured_barrens.txt b/forge-gui/res/cardsfolder/s/scoured_barrens.txt
index 44e98f44b44..edd6e9c3961 100644
--- a/forge-gui/res/cardsfolder/s/scoured_barrens.txt
+++ b/forge-gui/res/cardsfolder/s/scoured_barrens.txt
@@ -1,10 +1,10 @@
 Name:Scoured Barrens
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scoured_barrens.jpg
-Oracle:Scoured Barrens enters the battlefield tapped.\nWhen Scoured Barrens enters the battlefield, you gain 1 life.\n{T}: Add {W} or {B} to your mana pool.
+Oracle:Scoured Barrens enters the battlefield tapped.\nWhen Scoured Barrens enters the battlefield, you gain 1 life.\n{T}: Add {W} or {B}.
diff --git a/forge-gui/res/cardsfolder/s/scrubland.txt b/forge-gui/res/cardsfolder/s/scrubland.txt
index cb7318bee63..798d2368cf1 100644
--- a/forge-gui/res/cardsfolder/s/scrubland.txt
+++ b/forge-gui/res/cardsfolder/s/scrubland.txt
@@ -2,4 +2,4 @@ Name:Scrubland
 ManaCost:no cost
 Types:Land Plains Swamp
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scrubland.jpg
-Oracle:({T}: Add {W} or {B} to your mana pool.)
+Oracle:({T}: Add {W} or {B}.)
diff --git a/forge-gui/res/cardsfolder/s/scrying_sheets.txt b/forge-gui/res/cardsfolder/s/scrying_sheets.txt
index e96a1a6b083..543d5c8b560 100644
--- a/forge-gui/res/cardsfolder/s/scrying_sheets.txt
+++ b/forge-gui/res/cardsfolder/s/scrying_sheets.txt
@@ -1,9 +1,9 @@
 Name:Scrying Sheets
 ManaCost:no cost
 Types:Snow Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Dig | Cost$ 1 S T | DigNum$ 1 | ChangeNum$ 1 | ChangeValid$ Card.Snow | Optional$ True | LibraryPosition2$ 0 | ForceRevealToController$ True | SpellDescription$ Look at the top card of your library. If that card is snow, you may reveal it and put it into your hand. ({S} can be paid with one mana from a snow permanent.)
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scrying_sheets.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{S}, {T}: Look at the top card of your library. If that card is snow, you may reveal it and put it into your hand. ({S} can be paid with one mana from a snow permanent.)
+Oracle:{T}: Add {C}.\n{1}{S}, {T}: Look at the top card of your library. If that card is snow, you may reveal it and put it into your hand. ({S} can be paid with one mana from a snow permanent.)
diff --git a/forge-gui/res/cardsfolder/s/scuttlemutt.txt b/forge-gui/res/cardsfolder/s/scuttlemutt.txt
index 1e6016c2c74..e95874be6b7 100644
--- a/forge-gui/res/cardsfolder/s/scuttlemutt.txt
+++ b/forge-gui/res/cardsfolder/s/scuttlemutt.txt
@@ -2,8 +2,8 @@ Name:Scuttlemutt
 ManaCost:3
 Types:Artifact Creature Scarecrow
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ ChooseColor | Cost$ T | Defined$ You | OrColors$ True | SubAbility$ Animate | SpellDescription$ Target creature becomes the color or colors of your choice until end of turn.
 SVar:Animate:DB$ Animate | ValidTgts$ Creature | TgtPrompt$ Select target creature | Colors$ ChosenColor | OverwriteColors$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scuttlemutt.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.\n{T}: Target creature becomes the color or colors of your choice until end of turn.
+Oracle:{T}: Add one mana of any color.\n{T}: Target creature becomes the color or colors of your choice until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sea_gate_wreckage.txt b/forge-gui/res/cardsfolder/s/sea_gate_wreckage.txt
index e3f9ff665e3..907c3290620 100644
--- a/forge-gui/res/cardsfolder/s/sea_gate_wreckage.txt
+++ b/forge-gui/res/cardsfolder/s/sea_gate_wreckage.txt
@@ -1,9 +1,9 @@
 Name:Sea Gate Wreckage
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ 2 C T | NumCards$ 1 | ActivationCardsInHand$ 0 | SpellDescription$ Draw a card. Activate this ability only if you have no cards in hand.
 DeckHas:Ability$Mana.Colorless
 DeckHints:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sea_gate_wreckage.jpg
-Oracle:{T}: Add {C} to your mana pool. ({C} represents colorless mana.)\n{2}{C}, {T}: Draw a card. Activate this ability only if you have no cards in hand.
+Oracle:{T}: Add {C}. ({C} represents colorless mana.)\n{2}{C}, {T}: Draw a card. Activate this ability only if you have no cards in hand.
diff --git a/forge-gui/res/cardsfolder/s/sea_scryer.txt b/forge-gui/res/cardsfolder/s/sea_scryer.txt
index 6e356aa12c1..33821d536d6 100644
--- a/forge-gui/res/cardsfolder/s/sea_scryer.txt
+++ b/forge-gui/res/cardsfolder/s/sea_scryer.txt
@@ -2,8 +2,8 @@ Name:Sea Scryer
 ManaCost:1 U
 Types:Creature Merfolk Wizard
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ U | SpellDescription$ Add {U}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sea_scryer.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add {U} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/s/seachrome_coast.txt b/forge-gui/res/cardsfolder/s/seachrome_coast.txt
index 90f058a66df..14e700f087b 100644
--- a/forge-gui/res/cardsfolder/s/seachrome_coast.txt
+++ b/forge-gui/res/cardsfolder/s/seachrome_coast.txt
@@ -5,7 +5,7 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ GT2 | References$ ETBCheckSVar2 | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar2:Count$LastStateBattlefield Land.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seachrome_coast.jpg
-Oracle:Seachrome Coast enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {W} or {U} to your mana pool.
+Oracle:Seachrome Coast enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/s/seafloor_debris.txt b/forge-gui/res/cardsfolder/s/seafloor_debris.txt
index 13e2d549bf3..65d05638a8a 100644
--- a/forge-gui/res/cardsfolder/s/seafloor_debris.txt
+++ b/forge-gui/res/cardsfolder/s/seafloor_debris.txt
@@ -1,9 +1,9 @@
 Name:Seafloor Debris
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 K:CARDNAME enters the battlefield tapped.
 DeckNeeds:Color$Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seafloor_debris.jpg
-Oracle:Seafloor Debris enters the battlefield tapped.\n{T}: Add {U} to your mana pool.\n{T}, Sacrifice Seafloor Debris: Add one mana of any color to your mana pool.
+Oracle:Seafloor Debris enters the battlefield tapped.\n{T}: Add {U}.\n{T}, Sacrifice Seafloor Debris: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt b/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt
index 1fc6a2c16bf..120a3eda14e 100644
--- a/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt
+++ b/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt
@@ -14,7 +14,7 @@ ALTERNATE
 Name:Azcanta, the Sunken Ruin
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ U | Amount$ 1 | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | Amount$ 1 | SpellDescription$ Add {U}.
 A:AB$ Dig | Cost$ 2 U T | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Card.nonCreature+nonLand | SpellDescription$ Look at the top four cards of your library. You may reveal a noncreature, nonland card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azcanta_the_sunken_ruin.jpg
-Oracle:(Transforms from Search for Azcanta.)\n{T}: Add {U} to your mana pool.\n{2}{U}, {T}: Look at the top four cards of your library. You may reveal a noncreature, nonland card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
+Oracle:(Transforms from Search for Azcanta.)\n{T}: Add {U}.\n{2}{U}, {T}: Look at the top four cards of your library. You may reveal a noncreature, nonland card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
diff --git a/forge-gui/res/cardsfolder/s/seashell_cameo.txt b/forge-gui/res/cardsfolder/s/seashell_cameo.txt
index b9edbbe539c..a047f98444f 100644
--- a/forge-gui/res/cardsfolder/s/seashell_cameo.txt
+++ b/forge-gui/res/cardsfolder/s/seashell_cameo.txt
@@ -1,9 +1,9 @@
 Name:Seashell Cameo
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$White|Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seashell_cameo.jpg
-Oracle:{T}: Add {W} or {U} to your mana pool.
+Oracle:{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/s/seaside_citadel.txt b/forge-gui/res/cardsfolder/s/seaside_citadel.txt
index fde903e765c..6b7c0ba9e1f 100644
--- a/forge-gui/res/cardsfolder/s/seaside_citadel.txt
+++ b/forge-gui/res/cardsfolder/s/seaside_citadel.txt
@@ -2,8 +2,8 @@ Name:Seaside Citadel
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seaside_citadel.jpg
-Oracle:Seaside Citadel enters the battlefield tapped.\n{T}: Add {G}, {W}, or {U} to your mana pool.
+Oracle:Seaside Citadel enters the battlefield tapped.\n{T}: Add {G}, {W}, or {U}.
diff --git a/forge-gui/res/cardsfolder/s/seaside_haven.txt b/forge-gui/res/cardsfolder/s/seaside_haven.txt
index cca8d504031..7b2be09d620 100644
--- a/forge-gui/res/cardsfolder/s/seaside_haven.txt
+++ b/forge-gui/res/cardsfolder/s/seaside_haven.txt
@@ -1,8 +1,8 @@
 Name:Seaside Haven
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ W U T Sac<1/Bird> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seaside_haven.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{W}{U}, {T}, Sacrifice a Bird: Draw a card.
+Oracle:{T}: Add {C}.\n{W}{U}, {T}, Sacrifice a Bird: Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/secluded_glen.txt b/forge-gui/res/cardsfolder/s/secluded_glen.txt
index 4f342554621..59ea0595e8b 100644
--- a/forge-gui/res/cardsfolder/s/secluded_glen.txt
+++ b/forge-gui/res/cardsfolder/s/secluded_glen.txt
@@ -1,9 +1,9 @@
 Name:Secluded Glen
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Faerie> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Faerie card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/secluded_glen.jpg
-Oracle:As Secluded Glen enters the battlefield, you may reveal a Faerie card from your hand. If you don't, Secluded Glen enters the battlefield tapped.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:As Secluded Glen enters the battlefield, you may reveal a Faerie card from your hand. If you don't, Secluded Glen enters the battlefield tapped.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/s/secluded_steppe.txt b/forge-gui/res/cardsfolder/s/secluded_steppe.txt
index b8d082d8591..d93fcab6d04 100644
--- a/forge-gui/res/cardsfolder/s/secluded_steppe.txt
+++ b/forge-gui/res/cardsfolder/s/secluded_steppe.txt
@@ -2,7 +2,7 @@ Name:Secluded Steppe
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 K:Cycling:W
 SVar:Picture:http://www.wizards.com/global/images/magic/general/secluded_steppe.jpg
-Oracle:Secluded Steppe enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\nCycling {W} ({W}, Discard this card: Draw a card.)
+Oracle:Secluded Steppe enters the battlefield tapped.\n{T}: Add {W}.\nCycling {W} ({W}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/s/secrets_of_paradise.txt b/forge-gui/res/cardsfolder/s/secrets_of_paradise.txt
index 71c6323704e..9fe4ce06037 100644
--- a/forge-gui/res/cardsfolder/s/secrets_of_paradise.txt
+++ b/forge-gui/res/cardsfolder/s/secrets_of_paradise.txt
@@ -2,7 +2,7 @@ Name:Secrets of Paradise
 ManaCost:no cost
 Types:Conspiracy
 K:Hidden agenda
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+NamedCard | EffectZone$ Command | AddAbility$ AnyMana | Description$ Creatures of the named card you control have "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+NamedCard | EffectZone$ Command | AddAbility$ AnyMana | Description$ Creatures of the named card you control have "{T}: Add one mana of any color."
+SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:AgendaLogic:MostProminentCreatureInComputerDeck
-Oracle:Hidden agenda (Start the game with this conspiracy face down in the command zone and secretly name a card. You may turn this conspiracy face up any time and reveal the chosen name.)\nCreatures you control with the chosen name have "{T}: Add one mana of any color to your mana pool."
+Oracle:Hidden agenda (Start the game with this conspiracy face down in the command zone and secretly name a card. You may turn this conspiracy face up any time and reveal the chosen name.)\nCreatures you control with the chosen name have "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/s/seers_lantern.txt b/forge-gui/res/cardsfolder/s/seers_lantern.txt
index d03eda8b73d..57d432c2523 100644
--- a/forge-gui/res/cardsfolder/s/seers_lantern.txt
+++ b/forge-gui/res/cardsfolder/s/seers_lantern.txt
@@ -1,8 +1,8 @@
 Name:Seer's Lantern
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool. ({C} represents colorless mana.)
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}. ({C} represents colorless mana.)
 A:AB$ Scry | Cost$ 2 T | ScryNum$ 1 |SpellDescription$ Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seers_lantern.jpg
-Oracle:{T}: Add {C} to your mana pool. ({C} represents colorless mana.)\n{2}, {T}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+Oracle:{T}: Add {C}. ({C} represents colorless mana.)\n{2}, {T}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
diff --git a/forge-gui/res/cardsfolder/s/seething_song.txt b/forge-gui/res/cardsfolder/s/seething_song.txt
index d8b01eb0b13..12f96a0aa90 100644
--- a/forge-gui/res/cardsfolder/s/seething_song.txt
+++ b/forge-gui/res/cardsfolder/s/seething_song.txt
@@ -1,6 +1,6 @@
 Name:Seething Song
 ManaCost:2 R
 Types:Instant
-A:SP$ Mana | Cost$ 2 R | Produced$ R | Amount$ 5 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R}{R}{R}{R}{R} to your mana pool.
+A:SP$ Mana | Cost$ 2 R | Produced$ R | Amount$ 5 | AILogic$ ManaRitual | AINoRecursiveCheck$ True | SpellDescription$ Add {R}{R}{R}{R}{R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seething_song.jpg
-Oracle:Add {R}{R}{R}{R}{R} to your mana pool.
+Oracle:Add {R}{R}{R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/s/seismic_spike.txt b/forge-gui/res/cardsfolder/s/seismic_spike.txt
index f1d1fd73cca..e6d1e3b7a78 100644
--- a/forge-gui/res/cardsfolder/s/seismic_spike.txt
+++ b/forge-gui/res/cardsfolder/s/seismic_spike.txt
@@ -1,7 +1,7 @@
 Name:Seismic Spike
 ManaCost:2 R R
 Types:Sorcery
-A:SP$ Destroy | Cost$ 2 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBMana | SpellDescription$ Destroy target land. Add {R}{R} to your mana pool.
+A:SP$ Destroy | Cost$ 2 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBMana | SpellDescription$ Destroy target land. Add {R}{R}.
 SVar:DBMana:DB$Mana | Produced$ R | Amount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seismic_spike.jpg
-Oracle:Destroy target land. Add {R}{R} to your mana pool.
+Oracle:Destroy target land. Add {R}{R}.
diff --git a/forge-gui/res/cardsfolder/s/sejiri_refuge.txt b/forge-gui/res/cardsfolder/s/sejiri_refuge.txt
index d052554af28..80fff086dd1 100644
--- a/forge-gui/res/cardsfolder/s/sejiri_refuge.txt
+++ b/forge-gui/res/cardsfolder/s/sejiri_refuge.txt
@@ -1,10 +1,10 @@
 Name:Sejiri Refuge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sejiri_refuge.jpg
-Oracle:Sejiri Refuge enters the battlefield tapped.\nWhen Sejiri Refuge enters the battlefield, you gain 1 life.\n{T}: Add {W} or {U} to your mana pool.
+Oracle:Sejiri Refuge enters the battlefield tapped.\nWhen Sejiri Refuge enters the battlefield, you gain 1 life.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/s/sejiri_steppe.txt b/forge-gui/res/cardsfolder/s/sejiri_steppe.txt
index 2dcdaa099e9..23495b6a82a 100644
--- a/forge-gui/res/cardsfolder/s/sejiri_steppe.txt
+++ b/forge-gui/res/cardsfolder/s/sejiri_steppe.txt
@@ -4,6 +4,6 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigProtect | TriggerDescription$ When CARDNAME enters the battlefield, target creature you control gains protection from the color of your choice until end of turn.
 SVar:TrigProtect:DB$ Protection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Gains$ Choice | Choices$ AnyColor
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sejiri_steppe.jpg
-Oracle:Sejiri Steppe enters the battlefield tapped.\nWhen Sejiri Steppe enters the battlefield, target creature you control gains protection from the color of your choice until end of turn.\n{T}: Add {W} to your mana pool.
+Oracle:Sejiri Steppe enters the battlefield tapped.\nWhen Sejiri Steppe enters the battlefield, target creature you control gains protection from the color of your choice until end of turn.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_cluestone.txt b/forge-gui/res/cardsfolder/s/selesnya_cluestone.txt
index c43c92eeb05..4ba8cb8c4a2 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_cluestone.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_cluestone.txt
@@ -1,10 +1,10 @@
 Name:Selesnya Cluestone
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Draw | Cost$ G W T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Green|White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_cluestone.jpg
-Oracle:{T}: Add {G} or {W} to your mana pool.\n{G}{W}, {T}, Sacrifice Selesnya Cluestone: Draw a card.
+Oracle:{T}: Add {G} or {W}.\n{G}{W}, {T}, Sacrifice Selesnya Cluestone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_guildgate.txt b/forge-gui/res/cardsfolder/s/selesnya_guildgate.txt
index e65b1852731..4ea90823aaf 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_guildgate.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_guildgate.txt
@@ -2,7 +2,7 @@ Name:Selesnya Guildgate
 ManaCost:no cost
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_guildgate.jpg
-Oracle:Selesnya Guildgate enters the battlefield tapped.\n{T}: Add {G} or {W} to your mana pool.
+Oracle:Selesnya Guildgate enters the battlefield tapped.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_keyrune.txt b/forge-gui/res/cardsfolder/s/selesnya_keyrune.txt
index f33bc5ac9ea..4746f2613c0 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_keyrune.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_keyrune.txt
@@ -1,10 +1,10 @@
 Name:Selesnya Keyrune
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Animate | Cost$ G W | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Artifact,Creature,Wolf | Colors$ Green,White | SpellDescription$ CARDNAME becomes a 3/3 green and white Wolf artifact creature until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Green|White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_keyrune.jpg
-Oracle:{T}: Add {G} or {W} to your mana pool.\n{G}{W}: Selesnya Keyrune becomes a 3/3 green and white Wolf artifact creature until end of turn.
+Oracle:{T}: Add {G} or {W}.\n{G}{W}: Selesnya Keyrune becomes a 3/3 green and white Wolf artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_loft_gardens.txt b/forge-gui/res/cardsfolder/s/selesnya_loft_gardens.txt
index 09c53c5af85..e3d6c9c4808 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_loft_gardens.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_loft_gardens.txt
@@ -7,10 +7,10 @@ R:Event$ AddCounter | ActiveZones$ Command | ValidCard$ Permanent | EffectOnly$
 SVar:DoubleCounters:DB$ ReplaceEffect | VarName$ CounterNum | VarValue$ Z | References$ Z
 SVar:Y:ReplaceCount$TokenNum/Twice
 SVar:Z:ReplaceCount$CounterNum/Twice
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, until end of turn, whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, until end of turn, whenever you tap a land for mana, add one mana of any type that land produced.
 SVar:RolledChaos:DB$ Effect | AILogic$ Always | Triggers$ TrigTapForMana | SVars$ TrigMana
-SVar:TrigTapForMana:Mode$ TapsForMana | TriggerZones$ Command | ValidCard$ Land.YouCtrl | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+SVar:TrigTapForMana:Mode$ TapsForMana | TriggerZones$ Command | ValidCard$ Land.YouCtrl | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana of any type that land produced.
 SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_loft_gardens.jpg
 SVar:AIRollPlanarDieParams:Mode$ Always | MinTurn$ 1 | RollInMain1$ True
-Oracle:If an effect would create one or more tokens, it creates twice that many of those tokens instead.\nIf an effect would put one or more counters on a permanent, it puts twice that many of those counters on that permanent instead.\nWhenever you roll {CHAOS}, until end of turn, whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+Oracle:If an effect would create one or more tokens, it creates twice that many of those tokens instead.\nIf an effect would put one or more counters on a permanent, it puts twice that many of those counters on that permanent instead.\nWhenever you roll {CHAOS}, until end of turn, whenever you tap a land for mana, add one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_sanctuary.txt b/forge-gui/res/cardsfolder/s/selesnya_sanctuary.txt
index d0c20a89aed..160b86dd769 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_sanctuary.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_sanctuary.txt
@@ -2,9 +2,9 @@ Name:Selesnya Sanctuary
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G W | SpellDescription$ Add {G}{W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G W | SpellDescription$ Add {G}{W}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_sanctuary.jpg
-Oracle:Selesnya Sanctuary enters the battlefield tapped.\nWhen Selesnya Sanctuary enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {G}{W} to your mana pool.
+Oracle:Selesnya Sanctuary enters the battlefield tapped.\nWhen Selesnya Sanctuary enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {G}{W}.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_signet.txt b/forge-gui/res/cardsfolder/s/selesnya_signet.txt
index 3536d87434a..60690886f4b 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_signet.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_signet.txt
@@ -1,7 +1,7 @@
 Name:Selesnya Signet
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ G W | SpellDescription$ Add {G}{W} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ G W | SpellDescription$ Add {G}{W}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_signet.jpg
-Oracle:{1}, {T}: Add {G}{W} to your mana pool.
+Oracle:{1}, {T}: Add {G}{W}.
diff --git a/forge-gui/res/cardsfolder/s/selvala_explorer_returned.txt b/forge-gui/res/cardsfolder/s/selvala_explorer_returned.txt
index 7bfc31dfb4f..efa99ae44aa 100644
--- a/forge-gui/res/cardsfolder/s/selvala_explorer_returned.txt
+++ b/forge-gui/res/cardsfolder/s/selvala_explorer_returned.txt
@@ -2,7 +2,7 @@ Name:Selvala, Explorer Returned
 ManaCost:1 G W
 Types:Legendary Creature Elf Scout
 PT:2/4
-A:AB$ Dig | Cost$ T | PrecostDesc$ Parley — | DigNum$ 1 | Defined$ Player | Reveal$ True | NoMove$ True | RememberRevealed$ True | SubAbility$ DBMana | SpellDescription$ Each player reveals the top card of his or her library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life. Then each players draws a card.
+A:AB$ Dig | Cost$ T | PrecostDesc$ Parley — | DigNum$ 1 | Defined$ Player | Reveal$ True | NoMove$ True | RememberRevealed$ True | SubAbility$ DBMana | SpellDescription$ Each player reveals the top card of his or her library. For each nonland card revealed this way, add {G} and you gain 1 life. Then each players draws a card.
 SVar:DBMana:DB$ Mana | Produced$ G | Amount$ X | References$ X | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ X | References$ X | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ Player | NumCards$ 1 | SubAbility$ DBCleanup
@@ -10,4 +10,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Valid Card.nonLand
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selvala_explorer_returned.jpg
-Oracle:Parley — {T}: Each player reveals the top card of his or her library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life. Then each player draws a card.
+Oracle:Parley — {T}: Each player reveals the top card of his or her library. For each nonland card revealed this way, add {G} and you gain 1 life. Then each player draws a card.
diff --git a/forge-gui/res/cardsfolder/s/selvala_heart_of_the_wilds.txt b/forge-gui/res/cardsfolder/s/selvala_heart_of_the_wilds.txt
index a09b8d6086a..6aa71e95adf 100644
--- a/forge-gui/res/cardsfolder/s/selvala_heart_of_the_wilds.txt
+++ b/forge-gui/res/cardsfolder/s/selvala_heart_of_the_wilds.txt
@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creatu
 SVar:TrigDraw:DB$ Draw | OptionalDecider$ TriggeredCardController | Defined$ TriggeredCardController | NumCards$ 1 | ConditionCheckSVar$ Z | ConditionSVarCompare$ EQY | References$ Z,Y
 SVar:Z:TriggeredCard$Valid Card.greatestPower
 SVar:Y:Count$Valid Card.greatestPower
-A:AB$ Mana | Cost$ G T | Produced$ Combo Any | Amount$ X | References$ X | SpellDescription$ Add X mana in any combination of colors to your mana pool, where X is the greatest power among creatures you control.
+A:AB$ Mana | Cost$ G T | Produced$ Combo Any | Amount$ X | References$ X | SpellDescription$ Add X mana in any combination of colors, where X is the greatest power among creatures you control.
 SVar:X:Count$GreatestPower_Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selvala_heart_of_the_wilds.jpg
-Oracle:Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power.\n{G}, {T}: Add X mana in any combination of colors to your mana pool, where X is the greatest power among creatures you control.
\ No newline at end of file
+Oracle:Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power.\n{G}, {T}: Add X mana in any combination of colors, where X is the greatest power among creatures you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/sequestered_stash.txt b/forge-gui/res/cardsfolder/s/sequestered_stash.txt
index 810147a5f1b..e465961ba99 100644
--- a/forge-gui/res/cardsfolder/s/sequestered_stash.txt
+++ b/forge-gui/res/cardsfolder/s/sequestered_stash.txt
@@ -1,9 +1,9 @@
 Name:Sequestered Stash
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mill | Cost$ 4 T Sac<1/CARDNAME> | Defined$ You | NumCards$ 5 | SubAbility$ DBChooseCard | SpellDescription$ Put the top five cards of your library into your graveyard. Then you may put an artifact card from your graveyard on top of your library.
 SVar:DBChooseCard:DB$ ChooseCard | Choices$ Artifact.YouOwn | ChoiceZone$ Graveyard | Amount$ 1 | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | Defined$ ChosenCard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sequestered_stash.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}, {T}, Sacrifice Sequestered Stash: Put the top five cards of your library into your graveyard. Then you may put an artifact card from your graveyard on top of your library.
+Oracle:{T}: Add {C}.\n{4}, {T}, Sacrifice Sequestered Stash: Put the top five cards of your library into your graveyard. Then you may put an artifact card from your graveyard on top of your library.
diff --git a/forge-gui/res/cardsfolder/s/seraph_sanctuary.txt b/forge-gui/res/cardsfolder/s/seraph_sanctuary.txt
index 81cb667bf61..255cd8c8dae 100644
--- a/forge-gui/res/cardsfolder/s/seraph_sanctuary.txt
+++ b/forge-gui/res/cardsfolder/s/seraph_sanctuary.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ HavenLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Angel.YouCtrl | TriggerZones$ Battlefield | Execute$ HavenLife | TriggerDescription$ Whenever an Angel enters the battlefield under your control, you gain 1 life.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:HavenLife:DB$GainLife | Defined$ You | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seraph_sanctuary.jpg
-Oracle:When Seraph Sanctuary enters the battlefield, you gain 1 life.\nWhenever an Angel enters the battlefield under your control, you gain 1 life.\n{T}: Add {C} to your mana pool. 
\ No newline at end of file
+Oracle:When Seraph Sanctuary enters the battlefield, you gain 1 life.\nWhenever an Angel enters the battlefield under your control, you gain 1 life.\n{T}: Add {C}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/serras_sanctum.txt b/forge-gui/res/cardsfolder/s/serras_sanctum.txt
index a6b10b31121..b9b2e0fd574 100644
--- a/forge-gui/res/cardsfolder/s/serras_sanctum.txt
+++ b/forge-gui/res/cardsfolder/s/serras_sanctum.txt
@@ -1,8 +1,8 @@
 Name:Serra's Sanctum
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ W | Amount$ X | References$ X | SpellDescription$ Add {W} to your mana pool for each Enchantment you control.
+A:AB$ Mana | Cost$ T | Produced$ W | Amount$ X | References$ X | SpellDescription$ Add {W} for each Enchantment you control.
 SVar:X:Count$Valid Enchantment.YouCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serras_sanctum.jpg
-Oracle:{T}: Add {W} to your mana pool for each enchantment you control.
+Oracle:{T}: Add {W} for each enchantment you control.
diff --git a/forge-gui/res/cardsfolder/s/serum_powder.txt b/forge-gui/res/cardsfolder/s/serum_powder.txt
index 91b146cba29..11feb2adb7e 100644
--- a/forge-gui/res/cardsfolder/s/serum_powder.txt
+++ b/forge-gui/res/cardsfolder/s/serum_powder.txt
@@ -2,8 +2,8 @@ Name:Serum Powder
 ManaCost:3
 Types:Artifact
 Text:Any time you could mulligan and CARDNAME is in your hand, you may exile all the cards from your hand, then draw that many cards. (You can do this in addition to taking mulligans.)
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serum_powder.jpg
-Oracle:{T}: Add {C} to your mana pool.\nAny time you could mulligan and Serum Powder is in your hand, you may exile all the cards from your hand, then draw that many cards. (You can do this in addition to taking mulligans.)
+Oracle:{T}: Add {C}.\nAny time you could mulligan and Serum Powder is in your hand, you may exile all the cards from your hand, then draw that many cards. (You can do this in addition to taking mulligans.)
diff --git a/forge-gui/res/cardsfolder/s/servant_of_the_conduit.txt b/forge-gui/res/cardsfolder/s/servant_of_the_conduit.txt
index 6815b05d815..b06d64438c0 100644
--- a/forge-gui/res/cardsfolder/s/servant_of_the_conduit.txt
+++ b/forge-gui/res/cardsfolder/s/servant_of_the_conduit.txt
@@ -4,6 +4,6 @@ Types:Creature Elf Druid
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEnergy | TriggerDescription$ When CARDNAME enters the battlefield, you get {E}{E} (two energy counters).
 SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 2 
-A:AB$ Mana | Cost$ T PayEnergy<1> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T PayEnergy<1> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:Picture:http://www.wizards.com/global/images/magic/general/servant_of_the_conduit.jpg
-Oracle:When Servant of the Conduit enters the battlefield, you get {E}{E} (two energy counters).\n{T}, Pay {E}: Add one mana of any color to your mana pool.
+Oracle:When Servant of the Conduit enters the battlefield, you get {E}{E} (two energy counters).\n{T}, Pay {E}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/s/seton_krosan_protector.txt b/forge-gui/res/cardsfolder/s/seton_krosan_protector.txt
index a0d8afbcc94..4373946f38d 100644
--- a/forge-gui/res/cardsfolder/s/seton_krosan_protector.txt
+++ b/forge-gui/res/cardsfolder/s/seton_krosan_protector.txt
@@ -2,6 +2,6 @@ Name:Seton, Krosan Protector
 ManaCost:G G G
 Types:Legendary Creature Centaur Druid
 PT:2/2
-A:AB$ Mana | Cost$ tapXType<1/Druid> | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ tapXType<1/Druid> | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seton_krosan_protector.jpg
-Oracle:Tap an untapped Druid you control: Add {G} to your mana pool.
+Oracle:Tap an untapped Druid you control: Add {G}.
diff --git a/forge-gui/res/cardsfolder/s/shadowblood_egg.txt b/forge-gui/res/cardsfolder/s/shadowblood_egg.txt
index 8705ae55d05..90838066656 100644
--- a/forge-gui/res/cardsfolder/s/shadowblood_egg.txt
+++ b/forge-gui/res/cardsfolder/s/shadowblood_egg.txt
@@ -1,9 +1,9 @@
 Name:Shadowblood Egg
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ B R | SubAbility$ DBDraw | SpellDescription$ Add {B}{R} to your mana pool. Draw a card.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ B R | SubAbility$ DBDraw | SpellDescription$ Add {B}{R}. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shadowblood_egg.jpg
-Oracle:{2}, {T}, Sacrifice Shadowblood Egg: Add {B}{R} to your mana pool. Draw a card.
+Oracle:{2}, {T}, Sacrifice Shadowblood Egg: Add {B}{R}. Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/shadowblood_ridge.txt b/forge-gui/res/cardsfolder/s/shadowblood_ridge.txt
index 2d62c94b86a..8004b7a2c22 100644
--- a/forge-gui/res/cardsfolder/s/shadowblood_ridge.txt
+++ b/forge-gui/res/cardsfolder/s/shadowblood_ridge.txt
@@ -1,7 +1,7 @@
 Name:Shadowblood Ridge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ 1 T | Produced$ B R | SpellDescription$ Add {B}{R} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ B R | SpellDescription$ Add {B}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shadowblood_ridge.jpg
-Oracle:{1}, {T}: Add {B}{R} to your mana pool.
+Oracle:{1}, {T}: Add {B}{R}.
diff --git a/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt b/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt
index 9d2de00c40f..1842cef34a7 100644
--- a/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt
+++ b/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt
@@ -2,10 +2,10 @@ Name:Shaman of Forgotten Ways
 ManaCost:2 G
 Types:Creature Human Shaman
 PT:2/3
-A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Card.Creature | SpellDescription$ Add two mana in any combination of colors to your mana pool. Spend this mana only to cast creature spells.
+A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Card.Creature | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast creature spells.
 A:AB$ RepeatEach | Cost$ 9 G G T | PrecostDesc$ Formidable — | CheckSVar$ FormidableTest | SVarCompare$ GE8 | References$ FormidableTest | RepeatPlayers$ Player | RepeatSubAbility$ DBSetLife | SpellDescription$ Each player's life total becomes the number of creatures he or she controls. Activate this ability only if creatures you control have total power 8 or greater.
 SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
 SVar:DBSetLife:DB$ SetLife | Defined$ Player.IsRemembered | LifeAmount$ X | References$ X
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shaman_of_forgotten_ways.jpg
-Oracle:{T}: Add two mana in any combination of colors to your mana pool. Spend this mana only to cast creature spells.\nFormidable — {9}{G}{G}, {T}: Each player's life total becomes the number of creatures he or she controls. Activate this ability only if creatures you control have total power 8 or greater.
+Oracle:{T}: Add two mana in any combination of colors. Spend this mana only to cast creature spells.\nFormidable — {9}{G}{G}, {T}: Each player's life total becomes the number of creatures he or she controls. Activate this ability only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/s/shambling_vent.txt b/forge-gui/res/cardsfolder/s/shambling_vent.txt
index f6d40121867..3b42b3439c1 100644
--- a/forge-gui/res/cardsfolder/s/shambling_vent.txt
+++ b/forge-gui/res/cardsfolder/s/shambling_vent.txt
@@ -2,8 +2,8 @@ Name:Shambling Vent
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Animate | Cost$ 1 W B | Defined$ Self | Power$ 2 | Toughness$ 3 | Types$ Creature,Elemental | Colors$ White,Black | Keywords$ Lifelink | SpellDescription$ CARDNAME becomes a 2/3 white and black Elemental creature with lifelink until end of turn. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shambling_vent.jpg
-Oracle:Shambling Vent enters the battlefield tapped.\n{T}: Add {W} or {B} to your mana pool.\n{1}{W}{B}: Shambling Vent becomes a 2/3 white and black Elemental creature with lifelink until end of turn. It's still a land.
+Oracle:Shambling Vent enters the battlefield tapped.\n{T}: Add {W} or {B}.\n{1}{W}{B}: Shambling Vent becomes a 2/3 white and black Elemental creature with lifelink until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/s/shefet_dunes.txt b/forge-gui/res/cardsfolder/s/shefet_dunes.txt
index 4f1748bc646..96343cfe7d8 100644
--- a/forge-gui/res/cardsfolder/s/shefet_dunes.txt
+++ b/forge-gui/res/cardsfolder/s/shefet_dunes.txt
@@ -1,8 +1,8 @@
 Name:Shefet Dunes
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ PumpAll | Cost$ 2 W W T Sac<1/Desert> | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SorcerySpeed$ True | SpellDescription$ Creatures you control get +1/+1 until end of turn. Activate this ability only any time you could cast a sorcery.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shefet_dunes.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Pay 1 life: Add {W} to your mana pool.\n{2}{W}{W}, {T}, Sacrifice a Desert: Creatures you control get +1/+1 until end of turn. Activate this ability only any time you could cast a sorcery.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{T}, Pay 1 life: Add {W}.\n{2}{W}{W}, {T}, Sacrifice a Desert: Creatures you control get +1/+1 until end of turn. Activate this ability only any time you could cast a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/shelldock_isle.txt b/forge-gui/res/cardsfolder/s/shelldock_isle.txt
index b3adb2eebf1..73510183f80 100644
--- a/forge-gui/res/cardsfolder/s/shelldock_isle.txt
+++ b/forge-gui/res/cardsfolder/s/shelldock_isle.txt
@@ -2,9 +2,9 @@ Name:Shelldock Isle
 ManaCost:no cost
 Types:Land
 K:Hideaway
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Play | Cost$ U T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ LE20 | ForgetRemembered$ True | References$ X | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if a library has twenty or fewer cards in it.
 SVar:X:PlayerCountPlayers$LowestValidLibrary Card.YouOwn
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shelldock_isle.jpg
-Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {U} to your mana pool.\n{U}, {T}: You may play the exiled card without paying its mana cost if a library has twenty or fewer cards in it.
+Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {U}.\n{U}, {T}: You may play the exiled card without paying its mana cost if a library has twenty or fewer cards in it.
diff --git a/forge-gui/res/cardsfolder/s/sheltered_aerie.txt b/forge-gui/res/cardsfolder/s/sheltered_aerie.txt
index cc86bf9dec5..566ec8d38d5 100644
--- a/forge-gui/res/cardsfolder/s/sheltered_aerie.txt
+++ b/forge-gui/res/cardsfolder/s/sheltered_aerie.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ AbundantGrowthTap | Description$ Enchanted land has "{T}: Add two mana of any one color to your mana pool."
-SVar:AbundantGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ AbundantGrowthTap | Description$ Enchanted land has "{T}: Add two mana of any one color."
+SVar:AbundantGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sheltered_aerie.jpg
-Oracle:Enchant land\nEnchanted land has "{T}: Add two mana of any one color to your mana pool."
+Oracle:Enchant land\nEnchanted land has "{T}: Add two mana of any one color."
diff --git a/forge-gui/res/cardsfolder/s/sheltered_thicket.txt b/forge-gui/res/cardsfolder/s/sheltered_thicket.txt
index 179982708f1..b06c3fee9b3 100644
--- a/forge-gui/res/cardsfolder/s/sheltered_thicket.txt
+++ b/forge-gui/res/cardsfolder/s/sheltered_thicket.txt
@@ -4,4 +4,4 @@ Types:Land Mountain Forest
 K:CARDNAME enters the battlefield tapped.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sheltered_thicket.jpg
-Oracle:({T}: Add {R} or {G} to your mana pool.)\nSheltered Thicket enters the battlefield tapped.\nCycling {2} ({2}, discard this card: Draw a card.)
\ No newline at end of file
+Oracle:({T}: Add {R} or {G}.)\nSheltered Thicket enters the battlefield tapped.\nCycling {2} ({2}, discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/sheltered_valley.txt b/forge-gui/res/cardsfolder/s/sheltered_valley.txt
index 110713a42bb..ec2e4b11936 100644
--- a/forge-gui/res/cardsfolder/s/sheltered_valley.txt
+++ b/forge-gui/res/cardsfolder/s/sheltered_valley.txt
@@ -4,10 +4,10 @@ Types:Land
 R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ SacBeforeETB | Description$ If CARDNAME would enter the battlefield, instead sacrifice each other permanent named Sheltered Valley you control, then put CARDNAME onto the battlefield.
 SVar:SacBeforeETB:DB$ SacrificeAll | ValidCards$ Permanent.YouCtrl+namedSheltered Valley | SubAbility$ MoveToBattlefield
 SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Land.YouCtrl | PresentCompare$ LE3 | Execute$ TrigGainLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if you control three or fewer lands, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 SVar:NeedsToPlayVar:OnlyOne EQ0
 SVar:OnlyOne:Count$Valid Permanent.YouCtrl+namedSheltered Valley
 SVar:Picture:http://wizards.com/global/images/magic/general/sheltered_valley.jpg
-Oracle:If Sheltered Valley would enter the battlefield, instead sacrifice each other permanent named Sheltered Valley you control, then put Sheltered Valley onto the battlefield.\nAt the beginning of your upkeep, if you control three or fewer lands, you gain 1 life.\n{T}: Add {C} to your mana pool.
+Oracle:If Sheltered Valley would enter the battlefield, instead sacrifice each other permanent named Sheltered Valley you control, then put Sheltered Valley onto the battlefield.\nAt the beginning of your upkeep, if you control three or fewer lands, you gain 1 life.\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/s/shimmering_grotto.txt b/forge-gui/res/cardsfolder/s/shimmering_grotto.txt
index 9bfbd4bbf6c..0847f79b4e1 100644
--- a/forge-gui/res/cardsfolder/s/shimmering_grotto.txt
+++ b/forge-gui/res/cardsfolder/s/shimmering_grotto.txt
@@ -1,8 +1,8 @@
 Name:Shimmering Grotto
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shimmering_grotto.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/s/shinka_the_bloodsoaked_keep.txt b/forge-gui/res/cardsfolder/s/shinka_the_bloodsoaked_keep.txt
index 7fb3cd4d9e4..62b5b006a7f 100644
--- a/forge-gui/res/cardsfolder/s/shinka_the_bloodsoaked_keep.txt
+++ b/forge-gui/res/cardsfolder/s/shinka_the_bloodsoaked_keep.txt
@@ -1,8 +1,8 @@
 Name:Shinka, the Bloodsoaked Keep
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Pump | Cost$ R T | ValidTgts$ Creature.Legendary | TgtPrompt$ Select target legendary creature | KW$ First Strike | SpellDescription$ Target legendary creature gains first strike until end of turn.
 DeckHints:Type$Legendary
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shinka_the_bloodsoaked_keep.jpg
-Oracle:{T}: Add {R} to your mana pool.\n{R}, {T}: Target legendary creature gains first strike until end of turn.
+Oracle:{T}: Add {R}.\n{R}, {T}: Target legendary creature gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/shivan_gorge.txt b/forge-gui/res/cardsfolder/s/shivan_gorge.txt
index 88d5760910b..2206cf9ad1a 100644
--- a/forge-gui/res/cardsfolder/s/shivan_gorge.txt
+++ b/forge-gui/res/cardsfolder/s/shivan_gorge.txt
@@ -1,7 +1,7 @@
 Name:Shivan Gorge
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ DealDamage | Cost$ 2 R T | NumDmg$ 1 | Defined$ Player.Opponent | SpellDescription$ CARDNAME deals 1 damage to each opponent.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shivan_gorge.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}{R}, {T}: Shivan Gorge deals 1 damage to each opponent.
+Oracle:{T}: Add {C}.\n{2}{R}, {T}: Shivan Gorge deals 1 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/s/shivan_oasis.txt b/forge-gui/res/cardsfolder/s/shivan_oasis.txt
index 7a85de4afa8..ee01b97ac57 100644
--- a/forge-gui/res/cardsfolder/s/shivan_oasis.txt
+++ b/forge-gui/res/cardsfolder/s/shivan_oasis.txt
@@ -2,7 +2,7 @@ Name:Shivan Oasis
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shivan_oasis.jpg
-Oracle:Shivan Oasis enters the battlefield tapped.\n{T}: Add {R} or {G} to your mana pool.
+Oracle:Shivan Oasis enters the battlefield tapped.\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/s/shizo_deaths_storehouse.txt b/forge-gui/res/cardsfolder/s/shizo_deaths_storehouse.txt
index ce50084431c..2d0b9c38fc6 100644
--- a/forge-gui/res/cardsfolder/s/shizo_deaths_storehouse.txt
+++ b/forge-gui/res/cardsfolder/s/shizo_deaths_storehouse.txt
@@ -1,8 +1,8 @@
 Name:Shizo, Death's Storehouse
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Pump | Cost$ B T | ValidTgts$ Creature.Legendary | TgtPrompt$ Select target legendary creature | KW$Fear | SpellDescription$ Target legendary creature gains fear until end of turn.
 DeckHints:Type$Legendary
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shizo_deaths_storehouse.jpg
-Oracle:{T}: Add {B} to your mana pool.\n{B}, {T}: Target legendary creature gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
+Oracle:{T}: Add {B}.\n{B}, {T}: Target legendary creature gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
diff --git a/forge-gui/res/cardsfolder/s/shizuko_caller_of_autumn.txt b/forge-gui/res/cardsfolder/s/shizuko_caller_of_autumn.txt
index dc03c75dc1e..da98e1de603 100644
--- a/forge-gui/res/cardsfolder/s/shizuko_caller_of_autumn.txt
+++ b/forge-gui/res/cardsfolder/s/shizuko_caller_of_autumn.txt
@@ -2,7 +2,7 @@ Name:Shizuko, Caller of Autumn
 ManaCost:1 G G
 Types:Legendary Creature Snake Shaman
 PT:2/3
-T:Mode$ Phase | Phase$ Upkeep | Execute$ SakuraManaTriple | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player adds {G}{G}{G} to his or her mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
+T:Mode$ Phase | Phase$ Upkeep | Execute$ SakuraManaTriple | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player adds {G}{G}{G}. Until end of turn, they don't lose this mana as steps and phases end.
 SVar:SakuraManaTriple:DB$ Mana | Produced$ G | Amount$ 3 | PersistentMana$ True | Defined$ TriggeredPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shizuko_caller_of_autumn.jpg
-Oracle:At the beginning of each player's upkeep, that player adds {G}{G}{G} to his or her mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
+Oracle:At the beginning of each player's upkeep, that player adds {G}{G}{G}. Until end of turn, they don't lose this mana as steps and phases end.
diff --git a/forge-gui/res/cardsfolder/s/shrine_of_boundless_growth.txt b/forge-gui/res/cardsfolder/s/shrine_of_boundless_growth.txt
index 2ad79f37c3c..067da5a822e 100644
--- a/forge-gui/res/cardsfolder/s/shrine_of_boundless_growth.txt
+++ b/forge-gui/res/cardsfolder/s/shrine_of_boundless_growth.txt
@@ -4,8 +4,8 @@ Types:Artifact
 T:Mode$ SpellCast | ValidCard$ Card.Green | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAddCounter | TriggerDescription$ At the beginning of your upkeep or whenever you cast a green spell, put a charge counter on CARDNAME.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAddCounter | Secondary$ True | TriggerDescription$ At the beginning of your upkeep or whenever you cast a green spell, put a charge counter on CARDNAME.
 SVar:TrigAddCounter:DB$PutCounter | CounterType$ CHARGE | CounterNum$ 1
-A:AB$Mana | Cost$ T Sac<1/CARDNAME> | Produced$ C | Amount$ X | References$ X | SpellDescription$ Add {C} to your mana pool for each charge counter on CARDNAME.
+A:AB$Mana | Cost$ T Sac<1/CARDNAME> | Produced$ C | Amount$ X | References$ X | SpellDescription$ Add {C} for each charge counter on CARDNAME.
 SVar:X:Count$CardCounters.CHARGE
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shrine_of_boundless_growth.jpg
-Oracle:At the beginning of your upkeep or whenever you cast a green spell, put a charge counter on Shrine of Boundless Growth.\n{T}, Sacrifice Shrine of Boundless Growth: Add {C} to your mana pool for each charge counter on Shrine of Boundless Growth.
+Oracle:At the beginning of your upkeep or whenever you cast a green spell, put a charge counter on Shrine of Boundless Growth.\n{T}, Sacrifice Shrine of Boundless Growth: Add {C} for each charge counter on Shrine of Boundless Growth.
diff --git a/forge-gui/res/cardsfolder/s/shrine_of_the_forsaken_gods.txt b/forge-gui/res/cardsfolder/s/shrine_of_the_forsaken_gods.txt
index 2033d815034..d0e4b3aaa06 100644
--- a/forge-gui/res/cardsfolder/s/shrine_of_the_forsaken_gods.txt
+++ b/forge-gui/res/cardsfolder/s/shrine_of_the_forsaken_gods.txt
@@ -1,10 +1,10 @@
 Name:Shrine of the Forsaken Gods
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | IsPresent$ Land.YouCtrl | PresentCompare$ GE7 | RestrictValid$ Card.Colorless | SpellDescription$ Add {C}{C} to your mana pool. Spend this mana only to cast colorless spells. Activate this ability only if you control seven or more lands.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | IsPresent$ Land.YouCtrl | PresentCompare$ GE7 | RestrictValid$ Card.Colorless | SpellDescription$ Add {C}{C}. Spend this mana only to cast colorless spells. Activate this ability only if you control seven or more lands.
 SVar:RemRandomDeck:True
 DeckHas:Ability$Mana.Colorless
 DeckHints:Color$Colorless & Keyword$Devoid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shrine_of_the_forsaken_gods.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {C}{C} to your mana pool. Spend this mana only to cast colorless spells. Activate this ability only if you control seven or more lands.
+Oracle:{T}: Add {C}.\n{T}: Add {C}{C}. Spend this mana only to cast colorless spells. Activate this ability only if you control seven or more lands.
diff --git a/forge-gui/res/cardsfolder/s/sifter_of_skulls.txt b/forge-gui/res/cardsfolder/s/sifter_of_skulls.txt
index c335bdc15d5..c39c690bb36 100644
--- a/forge-gui/res/cardsfolder/s/sifter_of_skulls.txt
+++ b/forge-gui/res/cardsfolder/s/sifter_of_skulls.txt
@@ -3,10 +3,10 @@ ManaCost:3 B
 Types:Creature Eldrazi
 PT:4/3
 K:Devoid
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken creature you control dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." ({C} represents colorless mana.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken creature you control dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sifter_of_skulls.jpg
-Oracle:Devoid (This card has no color.)\nWhenever another nontoken creature you control dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." ({C} represents colorless mana.)
+Oracle:Devoid (This card has no color.)\nWhenever another nontoken creature you control dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
diff --git a/forge-gui/res/cardsfolder/s/silhana_starfletcher.txt b/forge-gui/res/cardsfolder/s/silhana_starfletcher.txt
index a2ed594dd77..40f8a2cb256 100644
--- a/forge-gui/res/cardsfolder/s/silhana_starfletcher.txt
+++ b/forge-gui/res/cardsfolder/s/silhana_starfletcher.txt
@@ -5,6 +5,6 @@ PT:1/3
 K:Reach
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentInComputerDeck
-A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/silhana_starfletcher.jpg
-Oracle:Reach (This creature can block creatures with flying.)\nAs Silhana Starfletcher enters the battlefield, choose a color.\n{T}: Add one mana of the chosen color to your mana pool.
+Oracle:Reach (This creature can block creatures with flying.)\nAs Silhana Starfletcher enters the battlefield, choose a color.\n{T}: Add one mana of the chosen color.
diff --git a/forge-gui/res/cardsfolder/s/silumgar_monument.txt b/forge-gui/res/cardsfolder/s/silumgar_monument.txt
index 010325fca94..72464e58196 100644
--- a/forge-gui/res/cardsfolder/s/silumgar_monument.txt
+++ b/forge-gui/res/cardsfolder/s/silumgar_monument.txt
@@ -1,10 +1,10 @@
 Name:Silumgar Monument
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Animate | Cost$ 4 U B | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | Colors$ Blue,Black | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 blue and black Dragon artifact creature with flying until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Blue|Black
 SVar:Picture:http://www.wizards.com/global/images/magic/general/silumgar_monument.jpg
-Oracle:{T}: Add {U} or {B} to your mana pool.\n{4}{U}{B}: Silumgar Monument becomes a 4/4 blue and black Dragon artifact creature with flying until end of turn.
+Oracle:{T}: Add {U} or {B}.\n{4}{U}{B}: Silumgar Monument becomes a 4/4 blue and black Dragon artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/silver_myr.txt b/forge-gui/res/cardsfolder/s/silver_myr.txt
index 0e0e96922a5..bd3e333b0ad 100644
--- a/forge-gui/res/cardsfolder/s/silver_myr.txt
+++ b/forge-gui/res/cardsfolder/s/silver_myr.txt
@@ -2,6 +2,6 @@ Name:Silver Myr
 ManaCost:2
 Types:Artifact Creature Myr
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/silver_myr.jpg
-Oracle:{T}: Add {U} to your mana pool.
+Oracle:{T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/s/simian_spirit_guide.txt b/forge-gui/res/cardsfolder/s/simian_spirit_guide.txt
index c2014673615..f27c6457bd4 100644
--- a/forge-gui/res/cardsfolder/s/simian_spirit_guide.txt
+++ b/forge-gui/res/cardsfolder/s/simian_spirit_guide.txt
@@ -2,6 +2,6 @@ Name:Simian Spirit Guide
 ManaCost:2 R
 Types:Creature Ape Spirit
 PT:2/2
-A:AB$ Mana | Cost$ ExileFromHand<1/CARDNAME> | Produced$ R | ActivationZone$ Hand | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ ExileFromHand<1/CARDNAME> | Produced$ R | ActivationZone$ Hand | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/simian_spirit_guide.jpg
-Oracle:Exile Simian Spirit Guide from your hand: Add {R} to your mana pool.
+Oracle:Exile Simian Spirit Guide from your hand: Add {R}.
diff --git a/forge-gui/res/cardsfolder/s/simic_cluestone.txt b/forge-gui/res/cardsfolder/s/simic_cluestone.txt
index eb9d02aa72d..9cc3ab73d43 100644
--- a/forge-gui/res/cardsfolder/s/simic_cluestone.txt
+++ b/forge-gui/res/cardsfolder/s/simic_cluestone.txt
@@ -1,10 +1,10 @@
 Name:Simic Cluestone
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Draw | Cost$ G U T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Green|Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/simic_cluestone.jpg
-Oracle:{T}: Add {G} or {U} to your mana pool.\n{G}{U}, {T}, Sacrifice Simic Cluestone: Draw a card.
+Oracle:{T}: Add {G} or {U}.\n{G}{U}, {T}, Sacrifice Simic Cluestone: Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/simic_growth_chamber.txt b/forge-gui/res/cardsfolder/s/simic_growth_chamber.txt
index 2ff6143730b..1d71b677c31 100644
--- a/forge-gui/res/cardsfolder/s/simic_growth_chamber.txt
+++ b/forge-gui/res/cardsfolder/s/simic_growth_chamber.txt
@@ -2,9 +2,9 @@ Name:Simic Growth Chamber
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G U | SpellDescription$ Add {G}{U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G U | SpellDescription$ Add {G}{U}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/simic_growth_chamber.jpg
-Oracle:Simic Growth Chamber enters the battlefield tapped.\nWhen Simic Growth Chamber enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {G}{U} to your mana pool.
+Oracle:Simic Growth Chamber enters the battlefield tapped.\nWhen Simic Growth Chamber enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {G}{U}.
diff --git a/forge-gui/res/cardsfolder/s/simic_guildgate.txt b/forge-gui/res/cardsfolder/s/simic_guildgate.txt
index 05b785cc979..78052b47ead 100644
--- a/forge-gui/res/cardsfolder/s/simic_guildgate.txt
+++ b/forge-gui/res/cardsfolder/s/simic_guildgate.txt
@@ -2,7 +2,7 @@ Name:Simic Guildgate
 ManaCost:no cost
 Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/simic_guildgate.jpg
-Oracle:Simic Guildgate enters the battlefield tapped.\n{T}: Add {G} or {U} to your mana pool.
+Oracle:Simic Guildgate enters the battlefield tapped.\n{T}: Add {G} or {U}.
diff --git a/forge-gui/res/cardsfolder/s/simic_keyrune.txt b/forge-gui/res/cardsfolder/s/simic_keyrune.txt
index 2c3a74925de..fea5442a279 100644
--- a/forge-gui/res/cardsfolder/s/simic_keyrune.txt
+++ b/forge-gui/res/cardsfolder/s/simic_keyrune.txt
@@ -1,10 +1,10 @@
 Name:Simic Keyrune
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Animate | Cost$ G U | Defined$ Self | Power$ 2 | Toughness$ 3 | Types$ Artifact,Creature,Crab | Colors$ Green,Blue | Keywords$ Hexproof | SpellDescription$ CARDNAME becomes a 2/3 green and blue Crab artifact creature with hexproof until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Green|Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/simic_keyrune.jpg
-Oracle:{T}: Add {G} or {U} to your mana pool.\n{G}{U}: Simic Keyrune becomes a 2/3 green and blue Crab artifact creature with hexproof until end of turn. (It can't be the target of spells or abilities your opponents control.)
+Oracle:{T}: Add {G} or {U}.\n{G}{U}: Simic Keyrune becomes a 2/3 green and blue Crab artifact creature with hexproof until end of turn. (It can't be the target of spells or abilities your opponents control.)
diff --git a/forge-gui/res/cardsfolder/s/simic_signet.txt b/forge-gui/res/cardsfolder/s/simic_signet.txt
index 5646c45a35a..1df7b22bc07 100644
--- a/forge-gui/res/cardsfolder/s/simic_signet.txt
+++ b/forge-gui/res/cardsfolder/s/simic_signet.txt
@@ -1,7 +1,7 @@
 Name:Simic Signet
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T | Produced$ G U | SpellDescription$ Add {G}{U} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ G U | SpellDescription$ Add {G}{U}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/simic_signet.jpg
-Oracle:{1}, {T}: Add {G}{U} to your mana pool.
+Oracle:{1}, {T}: Add {G}{U}.
diff --git a/forge-gui/res/cardsfolder/s/sisay.txt b/forge-gui/res/cardsfolder/s/sisay.txt
index c47ca6151c3..0392ed28b43 100644
--- a/forge-gui/res/cardsfolder/s/sisay.txt
+++ b/forge-gui/res/cardsfolder/s/sisay.txt
@@ -2,8 +2,8 @@ Name:Sisay
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:-2/-3
-T:Mode$ TapsForMana | TriggerZones$ Command | ValidCard$ Land.YouCtrl | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+T:Mode$ TapsForMana | TriggerZones$ Command | ValidCard$ Land.YouCtrl | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana of any type that land produced.
 SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:RemAIDeck:True
 SVar:Picture:https://downloads.cardforge.org/images/cards/VAN/Sisay.full.jpg
-Oracle:Hand -2, life -3\nWhenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+Oracle:Hand -2, life -3\nWhenever you tap a land for mana, add one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/s/sisays_ring.txt b/forge-gui/res/cardsfolder/s/sisays_ring.txt
index 736ee596283..799e0a8df0a 100644
--- a/forge-gui/res/cardsfolder/s/sisays_ring.txt
+++ b/forge-gui/res/cardsfolder/s/sisays_ring.txt
@@ -1,6 +1,6 @@
 Name:Sisay's Ring
 ManaCost:4
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sisays_ring.jpg
-Oracle:{T}: Add {C}{C} to your mana pool.
+Oracle:{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/s/sisters_of_the_flame.txt b/forge-gui/res/cardsfolder/s/sisters_of_the_flame.txt
index 9a75274bda3..81d3ac8cb82 100644
--- a/forge-gui/res/cardsfolder/s/sisters_of_the_flame.txt
+++ b/forge-gui/res/cardsfolder/s/sisters_of_the_flame.txt
@@ -2,6 +2,6 @@ Name:Sisters of the Flame
 ManaCost:1 R R
 Types:Creature Human Shaman
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://resources.wizards.com/magic/cards/dk/en-us/card1800.jpg
-Oracle:{T}: Add {R} to your mana pool.
+Oracle:{T}: Add {R}.
diff --git a/forge-gui/res/cardsfolder/s/skarrg_the_rage_pits.txt b/forge-gui/res/cardsfolder/s/skarrg_the_rage_pits.txt
index 4b0182a8d96..6a083dc73c2 100644
--- a/forge-gui/res/cardsfolder/s/skarrg_the_rage_pits.txt
+++ b/forge-gui/res/cardsfolder/s/skarrg_the_rage_pits.txt
@@ -1,7 +1,7 @@
 Name:Skarrg, the Rage Pits
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ R G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | KW$ Trample | SpellDescription$ Target creature gets +1/+1 and gains trample until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skarrg_the_rage_pits.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{R}{G}, {T}: Target creature gets +1/+1 and gains trample until end of turn.
+Oracle:{T}: Add {C}.\n{R}{G}, {T}: Target creature gets +1/+1 and gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/skirge_familiar.txt b/forge-gui/res/cardsfolder/s/skirge_familiar.txt
index b4bc3396221..fc8e195f62a 100644
--- a/forge-gui/res/cardsfolder/s/skirge_familiar.txt
+++ b/forge-gui/res/cardsfolder/s/skirge_familiar.txt
@@ -3,7 +3,7 @@ ManaCost:4 B
 Types:Creature Imp
 PT:3/2
 K:Flying
-A:AB$ Mana | Cost$ Discard<1/Card> | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ Discard<1/Card> | Produced$ B | SpellDescription$ Add {B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skirge_familiar.jpg
-Oracle:Flying\nDiscard a card: Add {B} to your mana pool.
+Oracle:Flying\nDiscard a card: Add {B}.
diff --git a/forge-gui/res/cardsfolder/s/skirk_prospector.txt b/forge-gui/res/cardsfolder/s/skirk_prospector.txt
index 11dbd122c33..84da1fed15f 100644
--- a/forge-gui/res/cardsfolder/s/skirk_prospector.txt
+++ b/forge-gui/res/cardsfolder/s/skirk_prospector.txt
@@ -2,7 +2,7 @@ Name:Skirk Prospector
 ManaCost:R
 Types:Creature Goblin
 PT:1/1
-A:AB$ Mana | Cost$ Sac<1/Goblin> | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/Goblin> | Produced$ R | SpellDescription$ Add {R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skirk_prospector.jpg
-Oracle:Sacrifice a Goblin: Add {R} to your mana pool.
+Oracle:Sacrifice a Goblin: Add {R}.
diff --git a/forge-gui/res/cardsfolder/s/skittering_invasion.txt b/forge-gui/res/cardsfolder/s/skittering_invasion.txt
index 05a63dea02e..b6bb7030155 100644
--- a/forge-gui/res/cardsfolder/s/skittering_invasion.txt
+++ b/forge-gui/res/cardsfolder/s/skittering_invasion.txt
@@ -1,9 +1,9 @@
 Name:Skittering Invasion
 ManaCost:7
 Types:Tribal Sorcery Eldrazi
-A:SP$ Token | Cost$ 7 | TokenAmount$ 5 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenAltImages$ c_0_1_eldrazi_spawn2,c_0_1_eldrazi_spawn3 | SpellDescription$ Create five 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+A:SP$ Token | Cost$ 7 | TokenAmount$ 5 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenAltImages$ c_0_1_eldrazi_spawn2,c_0_1_eldrazi_spawn3 | SpellDescription$ Create five 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skittering_invasion.jpg
-Oracle:Create five 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Create five 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/s/skull_of_ramos.txt b/forge-gui/res/cardsfolder/s/skull_of_ramos.txt
index a06337f98c0..d2252c4aa83 100644
--- a/forge-gui/res/cardsfolder/s/skull_of_ramos.txt
+++ b/forge-gui/res/cardsfolder/s/skull_of_ramos.txt
@@ -1,7 +1,7 @@
 Name:Skull of Ramos
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skull_of_ramos.jpg
-Oracle:{T}: Add {B} to your mana pool.\nSacrifice Skull of Ramos: Add {B} to your mana pool.
+Oracle:{T}: Add {B}.\nSacrifice Skull of Ramos: Add {B}.
diff --git a/forge-gui/res/cardsfolder/s/sky_diamond.txt b/forge-gui/res/cardsfolder/s/sky_diamond.txt
index ae349c6c12f..2a1d58cf52c 100644
--- a/forge-gui/res/cardsfolder/s/sky_diamond.txt
+++ b/forge-gui/res/cardsfolder/s/sky_diamond.txt
@@ -1,7 +1,7 @@
 Name:Sky Diamond
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sky_diamond.jpg
-Oracle:Sky Diamond enters the battlefield tapped.\n{T}: Add {U} to your mana pool.
+Oracle:Sky Diamond enters the battlefield tapped.\n{T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/s/skycloud_egg.txt b/forge-gui/res/cardsfolder/s/skycloud_egg.txt
index 43335720045..e859201a171 100644
--- a/forge-gui/res/cardsfolder/s/skycloud_egg.txt
+++ b/forge-gui/res/cardsfolder/s/skycloud_egg.txt
@@ -1,9 +1,9 @@
 Name:Skycloud Egg
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ W U | SubAbility$ DBDraw | SpellDescription$ Add {W}{U} to your mana pool. Draw a card.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ W U | SubAbility$ DBDraw | SpellDescription$ Add {W}{U}. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skycloud_egg.jpg
-Oracle:{2}, {T}, Sacrifice Skycloud Egg: Add {W}{U} to your mana pool. Draw a card.
+Oracle:{2}, {T}, Sacrifice Skycloud Egg: Add {W}{U}. Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/skycloud_expanse.txt b/forge-gui/res/cardsfolder/s/skycloud_expanse.txt
index 41442f0a9dd..e494e7a540d 100644
--- a/forge-gui/res/cardsfolder/s/skycloud_expanse.txt
+++ b/forge-gui/res/cardsfolder/s/skycloud_expanse.txt
@@ -1,7 +1,7 @@
 Name:Skycloud Expanse
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ 1 T | Produced$ W U | SpellDescription$ Add {W}{U} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ W U | SpellDescription$ Add {W}{U}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skycloud_expanse.jpg
-Oracle:{1}, {T}: Add {W}{U} to your mana pool.
+Oracle:{1}, {T}: Add {W}{U}.
diff --git a/forge-gui/res/cardsfolder/s/skyline_cascade.txt b/forge-gui/res/cardsfolder/s/skyline_cascade.txt
index d8f62f89a64..7a4655d4b01 100644
--- a/forge-gui/res/cardsfolder/s/skyline_cascade.txt
+++ b/forge-gui/res/cardsfolder/s/skyline_cascade.txt
@@ -4,6 +4,6 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature an opponent controls doesn't untap during its controller's next untap step.
 SVar:TrigPump:DB$Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skyline_cascade.jpg
-Oracle:Skyline Cascade enters the battlefield tapped.\nWhen Skyline Cascade enters the battlefield, target creature an opponent controls doesn't untap during its controller's next untap step.\n{T}: Add {U} to your mana pool.
+Oracle:Skyline Cascade enters the battlefield tapped.\nWhen Skyline Cascade enters the battlefield, target creature an opponent controls doesn't untap during its controller's next untap step.\n{T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/s/skyshroud_elf.txt b/forge-gui/res/cardsfolder/s/skyshroud_elf.txt
index 1cc7e1984e4..54819bf1cb4 100644
--- a/forge-gui/res/cardsfolder/s/skyshroud_elf.txt
+++ b/forge-gui/res/cardsfolder/s/skyshroud_elf.txt
@@ -2,9 +2,9 @@ Name:Skyshroud Elf
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ 1 | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ 1 | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ 1 | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ 1 | Produced$ R | SpellDescription$ Add {R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skyshroud_elf.jpg
-Oracle:{T}: Add {G} to your mana pool.\n{1}: Add {R} or {W} to your mana pool.
+Oracle:{T}: Add {G}.\n{1}: Add {R} or {W}.
diff --git a/forge-gui/res/cardsfolder/s/skyshroud_forest.txt b/forge-gui/res/cardsfolder/s/skyshroud_forest.txt
index 65fb3860ad6..6a7b52c22e8 100644
--- a/forge-gui/res/cardsfolder/s/skyshroud_forest.txt
+++ b/forge-gui/res/cardsfolder/s/skyshroud_forest.txt
@@ -1,10 +1,10 @@
 Name:Skyshroud Forest
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U} to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you.
 K:CARDNAME enters the battlefield tapped.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skyshroud_forest.jpg
-Oracle:Skyshroud Forest enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{T}: Add {G} or {U} to your mana pool. Skyshroud Forest deals 1 damage to you.
+Oracle:Skyshroud Forest enters the battlefield tapped.\n{T}: Add {C}.\n{T}: Add {G} or {U}. Skyshroud Forest deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/s/skyshroud_troopers.txt b/forge-gui/res/cardsfolder/s/skyshroud_troopers.txt
index 785dc13c325..628b6d99649 100644
--- a/forge-gui/res/cardsfolder/s/skyshroud_troopers.txt
+++ b/forge-gui/res/cardsfolder/s/skyshroud_troopers.txt
@@ -2,6 +2,6 @@ Name:Skyshroud Troopers
 ManaCost:3 G
 Types:Creature Elf Druid Warrior
 PT:3/3
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://resources.wizards.com/magic/cards/st/en-us/card5230.jpg
-Oracle:{T}: Add {G} to your mana pool.
+Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/s/slayers_stronghold.txt b/forge-gui/res/cardsfolder/s/slayers_stronghold.txt
index de6c63a31ca..23d6b0ecc33 100644
--- a/forge-gui/res/cardsfolder/s/slayers_stronghold.txt
+++ b/forge-gui/res/cardsfolder/s/slayers_stronghold.txt
@@ -1,7 +1,7 @@
 Name:Slayers' Stronghold
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ R W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2 | KW$ Vigilance & Haste | SpellDescription$ Target creature gets +2/+0 and gains vigilance and haste until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slayers_stronghold.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{R}{W}, {T}: Target creature gets +2/+0 and gains vigilance and haste until end of turn.
+Oracle:{T}: Add {C}.\n{R}{W}, {T}: Target creature gets +2/+0 and gains vigilance and haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/slippery_karst.txt b/forge-gui/res/cardsfolder/s/slippery_karst.txt
index c7a70681cd8..a52663c9afe 100644
--- a/forge-gui/res/cardsfolder/s/slippery_karst.txt
+++ b/forge-gui/res/cardsfolder/s/slippery_karst.txt
@@ -2,7 +2,7 @@ Name:Slippery Karst
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slippery_karst.jpg
-Oracle:Slippery Karst enters the battlefield tapped.\n{T}: Add {G} to your mana pool.\nCycling {2} ({2}, Discard this card: Draw a card.)
+Oracle:Slippery Karst enters the battlefield tapped.\n{T}: Add {G}.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/s/sliver_hive.txt b/forge-gui/res/cardsfolder/s/sliver_hive.txt
index a29be5049f9..287ec44ba47 100644
--- a/forge-gui/res/cardsfolder/s/sliver_hive.txt
+++ b/forge-gui/res/cardsfolder/s/sliver_hive.txt
@@ -1,11 +1,11 @@
 Name:Sliver Hive
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Card.Sliver | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a Sliver spell.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Card.Sliver | SpellDescription$ Add one mana of any color. Spend this mana only to cast a Sliver spell.
 A:AB$ Token | Cost$ 5 T | IsPresent$ Sliver.YouCtrl | TokenAmount$ 1 | TokenName$ Sliver | TokenTypes$ Creature,Sliver | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ c 1 1 sliver M15 | SpellDescription$ Create a 1/1 colorless Sliver creature token. Activate this ability only if you control a Sliver.
 SVar:BuffedBy:Sliver
 DeckHints:Type$Sliver
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sliver_hive.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast a Sliver spell.\n{5}, {T}: Create a 1/1 colorless Sliver creature token. Activate this ability only if you control a Sliver.
+Oracle:{T}: Add {C}.\n{T}: Add one mana of any color. Spend this mana only to cast a Sliver spell.\n{5}, {T}: Create a 1/1 colorless Sliver creature token. Activate this ability only if you control a Sliver.
diff --git a/forge-gui/res/cardsfolder/s/smokebraider.txt b/forge-gui/res/cardsfolder/s/smokebraider.txt
index f6c6cefebbe..25eb5b49377 100644
--- a/forge-gui/res/cardsfolder/s/smokebraider.txt
+++ b/forge-gui/res/cardsfolder/s/smokebraider.txt
@@ -2,7 +2,7 @@ Name:Smokebraider
 ManaCost:1 R
 Types:Creature Elemental Shaman
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Card.Elemental,Activated.Elemental | AILogic$ MostProminentInComputerHand | SpellDescription$ Add two mana in any combination of colors to your mana pool. Spend this mana only to cast Elemental spells or activate abilities of Elementals.
+A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Card.Elemental,Activated.Elemental | AILogic$ MostProminentInComputerHand | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast Elemental spells or activate abilities of Elementals.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/smokebraider.jpg
-Oracle:{T}: Add two mana in any combination of colors to your mana pool. Spend this mana only to cast Elemental spells or activate abilities of Elementals.
+Oracle:{T}: Add two mana in any combination of colors. Spend this mana only to cast Elemental spells or activate abilities of Elementals.
diff --git a/forge-gui/res/cardsfolder/s/smoldering_crater.txt b/forge-gui/res/cardsfolder/s/smoldering_crater.txt
index 227803164bc..0f56615e756 100644
--- a/forge-gui/res/cardsfolder/s/smoldering_crater.txt
+++ b/forge-gui/res/cardsfolder/s/smoldering_crater.txt
@@ -2,7 +2,7 @@ Name:Smoldering Crater
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/smoldering_crater.jpg
-Oracle:Smoldering Crater enters the battlefield tapped.\n{T}: Add {R} to your mana pool.\nCycling {2} ({2}, Discard this card: Draw a card.)
+Oracle:Smoldering Crater enters the battlefield tapped.\n{T}: Add {R}.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/s/smoldering_marsh.txt b/forge-gui/res/cardsfolder/s/smoldering_marsh.txt
index 482f9a6a9dd..37ede33b2e5 100644
--- a/forge-gui/res/cardsfolder/s/smoldering_marsh.txt
+++ b/forge-gui/res/cardsfolder/s/smoldering_marsh.txt
@@ -6,4 +6,4 @@ SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBChe
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar:Count$LastStateBattlefield Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/smoldering_marsh.jpg
-Oracle:({T}: Add {B} or {R} to your mana pool.)\nSmoldering Marsh enters the battlefield tapped unless you control two or more basic lands.
\ No newline at end of file
+Oracle:({T}: Add {B} or {R}.)\nSmoldering Marsh enters the battlefield tapped unless you control two or more basic lands.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/smoldering_spires.txt b/forge-gui/res/cardsfolder/s/smoldering_spires.txt
index c0cc4277d0e..d3a26e4d3d6 100644
--- a/forge-gui/res/cardsfolder/s/smoldering_spires.txt
+++ b/forge-gui/res/cardsfolder/s/smoldering_spires.txt
@@ -2,9 +2,9 @@ Name:Smoldering Spires
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature can't block this turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | IsCurse$ True | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/Smoldering_Spires.jpg
-Oracle:Smoldering Spires enters the battlefield tapped.\nWhen Smoldering Spires enters the battlefield, target creature can't block this turn.\n{T}: Add {R} to your mana pool.
+Oracle:Smoldering Spires enters the battlefield tapped.\nWhen Smoldering Spires enters the battlefield, target creature can't block this turn.\n{T}: Add {R}.
diff --git a/forge-gui/res/cardsfolder/s/snow_covered_forest.txt b/forge-gui/res/cardsfolder/s/snow_covered_forest.txt
index e0a976318c2..3dafb2c8c18 100644
--- a/forge-gui/res/cardsfolder/s/snow_covered_forest.txt
+++ b/forge-gui/res/cardsfolder/s/snow_covered_forest.txt
@@ -2,4 +2,4 @@ Name:Snow-Covered Forest
 ManaCost:no cost
 Types:Basic Snow Land Forest
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snow_covered_forest.jpg
-Oracle:({T}: Add {G} to your mana pool.)
+Oracle:({T}: Add {G}.)
diff --git a/forge-gui/res/cardsfolder/s/snow_covered_island.txt b/forge-gui/res/cardsfolder/s/snow_covered_island.txt
index ede4c7f968a..007fe9ec7e8 100644
--- a/forge-gui/res/cardsfolder/s/snow_covered_island.txt
+++ b/forge-gui/res/cardsfolder/s/snow_covered_island.txt
@@ -2,4 +2,4 @@ Name:Snow-Covered Island
 ManaCost:no cost
 Types:Basic Snow Land Island
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snow_covered_island.jpg
-Oracle:({T}: Add {U} to your mana pool.)
+Oracle:({T}: Add {U}.)
diff --git a/forge-gui/res/cardsfolder/s/snow_covered_mountain.txt b/forge-gui/res/cardsfolder/s/snow_covered_mountain.txt
index 08c2a2ba41a..434e0001bf7 100644
--- a/forge-gui/res/cardsfolder/s/snow_covered_mountain.txt
+++ b/forge-gui/res/cardsfolder/s/snow_covered_mountain.txt
@@ -2,4 +2,4 @@ Name:Snow-Covered Mountain
 ManaCost:no cost
 Types:Basic Snow Land Mountain
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg
-Oracle:({T}: Add {R} to your mana pool.)
+Oracle:({T}: Add {R}.)
diff --git a/forge-gui/res/cardsfolder/s/snow_covered_plains.txt b/forge-gui/res/cardsfolder/s/snow_covered_plains.txt
index 1989f0f1c6d..8705d37d953 100644
--- a/forge-gui/res/cardsfolder/s/snow_covered_plains.txt
+++ b/forge-gui/res/cardsfolder/s/snow_covered_plains.txt
@@ -2,4 +2,4 @@ Name:Snow-Covered Plains
 ManaCost:no cost
 Types:Basic Snow Land Plains
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snow_covered_plains.jpg
-Oracle:({T}: Add {W} to your mana pool.)
+Oracle:({T}: Add {W}.)
diff --git a/forge-gui/res/cardsfolder/s/snow_covered_swamp.txt b/forge-gui/res/cardsfolder/s/snow_covered_swamp.txt
index 62fb030c5a3..39efe8860c0 100644
--- a/forge-gui/res/cardsfolder/s/snow_covered_swamp.txt
+++ b/forge-gui/res/cardsfolder/s/snow_covered_swamp.txt
@@ -2,4 +2,4 @@ Name:Snow-Covered Swamp
 ManaCost:no cost
 Types:Basic Snow Land Swamp
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snow_covered_swamp.jpg
-Oracle:({T}: Add {B} to your mana pool.)
+Oracle:({T}: Add {B}.)
diff --git a/forge-gui/res/cardsfolder/s/snowfall.txt b/forge-gui/res/cardsfolder/s/snowfall.txt
index 4b0f954523d..1f09791fb78 100644
--- a/forge-gui/res/cardsfolder/s/snowfall.txt
+++ b/forge-gui/res/cardsfolder/s/snowfall.txt
@@ -2,10 +2,10 @@ Name:Snowfall
 ManaCost:2 U
 Types:Enchantment
 K:Cumulative upkeep:U
-T:Mode$ TapsForMana | ValidCard$ Island | Execute$ TrigMana | Static$ True | TriggerZones$ Battlefield | OptionalDecider$ TriggeredCardController | TriggerDescription$ Whenever an Island is tapped for mana, its controller may add {U} to his or her mana pool (in addition to the mana the land produces). If that Island is snow, its controller may add {U}{U} to his or her mana pool instead. Spend this mana only to pay cumulative upkeep costs.
+T:Mode$ TapsForMana | ValidCard$ Island | Execute$ TrigMana | Static$ True | TriggerZones$ Battlefield | OptionalDecider$ TriggeredCardController | TriggerDescription$ Whenever an Island is tapped for mana, its controller may add an additional {U}. If that Island is snow, its controller may add an additional {U}{U} instead. Spend this mana only to pay cumulative upkeep costs.
 SVar:TrigMana:DB$ Mana | Produced$ U | Amount$ 1 | Defined$ TriggeredCardController | RestrictValid$ CumulativeUpkeep | ConditionDefined$ TriggeredCard | ConditionPresent$ Land.Snow | ConditionCompare$ EQ0 | SubAbility$ DBMana
 SVar:DBMana:DB$ Mana | Produced$ U | Amount$ 2 | Defined$ TriggeredCardController | RestrictValid$ CumulativeUpkeep | ConditionDefined$ TriggeredCard | ConditionPresent$ Land.Snow | ConditionCompare$ GE1
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snowfall.jpg
-Oracle:Cumulative upkeep {U} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhenever an Island is tapped for mana, its controller may add {U} to his or her mana pool (in addition to the mana the land produces). If that Island is snow, its controller may add {U}{U} to his or her mana pool instead. Spend this mana only to pay cumulative upkeep costs.
+Oracle:Cumulative upkeep {U} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhenever an Island is tapped for mana, its controller may add an additional {U}. If that Island is snow, its controller may add an additional {U}{U} instead. Spend this mana only to pay cumulative upkeep costs.
diff --git a/forge-gui/res/cardsfolder/s/soaring_seacliff.txt b/forge-gui/res/cardsfolder/s/soaring_seacliff.txt
index 9cff2368a8b..a67498e4e73 100644
--- a/forge-gui/res/cardsfolder/s/soaring_seacliff.txt
+++ b/forge-gui/res/cardsfolder/s/soaring_seacliff.txt
@@ -2,8 +2,8 @@ Name:Soaring Seacliff
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gains flying until end of turn.
 SVar:TrigPump:DB$Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soaring_seacliff.jpg
-Oracle:Soaring Seacliff enters the battlefield tapped.\nWhen Soaring Seacliff enters the battlefield, target creature gains flying until end of turn.\n{T}: Add {U} to your mana pool.
+Oracle:Soaring Seacliff enters the battlefield tapped.\nWhen Soaring Seacliff enters the battlefield, target creature gains flying until end of turn.\n{T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/s/sol_grail.txt b/forge-gui/res/cardsfolder/s/sol_grail.txt
index de512f62f1a..34d2b3c761e 100644
--- a/forge-gui/res/cardsfolder/s/sol_grail.txt
+++ b/forge-gui/res/cardsfolder/s/sol_grail.txt
@@ -3,6 +3,6 @@ ManaCost:3
 Types:Artifact
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
-A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sol_grail.jpg
-Oracle:As Sol Grail enters the battlefield, choose a color.\n{T}: Add one mana of the chosen color to your mana pool.
+Oracle:As Sol Grail enters the battlefield, choose a color.\n{T}: Add one mana of the chosen color.
diff --git a/forge-gui/res/cardsfolder/s/sol_ring.txt b/forge-gui/res/cardsfolder/s/sol_ring.txt
index 0539e964906..25b825649e0 100644
--- a/forge-gui/res/cardsfolder/s/sol_ring.txt
+++ b/forge-gui/res/cardsfolder/s/sol_ring.txt
@@ -1,6 +1,6 @@
 Name:Sol Ring
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sol_ring.jpg
-Oracle:{T}: Add {C}{C} to your mana pool.
+Oracle:{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/s/soldevi_adnate.txt b/forge-gui/res/cardsfolder/s/soldevi_adnate.txt
index 841d73887e5..95982ac6516 100644
--- a/forge-gui/res/cardsfolder/s/soldevi_adnate.txt
+++ b/forge-gui/res/cardsfolder/s/soldevi_adnate.txt
@@ -2,8 +2,8 @@ Name:Soldevi Adnate
 ManaCost:1 B
 Types:Creature Human Cleric
 PT:1/2
-A:AB$ Mana | Cost$ T Sac<1/Creature.Black;Creature.Artifact/black or artifact creature> | Produced$ B | Amount$ X | SpellDescription$ Add to your mana pool an amount of black mana equal to the sacrificed creature's converted mana cost.
+A:AB$ Mana | Cost$ T Sac<1/Creature.Black;Creature.Artifact/black or artifact creature> | Produced$ B | Amount$ X | SpellDescription$ Add an amount of black mana equal to the sacrificed creature's converted mana cost.
 SVar:X:Sacrificed$CardManaCost
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soldevi_adnate.jpg
-Oracle:{T}, Sacrifice a black or artifact creature: Add to your mana pool an amount of {B} equal to the sacrificed creature's converted mana cost.
+Oracle:{T}, Sacrifice a black or artifact creature: Add an amount of {B} equal to the sacrificed creature's converted mana cost.
diff --git a/forge-gui/res/cardsfolder/s/soldevi_excavations.txt b/forge-gui/res/cardsfolder/s/soldevi_excavations.txt
index ef275f7b2aa..83776ea4229 100644
--- a/forge-gui/res/cardsfolder/s/soldevi_excavations.txt
+++ b/forge-gui/res/cardsfolder/s/soldevi_excavations.txt
@@ -1,7 +1,7 @@
 Name:Soldevi Excavations
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C U | SpellDescription$ Add {C}{U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C U | SpellDescription$ Add {C}{U}.
 A:AB$ Scry | Cost$ 1 T | ScryNum$ 1 | SpellDescription$ Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, sacrifice an untapped Island instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
 SVar:PayBeforeETB:DB$ Sacrifice | SacValid$ Island.untapped | Defined$ You | RememberSacrificed$ True | SubAbility$ MoveToGraveyard
@@ -11,4 +11,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soldevi_excavations.jpg
-Oracle:If Soldevi Excavations would enter the battlefield, sacrifice an untapped Island instead. If you do, put Soldevi Excavations onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {C}{U} to your mana pool.\n{1}, {T}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+Oracle:If Soldevi Excavations would enter the battlefield, sacrifice an untapped Island instead. If you do, put Soldevi Excavations onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {C}{U}.\n{1}, {T}: Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
diff --git a/forge-gui/res/cardsfolder/s/soldevi_machinist.txt b/forge-gui/res/cardsfolder/s/soldevi_machinist.txt
index a872880b817..4284be65958 100644
--- a/forge-gui/res/cardsfolder/s/soldevi_machinist.txt
+++ b/forge-gui/res/cardsfolder/s/soldevi_machinist.txt
@@ -2,7 +2,7 @@ Name:Soldevi Machinist
 ManaCost:1 U
 Types:Creature Human Wizard Artificer
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Activated.Artifact | SpellDescription$ Add {C}{C} to your mana pool. Spend this mana only to activate abilities of artifacts.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Activated.Artifact | SpellDescription$ Add {C}{C}. Spend this mana only to activate abilities of artifacts.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soldevi_machinist.jpg
-Oracle:{T}: Add {C}{C} to your mana pool. Spend this mana only to activate abilities of artifacts.
+Oracle:{T}: Add {C}{C}. Spend this mana only to activate abilities of artifacts.
diff --git a/forge-gui/res/cardsfolder/s/somberwald_sage.txt b/forge-gui/res/cardsfolder/s/somberwald_sage.txt
index a93ad47b954..a869b120e82 100644
--- a/forge-gui/res/cardsfolder/s/somberwald_sage.txt
+++ b/forge-gui/res/cardsfolder/s/somberwald_sage.txt
@@ -2,6 +2,6 @@ Name:Somberwald Sage
 ManaCost:2 G
 Types:Creature Human Druid
 PT:0/1
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 3 | RestrictValid$ Card.Creature | SpellDescription$ Add three mana of any one color to your mana pool. Spend this mana only to cast creature spells.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 3 | RestrictValid$ Card.Creature | SpellDescription$ Add three mana of any one color. Spend this mana only to cast creature spells.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/somberwald_sage.jpg
-Oracle:{T}: Add three mana of any one color to your mana pool. Spend this mana only to cast creature spells.
+Oracle:{T}: Add three mana of any one color. Spend this mana only to cast creature spells.
diff --git a/forge-gui/res/cardsfolder/s/song_of_freyalise.txt b/forge-gui/res/cardsfolder/s/song_of_freyalise.txt
index 0047fb621a7..f66051631a5 100644
--- a/forge-gui/res/cardsfolder/s/song_of_freyalise.txt
+++ b/forge-gui/res/cardsfolder/s/song_of_freyalise.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Enchantment Saga
 K:Saga:3:DBAnimateAll,DBAnimateAll,DBPutCounterAll
 SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Abilities$ AnyMana | UntilYourNextTurn$ True | SpellDescription$ Until your next turn, creatures you control gain "{T}: Add one mana of any color."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPumpAll | SpellDescription$ Put a +1/+1 counter on each creature you control. Those creatures gain vigilance, trample, and indestructible until end of turn.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Vigilance & Trample & Indestructible
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/s/songs_of_the_damned.txt b/forge-gui/res/cardsfolder/s/songs_of_the_damned.txt
index 035ce31decc..9e9337105f4 100644
--- a/forge-gui/res/cardsfolder/s/songs_of_the_damned.txt
+++ b/forge-gui/res/cardsfolder/s/songs_of_the_damned.txt
@@ -1,8 +1,8 @@
 Name:Songs of the Damned
 ManaCost:B
 Types:Instant
-A:SP$ Mana | Cost$ B | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} to your mana pool for each creature card in your graveyard.
+A:SP$ Mana | Cost$ B | Produced$ B | Amount$ X | References$ X | SpellDescription$ Add {B} for each creature card in your graveyard.
 SVar:X:Count$TypeInYourYard.Creature
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/songs_of_the_damned.jpg
-Oracle:Add {B} to your mana pool for each creature card in your graveyard.
+Oracle:Add {B} for each creature card in your graveyard.
diff --git a/forge-gui/res/cardsfolder/s/soulbright_flamekin.txt b/forge-gui/res/cardsfolder/s/soulbright_flamekin.txt
index 1d25ec660bd..96dfd36e626 100644
--- a/forge-gui/res/cardsfolder/s/soulbright_flamekin.txt
+++ b/forge-gui/res/cardsfolder/s/soulbright_flamekin.txt
@@ -2,7 +2,7 @@ Name:Soulbright Flamekin
 ManaCost:1 R
 Types:Creature Elemental Shaman
 PT:2/1
-A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Trample | SubAbility$ StoreNum | SpellDescription$ Target creature gains trample until end of turn. If this is the third time this ability has resolved this turn, you may add {R}{R}{R}{R}{R}{R}{R}{R} to your mana pool.
+A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Trample | SubAbility$ StoreNum | SpellDescription$ Target creature gains trample until end of turn. If this is the third time this ability has resolved this turn, you may add {R}{R}{R}{R}{R}{R}{R}{R}.
 SVar:StoreNum:DB$ StoreSVar | SVar$ SoulbrightNum | Type$ CountSVar | Expression$ SoulbrightNum/Plus.1 | SubAbility$ SoulbrightMana
 SVar:SoulbrightMana:DB$ Mana | Produced$ R R R R R R R R | ConditionCheckSVar$ SoulbrightNum | ConditionSVarCompare$ EQ3 | Optional$ True
 SVar:SoulbrightNum:Number$0
@@ -11,4 +11,4 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.S
 SVar:TrigReset:DB$ StoreSVar | SVar$ SoulbrightNum | Type$ Number | Expression$ 0
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soulbright_flamekin.jpg
-Oracle:{2}: Target creature gains trample until end of turn. If this is the third time this ability has resolved this turn, you may add {R}{R}{R}{R}{R}{R}{R}{R} to your mana pool.
+Oracle:{2}: Target creature gains trample until end of turn. If this is the third time this ability has resolved this turn, you may add {R}{R}{R}{R}{R}{R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/s/sovereigns_realm.txt b/forge-gui/res/cardsfolder/s/sovereigns_realm.txt
index fdd0912de73..ae09d15afae 100644
--- a/forge-gui/res/cardsfolder/s/sovereigns_realm.txt
+++ b/forge-gui/res/cardsfolder/s/sovereigns_realm.txt
@@ -4,6 +4,6 @@ Text:(Start the game with this conspiracy face up in the command zone.)
 K:Your deck can't have basic land cards.
 K:Your starting hand size is five.
 A:AB$ Effect | Cost$ ExileFromHand<1/Card> | SpellDescription$ Exile a card from your hand: This turn, you may play basic land cards from outside the game.
-S:Mode$ Continuous | Affected$ Land.Basic+YouCtrl | AddAbility$ AnyMana | Description$ Basic lands you control have "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
-Oracle:(Start the game with this conspiracy face up in the command zone.)\nYour deck can't have basic land cards and your starting hand size is five.\nExile a card from your hand: This turn, you may play basic land cards from outside the game.\nBasic lands you control have "{T}: Add one mana of any color to your mana pool."
+S:Mode$ Continuous | Affected$ Land.Basic+YouCtrl | AddAbility$ AnyMana | Description$ Basic lands you control have "{T}: Add one mana of any color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
+Oracle:(Start the game with this conspiracy face up in the command zone.)\nYour deck can't have basic land cards and your starting hand size is five.\nExile a card from your hand: This turn, you may play basic land cards from outside the game.\nBasic lands you control have "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/s/spawning_bed.txt b/forge-gui/res/cardsfolder/s/spawning_bed.txt
index 726347689f3..ffd1f9841ee 100644
--- a/forge-gui/res/cardsfolder/s/spawning_bed.txt
+++ b/forge-gui/res/cardsfolder/s/spawning_bed.txt
@@ -1,10 +1,10 @@
 Name:Spawning Bed
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Token | Cost$ 6 T Sac<1/CARDNAME> | TokenOwner$ You | TokenAmount$ 3 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABEldraziMana | SpellDescription$ Create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABEldraziMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Token | Cost$ 6 T Sac<1/CARDNAME> | TokenOwner$ You | TokenAmount$ 3 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABEldraziMana | SpellDescription$ Create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
+SVar:ABEldraziMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spawning_bed.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{6}, {T}, Sacrifice Spawning Bed: Create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:{T}: Add {C}.\n{6}, {T}, Sacrifice Spawning Bed: Create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/s/spawning_breath.txt b/forge-gui/res/cardsfolder/s/spawning_breath.txt
index cf12002c224..73c3fa0be3c 100644
--- a/forge-gui/res/cardsfolder/s/spawning_breath.txt
+++ b/forge-gui/res/cardsfolder/s/spawning_breath.txt
@@ -2,9 +2,9 @@ Name:Spawning Breath
 ManaCost:1 R
 Types:Instant
 A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SubAbility$ DBToken | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn3 | SpellDescription$ Create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenImage$ c_0_1_eldrazi_spawn3 | SpellDescription$ Create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spawning_breath.jpg
-Oracle:Spawning Breath deals 1 damage to target creature or player. Create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Spawning Breath deals 1 damage to target creature or player. Create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/s/spawning_pool.txt b/forge-gui/res/cardsfolder/s/spawning_pool.txt
index 63f7893bc0f..45cae3b38ca 100644
--- a/forge-gui/res/cardsfolder/s/spawning_pool.txt
+++ b/forge-gui/res/cardsfolder/s/spawning_pool.txt
@@ -2,8 +2,8 @@ Name:Spawning Pool
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Animate | Cost$ 1 B | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Skeleton | Colors$ Black | Abilities$ ABRegen | SpellDescription$ CARDNAME becomes a 1/1 black Skeleton creature with "{B}: Regenerate this creature" until end of turn. It's still a land. (If it regenerates, the next time it would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
 SVar:ABRegen:AB$Regenerate | Cost$ B | SpellDescription$ Regenerate CARDNAME.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spawning_pool.jpg
-Oracle:Spawning Pool enters the battlefield tapped.\n{T}: Add {B} to your mana pool.\n{1}{B}: Spawning Pool becomes a 1/1 black Skeleton creature with "{B}: Regenerate this creature" until end of turn. It's still a land. (If it regenerates, the next time it would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
+Oracle:Spawning Pool enters the battlefield tapped.\n{T}: Add {B}.\n{1}{B}: Spawning Pool becomes a 1/1 black Skeleton creature with "{B}: Regenerate this creature" until end of turn. It's still a land. (If it regenerates, the next time it would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
diff --git a/forge-gui/res/cardsfolder/s/spawnsire_of_ulamog.txt b/forge-gui/res/cardsfolder/s/spawnsire_of_ulamog.txt
index 99905652ea7..2c9162bcaa9 100644
--- a/forge-gui/res/cardsfolder/s/spawnsire_of_ulamog.txt
+++ b/forge-gui/res/cardsfolder/s/spawnsire_of_ulamog.txt
@@ -3,11 +3,11 @@ ManaCost:10
 Types:Creature Eldrazi
 PT:7/11
 K:Annihilator:1
-A:AB$ Token | Cost$ 4 | TokenAmount$ 2 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAltImages$ c_0_1_eldrazi_spawn2,c_0_1_eldrazi_spawn3 | TokenAbilities$ ABEldraziMana | SpellDescription$ Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABEldraziMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Token | Cost$ 4 | TokenAmount$ 2 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAltImages$ c_0_1_eldrazi_spawn2,c_0_1_eldrazi_spawn3 | TokenAbilities$ ABEldraziMana | SpellDescription$ Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
+SVar:ABEldraziMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 A:AB$ Play | Cost$ 20 | Valid$ Card.Eldrazi+YouOwn | ValidZone$ Sideboard | WithoutManaCost$ True | Amount$ SpawnsireX | Controller$ You | Optional$ True | References$ SpawnsireX | SpellDescription$ Cast any number of Eldrazi cards you own from outside the game without paying their mana costs.
 SVar:SpawnsireX:Count$TypeInYourSideboard.Eldrazi
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spawnsire_of_ulamog.jpg
-Oracle:Annihilator 1 (Whenever this creature attacks, defending player sacrifices a permanent.)\n{4}: Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool."\n{20}: Cast any number of Eldrazi cards you own from outside the game without paying their mana costs.
+Oracle:Annihilator 1 (Whenever this creature attacks, defending player sacrifices a permanent.)\n{4}: Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."\n{20}: Cast any number of Eldrazi cards you own from outside the game without paying their mana costs.
diff --git a/forge-gui/res/cardsfolder/s/spectral_searchlight.txt b/forge-gui/res/cardsfolder/s/spectral_searchlight.txt
index 98dd8ad257f..adf8cd818d4 100644
--- a/forge-gui/res/cardsfolder/s/spectral_searchlight.txt
+++ b/forge-gui/res/cardsfolder/s/spectral_searchlight.txt
@@ -1,8 +1,8 @@
 Name:Spectral Searchlight
 ManaCost:3
 Types:Artifact
-A:AB$ ChoosePlayer | Cost$ T | Defined$ You | Choices$ Player | ChoiceTitle$ Choose an player | SubAbility$ DBMana | SpellDescription$ Choose a player. That player adds one mana of any color he or she chooses to his or her mana pool.
+A:AB$ ChoosePlayer | Cost$ T | Defined$ You | Choices$ Player | ChoiceTitle$ Choose an player | SubAbility$ DBMana | SpellDescription$ Choose a player. That player adds one mana of any color he or she chooses.
 SVar:DBMana:DB$ Mana | Produced$ Any | Defined$ ChosenPlayer
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spectral_searchlight.jpg
-Oracle:{T}: Choose a player. That player adds one mana of any color he or she chooses to his or her mana pool.
+Oracle:{T}: Choose a player. That player adds one mana of any color he or she chooses.
diff --git a/forge-gui/res/cardsfolder/s/spell_swindle.txt b/forge-gui/res/cardsfolder/s/spell_swindle.txt
index d34a080a3a1..d113d0cf9d1 100644
--- a/forge-gui/res/cardsfolder/s/spell_swindle.txt
+++ b/forge-gui/res/cardsfolder/s/spell_swindle.txt
@@ -1,11 +1,11 @@
 Name:Spell Swindle
 ManaCost:3 U U
 Types:Instant
-A:SP$ Counter | Cost$ 3 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | RememberCounteredCMC$ True | SubAbility$ DBTreasureTokens | SpellDescription$ Counter target spell. Create X colorless Treasure artifact tokens, where X is that spell's converted mana cost. They have "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+A:SP$ Counter | Cost$ 3 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | RememberCounteredCMC$ True | SubAbility$ DBTreasureTokens | SpellDescription$ Counter target spell. Create X colorless Treasure artifact tokens, where X is that spell's converted mana cost. They have "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:DBTreasureTokens:DB$ Token | TokenAmount$ X | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | References$ X | SubAbility$ DBCleanup
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedNumber
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_swindle.jpg
-Oracle:Counter target spell. Create X colorless Treasure artifact tokens, where X is that spell's converted mana cost. They have "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:Counter target spell. Create X colorless Treasure artifact tokens, where X is that spell's converted mana cost. They have "{T}, Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/s/sphere_of_the_suns.txt b/forge-gui/res/cardsfolder/s/sphere_of_the_suns.txt
index 5ba1c787cec..4697105ff77 100644
--- a/forge-gui/res/cardsfolder/s/sphere_of_the_suns.txt
+++ b/forge-gui/res/cardsfolder/s/sphere_of_the_suns.txt
@@ -4,7 +4,7 @@ Types:Artifact
 K:ETBReplacement:Other:SphereTapped
 SVar:SphereTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped and with three charge counters on it.
 SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 3
-A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sphere_of_the_suns.jpg
-Oracle:Sphere of the Suns enters the battlefield tapped and with three charge counters on it.\n{T}, Remove a charge counter from Sphere of the Suns: Add one mana of any color to your mana pool.
+Oracle:Sphere of the Suns enters the battlefield tapped and with three charge counters on it.\n{T}, Remove a charge counter from Sphere of the Suns: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/s/spinerock_knoll.txt b/forge-gui/res/cardsfolder/s/spinerock_knoll.txt
index c2cad5709cb..efa96b8f864 100644
--- a/forge-gui/res/cardsfolder/s/spinerock_knoll.txt
+++ b/forge-gui/res/cardsfolder/s/spinerock_knoll.txt
@@ -2,8 +2,8 @@ Name:Spinerock Knoll
 ManaCost:no cost
 Types:Land
 K:Hideaway
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Play | Cost$ R T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7 | References$ X | ForgetRemembered$ True | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if an opponent was dealt 7 or more damage this turn.
 SVar:X:Count$MaxOppDamageThisTurn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spinerock_knoll.jpg
-Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {R} to your mana pool.\n{R}, {T}: You may play the exiled card without paying its mana cost if an opponent was dealt 7 or more damage this turn.
+Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {R}.\n{R}, {T}: You may play the exiled card without paying its mana cost if an opponent was dealt 7 or more damage this turn.
diff --git a/forge-gui/res/cardsfolder/s/spire_of_industry.txt b/forge-gui/res/cardsfolder/s/spire_of_industry.txt
index b8bf617b91f..0055119f188 100644
--- a/forge-gui/res/cardsfolder/s/spire_of_industry.txt
+++ b/forge-gui/res/cardsfolder/s/spire_of_industry.txt
@@ -1,8 +1,8 @@
 Name:Spire of Industry
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | Amount$ 1 | CheckSVar$ X | References$ X | SpellDescription$ Add one mana of any color to your mana pool. Activate this ability only if you control an artifact.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | Amount$ 1 | CheckSVar$ X | References$ X | SpellDescription$ Add one mana of any color. Activate this ability only if you control an artifact.
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spire_of_industry.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Pay 1 life: Add one mana of any color to your mana pool. Activate this ability only if you control an artifact.
+Oracle:{T}: Add {C}.\n{T}, Pay 1 life: Add one mana of any color. Activate this ability only if you control an artifact.
diff --git a/forge-gui/res/cardsfolder/s/spirebluff_canal.txt b/forge-gui/res/cardsfolder/s/spirebluff_canal.txt
index a7b22a4cec0..0f09179b595 100644
--- a/forge-gui/res/cardsfolder/s/spirebluff_canal.txt
+++ b/forge-gui/res/cardsfolder/s/spirebluff_canal.txt
@@ -5,7 +5,7 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ GT2 | References$ ETBCheckSVar2 | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar2:Count$LastStateBattlefield Land.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spirebluff_canal.jpg
-Oracle:Spirebluff Canal enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {U} or {R} to your mana pool.
+Oracle:Spirebluff Canal enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {U} or {R}.
diff --git a/forge-gui/res/cardsfolder/s/spoils_of_evil.txt b/forge-gui/res/cardsfolder/s/spoils_of_evil.txt
index c9172ace4a7..78baa6eec8d 100644
--- a/forge-gui/res/cardsfolder/s/spoils_of_evil.txt
+++ b/forge-gui/res/cardsfolder/s/spoils_of_evil.txt
@@ -1,9 +1,9 @@
 Name:Spoils of Evil
 ManaCost:2 B
 Types:Instant
-A:SP$ GainLife | Cost$ 2 B | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Defined$ You | LifeAmount$ X | References$ X | SubAbility$ DBMana | SpellDescription$ For each artifact or creature card in target opponent's graveyard, add {1} to your mana pool and you gain 1 life.
+A:SP$ GainLife | Cost$ 2 B | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Defined$ You | LifeAmount$ X | References$ X | SubAbility$ DBMana | SpellDescription$ For each artifact or creature card in target opponent's graveyard, add {1} and you gain 1 life.
 SVar:DBMana:DB$ Mana | Produced$ C | Amount$ X | References$ X
 SVar:X:Count$ValidGraveyard Creature.OppOwn,Artifact.OppOwn
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spoils_of_evil.jpg
-Oracle:For each artifact or creature card in target opponent's graveyard, add {C} to your mana pool and you gain 1 life.
+Oracle:For each artifact or creature card in target opponent's graveyard, add {C} and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/s/springjack_pasture.txt b/forge-gui/res/cardsfolder/s/springjack_pasture.txt
index 81e8f290f77..fc35ebeafb9 100644
--- a/forge-gui/res/cardsfolder/s/springjack_pasture.txt
+++ b/forge-gui/res/cardsfolder/s/springjack_pasture.txt
@@ -1,11 +1,11 @@
 Name:Springjack Pasture
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Token | Cost$ 4 T | TokenAmount$ 1 | TokenName$ Goat | TokenTypes$ Creature,Goat | TokenOwner$ You | TokenColors$ White | TokenPower$ 0 | TokenToughness$ 1 | SpellDescription$ Create a 0/1 white Goat creature token.
-A:AB$Mana | Cost$ T Sac<X/Goat> | CostDesc$ {T}, Sacrifice X Goats: | Produced$ Any | Amount$ ChosenX | References$ X | Defined$ You | SubAbility$ DBGainLife | SpellDescription$ Add X mana of any one color to your mana pool. You gain X life.
+A:AB$Mana | Cost$ T Sac<X/Goat> | CostDesc$ {T}, Sacrifice X Goats: | Produced$ Any | Amount$ ChosenX | References$ X | Defined$ You | SubAbility$ DBGainLife | SpellDescription$ Add X mana of any one color. You gain X life.
 SVar:X:XChoice
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ ChosenX
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/springjack_pasture.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}, {T}: Create a 0/1 white Goat creature token.\n{T}, Sacrifice X Goats: Add X mana of any one color to your mana pool. You gain X life.
+Oracle:{T}: Add {C}.\n{4}, {T}: Create a 0/1 white Goat creature token.\n{T}, Sacrifice X Goats: Add X mana of any one color. You gain X life.
diff --git a/forge-gui/res/cardsfolder/s/springleaf_drum.txt b/forge-gui/res/cardsfolder/s/springleaf_drum.txt
index 80cea2c2bf2..bdee966da52 100644
--- a/forge-gui/res/cardsfolder/s/springleaf_drum.txt
+++ b/forge-gui/res/cardsfolder/s/springleaf_drum.txt
@@ -1,7 +1,7 @@
 Name:Springleaf Drum
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ T tapXType<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T tapXType<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/springleaf_drum.jpg
-Oracle:{T}, Tap an untapped creature you control: Add one mana of any color to your mana pool.
+Oracle:{T}, Tap an untapped creature you control: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/s/squandered_resources.txt b/forge-gui/res/cardsfolder/s/squandered_resources.txt
index aff7bb82dd7..6d1b2470975 100644
--- a/forge-gui/res/cardsfolder/s/squandered_resources.txt
+++ b/forge-gui/res/cardsfolder/s/squandered_resources.txt
@@ -1,8 +1,8 @@
 Name:Squandered Resources
 ManaCost:B G
 Types:Enchantment
-A:AB$ ManaReflected | Cost$ Sac<1/Land> | ColorOrType$ Type | Valid$ Defined.Sacrificed | ReflectProperty$ Produce | SpellDescription$ Add to your mana pool one mana of any type the sacrificed land could produce.
+A:AB$ ManaReflected | Cost$ Sac<1/Land> | ColorOrType$ Type | Valid$ Defined.Sacrificed | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type the sacrificed land could produce.
 SVar:RemAIDeck:True
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/squandered_resources.jpg
-Oracle:Sacrifice a land: Add to your mana pool one mana of any type the sacrificed land could produce.
+Oracle:Sacrifice a land: Add one mana of any type the sacrificed land could produce.
diff --git a/forge-gui/res/cardsfolder/s/stalking_stones.txt b/forge-gui/res/cardsfolder/s/stalking_stones.txt
index 8ef78e51635..f0f2ac049ad 100644
--- a/forge-gui/res/cardsfolder/s/stalking_stones.txt
+++ b/forge-gui/res/cardsfolder/s/stalking_stones.txt
@@ -1,7 +1,7 @@
 Name:Stalking Stones
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ 6 | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Artifact,Elemental | Permanent$ True | SpellDescription$ CARDNAME becomes a 3/3 Elemental artifact creature that's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stalking_stones.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{6}: Stalking Stones becomes a 3/3 Elemental artifact creature that's still a land.
+Oracle:{T}: Add {C}.\n{6}: Stalking Stones becomes a 3/3 Elemental artifact creature that's still a land.
diff --git a/forge-gui/res/cardsfolder/s/standing_stones.txt b/forge-gui/res/cardsfolder/s/standing_stones.txt
index 8aff8001e75..3254a93481e 100644
--- a/forge-gui/res/cardsfolder/s/standing_stones.txt
+++ b/forge-gui/res/cardsfolder/s/standing_stones.txt
@@ -1,7 +1,7 @@
 Name:Standing Stones
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ 1 T PayLife<1> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ 1 T PayLife<1> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/standing_stones.jpg
-Oracle:{1}, {T}, Pay 1 life: Add one mana of any color to your mana pool.
+Oracle:{1}, {T}, Pay 1 life: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/s/star_compass.txt b/forge-gui/res/cardsfolder/s/star_compass.txt
index f2abc43339f..a0790a5cbbf 100644
--- a/forge-gui/res/cardsfolder/s/star_compass.txt
+++ b/forge-gui/res/cardsfolder/s/star_compass.txt
@@ -2,6 +2,6 @@ Name:Star Compass
 ManaCost:2
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Basic.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add to your mana pool one mana of any color a basic land you control could produce.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Basic.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any color a basic land you control could produce.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/star_compass.jpg
-Oracle:Star Compass enters the battlefield tapped.\n{T}: Add to your mana pool one mana of any color that a basic land you control could produce.
+Oracle:Star Compass enters the battlefield tapped.\n{T}: Add one mana of any color that a basic land you control could produce.
diff --git a/forge-gui/res/cardsfolder/s/starlit_sanctum.txt b/forge-gui/res/cardsfolder/s/starlit_sanctum.txt
index 112f3dbf5b4..d5a77bae7e9 100644
--- a/forge-gui/res/cardsfolder/s/starlit_sanctum.txt
+++ b/forge-gui/res/cardsfolder/s/starlit_sanctum.txt
@@ -1,11 +1,11 @@
 Name:Starlit Sanctum
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ GainLife | Cost$ W T Sac<1/Creature.Cleric/Cleric creature> | LifeAmount$ X | References$ X | SpellDescription$ You gain life equal to the sacrificed creature's toughness.
 SVar:X:Sacrificed$CardToughness
 A:AB$ LoseLife | Cost$ B T Sac<1/Creature.Cleric/Cleric creature> | ValidTgts$ Player | LifeAmount$ Y | References$ Y | TgtPrompt$ Select a player | SpellDescription$ Target player loses life equal to the sacrificed creature's power.
 SVar:Y:Sacrificed$CardPower
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/starlit_sanctum.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{W}, {T}, Sacrifice a Cleric creature: You gain life equal to the sacrificed creature's toughness.\n{B}, {T}, Sacrifice a Cleric creature: Target player loses life equal to the sacrificed creature's power.
+Oracle:{T}: Add {C}.\n{W}, {T}, Sacrifice a Cleric creature: You gain life equal to the sacrificed creature's toughness.\n{B}, {T}, Sacrifice a Cleric creature: Target player loses life equal to the sacrificed creature's power.
diff --git a/forge-gui/res/cardsfolder/s/steam_vents.txt b/forge-gui/res/cardsfolder/s/steam_vents.txt
index 32586658ed4..05b21cb7e9f 100644
--- a/forge-gui/res/cardsfolder/s/steam_vents.txt
+++ b/forge-gui/res/cardsfolder/s/steam_vents.txt
@@ -4,4 +4,4 @@ Types:Land Island Mountain
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | UnlessAI$ Shockland | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://resources.wizards.com/magic/cards/gpt/en-us/card96923.jpg
-Oracle:({T}: Add {U} or {R} to your mana pool.)\nAs Steam Vents enters the battlefield, you may pay 2 life. If you don't, Steam Vents enters the battlefield tapped.
+Oracle:({T}: Add {U} or {R}.)\nAs Steam Vents enters the battlefield, you may pay 2 life. If you don't, Steam Vents enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/s/stensia_bloodhall.txt b/forge-gui/res/cardsfolder/s/stensia_bloodhall.txt
index 6b15b81734a..9fa2d177b68 100644
--- a/forge-gui/res/cardsfolder/s/stensia_bloodhall.txt
+++ b/forge-gui/res/cardsfolder/s/stensia_bloodhall.txt
@@ -1,7 +1,7 @@
 Name:Stensia Bloodhall
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ DealDamage | Cost$ 3 B R T | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target player.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stensia_bloodhall.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{3}{B}{R}, {T}: Stensia Bloodhall deals 2 damage to target player.
+Oracle:{T}: Add {C}.\n{3}{B}{R}, {T}: Stensia Bloodhall deals 2 damage to target player.
diff --git a/forge-gui/res/cardsfolder/s/steward_of_valeron.txt b/forge-gui/res/cardsfolder/s/steward_of_valeron.txt
index 05431411935..85e8acec871 100644
--- a/forge-gui/res/cardsfolder/s/steward_of_valeron.txt
+++ b/forge-gui/res/cardsfolder/s/steward_of_valeron.txt
@@ -2,7 +2,7 @@ Name:Steward of Valeron
 ManaCost:G W
 Types:Creature Human Druid Knight
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 K:Vigilance
 SVar:Picture:http://www.wizards.com/global/images/magic/general/steward_of_valeron.jpg
-Oracle:Vigilance\n{T}: Add {G} to your mana pool.
+Oracle:Vigilance\n{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/s/stirring_wildwood.txt b/forge-gui/res/cardsfolder/s/stirring_wildwood.txt
index f4ede9a468e..a9c3d86f517 100644
--- a/forge-gui/res/cardsfolder/s/stirring_wildwood.txt
+++ b/forge-gui/res/cardsfolder/s/stirring_wildwood.txt
@@ -2,8 +2,8 @@ Name:Stirring Wildwood
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Animate | Cost$ 1 G W | Defined$ Self | Power$ 3 | Toughness$ 4 | Types$ Creature,Elemental | Keywords$ Reach | Colors$ Green,White | SpellDescription$ Until end of turn, CARDNAME becomes a 3/4 green and white Elemental creature with reach. It's still a land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stirring_wildwood.jpg
-Oracle:Stirring Wildwood enters the battlefield tapped.\n{T}: Add {G} or {W} to your mana pool.\n{1}{G}{W}: Until end of turn, Stirring Wildwood becomes a 3/4 green and white Elemental creature with reach. It's still a land.
+Oracle:Stirring Wildwood enters the battlefield tapped.\n{T}: Add {G} or {W}.\n{1}{G}{W}: Until end of turn, Stirring Wildwood becomes a 3/4 green and white Elemental creature with reach. It's still a land.
diff --git a/forge-gui/res/cardsfolder/s/stomping_ground.txt b/forge-gui/res/cardsfolder/s/stomping_ground.txt
index a63ff3c2079..02d85092065 100644
--- a/forge-gui/res/cardsfolder/s/stomping_ground.txt
+++ b/forge-gui/res/cardsfolder/s/stomping_ground.txt
@@ -4,4 +4,4 @@ Types:Land Mountain Forest
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | UnlessAI$ Shockland | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://resources.wizards.com/magic/cards/gpt/en-us/card96896.jpg
-Oracle:({T}: Add {R} or {G} to your mana pool.)\nAs Stomping Ground enters the battlefield, you may pay 2 life. If you don't, Stomping Ground enters the battlefield tapped.
+Oracle:({T}: Add {R} or {G}.)\nAs Stomping Ground enters the battlefield, you may pay 2 life. If you don't, Stomping Ground enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/s/stone_quarry.txt b/forge-gui/res/cardsfolder/s/stone_quarry.txt
index 6045fa63781..adcae8be7e7 100644
--- a/forge-gui/res/cardsfolder/s/stone_quarry.txt
+++ b/forge-gui/res/cardsfolder/s/stone_quarry.txt
@@ -2,7 +2,7 @@ Name:Stone Quarry
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stone_quarry.jpg
-Oracle:Stone Quarry enters the battlefield tapped.\n{T}: Add {R} or {W} to your mana pool. 
\ No newline at end of file
+Oracle:Stone Quarry enters the battlefield tapped.\n{T}: Add {R} or {W}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/storm_the_vault_vault_of_catlacan.txt b/forge-gui/res/cardsfolder/s/storm_the_vault_vault_of_catlacan.txt
index 142e347a538..0a67c9223f5 100644
--- a/forge-gui/res/cardsfolder/s/storm_the_vault_vault_of_catlacan.txt
+++ b/forge-gui/res/cardsfolder/s/storm_the_vault_vault_of_catlacan.txt
@@ -1,21 +1,21 @@
 Name:Storm the Vault
 ManaCost:2 U R
 Types:Legendary Enchantment
-T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ DBToken | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player this turn, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool.
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ DBToken | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player this turn, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool. 
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Artifact.YouCtrl | PresentCompare$ GE5 | Execute$ TrigTransform | TriggerDescription$ At the beginning of your end step, if you control five or more artifacts, transform CARDNAME.
 SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform
 AlternateMode:DoubleFaced
 SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_the_vault.jpg
-Oracle:Whenever one or more creatures you control deal combat damage to a player, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."\nAt the beginning of your end step, if you control five or more artifacts, transform Storm the Vault.
+Oracle:Whenever one or more creatures you control deal combat damage to a player, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."\nAt the beginning of your end step, if you control five or more artifacts, transform Storm the Vault.
 
 ALTERNATE
 
 Name:Vault of Catlacan
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool. 
-A:AB$ Mana | Cost$ T | Produced$ U | Amount$ X | References$ X | SpellDescription$ Add {U} to your mana pool for each artifact you control.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
+A:AB$ Mana | Cost$ T | Produced$ U | Amount$ X | References$ X | SpellDescription$ Add {U} for each artifact you control.
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vault_of_catlacan.jpg
-Oracle:(Transforms from Storm the Vault.)\n{T}: Add one mana of any color to your mana pool.\n{T}: Add {U} to your mana pool for each artifact you control.
+Oracle:(Transforms from Storm the Vault.)\n{T}: Add one mana of any color.\n{T}: Add {U} for each artifact you control.
diff --git a/forge-gui/res/cardsfolder/s/strip_mine.txt b/forge-gui/res/cardsfolder/s/strip_mine.txt
index a1bb3767916..8e60c27e8db 100644
--- a/forge-gui/res/cardsfolder/s/strip_mine.txt
+++ b/forge-gui/res/cardsfolder/s/strip_mine.txt
@@ -1,7 +1,7 @@
 Name:Strip Mine
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land. | Cost$ T Sac<1/CARDNAME> | AILogic$ LandForLand | SpellDescription$ Destroy target land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/strip_mine.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Sacrifice Strip Mine: Destroy target land.
+Oracle:{T}: Add {C}.\n{T}, Sacrifice Strip Mine: Destroy target land.
diff --git a/forge-gui/res/cardsfolder/s/su_chi.txt b/forge-gui/res/cardsfolder/s/su_chi.txt
index 894ade113a3..654472a87b0 100644
--- a/forge-gui/res/cardsfolder/s/su_chi.txt
+++ b/forge-gui/res/cardsfolder/s/su_chi.txt
@@ -2,7 +2,7 @@ Name:Su-Chi
 ManaCost:4
 Types:Artifact Creature Construct
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigAddMana | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, add {C}{C}{C}{C} to your mana pool.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigAddMana | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, add {C}{C}{C}{C}.
 SVar:TrigAddMana:DB$Mana | Produced$1 | Amount$ 4
 SVar:Picture:http://www.wizards.com/global/images/magic/general/su_chi.jpg
-Oracle:When Su-Chi dies, add {C}{C}{C}{C} to your mana pool.
+Oracle:When Su-Chi dies, add {C}{C}{C}{C}.
diff --git a/forge-gui/res/cardsfolder/s/submerged_boneyard.txt b/forge-gui/res/cardsfolder/s/submerged_boneyard.txt
index 871f1f377d0..446f95a5de1 100644
--- a/forge-gui/res/cardsfolder/s/submerged_boneyard.txt
+++ b/forge-gui/res/cardsfolder/s/submerged_boneyard.txt
@@ -2,7 +2,7 @@ Name:Submerged Boneyard
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/submerged_boneyard.jpg
-Oracle:Submerged Boneyard enters the battlefield tapped.\n{T}: Add {U} or {B} to your mana pool.
+Oracle:Submerged Boneyard enters the battlefield tapped.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/s/subterranean_hangar.txt b/forge-gui/res/cardsfolder/s/subterranean_hangar.txt
index 59c33a89b22..feed67cdc02 100644
--- a/forge-gui/res/cardsfolder/s/subterranean_hangar.txt
+++ b/forge-gui/res/cardsfolder/s/subterranean_hangar.txt
@@ -3,9 +3,9 @@ ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
 A:AB$ PutCounter | Cost$ T | Defined$ Self | CounterType$ STORAGE | CounterNum$ 1 | SpellDescription$ Put a storage counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ B | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {B} to your mana pool for each storage counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/STORAGE> | Produced$ B | Amount$ ChosenX | CostDesc$ {T}, Remove any number of storage counters from CARDNAME: | References$ X | SpellDescription$ Add {B} for each storage counter removed this way.
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/subterranean_hangar.jpg
-Oracle:Subterranean Hangar enters the battlefield tapped.\n{T}: Put a storage counter on Subterranean Hangar.\n{T}, Remove any number of storage counters from Subterranean Hangar: Add {B} to your mana pool for each storage counter removed this way.
+Oracle:Subterranean Hangar enters the battlefield tapped.\n{T}: Put a storage counter on Subterranean Hangar.\n{T}, Remove any number of storage counters from Subterranean Hangar: Add {B} for each storage counter removed this way.
diff --git a/forge-gui/res/cardsfolder/s/sulfur_vent.txt b/forge-gui/res/cardsfolder/s/sulfur_vent.txt
index 4a0729853f2..0f1b2caae39 100644
--- a/forge-gui/res/cardsfolder/s/sulfur_vent.txt
+++ b/forge-gui/res/cardsfolder/s/sulfur_vent.txt
@@ -2,8 +2,8 @@ Name:Sulfur Vent
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ U R | SpellDescription$ Add {U}{R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ U R | SpellDescription$ Add {U}{R}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sulfur_vent.jpg
-Oracle:Sulfur Vent enters the battlefield tapped.\n{T}: Add {B} to your mana pool.\n{T}, Sacrifice Sulfur Vent: Add {U}{R} to your mana pool.
+Oracle:Sulfur Vent enters the battlefield tapped.\n{T}: Add {B}.\n{T}, Sacrifice Sulfur Vent: Add {U}{R}.
diff --git a/forge-gui/res/cardsfolder/s/sulfurous_springs.txt b/forge-gui/res/cardsfolder/s/sulfurous_springs.txt
index 83a9c263434..9a94851f29d 100644
--- a/forge-gui/res/cardsfolder/s/sulfurous_springs.txt
+++ b/forge-gui/res/cardsfolder/s/sulfurous_springs.txt
@@ -1,9 +1,9 @@
 Name:Sulfurous Springs
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B} to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sulfurous_springs.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {B} or {R} to your mana pool. Sulfurous Springs deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {B} or {R}. Sulfurous Springs deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/s/sultai_banner.txt b/forge-gui/res/cardsfolder/s/sultai_banner.txt
index 7f3c8abb66c..03e60f6872c 100644
--- a/forge-gui/res/cardsfolder/s/sultai_banner.txt
+++ b/forge-gui/res/cardsfolder/s/sultai_banner.txt
@@ -1,11 +1,11 @@
 Name:Sultai Banner
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Draw | Cost$ B G U T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Black|Green|Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sultai_banner.jpg
-Oracle:{T}: Add {B}, {G}, or {U} to your mana pool.\n{B}{G}{U}, {T}, Sacrifice Sultai Banner: Draw a card.
+Oracle:{T}: Add {B}, {G}, or {U}.\n{B}{G}{U}, {T}, Sacrifice Sultai Banner: Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/sunastian_falconer.txt b/forge-gui/res/cardsfolder/s/sunastian_falconer.txt
index e8f87a67540..085a2e82bb0 100644
--- a/forge-gui/res/cardsfolder/s/sunastian_falconer.txt
+++ b/forge-gui/res/cardsfolder/s/sunastian_falconer.txt
@@ -2,6 +2,6 @@ Name:Sunastian Falconer
 ManaCost:3 R G
 Types:Legendary Creature Human Shaman
 PT:4/4
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:Picture:http://resources.wizards.com/magic/cards/le/en-us/card1687.jpg
-Oracle:{T}: Add {C}{C} to your mana pool.
+Oracle:{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/s/sungrass_egg.txt b/forge-gui/res/cardsfolder/s/sungrass_egg.txt
index cd3754ed447..924c24cee3a 100644
--- a/forge-gui/res/cardsfolder/s/sungrass_egg.txt
+++ b/forge-gui/res/cardsfolder/s/sungrass_egg.txt
@@ -1,9 +1,9 @@
 Name:Sungrass Egg
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ G W | SubAbility$ DBDraw | SpellDescription$ Add {G}{W} to your mana pool. Draw a card.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ G W | SubAbility$ DBDraw | SpellDescription$ Add {G}{W}. Draw a card.
 SVar:DBDraw:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sungrass_egg.jpg
-Oracle:{2}, {T}, Sacrifice Sungrass Egg: Add {G}{W} to your mana pool. Draw a card.
+Oracle:{2}, {T}, Sacrifice Sungrass Egg: Add {G}{W}. Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/sungrass_prairie.txt b/forge-gui/res/cardsfolder/s/sungrass_prairie.txt
index 320c45de547..61f56856f2a 100644
--- a/forge-gui/res/cardsfolder/s/sungrass_prairie.txt
+++ b/forge-gui/res/cardsfolder/s/sungrass_prairie.txt
@@ -1,7 +1,7 @@
 Name:Sungrass Prairie
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ 1 T | Produced$ G W | SpellDescription$ Add {G}{W} to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ G W | SpellDescription$ Add {G}{W}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sungrass_prairie.jpg
-Oracle:{1}, {T}: Add {G}{W} to your mana pool.
+Oracle:{1}, {T}: Add {G}{W}.
diff --git a/forge-gui/res/cardsfolder/s/sunhome_fortress_of_the_legion.txt b/forge-gui/res/cardsfolder/s/sunhome_fortress_of_the_legion.txt
index ab1872f04c6..f2b1c40a7e9 100644
--- a/forge-gui/res/cardsfolder/s/sunhome_fortress_of_the_legion.txt
+++ b/forge-gui/res/cardsfolder/s/sunhome_fortress_of_the_legion.txt
@@ -1,7 +1,7 @@
 Name:Sunhome, Fortress of the Legion
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Pump | Cost$ 2 R W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Double Strike | SpellDescription$ Target creature gains double strike until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunhome_fortress_of_the_legion.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}{R}{W}, {T}: Target creature gains double strike until end of turn.
+Oracle:{T}: Add {C}.\n{2}{R}{W}, {T}: Target creature gains double strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sunken_hollow.txt b/forge-gui/res/cardsfolder/s/sunken_hollow.txt
index 7fec9f13140..fd66953922b 100644
--- a/forge-gui/res/cardsfolder/s/sunken_hollow.txt
+++ b/forge-gui/res/cardsfolder/s/sunken_hollow.txt
@@ -6,4 +6,4 @@ SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBChe
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:ETBCheckSVar:Count$LastStateBattlefield Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunken_hollow.jpg
-Oracle:({T}: Add {U} or {B} to your mana pool.)\nSunken Hollow enters the battlefield tapped unless you control two or more basic lands.
\ No newline at end of file
+Oracle:({T}: Add {U} or {B}.)\nSunken Hollow enters the battlefield tapped unless you control two or more basic lands.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/sunken_ruins.txt b/forge-gui/res/cardsfolder/s/sunken_ruins.txt
index 4523c94726b..a9175e47285 100644
--- a/forge-gui/res/cardsfolder/s/sunken_ruins.txt
+++ b/forge-gui/res/cardsfolder/s/sunken_ruins.txt
@@ -1,10 +1,10 @@
 Name:Sunken Ruins
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ UB T | Produced$ U | Amount$ 2 | SpellDescription$ Add {U}{U} to your mana pool.
-A:AB$ Mana | Cost$ UB T | Produced$ U B | SpellDescription$ Add {U}{B} to your mana pool.
-A:AB$ Mana | Cost$ UB T | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ UB T | Produced$ U | Amount$ 2 | SpellDescription$ Add {U}{U}.
+A:AB$ Mana | Cost$ UB T | Produced$ U B | SpellDescription$ Add {U}{B}.
+A:AB$ Mana | Cost$ UB T | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunken_ruins.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{U/B}, {T}: Add {U}{U}, {U}{B}, or {B}{B} to your mana pool.
+Oracle:{T}: Add {C}.\n{U/B}, {T}: Add {U}{U}, {U}{B}, or {B}{B}.
diff --git a/forge-gui/res/cardsfolder/s/sunpetal_grove.txt b/forge-gui/res/cardsfolder/s/sunpetal_grove.txt
index 59757c2524d..e79e5c6e871 100644
--- a/forge-gui/res/cardsfolder/s/sunpetal_grove.txt
+++ b/forge-gui/res/cardsfolder/s/sunpetal_grove.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Forest.YouCtrl,Plains.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Forest or a Plains.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunpetal_grove.jpg
-Oracle:Sunpetal Grove enters the battlefield tapped unless you control a Forest or a Plains.\n{T}: Add {G} or {W} to your mana pool.
+Oracle:Sunpetal Grove enters the battlefield tapped unless you control a Forest or a Plains.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/s/sunscorched_desert.txt b/forge-gui/res/cardsfolder/s/sunscorched_desert.txt
index 04c8bd67d6e..63b764cc7d5 100644
--- a/forge-gui/res/cardsfolder/s/sunscorched_desert.txt
+++ b/forge-gui/res/cardsfolder/s/sunscorched_desert.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Land Desert
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to target player.
 SVar:TrigDealDamage:DB$DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunscorched_desert.jpg
-Oracle:When Sunscorched Desert enters the battlefield, it deals 1 damage to target player.\n{T}: Add {C} to your mana pool.
\ No newline at end of file
+Oracle:When Sunscorched Desert enters the battlefield, it deals 1 damage to target player.\n{T}: Add {C}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/sunseed_nurturer.txt b/forge-gui/res/cardsfolder/s/sunseed_nurturer.txt
index e7ff1f2b670..41e7c899418 100644
--- a/forge-gui/res/cardsfolder/s/sunseed_nurturer.txt
+++ b/forge-gui/res/cardsfolder/s/sunseed_nurturer.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Human Druid Wizard
 PT:1/1
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | IsPresent$ Creature.powerGE5+YouCtrl | Execute$ TrigLife | TriggerDescription$ At the beginning of your end step, if you control a creature with power 5 or greater, you may gain 2 life.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:TrigLife:DB$GainLife | Defined$ You | LifeAmount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunseed_nurturer.jpg
-Oracle:At the beginning of your end step, if you control a creature with power 5 or greater, you may gain 2 life.\n{T}: Add {C} to your mana pool.
+Oracle:At the beginning of your end step, if you control a creature with power 5 or greater, you may gain 2 life.\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/s/survivors_encampment.txt b/forge-gui/res/cardsfolder/s/survivors_encampment.txt
index 77cf6d3d215..a3fd903ea23 100644
--- a/forge-gui/res/cardsfolder/s/survivors_encampment.txt
+++ b/forge-gui/res/cardsfolder/s/survivors_encampment.txt
@@ -1,7 +1,7 @@
 Name:Survivors' Encampment
 ManaCost:no cost
 Types:Land Desert
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T tapXType<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T tapXType<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/survivors_encampment.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Tap an untapped creature you control: Add one mana of any color to your mana pool.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{T}, Tap an untapped creature you control: Add one mana of any color.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/svogthos_the_restless_tomb.txt b/forge-gui/res/cardsfolder/s/svogthos_the_restless_tomb.txt
index b4f52f2f50f..552cde08a71 100644
--- a/forge-gui/res/cardsfolder/s/svogthos_the_restless_tomb.txt
+++ b/forge-gui/res/cardsfolder/s/svogthos_the_restless_tomb.txt
@@ -1,10 +1,10 @@
 Name:Svogthos, the Restless Tomb
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Animate | Cost$ 3 B G | Defined$ Self | Types$ Creature,Zombie,Plant | Colors$ Black,Green | staticAbilities$ Static | References$ X | SpellDescription$ Until end of turn, CARDNAME becomes a black and green Plant Zombie creature with "This creature's power and toughness are each equal to the number of creature cards in your graveyard." It's still a land.
 SVar:Static:Mode$ Continuous | EffectZone$ Battlefield | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ This creature's power and toughness are each equal to the number of creature cards in your graveyard.
 SVar:X:Count$TypeInYourYard.Creature
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/svogthos_the_restless_tomb.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{3}{B}{G}: Until end of turn, Svogthos, the Restless Tomb becomes a black and green Plant Zombie creature with "This creature's power and toughness are each equal to the number of creature cards in your graveyard." It's still a land.
+Oracle:{T}: Add {C}.\n{3}{B}{G}: Until end of turn, Svogthos, the Restless Tomb becomes a black and green Plant Zombie creature with "This creature's power and toughness are each equal to the number of creature cards in your graveyard." It's still a land.
diff --git a/forge-gui/res/cardsfolder/s/svyelunite_temple.txt b/forge-gui/res/cardsfolder/s/svyelunite_temple.txt
index 8fd0956ab85..e1c515bb1d6 100644
--- a/forge-gui/res/cardsfolder/s/svyelunite_temple.txt
+++ b/forge-gui/res/cardsfolder/s/svyelunite_temple.txt
@@ -2,8 +2,8 @@ Name:Svyelunite Temple
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ U | Amount$ 2 | SpellDescription$ Add {U}{U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ U | Amount$ 2 | SpellDescription$ Add {U}{U}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/svyelunite_temple.jpg
-Oracle:Svyelunite Temple enters the battlefield tapped.\n{T}: Add {U} to your mana pool.\n{T}, Sacrifice Svyelunite Temple: Add {U}{U} to your mana pool.
+Oracle:Svyelunite Temple enters the battlefield tapped.\n{T}: Add {U}.\n{T}, Sacrifice Svyelunite Temple: Add {U}{U}.
diff --git a/forge-gui/res/cardsfolder/s/swarmyard.txt b/forge-gui/res/cardsfolder/s/swarmyard.txt
index d157c20a309..51cafb76636 100644
--- a/forge-gui/res/cardsfolder/s/swarmyard.txt
+++ b/forge-gui/res/cardsfolder/s/swarmyard.txt
@@ -1,7 +1,7 @@
 Name:Swarmyard
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Regenerate | ValidTgts$ Insect,Rat,Spider,Squirrel | TgtPrompt$ Select target Insect, Rat, Spider, or Squirrel | Cost$ T | SpellDescription$ Regenerate target Insect, Rat, Spider, or Squirrel.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/swarmyard.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Regenerate target Insect, Rat, Spider, or Squirrel.
+Oracle:{T}: Add {C}.\n{T}: Regenerate target Insect, Rat, Spider, or Squirrel.
diff --git a/forge-gui/res/cardsfolder/s/sylvan_caryatid.txt b/forge-gui/res/cardsfolder/s/sylvan_caryatid.txt
index ed0ae1e8565..4b1ba30aa0d 100644
--- a/forge-gui/res/cardsfolder/s/sylvan_caryatid.txt
+++ b/forge-gui/res/cardsfolder/s/sylvan_caryatid.txt
@@ -4,6 +4,6 @@ Types:Creature Plant
 PT:0/3
 K:Defender
 K:Hexproof
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sylvan_caryatid.jpg
-Oracle:Defender, hexproof\n{T}: Add one mana of any color to your mana pool.
+Oracle:Defender, hexproof\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/s/sylvok_explorer.txt b/forge-gui/res/cardsfolder/s/sylvok_explorer.txt
index 60fdf78bac2..c832ea7ee74 100644
--- a/forge-gui/res/cardsfolder/s/sylvok_explorer.txt
+++ b/forge-gui/res/cardsfolder/s/sylvok_explorer.txt
@@ -2,6 +2,6 @@ Name:Sylvok Explorer
 ManaCost:1 G
 Types:Creature Human Druid
 PT:1/1
-A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.OppCtrl | ReflectProperty$ Produce | SpellDescription$ Add to your mana pool one mana of any color that a land an opponent controls could produce.
+A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.OppCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any color that a land an opponent controls could produce.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sylvok_explorer.jpg
-Oracle:{T}: Add to your mana pool one mana of any color that a land an opponent controls could produce.
+Oracle:{T}: Add one mana of any color that a land an opponent controls could produce.
diff --git a/forge-gui/res/cardsfolder/t/taiga.txt b/forge-gui/res/cardsfolder/t/taiga.txt
index 6997a3d984b..cb4e6420177 100644
--- a/forge-gui/res/cardsfolder/t/taiga.txt
+++ b/forge-gui/res/cardsfolder/t/taiga.txt
@@ -2,4 +2,4 @@ Name:Taiga
 ManaCost:no cost
 Types:Land Mountain Forest
 SVar:Picture:http://www.wizards.com/global/images/magic/general/taiga.jpg
-Oracle:({T}: Add {R} or {G} to your mana pool.)
+Oracle:({T}: Add {R} or {G}.)
diff --git a/forge-gui/res/cardsfolder/t/tainted_field.txt b/forge-gui/res/cardsfolder/t/tainted_field.txt
index a671b29cbce..73be4773df2 100644
--- a/forge-gui/res/cardsfolder/t/tainted_field.txt
+++ b/forge-gui/res/cardsfolder/t/tainted_field.txt
@@ -1,8 +1,8 @@
 Name:Tainted Field
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {W} to your mana pool. Activate this ability only if you control a Swamp.
-A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {B} to your mana pool. Activate this ability only if you control a Swamp.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {W}. Activate this ability only if you control a Swamp.
+A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {B}. Activate this ability only if you control a Swamp.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tainted_field.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {W} or {B} to your mana pool. Activate this ability only if you control a Swamp.
+Oracle:{T}: Add {C}.\n{T}: Add {W} or {B}. Activate this ability only if you control a Swamp.
diff --git a/forge-gui/res/cardsfolder/t/tainted_isle.txt b/forge-gui/res/cardsfolder/t/tainted_isle.txt
index 27196563b4b..9cd59df2330 100644
--- a/forge-gui/res/cardsfolder/t/tainted_isle.txt
+++ b/forge-gui/res/cardsfolder/t/tainted_isle.txt
@@ -1,8 +1,8 @@
 Name:Tainted Isle
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {U} to your mana pool. Activate this ability only if you control a Swamp.
-A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {B} to your mana pool. Activate this ability only if you control a Swamp.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ U | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {U}. Activate this ability only if you control a Swamp.
+A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {B}. Activate this ability only if you control a Swamp.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tainted_isle.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {U} or {B} to your mana pool. Activate this ability only if you control a Swamp.
+Oracle:{T}: Add {C}.\n{T}: Add {U} or {B}. Activate this ability only if you control a Swamp.
diff --git a/forge-gui/res/cardsfolder/t/tainted_peak.txt b/forge-gui/res/cardsfolder/t/tainted_peak.txt
index d9adaabf3cd..6ccf8fec4aa 100644
--- a/forge-gui/res/cardsfolder/t/tainted_peak.txt
+++ b/forge-gui/res/cardsfolder/t/tainted_peak.txt
@@ -1,8 +1,8 @@
 Name:Tainted Peak
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {B} to your mana pool. Activate this ability only if you control a Swamp.
-A:AB$ Mana | Cost$ T | Produced$ R | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {R} to your mana pool. Activate this ability only if you control a Swamp.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {B}. Activate this ability only if you control a Swamp.
+A:AB$ Mana | Cost$ T | Produced$ R | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {R}. Activate this ability only if you control a Swamp.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tainted_peak.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {B} or {R} to your mana pool. Activate this ability only if you control a Swamp.
+Oracle:{T}: Add {C}.\n{T}: Add {B} or {R}. Activate this ability only if you control a Swamp.
diff --git a/forge-gui/res/cardsfolder/t/tainted_wood.txt b/forge-gui/res/cardsfolder/t/tainted_wood.txt
index 6916c90b269..38f2ee2cc4f 100644
--- a/forge-gui/res/cardsfolder/t/tainted_wood.txt
+++ b/forge-gui/res/cardsfolder/t/tainted_wood.txt
@@ -1,8 +1,8 @@
 Name:Tainted Wood
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {B} to your mana pool. Activate this ability only if you control a Swamp.
-A:AB$ Mana | Cost$ T | Produced$ G | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {G} to your mana pool. Activate this ability only if you control a Swamp.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ B | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {B}. Activate this ability only if you control a Swamp.
+A:AB$ Mana | Cost$ T | Produced$ G | IsPresent$ Swamp.YouCtrl | SpellDescription$ Add {G}. Activate this ability only if you control a Swamp.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tainted_wood.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {B} or {G} to your mana pool. Activate this ability only if you control a Swamp.
+Oracle:{T}: Add {C}.\n{T}: Add {B} or {G}. Activate this ability only if you control a Swamp.
diff --git a/forge-gui/res/cardsfolder/t/talisman_of_dominance.txt b/forge-gui/res/cardsfolder/t/talisman_of_dominance.txt
index 011bd31ae38..51c332f7bda 100644
--- a/forge-gui/res/cardsfolder/t/talisman_of_dominance.txt
+++ b/forge-gui/res/cardsfolder/t/talisman_of_dominance.txt
@@ -1,9 +1,9 @@
 Name:Talisman of Dominance
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U} 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.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/talisman_of_dominance.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {U} or {B} to your mana pool. Talisman of Dominance deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {U} or {B}. Talisman of Dominance deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/t/talisman_of_impulse.txt b/forge-gui/res/cardsfolder/t/talisman_of_impulse.txt
index 3a1218b96fb..53175a6b157 100644
--- a/forge-gui/res/cardsfolder/t/talisman_of_impulse.txt
+++ b/forge-gui/res/cardsfolder/t/talisman_of_impulse.txt
@@ -1,9 +1,9 @@
 Name:Talisman of Impulse
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R} to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/talisman_of_impulse.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {R} or {G} to your mana pool. Talisman of Impulse deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {R} or {G}. Talisman of Impulse deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/t/talisman_of_indulgence.txt b/forge-gui/res/cardsfolder/t/talisman_of_indulgence.txt
index dfd530269d1..30e48cf4c3c 100644
--- a/forge-gui/res/cardsfolder/t/talisman_of_indulgence.txt
+++ b/forge-gui/res/cardsfolder/t/talisman_of_indulgence.txt
@@ -1,9 +1,9 @@
 Name:Talisman of Indulgence
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B} to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add {R}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/talisman_of_indulgence.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {B} or {R} to your mana pool. Talisman of Indulgence deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {B} or {R}. Talisman of Indulgence deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/t/talisman_of_progress.txt b/forge-gui/res/cardsfolder/t/talisman_of_progress.txt
index 619a8666319..ecb86f45153 100644
--- a/forge-gui/res/cardsfolder/t/talisman_of_progress.txt
+++ b/forge-gui/res/cardsfolder/t/talisman_of_progress.txt
@@ -1,9 +1,9 @@
 Name:Talisman of Progress
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-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$ U | SubAbility$ DBPain | SpellDescription$ Add {U} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/talisman_of_progress.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {W} or {U} to your mana pool. Talisman of Progress deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {W} or {U}. Talisman of Progress deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/t/talisman_of_unity.txt b/forge-gui/res/cardsfolder/t/talisman_of_unity.txt
index 9bb7b3a00ae..6b357408735 100644
--- a/forge-gui/res/cardsfolder/t/talisman_of_unity.txt
+++ b/forge-gui/res/cardsfolder/t/talisman_of_unity.txt
@@ -1,9 +1,9 @@
 Name:Talisman of Unity
 ManaCost:2
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-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$ G | SubAbility$ DBPain | SpellDescription$ Add {G} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add {W}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/talisman_of_unity.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {G} or {W} to your mana pool. Talisman of Unity deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {G} or {W}. Talisman of Unity deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/t/tangleroot.txt b/forge-gui/res/cardsfolder/t/tangleroot.txt
index 3d1a7357b88..324a9af4a80 100644
--- a/forge-gui/res/cardsfolder/t/tangleroot.txt
+++ b/forge-gui/res/cardsfolder/t/tangleroot.txt
@@ -1,8 +1,8 @@
 Name:Tangleroot
 ManaCost:3
 Types:Artifact
-T:Mode$ SpellCast | ValidCard$ Creature | Execute$ TrigMana | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts a creature spell, that player adds {G} to his or her mana pool.
+T:Mode$ SpellCast | ValidCard$ Creature | Execute$ TrigMana | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts a creature spell, that player adds {G}.
 SVar:TrigMana:DB$ Mana | Produced$ G | Amount$ 1 | Defined$ TriggeredActivator
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tangleroot.jpg
-Oracle:Whenever a player casts a creature spell, that player adds {G} to his or her mana pool.
+Oracle:Whenever a player casts a creature spell, that player adds {G}.
diff --git a/forge-gui/res/cardsfolder/t/tarnished_citadel.txt b/forge-gui/res/cardsfolder/t/tarnished_citadel.txt
index 655fcda8d4c..4ee777f903f 100644
--- a/forge-gui/res/cardsfolder/t/tarnished_citadel.txt
+++ b/forge-gui/res/cardsfolder/t/tarnished_citadel.txt
@@ -1,8 +1,8 @@
 Name:Tarnished Citadel
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBPain | SpellDescription$ Add one mana of any color to your mana pool. CARDNAME deals 3 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ Any | SubAbility$ DBPain | SpellDescription$ Add one mana of any color. CARDNAME deals 3 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 3 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tarnished_citadel.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Tarnished Citadel deals 3 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add one mana of any color. Tarnished Citadel deals 3 damage to you.
diff --git a/forge-gui/res/cardsfolder/t/tectonic_edge.txt b/forge-gui/res/cardsfolder/t/tectonic_edge.txt
index 1d5f3ae1815..7e2c2ca78a9 100644
--- a/forge-gui/res/cardsfolder/t/tectonic_edge.txt
+++ b/forge-gui/res/cardsfolder/t/tectonic_edge.txt
@@ -1,8 +1,8 @@
 Name:Tectonic Edge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land. | Cost$ 1 T Sac<1/CARDNAME> | IsPresent$ Land.OppCtrl | PresentCompare$ GE4 | AILogic$ LandForLand | SpellDescription$ Destroy target nonbasic land. Activate this ability only if an opponent controls four or more lands.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tectonic_edge.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}, Sacrifice Tectonic Edge: Destroy target nonbasic land. Activate this ability only if an opponent controls four or more lands.
+Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Tectonic Edge: Destroy target nonbasic land. Activate this ability only if an opponent controls four or more lands.
diff --git a/forge-gui/res/cardsfolder/t/teetering_peaks.txt b/forge-gui/res/cardsfolder/t/teetering_peaks.txt
index c99b08e7e4d..ac690a22fcd 100644
--- a/forge-gui/res/cardsfolder/t/teetering_peaks.txt
+++ b/forge-gui/res/cardsfolder/t/teetering_peaks.txt
@@ -2,9 +2,9 @@ Name:Teetering Peaks
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +2/+0 until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +0
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/teetering_peaks.jpg
-Oracle:Teetering Peaks enters the battlefield tapped.\nWhen Teetering Peaks enters the battlefield, target creature gets +2/+0 until end of turn.\n{T}: Add {R} to your mana pool.
+Oracle:Teetering Peaks enters the battlefield tapped.\nWhen Teetering Peaks enters the battlefield, target creature gets +2/+0 until end of turn.\n{T}: Add {R}.
diff --git a/forge-gui/res/cardsfolder/t/teferis_isle.txt b/forge-gui/res/cardsfolder/t/teferis_isle.txt
index 41b1dda409e..f8e4ce71add 100644
--- a/forge-gui/res/cardsfolder/t/teferis_isle.txt
+++ b/forge-gui/res/cardsfolder/t/teferis_isle.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Legendary Land
 K:Phasing
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | Amount$ 2 | SpellDescription$ Add {U}{U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | Amount$ 2 | SpellDescription$ Add {U}{U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/teferis_isle.jpg
-Oracle:Phasing (This phases in or out before you untap during each of your untap steps. While it's phased out, it's treated as though it doesn't exist.)\nTeferi's Isle enters the battlefield tapped.\n{T}: Add {U}{U} to your mana pool.
+Oracle:Phasing (This phases in or out before you untap during each of your untap steps. While it's phased out, it's treated as though it doesn't exist.)\nTeferi's Isle enters the battlefield tapped.\n{T}: Add {U}{U}.
diff --git a/forge-gui/res/cardsfolder/t/temple_garden.txt b/forge-gui/res/cardsfolder/t/temple_garden.txt
index 0c37d06367c..8305395bf49 100644
--- a/forge-gui/res/cardsfolder/t/temple_garden.txt
+++ b/forge-gui/res/cardsfolder/t/temple_garden.txt
@@ -4,4 +4,4 @@ Types:Land Forest Plains
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | UnlessAI$ Shockland | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://resources.wizards.com/magic/cards/rav/en-us/card89093.jpg
-Oracle:({T}: Add {G} or {W} to your mana pool.)\nAs Temple Garden enters the battlefield, you may pay 2 life. If you don't, Temple Garden enters the battlefield tapped.
+Oracle:({T}: Add {G} or {W}.)\nAs Temple Garden enters the battlefield, you may pay 2 life. If you don't, Temple Garden enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/t/temple_of_abandon.txt b/forge-gui/res/cardsfolder/t/temple_of_abandon.txt
index 78462711fc7..82ddad50567 100644
--- a/forge-gui/res/cardsfolder/t/temple_of_abandon.txt
+++ b/forge-gui/res/cardsfolder/t/temple_of_abandon.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_abandon.jpg
-Oracle:Temple of Abandon enters the battlefield tapped.\nWhen Temple of Abandon enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {R} or {G} to your mana pool.
+Oracle:Temple of Abandon enters the battlefield tapped.\nWhen Temple of Abandon enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/t/temple_of_deceit.txt b/forge-gui/res/cardsfolder/t/temple_of_deceit.txt
index 58a5640ca44..98c89bafebe 100644
--- a/forge-gui/res/cardsfolder/t/temple_of_deceit.txt
+++ b/forge-gui/res/cardsfolder/t/temple_of_deceit.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_deceit.jpg
-Oracle:Temple of Deceit enters the battlefield tapped.\nWhen Temple of Deceit enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {U} or {B} to your mana pool.
+Oracle:Temple of Deceit enters the battlefield tapped.\nWhen Temple of Deceit enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/t/temple_of_enlightenment.txt b/forge-gui/res/cardsfolder/t/temple_of_enlightenment.txt
index 3fb1b720909..1bbc7e8bc7a 100644
--- a/forge-gui/res/cardsfolder/t/temple_of_enlightenment.txt
+++ b/forge-gui/res/cardsfolder/t/temple_of_enlightenment.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_enlightenment.jpg
-Oracle:Temple of Enlightenment enters the battlefield tapped.\nWhen Temple of Enlightenment enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {W} or {U} to your mana pool.
+Oracle:Temple of Enlightenment enters the battlefield tapped.\nWhen Temple of Enlightenment enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/t/temple_of_malady.txt b/forge-gui/res/cardsfolder/t/temple_of_malady.txt
index eb385d2437c..fadb4a605da 100644
--- a/forge-gui/res/cardsfolder/t/temple_of_malady.txt
+++ b/forge-gui/res/cardsfolder/t/temple_of_malady.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_malady.jpg
-Oracle:Temple of Malady enters the battlefield tapped.\nWhen Temple of Malady enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {B} or {G} to your mana pool.
+Oracle:Temple of Malady enters the battlefield tapped.\nWhen Temple of Malady enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {B} or {G}.
diff --git a/forge-gui/res/cardsfolder/t/temple_of_malice.txt b/forge-gui/res/cardsfolder/t/temple_of_malice.txt
index 20f2aaba0a3..210a7c05a50 100644
--- a/forge-gui/res/cardsfolder/t/temple_of_malice.txt
+++ b/forge-gui/res/cardsfolder/t/temple_of_malice.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_malice.jpg
-Oracle:Temple of Malice enters the battlefield tapped.\nWhen Temple of Malice enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {B} or {R} to your mana pool.
+Oracle:Temple of Malice enters the battlefield tapped.\nWhen Temple of Malice enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/t/temple_of_mystery.txt b/forge-gui/res/cardsfolder/t/temple_of_mystery.txt
index 531cb1bea8a..6ff3e01ea30 100644
--- a/forge-gui/res/cardsfolder/t/temple_of_mystery.txt
+++ b/forge-gui/res/cardsfolder/t/temple_of_mystery.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_mystery.jpg
-Oracle:Temple of Mystery enters the battlefield tapped.\nWhen Temple of Mystery enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {G} or {U} to your mana pool.
+Oracle:Temple of Mystery enters the battlefield tapped.\nWhen Temple of Mystery enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {G} or {U}.
diff --git a/forge-gui/res/cardsfolder/t/temple_of_plenty.txt b/forge-gui/res/cardsfolder/t/temple_of_plenty.txt
index e28f16bda54..75195a8abeb 100644
--- a/forge-gui/res/cardsfolder/t/temple_of_plenty.txt
+++ b/forge-gui/res/cardsfolder/t/temple_of_plenty.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_plenty.jpg
-Oracle:Temple of Plenty enters the battlefield tapped.\nWhen Temple of Plenty enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {G} or {W} to your mana pool.
+Oracle:Temple of Plenty enters the battlefield tapped.\nWhen Temple of Plenty enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/t/temple_of_silence.txt b/forge-gui/res/cardsfolder/t/temple_of_silence.txt
index 69845e6e4bf..3d0332d2c6d 100644
--- a/forge-gui/res/cardsfolder/t/temple_of_silence.txt
+++ b/forge-gui/res/cardsfolder/t/temple_of_silence.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_silence.jpg
-Oracle:Temple of Silence enters the battlefield tapped.\nWhen Temple of Silence enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {W} or {B} to your mana pool.
+Oracle:Temple of Silence enters the battlefield tapped.\nWhen Temple of Silence enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {W} or {B}.
diff --git a/forge-gui/res/cardsfolder/t/temple_of_the_false_god.txt b/forge-gui/res/cardsfolder/t/temple_of_the_false_god.txt
index 3fba96c92f4..ace29770a3d 100644
--- a/forge-gui/res/cardsfolder/t/temple_of_the_false_god.txt
+++ b/forge-gui/res/cardsfolder/t/temple_of_the_false_god.txt
@@ -1,7 +1,7 @@
 Name:Temple of the False God
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | IsPresent$ Land.YouCtrl | PresentCompare$ GE5 | SpellDescription$ Add {C}{C} to your mana pool. Activate this ability only if you control five or more lands.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | IsPresent$ Land.YouCtrl | PresentCompare$ GE5 | SpellDescription$ Add {C}{C}. Activate this ability only if you control five or more lands.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_the_false_god.jpg
-Oracle:{T}: Add {C}{C} to your mana pool. Activate this ability only if you control five or more lands.
+Oracle:{T}: Add {C}{C}. Activate this ability only if you control five or more lands.
diff --git a/forge-gui/res/cardsfolder/t/temple_of_triumph.txt b/forge-gui/res/cardsfolder/t/temple_of_triumph.txt
index 138a91d3ac5..475122aa57b 100644
--- a/forge-gui/res/cardsfolder/t/temple_of_triumph.txt
+++ b/forge-gui/res/cardsfolder/t/temple_of_triumph.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temple_of_triumph.jpg
-Oracle:Temple of Triumph enters the battlefield tapped.\nWhen Temple of Triumph enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {R} or {W} to your mana pool.
+Oracle:Temple of Triumph enters the battlefield tapped.\nWhen Temple of Triumph enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {R} or {W}.
diff --git a/forge-gui/res/cardsfolder/t/temur_banner.txt b/forge-gui/res/cardsfolder/t/temur_banner.txt
index 66782dae1ae..a0993c99a48 100644
--- a/forge-gui/res/cardsfolder/t/temur_banner.txt
+++ b/forge-gui/res/cardsfolder/t/temur_banner.txt
@@ -1,11 +1,11 @@
 Name:Temur Banner
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Draw | Cost$ G U R T Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Green|Blue|Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temur_banner.jpg
-Oracle:{T}: Add {G}, {U}, or {R} to your mana pool.\n{G}{U}{R}, {T}, Sacrifice Temur Banner: Draw a card.
+Oracle:{T}: Add {G}, {U}, or {R}.\n{G}{U}{R}, {T}, Sacrifice Temur Banner: Draw a card.
diff --git a/forge-gui/res/cardsfolder/t/tendo_ice_bridge.txt b/forge-gui/res/cardsfolder/t/tendo_ice_bridge.txt
index ac1d15fc693..05f47c9fab6 100644
--- a/forge-gui/res/cardsfolder/t/tendo_ice_bridge.txt
+++ b/forge-gui/res/cardsfolder/t/tendo_ice_bridge.txt
@@ -2,7 +2,7 @@ Name:Tendo Ice Bridge
 ManaCost:no cost
 Types:Land
 K:etbCounter:CHARGE:1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tendo_ice_bridge.jpg
-Oracle:Tendo Ice Bridge enters the battlefield with a charge counter on it.\n{T}: Add {C} to your mana pool.\n{T}, Remove a charge counter from Tendo Ice Bridge: Add one mana of any color to your mana pool.
+Oracle:Tendo Ice Bridge enters the battlefield with a charge counter on it.\n{T}: Add {C}.\n{T}, Remove a charge counter from Tendo Ice Bridge: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/t/terminal_moraine.txt b/forge-gui/res/cardsfolder/t/terminal_moraine.txt
index bb0819f97b0..147c87282be 100644
--- a/forge-gui/res/cardsfolder/t/terminal_moraine.txt
+++ b/forge-gui/res/cardsfolder/t/terminal_moraine.txt
@@ -1,7 +1,7 @@
 Name:Terminal Moraine
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/terminal_moraine.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}, Sacrifice Terminal Moraine: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library.
+Oracle:{T}: Add {C}.\n{2}, {T}, Sacrifice Terminal Moraine: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/t/terrain_generator.txt b/forge-gui/res/cardsfolder/t/terrain_generator.txt
index 8cb5bb7a23e..c546d065b21 100644
--- a/forge-gui/res/cardsfolder/t/terrain_generator.txt
+++ b/forge-gui/res/cardsfolder/t/terrain_generator.txt
@@ -1,7 +1,7 @@
 Name:Terrain Generator
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 2 T | ChangeType$ Land.Basic+YouCtrl | ChangeNum$ 1 | Hidden$ True | Origin$ Hand | Destination$ Battlefield | Tapped$ True | SpellDescription$ You may put a basic land card from your hand onto the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/terrain_generator.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: You may put a basic land card from your hand onto the battlefield tapped.
+Oracle:{T}: Add {C}.\n{2}, {T}: You may put a basic land card from your hand onto the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/t/terrarion.txt b/forge-gui/res/cardsfolder/t/terrarion.txt
index 5a1066c1619..245ece3d9e8 100644
--- a/forge-gui/res/cardsfolder/t/terrarion.txt
+++ b/forge-gui/res/cardsfolder/t/terrarion.txt
@@ -1,10 +1,10 @@
 Name:Terrarion
 ManaCost:1
 Types:Artifact
-A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ Combo Any | Amount$ 2 | AILogic$ MostProminentInComputerHand | SpellDescription$ Add two mana in any combination of colors to your mana pool.
+A:AB$ Mana | Cost$ 2 T Sac<1/CARDNAME> | Produced$ Combo Any | Amount$ 2 | AILogic$ MostProminentInComputerHand | SpellDescription$ Add two mana in any combination of colors.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card.
 SVar:TrigDraw:DB$Draw | Defined$ TriggeredCardController | NumCards$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/terrarion.jpg
-Oracle:Terrarion enters the battlefield tapped.\n{2}, {T}, Sacrifice Terrarion: Add two mana in any combination of colors to your mana pool.\nWhen Terrarion is put into a graveyard from the battlefield, draw a card.
+Oracle:Terrarion enters the battlefield tapped.\n{2}, {T}, Sacrifice Terrarion: Add two mana in any combination of colors.\nWhen Terrarion is put into a graveyard from the battlefield, draw a card.
diff --git a/forge-gui/res/cardsfolder/t/tezzeret_the_schemer.txt b/forge-gui/res/cardsfolder/t/tezzeret_the_schemer.txt
index 157448fbd47..69ed679bf02 100644
--- a/forge-gui/res/cardsfolder/t/tezzeret_the_schemer.txt
+++ b/forge-gui/res/cardsfolder/t/tezzeret_the_schemer.txt
@@ -2,8 +2,8 @@ Name:Tezzeret the Schemer
 ManaCost:2 U B
 Types:Legendary Planeswalker Tezzeret
 Loyalty:5
-A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenName$ Etherium Cell | TokenImage$ c etherium cell | TokenTypes$ Artifact | TokenOwner$ You | TokenColors$ Colorless | TokenAbilities$ ABMana | References$ ABMana | SpellDescription$ Create a colorless artifact token named Etherium Cell with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenName$ Etherium Cell | TokenImage$ c etherium cell | TokenTypes$ Artifact | TokenOwner$ You | TokenColors$ Colorless | TokenAbilities$ ABMana | References$ ABMana | SpellDescription$ Create a colorless artifact token named Etherium Cell with "{T}, Sacrifice this artifact: Add one mana of any color."
+SVar:ABMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ Pump | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | NumDef$ -X | References$ X | SpellDescription$ Target creature gets +X/-X until end of turn, where X is the number of artifacts you control.
 SVar:X:Count$Valid Artifact.YouCtrl
 A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Tezzeret the Schemer | Triggers$ CombatTrig | SVars$ TezzeretAnimate | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of combat on your turn, target artifact you control becomes an artifact creature with base power and toughness 5/5."
@@ -11,4 +11,4 @@ SVar:CombatTrig:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZon
 SVar:TezzeretAnimate:DB$ Animate | ValidTgts$ Artifact.YouCtrl | TgtPrompt$ Select target artifact you control | Power$ 5 | Toughness$ 5 | Types$ Artifact,Creature | Permanent$ True
 DeckNeeds:Type$Artifact
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tezzeret_the_schemer.jpg
-Oracle:[+1]: Create a colorless artifact token named Etherium Cell with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."\n[-2]: Target creature gets +X/-X until end of turn, where X is the number of artifacts you control.\n[-7]: You get an emblem with "At the beginning of combat on your turn, target artifact you control becomes an artifact creature with base power and toughness 5/5."
+Oracle:[+1]: Create a colorless artifact token named Etherium Cell with "{T}, Sacrifice this artifact: Add one mana of any color."\n[-2]: Target creature gets +X/-X until end of turn, where X is the number of artifacts you control.\n[-7]: You get an emblem with "At the beginning of combat on your turn, target artifact you control becomes an artifact creature with base power and toughness 5/5."
diff --git a/forge-gui/res/cardsfolder/t/thalakos_lowlands.txt b/forge-gui/res/cardsfolder/t/thalakos_lowlands.txt
index c15d77d0760..58befe7d1c9 100644
--- a/forge-gui/res/cardsfolder/t/thalakos_lowlands.txt
+++ b/forge-gui/res/cardsfolder/t/thalakos_lowlands.txt
@@ -1,9 +1,9 @@
 Name:Thalakos Lowlands
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBStayTapped | SpellDescription$ Add {W} to your mana pool. CARDNAME doesn't untap during your next untap step.
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBStayTapped | SpellDescription$ Add {U} to your mana pool. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBStayTapped | SpellDescription$ Add {W}. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBStayTapped | SpellDescription$ Add {U}. CARDNAME doesn't untap during your next untap step.
 SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thalakos_lowlands.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {W} or {U} to your mana pool. Thalakos Lowlands doesn't untap during your next untap step.
+Oracle:{T}: Add {C}.\n{T}: Add {W} or {U}. Thalakos Lowlands doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/t/thaumatic_compass_spires_of_orazca.txt b/forge-gui/res/cardsfolder/t/thaumatic_compass_spires_of_orazca.txt
index 187c915d731..1b36195177b 100644
--- a/forge-gui/res/cardsfolder/t/thaumatic_compass_spires_of_orazca.txt
+++ b/forge-gui/res/cardsfolder/t/thaumatic_compass_spires_of_orazca.txt
@@ -13,8 +13,8 @@ ALTERNATE
 Name:Spires of Orazca
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 A:AB$ Untap | Cost$ T | ValidTgts$ Creature.attacking+OppCtrl | IsCurse$ True | TgtPrompt$ Select target attacking creature an opponent controls | SubAbility$ RemCombat | SpellDescription$ Untap target attacking creature an opponent controls and remove it from combat.
 SVar:RemCombat:DB$ RemoveFromCombat | Defined$ Targeted | AILogic$ RemoveBestAttacker
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spires_of_orazca.jpg
-Oracle:(Transforms from Thaumatic Compass.)\n{T}: Add {C} to your mana pool.\n{T}: Untap target attacking creature an opponent controls and remove it from combat.
+Oracle:(Transforms from Thaumatic Compass.)\n{T}: Add {C}.\n{T}: Untap target attacking creature an opponent controls and remove it from combat.
diff --git a/forge-gui/res/cardsfolder/t/thermopod.txt b/forge-gui/res/cardsfolder/t/thermopod.txt
index d13d356e8d3..7fc27acbcdc 100644
--- a/forge-gui/res/cardsfolder/t/thermopod.txt
+++ b/forge-gui/res/cardsfolder/t/thermopod.txt
@@ -2,8 +2,8 @@ Name:Thermopod
 ManaCost:4 R
 Types:Snow Creature Slug
 PT:4/3
-A:AB$ Mana | Cost$ Sac<1/Creature> | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/Creature> | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Pump | Cost$ S | KW$ Haste | Defined$ Self | SpellDescription$ CARDNAME gains haste until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thermopod.jpg
-Oracle:{S}: Thermopod gains haste until end of turn. ({S} can be paid with one mana from a snow permanent.)\nSacrifice a creature: Add {R} to your mana pool.
+Oracle:{S}: Thermopod gains haste until end of turn. ({S} can be paid with one mana from a snow permanent.)\nSacrifice a creature: Add {R}.
diff --git a/forge-gui/res/cardsfolder/t/thespians_stage.txt b/forge-gui/res/cardsfolder/t/thespians_stage.txt
index dcc6473a8e4..e6673ff8a1d 100644
--- a/forge-gui/res/cardsfolder/t/thespians_stage.txt
+++ b/forge-gui/res/cardsfolder/t/thespians_stage.txt
@@ -1,9 +1,9 @@
 Name:Thespian's Stage
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Clone | Cost$ 2 T | ValidTgts$ Land | TgtPrompt$ Select target land to copy. | AddAbilities$ ThespianCopy | AddSVars$ ThespianCopy | SpellDescription$ CARDNAME becomes a copy of target land and gains this ability.
 SVar:ThespianCopy:AB$ Clone | Cost$ 2 T | ValidTgts$ Land | TgtPrompt$ Select target land to copy. | AddAbilities$ ThespianCopy | AddSVars$ ThespianCopy | SpellDescription$ CARDNAME becomes a copy of target land and gains this ability.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thespians_stage.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: Thespian's Stage becomes a copy of target land and gains this ability.
+Oracle:{T}: Add {C}.\n{2}, {T}: Thespian's Stage becomes a copy of target land and gains this ability.
diff --git a/forge-gui/res/cardsfolder/t/thornwood_falls.txt b/forge-gui/res/cardsfolder/t/thornwood_falls.txt
index 526c039c759..c3d99e1e7a5 100644
--- a/forge-gui/res/cardsfolder/t/thornwood_falls.txt
+++ b/forge-gui/res/cardsfolder/t/thornwood_falls.txt
@@ -1,10 +1,10 @@
 Name:Thornwood Falls
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thornwood_falls.jpg
-Oracle:Thornwood Falls enters the battlefield tapped.\nWhen Thornwood Falls enters the battlefield, you gain 1 life.\n{T}: Add {G} or {U} to your mana pool.
+Oracle:Thornwood Falls enters the battlefield tapped.\nWhen Thornwood Falls enters the battlefield, you gain 1 life.\n{T}: Add {G} or {U}.
diff --git a/forge-gui/res/cardsfolder/t/thought_vessel.txt b/forge-gui/res/cardsfolder/t/thought_vessel.txt
index 742df3a3077..bd57d8fd385 100644
--- a/forge-gui/res/cardsfolder/t/thought_vessel.txt
+++ b/forge-gui/res/cardsfolder/t/thought_vessel.txt
@@ -2,6 +2,6 @@ Name:Thought Vessel
 ManaCost:2
 Types:Artifact
 S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thought_vessel.jpg
-Oracle:You have no maximum hand size.\n{T}: Add {C} to your mana pool.
+Oracle:You have no maximum hand size.\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/t/thran_dynamo.txt b/forge-gui/res/cardsfolder/t/thran_dynamo.txt
index 2209c3ee6fa..f980ba32bea 100644
--- a/forge-gui/res/cardsfolder/t/thran_dynamo.txt
+++ b/forge-gui/res/cardsfolder/t/thran_dynamo.txt
@@ -1,6 +1,6 @@
 Name:Thran Dynamo
 ManaCost:4
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thran_dynamo.jpg
-Oracle:{T}: Add {C}{C}{C} to your mana pool.
+Oracle:{T}: Add {C}{C}{C}.
diff --git a/forge-gui/res/cardsfolder/t/thran_quarry.txt b/forge-gui/res/cardsfolder/t/thran_quarry.txt
index 1ed1ad84a3f..cda08fd09b0 100644
--- a/forge-gui/res/cardsfolder/t/thran_quarry.txt
+++ b/forge-gui/res/cardsfolder/t/thran_quarry.txt
@@ -1,9 +1,9 @@
 Name:Thran Quarry
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | IsPresent$ Creature.YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if you control no creatures, sacrifice CARDNAME.
 SVar:TrigSac:DB$Sacrifice | Defined$ Self
 SVar:NeedsToPlay:Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thran_quarry.jpg
-Oracle:At the beginning of the end step, if you control no creatures, sacrifice Thran Quarry.\n{T}: Add one mana of any color to your mana pool.
+Oracle:At the beginning of the end step, if you control no creatures, sacrifice Thran Quarry.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/t/thran_turbine.txt b/forge-gui/res/cardsfolder/t/thran_turbine.txt
index dd6e598e0b7..99af0c7eda7 100644
--- a/forge-gui/res/cardsfolder/t/thran_turbine.txt
+++ b/forge-gui/res/cardsfolder/t/thran_turbine.txt
@@ -1,8 +1,8 @@
 Name:Thran Turbine
 ManaCost:1
 Types:Artifact
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ DBMana | TriggerDescription$ At the beginning of your upkeep, you may add {C}{C} to your mana pool. You can't spend this mana to cast spells.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ DBMana | TriggerDescription$ At the beginning of your upkeep, you may add {C}{C}. You can't spend this mana to cast spells.
 SVar:DBMana:DB$ Mana | Amount$ 2 | Produced$ C | RestrictValid$ nonSpell
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thran_turbine.jpg
-Oracle:At the beginning of your upkeep, you may add {C}{C} to your mana pool. You can't spend this mana to cast spells.
+Oracle:At the beginning of your upkeep, you may add {C}{C}. You can't spend this mana to cast spells.
diff --git a/forge-gui/res/cardsfolder/t/throne_of_the_high_city.txt b/forge-gui/res/cardsfolder/t/throne_of_the_high_city.txt
index e84076d42c5..820b2c378e8 100644
--- a/forge-gui/res/cardsfolder/t/throne_of_the_high_city.txt
+++ b/forge-gui/res/cardsfolder/t/throne_of_the_high_city.txt
@@ -1,7 +1,7 @@
 Name:Throne of the High City
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ BecomeMonarch | Cost$ 4 T Sac<1/CARDNAME> | Defined$ You | SpellDescription$ You become the monarch.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/throne_of_the_high_city.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{4}, {T}, Sacrifice Throne of the High City: You become the monarch.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{4}, {T}, Sacrifice Throne of the High City: You become the monarch.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/t/thunder_totem.txt b/forge-gui/res/cardsfolder/t/thunder_totem.txt
index ce5199b7a93..e383f520a33 100644
--- a/forge-gui/res/cardsfolder/t/thunder_totem.txt
+++ b/forge-gui/res/cardsfolder/t/thunder_totem.txt
@@ -1,9 +1,9 @@
 Name:Thunder Totem
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | Amount$ 1 | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | Amount$ 1 | SpellDescription$ Add {W}.
 A:AB$ Animate | Cost$ 1 W W | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Artifact,Spirit | Colors$ White | Keywords$ Flying & First Strike | SpellDescription$ CARDNAME becomes a 2/2 white Spirit artifact creature with flying and first strike until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$white
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thunder_totem.jpg
-Oracle:{T}: Add {W} to your mana pool.\n{1}{W}{W}: Thunder Totem becomes a 2/2 white Spirit artifact creature with flying and first strike until end of turn.
+Oracle:{T}: Add {W}.\n{1}{W}{W}: Thunder Totem becomes a 2/2 white Spirit artifact creature with flying and first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/tigereye_cameo.txt b/forge-gui/res/cardsfolder/t/tigereye_cameo.txt
index 54a8bb5365e..709ba271db2 100644
--- a/forge-gui/res/cardsfolder/t/tigereye_cameo.txt
+++ b/forge-gui/res/cardsfolder/t/tigereye_cameo.txt
@@ -1,9 +1,9 @@
 Name:Tigereye Cameo
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Green|White
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tigereye_cameo.jpg
-Oracle:{T}: Add {G} or {W} to your mana pool.
+Oracle:{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/t/timberland_ruins.txt b/forge-gui/res/cardsfolder/t/timberland_ruins.txt
index ddbd9dfd226..b6cb0dfb5f3 100644
--- a/forge-gui/res/cardsfolder/t/timberland_ruins.txt
+++ b/forge-gui/res/cardsfolder/t/timberland_ruins.txt
@@ -1,8 +1,8 @@
 Name:Timberland Ruins
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/timberland_ruins.jpg
-Oracle:Timberland Ruins enters the battlefield tapped.\n{T}: Add {G} to your mana pool.\n{T}, Sacrifice Timberland Ruins: Add one mana of any color to your mana pool.
+Oracle:Timberland Ruins enters the battlefield tapped.\n{T}: Add {G}.\n{T}, Sacrifice Timberland Ruins: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/t/timberline_ridge.txt b/forge-gui/res/cardsfolder/t/timberline_ridge.txt
index c333a151517..0fe826a08ca 100644
--- a/forge-gui/res/cardsfolder/t/timberline_ridge.txt
+++ b/forge-gui/res/cardsfolder/t/timberline_ridge.txt
@@ -2,10 +2,10 @@ Name:Timberline Ridge
 ManaCost:no cost
 Types:Land
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_DEPLETION | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ CARDNAME doesn't untap during your untap step if it has a depletion counter on it.
-A:AB$ Mana | Cost$ T | Produced$ R | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {R} to your mana pool. Put a depletion counter on CARDNAME.
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {G} to your mana pool. Put a depletion counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ R | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {R}. Put a depletion counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {G}. Put a depletion counter on CARDNAME.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSubCounter | TriggerDescription$ At the beginning of your upkeep, remove a depletion counter from CARDNAME.
 SVar:TrigSubCounter:DB$RemoveCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 1
 SVar:AddCounter:DB$PutCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/timberline_ridge.jpg
-Oracle:Timberline Ridge doesn't untap during your untap step if it has a depletion counter on it.\nAt the beginning of your upkeep, remove a depletion counter from Timberline Ridge.\n{T}: Add {R} or {G} to your mana pool. Put a depletion counter on Timberline Ridge.
+Oracle:Timberline Ridge doesn't untap during your untap step if it has a depletion counter on it.\nAt the beginning of your upkeep, remove a depletion counter from Timberline Ridge.\n{T}: Add {R} or {G}. Put a depletion counter on Timberline Ridge.
diff --git a/forge-gui/res/cardsfolder/t/tinder_farm.txt b/forge-gui/res/cardsfolder/t/tinder_farm.txt
index 1c811ebfb7d..61d64174eec 100644
--- a/forge-gui/res/cardsfolder/t/tinder_farm.txt
+++ b/forge-gui/res/cardsfolder/t/tinder_farm.txt
@@ -2,8 +2,8 @@ Name:Tinder Farm
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$T Sac<1/CARDNAME> | Produced$ R W | SpellDescription$ Add {R}{W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$T Sac<1/CARDNAME> | Produced$ R W | SpellDescription$ Add {R}{W}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tinder_farm.jpg
-Oracle:Tinder Farm enters the battlefield tapped.\n{T}: Add {G} to your mana pool.\n{T}, Sacrifice Tinder Farm: Add {R}{W} to your mana pool.
+Oracle:Tinder Farm enters the battlefield tapped.\n{T}: Add {G}.\n{T}, Sacrifice Tinder Farm: Add {R}{W}.
diff --git a/forge-gui/res/cardsfolder/t/tinder_wall.txt b/forge-gui/res/cardsfolder/t/tinder_wall.txt
index de73cbce098..b71a1d86d59 100644
--- a/forge-gui/res/cardsfolder/t/tinder_wall.txt
+++ b/forge-gui/res/cardsfolder/t/tinder_wall.txt
@@ -3,8 +3,8 @@ ManaCost:G
 Types:Creature Plant Wall
 PT:0/3
 K:Defender
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R} to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
 A:AB$ DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature.blockedBySource | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature it's blocking.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tinder_wall.jpg
-Oracle:Defender (This creature can't attack.)\nSacrifice Tinder Wall: Add {R}{R} to your mana pool.\n{R}, Sacrifice Tinder Wall: Tinder Wall deals 2 damage to target creature it's blocking.
+Oracle:Defender (This creature can't attack.)\nSacrifice Tinder Wall: Add {R}{R}.\n{R}, Sacrifice Tinder Wall: Tinder Wall deals 2 damage to target creature it's blocking.
diff --git a/forge-gui/res/cardsfolder/t/tolaria.txt b/forge-gui/res/cardsfolder/t/tolaria.txt
index bdf0a1261c8..c8ae2ba38aa 100644
--- a/forge-gui/res/cardsfolder/t/tolaria.txt
+++ b/forge-gui/res/cardsfolder/t/tolaria.txt
@@ -1,8 +1,8 @@
 Name:Tolaria
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Debuff | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Keywords$ Banding & Bands with Other Creatures named Wolves of the Hunt & Bands with Other Legendary Creatures | ActivationPhases$ Upkeep | SpellDescription$ Target creature loses banding and all "bands with other" abilities until end of turn. Activate this ability only during any upkeep step. | StackDescription$ SpellDescription
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tolaria.jpg
-Oracle:{T}: Add {U} to your mana pool.\n{T}: Target creature loses banding and all "bands with other" abilities until end of turn. Activate this ability only during any upkeep step.
+Oracle:{T}: Add {U}.\n{T}: Target creature loses banding and all "bands with other" abilities until end of turn. Activate this ability only during any upkeep step.
diff --git a/forge-gui/res/cardsfolder/t/tolaria_west.txt b/forge-gui/res/cardsfolder/t/tolaria_west.txt
index 9ecfcb0ffad..fdaba54a545 100644
--- a/forge-gui/res/cardsfolder/t/tolaria_west.txt
+++ b/forge-gui/res/cardsfolder/t/tolaria_west.txt
@@ -2,8 +2,8 @@ Name:Tolaria West
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 K:Transmute:1 U U
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tolaria_west.jpg
-Oracle:Tolaria West enters the battlefield tapped.\n{T}: Add {U} to your mana pool.\nTransmute {1}{U}{U} ({1}{U}{U}, Discard this card: Search your library for a card with converted mana cost 0, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)
+Oracle:Tolaria West enters the battlefield tapped.\n{T}: Add {U}.\nTransmute {1}{U}{U} ({1}{U}{U}, Discard this card: Search your library for a card with converted mana cost 0, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/t/tolarian_academy.txt b/forge-gui/res/cardsfolder/t/tolarian_academy.txt
index 6cc9e689836..d24c2373326 100644
--- a/forge-gui/res/cardsfolder/t/tolarian_academy.txt
+++ b/forge-gui/res/cardsfolder/t/tolarian_academy.txt
@@ -1,8 +1,8 @@
 Name:Tolarian Academy
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ U | Amount$ X | References$ X | SpellDescription$ Add {U} to your mana pool for each artifact you control.
+A:AB$ Mana | Cost$ T | Produced$ U | Amount$ X | References$ X | SpellDescription$ Add {U} for each artifact you control.
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tolarian_academy.jpg
-Oracle:{T}: Add {U} to your mana pool for each artifact you control.
+Oracle:{T}: Add {U} for each artifact you control.
diff --git a/forge-gui/res/cardsfolder/t/tomb_of_the_spirit_dragon.txt b/forge-gui/res/cardsfolder/t/tomb_of_the_spirit_dragon.txt
index 716378078f0..d962429a47c 100644
--- a/forge-gui/res/cardsfolder/t/tomb_of_the_spirit_dragon.txt
+++ b/forge-gui/res/cardsfolder/t/tomb_of_the_spirit_dragon.txt
@@ -1,8 +1,8 @@
 Name:Tomb of the Spirit Dragon
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ GainLife | Cost$ 2 T | LifeAmount$ X | References$ X | SpellDescription$ You gain 1 life for each colorless creature you control.
 SVar:X:Count$Valid Creature.Colorless+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tomb_of_the_spirit_dragon.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: You gain 1 life for each colorless creature you control.
+Oracle:{T}: Add {C}.\n{2}, {T}: You gain 1 life for each colorless creature you control.
diff --git a/forge-gui/res/cardsfolder/t/tomb_of_urami.txt b/forge-gui/res/cardsfolder/t/tomb_of_urami.txt
index 76b372355c2..87817129b86 100644
--- a/forge-gui/res/cardsfolder/t/tomb_of_urami.txt
+++ b/forge-gui/res/cardsfolder/t/tomb_of_urami.txt
@@ -1,9 +1,9 @@
 Name:Tomb of Urami
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B} to your mana pool. CARDNAME deals 1 damage to you if you don't control an Ogre.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you if you don't control an Ogre.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You | ConditionPresent$ Ogre.YouCtrl | ConditionCompare$ EQ0
 A:AB$ Token | Cost$ 2 B B T Sac<All/Land> | TokenAmount$ 1 | TokenController$ You | TokenName$ Urami | TokenTypes$ Legendary,Creature,Demon,Spirit | TokenColors$ Black | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | CostDesc$ {2}{B}{B}, {T}, Sacrifice all lands you control: | SpellDescription$ Create a legendary 5/5 black Demon Spirit creature token with flying named Urami.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tomb_of_urami.jpg
-Oracle:{T}: Add {B} to your mana pool. Tomb of Urami deals 1 damage to you if you don't control an Ogre.\n{2}{B}{B}, {T}, Sacrifice all lands you control: Create a legendary 5/5 black Demon Spirit creature token with flying named Urami.
+Oracle:{T}: Add {B}. Tomb of Urami deals 1 damage to you if you don't control an Ogre.\n{2}{B}{B}, {T}, Sacrifice all lands you control: Create a legendary 5/5 black Demon Spirit creature token with flying named Urami.
diff --git a/forge-gui/res/cardsfolder/t/tooth_of_ramos.txt b/forge-gui/res/cardsfolder/t/tooth_of_ramos.txt
index 4ded1882fe8..0c96d943536 100644
--- a/forge-gui/res/cardsfolder/t/tooth_of_ramos.txt
+++ b/forge-gui/res/cardsfolder/t/tooth_of_ramos.txt
@@ -1,8 +1,8 @@
 Name:Tooth of Ramos
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ W | SpellDescription$ Add {W}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tooth_of_ramos.jpg
-Oracle:{T}: Add {W} to your mana pool.\nSacrifice Tooth of Ramos: Add {W} to your mana pool.
+Oracle:{T}: Add {W}.\nSacrifice Tooth of Ramos: Add {W}.
diff --git a/forge-gui/res/cardsfolder/t/tower_of_the_magistrate.txt b/forge-gui/res/cardsfolder/t/tower_of_the_magistrate.txt
index 1733db54df0..392006d4757 100644
--- a/forge-gui/res/cardsfolder/t/tower_of_the_magistrate.txt
+++ b/forge-gui/res/cardsfolder/t/tower_of_the_magistrate.txt
@@ -1,7 +1,7 @@
 Name:Tower of the Magistrate
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Protection | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Gains$ artifacts | SpellDescription$ Target creature gains protection from artifacts until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tower_of_the_magistrate.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Target creature gains protection from artifacts until end of turn.
+Oracle:{T}: Add {C}.\n{1}, {T}: Target creature gains protection from artifacts until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/trace_of_abundance.txt b/forge-gui/res/cardsfolder/t/trace_of_abundance.txt
index 6a16e4f8e6f..8236f617b6b 100644
--- a/forge-gui/res/cardsfolder/t/trace_of_abundance.txt
+++ b/forge-gui/res/cardsfolder/t/trace_of_abundance.txt
@@ -4,8 +4,8 @@ Types:Enchantment Aura
 K:Enchant Land
 A:SP$ Attach | Cost$ RW G | ValidTgts$ Land | TgtPrompt$ Select target land | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Land.EnchantedBy | AddKeyword$ Shroud | Description$ Enchanted land has shroud. (It can't be the target of spells or abilities.)
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.
 SVar:TrigMana:DB$ Mana | Produced$ Any | Defined$ TriggeredCardController
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trace_of_abundance.jpg
-Oracle:Enchant land\nEnchanted land has shroud. (It can't be the target of spells or abilities.)\nWhenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool (in addition to the mana the land produces).
+Oracle:Enchant land\nEnchanted land has shroud. (It can't be the target of spells or abilities.)\nWhenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.
diff --git a/forge-gui/res/cardsfolder/t/tranquil_cove.txt b/forge-gui/res/cardsfolder/t/tranquil_cove.txt
index e8917df1291..060ea72195e 100644
--- a/forge-gui/res/cardsfolder/t/tranquil_cove.txt
+++ b/forge-gui/res/cardsfolder/t/tranquil_cove.txt
@@ -1,10 +1,10 @@
 Name:Tranquil Cove
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tranquil_cove.jpg
-Oracle:Tranquil Cove enters the battlefield tapped.\nWhen Tranquil Cove enters the battlefield, you gain 1 life.\n{T}: Add {W} or {U} to your mana pool.
+Oracle:Tranquil Cove enters the battlefield tapped.\nWhen Tranquil Cove enters the battlefield, you gain 1 life.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/t/tranquil_expanse.txt b/forge-gui/res/cardsfolder/t/tranquil_expanse.txt
index eb348c08d88..dab1feed98c 100644
--- a/forge-gui/res/cardsfolder/t/tranquil_expanse.txt
+++ b/forge-gui/res/cardsfolder/t/tranquil_expanse.txt
@@ -2,7 +2,7 @@ Name:Tranquil Expanse
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tranquil_expanse.jpg
-Oracle:Tranquil Expanse enters the battlefield tapped.\n{T}: Add {G} or {W} to your mana pool.
+Oracle:Tranquil Expanse enters the battlefield tapped.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/t/tranquil_garden.txt b/forge-gui/res/cardsfolder/t/tranquil_garden.txt
index 07722d10a27..2869458d7f9 100644
--- a/forge-gui/res/cardsfolder/t/tranquil_garden.txt
+++ b/forge-gui/res/cardsfolder/t/tranquil_garden.txt
@@ -1,9 +1,9 @@
 Name:Tranquil Garden
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBStayTapped | SpellDescription$ Add {G} to your mana pool. CARDNAME doesn't untap during your next untap step.
-A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBStayTapped | SpellDescription$ Add {W} to your mana pool. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBStayTapped | SpellDescription$ Add {G}. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBStayTapped | SpellDescription$ Add {W}. CARDNAME doesn't untap during your next untap step.
 SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tranquil_garden.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {G} or {W} to your mana pool. Tranquil Garden doesn't untap during your next untap step.
+Oracle:{T}: Add {C}.\n{T}: Add {G} or {W}. Tranquil Garden doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/t/transguild_promenade.txt b/forge-gui/res/cardsfolder/t/transguild_promenade.txt
index 90c96af6aee..8647e492c47 100644
--- a/forge-gui/res/cardsfolder/t/transguild_promenade.txt
+++ b/forge-gui/res/cardsfolder/t/transguild_promenade.txt
@@ -4,7 +4,7 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you pay {1}.
 SVar:TrigSac:DB$Sacrifice | Defined$ Self | UnlessCost$ 1 | UnlessPayer$ You
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:NeedsToPlay:Land.untapped+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/transguild_promenade.jpg
-Oracle:Transguild Promenade enters the battlefield tapped.\nWhen Transguild Promenade enters the battlefield, sacrifice it unless you pay {1}.\n{T}: Add one mana of any color to your mana pool.
+Oracle:Transguild Promenade enters the battlefield tapped.\nWhen Transguild Promenade enters the battlefield, sacrifice it unless you pay {1}.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/t/treasonous_ogre.txt b/forge-gui/res/cardsfolder/t/treasonous_ogre.txt
index b3809f270dc..914bc56d2b0 100644
--- a/forge-gui/res/cardsfolder/t/treasonous_ogre.txt
+++ b/forge-gui/res/cardsfolder/t/treasonous_ogre.txt
@@ -3,6 +3,6 @@ ManaCost:3 R
 Types:Creature Ogre Shaman
 PT:2/3
 K:Dethrone
-A:AB$ Mana | Cost$ PayLife<3> | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ PayLife<3> | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treasonous_ogre.jpg
-Oracle:Dethrone (Whenever this creature attacks the player with the most life or tied for most life, put a +1/+1 counter on it.)\nPay 3 life: Add {R} to your mana pool.
+Oracle:Dethrone (Whenever this creature attacks the player with the most life or tied for most life, put a +1/+1 counter on it.)\nPay 3 life: Add {R}.
diff --git a/forge-gui/res/cardsfolder/t/treasure_map_treasure_cove.txt b/forge-gui/res/cardsfolder/t/treasure_map_treasure_cove.txt
index f4193ed8f05..40c9b360616 100644
--- a/forge-gui/res/cardsfolder/t/treasure_map_treasure_cove.txt
+++ b/forge-gui/res/cardsfolder/t/treasure_map_treasure_cove.txt
@@ -1,25 +1,25 @@
 Name:Treasure Map
 ManaCost:2
 Types:Artifact
-A:AB$ Scry | Cost$ 1 T | ScryNum$ 1 | SubAbility$ DBLandmark | SpellDescription$ Scry 1. Put a landmark counter on CARDNAME. Then if there are three or more landmark counters on it, remove those counters, transform CARDNAME, and create three colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+A:AB$ Scry | Cost$ 1 T | ScryNum$ 1 | SubAbility$ DBLandmark | SpellDescription$ Scry 1. Put a landmark counter on CARDNAME. Then if there are three or more landmark counters on it, remove those counters, transform CARDNAME, and create three colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:DBLandmark:DB$ PutCounter | Defined$ Self | CounterType$ LANDMARK | CounterNum$ 1 | SubAbility$ DBBranch
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ XMarksTheSpot | References$ XMarksTheSpot | TrueSubAbility$ DBRemoveCtrs
 SVar:DBRemoveCtrs:DB$ RemoveCounter | Defined$ Self | CounterType$ LANDMARK | CounterNum$ All | SubAbility$ DBTransform
 SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform  | SubAbility$ DBTreasureTokens
 SVar:DBTreasureTokens:DB$ Token | TokenAmount$ 3 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | References$ ABTreasureMana
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 SVar:XMarksTheSpot:Count$Valid Card.Self+counters_GE3_LANDMARK
 AlternateMode:DoubleFaced
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treasure_map.jpg
-Oracle:{1}, {T}: Scry 1. Put a landmark counter on Treasure Map. Then if there are three or more landmark counters on it, remove those counters, transform Treasure Map, and create three colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:{1}, {T}: Scry 1. Put a landmark counter on Treasure Map. Then if there are three or more landmark counters on it, remove those counters, transform Treasure Map, and create three colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color."
 
 ALTERNATE
 
 Name:Treasure Cove
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Draw | Cost$ T Sac<1/Treasure> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treasure_cove.jpg
-Oracle:(Transforms from Treasure Map.)\n{T}: Add {C} to your mana pool.\n{T}, Sacrifice a Treasure: Draw a card.
+Oracle:(Transforms from Treasure Map.)\n{T}: Add {C}.\n{T}, Sacrifice a Treasure: Draw a card.
diff --git a/forge-gui/res/cardsfolder/t/tree_of_tales.txt b/forge-gui/res/cardsfolder/t/tree_of_tales.txt
index f56aa4355f1..07eff03e359 100644
--- a/forge-gui/res/cardsfolder/t/tree_of_tales.txt
+++ b/forge-gui/res/cardsfolder/t/tree_of_tales.txt
@@ -1,6 +1,6 @@
 Name:Tree of Tales
 ManaCost:no cost
 Types:Artifact Land
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tree_of_tales.jpg
-Oracle:{T}: Add {G} to your mana pool.
+Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/t/tresserhorn_sinks.txt b/forge-gui/res/cardsfolder/t/tresserhorn_sinks.txt
index 6f4f6ff876b..eb61cb42962 100644
--- a/forge-gui/res/cardsfolder/t/tresserhorn_sinks.txt
+++ b/forge-gui/res/cardsfolder/t/tresserhorn_sinks.txt
@@ -2,7 +2,7 @@ Name:Tresserhorn Sinks
 ManaCost:no cost
 Types:Snow Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tresserhorn_sinks.jpg
-Oracle:Tresserhorn Sinks enters the battlefield tapped.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:Tresserhorn Sinks enters the battlefield tapped.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/t/trevas_attendant.txt b/forge-gui/res/cardsfolder/t/trevas_attendant.txt
index d6a54c1ab47..86f5a6219c9 100644
--- a/forge-gui/res/cardsfolder/t/trevas_attendant.txt
+++ b/forge-gui/res/cardsfolder/t/trevas_attendant.txt
@@ -2,7 +2,7 @@ Name:Treva's Attendant
 ManaCost:5
 Types:Artifact Creature Golem
 PT:3/3
-A:AB$ Mana | Cost$ 1 Sac<1/CARDNAME> | Produced$ G W U | SpellDescription$ Add {G}{W}{U} to your mana pool.
+A:AB$ Mana | Cost$ 1 Sac<1/CARDNAME> | Produced$ G W U | SpellDescription$ Add {G}{W}{U}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trevas_attendant.jpg
-Oracle:{1}, Sacrifice Treva's Attendant: Add {G}{W}{U} to your mana pool.
+Oracle:{1}, Sacrifice Treva's Attendant: Add {G}{W}{U}.
diff --git a/forge-gui/res/cardsfolder/t/trevas_ruins.txt b/forge-gui/res/cardsfolder/t/trevas_ruins.txt
index 501bf3436fa..b60d1e2c2f2 100644
--- a/forge-gui/res/cardsfolder/t/trevas_ruins.txt
+++ b/forge-gui/res/cardsfolder/t/trevas_ruins.txt
@@ -1,11 +1,11 @@
 Name:Treva's Ruins
 ManaCost:no cost
 Types:Land Lair
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Land.nonLair/non-Lair land> | UnlessPayer$ You
 SVar:NeedsToPlay:Land.nonLair+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trevas_ruins.jpg
-Oracle:When Treva's Ruins enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {G}, {W}, or {U} to your mana pool.
+Oracle:When Treva's Ruins enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.\n{T}: Add {G}, {W}, or {U}.
diff --git a/forge-gui/res/cardsfolder/t/troll_horn_cameo.txt b/forge-gui/res/cardsfolder/t/troll_horn_cameo.txt
index 605cb454f8a..02159dffad7 100644
--- a/forge-gui/res/cardsfolder/t/troll_horn_cameo.txt
+++ b/forge-gui/res/cardsfolder/t/troll_horn_cameo.txt
@@ -1,9 +1,9 @@
 Name:Troll-Horn Cameo
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Green|Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/troll_horn_cameo.jpg
-Oracle:{T}: Add {R} or {G} to your mana pool.
+Oracle:{T}: Add {R} or {G}.
diff --git a/forge-gui/res/cardsfolder/t/tropical_island.txt b/forge-gui/res/cardsfolder/t/tropical_island.txt
index 30e54841bf7..ceb1f9c110a 100644
--- a/forge-gui/res/cardsfolder/t/tropical_island.txt
+++ b/forge-gui/res/cardsfolder/t/tropical_island.txt
@@ -2,4 +2,4 @@ Name:Tropical Island
 ManaCost:no cost
 Types:Land Forest Island
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tropical_island.jpg
-Oracle:({T}: Add {G} or {U} to your mana pool.)
+Oracle:({T}: Add {G} or {U}.)
diff --git a/forge-gui/res/cardsfolder/t/trove_of_temptation.txt b/forge-gui/res/cardsfolder/t/trove_of_temptation.txt
index 28719b77927..928bb4dd0c9 100644
--- a/forge-gui/res/cardsfolder/t/trove_of_temptation.txt
+++ b/forge-gui/res/cardsfolder/t/trove_of_temptation.txt
@@ -2,9 +2,9 @@ Name:Trove of Temptation
 ManaCost:3 R
 Types:Enchantment
 K:Each opponent must attack you or a planeswalker you control with at least one creature each combat if able.
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBTreasureToken | TriggerDescription$ At the beginning of your end step, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBTreasureToken | TriggerDescription$ At the beginning of your end step, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color.
 SVar:DBTreasureToken:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trove_of_temptation.jpg
-Oracle:Each opponent must attack you or a planeswalker you control with at least one creature each combat if able.\nAt the beginning of your end step, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool.
+Oracle:Each opponent must attack you or a planeswalker you control with at least one creature each combat if able.\nAt the beginning of your end step, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/t/truga_jungle.txt b/forge-gui/res/cardsfolder/t/truga_jungle.txt
index 1fdbffd1a9e..44714f0ea30 100644
--- a/forge-gui/res/cardsfolder/t/truga_jungle.txt
+++ b/forge-gui/res/cardsfolder/t/truga_jungle.txt
@@ -1,10 +1,10 @@
 Name:Truga Jungle
 ManaCost:no cost
 Types:Plane Ergamon
-S:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land | AddAbility$ AnyMana | Description$ All lands have "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land | AddAbility$ AnyMana | Description$ All lands have "{T}: Add one mana of any color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, reveal the top three cards of your library. Put all land cards revealed this way into your hand and the rest on the bottom of your library in any order.
 SVar:RolledChaos:DB$ Dig | DigNum$ 3 | Reveal$ True | ChangeNum$ All | ChangeValid$ Land
 SVar:Picture:http://www.wizards.com/global/images/magic/general/truga_jungle.jpg
 SVar:AIRollPlanarDieParams:Mode$ Random | Chance$ 20
-Oracle:All lands have "{T}: Add one mana of any color to your mana pool."\nWhenever you roll {CHAOS}, reveal the top three cards of your library. Put all land cards revealed this way into your hand and the rest on the bottom of your library in any order.
+Oracle:All lands have "{T}: Add one mana of any color."\nWhenever you roll {CHAOS}, reveal the top three cards of your library. Put all land cards revealed this way into your hand and the rest on the bottom of your library in any order.
diff --git a/forge-gui/res/cardsfolder/t/tundra.txt b/forge-gui/res/cardsfolder/t/tundra.txt
index d7dbde4dc8d..6a0effba137 100644
--- a/forge-gui/res/cardsfolder/t/tundra.txt
+++ b/forge-gui/res/cardsfolder/t/tundra.txt
@@ -2,4 +2,4 @@ Name:Tundra
 ManaCost:no cost
 Types:Land Plains Island
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tundra.jpg
-Oracle:({T}: Add {W} or {U} to your mana pool.)
+Oracle:({T}: Add {W} or {U}.)
diff --git a/forge-gui/res/cardsfolder/t/turn_to_dust.txt b/forge-gui/res/cardsfolder/t/turn_to_dust.txt
index a678586ec05..57f84ba4c25 100644
--- a/forge-gui/res/cardsfolder/t/turn_to_dust.txt
+++ b/forge-gui/res/cardsfolder/t/turn_to_dust.txt
@@ -1,8 +1,8 @@
 Name:Turn to Dust
 ManaCost:G
 Types:Instant
-A:SP$ Destroy | Cost$ G | ValidTgts$ Equipment | TgtPrompt$ Select target Equipment | SubAbility$ DBMana | SpellDescription$ Destroy target Equipment. Add {G} to your mana pool.
+A:SP$ Destroy | Cost$ G | ValidTgts$ Equipment | TgtPrompt$ Select target Equipment | SubAbility$ DBMana | SpellDescription$ Destroy target Equipment. Add {G}.
 SVar:DBMana:DB$Mana | Produced$ G | Amount$ 1
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/turn_to_dust.jpg
-Oracle:Destroy target Equipment. Add {G} to your mana pool.
+Oracle:Destroy target Equipment. Add {G}.
diff --git a/forge-gui/res/cardsfolder/t/turntimber_grove.txt b/forge-gui/res/cardsfolder/t/turntimber_grove.txt
index 73c1ec85b27..632f3991652 100644
--- a/forge-gui/res/cardsfolder/t/turntimber_grove.txt
+++ b/forge-gui/res/cardsfolder/t/turntimber_grove.txt
@@ -2,8 +2,8 @@ Name:Turntimber Grove
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +1/+1 until end of turn.
 SVar:TrigPump:DB$Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/turntimber_grove.jpg
-Oracle:Turntimber Grove enters the battlefield tapped.\nWhen Turntimber Grove enters the battlefield, target creature gets +1/+1 until end of turn.\n{T}: Add {G} to your mana pool.
+Oracle:Turntimber Grove enters the battlefield tapped.\nWhen Turntimber Grove enters the battlefield, target creature gets +1/+1 until end of turn.\n{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/t/twilight_mire.txt b/forge-gui/res/cardsfolder/t/twilight_mire.txt
index c18e107eae8..19b07be3075 100644
--- a/forge-gui/res/cardsfolder/t/twilight_mire.txt
+++ b/forge-gui/res/cardsfolder/t/twilight_mire.txt
@@ -1,10 +1,10 @@
 Name:Twilight Mire
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ BG T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool.
-A:AB$ Mana | Cost$ BG T | Produced$ B G | SpellDescription$ Add {B}{G} to your mana pool.
-A:AB$ Mana | Cost$ BG T | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ BG T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
+A:AB$ Mana | Cost$ BG T | Produced$ B G | SpellDescription$ Add {B}{G}.
+A:AB$ Mana | Cost$ BG T | Produced$ B | Amount$ 2 | SpellDescription$ Add {B}{B}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/twilight_mire.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{B/G}, {T}: Add {B}{B}, {B}{G}, or {G}{G} to your mana pool.
+Oracle:{T}: Add {C}.\n{B/G}, {T}: Add {B}{B}, {B}{G}, or {G}{G}.
diff --git a/forge-gui/res/cardsfolder/u/ulvenwald_captive_ulvenwald_abomination.txt b/forge-gui/res/cardsfolder/u/ulvenwald_captive_ulvenwald_abomination.txt
index 40bdc57184a..e74f167b8ba 100644
--- a/forge-gui/res/cardsfolder/u/ulvenwald_captive_ulvenwald_abomination.txt
+++ b/forge-gui/res/cardsfolder/u/ulvenwald_captive_ulvenwald_abomination.txt
@@ -8,7 +8,7 @@ PT:1/2
 
 K:Defender
 
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 
 A:AB$SetState | Cost$ 5 G G | Defined$ Self | Mode$ Transform | SpellDescription$ Transform CARDNAME.
 
@@ -16,7 +16,7 @@ SVar:Picture:http://www.wizards.com/global/images/magic/general/ulvenwald_captiv
 
 AlternateMode:DoubleFaced
 
-Oracle:Defender\n{T}: Add {G} to your mana pool.\n{5}{G}{G}: Transform Ulvenwald Captive.
+Oracle:Defender\n{T}: Add {G}.\n{5}{G}{G}: Transform Ulvenwald Captive.
 
 
 
@@ -32,9 +32,9 @@ Types:Creature Eldrazi Werewolf
 
 PT:4/6
 
-A:AB$ Mana | Cost$ T | Produced$ C C | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C C | SpellDescription$ Add {C}{C}.
 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ulvenwald_abomination.jpg
 
-Oracle:{T}: Add {C}{C} to your mana pool.
+Oracle:{T}: Add {C}{C}.
 
diff --git a/forge-gui/res/cardsfolder/u/unbridled_growth.txt b/forge-gui/res/cardsfolder/u/unbridled_growth.txt
index 212d500f0e6..2a5ce47d974 100644
--- a/forge-gui/res/cardsfolder/u/unbridled_growth.txt
+++ b/forge-gui/res/cardsfolder/u/unbridled_growth.txt
@@ -3,8 +3,8 @@ ManaCost:G
 Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ G | ValidTgts$ Land | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ UnbridledGrowthTap | Description$ Enchanted land has "{T}: Add one mana of any color to your mana pool."
-SVar:UnbridledGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ UnbridledGrowthTap | Description$ Enchanted land has "{T}: Add one mana of any color."
+SVar:UnbridledGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ Draw | Cost$ Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card. 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unbridled_growth.jpg
-Oracle:Enchant land\nEnchanted land has "{T}: Add one mana of any color to your mana pool."\nSacrifice Unbridled Growth: Draw a card.
\ No newline at end of file
+Oracle:Enchant land\nEnchanted land has "{T}: Add one mana of any color."\nSacrifice Unbridled Growth: Draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/u/unclaimed_territory.txt b/forge-gui/res/cardsfolder/u/unclaimed_territory.txt
index a4efa1b125f..4f22a55fb29 100644
--- a/forge-gui/res/cardsfolder/u/unclaimed_territory.txt
+++ b/forge-gui/res/cardsfolder/u/unclaimed_territory.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:ETBReplacement:Other:ChooseCT
 SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. | AILogic$ MostProminentInComputerDeck
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Creature.ChosenType | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell of the chosen type.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Creature.ChosenType | SpellDescription$ Add one mana of any color. Spend this mana only to cast a creature spell of the chosen type.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unclaimed_territory.jpg
-Oracle:As Unclaimed Territory enters the battlefield, choose a creature type. \n{T}: Add {C} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell of the chosen type.
+Oracle:As Unclaimed Territory enters the battlefield, choose a creature type. \n{T}: Add {C}.\n{T}: Add one mana of any color. Spend this mana only to cast a creature spell of the chosen type.
diff --git a/forge-gui/res/cardsfolder/u/underground_river.txt b/forge-gui/res/cardsfolder/u/underground_river.txt
index 44f8cd402b9..f50a9a11832 100644
--- a/forge-gui/res/cardsfolder/u/underground_river.txt
+++ b/forge-gui/res/cardsfolder/u/underground_river.txt
@@ -1,9 +1,9 @@
 Name:Underground River
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U} 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.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add {B}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/underground_river.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {U} or {B} to your mana pool. Underground River deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {U} or {B}. Underground River deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/u/underground_sea.txt b/forge-gui/res/cardsfolder/u/underground_sea.txt
index 4184179d24a..7f60a7baaf8 100644
--- a/forge-gui/res/cardsfolder/u/underground_sea.txt
+++ b/forge-gui/res/cardsfolder/u/underground_sea.txt
@@ -2,4 +2,4 @@ Name:Underground Sea
 ManaCost:no cost
 Types:Land Island Swamp
 SVar:Picture:http://www.wizards.com/global/images/magic/general/underground_sea.jpg
-Oracle:({T}: Add {U} or {B} to your mana pool.)
+Oracle:({T}: Add {U} or {B}.)
diff --git a/forge-gui/res/cardsfolder/u/undiscovered_paradise.txt b/forge-gui/res/cardsfolder/u/undiscovered_paradise.txt
index 5120debb2fd..5a2234c5221 100644
--- a/forge-gui/res/cardsfolder/u/undiscovered_paradise.txt
+++ b/forge-gui/res/cardsfolder/u/undiscovered_paradise.txt
@@ -1,7 +1,7 @@
 Name:Undiscovered Paradise
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool. During your next untap step, as you untap your permanents, return Undiscovered Paradise to its owner's hand. | SubAbility$ DBReturn
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color. During your next untap step, as you untap your permanents, return Undiscovered Paradise to its owner's hand. | SubAbility$ DBReturn
 SVar:DBReturn:DB$ Pump | Defined$ Self | KW$ HIDDEN During your next untap step, as you untap your permanents, return CARDNAME to its owner's hand. | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/undiscovered_paradise.jpg
-Oracle:{T}: Add one mana of any color to your mana pool. During your next untap step, as you untap your permanents, return Undiscovered Paradise to its owner's hand.
+Oracle:{T}: Add one mana of any color. During your next untap step, as you untap your permanents, return Undiscovered Paradise to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/u/unholy_grotto.txt b/forge-gui/res/cardsfolder/u/unholy_grotto.txt
index 0381d0b36e2..f6f549559a4 100644
--- a/forge-gui/res/cardsfolder/u/unholy_grotto.txt
+++ b/forge-gui/res/cardsfolder/u/unholy_grotto.txt
@@ -1,8 +1,8 @@
 Name:Unholy Grotto
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ B T | TgtPrompt$ Choose target Zombie card in your graveyard | ValidTgts$ Zombie.YouCtrl | Origin$ Graveyard | Destination$ Library | SpellDescription$ Put target Zombie card from your graveyard on top of your library.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unholy_grotto.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{B}, {T}: Put target Zombie card from your graveyard on top of your library.
+Oracle:{T}: Add {C}.\n{B}, {T}: Put target Zombie card from your graveyard on top of your library.
diff --git a/forge-gui/res/cardsfolder/u/unknown_shores.txt b/forge-gui/res/cardsfolder/u/unknown_shores.txt
index 6783e5597e0..e143bd414eb 100644
--- a/forge-gui/res/cardsfolder/u/unknown_shores.txt
+++ b/forge-gui/res/cardsfolder/u/unknown_shores.txt
@@ -1,10 +1,10 @@
 Name:Unknown Shores
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemRandomDeck:True
 DeckHas:Ability$Mana.Colorless
 DeckHints:Color$Colorless & Keyword$Devoid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unknown_shores.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/u/unstable_frontier.txt b/forge-gui/res/cardsfolder/u/unstable_frontier.txt
index 3517d96877c..0190d6b2336 100644
--- a/forge-gui/res/cardsfolder/u/unstable_frontier.txt
+++ b/forge-gui/res/cardsfolder/u/unstable_frontier.txt
@@ -1,9 +1,9 @@
 Name:Unstable Frontier
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ DBAnimate | SpellDescription$ Target land you control becomes the basic land type of your choice until end of turn.
 SVar:DBAnimate:DB$ Animate | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unstable_frontier.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Target land you control becomes the basic land type of your choice until end of turn.
+Oracle:{T}: Add {C}.\n{T}: Target land you control becomes the basic land type of your choice until end of turn.
diff --git a/forge-gui/res/cardsfolder/u/unstable_obelisk.txt b/forge-gui/res/cardsfolder/u/unstable_obelisk.txt
index 3a0ce629c88..e376caa9cb8 100644
--- a/forge-gui/res/cardsfolder/u/unstable_obelisk.txt
+++ b/forge-gui/res/cardsfolder/u/unstable_obelisk.txt
@@ -1,7 +1,7 @@
 Name:Unstable Obelisk
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | Cost$ 7 T Sac<1/CARDNAME> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Destroy target permanent.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unstable_obelisk.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{7}, {T}, Sacrifice Unstable Obelisk: Destroy target permanent.
+Oracle:{T}: Add {C}.\n{7}, {T}, Sacrifice Unstable Obelisk: Destroy target permanent.
diff --git a/forge-gui/res/cardsfolder/u/untaidake_the_cloud_keeper.txt b/forge-gui/res/cardsfolder/u/untaidake_the_cloud_keeper.txt
index c09dca1fcb8..8283093974f 100644
--- a/forge-gui/res/cardsfolder/u/untaidake_the_cloud_keeper.txt
+++ b/forge-gui/res/cardsfolder/u/untaidake_the_cloud_keeper.txt
@@ -2,8 +2,8 @@ Name:Untaidake, the Cloud Keeper
 ManaCost:no cost
 Types:Legendary Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T PayLife<2> | Produced$ C | Amount$ 2 | RestrictValid$ Card.Legendary | SpellDescription$ Add {C}{C} to your mana pool. Spend this mana only to cast legendary spells.
+A:AB$ Mana | Cost$ T PayLife<2> | Produced$ C | Amount$ 2 | RestrictValid$ Card.Legendary | SpellDescription$ Add {C}{C}. Spend this mana only to cast legendary spells.
 SVar:RemRandomDeck:True
 DeckHints:Type$Legendary
 SVar:Picture:http://www.wizards.com/global/images/magic/general/untaidake_the_cloud_keeper.jpg
-Oracle:Untaidake, the Cloud Keeper enters the battlefield tapped.\n{T}, Pay 2 life: Add {C}{C} to your mana pool. Spend this mana only to cast legendary spells.
+Oracle:Untaidake, the Cloud Keeper enters the battlefield tapped.\n{T}, Pay 2 life: Add {C}{C}. Spend this mana only to cast legendary spells.
diff --git a/forge-gui/res/cardsfolder/u/upwelling.txt b/forge-gui/res/cardsfolder/u/upwelling.txt
index 6da77dbb902..7b26a1678a1 100644
--- a/forge-gui/res/cardsfolder/u/upwelling.txt
+++ b/forge-gui/res/cardsfolder/u/upwelling.txt
@@ -1,8 +1,8 @@
 Name:Upwelling
 ManaCost:3 G
 Types:Enchantment
-S:Mode$ Continuous | GlobalRule$ Mana pools don't empty as steps and phases end. | Description$ Mana pools don't empty as steps and phases end.
+S:Mode$ Continuous | GlobalRule$ Mana pools don't empty as steps and phases end. | Description$ Players don't lose unspent mana as steps and phases end.
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/upwelling.jpg
-Oracle:Mana pools don't empty as steps and phases end.
+Oracle:Players don't lose unspent mana as steps and phases end.
diff --git a/forge-gui/res/cardsfolder/u/ur_golems_eye.txt b/forge-gui/res/cardsfolder/u/ur_golems_eye.txt
index 60b635f0348..ade5f210957 100644
--- a/forge-gui/res/cardsfolder/u/ur_golems_eye.txt
+++ b/forge-gui/res/cardsfolder/u/ur_golems_eye.txt
@@ -1,6 +1,6 @@
 Name:Ur-Golem's Eye
 ManaCost:4
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ur_golems_eye.jpg
-Oracle:{T}: Add {C}{C} to your mana pool.
+Oracle:{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/u/urborg.txt b/forge-gui/res/cardsfolder/u/urborg.txt
index 029c52fc6d7..2b00f04b460 100644
--- a/forge-gui/res/cardsfolder/u/urborg.txt
+++ b/forge-gui/res/cardsfolder/u/urborg.txt
@@ -1,10 +1,10 @@
 Name:Urborg
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SpellDescription$ Add {B}.
 A:AB$ GenericChoice | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Choices$ DebuffFS,DebuffSW | Defined$ You | SpellDescription$ Target creature loses first strike or swampwalk until end of turn.
 SVar:DebuffFS:DB$ Debuff | Keywords$ First Strike | Defined$ Targeted | SpellDescription$ Target creature loses first strike until end of turn.
 SVar:DebuffSW:DB$ Debuff | Defined$ Targeted | Keywords$ Swampwalk | SpellDescription$ Target creature loses swampwalk until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urborg.jpg
-Oracle:{T}: Add {B} to your mana pool.\n{T}: Target creature loses first strike or swampwalk until end of turn.
+Oracle:{T}: Add {B}.\n{T}: Target creature loses first strike or swampwalk until end of turn.
diff --git a/forge-gui/res/cardsfolder/u/urborg_elf.txt b/forge-gui/res/cardsfolder/u/urborg_elf.txt
index 660b393deae..1237375c075 100644
--- a/forge-gui/res/cardsfolder/u/urborg_elf.txt
+++ b/forge-gui/res/cardsfolder/u/urborg_elf.txt
@@ -2,8 +2,8 @@ Name:Urborg Elf
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://resources.wizards.com/magic/cards/ap/en-us/card26717.jpg
-Oracle:{T}: Add {G}, {U}, or {B} to your mana pool.
+Oracle:{T}: Add {G}, {U}, or {B}.
diff --git a/forge-gui/res/cardsfolder/u/urborg_volcano.txt b/forge-gui/res/cardsfolder/u/urborg_volcano.txt
index 9c78d064587..c2980a26002 100644
--- a/forge-gui/res/cardsfolder/u/urborg_volcano.txt
+++ b/forge-gui/res/cardsfolder/u/urborg_volcano.txt
@@ -2,7 +2,7 @@ Name:Urborg Volcano
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urborg_volcano.jpg
-Oracle:Urborg Volcano enters the battlefield tapped.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:Urborg Volcano enters the battlefield tapped.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/u/urzas_factory.txt b/forge-gui/res/cardsfolder/u/urzas_factory.txt
index dcba2a817f7..cf9dfcdcd8b 100644
--- a/forge-gui/res/cardsfolder/u/urzas_factory.txt
+++ b/forge-gui/res/cardsfolder/u/urzas_factory.txt
@@ -1,7 +1,7 @@
 Name:Urza's Factory
 ManaCost:no cost
 Types:Land Urza's
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Token | Cost$ 7 T | TokenAmount$ 1 | TokenName$ Assembly-Worker | TokenTypes$ Artifact,Creature,Assembly-Worker | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 2 | TokenToughness$ 2 | SpellDescription$ Create a 2/2 colorless Assembly-Worker artifact creature token.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_factory.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{7}, {T}: Create a 2/2 colorless Assembly-Worker artifact creature token.
+Oracle:{T}: Add {C}.\n{7}, {T}: Create a 2/2 colorless Assembly-Worker artifact creature token.
diff --git a/forge-gui/res/cardsfolder/u/urzas_mine.txt b/forge-gui/res/cardsfolder/u/urzas_mine.txt
index 2ee4d051f80..272c06bdcca 100644
--- a/forge-gui/res/cardsfolder/u/urzas_mine.txt
+++ b/forge-gui/res/cardsfolder/u/urzas_mine.txt
@@ -1,7 +1,7 @@
 Name:Urza's Mine
 ManaCost:no cost
 Types:Land Urza's Mine
-A:AB$ Mana | Cost$ T | Produced$ C | Bonus$ UrzaLands | BonusProduced$ 1 | SpellDescription$ Add {C} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {C}{C} to your mana pool instead.
+A:AB$ Mana | Cost$ T | Produced$ C | Bonus$ UrzaLands | BonusProduced$ 1 | SpellDescription$ Add {C}. If you control an Urza's Power-Plant and an Urza's Tower, add {C}{C} instead.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_mine.jpg
-Oracle:{T}: Add {C} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {C}{C} to your mana pool instead.
+Oracle:{T}: Add {C}. If you control an Urza's Power-Plant and an Urza's Tower, add {C}{C} instead.
diff --git a/forge-gui/res/cardsfolder/u/urzas_power_plant.txt b/forge-gui/res/cardsfolder/u/urzas_power_plant.txt
index d1791af0cc4..04bae02906e 100644
--- a/forge-gui/res/cardsfolder/u/urzas_power_plant.txt
+++ b/forge-gui/res/cardsfolder/u/urzas_power_plant.txt
@@ -1,7 +1,7 @@
 Name:Urza's Power Plant
 ManaCost:no cost
 Types:Land Urza's Power-Plant
-A:AB$ Mana | Cost$ T | Produced$ C | Bonus$ UrzaLands | BonusProduced$ 1 | SpellDescription$ Add {C} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {C}{C} to your mana pool instead.
+A:AB$ Mana | Cost$ T | Produced$ C | Bonus$ UrzaLands | BonusProduced$ 1 | SpellDescription$ Add {C}. If you control an Urza's Mine and an Urza's Tower, add {C}{C} instead.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_power_plant.jpg
-Oracle:{T}: Add {C} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {C}{C} to your mana pool instead.
+Oracle:{T}: Add {C}. If you control an Urza's Mine and an Urza's Tower, add {C}{C} instead.
diff --git a/forge-gui/res/cardsfolder/u/urzas_tower.txt b/forge-gui/res/cardsfolder/u/urzas_tower.txt
index 95c8adae4ef..0d362d8af1e 100644
--- a/forge-gui/res/cardsfolder/u/urzas_tower.txt
+++ b/forge-gui/res/cardsfolder/u/urzas_tower.txt
@@ -1,7 +1,7 @@
 Name:Urza's Tower
 ManaCost:no cost
 Types:Land Urza's Tower
-A:AB$ Mana | Cost$ T | Produced$ C | Bonus$ UrzaLands | BonusProduced$ 2 | SpellDescription$ Add {C} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {C}{C}{C} to your mana pool instead.
+A:AB$ Mana | Cost$ T | Produced$ C | Bonus$ UrzaLands | BonusProduced$ 2 | SpellDescription$ Add {C}. If you control an Urza's Mine and an Urza's Power-Plant, add {C}{C}{C} instead.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_tower.jpg
-Oracle:{T}: Add {C} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {C}{C}{C} to your mana pool instead.
+Oracle:{T}: Add {C}. If you control an Urza's Mine and an Urza's Power-Plant, add {C}{C}{C} instead.
diff --git a/forge-gui/res/cardsfolder/u/utopia_mycon.txt b/forge-gui/res/cardsfolder/u/utopia_mycon.txt
index 02f8277930a..4d5a91c2454 100644
--- a/forge-gui/res/cardsfolder/u/utopia_mycon.txt
+++ b/forge-gui/res/cardsfolder/u/utopia_mycon.txt
@@ -5,6 +5,6 @@ PT:0/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a spore counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ SPORE | CounterNum$ 1 | SpellDescription$ Put a spore counter on CARDNAME.
 A:AB$ Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ g 1 1 saproling TSP | SpellDescription$ Create a 1/1 green Saproling creature token.
-A:AB$ Mana | Cost$ Sac<1/Saproling> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/Saproling> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/utopia_mycon.jpg
-Oracle:At the beginning of your upkeep, put a spore counter on Utopia Mycon.\nRemove three spore counters from Utopia Mycon: Create a 1/1 green Saproling creature token.\nSacrifice a Saproling: Add one mana of any color to your mana pool.
+Oracle:At the beginning of your upkeep, put a spore counter on Utopia Mycon.\nRemove three spore counters from Utopia Mycon: Create a 1/1 green Saproling creature token.\nSacrifice a Saproling: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/u/utopia_sprawl.txt b/forge-gui/res/cardsfolder/u/utopia_sprawl.txt
index 8dfb380b159..6623e82cfb1 100644
--- a/forge-gui/res/cardsfolder/u/utopia_sprawl.txt
+++ b/forge-gui/res/cardsfolder/u/utopia_sprawl.txt
@@ -5,8 +5,8 @@ K:Enchant Forest
 A:SP$ Attach | Cost$ G | ValidTgts$ Forest | TgtPrompt$ Select target Forest | AILogic$ Pump
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to his or her mana pool.
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted Forest is tapped for mana, its controller adds an additional one mana of the chosen color.
 SVar:TrigMana:DB$ Mana | Produced$ Chosen | Defined$ TriggeredCardController
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/utopia_sprawl.jpg
-Oracle:Enchant Forest\nAs Utopia Sprawl enters the battlefield, choose a color.\nWhenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to his or her mana pool (in addition to the mana the land produces).
+Oracle:Enchant Forest\nAs Utopia Sprawl enters the battlefield, choose a color.\nWhenever enchanted Forest is tapped for mana, its controller adds an additional one mana of the chosen color.
diff --git a/forge-gui/res/cardsfolder/u/utopia_tree.txt b/forge-gui/res/cardsfolder/u/utopia_tree.txt
index e559b92fbda..19f4bfc75d0 100644
--- a/forge-gui/res/cardsfolder/u/utopia_tree.txt
+++ b/forge-gui/res/cardsfolder/u/utopia_tree.txt
@@ -2,6 +2,6 @@ Name:Utopia Tree
 ManaCost:1 G
 Types:Creature Plant
 PT:0/2
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card84434.jpg
-Oracle:{T}: Add one mana of any color to your mana pool.
+Oracle:{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/u/utopia_vow.txt b/forge-gui/res/cardsfolder/u/utopia_vow.txt
index a2d0414c5bd..4f78b476db0 100644
--- a/forge-gui/res/cardsfolder/u/utopia_vow.txt
+++ b/forge-gui/res/cardsfolder/u/utopia_vow.txt
@@ -3,10 +3,10 @@ ManaCost:1 G
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. | AddAbility$ AnyMana | Description$ Enchanted creature can't attack or block. Enchanted creature has "{T}: Add one mana of any color to your mana pool."
-SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. | AddAbility$ AnyMana | Description$ Enchanted creature can't attack or block. Enchanted creature has "{T}: Add one mana of any color."
+SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:NonStackingAttachEffect:True
 #TODO: For AI, this acts as a curse spell to lock the opponent's creature while giving the opponent mana advantage (similar to Path to Exile). Could probably be improved to be used on own useless creatures instead when possible.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/utopia_vow.jpg
-Oracle:Enchant creature\nEnchanted creature can't attack or block.\nEnchanted creature has "{T}: Add one mana of any color to your mana pool."
+Oracle:Enchant creature\nEnchanted creature can't attack or block.\nEnchanted creature has "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/v/valakut_the_molten_pinnacle.txt b/forge-gui/res/cardsfolder/v/valakut_the_molten_pinnacle.txt
index 71e244ab3bd..c5d5e8fda0b 100644
--- a/forge-gui/res/cardsfolder/v/valakut_the_molten_pinnacle.txt
+++ b/forge-gui/res/cardsfolder/v/valakut_the_molten_pinnacle.txt
@@ -4,6 +4,6 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | ValidCard$ Mountain.YouCtrl | Origin$ Any | Destination$ Battlefield | OptionalDecider$ You | Execute$ TrigDamage | IsPresent$ Mountain.YouCtrl | PresentCompare$ GE6 | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Mountain enters the battlefield under your control, if you control at least five other Mountains, you may have CARDNAME deal 3 damage to target creature or player.
 SVar:TrigDamage:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | TgtPrompt$ Select target creature or player | NumDmg$ 3
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/valakut_the_molten_pinnacle.jpg
-Oracle:Valakut, the Molten Pinnacle enters the battlefield tapped.\nWhenever a Mountain enters the battlefield under your control, if you control at least five other Mountains, you may have Valakut, the Molten Pinnacle deal 3 damage to target creature or player.\n{T}: Add {R} to your mana pool.
+Oracle:Valakut, the Molten Pinnacle enters the battlefield tapped.\nWhenever a Mountain enters the battlefield under your control, if you control at least five other Mountains, you may have Valakut, the Molten Pinnacle deal 3 damage to target creature or player.\n{T}: Add {R}.
diff --git a/forge-gui/res/cardsfolder/v/valleymaker.txt b/forge-gui/res/cardsfolder/v/valleymaker.txt
index 1a19a8b4c47..200a04d4b43 100644
--- a/forge-gui/res/cardsfolder/v/valleymaker.txt
+++ b/forge-gui/res/cardsfolder/v/valleymaker.txt
@@ -3,8 +3,8 @@ ManaCost:5 RG
 Types:Creature Giant Shaman
 PT:5/5
 A:AB$ DealDamage | Cost$ T Sac<1/Mountain> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature.
-A:AB$ ChoosePlayer | Cost$ T Sac<1/Forest> | Defined$ You | SubAbility$ DBMana | SpellDescription$ Choose a player. That player adds {G}{G}{G} to his or her mana pool.
+A:AB$ ChoosePlayer | Cost$ T Sac<1/Forest> | Defined$ You | SubAbility$ DBMana | SpellDescription$ Choose a player. That player adds {G}{G}{G}.
 SVar:DBMana:DB$ Mana | Produced$ G | Amount$ 3 | Defined$ ChosenPlayer
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/valleymaker.jpg
-Oracle:{T}, Sacrifice a Mountain: Valleymaker deals 3 damage to target creature.\n{T}, Sacrifice a Forest: Choose a player. That player adds {G}{G}{G} to his or her mana pool.
+Oracle:{T}, Sacrifice a Mountain: Valleymaker deals 3 damage to target creature.\n{T}, Sacrifice a Forest: Choose a player. That player adds {G}{G}{G}.
diff --git a/forge-gui/res/cardsfolder/v/vances_blasting_cannons_spitfire_bastion.txt b/forge-gui/res/cardsfolder/v/vances_blasting_cannons_spitfire_bastion.txt
index 6c8f4307322..16740c6cf97 100644
--- a/forge-gui/res/cardsfolder/v/vances_blasting_cannons_spitfire_bastion.txt
+++ b/forge-gui/res/cardsfolder/v/vances_blasting_cannons_spitfire_bastion.txt
@@ -18,7 +18,7 @@ ALTERNATE
 Name:Spitfire Bastion
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ R | Amount$ 1 | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | Amount$ 1 | SpellDescription$ Add {R}.
 A:AB$ DealDamage | Cost$ 2 R T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spitfire_bastion.jpg
-Oracle:(Transforms from Vance's Blasting Cannons.)\n{T}: Add {R} to your mana pool.\n{2}{R}, {T}: Spitfire Bastion deals 3 damage to target creature or player.
+Oracle:(Transforms from Vance's Blasting Cannons.)\n{T}: Add {R}.\n{2}{R}, {T}: Spitfire Bastion deals 3 damage to target creature or player.
diff --git a/forge-gui/res/cardsfolder/v/vault_of_the_archangel.txt b/forge-gui/res/cardsfolder/v/vault_of_the_archangel.txt
index 3c232b4c2a5..79820232168 100644
--- a/forge-gui/res/cardsfolder/v/vault_of_the_archangel.txt
+++ b/forge-gui/res/cardsfolder/v/vault_of_the_archangel.txt
@@ -1,7 +1,7 @@
 Name:Vault of the Archangel
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ PumpAll | Cost$ 2 W B T | ValidCards$ Creature.YouCtrl | KW$ Deathtouch & Lifelink | SpellDescription$ Creatures you control gain deathtouch and lifelink until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vault_of_the_archangel.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}{W}{B}, {T}: Creatures you control gain deathtouch and lifelink until end of turn.
+Oracle:{T}: Add {C}.\n{2}{W}{B}, {T}: Creatures you control gain deathtouch and lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/v/vault_of_whispers.txt b/forge-gui/res/cardsfolder/v/vault_of_whispers.txt
index 5503bf9c9e3..6a0db5ce0f2 100644
--- a/forge-gui/res/cardsfolder/v/vault_of_whispers.txt
+++ b/forge-gui/res/cardsfolder/v/vault_of_whispers.txt
@@ -1,6 +1,6 @@
 Name:Vault of Whispers
 ManaCost:no cost
 Types:Artifact Land
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vault_of_whispers.jpg
-Oracle:{T}: Add {B} to your mana pool.
+Oracle:{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/v/vec_townships.txt b/forge-gui/res/cardsfolder/v/vec_townships.txt
index a200f6d371a..9ba7e2db842 100644
--- a/forge-gui/res/cardsfolder/v/vec_townships.txt
+++ b/forge-gui/res/cardsfolder/v/vec_townships.txt
@@ -1,9 +1,9 @@
 Name:Vec Townships
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} 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
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}. 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:Picture:http://magiccards.info/scans/en/br/93.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {G} or {W} to your mana pool. Vec Townships doesn't untap during your next untap step.
+Oracle:{T}: Add {C}.\n{T}: Add {G} or {W}. Vec Townships doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/v/vedalken_engineer.txt b/forge-gui/res/cardsfolder/v/vedalken_engineer.txt
index aada140a305..d6a2bd2ec12 100644
--- a/forge-gui/res/cardsfolder/v/vedalken_engineer.txt
+++ b/forge-gui/res/cardsfolder/v/vedalken_engineer.txt
@@ -2,6 +2,6 @@ Name:Vedalken Engineer
 ManaCost:1 U
 Types:Creature Vedalken Artificer
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | RestrictValid$ Card.Artifact,Activated.Artifact | SpellDescription$ Add two mana of any one color to your mana pool. Spend this mana only to cast artifact spells or activate abilities of artifacts.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | RestrictValid$ Card.Artifact,Activated.Artifact | SpellDescription$ Add two mana of any one color. Spend this mana only to cast artifact spells or activate abilities of artifacts.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vedalken_engineer.jpg
-Oracle:{T}: Add two mana of any one color to your mana pool. Spend this mana only to cast artifact spells or activate abilities of artifacts.
+Oracle:{T}: Add two mana of any one color. Spend this mana only to cast artifact spells or activate abilities of artifacts.
diff --git a/forge-gui/res/cardsfolder/v/veinfire_borderpost.txt b/forge-gui/res/cardsfolder/v/veinfire_borderpost.txt
index 5700c93292a..41666bcd323 100644
--- a/forge-gui/res/cardsfolder/v/veinfire_borderpost.txt
+++ b/forge-gui/res/cardsfolder/v/veinfire_borderpost.txt
@@ -2,8 +2,8 @@ Name:Veinfire Borderpost
 ManaCost:1 B R
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:AltCost:Cost$ 1 Return<1/Land.Basic> | Description$ You may pay {1} and return a basic land you control to its owner's hand rather than pay Veinfire Borderpost's mana cost.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/veinfire_borderpost.jpg
-Oracle:You may pay {1} and return a basic land you control to its owner's hand rather than pay Veinfire Borderpost's mana cost.\nVeinfire Borderpost enters the battlefield tapped.\n{T}: Add {B} or {R} to your mana pool.
+Oracle:You may pay {1} and return a basic land you control to its owner's hand rather than pay Veinfire Borderpost's mana cost.\nVeinfire Borderpost enters the battlefield tapped.\n{T}: Add {B} or {R}.
diff --git a/forge-gui/res/cardsfolder/v/veldt.txt b/forge-gui/res/cardsfolder/v/veldt.txt
index d67c82ca32d..047b2a63c00 100644
--- a/forge-gui/res/cardsfolder/v/veldt.txt
+++ b/forge-gui/res/cardsfolder/v/veldt.txt
@@ -2,10 +2,10 @@ Name:Veldt
 ManaCost:no cost
 Types:Land
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_DEPLETION | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ CARDNAME doesn't untap during your untap step if it has a depletion counter on it.
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {G} to your mana pool. Put a depletion counter on CARDNAME.
-A:AB$ Mana | Cost$ T | Produced$ W | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {W} to your mana pool. Put a depletion counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {G}. Put a depletion counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ W | Amount$ 1 | SubAbility$ AddCounter | SpellDescription$ Add {W}. Put a depletion counter on CARDNAME.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSubCounter | TriggerDescription$ At the beginning of your upkeep, remove a depletion counter from CARDNAME.
 SVar:TrigSubCounter:DB$RemoveCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 1
 SVar:AddCounter:DB$PutCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/veldt.jpg
-Oracle:Veldt doesn't untap during your untap step if it has a depletion counter on it.\nAt the beginning of your upkeep, remove a depletion counter from Veldt.\n{T}: Add {G} or {W} to your mana pool. Put a depletion counter on Veldt.
+Oracle:Veldt doesn't untap during your untap step if it has a depletion counter on it.\nAt the beginning of your upkeep, remove a depletion counter from Veldt.\n{T}: Add {G} or {W}. Put a depletion counter on Veldt.
diff --git a/forge-gui/res/cardsfolder/v/ventifact_bottle.txt b/forge-gui/res/cardsfolder/v/ventifact_bottle.txt
index 7350b7e3cfe..980b77fe19c 100644
--- a/forge-gui/res/cardsfolder/v/ventifact_bottle.txt
+++ b/forge-gui/res/cardsfolder/v/ventifact_bottle.txt
@@ -2,7 +2,7 @@ Name:Ventifact Bottle
 ManaCost:3
 Types:Artifact
 A:AB$ PutCounter | Cost$ X 1 T | CounterType$ CHARGE | CounterNum$ X | References$ X | SorcerySpeed$ True | SpellDescription$ Put X charge counters on Ventifact Bottle. Activate this ability only any time you could cast a sorcery.
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGetMana | CheckSVar$ Y | SVarCompare$ GE1 | TriggerDescription$ At the beginning of your precombat main phase, if CARDNAME has a charge counter on it, tap it and remove all charge counters from it. Add {C} to your mana pool for each charge counter removed this way.
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGetMana | CheckSVar$ Y | SVarCompare$ GE1 | TriggerDescription$ At the beginning of your precombat main phase, if CARDNAME has a charge counter on it, tap it and remove all charge counters from it. Add {C} for each charge counter removed this way.
 SVar:TrigGetMana:DB$ Mana | Produced$ C | Amount$ Y | SubAbility$ TrigRemove
 SVar:TrigRemove:DB$ RemoveCounter | CounterType$ CHARGE | CounterNum$ Y | References$ Y | SubAbility$ DBTap
 SVar:DBTap:DB$ Tap | Defined$ Self
@@ -10,4 +10,4 @@ SVar:X:Count$xPaid
 SVar:Y:Count$CardCounters.CHARGE
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ventifact_bottle.jpg
-Oracle:{X}{1}, {T}: Put X charge counters on Ventifact Bottle. Activate this ability only any time you could cast a sorcery.\nAt the beginning of your precombat main phase, if Ventifact Bottle has a charge counter on it, tap it and remove all charge counters from it. Add {C} to your mana pool for each charge counter removed this way.
+Oracle:{X}{1}, {T}: Put X charge counters on Ventifact Bottle. Activate this ability only any time you could cast a sorcery.\nAt the beginning of your precombat main phase, if Ventifact Bottle has a charge counter on it, tap it and remove all charge counters from it. Add {C} for each charge counter removed this way.
diff --git a/forge-gui/res/cardsfolder/v/verdant_eidolon.txt b/forge-gui/res/cardsfolder/v/verdant_eidolon.txt
index dad8a050496..672fa9ab612 100644
--- a/forge-gui/res/cardsfolder/v/verdant_eidolon.txt
+++ b/forge-gui/res/cardsfolder/v/verdant_eidolon.txt
@@ -2,9 +2,9 @@ Name:Verdant Eidolon
 ManaCost:3 G
 Types:Creature Spirit
 PT:2/2
-A:AB$ Mana | Cost$ G Sac<1/CARDNAME> | Produced$ Any | Amount$ 3 | SpellDescription$ Add three mana of any one color to your mana pool.
+A:AB$ Mana | Cost$ G Sac<1/CARDNAME> | Produced$ Any | Amount$ 3 | SpellDescription$ Add three mana of any one color.
 T:Mode$ SpellCast | ValidCard$ Card.MultiColor | ValidActivatingPlayer$ You | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a multicolored spell, you may return CARDNAME from your graveyard to your hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/verdant_eidolon.jpg
-Oracle:{G}, Sacrifice Verdant Eidolon: Add three mana of any one color to your mana pool.\nWhenever you cast a multicolored spell, you may return Verdant Eidolon from your graveyard to your hand.
+Oracle:{G}, Sacrifice Verdant Eidolon: Add three mana of any one color.\nWhenever you cast a multicolored spell, you may return Verdant Eidolon from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/v/verdant_haven.txt b/forge-gui/res/cardsfolder/v/verdant_haven.txt
index 89985ad1d50..92e17c67d4e 100644
--- a/forge-gui/res/cardsfolder/v/verdant_haven.txt
+++ b/forge-gui/res/cardsfolder/v/verdant_haven.txt
@@ -5,8 +5,8 @@ K:Enchant land
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 2 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 2
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.
 SVar:TrigMana:DB$Mana | Produced$ Any | Amount$ 1 | Defined$ TriggeredCardController
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/verdant_haven.jpg
-Oracle:Enchant land\nWhen Verdant Haven enters the battlefield, you gain 2 life.\nWhenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool (in addition to the mana the land produces).
+Oracle:Enchant land\nWhen Verdant Haven enters the battlefield, you gain 2 life.\nWhenever enchanted land is tapped for mana, its controller adds an additional one mana of any color.
diff --git a/forge-gui/res/cardsfolder/v/vernal_bloom.txt b/forge-gui/res/cardsfolder/v/vernal_bloom.txt
index c313e7ddfc8..576f71dc85b 100644
--- a/forge-gui/res/cardsfolder/v/vernal_bloom.txt
+++ b/forge-gui/res/cardsfolder/v/vernal_bloom.txt
@@ -1,8 +1,8 @@
 Name:Vernal Bloom
 ManaCost:3 G
 Types:Enchantment
-T:Mode$ TapsForMana | ValidCard$ Forest | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a Forest is tapped for mana, its controller adds {G} to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Forest | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a Forest is tapped for mana, its controller adds an additional {G}.
 SVar:TrigMana:DB$ Mana | Produced$ G | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vernal_bloom.jpg
-Oracle:Whenever a Forest is tapped for mana, its controller adds {G} to his or her mana pool (in addition to the mana the land produces).
+Oracle:Whenever a Forest is tapped for mana, its controller adds an additional {G}.
diff --git a/forge-gui/res/cardsfolder/v/vesper_ghoul.txt b/forge-gui/res/cardsfolder/v/vesper_ghoul.txt
index c54dd52905e..b02fb749438 100644
--- a/forge-gui/res/cardsfolder/v/vesper_ghoul.txt
+++ b/forge-gui/res/cardsfolder/v/vesper_ghoul.txt
@@ -2,6 +2,6 @@ Name:Vesper Ghoul
 ManaCost:2 B
 Types:Creature Zombie Druid
 PT:1/1
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vesper_ghoul.jpg
-Oracle:{T}, Pay 1 life: Add one mana of any color to your mana pool.
+Oracle:{T}, Pay 1 life: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/v/vessel_of_endless_rest.txt b/forge-gui/res/cardsfolder/v/vessel_of_endless_rest.txt
index c0d3f7a0e6f..bce1d9adaf0 100644
--- a/forge-gui/res/cardsfolder/v/vessel_of_endless_rest.txt
+++ b/forge-gui/res/cardsfolder/v/vessel_of_endless_rest.txt
@@ -3,6 +3,6 @@ ManaCost:3
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ Disinter | TriggerDescription$ When CARDNAME enters the battlefield, put target card in a graveyard on the bottom of its owner's library.
 SVar:Disinter:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | ValidTgts$ Card | TgtPrompt$ Select target card from a graveyard | LibraryPosition$ -1
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vessel_of_endless_rest.jpg
-Oracle:When Vessel of Endless Rest enters the battlefield, put target card from a graveyard on the bottom of its owner's library.\n{T}: Add one mana of any color to your mana pool.
+Oracle:When Vessel of Endless Rest enters the battlefield, put target card from a graveyard on the bottom of its owner's library.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/v/vessel_of_volatility.txt b/forge-gui/res/cardsfolder/v/vessel_of_volatility.txt
index e41f09dada9..91f9c56647d 100644
--- a/forge-gui/res/cardsfolder/v/vessel_of_volatility.txt
+++ b/forge-gui/res/cardsfolder/v/vessel_of_volatility.txt
@@ -1,6 +1,6 @@
 Name:Vessel of Volatility
 ManaCost:1 R
 Types:Enchantment
-A:AB$ Mana | Cost$ 1 R Sac<1/CARDNAME> | Produced$ R | Amount$ 4 |SpellDescription$ Add {R}{R}{R}{R} to your mana pool.
+A:AB$ Mana | Cost$ 1 R Sac<1/CARDNAME> | Produced$ R | Amount$ 4 |SpellDescription$ Add {R}{R}{R}{R}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vessel_of_volatility.jpg
-Oracle:{1}{R}, Sacrifice Vessel of Volatility: Add {R}{R}{R}{R} to your mana pool.
+Oracle:{1}{R}, Sacrifice Vessel of Volatility: Add {R}{R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/v/vile_redeemer.txt b/forge-gui/res/cardsfolder/v/vile_redeemer.txt
index b0c9f3b99ce..e3183e479a2 100644
--- a/forge-gui/res/cardsfolder/v/vile_redeemer.txt
+++ b/forge-gui/res/cardsfolder/v/vile_redeemer.txt
@@ -4,11 +4,11 @@ Types:Creature Eldrazi
 PT:3/3
 K:Devoid
 K:Flash
-T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When you cast CARDNAME, you may pay {C}. If you do, create a 1/1 colorless Eldrazi Scion creature token for each nontoken creature that died under your control this turn. Those tokens have "Sacrifice this creature: Add {C} to your mana pool."
+T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When you cast CARDNAME, you may pay {C}. If you do, create a 1/1 colorless Eldrazi Scion creature token for each nontoken creature that died under your control this turn. Those tokens have "Sacrifice this creature: Add {C}."
 SVar:TrigToken:AB$ Token | Cost$ C | TokenAmount$ X | References$ X | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.nonToken+YouCtrl
 DeckHints:Ability$Mana.Colorless
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vile_redeemer.jpg
-Oracle:Devoid (This card has no color.)\nFlash\nWhen you cast Vile Redeemer, you may pay {C}. If you do, create a 1/1 colorless Eldrazi Scion creature token for each nontoken creature that died under your control this turn. Those tokens have "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Devoid (This card has no color.)\nFlash\nWhen you cast Vile Redeemer, you may pay {C}. If you do, create a 1/1 colorless Eldrazi Scion creature token for each nontoken creature that died under your control this turn. Those tokens have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/v/vine_trellis.txt b/forge-gui/res/cardsfolder/v/vine_trellis.txt
index b4269cc73b9..9bdf317508b 100644
--- a/forge-gui/res/cardsfolder/v/vine_trellis.txt
+++ b/forge-gui/res/cardsfolder/v/vine_trellis.txt
@@ -3,6 +3,6 @@ ManaCost:1 G
 Types:Creature Plant Wall
 PT:0/4
 K:Defender
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://resources.wizards.com/magic/cards/mm/en-us/card19624.jpg
-Oracle:Defender\n{T}: Add {G} to your mana pool.
+Oracle:Defender\n{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/v/viridian_acolyte.txt b/forge-gui/res/cardsfolder/v/viridian_acolyte.txt
index 1520cf28746..0c87796fe76 100644
--- a/forge-gui/res/cardsfolder/v/viridian_acolyte.txt
+++ b/forge-gui/res/cardsfolder/v/viridian_acolyte.txt
@@ -2,7 +2,7 @@ Name:Viridian Acolyte
 ManaCost:G
 Types:Creature Elf Shaman
 PT:1/1
-A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/viridian_acolyte.jpg
-Oracle:{1}, {T}: Add one mana of any color to your mana pool.
+Oracle:{1}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/v/viridian_joiner.txt b/forge-gui/res/cardsfolder/v/viridian_joiner.txt
index ba6ca912c82..7552d5a6419 100644
--- a/forge-gui/res/cardsfolder/v/viridian_joiner.txt
+++ b/forge-gui/res/cardsfolder/v/viridian_joiner.txt
@@ -2,8 +2,8 @@ Name:Viridian Joiner
 ManaCost:2 G
 Types:Creature Elf Druid
 PT:1/2
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add to your mana pool an amount of {G} equal to CARDNAME's power.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add an amount of {G} equal to CARDNAME's power.
 SVar:X:Count$CardPower
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/viridian_joiner.jpg
-Oracle:{T}: Add to your mana pool an amount of {G} equal to Viridian Joiner's power.
+Oracle:{T}: Add an amount of {G} equal to Viridian Joiner's power.
diff --git a/forge-gui/res/cardsfolder/v/visage_of_bolas.txt b/forge-gui/res/cardsfolder/v/visage_of_bolas.txt
index 03d749dfd7d..e7b93034995 100644
--- a/forge-gui/res/cardsfolder/v/visage_of_bolas.txt
+++ b/forge-gui/res/cardsfolder/v/visage_of_bolas.txt
@@ -3,9 +3,9 @@ ManaCost:4
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library and/or graveyard for a card named Nicol Bolas, the Deceiver, reveal it, and put it into your hand. If you search your library this way, shuffle it.
 SVar:TrigSearch:DB$ ChangeZone | Origin$ Library,Graveyard | Destination$ Hand | ChangeType$ Card.namedNicol Bolas; the Deceiver | ChangeNum$ 1 | Optional$ True
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 DeckHints:Name$Nicol Bolas, the Deceiver
 SVar:Picture:http://www.wizards.com/global/images/magic/general/visage_of_bolas.jpg
-Oracle:When Visage of Bolas enters the battlefield, you may search your library and/or graveyard for a card named Nicol Bolas, the Deceiver, reveal it, and put it into your hand. If you search your library this way, shuffle it.\n{T}: Add {U}, {B}, or {R} to your mana pool.
\ No newline at end of file
+Oracle:When Visage of Bolas enters the battlefield, you may search your library and/or graveyard for a card named Nicol Bolas, the Deceiver, reveal it, and put it into your hand. If you search your library this way, shuffle it.\n{T}: Add {U}, {B}, or {R}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/v/vitu_ghazi_the_city_tree.txt b/forge-gui/res/cardsfolder/v/vitu_ghazi_the_city_tree.txt
index 7bc4e3a709a..0d5971b31d0 100644
--- a/forge-gui/res/cardsfolder/v/vitu_ghazi_the_city_tree.txt
+++ b/forge-gui/res/cardsfolder/v/vitu_ghazi_the_city_tree.txt
@@ -1,8 +1,8 @@
 Name:Vitu-Ghazi, the City-Tree
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Token | Cost$ 2 G W T | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ g 1 1 saproling RAV | SpellDescription$ Create a 1/1 green Saproling creature token.
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vitu_ghazi_the_city_tree.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}{G}{W}, {T}: Create a 1/1 green Saproling creature token.
+Oracle:{T}: Add {C}.\n{2}{G}{W}, {T}: Create a 1/1 green Saproling creature token.
diff --git a/forge-gui/res/cardsfolder/v/vivid_crag.txt b/forge-gui/res/cardsfolder/v/vivid_crag.txt
index 867a356b6fc..85c838380ff 100644
--- a/forge-gui/res/cardsfolder/v/vivid_crag.txt
+++ b/forge-gui/res/cardsfolder/v/vivid_crag.txt
@@ -4,8 +4,8 @@ Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two charge counters on it.
 SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vivid_crag.jpg
-Oracle:Vivid Crag enters the battlefield tapped with two charge counters on it.\n{T}: Add {R} to your mana pool.\n{T}, Remove a charge counter from Vivid Crag: Add one mana of any color to your mana pool.
+Oracle:Vivid Crag enters the battlefield tapped with two charge counters on it.\n{T}: Add {R}.\n{T}, Remove a charge counter from Vivid Crag: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/v/vivid_creek.txt b/forge-gui/res/cardsfolder/v/vivid_creek.txt
index ea9f8967e83..47816e57b29 100644
--- a/forge-gui/res/cardsfolder/v/vivid_creek.txt
+++ b/forge-gui/res/cardsfolder/v/vivid_creek.txt
@@ -4,8 +4,8 @@ Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two charge counters on it.
 SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vivid_creek.jpg
-Oracle:Vivid Creek enters the battlefield tapped with two charge counters on it.\n{T}: Add {U} to your mana pool.\n{T}, Remove a charge counter from Vivid Creek: Add one mana of any color to your mana pool.
+Oracle:Vivid Creek enters the battlefield tapped with two charge counters on it.\n{T}: Add {U}.\n{T}, Remove a charge counter from Vivid Creek: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/v/vivid_grove.txt b/forge-gui/res/cardsfolder/v/vivid_grove.txt
index e3dca4c7c47..4eb70f11e0e 100644
--- a/forge-gui/res/cardsfolder/v/vivid_grove.txt
+++ b/forge-gui/res/cardsfolder/v/vivid_grove.txt
@@ -4,8 +4,8 @@ Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two charge counters on it.
 SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vivid_grove.jpg
-Oracle:Vivid Grove enters the battlefield tapped with two charge counters on it.\n{T}: Add {G} to your mana pool.\n{T}, Remove a charge counter from Vivid Grove: Add one mana of any color to your mana pool.
+Oracle:Vivid Grove enters the battlefield tapped with two charge counters on it.\n{T}: Add {G}.\n{T}, Remove a charge counter from Vivid Grove: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/v/vivid_marsh.txt b/forge-gui/res/cardsfolder/v/vivid_marsh.txt
index ce2aef561d0..de018bb4a4d 100644
--- a/forge-gui/res/cardsfolder/v/vivid_marsh.txt
+++ b/forge-gui/res/cardsfolder/v/vivid_marsh.txt
@@ -5,8 +5,8 @@ K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two charge counters on it.
 SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
-A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vivid_marsh.jpg
-Oracle:Vivid Marsh enters the battlefield tapped with two charge counters on it.\n{T}: Add {B} to your mana pool.\n{T}, Remove a charge counter from Vivid Marsh: Add one mana of any color to your mana pool.
+Oracle:Vivid Marsh enters the battlefield tapped with two charge counters on it.\n{T}: Add {B}.\n{T}, Remove a charge counter from Vivid Marsh: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/v/vivid_meadow.txt b/forge-gui/res/cardsfolder/v/vivid_meadow.txt
index d09702b4fb1..178c30a4acf 100644
--- a/forge-gui/res/cardsfolder/v/vivid_meadow.txt
+++ b/forge-gui/res/cardsfolder/v/vivid_meadow.txt
@@ -4,8 +4,8 @@ Types:Land
 K:ETBReplacement:Other:LandTapped
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter | SpellDescription$ CARDNAME enters the battlefield tapped with two charge counters on it.
 SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ CHARGE | CounterNum$ 2 
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T SubCounter<1/CHARGE> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vivid_meadow.jpg
-Oracle:Vivid Meadow enters the battlefield tapped with two charge counters on it.\n{T}: Add {W} to your mana pool.\n{T}, Remove a charge counter from Vivid Meadow: Add one mana of any color to your mana pool.
+Oracle:Vivid Meadow enters the battlefield tapped with two charge counters on it.\n{T}: Add {W}.\n{T}, Remove a charge counter from Vivid Meadow: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/v/void_attendant.txt b/forge-gui/res/cardsfolder/v/void_attendant.txt
index dfe3fdd5ea4..89678376faf 100644
--- a/forge-gui/res/cardsfolder/v/void_attendant.txt
+++ b/forge-gui/res/cardsfolder/v/void_attendant.txt
@@ -3,9 +3,9 @@ ManaCost:2 G
 Types:Creature Eldrazi Processor
 PT:2/3
 K:Devoid
-A:AB$ Token | Cost$ 1 G ExiledMoveToGrave<1/Card.OppOwn/card an opponent owns> | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | SpellDescription$ Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Token | Cost$ 1 G ExiledMoveToGrave<1/Card.OppOwn/card an opponent owns> | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAbilities$ ABMana | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | SpellDescription$ Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckHints:Keyword$Ingest & Type$Eldrazi
 DeckHas:Ability$Mana.Colorless & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/void_attendant.jpg
-Oracle:Devoid (This card has no color.)\n{1}{G}, Put a card an opponent owns from exile into that player's graveyard: Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+Oracle:Devoid (This card has no color.)\n{1}{G}, Put a card an opponent owns from exile into that player's graveyard: Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/v/volcanic_island.txt b/forge-gui/res/cardsfolder/v/volcanic_island.txt
index cf8f17e9d87..f887cf24941 100644
--- a/forge-gui/res/cardsfolder/v/volcanic_island.txt
+++ b/forge-gui/res/cardsfolder/v/volcanic_island.txt
@@ -2,4 +2,4 @@ Name:Volcanic Island
 ManaCost:no cost
 Types:Land Island Mountain
 SVar:Picture:http://www.wizards.com/global/images/magic/general/volcanic_island.jpg
-Oracle:({T}: Add {U} or {R} to your mana pool.)
+Oracle:({T}: Add {U} or {R}.)
diff --git a/forge-gui/res/cardsfolder/v/volraths_stronghold.txt b/forge-gui/res/cardsfolder/v/volraths_stronghold.txt
index 52d3a24965d..b031f61b2ee 100644
--- a/forge-gui/res/cardsfolder/v/volraths_stronghold.txt
+++ b/forge-gui/res/cardsfolder/v/volraths_stronghold.txt
@@ -1,8 +1,8 @@
 Name:Volrath's Stronghold
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 1 B T | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Library | SpellDescription$ Put target creature card from your graveyard on top of your library.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/volraths_stronghold.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}{B}, {T}: Put target creature card from your graveyard on top of your library.
+Oracle:{T}: Add {C}.\n{1}{B}, {T}: Put target creature card from your graveyard on top of your library.
diff --git a/forge-gui/res/cardsfolder/v/vorinclex_voice_of_hunger.txt b/forge-gui/res/cardsfolder/v/vorinclex_voice_of_hunger.txt
index 44ac468332c..84b4c117901 100644
--- a/forge-gui/res/cardsfolder/v/vorinclex_voice_of_hunger.txt
+++ b/forge-gui/res/cardsfolder/v/vorinclex_voice_of_hunger.txt
@@ -3,9 +3,9 @@ ManaCost:6 G G
 Types:Legendary Creature Praetor
 PT:7/6
 K:Trample
-T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana of any type that land produced.
 SVar:TrigMana:DB$ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ You
 T:Mode$ TapsForMana | ValidCard$ Land.OppCtrl | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent taps a land for mana, that land doesn't untap during its controller's next untap step.
 SVar:TrigPump:DB$Pump | Defined$ TriggeredCard | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vorinclex_voice_of_hunger.jpg
-Oracle:Trample\nWhenever you tap a land for mana, add one mana to your mana pool of any type that land produced.\nWhenever an opponent taps a land for mana, that land doesn't untap during its controller's next untap step.
+Oracle:Trample\nWhenever you tap a land for mana, add one mana of any type that land produced.\nWhenever an opponent taps a land for mana, that land doesn't untap during its controller's next untap step.
diff --git a/forge-gui/res/cardsfolder/v/vraska_relic_seeker.txt b/forge-gui/res/cardsfolder/v/vraska_relic_seeker.txt
index c83cada228a..f312d508a51 100644
--- a/forge-gui/res/cardsfolder/v/vraska_relic_seeker.txt
+++ b/forge-gui/res/cardsfolder/v/vraska_relic_seeker.txt
@@ -3,10 +3,10 @@ ManaCost:4 B G
 Types:Legendary Planeswalker Vraska
 Loyalty:6
 A:AB$ Token | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenName$ Pirate | TokenTypes$ Creature,Pirate | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Menace | SpellDescription$ Create a 2/2 black Pirate creature token with menace.
-A:AB$ Destroy | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Artifact,Creature,Enchantment | TgtPrompt$ Select target artifact, creature, or enchantment | AILogic$ MinLoyalty.4 | SubAbility$ DBTreasure | SpellDescription$ Destroy target artifact, creature, or enchantment. Create a colorless treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+A:AB$ Destroy | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Artifact,Creature,Enchantment | TgtPrompt$ Select target artifact, creature, or enchantment | AILogic$ MinLoyalty.4 | SubAbility$ DBTreasure | SpellDescription$ Destroy target artifact, creature, or enchantment. Create a colorless treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:DBTreasure:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAbilities$ ABTreasureMana | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4
-SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABTreasureMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
 A:AB$ SetLife | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 1 | SpellDescription$ Target player's life total becomes 1.
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vraska_relic_seeker.jpg
-Oracle:[+2]: Create a 2/2 black Pirate creature token with menace.\n[-3]: Destroy target artifact, creature, or enchantment. Create a colorless treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."\n[-10]: Target player's life total becomes 1.
+Oracle:[+2]: Create a 2/2 black Pirate creature token with menace.\n[-3]: Destroy target artifact, creature, or enchantment. Create a colorless treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."\n[-10]: Target player's life total becomes 1.
diff --git a/forge-gui/res/cardsfolder/w/wall_of_roots.txt b/forge-gui/res/cardsfolder/w/wall_of_roots.txt
index 1a0257562f1..8a05cd42372 100644
--- a/forge-gui/res/cardsfolder/w/wall_of_roots.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_roots.txt
@@ -3,6 +3,6 @@ ManaCost:1 G
 Types:Creature Plant Wall
 PT:0/5
 K:Defender
-A:AB$ Mana | Cost$ AddCounter<1/M0M1> | Produced$ G | ActivationLimit$ 1 | SpellDescription$ Add {G} to your mana pool. Activate this ability only once each turn.
+A:AB$ Mana | Cost$ AddCounter<1/M0M1> | Produced$ G | ActivationLimit$ 1 | SpellDescription$ Add {G}. Activate this ability only once each turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_roots.jpg
-Oracle:Defender\nPut a -0/-1 counter on Wall of Roots: Add {G} to your mana pool. Activate this ability only once each turn.
+Oracle:Defender\nPut a -0/-1 counter on Wall of Roots: Add {G}. Activate this ability only once each turn.
diff --git a/forge-gui/res/cardsfolder/w/wandering_fumarole.txt b/forge-gui/res/cardsfolder/w/wandering_fumarole.txt
index a84a1d059df..135c9790935 100644
--- a/forge-gui/res/cardsfolder/w/wandering_fumarole.txt
+++ b/forge-gui/res/cardsfolder/w/wandering_fumarole.txt
@@ -2,9 +2,9 @@ Name:Wandering Fumarole
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Animate | Cost$ 2 U R | Defined$ Self | Power$ 1 | Toughness$ 4 | Types$ Creature,Elemental | Colors$ Blue,Red | Abilities$ ABPump | SpellDescription$ Until end of turn, CARDNAME becomes a 1/4 blue and red Elemental creature with "{0}: Switch this creature's power and toughness until end of turn." It's still a land.
 SVar:ABPump:AB$ Pump | Cost$ 0 | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch this creature's power and toughness until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wandering_fumarole.jpg
-Oracle:Wandering Fumarole enters the battlefield tapped.\n{T}: Add {U} or {R} to your mana pool.\n{2}{U}{R}: Until end of turn, Wandering Fumarole becomes a 1/4 blue and red Elemental creature with "{0}: Switch this creature's power and toughness until end of turn." It's still a land.
+Oracle:Wandering Fumarole enters the battlefield tapped.\n{T}: Add {U} or {R}.\n{2}{U}{R}: Until end of turn, Wandering Fumarole becomes a 1/4 blue and red Elemental creature with "{0}: Switch this creature's power and toughness until end of turn." It's still a land.
diff --git a/forge-gui/res/cardsfolder/w/wanderwine_hub.txt b/forge-gui/res/cardsfolder/w/wanderwine_hub.txt
index 56d22807c25..ef311c34dc0 100644
--- a/forge-gui/res/cardsfolder/w/wanderwine_hub.txt
+++ b/forge-gui/res/cardsfolder/w/wanderwine_hub.txt
@@ -1,9 +1,9 @@
 Name:Wanderwine Hub
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Merfolk> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Merfolk card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wanderwine_hub.jpg
-Oracle:As Wanderwine Hub enters the battlefield, you may reveal a Merfolk card from your hand. If you don't, Wanderwine Hub enters the battlefield tapped.\n{T}: Add {W} or {U} to your mana pool.
+Oracle:As Wanderwine Hub enters the battlefield, you may reveal a Merfolk card from your hand. If you don't, Wanderwine Hub enters the battlefield tapped.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/w/wanted_scoundrels.txt b/forge-gui/res/cardsfolder/w/wanted_scoundrels.txt
index 488fb59ffc8..ca90b4117bc 100644
--- a/forge-gui/res/cardsfolder/w/wanted_scoundrels.txt
+++ b/forge-gui/res/cardsfolder/w/wanted_scoundrels.txt
@@ -2,8 +2,8 @@ Name:Wanted Scoundrels
 ManaCost:1 B
 Types:Creature Human Pirate
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, target opponent creates two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, target opponent creates two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:TrigToken:DB$ Token | ValidTgts$ Opponent | TokenAmount$ 2 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ Targeted | TokenColors$ Colorless | TokenImage$ c treasure | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | TokenAbilities$ ABMana | References$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sanctum_seeker.jpg
-Oracle:When Wanted Scoundrels dies, target opponent creates two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:When Wanted Scoundrels dies, target opponent creates two colorless Treasure artifact tokens with "{T}, Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/w/warden_of_geometries.txt b/forge-gui/res/cardsfolder/w/warden_of_geometries.txt
index aff91cda320..d1122febb1a 100644
--- a/forge-gui/res/cardsfolder/w/warden_of_geometries.txt
+++ b/forge-gui/res/cardsfolder/w/warden_of_geometries.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Creature Eldrazi Drone
 PT:2/3
 K:Vigilance
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool. ({C} represents colorless mana.)
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}. ({C} represents colorless mana.)
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warden_of_geometries.jpg
-Oracle:Vigilance\n{T}: Add {C} to your mana pool. ({C} represents colorless mana.)
+Oracle:Vigilance\n{T}: Add {C}. ({C} represents colorless mana.)
diff --git a/forge-gui/res/cardsfolder/w/warden_of_the_wall.txt b/forge-gui/res/cardsfolder/w/warden_of_the_wall.txt
index ab27f160499..c5943d0dea7 100644
--- a/forge-gui/res/cardsfolder/w/warden_of_the_wall.txt
+++ b/forge-gui/res/cardsfolder/w/warden_of_the_wall.txt
@@ -2,7 +2,7 @@ Name:Warden of the Wall
 ManaCost:3
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 S:Mode$ Continuous | Affected$ Card.Self | Condition$ NotPlayerTurn | EffectZone$ Battlefield | SetPower$ 2 | SetToughness$ 3 | AddType$ Creature & Gargoyle | AddKeyword$ Flying | Description$ As long as it's not your turn, CARDNAME is a 2/3 Gargoyle artifact creature with flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warden_of_the_wall.jpg
-Oracle:Warden of the Wall enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\nAs long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying.
+Oracle:Warden of the Wall enters the battlefield tapped.\n{T}: Add {C}.\nAs long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying.
diff --git a/forge-gui/res/cardsfolder/w/warped_landscape.txt b/forge-gui/res/cardsfolder/w/warped_landscape.txt
index cb01bb38ebe..599d8ea1dee 100644
--- a/forge-gui/res/cardsfolder/w/warped_landscape.txt
+++ b/forge-gui/res/cardsfolder/w/warped_landscape.txt
@@ -1,7 +1,7 @@
 Name:Warped Landscape
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warped_landscape.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}, Sacrifice Warped Landscape: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library.
\ No newline at end of file
+Oracle:{T}: Add {C}.\n{2}, {T}, Sacrifice Warped Landscape: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/w/warping_wail.txt b/forge-gui/res/cardsfolder/w/warping_wail.txt
index 14971fb3fe6..53a77c6138b 100644
--- a/forge-gui/res/cardsfolder/w/warping_wail.txt
+++ b/forge-gui/res/cardsfolder/w/warping_wail.txt
@@ -4,9 +4,9 @@ Types:Instant
 A:SP$ Charm | Cost$ 1 C | Choices$ DBExile,DBCounter,DBToken
 SVar:DBExile:DB$ ChangeZone | ValidTgts$ Creature.powerLE1,Creature.toughnessLE1 | TgtPrompt$ Choose target creature with power or toughness 1 or less | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature with power or toughness 1 or less.
 SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card.Sorcery | TgtPrompt$ Counter target sorcery spell | SpellDescription$ Counter target sorcery spell.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana | SpellDescription$ Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C} to your mana pool.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Eldrazi Scion | TokenTypes$ Creature,Eldrazi,Scion | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenAltImages$ c_1_1_eldrazi_scion2,c_1_1_eldrazi_scion3,c_1_1_eldrazi_scion4,c_1_1_eldrazi_scion5,c_1_1_eldrazi_scion6 | TokenAbilities$ ABMana | SpellDescription$ Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ C | Amount$ 1 | SpellDescription$ Add {C}.
 DeckNeeds:Ability$Mana.Colorless
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warping_wail.jpg
-Oracle:({C} represents colorless mana)\nChoose one —\n• Exile target creature with power or toughness 1 or less.\n• Counter target sorcery spell.\n• Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
\ No newline at end of file
+Oracle:({C} represents colorless mana)\nChoose one —\n• Exile target creature with power or toughness 1 or less.\n• Counter target sorcery spell.\n• Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/w/waste_not.txt b/forge-gui/res/cardsfolder/w/waste_not.txt
index 231b71af012..53bd13e5616 100644
--- a/forge-gui/res/cardsfolder/w/waste_not.txt
+++ b/forge-gui/res/cardsfolder/w/waste_not.txt
@@ -3,10 +3,10 @@ ManaCost:1 B
 Types:Enchantment
 T:Mode$ Discarded | ValidCard$ Creature.OppOwn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent discards a creature card, create a 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie M15 | 
-T:Mode$ Discarded | ValidCard$ Land.OppOwn | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever an opponent discards a land card, add {B}{B} to your mana pool.
+T:Mode$ Discarded | ValidCard$ Land.OppOwn | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever an opponent discards a land card, add {B}{B}.
 SVar:TrigMana:DB$ Mana | Produced$ B | Amount$ 2 | Defined$ You
 T:Mode$ Discarded | ValidCard$ Card.nonLand+nonCreature+OppOwn | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent discards a noncreature, nonland card, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waste_not.jpg
-Oracle:Whenever an opponent discards a creature card, create a 2/2 black Zombie creature token.\nWhenever an opponent discards a land card, add {B}{B} to your mana pool.\nWhenever an opponent discards a noncreature, nonland card, draw a card.
+Oracle:Whenever an opponent discards a creature card, create a 2/2 black Zombie creature token.\nWhenever an opponent discards a land card, add {B}{B}.\nWhenever an opponent discards a noncreature, nonland card, draw a card.
diff --git a/forge-gui/res/cardsfolder/w/wasteland.txt b/forge-gui/res/cardsfolder/w/wasteland.txt
index b5b4b5a5fd1..dc7d11d447d 100644
--- a/forge-gui/res/cardsfolder/w/wasteland.txt
+++ b/forge-gui/res/cardsfolder/w/wasteland.txt
@@ -1,7 +1,7 @@
 Name:Wasteland
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land. | Cost$ T Sac<1/CARDNAME> | AILogic$ LandForLand | SpellDescription$ Destroy target nonbasic land.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wasteland.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}, Sacrifice Wasteland: Destroy target nonbasic land.
+Oracle:{T}: Add {C}.\n{T}, Sacrifice Wasteland: Destroy target nonbasic land.
diff --git a/forge-gui/res/cardsfolder/w/wastes.txt b/forge-gui/res/cardsfolder/w/wastes.txt
index 6d898c2e81c..17b11df8697 100644
--- a/forge-gui/res/cardsfolder/w/wastes.txt
+++ b/forge-gui/res/cardsfolder/w/wastes.txt
@@ -1,7 +1,7 @@
 Name:Wastes
 ManaCost:no cost
 Types:Basic Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wastes.jpg
-Oracle:{T}: Add {C} to your mana pool.
+Oracle:{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/w/waterveil_cavern.txt b/forge-gui/res/cardsfolder/w/waterveil_cavern.txt
index 1aeca7b5ea8..06b6f77dfa0 100644
--- a/forge-gui/res/cardsfolder/w/waterveil_cavern.txt
+++ b/forge-gui/res/cardsfolder/w/waterveil_cavern.txt
@@ -1,9 +1,9 @@
 Name:Waterveil Cavern
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBStayTapped | SpellDescription$ Add {U} to your mana pool. CARDNAME doesn't untap during your next untap step.
-A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBStayTapped | SpellDescription$ Add {B} to your mana pool. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBStayTapped | SpellDescription$ Add {U}. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBStayTapped | SpellDescription$ Add {B}. CARDNAME doesn't untap during your next untap step.
 SVar:DBStayTapped:DB$ Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waterveil_cavern.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {U} or {B} to your mana pool. Waterveil Cavern doesn't untap during your next untap step.
+Oracle:{T}: Add {C}.\n{T}: Add {U} or {B}. Waterveil Cavern doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/w/watery_grave.txt b/forge-gui/res/cardsfolder/w/watery_grave.txt
index da9b9b44012..7542b0df89c 100644
--- a/forge-gui/res/cardsfolder/w/watery_grave.txt
+++ b/forge-gui/res/cardsfolder/w/watery_grave.txt
@@ -4,4 +4,4 @@ Types:Land Island Swamp
 K:ETBReplacement:Other:DBTap
 SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | UnlessAI$ Shockland | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
 SVar:Picture:http://resources.wizards.com/magic/cards/rav/en-us/card83731.jpg
-Oracle:({T}: Add {U} or {B} to your mana pool.)\nAs Watery Grave enters the battlefield, you may pay 2 life. If you don't, Watery Grave enters the battlefield tapped.
+Oracle:({T}: Add {U} or {B}.)\nAs Watery Grave enters the battlefield, you may pay 2 life. If you don't, Watery Grave enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/w/weatherseed_totem.txt b/forge-gui/res/cardsfolder/w/weatherseed_totem.txt
index 21735c3b263..775d25010d4 100644
--- a/forge-gui/res/cardsfolder/w/weatherseed_totem.txt
+++ b/forge-gui/res/cardsfolder/w/weatherseed_totem.txt
@@ -1,9 +1,9 @@
 Name:Weatherseed Totem
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Animate | Cost$ 2 G G G | Defined$ Self | Power$ 5 | Toughness$ 3 | Types$ Creature,Artifact,Treefolk | Colors$ Green | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 5/3 green Treefolk artifact creature with trample until end of turn.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | TriggerController$ TriggeredCardController | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, if it was a creature, return this card to its owner's hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ TriggeredCard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/weatherseed_totem.jpg
-Oracle:{T}: Add {G} to your mana pool.\n{2}{G}{G}{G}: Weatherseed Totem becomes a 5/3 green Treefolk artifact creature with trample until end of turn.\nWhen Weatherseed Totem is put into a graveyard from the battlefield, if it was a creature, return this card to its owner's hand.
+Oracle:{T}: Add {G}.\n{2}{G}{G}{G}: Weatherseed Totem becomes a 5/3 green Treefolk artifact creature with trample until end of turn.\nWhen Weatherseed Totem is put into a graveyard from the battlefield, if it was a creature, return this card to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/w/weaver_of_currents.txt b/forge-gui/res/cardsfolder/w/weaver_of_currents.txt
index b6335c89a36..f7298bfde72 100644
--- a/forge-gui/res/cardsfolder/w/weaver_of_currents.txt
+++ b/forge-gui/res/cardsfolder/w/weaver_of_currents.txt
@@ -2,7 +2,7 @@ Name:Weaver of Currents
 ManaCost:1 G U
 Types:Creature Naga Druid
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 DeckHas:Ability$Mana.Colorless
 SVar:Picture:http://www.wizards.com/global/images/magic/general/weaver_of_currents.jpg
-Oracle:{T}: Add {C}{C} to your mana pool.
\ No newline at end of file
+Oracle:{T}: Add {C}{C}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/w/weirding_wood.txt b/forge-gui/res/cardsfolder/w/weirding_wood.txt
index 68802df7e2f..d79143b2df6 100644
--- a/forge-gui/res/cardsfolder/w/weirding_wood.txt
+++ b/forge-gui/res/cardsfolder/w/weirding_wood.txt
@@ -6,8 +6,8 @@ A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Clue | TokenTypes$ Artifact,Clue | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c clue | TokenAltImages$ c_clue2,c_clue3,c_clue4,c_clue5,c_clue6 | TokenAbilities$ ABDraw
 SVar:ABDraw:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ WeirdingWoodTap | Description$ Enchanted land has "{T}: Add two mana of any one color to your mana pool."
-SVar:WeirdingWoodTap:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ WeirdingWoodTap | Description$ Enchanted land has "{T}: Add two mana of any one color."
+SVar:WeirdingWoodTap:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 DeckHas:Ability$Investigate & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/weirding_wood.jpg
-Oracle:Enchant land\nWhen Weirding Wood enters the battlefield, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")\nEnchanted land has "{T}: Add two mana of any one color to your mana pool."
+Oracle:Enchant land\nWhen Weirding Wood enters the battlefield, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")\nEnchanted land has "{T}: Add two mana of any one color."
diff --git a/forge-gui/res/cardsfolder/w/werebear.txt b/forge-gui/res/cardsfolder/w/werebear.txt
index 1ed9220829b..6411c88a9cc 100644
--- a/forge-gui/res/cardsfolder/w/werebear.txt
+++ b/forge-gui/res/cardsfolder/w/werebear.txt
@@ -2,7 +2,7 @@ Name:Werebear
 ManaCost:1 G
 Types:Creature Human Bear Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | Condition$ Threshold | Description$ Threshold — CARDNAME gets +3/+3 as long as seven or more cards are in your graveyard.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/werebear.jpg
-Oracle:{T}: Add {G} to your mana pool.\nThreshold — Werebear gets +3/+3 as long as seven or more cards are in your graveyard.
+Oracle:{T}: Add {G}.\nThreshold — Werebear gets +3/+3 as long as seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/w/westvale_abbey_ormendahl_profane_prince.txt b/forge-gui/res/cardsfolder/w/westvale_abbey_ormendahl_profane_prince.txt
index bb1c43a4584..0662b4f574c 100644
--- a/forge-gui/res/cardsfolder/w/westvale_abbey_ormendahl_profane_prince.txt
+++ b/forge-gui/res/cardsfolder/w/westvale_abbey_ormendahl_profane_prince.txt
@@ -1,14 +1,14 @@
 Name:Westvale Abbey
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Token | Cost$ 5 T PayLife<1> | TokenAmount$ 1 | TokenName$ Human Cleric | TokenTypes$ Creature,Human,Cleric | TokenOwner$ You | TokenColors$ White,Black | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Create a 1/1 white and black Human Cleric creature token.
 A:AB$SetState | Cost$ 5 T Sac<5/Creature> | Defined$ Self | Mode$ Transform | SubAbility$ DBUntap | SpellDescription$ Transform CARDNAME, then untap it.
 SVar:DBUntap:DB$ Untap | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/westvale_abbey.jpg
 SVar:AIPreference:SacCost$Creature.token,Creature.cmcLE2
 AlternateMode:DoubleFaced
-Oracle:{T}: Add {C} to your mana pool.\n{5}, {T}, Pay 1 life: Create a 1/1 white and black Human Cleric creature token.\n{5}, {T}, Sacrifice five creatures: Transform Westvale Abbey, then untap it.
+Oracle:{T}: Add {C}.\n{5}, {T}, Pay 1 life: Create a 1/1 white and black Human Cleric creature token.\n{5}, {T}, Sacrifice five creatures: Transform Westvale Abbey, then untap it.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/w/whisperer_of_the_wilds.txt b/forge-gui/res/cardsfolder/w/whisperer_of_the_wilds.txt
index 442bb651d70..099981ddfc2 100644
--- a/forge-gui/res/cardsfolder/w/whisperer_of_the_wilds.txt
+++ b/forge-gui/res/cardsfolder/w/whisperer_of_the_wilds.txt
@@ -2,7 +2,7 @@ Name:Whisperer of the Wilds
 ManaCost:1 G
 Types:Creature Human Shaman
 PT:0/2
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | IsPresent$ Creature.YouCtrl+powerGE4 | PrecostDesc$ Ferocious — | SpellDescription$ Add {G}{G} to your mana pool. Activate this ability only if you control a creature with power 4 or greater.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | IsPresent$ Creature.YouCtrl+powerGE4 | PrecostDesc$ Ferocious — | SpellDescription$ Add {G}{G}. Activate this ability only if you control a creature with power 4 or greater.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/whisperer_of_the_wilds.jpg
-Oracle:{T}: Add {G} to your mana pool.\nFerocious — {T}: Add {G}{G} to your mana pool. Activate this ability only if you control a creature with power 4 or greater.
+Oracle:{T}: Add {G}.\nFerocious — {T}: Add {G}{G}. Activate this ability only if you control a creature with power 4 or greater.
diff --git a/forge-gui/res/cardsfolder/w/white_mana_battery.txt b/forge-gui/res/cardsfolder/w/white_mana_battery.txt
index 937033cff17..bbbc33b037e 100644
--- a/forge-gui/res/cardsfolder/w/white_mana_battery.txt
+++ b/forge-gui/res/cardsfolder/w/white_mana_battery.txt
@@ -2,10 +2,10 @@ Name:White Mana Battery
 ManaCost:4
 Types:Artifact
 A:AB$ PutCounter | Cost$ 2 T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on CARDNAME.
-A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ W | Amount$ Y | CostDesc$ {T}, Remove any number of charge counters from CARDNAME: | SpellDescription$ Add {W} to your mana pool, then add an additional {W} to your mana pool for each charge counter removed this way.
+A:AB$ Mana | Cost$ T SubCounter<X/CHARGE> | Produced$ W | Amount$ Y | CostDesc$ {T}, Remove any number of charge counters from CARDNAME: | SpellDescription$ Add {W}, then add an additional {W} for each charge counter removed this way.
 SVar:Y:Number$1/Plus.ChosenX
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/white_mana_battery.jpg
-Oracle:{2}, {T}: Put a charge counter on White Mana Battery.\n{T}, Remove any number of charge counters from White Mana Battery: Add {W} to your mana pool, then add an additional {W} to your mana pool for each charge counter removed this way.
+Oracle:{2}, {T}: Put a charge counter on White Mana Battery.\n{T}, Remove any number of charge counters from White Mana Battery: Add {W}, then add an additional {W} for each charge counter removed this way.
diff --git a/forge-gui/res/cardsfolder/w/wild_cantor.txt b/forge-gui/res/cardsfolder/w/wild_cantor.txt
index 02e00e1ff75..8542d06051f 100644
--- a/forge-gui/res/cardsfolder/w/wild_cantor.txt
+++ b/forge-gui/res/cardsfolder/w/wild_cantor.txt
@@ -2,6 +2,6 @@ Name:Wild Cantor
 ManaCost:RG
 Types:Creature Human Druid
 PT:1/1
-A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wild_cantor.jpg
-Oracle:({R/G} can be paid with either {R} or {G}.)\nSacrifice Wild Cantor: Add one mana of any color to your mana pool.
+Oracle:({R/G} can be paid with either {R} or {G}.)\nSacrifice Wild Cantor: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/w/wild_growth.txt b/forge-gui/res/cardsfolder/w/wild_growth.txt
index a9f1282aa8a..17b22680a16 100644
--- a/forge-gui/res/cardsfolder/w/wild_growth.txt
+++ b/forge-gui/res/cardsfolder/w/wild_growth.txt
@@ -3,8 +3,8 @@ ManaCost:G
 Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ G | ValidTgts$ Land | AILogic$ Pump
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds an additional {G}.
 SVar:TrigMana:DB$ Mana | Produced$ G | Amount$ 1 | Defined$ TriggeredCardController
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wild_growth.jpg
-Oracle:Enchant land\nWhenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool (in addition to the mana the land produces).
+Oracle:Enchant land\nWhenever enchanted land is tapped for mana, its controller adds an additional {G}.
diff --git a/forge-gui/res/cardsfolder/w/wildfield_borderpost.txt b/forge-gui/res/cardsfolder/w/wildfield_borderpost.txt
index dcff8b5481f..bf0d0593dc0 100644
--- a/forge-gui/res/cardsfolder/w/wildfield_borderpost.txt
+++ b/forge-gui/res/cardsfolder/w/wildfield_borderpost.txt
@@ -2,8 +2,8 @@ Name:Wildfield Borderpost
 ManaCost:1 G W
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 SVar:AltCost:Cost$ 1 Return<1/Land.Basic> | Description$ You may pay {1} and return a basic land you control to its owner's hand rather than pay Wildfield Borderpost's mana cost.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wildfield_borderpost.jpg
-Oracle:You may pay {1} and return a basic land you control to its owner's hand rather than pay Wildfield Borderpost's mana cost.\nWildfield Borderpost enters the battlefield tapped.\n{T}: Add {G} or {W} to your mana pool.
+Oracle:You may pay {1} and return a basic land you control to its owner's hand rather than pay Wildfield Borderpost's mana cost.\nWildfield Borderpost enters the battlefield tapped.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/w/wily_goblin.txt b/forge-gui/res/cardsfolder/w/wily_goblin.txt
index 4848f61d21b..85bd1ffd107 100644
--- a/forge-gui/res/cardsfolder/w/wily_goblin.txt
+++ b/forge-gui/res/cardsfolder/w/wily_goblin.txt
@@ -2,9 +2,9 @@ Name:Wily Goblin
 ManaCost:R R
 Types:Creature Goblin Pirate
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Artifact,Treasure | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c treasure | TokenAltImages$ c_treasure2,c_treasure3,c_treasure4 | TokenAbilities$ ABMana | References$ ABMana
-SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wily_goblin.jpg
-Oracle:When Wily Goblin enters the battlefield, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool."
+Oracle:When Wily Goblin enters the battlefield, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/w/wind_scarred_crag.txt b/forge-gui/res/cardsfolder/w/wind_scarred_crag.txt
index 7face48aa1c..7eeb3e6f006 100644
--- a/forge-gui/res/cardsfolder/w/wind_scarred_crag.txt
+++ b/forge-gui/res/cardsfolder/w/wind_scarred_crag.txt
@@ -1,10 +1,10 @@
 Name:Wind-Scarred Crag
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 1
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wind_scarred_crag.jpg
-Oracle:Wind-Scarred Crag enters the battlefield tapped.\nWhen Wind-Scarred Crag enters the battlefield, you gain 1 life.\n{T}: Add {R} or {W} to your mana pool.
+Oracle:Wind-Scarred Crag enters the battlefield tapped.\nWhen Wind-Scarred Crag enters the battlefield, you gain 1 life.\n{T}: Add {R} or {W}.
diff --git a/forge-gui/res/cardsfolder/w/windbrisk_heights.txt b/forge-gui/res/cardsfolder/w/windbrisk_heights.txt
index 8979626744c..0e2e24bfd0c 100644
--- a/forge-gui/res/cardsfolder/w/windbrisk_heights.txt
+++ b/forge-gui/res/cardsfolder/w/windbrisk_heights.txt
@@ -2,8 +2,8 @@ Name:Windbrisk Heights
 ManaCost:no cost
 Types:Land
 K:Hideaway
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Play | Cost$ W T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | References$ X | ForgetRemembered$ True | PlayerTurn$ True | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if you attacked with three or more creatures this turn.
 SVar:X:Count$AttackersDeclared
 SVar:Picture:http://www.wizards.com/global/images/magic/general/windbrisk_heights.jpg
-Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {W} to your mana pool.\n{W}, {T}: You may play the exiled card without paying its mana cost if you attacked with three or more creatures this turn.
+Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {W}.\n{W}, {T}: You may play the exiled card without paying its mana cost if you attacked with three or more creatures this turn.
diff --git a/forge-gui/res/cardsfolder/w/winding_canyons.txt b/forge-gui/res/cardsfolder/w/winding_canyons.txt
index 2382ef66015..2cfcb582e56 100644
--- a/forge-gui/res/cardsfolder/w/winding_canyons.txt
+++ b/forge-gui/res/cardsfolder/w/winding_canyons.txt
@@ -1,9 +1,9 @@
 Name:Winding Canyons
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Effect | Cost$ 2 T | Name$ Winding Canyons Effect | StaticAbilities$ GiveFlash | SpellDescription$ Until end of turn, you may cast creature spells as though they had flash.
 SVar:GiveFlash:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl+nonToken | AddHiddenKeyword$ Flash | AffectedZone$ Exile,Graveyard,Hand,Library,Command | Description$ Until end of turn, you may cast creature spells as though they had flash.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/winding_canyons.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{2}, {T}: Until end of turn, you may cast creature spells as though they had flash.
+Oracle:{T}: Add {C}.\n{2}, {T}: Until end of turn, you may cast creature spells as though they had flash.
diff --git a/forge-gui/res/cardsfolder/w/wintermoon_mesa.txt b/forge-gui/res/cardsfolder/w/wintermoon_mesa.txt
index 624b1788d71..04d49454acc 100644
--- a/forge-gui/res/cardsfolder/w/wintermoon_mesa.txt
+++ b/forge-gui/res/cardsfolder/w/wintermoon_mesa.txt
@@ -2,8 +2,8 @@ Name:Wintermoon Mesa
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Tap | Cost$ 2 T Sac<1/CARDNAME> | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select target land | ValidTgts$ Land | SpellDescription$ Tap two target lands.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wintermoon_mesa.jpg
-Oracle:Wintermoon Mesa enters the battlefield tapped.\n{T}: Add {C} to your mana pool.\n{2}, {T}, Sacrifice Wintermoon Mesa: Tap two target lands.
+Oracle:Wintermoon Mesa enters the battlefield tapped.\n{T}: Add {C}.\n{2}, {T}, Sacrifice Wintermoon Mesa: Tap two target lands.
diff --git a/forge-gui/res/cardsfolder/w/winters_night.txt b/forge-gui/res/cardsfolder/w/winters_night.txt
index f421c582670..a76b548a1da 100644
--- a/forge-gui/res/cardsfolder/w/winters_night.txt
+++ b/forge-gui/res/cardsfolder/w/winters_night.txt
@@ -1,10 +1,10 @@
 Name:Winter's Night
 ManaCost:R G W
 Types:World Enchantment
-T:Mode$ TapsForMana | ValidCard$ Land.Snow | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a snow land for mana, that player adds one mana to his or her mana pool of any type that land produced. That land doesn't untap during its controller's next untap step.
+T:Mode$ TapsForMana | ValidCard$ Land.Snow | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a snow land for mana, that player adds one mana of any type that land produced. That land doesn't untap during its controller's next untap step.
 SVar:TrigMana:DB$ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer | SubAbility$ DBPump
 SVar:DBPump:DB$Pump | Defined$ TriggeredCard | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/winters_night.jpg
-Oracle:Whenever a player taps a snow land for mana, that player adds one mana to his or her mana pool of any type that land produced. That land doesn't untap during its controller's next untap step.
+Oracle:Whenever a player taps a snow land for mana, that player adds one mana of any type that land produced. That land doesn't untap during its controller's next untap step.
diff --git a/forge-gui/res/cardsfolder/w/wirewood_channeler.txt b/forge-gui/res/cardsfolder/w/wirewood_channeler.txt
index e10345349c7..f57b73daef4 100644
--- a/forge-gui/res/cardsfolder/w/wirewood_channeler.txt
+++ b/forge-gui/res/cardsfolder/w/wirewood_channeler.txt
@@ -2,9 +2,9 @@ Name:Wirewood Channeler
 ManaCost:3 G
 Types:Creature Elf Druid
 PT:2/2
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | References$ X | SpellDescription$ Add X mana of any one color to your mana pool, where X is the number of Elves on the battlefield.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | References$ X | SpellDescription$ Add X mana of any one color, where X is the number of Elves on the battlefield.
 SVar:X:Count$Valid Elf
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wirewood_channeler.jpg
-Oracle:{T}: Add X mana of any one color to your mana pool, where X is the number of Elves on the battlefield.
+Oracle:{T}: Add X mana of any one color, where X is the number of Elves on the battlefield.
diff --git a/forge-gui/res/cardsfolder/w/wirewood_elf.txt b/forge-gui/res/cardsfolder/w/wirewood_elf.txt
index 067a8c133eb..1e13c4ccbe7 100644
--- a/forge-gui/res/cardsfolder/w/wirewood_elf.txt
+++ b/forge-gui/res/cardsfolder/w/wirewood_elf.txt
@@ -2,6 +2,6 @@ Name:Wirewood Elf
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:1/2
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 SVar:Picture:http://resources.wizards.com/magic/cards/ons/en-us/card39828.jpg
-Oracle:{T}: Add {G} to your mana pool.
+Oracle:{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/w/wirewood_lodge.txt b/forge-gui/res/cardsfolder/w/wirewood_lodge.txt
index 6493f5b30c0..68e0983a0ca 100644
--- a/forge-gui/res/cardsfolder/w/wirewood_lodge.txt
+++ b/forge-gui/res/cardsfolder/w/wirewood_lodge.txt
@@ -1,8 +1,8 @@
 Name:Wirewood Lodge
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Untap | Cost$ G T | ValidTgts$ Elf | TgtPrompt$ Select target Elf | SpellDescription$ Untap target Elf.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wirewood_lodge.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{G}, {T}: Untap target Elf.
+Oracle:{T}: Add {C}.\n{G}, {T}: Untap target Elf.
diff --git a/forge-gui/res/cardsfolder/w/witch_engine.txt b/forge-gui/res/cardsfolder/w/witch_engine.txt
index 7724a9ffdc9..10d72bf2637 100644
--- a/forge-gui/res/cardsfolder/w/witch_engine.txt
+++ b/forge-gui/res/cardsfolder/w/witch_engine.txt
@@ -3,9 +3,9 @@ ManaCost:5 B
 Types:Creature Horror
 PT:4/4
 K:Swampwalk
-A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 4 | SubAbility$ ChangeControl | SpellDescription$ Add {B}{B}{B}{B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 4 | SubAbility$ ChangeControl | SpellDescription$ Add {B}{B}{B}{B}.
 SVar:ChangeControl:DB$GainControl | Defined$ Self | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ RemCombat | SpellDescription$ Target opponent gains control of CARDNAME.
 SVar:RemCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/witch_engine.jpg
-Oracle:Swampwalk\n{T}: Add {B}{B}{B}{B} to your mana pool. Target opponent gains control of Witch Engine. (Activate this ability only any time you could cast an instant.)
+Oracle:Swampwalk\n{T}: Add {B}{B}{B}{B}. Target opponent gains control of Witch Engine. (Activate this ability only any time you could cast an instant.)
diff --git a/forge-gui/res/cardsfolder/w/wizards_school.txt b/forge-gui/res/cardsfolder/w/wizards_school.txt
index 13b7efcd3eb..d2fa55c82dc 100644
--- a/forge-gui/res/cardsfolder/w/wizards_school.txt
+++ b/forge-gui/res/cardsfolder/w/wizards_school.txt
@@ -1,11 +1,11 @@
 Name:Wizards' School
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ 1 T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ W | SpellDescription$ Add {W} to your mana pool.
-A:AB$ Mana | Cost$ 2 T | Produced$ B | SpellDescription$ Add {B} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Mana | Cost$ 2 T | Produced$ W | SpellDescription$ Add {W}.
+A:AB$ Mana | Cost$ 2 T | Produced$ B | SpellDescription$ Add {B}.
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wizards_school.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{1}, {T}: Add {U} to your mana pool.\n{2}, {T}: Add {W} or {B} to your mana pool.
+Oracle:{T}: Add {C}.\n{1}, {T}: Add {U}.\n{2}, {T}: Add {W} or {B}.
diff --git a/forge-gui/res/cardsfolder/w/wooded_bastion.txt b/forge-gui/res/cardsfolder/w/wooded_bastion.txt
index e9cd7ee103f..1940b52a537 100644
--- a/forge-gui/res/cardsfolder/w/wooded_bastion.txt
+++ b/forge-gui/res/cardsfolder/w/wooded_bastion.txt
@@ -1,10 +1,10 @@
 Name:Wooded Bastion
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ GW T | Produced$ W | Amount$ 2 | SpellDescription$ Add {W}{W} to your mana pool.
-A:AB$ Mana | Cost$ GW T | Produced$ G W | SpellDescription$ Add {G}{W} to your mana pool.
-A:AB$ Mana | Cost$ GW T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ GW T | Produced$ W | Amount$ 2 | SpellDescription$ Add {W}{W}.
+A:AB$ Mana | Cost$ GW T | Produced$ G W | SpellDescription$ Add {G}{W}.
+A:AB$ Mana | Cost$ GW T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wooded_bastion.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{G/W}, {T}: Add {G}{G}, {G}{W}, or {W}{W} to your mana pool.
+Oracle:{T}: Add {C}.\n{G/W}, {T}: Add {G}{G}, {G}{W}, or {W}{W}.
diff --git a/forge-gui/res/cardsfolder/w/woodland_stream.txt b/forge-gui/res/cardsfolder/w/woodland_stream.txt
index 45ce99efe45..f02dfb94334 100644
--- a/forge-gui/res/cardsfolder/w/woodland_stream.txt
+++ b/forge-gui/res/cardsfolder/w/woodland_stream.txt
@@ -2,7 +2,7 @@ Name:Woodland Stream
 ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/woodland_stream.jpg
-Oracle:Woodland Stream enters the battlefield tapped.\n{T}: Add {G} or {U} to your mana pool. 
\ No newline at end of file
+Oracle:Woodland Stream enters the battlefield tapped.\n{T}: Add {G} or {U}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/w/workhorse.txt b/forge-gui/res/cardsfolder/w/workhorse.txt
index 38dad39682b..1a12e0c9d72 100644
--- a/forge-gui/res/cardsfolder/w/workhorse.txt
+++ b/forge-gui/res/cardsfolder/w/workhorse.txt
@@ -3,6 +3,6 @@ ManaCost:6
 Types:Artifact Creature Horse
 PT:0/0
 K:etbCounter:P1P1:4
-A:AB$ Mana | Cost$ SubCounter<1/P1P1> | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ SubCounter<1/P1P1> | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/workhorse.jpg
-Oracle:Workhorse enters the battlefield with four +1/+1 counters on it.\nRemove a +1/+1 counter from Workhorse: Add {C} to your mana pool.
+Oracle:Workhorse enters the battlefield with four +1/+1 counters on it.\nRemove a +1/+1 counter from Workhorse: Add {C}.
diff --git a/forge-gui/res/cardsfolder/w/worldknit.txt b/forge-gui/res/cardsfolder/w/worldknit.txt
index d394922de60..71d30e1aa98 100644
--- a/forge-gui/res/cardsfolder/w/worldknit.txt
+++ b/forge-gui/res/cardsfolder/w/worldknit.txt
@@ -1,10 +1,10 @@
 Name:Worldknit
 ManaCost:no cost
 Types:Conspiracy
-T:Mode$ NewGame | TriggerZones$ Command | Execute$ TrigWorldknit | Static$ True | TriggerDescription$ As long as every card in your card pool started the game in your library or in the command zone, lands you control have "{T}: Add one mana of any color to your mana pool."
+T:Mode$ NewGame | TriggerZones$ Command | Execute$ TrigWorldknit | Static$ True | TriggerDescription$ As long as every card in your card pool started the game in your library or in the command zone, lands you control have "{T}: Add one mana of any color."
 SVar:TrigWorldknit:DB$ StoreSVar | SVar$ X | Type$ Number | Expression$ 1 | ConditionCheckSVar$ Y | ConditionSVarCompare$ EQ0 | References$ Y
-S:Mode$ Continuous | Affected$ Land.YouCtrl | EffectZone$ Command | CheckSVar$ X | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add one mana of any one color to your mana pool."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any one color to your mana pool.
+S:Mode$ Continuous | Affected$ Land.YouCtrl | EffectZone$ Command | CheckSVar$ X | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add one mana of any one color."
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any one color.
 SVar:X:Number$0
 SVar:Y:Count$InYourSideboard
-Oracle:(Start the game with this conspiracy face up in the command zone.)\nAs long as every card in your card pool started the game in your library or in the command zone, lands you control have "{T}: Add one mana of any color to your mana pool."
+Oracle:(Start the game with this conspiracy face up in the command zone.)\nAs long as every card in your card pool started the game in your library or in the command zone, lands you control have "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/w/worldpurge.txt b/forge-gui/res/cardsfolder/w/worldpurge.txt
index f5b6adc3eae..531ce79f0ab 100644
--- a/forge-gui/res/cardsfolder/w/worldpurge.txt
+++ b/forge-gui/res/cardsfolder/w/worldpurge.txt
@@ -1,7 +1,7 @@
 Name:Worldpurge
 ManaCost:4 WU WU WU WU
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ 4 WU WU WU WU | ChangeType$ Permanent | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBRepeat | SpellDescription$ Return all permanents to their owners' hands. Each player chooses up to seven cards in his or her hand, then shuffles the rest into his or her library. Empty all mana pools.
+A:SP$ ChangeZoneAll | Cost$ 4 WU WU WU WU | ChangeType$ Permanent | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBRepeat | SpellDescription$ Return all permanents to their owners' hands. Each player chooses up to seven cards in his or her hand, then shuffles the rest into his or her library. Each player loses all unspent mana.
 SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose
 SVar:DBChoose:DB$ ChooseCard | Amount$ 7 | Defined$ Remembered | Choices$ Card.RememberedPlayerCtrl | ChoiceZone$ Hand | SubAbility$ DBReturn | RememberChosen$ True
 SVar:DBReturn:DB$ ChangeZone | Defined$ ValidHand Card.IsNotRemembered+RememberedPlayerCtrl | Origin$ Hand | Destination$ Library | Shuffle$ True | SubAbility$ DBEmpty
@@ -9,4 +9,4 @@ SVar:DBEmpty:DB$ DrainMana | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/worldpurge.jpg
-Oracle:Return all permanents to their owners' hands. Each player chooses up to seven cards in his or her hand, then shuffles the rest into his or her library. Empty all mana pools.
+Oracle:Return all permanents to their owners' hands. Each player chooses up to seven cards in his or her hand, then shuffles the rest into his or her library. Each player loses all unspent mana.
diff --git a/forge-gui/res/cardsfolder/w/worn_powerstone.txt b/forge-gui/res/cardsfolder/w/worn_powerstone.txt
index 18978eb319b..ea14026cf25 100644
--- a/forge-gui/res/cardsfolder/w/worn_powerstone.txt
+++ b/forge-gui/res/cardsfolder/w/worn_powerstone.txt
@@ -2,6 +2,6 @@ Name:Worn Powerstone
 ManaCost:3
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/worn_powerstone.jpg
-Oracle:Worn Powerstone enters the battlefield tapped.\n{T}: Add {C}{C} to your mana pool.
+Oracle:Worn Powerstone enters the battlefield tapped.\n{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/x/xenagos_the_reveler.txt b/forge-gui/res/cardsfolder/x/xenagos_the_reveler.txt
index a28cc5fb6d9..fcad53c1e39 100644
--- a/forge-gui/res/cardsfolder/x/xenagos_the_reveler.txt
+++ b/forge-gui/res/cardsfolder/x/xenagos_the_reveler.txt
@@ -2,7 +2,7 @@ Name:Xenagos, the Reveler
 ManaCost:2 R G
 Types:Legendary Planeswalker Xenagos
 Loyalty:3
-A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Amount$ X | Produced$ Combo R G | Planeswalker$ True | References$ X | SpellDescription$ Add X mana in any combination of {R} and/or {G} to your mana pool, where X is the number of creatures you control.
+A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Amount$ X | Produced$ Combo R G | Planeswalker$ True | References$ X | SpellDescription$ Add X mana in any combination of {R} and/or {G}, where X is the number of creatures you control.
 SVar:X:Count$Valid Creature.YouCtrl
 A:AB$ Token | Cost$ AddCounter<0/LOYALTY> | TokenAmount$ 1 | TokenName$ Satyr | TokenColors$ Red,Green | TokenTypes$ Creature,Satyr | TokenOwner$ You | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Haste | Planeswalker$ True | TokenImage$ rg 2 2 satyr | SpellDescription$ Create a 2/2 red and green Satyr creature token with haste.
 A:AB$ Mill | Cost$ SubCounter<6/LOYALTY> | NumCards$ 7 | Destination$ Exile | RememberMilled$ True | Planeswalker$ True | Ultimate$ True | SubAbility$ DBChangeZone | SpellDescription$ Exile the top seven cards of your library. You may put any number of creature and/or land cards from among them onto the battlefield.
@@ -11,4 +11,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Y:Count$ValidExile Creature.IsRemembered,Land.IsRemembered
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/xenagos_the_reveler.jpg
-Oracle:[+1]: Add X mana in any combination of {R} and/or {G} to your mana pool, where X is the number of creatures you control.\n[0]: Create a 2/2 red and green Satyr creature token with haste.\n[-6]: Exile the top seven cards of your library. You may put any number of creature and/or land cards from among them onto the battlefield.
+Oracle:[+1]: Add X mana in any combination of {R} and/or {G}, where X is the number of creatures you control.\n[0]: Create a 2/2 red and green Satyr creature token with haste.\n[-6]: Exile the top seven cards of your library. You may put any number of creature and/or land cards from among them onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/y/yavimaya_coast.txt b/forge-gui/res/cardsfolder/y/yavimaya_coast.txt
index 9fb312d5adb..26e9bd64c35 100644
--- a/forge-gui/res/cardsfolder/y/yavimaya_coast.txt
+++ b/forge-gui/res/cardsfolder/y/yavimaya_coast.txt
@@ -1,9 +1,9 @@
 Name:Yavimaya Coast
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U} to your mana pool. CARDNAME deals 1 damage to you.
-A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G} to your mana pool. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add {U}. CARDNAME deals 1 damage to you.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBPain | SpellDescription$ Add {G}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/yavimaya_coast.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{T}: Add {G} or {U} to your mana pool. Yavimaya Coast deals 1 damage to you.
+Oracle:{T}: Add {C}.\n{T}: Add {G} or {U}. Yavimaya Coast deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/y/yavimaya_hollow.txt b/forge-gui/res/cardsfolder/y/yavimaya_hollow.txt
index 887153609e7..95bd1d9cfda 100644
--- a/forge-gui/res/cardsfolder/y/yavimaya_hollow.txt
+++ b/forge-gui/res/cardsfolder/y/yavimaya_hollow.txt
@@ -1,7 +1,7 @@
 Name:Yavimaya Hollow
 ManaCost:no cost
 Types:Legendary Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Regenerate | Cost$ G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Regenerate target creature.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/yavimaya_hollow.jpg
-Oracle:{T}: Add {C} to your mana pool.\n{G}, {T}: Regenerate target creature.
+Oracle:{T}: Add {C}.\n{G}, {T}: Regenerate target creature.
diff --git a/forge-gui/res/cardsfolder/z/zendikar_resurgent.txt b/forge-gui/res/cardsfolder/z/zendikar_resurgent.txt
index 40df0ed37c1..40b8705d514 100644
--- a/forge-gui/res/cardsfolder/z/zendikar_resurgent.txt
+++ b/forge-gui/res/cardsfolder/z/zendikar_resurgent.txt
@@ -1,9 +1,9 @@
 Name:Zendikar Resurgent
 ManaCost:5 G G
 Types:Enchantment
-T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced. (The types of mana are white, blue, black, red, green, and colorless.)
+T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana of any type that land produced. (The types of mana are white, blue, black, red, green, and colorless.)
 SVar:TrigMana:DB$ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell, draw a card.
 SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zendikar_resurgent.jpg
-Oracle:Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced. (The types of mana are white, blue, black, red, green, and colorless.)\nWhenever you cast a creature spell, draw a card.
+Oracle:Whenever you tap a land for mana, add one mana of any type that land produced. (The types of mana are white, blue, black, red, green, and colorless.)\nWhenever you cast a creature spell, draw a card.
diff --git a/forge-gui/res/cardsfolder/z/zhalfirin_void.txt b/forge-gui/res/cardsfolder/z/zhalfirin_void.txt
index f769a4633be..700252fd61a 100644
--- a/forge-gui/res/cardsfolder/z/zhalfirin_void.txt
+++ b/forge-gui/res/cardsfolder/z/zhalfirin_void.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 DeckHas:Ability$Mana.Colorless
-Oracle:When Zhalfirin Void enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {C} to your mana pool.
+Oracle:When Zhalfirin Void enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/z/zhur_taa_ancient.txt b/forge-gui/res/cardsfolder/z/zhur_taa_ancient.txt
index 5e5865718f8..9f5cad19ae7 100644
--- a/forge-gui/res/cardsfolder/z/zhur_taa_ancient.txt
+++ b/forge-gui/res/cardsfolder/z/zhur_taa_ancient.txt
@@ -2,7 +2,7 @@ Name:Zhur-Taa Ancient
 ManaCost:3 R G
 Types:Creature Beast
 PT:7/5
-T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
 SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zhur_taa_ancient.jpg
-Oracle:Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+Oracle:Whenever a player taps a land for mana, that player adds one mana of any type that land produced.
diff --git a/forge-gui/res/cardsfolder/z/zhur_taa_druid.txt b/forge-gui/res/cardsfolder/z/zhur_taa_druid.txt
index 77d4b4775ba..76ef37cfcef 100644
--- a/forge-gui/res/cardsfolder/z/zhur_taa_druid.txt
+++ b/forge-gui/res/cardsfolder/z/zhur_taa_druid.txt
@@ -2,8 +2,8 @@ Name:Zhur-Taa Druid
 ManaCost:R G
 Types:Creature Human Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 T:Mode$ TapsForMana | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever you tap CARDNAME for mana, it deals 1 damage to each opponent.
 SVar:TrigDmg:DB$ DealDamage | NumDmg$ 1 | Defined$ Player.Opponent
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zhur_taa_druid.jpg
-Oracle:{T}: Add {G} to your mana pool.\nWhenever you tap Zhur-Taa Druid for mana, it deals 1 damage to each opponent.
+Oracle:{T}: Add {G}.\nWhenever you tap Zhur-Taa Druid for mana, it deals 1 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/z/zoetic_cavern.txt b/forge-gui/res/cardsfolder/z/zoetic_cavern.txt
index 6de599b185c..d8d94c8b2af 100644
--- a/forge-gui/res/cardsfolder/z/zoetic_cavern.txt
+++ b/forge-gui/res/cardsfolder/z/zoetic_cavern.txt
@@ -2,6 +2,6 @@ Name:Zoetic Cavern
 ManaCost:no cost
 Types:Land
 K:Morph:2
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zoetic_cavern.jpg
-Oracle:{T}: Add {C} to your mana pool.\nMorph {2} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
+Oracle:{T}: Add {C}.\nMorph {2} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)