diff --git a/forge-gui/res/cardsfolder/a/archangel_of_thune.txt b/forge-gui/res/cardsfolder/a/archangel_of_thune.txt
index f7134812..068c9c5c 100644
--- a/forge-gui/res/cardsfolder/a/archangel_of_thune.txt
+++ b/forge-gui/res/cardsfolder/a/archangel_of_thune.txt
@@ -1,10 +1,10 @@
-Name:Archangel of Thune
-ManaCost:3 W W
-Types:Creature Angel
-PT:3/4
-K:Flying
-K:Lifelink
-T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you gain life, put a +1/+1 counter on each creature you control.
-SVar:TrigPutCounter:AB$ PutCounterAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/archangel_of_thune.jpg
-Oracle:Flying\nLifelink (Damage dealt by this creature also causes you to gain that much life.)\nWhenever you gain life, put a +1/+1 counter on each creature you control.
+Name:Archangel of Thune
+ManaCost:3 W W
+Types:Creature Angel
+PT:3/4
+K:Flying
+K:Lifelink
+T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you gain life, put a +1/+1 counter on each creature you control.
+SVar:TrigPutCounter:AB$ PutCounterAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/archangel_of_thune.jpg
+Oracle:Flying, lifelink\nWhenever you gain life, put a +1/+1 counter on each creature you control.
diff --git a/forge-gui/res/cardsfolder/b/benevolent_ancestor.txt b/forge-gui/res/cardsfolder/b/benevolent_ancestor.txt
index 4ea1639b..ab9e4c94 100644
--- a/forge-gui/res/cardsfolder/b/benevolent_ancestor.txt
+++ b/forge-gui/res/cardsfolder/b/benevolent_ancestor.txt
@@ -5,4 +5,4 @@ PT:0/4
 K:Defender
 A:AB$ PreventDamage | Cost$ 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.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/benevolent_ancestor.jpg
-Oracle:Defender (This creature can't attack.)\n{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.
+Oracle:Defender\n{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.
diff --git a/forge-gui/res/cardsfolder/b/butchers_glee.txt b/forge-gui/res/cardsfolder/b/butchers_glee.txt
index 2cf53505..d8886433 100644
--- a/forge-gui/res/cardsfolder/b/butchers_glee.txt
+++ b/forge-gui/res/cardsfolder/b/butchers_glee.txt
@@ -1,7 +1,7 @@
-Name:Butcher's Glee
-ManaCost:2 B
-Types:Instant
-A:SP$ Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | KW$ Lifelink | SubAbility$ DBRegen | SpellDescription$ Target creature gets +3/+0 and gains lifelink until end of turn. Regenerate it.
-SVar:DBRegen:DB$ Regenerate | Defined$ ParentTarget
-SVar:Picture:http://www.wizards.com/global/images/magic/general/butchers_glee.jpg
-Oracle:Target creature gets +3/+0 and gains lifelink until end of turn. Regenerate it. (Damage dealt by a creature with lifelink also causes its controller to gain that much life.)
+Name:Butcher's Glee
+ManaCost:2 B
+Types:Instant
+A:SP$ Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | KW$ Lifelink | SubAbility$ DBRegen | SpellDescription$ Target creature gets +3/+0 and gains lifelink until end of turn. Regenerate it.
+SVar:DBRegen:DB$ Regenerate | Defined$ ParentTarget
+SVar:Picture:http://www.wizards.com/global/images/magic/general/butchers_glee.jpg
+Oracle:Target creature gets +3/+0 and gains lifelink until end of turn. Regenerate it.
diff --git a/forge-gui/res/cardsfolder/c/carven_caryatid.txt b/forge-gui/res/cardsfolder/c/carven_caryatid.txt
index b835a992..b8203ed4 100644
--- a/forge-gui/res/cardsfolder/c/carven_caryatid.txt
+++ b/forge-gui/res/cardsfolder/c/carven_caryatid.txt
@@ -6,4 +6,4 @@ K:Defender
 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 | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carven_caryatid.jpg
-Oracle:Defender (This creature can't attack.)\nWhen Carven Caryatid enters the battlefield, draw a card.
+Oracle:Defender\nWhen Carven Caryatid enters the battlefield, draw a card.
diff --git a/forge-gui/res/cardsfolder/c/child_of_night.txt b/forge-gui/res/cardsfolder/c/child_of_night.txt
index 24381fd7..a7a9fd43 100644
--- a/forge-gui/res/cardsfolder/c/child_of_night.txt
+++ b/forge-gui/res/cardsfolder/c/child_of_night.txt
@@ -4,4 +4,4 @@ Types:Creature Vampire
 PT:2/1
 K:Lifelink
 SVar:Picture:http://www.wizards.com/global/images/magic/general/child_of_night.jpg
-Oracle:Lifelink (Damage dealt by this creature also causes you to gain that much life.)
+Oracle:Lifelink
diff --git a/forge-gui/res/cardsfolder/c/condescend.txt b/forge-gui/res/cardsfolder/c/condescend.txt
index 2565c40d..6b919392 100644
--- a/forge-gui/res/cardsfolder/c/condescend.txt
+++ b/forge-gui/res/cardsfolder/c/condescend.txt
@@ -1,9 +1,9 @@
 Name:Condescend
 ManaCost:X U
 Types:Instant
-A:SP$ Counter | Cost$ X U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SubAbility$ DBScry | References$ X | SpellDescription$ Counter target spell unless its controller pays {X}. Scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+A:SP$ Counter | Cost$ X U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SubAbility$ DBScry | References$ X | SpellDescription$ Counter target spell unless its controller pays {X}. Scry 2.
 SVar:DBScry:DB$Scry | ScryNum$ 2
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/condescend.jpg
-Oracle:Counter target spell unless its controller pays {X}. Scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+Oracle:Counter target spell unless its controller pays {X}. Scry 2.
diff --git a/forge-gui/res/cardsfolder/d/darksteel_axe.txt b/forge-gui/res/cardsfolder/d/darksteel_axe.txt
index 0c1d2fc9..dcdb5184 100644
--- a/forge-gui/res/cardsfolder/d/darksteel_axe.txt
+++ b/forge-gui/res/cardsfolder/d/darksteel_axe.txt
@@ -5,4 +5,4 @@ K:Indestructible
 K:Equip 2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darksteel_axe.jpg
-Oracle:Indestructible (Effects that say "destroy" don't destroy this artifact.)\nEquipped creature gets +2/+0.\nEquip {2}
+Oracle:Indestructible\nEquipped creature gets +2/+0.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/d/dissolve.txt b/forge-gui/res/cardsfolder/d/dissolve.txt
index 546fbae3..efa3b780 100644
--- a/forge-gui/res/cardsfolder/d/dissolve.txt
+++ b/forge-gui/res/cardsfolder/d/dissolve.txt
@@ -1,7 +1,7 @@
-Name:Dissolve
-ManaCost:1 U U
-Types:Instant
-A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ DBScry | Destination$ Graveyard | SpellDescription$ Counter target spell. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
-SVar:DBScry:DB$ Scry | ScryNum$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/dissolve.jpg
-Oracle:Counter target spell. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+Name:Dissolve
+ManaCost:1 U U
+Types:Instant
+A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ DBScry | Destination$ Graveyard | SpellDescription$ Counter target spell. Scry 1.
+SVar:DBScry:DB$ Scry | ScryNum$ 1 
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dissolve.jpg
+Oracle:Counter target spell. Scry 1.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/e/enlarge.txt b/forge-gui/res/cardsfolder/e/enlarge.txt
index 7c1083a5..21fd17f3 100644
--- a/forge-gui/res/cardsfolder/e/enlarge.txt
+++ b/forge-gui/res/cardsfolder/e/enlarge.txt
@@ -1,6 +1,6 @@
-Name:Enlarge
-ManaCost:3 G G
-Types:Sorcery
-A:SP$ Pump | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +7 | NumDef$ +7 | KW$ Trample & HIDDEN CARDNAME must be blocked if able. | AILogic$ Pump | SpellDescription$ Target creature gets +7/+7 and gains trample until end of turn. It must be blocked this turn if able.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/enlarge.jpg
-Oracle:Target creature gets +7/+7 and gains trample until end of turn. It must be blocked this turn if able. (If a creature with trample would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
+Name:Enlarge
+ManaCost:3 G G
+Types:Sorcery
+A:SP$ Pump | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +7 | NumDef$ +7 | KW$ Trample & HIDDEN CARDNAME must be blocked if able. | AILogic$ Pump | SpellDescription$ Target creature gets +7/+7 and gains trample until end of turn. It must be blocked this turn if able.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/enlarge.jpg
+Oracle:Target creature gets +7/+7 and gains trample until end of turn. It must be blocked this turn if able.
diff --git a/forge-gui/res/cardsfolder/e/eternal_thirst.txt b/forge-gui/res/cardsfolder/e/eternal_thirst.txt
index 5f07b1e4..3d873132 100644
--- a/forge-gui/res/cardsfolder/e/eternal_thirst.txt
+++ b/forge-gui/res/cardsfolder/e/eternal_thirst.txt
@@ -1,11 +1,11 @@
-Name:Eternal Thirst
-ManaCost:1 B
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Lifelink | AddTrigger$ EternalChangeZone | AddSVar$ EternalCounters | Description$ Enchanted creature has lifelink and "Whenever a creature an opponent controls dies, put a +1/+1 counter on this creature."
-SVar:EternalChangeZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ EternalCounters | TriggerDescription$ Whenever a creature an opponent controls dies, put a +1/+1 counter on CARDNAME.
-SVar:EternalCounters:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:NonStackingAttachEffect:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/eternal_thirst.jpg
-Oracle:Enchant creature\nEnchanted creature has lifelink and "Whenever a creature an opponent controls dies, put a +1/+1 counter on this creature." (Damage dealt by a creature with lifelink also causes its controller to gain that much life.)
+Name:Eternal Thirst
+ManaCost:1 B
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Lifelink | AddTrigger$ EternalChangeZone | AddSVar$ EternalCounters | Description$ Enchanted creature has lifelink and "Whenever a creature an opponent controls dies, put a +1/+1 counter on this creature."
+SVar:EternalChangeZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ EternalCounters | TriggerDescription$ Whenever a creature an opponent controls dies, put a +1/+1 counter on CARDNAME.
+SVar:EternalCounters:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:NonStackingAttachEffect:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/eternal_thirst.jpg
+Oracle:Enchant creature\nEnchanted creature has lifelink and "Whenever a creature an opponent controls dies, put a +1/+1 counter on this creature."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/greater_basilisk.txt b/forge-gui/res/cardsfolder/g/greater_basilisk.txt
index 23c39954..a315838a 100644
--- a/forge-gui/res/cardsfolder/g/greater_basilisk.txt
+++ b/forge-gui/res/cardsfolder/g/greater_basilisk.txt
@@ -4,4 +4,4 @@ Types:Creature Basilisk
 PT:3/5
 K:Deathtouch
 SVar:Picture:http://www.wizards.com/global/images/magic/general/greater_basilisk.jpg
-Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)
+Oracle:Deathtouch
diff --git a/forge-gui/res/cardsfolder/h/hypersonic_dragon.txt b/forge-gui/res/cardsfolder/h/hypersonic_dragon.txt
index 07089674..0f9b7f2c 100644
--- a/forge-gui/res/cardsfolder/h/hypersonic_dragon.txt
+++ b/forge-gui/res/cardsfolder/h/hypersonic_dragon.txt
@@ -1,9 +1,9 @@
-Name:Hypersonic Dragon
-ManaCost:3 U R
-Types:Creature Dragon
-PT:4/4
-K:Flying
-K:Haste
-S:Mode$ Continuous | Affected$ Sorcery.YouCtrl | AddHiddenKeyword$ Flash | AffectedZone$ Exile,Graveyard,Hand,Library | Description$ You may cast sorcery spells as though they had flash.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hypersonic_dragon.jpg
-Oracle:Flying, haste\nYou may cast sorcery spells as though they had flash. (You may cast them any time you could cast an instant.)
+Name:Hypersonic Dragon
+ManaCost:3 U R
+Types:Creature Dragon
+PT:4/4
+K:Flying
+K:Haste
+S:Mode$ Continuous | Affected$ Sorcery.YouCtrl | AddHiddenKeyword$ Flash | AffectedZone$ Exile,Graveyard,Hand,Library | Description$ You may cast sorcery spells as though they had flash.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hypersonic_dragon.jpg
+Oracle:Flying, haste\nYou may cast sorcery spells as though they had flash.
diff --git a/forge-gui/res/cardsfolder/i/illusory_ambusher.txt b/forge-gui/res/cardsfolder/i/illusory_ambusher.txt
index 6834184e..8e229075 100644
--- a/forge-gui/res/cardsfolder/i/illusory_ambusher.txt
+++ b/forge-gui/res/cardsfolder/i/illusory_ambusher.txt
@@ -8,4 +8,4 @@ SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X | References$ X
 SVar:X:TriggerCount$DamageAmount
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/illusory_ambusher.jpg
-Oracle:Flash (You may cast this spell any time you could cast an instant.)\nWhenever Illusory Ambusher is dealt damage, draw that many cards.
\ No newline at end of file
+Oracle:Flash\nWhenever Illusory Ambusher is dealt damage, draw that many cards.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/j/jungle_barrier.txt b/forge-gui/res/cardsfolder/j/jungle_barrier.txt
index a93d42eb..2f1eb8e9 100644
--- a/forge-gui/res/cardsfolder/j/jungle_barrier.txt
+++ b/forge-gui/res/cardsfolder/j/jungle_barrier.txt
@@ -6,4 +6,4 @@ K:Defender
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_barrier.jpg
-Oracle:Defender (This creature can't attack.)\nWhen Jungle Barrier enters the battlefield, draw a card.
+Oracle:Defender\nWhen Jungle Barrier enters the battlefield, draw a card.
diff --git a/forge-gui/res/cardsfolder/m/magma_jet.txt b/forge-gui/res/cardsfolder/m/magma_jet.txt
index f8715a5d..a73dc59e 100644
--- a/forge-gui/res/cardsfolder/m/magma_jet.txt
+++ b/forge-gui/res/cardsfolder/m/magma_jet.txt
@@ -1,7 +1,7 @@
 Name:Magma Jet
 ManaCost:1 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ DBScry | SpellDescription$ CARDNAME deals 2 damage to target creature or player. Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ DBScry | SpellDescription$ CARDNAME deals 2 damage to target creature or player. Scry 2.
 SVar:DBScry:DB$Scry | ScryNum$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magma_jet.jpg
-Oracle:Magma Jet deals 2 damage to target creature or player. Scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+Oracle:Magma Jet deals 2 damage to target creature or player. Scry 2.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/mindcrank.txt b/forge-gui/res/cardsfolder/m/mindcrank.txt
index 32a14210..d5cda73c 100644
--- a/forge-gui/res/cardsfolder/m/mindcrank.txt
+++ b/forge-gui/res/cardsfolder/m/mindcrank.txt
@@ -1,10 +1,10 @@
 Name:Mindcrank
 ManaCost:2
 Types:Artifact
-T:Mode$ LifeLost | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever an opponent loses life, that player puts that many cards from the top of his or her library into his or her graveyard. (Damage dealt by sources without infect causes loss of life.)
+T:Mode$ LifeLost | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever an opponent loses life, that player puts that many cards from the top of his or her library into his or her graveyard. (Damage causes loss of life.)
 SVar:TrigMill:AB$ Mill | Cost$ 0 | Defined$ TriggeredPlayer | NumCards$ X | References$ X
 SVar:X:TriggerCount$LifeAmount
 SVar:RemRandomDeck:True
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mindcrank.jpg
-Oracle:Whenever an opponent loses life, that player puts that many cards from the top of his or her library into his or her graveyard. (Damage dealt by sources without infect causes loss of life.)
+Oracle:Whenever an opponent loses life, that player puts that many cards from the top of his or her library into his or her graveyard. (Damage causes loss of life.)
diff --git a/forge-gui/res/cardsfolder/n/netcaster_spider.txt b/forge-gui/res/cardsfolder/n/netcaster_spider.txt
index 6a8e0cc7..a052bb64 100644
--- a/forge-gui/res/cardsfolder/n/netcaster_spider.txt
+++ b/forge-gui/res/cardsfolder/n/netcaster_spider.txt
@@ -1,9 +1,9 @@
-Name:Netcaster Spider
-ManaCost:2 G
-Types:Creature Spider
-PT:2/3
-K:Reach
-T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2
-SVar:Picture:http://www.wizards.com/global/images/magic/general/netcaster_spider.jpg
-Oracle:Reach (This creature can block creatures with flying.)\nWhenever Netcaster Spider blocks a creature with flying, Netcaster Spider gets +2/+0 until end of turn.
+Name:Netcaster Spider
+ManaCost:2 G
+Types:Creature Spider
+PT:2/3
+K:Reach
+T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, CARDNAME gets +2/+0 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2
+SVar:Picture:http://www.wizards.com/global/images/magic/general/netcaster_spider.jpg
+Oracle:Reach\nWhenever Netcaster Spider blocks a creature with flying, Netcaster Spider gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/serra_ascendant.txt b/forge-gui/res/cardsfolder/s/serra_ascendant.txt
index 88155b1a..f5d1c0ab 100644
--- a/forge-gui/res/cardsfolder/s/serra_ascendant.txt
+++ b/forge-gui/res/cardsfolder/s/serra_ascendant.txt
@@ -7,4 +7,4 @@ S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 5 | AddToughness$ 5 | AddKe
 SVar:X:Count$YourLifeTotal
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serra_ascendant.jpg
-Oracle:Lifelink (Damage dealt by this creature also causes you to gain that much life.)\nAs long as you have 30 or more life, Serra Ascendant gets +5/+5 and has flying.
+Oracle:Lifelink\nAs long as you have 30 or more life, Serra Ascendant gets +5/+5 and has flying.
diff --git a/forge-gui/res/cardsfolder/s/serum_visions.txt b/forge-gui/res/cardsfolder/s/serum_visions.txt
index a7358a56..42b7f5b2 100644
--- a/forge-gui/res/cardsfolder/s/serum_visions.txt
+++ b/forge-gui/res/cardsfolder/s/serum_visions.txt
@@ -1,7 +1,7 @@
 Name:Serum Visions
 ManaCost:U
 Types:Sorcery
-A:SP$ Draw | Cost$ U | Defined$ You | NumCards$ 1 | SubAbility$ DBScry | SpellDescription$ Draw a card. Scry 2 (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+A:SP$ Draw | Cost$ U | Defined$ You | NumCards$ 1 | SubAbility$ DBScry | SpellDescription$ Draw a card. Scry 2.
 SVar:DBScry:DB$Scry | ScryNum$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serum_visions.jpg
-Oracle:Draw a card. Scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+Oracle:Draw a card. Scry 2.
diff --git a/forge-gui/res/cardsfolder/s/stalwart_aven.txt b/forge-gui/res/cardsfolder/s/stalwart_aven.txt
index 98ab53d8..de63a900 100644
--- a/forge-gui/res/cardsfolder/s/stalwart_aven.txt
+++ b/forge-gui/res/cardsfolder/s/stalwart_aven.txt
@@ -6,4 +6,4 @@ K:Flying
 K:Renown:1
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stalwart_aven.jpg
-Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nRenown 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.)
+Oracle:Flying\nRenown 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.)
diff --git a/forge-gui/res/cardsfolder/t/teferi_mage_of_zhalfir.txt b/forge-gui/res/cardsfolder/t/teferi_mage_of_zhalfir.txt
index fc133104..d203d9ed 100644
--- a/forge-gui/res/cardsfolder/t/teferi_mage_of_zhalfir.txt
+++ b/forge-gui/res/cardsfolder/t/teferi_mage_of_zhalfir.txt
@@ -1,9 +1,9 @@
-Name:Teferi, Mage of Zhalfir
-ManaCost:2 U U U
-Types:Legendary Creature Human Wizard
-PT:3/4
-K:Flash
-S:Mode$ Continuous | Affected$ Creature.YouOwn+nonToken | AffectedZone$ Hand,Graveyard,Exile,Library,Command | AddKeyword$ Flash | Description$ Creature cards you own that aren't on the battlefield have flash.
-S:Mode$ CantBeCast | ValidCard$ Card | OnlySorcerySpeed$ True | Caster$ Opponent | Description$ Each opponent can cast spells only any time he or she could cast a sorcery.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/teferi_mage_of_zhalfir.jpg
-Oracle:Flash (You may cast this spell any time you could cast an instant.)\nCreature cards you own that aren't on the battlefield have flash.\nEach opponent can cast spells only any time he or she could cast a sorcery.
+Name:Teferi, Mage of Zhalfir
+ManaCost:2 U U U
+Types:Legendary Creature Human Wizard
+PT:3/4
+K:Flash
+S:Mode$ Continuous | Affected$ Creature.YouOwn+nonToken | AffectedZone$ Hand,Graveyard,Exile,Library,Command | AddKeyword$ Flash | Description$ Creature cards you own that aren't on the battlefield have flash.
+S:Mode$ CantBeCast | ValidCard$ Card | OnlySorcerySpeed$ True | Caster$ Opponent | Description$ Each opponent can cast spells only any time he or she could cast a sorcery.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/teferi_mage_of_zhalfir.jpg
+Oracle:Flash\nCreature cards you own that aren't on the battlefield have flash.\nEach opponent can cast spells only any time he or she could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/t/thundermaw_hellkite.txt b/forge-gui/res/cardsfolder/t/thundermaw_hellkite.txt
index e1c63960..34a01089 100644
--- a/forge-gui/res/cardsfolder/t/thundermaw_hellkite.txt
+++ b/forge-gui/res/cardsfolder/t/thundermaw_hellkite.txt
@@ -1,11 +1,11 @@
-Name:Thundermaw Hellkite
-ManaCost:3 R R
-Types:Creature Dragon
-PT:5/5
-K:Flying
-K:Haste
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ ThunderDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to each creature with flying your opponents control. Tap those creatures.
-SVar:ThunderDamage:AB$ DamageAll | Cost$ 0 | NumDmg$ 1 | ValidCards$ Creature.withFlying+OppCtrl | ValidDescription$ each creature with flying you don't control | SubAbility$ ThunderTap
-SVar:ThunderTap:DB$ TapAll | Cost$ 0 | ValidCards$ Creature.withFlying+OppCtrl | ValidDescription$ each creature with flying you don't control
-SVar:Picture:http://www.wizards.com/global/images/magic/general/thundermaw_hellkite.jpg
-Oracle:Flying\nHaste (This creature can attack and {T} as soon as it comes under your control.)\nWhen Thundermaw Hellkite enters the battlefield, it deals 1 damage to each creature with flying your opponents control. Tap those creatures.
+Name:Thundermaw Hellkite
+ManaCost:3 R R
+Types:Creature Dragon
+PT:5/5
+K:Flying
+K:Haste
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ ThunderDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to each creature with flying your opponents control. Tap those creatures.
+SVar:ThunderDamage:AB$ DamageAll | Cost$ 0 | NumDmg$ 1 | ValidCards$ Creature.withFlying+OppCtrl | ValidDescription$ each creature with flying you don't control | SubAbility$ ThunderTap
+SVar:ThunderTap:DB$ TapAll | Cost$ 0 | ValidCards$ Creature.withFlying+OppCtrl | ValidDescription$ each creature with flying you don't control
+SVar:Picture:http://www.wizards.com/global/images/magic/general/thundermaw_hellkite.jpg
+Oracle:Flying, haste\nWhen Thundermaw Hellkite enters the battlefield, it deals 1 damage to each creature with flying your opponents control. Tap those creatures.
diff --git a/forge-gui/res/cardsfolder/u/ulvenwald_tracker.txt b/forge-gui/res/cardsfolder/u/ulvenwald_tracker.txt
index 3bd59270..b1cee8c5 100644
--- a/forge-gui/res/cardsfolder/u/ulvenwald_tracker.txt
+++ b/forge-gui/res/cardsfolder/u/ulvenwald_tracker.txt
@@ -1,9 +1,9 @@
-Name:Ulvenwald Tracker
-ManaCost:G
-Types:Creature Human Shaman
-PT:1/1
-A:AB$ Pump | Cost$ 1 G T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | SubAbility$ TrackerFight | StackDescription$ None | SpellDescription$ Target creature you control fights another target creature.
-SVar:TrackerFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Choose target creature to fight the first target
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ulvenwald_tracker.jpg
-Oracle:{1}{G}, {T}: Target creature you control fights another target creature. (Each deals damage equal to its power to the other.)
+Name:Ulvenwald Tracker
+ManaCost:G
+Types:Creature Human Shaman
+PT:1/1
+A:AB$ Pump | Cost$ 1 G T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | SubAbility$ TrackerFight | StackDescription$ None | SpellDescription$ Target creature you control fights another target creature.
+SVar:TrackerFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Choose target creature to fight the first target
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ulvenwald_tracker.jpg
+Oracle:{1}{G}, {T}: Target creature you control fights another target creature.
diff --git a/forge-gui/res/cardsfolder/u/undercity_troll.txt b/forge-gui/res/cardsfolder/u/undercity_troll.txt
index a2b7753b..c894ffcd 100644
--- a/forge-gui/res/cardsfolder/u/undercity_troll.txt
+++ b/forge-gui/res/cardsfolder/u/undercity_troll.txt
@@ -1,9 +1,9 @@
-Name:Undercity Troll
-ManaCost:1 G
-Types:Creature Troll
-PT:2/2
-K:Renown:1
-A:AB$ Regenerate | Cost$ 2 G | SpellDescription$ Regenerate CARDNAME. (The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
-DeckHas:Ability$Counters
-SVar:Picture:http://www.wizards.com/global/images/magic/general/undercity_troll.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.)\n{2}{G}: Regenerate Undercity Troll. (The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
+Name:Undercity Troll
+ManaCost:1 G
+Types:Creature Troll
+PT:2/2
+K:Renown:1
+A:AB$ Regenerate | Cost$ 2 G | SpellDescription$ Regenerate CARDNAME.
+DeckHas:Ability$Counters
+SVar:Picture:http://www.wizards.com/global/images/magic/general/undercity_troll.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.)\n{2}{G}: Regenerate Undercity Troll.