diff --git a/res/cardsfolder/aether_mutation.txt b/res/cardsfolder/aether_mutation.txt
index 333a0766a68..cc2651e7be3 100644
--- a/res/cardsfolder/aether_mutation.txt
+++ b/res/cardsfolder/aether_mutation.txt
@@ -2,7 +2,7 @@ Name:AEther Mutation
 ManaCost:3 G U
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$3 G U|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Hand|SpellDescription$Return target creature to its owner's hand. Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost.|SubAbility$MakeToken<>X<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None
+A:SP$Bounce | Cost$ 3 G U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost. | SubAbility$ MakeToken<>X<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None
 #X will be the Converted Mana Cost of the target of AEther Mutation
 SVar:X:Count$CardManaCost
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/altars_light.txt b/res/cardsfolder/altars_light.txt
index 9062154fbad..190d27244ba 100644
--- a/res/cardsfolder/altars_light.txt
+++ b/res/cardsfolder/altars_light.txt
@@ -2,7 +2,7 @@ Name:Altar's Light
 ManaCost:2 W W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$2 W W|ValidTgts$Artifact,Enchantment|TgtPrompt$Select target artifact or enchantment|Destination$Exile|SpellDescription$Exile target artifact or enchantment.
+A:SP$Bounce | Cost$ 2 W W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Destination$ Exile | SpellDescription$ Exile target artifact or enchantment.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/altars_light.jpg
 End
diff --git a/res/cardsfolder/aura_extraction.txt b/res/cardsfolder/aura_extraction.txt
index 51139a9a0fe..41b7b57607f 100644
--- a/res/cardsfolder/aura_extraction.txt
+++ b/res/cardsfolder/aura_extraction.txt
@@ -2,7 +2,7 @@ Name:Aura Extraction
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 W|ValidTgts$Enchantment|TgtPrompt$Select target enchantment|Destination$TopofLibrary|SpellDescription$Put target enchantment on top of its owner's library.
+A:SP$Bounce | Cost$ 1 W | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | Destination$ TopofLibrary | SpellDescription$ Put target enchantment on top of its owner's library.
 K:Cycling:2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aura_extraction.jpg
diff --git a/res/cardsfolder/boomerang.txt b/res/cardsfolder/boomerang.txt
index c0822648ea0..1aab21cd145 100644
--- a/res/cardsfolder/boomerang.txt
+++ b/res/cardsfolder/boomerang.txt
@@ -2,7 +2,7 @@ Name:Boomerang
 ManaCost:U U
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$U U|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$Hand|SpellDescription$Return target permanent to its owner's hand.
+A:SP$Bounce | Cost$ U U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boomerang.jpg
 End
diff --git a/res/cardsfolder/call_to_heel.txt b/res/cardsfolder/call_to_heel.txt
index 74f5eaa5bb0..e6aca91d561 100644
--- a/res/cardsfolder/call_to_heel.txt
+++ b/res/cardsfolder/call_to_heel.txt
@@ -2,7 +2,7 @@ Name:Call to Heel
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 U|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Hand|SpellDescription$Return target creature to its owner's hand. Its controller draws a card.|SubAbility$TgtCtrlrDraw/1
+A:SP$Bounce | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. Its controller draws a card. | SubAbility$ TgtCtrlrDraw/1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/call_to_heel.jpg
 End
diff --git a/res/cardsfolder/capsize.txt b/res/cardsfolder/capsize.txt
index 429cfba757e..57be180890a 100644
--- a/res/cardsfolder/capsize.txt
+++ b/res/cardsfolder/capsize.txt
@@ -2,7 +2,7 @@ Name:Capsize
 ManaCost:1 U U
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 U U|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$Hand|SpellDescription$Return target permanent to its owner's hand.
+A:SP$Bounce | Cost$ 1 U U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:Buyback:3
 SVar:RemAIDeck:True
 SVar:PlayMain1:TRUE
diff --git a/res/cardsfolder/caustic_rain.txt b/res/cardsfolder/caustic_rain.txt
index 5c71b82c589..9b224cb8ecb 100644
--- a/res/cardsfolder/caustic_rain.txt
+++ b/res/cardsfolder/caustic_rain.txt
@@ -2,7 +2,7 @@ Name:Caustic Rain
 ManaCost:2 B B
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$2 B B|ValidTgts$Land|TgtPrompt$Select target land|Destination$Exile|SpellDescription$Exile target land.
+A:SP$Bounce | Cost$ 2 B B | ValidTgts$ Land | TgtPrompt$ Select target land | Destination$ Exile | SpellDescription$ Exile target land.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/caustic_rain.jpg
 End
diff --git a/res/cardsfolder/celestial_purge.txt b/res/cardsfolder/celestial_purge.txt
index 53dff75148e..6cb3957bd36 100644
--- a/res/cardsfolder/celestial_purge.txt
+++ b/res/cardsfolder/celestial_purge.txt
@@ -2,7 +2,7 @@ Name:Celestial Purge
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 W|ValidTgts$Permanent.Black,Permanent.Red|TgtPrompt$Select target black or red permanent|Destination$Exile|SpellDescription$Exile target black or red permanent.
+A:SP$Bounce | Cost$ 1 W | ValidTgts$ Permanent.Black,Permanent.Red | TgtPrompt$ Select target black or red permanent | Destination$ Exile | SpellDescription$ Exile target black or red permanent.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/celestial_purge.jpg
 End
diff --git a/res/cardsfolder/clutch_of_the_undercity.txt b/res/cardsfolder/clutch_of_the_undercity.txt
index 6c668777bda..99549bf05f7 100644
--- a/res/cardsfolder/clutch_of_the_undercity.txt
+++ b/res/cardsfolder/clutch_of_the_undercity.txt
@@ -2,7 +2,7 @@ Name:Clutch of the Undercity
 ManaCost:1 U U B
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 U U B|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$Hand|SpellDescription$Return target permanent to its owner's hand. Its controller loses 3 life.|SubAbility$TgtCtrlrLoseLife/3
+A:SP$Bounce | Cost$ 1 U U B | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand. Its controller loses 3 life. | SubAbility$ TgtCtrlrLoseLife/3
 K:Transmute: 1 U B
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/clutch_of_the_undercity.jpg
diff --git a/res/cardsfolder/condemn.txt b/res/cardsfolder/condemn.txt
index b601b7b1313..9d1ce0940b2 100644
--- a/res/cardsfolder/condemn.txt
+++ b/res/cardsfolder/condemn.txt
@@ -2,7 +2,7 @@ Name:Condemn
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$W|ValidTgts$Creature.attacking|TgtPrompt$Select target attacking creature|Destination$BottomofLibrary|SpellDescription$Put target attacking creature on the bottom of its owner's library. Its controller gains life equal to its toughness.|SubAbility$GainLifeTgtOwner/dX
+A:SP$Bounce | Cost$ W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Destination$ BottomofLibrary | SpellDescription$ Put target attacking creature on the bottom of its owner's library. Its controller gains life equal to its toughness. | SubAbility$ GainLifeTgtOwner/dX
 SVar:dX:Count$TgtCardToughness
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/counterintelligence.txt b/res/cardsfolder/counterintelligence.txt
index 662b49f5163..373f52bee5d 100644
--- a/res/cardsfolder/counterintelligence.txt
+++ b/res/cardsfolder/counterintelligence.txt
@@ -2,7 +2,7 @@ Name:Counterintelligence
 ManaCost:2 U U
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$2 U U|TargetMin$1|TargetMax$2|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Hand|SpellDescription$Return one or two target creatures to their owners' hands.
+A:SP$Bounce | Cost$ 2 U U | TargetMin$ 1 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Hand | SpellDescription$ Return one or two target creatures to their owners' hands.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/counterintelligence.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/cut_the_earthly_bond.txt b/res/cardsfolder/cut_the_earthly_bond.txt
index 1e1ea23ed7f..4266c4a1e7c 100644
--- a/res/cardsfolder/cut_the_earthly_bond.txt
+++ b/res/cardsfolder/cut_the_earthly_bond.txt
@@ -2,7 +2,7 @@ Name:Cut the Earthly Bond
 ManaCost:U
 Types:Instant Arcane
 Text:no text
-A:SP$Bounce|Cost$U|ValidTgts$Permanent.enchanted|TgtPrompt$Select target enchanted permanent|Destination$Hand|SpellDescription$Return target enchanted permanent to its owner's hand.
+A:SP$Bounce | Cost$ U | ValidTgts$ Permanent.enchanted | TgtPrompt$ Select target enchanted permanent | Destination$ Hand | SpellDescription$ Return target enchanted permanent to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cut_the_earthly_bond.jpg
 End
diff --git a/res/cardsfolder/deglamer.txt b/res/cardsfolder/deglamer.txt
index 40dfdc5cb4c..2479da6e94d 100644
--- a/res/cardsfolder/deglamer.txt
+++ b/res/cardsfolder/deglamer.txt
@@ -2,7 +2,7 @@ Name:Deglamer
 ManaCost:1 G
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 G|ValidTgts$Artifact,Enchantment|TgtPrompt$Select target artifact or enchantment|Destination$ShuffleIntoLibrary|SpellDescription$Choose target artifact or enchantment. Its owner shuffles it into his or her library.
+A:SP$Bounce | Cost$ 1 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Destination$ ShuffleIntoLibrary | SpellDescription$ Choose target artifact or enchantment. Its owner shuffles it into his or her library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deglamer.jpg
 End
diff --git a/res/cardsfolder/deny_reality.txt b/res/cardsfolder/deny_reality.txt
index dbb9e6683b0..4bc77fe76a7 100644
--- a/res/cardsfolder/deny_reality.txt
+++ b/res/cardsfolder/deny_reality.txt
@@ -3,7 +3,7 @@ ManaCost:3 U B
 Types:Instant
 Text:no text
 K:Cascade
-A:SP$Bounce|Cost$3 U B|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$Hand|SpellDescription$Return target permanent to its owner's hand.
+A:SP$Bounce | Cost$ 3 U B | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deny_reality.jpg
 End
diff --git a/res/cardsfolder/disempower.txt b/res/cardsfolder/disempower.txt
index f2101910276..5db09661229 100644
--- a/res/cardsfolder/disempower.txt
+++ b/res/cardsfolder/disempower.txt
@@ -2,7 +2,7 @@ Name:Disempower
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 W|ValidTgts$Artifact,Enchantment|TgtPrompt$Select target artifact or enchantment|Destination$TopofLibrary|SpellDescription$Put target artifact or enchantment on top of its owner's library.
+A:SP$Bounce | Cost$ 1 W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Destination$ TopofLibrary | SpellDescription$ Put target artifact or enchantment on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/disempower.jpg
 End
diff --git a/res/cardsfolder/disperse.txt b/res/cardsfolder/disperse.txt
index c13564c3db6..2df8985d121 100644
--- a/res/cardsfolder/disperse.txt
+++ b/res/cardsfolder/disperse.txt
@@ -2,7 +2,7 @@ Name:Disperse
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 U|ValidTgts$Permanent.nonLand|TgtPrompt$Select target nonland permanent|Destination$Hand|SpellDescription$Return target nonland permanent to its owner's hand.
+A:SP$Bounce | Cost$ 1 U | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | Destination$ Hand | SpellDescription$ Return target nonland permanent to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/disperse.jpg
 End
diff --git a/res/cardsfolder/erase.txt b/res/cardsfolder/erase.txt
index 069d0843c74..969e406192f 100644
--- a/res/cardsfolder/erase.txt
+++ b/res/cardsfolder/erase.txt
@@ -2,7 +2,7 @@ Name:Erase
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$W|ValidTgts$Enchantment|TgtPrompt$Select target enchantment|Destination$Exile|SpellDescription$Exile target enchantment.
+A:SP$Bounce | Cost$ W | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | Destination$ Exile | SpellDescription$ Exile target enchantment.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/erase.jpg
 End
diff --git a/res/cardsfolder/essence_fracture.txt b/res/cardsfolder/essence_fracture.txt
index b5ef8abd181..60d5930961f 100644
--- a/res/cardsfolder/essence_fracture.txt
+++ b/res/cardsfolder/essence_fracture.txt
@@ -2,7 +2,7 @@ Name:Essence Fracture
 ManaCost:3 U U
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$3 U U|TargetMin$2|TargetMax$2|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Hand|SpellDescription$Return two target creatures to their owners' hands.
+A:SP$Bounce | Cost$ 3 U U | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Hand | SpellDescription$ Return two target creatures to their owners' hands.
 K:Cycling:2 U
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/essence_fracture.jpg
diff --git a/res/cardsfolder/excommunicate.txt b/res/cardsfolder/excommunicate.txt
index e6d23ef9b54..1cf03290c53 100644
--- a/res/cardsfolder/excommunicate.txt
+++ b/res/cardsfolder/excommunicate.txt
@@ -2,7 +2,7 @@ Name:Excommunicate
 ManaCost:2 W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$2 W|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$TopofLibrary|SpellDescription$Put target creature on top of its owner's library.
+A:SP$Bounce | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ TopofLibrary | SpellDescription$ Put target creature on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/excommunicate.jpg
 End
diff --git a/res/cardsfolder/exile.txt b/res/cardsfolder/exile.txt
index d8a0cf60220..a7553f42474 100644
--- a/res/cardsfolder/exile.txt
+++ b/res/cardsfolder/exile.txt
@@ -2,7 +2,7 @@ Name:Exile
 ManaCost:2 W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$2 W|ValidTgts$Creature.attacking+nonWhite|TgtPrompt$Select target nonwhite attacking creature|Destination$Exile|SpellDescription$Exile target nonwhite attacking creature. You gain life equal to its toughness.|SubAbility$YouGainLife/dX
+A:SP$Bounce | Cost$ 2 W | ValidTgts$ Creature.attacking+nonWhite | TgtPrompt$ Select target nonwhite attacking creature | Destination$ Exile | SpellDescription$ Exile target nonwhite attacking creature. You gain life equal to its toughness. | SubAbility$ YouGainLife/dX
 SVar:dX:Count$TgtCardToughness
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/eye_of_nowhere.txt b/res/cardsfolder/eye_of_nowhere.txt
index e74b0bdd8f5..1e4eb8752b4 100644
--- a/res/cardsfolder/eye_of_nowhere.txt
+++ b/res/cardsfolder/eye_of_nowhere.txt
@@ -2,7 +2,7 @@ Name:Eye of Nowhere
 ManaCost:U U
 Types:Sorcery Arcane
 Text:no text
-A:SP$Bounce|Cost$U U|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$Hand|SpellDescription$Return target permanent to its owner's hand.
+A:SP$Bounce | Cost$ U U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eye_of_nowhere.jpg
 End
diff --git a/res/cardsfolder/fallow_earth.txt b/res/cardsfolder/fallow_earth.txt
index d36859fca2e..a6bc7fb6884 100644
--- a/res/cardsfolder/fallow_earth.txt
+++ b/res/cardsfolder/fallow_earth.txt
@@ -2,7 +2,7 @@ Name:Fallow Earth
 ManaCost:2 G
 Types:Sorcery
 Text:
-A:SP$Bounce|Cost$2 G|ValidTgts$Land|TgtPrompt$Select target land|Destination$TopofLibrary|SpellDescription$Put target land on top of its owner's library.
+A:SP$Bounce | Cost$ 2 G | ValidTgts$ Land | TgtPrompt$ Select target land | Destination$ TopofLibrary | SpellDescription$ Put target land on top of its owner's library.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fallow_earth.jpg
 End
diff --git a/res/cardsfolder/forced_retreat.txt b/res/cardsfolder/forced_retreat.txt
index a4fda97056d..c552ef59883 100644
--- a/res/cardsfolder/forced_retreat.txt
+++ b/res/cardsfolder/forced_retreat.txt
@@ -2,7 +2,7 @@ Name:Forced Retreat
 ManaCost:2 U
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$2 U|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$TopofLibrary|SpellDescription$Put target creature on top of its owner's library.
+A:SP$Bounce | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ TopofLibrary | SpellDescription$ Put target creature on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forced_retreat.jpg
 End
diff --git a/res/cardsfolder/hoodwink.txt b/res/cardsfolder/hoodwink.txt
index ff6355c2060..1ab9e025d20 100644
--- a/res/cardsfolder/hoodwink.txt
+++ b/res/cardsfolder/hoodwink.txt
@@ -2,7 +2,7 @@ Name:Hoodwink
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 U|ValidTgts$Artifact,Enchantment,Land|TgtPrompt$Select target artifact, enchantment, or land|Destination$Hand|SpellDescription$Return target artifact, enchantment, or land to its owner's hand.
+A:SP$Bounce | Cost$ 1 U | ValidTgts$ Artifact,Enchantment,Land | TgtPrompt$ Select target artifact, enchantment, or land | Destination$ Hand | SpellDescription$ Return target artifact, enchantment, or land to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hoodwink.jpg
 End
diff --git a/res/cardsfolder/into_thin_air.txt b/res/cardsfolder/into_thin_air.txt
index ae8ba932aa2..6e29e22ccc4 100644
--- a/res/cardsfolder/into_thin_air.txt
+++ b/res/cardsfolder/into_thin_air.txt
@@ -2,7 +2,7 @@ Name:Into Thin Air
 ManaCost:5 U
 Types:Instant
 Text:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)\r\n
-A:SP$Bounce|Cost$5 U|ValidTgts$Artifact|TgtPrompt$Select target artifact|Destination$Hand|SpellDescription$Return target artifact to its owner's hand.
+A:SP$Bounce | Cost$ 5 U | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | Destination$ Hand | SpellDescription$ Return target artifact to its owner's hand.
 K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/into_thin_air.jpg
diff --git a/res/cardsfolder/ionas_judgment.txt b/res/cardsfolder/ionas_judgment.txt
index 58da61a68b1..021806644e2 100644
--- a/res/cardsfolder/ionas_judgment.txt
+++ b/res/cardsfolder/ionas_judgment.txt
@@ -2,7 +2,7 @@ Name:Iona's Judgment
 ManaCost:4 W
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$4 W|ValidTgts$Creature,Enchantment|TgtPrompt$Select target creature or enchantment|Destination$Exile|SpellDescription$Exile target creature or enchantment.
+A:SP$Bounce | Cost$ 4 W | ValidTgts$ Creature,Enchantment | TgtPrompt$ Select target creature or enchantment | Destination$ Exile|SpellDescription$ Exile target creature or enchantment.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ionas_judgment.jpg
 End
diff --git a/res/cardsfolder/last_breath.txt b/res/cardsfolder/last_breath.txt
index cde807b27b8..c6e7eead372 100644
--- a/res/cardsfolder/last_breath.txt
+++ b/res/cardsfolder/last_breath.txt
@@ -2,7 +2,7 @@ Name:Last Breath
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 W|ValidTgts$Creature.powerLE2|TgtPrompt$Select target creature with power 2 or less|Destination$Exile|SpellDescription$Exile target creature with power 2 or less. Its controller gains 4 life.|SubAbility$TgtCtrlrGainLife/4
+A:SP$Bounce | Cost$ 1 W | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | Destination$ Exile | SpellDescription$ Exile target creature with power 2 or less. Its controller gains 4 life. | SubAbility$ TgtCtrlrGainLife/4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/last_breath.jpg
 End
diff --git a/res/cardsfolder/plow_under.txt b/res/cardsfolder/plow_under.txt
index 4444ebbb683..01e0843164b 100644
--- a/res/cardsfolder/plow_under.txt
+++ b/res/cardsfolder/plow_under.txt
@@ -2,7 +2,7 @@ Name:Plow Under
 ManaCost:3 G G
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$3 G G|TargetMin$2|TargetMax$2|ValidTgts$Land|TgtPrompt$Select target Land|Destination$TopofLibrary|SpellDescription$Put two target lands on top of their owners' libraries.
+A:SP$Bounce | Cost$ 3 G G | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target Land | Destination$ TopofLibrary | SpellDescription$ Put two target lands on top of their owners' libraries.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/plow_under.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/recoil.txt b/res/cardsfolder/recoil.txt
index 8e8a9b81fbe..762b10981bd 100644
--- a/res/cardsfolder/recoil.txt
+++ b/res/cardsfolder/recoil.txt
@@ -2,7 +2,7 @@ Name:Recoil
 ManaCost:1 U B
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 U B|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$Hand|SpellDescription$Return target permanent to its owner's hand. Then that player discard a card.|SubAbility$TgtOwnerDiscard/1
+A:SP$Bounce | Cost$ 1 U B | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand. Then that player discard a card. | SubAbility$ TgtOwnerDiscard/1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/recoil.jpg
 End
diff --git a/res/cardsfolder/regress.txt b/res/cardsfolder/regress.txt
index 7dd35a87571..f960f4d0dea 100644
--- a/res/cardsfolder/regress.txt
+++ b/res/cardsfolder/regress.txt
@@ -2,7 +2,7 @@ Name:Regress
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$2 U|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$Hand|SpellDescription$Return target permanent to its owner's hand.
+A:SP$Bounce | Cost$ 2 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/mrd/en-us/card49061.jpg
 End
diff --git a/res/cardsfolder/repel.txt b/res/cardsfolder/repel.txt
index 0d0d6763674..001754fd23f 100644
--- a/res/cardsfolder/repel.txt
+++ b/res/cardsfolder/repel.txt
@@ -2,7 +2,7 @@ Name:Repel
 ManaCost:3 U
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$3 U|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$TopofLibrary|SpellDescription$Put target creature on top of its owner's library.
+A:SP$Bounce | Cost$ 3 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ TopofLibrary | SpellDescription$ Put target creature on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/repel.jpg
 End
diff --git a/res/cardsfolder/repulse.txt b/res/cardsfolder/repulse.txt
index ea4f9ec4792..b3cf1bcf6cc 100644
--- a/res/cardsfolder/repulse.txt
+++ b/res/cardsfolder/repulse.txt
@@ -2,7 +2,7 @@ Name:Repulse
 ManaCost:2 U
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$2 U|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Hand|SpellDescription$Return target creature to its owner's hand.
+A:SP$Bounce | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
 K:Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/in/en-us/card22985.jpg
diff --git a/res/cardsfolder/rescind.txt b/res/cardsfolder/rescind.txt
index d62d1542737..33cc27f0174 100644
--- a/res/cardsfolder/rescind.txt
+++ b/res/cardsfolder/rescind.txt
@@ -3,7 +3,7 @@ ManaCost:1 U U
 Types:Instant
 Text:
 K:Cycling:2
-A:SP$Bounce|Cost$1 U U|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$Hand|SpellDescription$Return target permanent to its owner's hand.
+A:SP$Bounce | Cost$ 1 U U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rescind.jpg
 End
diff --git a/res/cardsfolder/revoke_existence.txt b/res/cardsfolder/revoke_existence.txt
index ece26b1dbdd..3428e85bea6 100644
--- a/res/cardsfolder/revoke_existence.txt
+++ b/res/cardsfolder/revoke_existence.txt
@@ -2,7 +2,7 @@ Name:Revoke Existence
 ManaCost:1 W
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$1 W|ValidTgts$Artifact,Enchantment|TgtPrompt$Select target artifact or enchantment|Destination$Exile|SpellDescription$Exile target artifact or enchantment.
+A:SP$Bounce | Cost$ 1 W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Destination$ Exile | SpellDescription$ Exile target artifact or enchantment.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/revoke_existence.jpg
 End
diff --git a/res/cardsfolder/second_thoughts.txt b/res/cardsfolder/second_thoughts.txt
index 96af8916b4c..2f8caabfbe0 100644
--- a/res/cardsfolder/second_thoughts.txt
+++ b/res/cardsfolder/second_thoughts.txt
@@ -2,7 +2,7 @@ Name:Second Thoughts
 ManaCost:4 W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$4 W|ValidTgts$Creature.attacking|TgtPrompt$Select target attacking creature|Destination$Exile|SpellDescription$Exile target attacking creature.
+A:SP$Bounce | Cost$ 4 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Destination$ Exile | SpellDescription$ Exile target attacking creature.
 K:Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/snap.txt b/res/cardsfolder/snap.txt
index 7299ad7f352..031f3b28024 100644
--- a/res/cardsfolder/snap.txt
+++ b/res/cardsfolder/snap.txt
@@ -2,7 +2,7 @@ Name:Snap
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 U|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Hand|SpellDescription$Return target creature to its owner's hand. Untap up to two lands.|SubAbility$YouUntapUpTo/2/Land
+A:SP$Bounce | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. Untap up to two lands. | SubAbility$ YouUntapUpTo/2/Land
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/snap.jpg
 End
diff --git a/res/cardsfolder/surging_aether.txt b/res/cardsfolder/surging_aether.txt
index 77a47eb3520..5c49aa094d1 100644
--- a/res/cardsfolder/surging_aether.txt
+++ b/res/cardsfolder/surging_aether.txt
@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Instant
 Text:
 K:Ripple:4
-A:SP$Bounce|Cost$3 U|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$Hand|SpellDescription$Return target permanent to its owner's hand.
+A:SP$Bounce | Cost$ 3 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/surging_aether.jpg
 End
diff --git a/res/cardsfolder/swords_to_plowshares.txt b/res/cardsfolder/swords_to_plowshares.txt
index 1758866a351..25971caa4cb 100644
--- a/res/cardsfolder/swords_to_plowshares.txt
+++ b/res/cardsfolder/swords_to_plowshares.txt
@@ -2,7 +2,7 @@ Name:Swords to Plowshares
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$W|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Exile|SpellDescription$Exile target creature. Its controller gains life equal to its power.|SubAbility$TgtCtrlrGainLife/dX
+A:SP$Bounce | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Exile | SpellDescription$ Exile target creature. Its controller gains life equal to its power. | SubAbility$ TgtCtrlrGainLife/dX
 SVar:dX:Count$TgtCardPower
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/br/en-us/card21172.jpg
diff --git a/res/cardsfolder/symbol_of_unsummoning.txt b/res/cardsfolder/symbol_of_unsummoning.txt
index 17df805938d..35b600f4fe1 100644
--- a/res/cardsfolder/symbol_of_unsummoning.txt
+++ b/res/cardsfolder/symbol_of_unsummoning.txt
@@ -2,7 +2,7 @@ Name:Symbol of Unsummoning
 ManaCost:2 U
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$2 U|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Hand|SpellDescription$Return target creature to its owner's hand.
+A:SP$Bounce | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
 K:Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/symbol_of_unsummoning.jpg
diff --git a/res/cardsfolder/temporal_eddy.txt b/res/cardsfolder/temporal_eddy.txt
index 7f8dffc4339..985c8f2a49c 100644
--- a/res/cardsfolder/temporal_eddy.txt
+++ b/res/cardsfolder/temporal_eddy.txt
@@ -2,7 +2,7 @@ Name:Temporal Eddy
 ManaCost:2 U U
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$2 U U|ValidTgts$Creature,Land|TgtPrompt$Select target creature or land|Destination$TopofLibrary|SpellDescription$Put target creature or land on top of its owner's library.
+A:SP$Bounce | Cost$ 2 U U | ValidTgts$ Creature,Land | TgtPrompt$ Select target creature or land | Destination$ TopofLibrary | SpellDescription$ Put target creature or land on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temporal_eddy.jpg
 End
diff --git a/res/cardsfolder/temporal_fissure.txt b/res/cardsfolder/temporal_fissure.txt
index 72cd110fb5d..aeff66d244f 100644
--- a/res/cardsfolder/temporal_fissure.txt
+++ b/res/cardsfolder/temporal_fissure.txt
@@ -2,7 +2,7 @@ Name:Temporal Fissure
 ManaCost:4 U
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$4 U|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$Hand|SpellDescription$Return target permanent to its owner's hand.
+A:SP$Bounce | Cost$ 4 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 K:Storm
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temporal_fissure.jpg
diff --git a/res/cardsfolder/temporal_spring.txt b/res/cardsfolder/temporal_spring.txt
index 1a2fcf0a63d..f6bba1e8037 100644
--- a/res/cardsfolder/temporal_spring.txt
+++ b/res/cardsfolder/temporal_spring.txt
@@ -2,7 +2,7 @@ Name:Temporal Spring
 ManaCost:1 G U
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$1 G U|ValidTgts$Permanent|TgtPrompt$Select target permanent|Destination$TopofLibrary|SpellDescription$Put target permanent on top of its owner's library.
+A:SP$Bounce | Cost$ 1 G U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Destination$ TopofLibrary | SpellDescription$ Put target permanent on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temporal_spring.jpg
 End
diff --git a/res/cardsfolder/time_ebb.txt b/res/cardsfolder/time_ebb.txt
index d72bb4bbbed..69e9ac40886 100644
--- a/res/cardsfolder/time_ebb.txt
+++ b/res/cardsfolder/time_ebb.txt
@@ -2,7 +2,7 @@ Name:Time Ebb
 ManaCost:2 U
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$2 U|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$TopofLibrary|SpellDescription$Put target creature on top of its owner's library.
+A:SP$Bounce | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ TopofLibrary | SpellDescription$ Put target creature on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/time_ebb.jpg
 End
diff --git a/res/cardsfolder/undo.txt b/res/cardsfolder/undo.txt
index 299e794d43a..d53bf786312 100644
--- a/res/cardsfolder/undo.txt
+++ b/res/cardsfolder/undo.txt
@@ -2,7 +2,7 @@ Name:Undo
 ManaCost:1 U U
 Types:Sorcery
 Text:no text
-A:SP$Bounce|Cost$1 U U|TargetMin$2|TargetMax$2|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Hand|SpellDescription$Return two target creatures to their owners' hands.
+A:SP$Bounce | Cost$ 1 U U | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Hand | SpellDescription$ Return two target creatures to their owners' hands.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/undo.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/unmake.txt b/res/cardsfolder/unmake.txt
index 00928bdd9bf..7c4a4c82f8b 100644
--- a/res/cardsfolder/unmake.txt
+++ b/res/cardsfolder/unmake.txt
@@ -2,7 +2,7 @@ Name:Unmake
 ManaCost:WB WB WB
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$WB WB WB|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Exile|SpellDescription$Remove target creature from the game.
+A:SP$Bounce | Cost$ WB WB WB | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Exile | SpellDescription$ Remove target creature from the game.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unmake.jpg
 End
diff --git a/res/cardsfolder/unsummon.txt b/res/cardsfolder/unsummon.txt
index 5d0655bd987..75ce4a60e78 100644
--- a/res/cardsfolder/unsummon.txt
+++ b/res/cardsfolder/unsummon.txt
@@ -2,7 +2,7 @@ Name:Unsummon
 ManaCost:U
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$U|ValidTgts$Creature|TgtPrompt$Select target creature|Destination$Hand|SpellDescription$Return target creature to its owner's hand.
+A:SP$Bounce | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/unsummon.jpg
 End
diff --git a/res/cardsfolder/uproot.txt b/res/cardsfolder/uproot.txt
index 8a4f0118989..27a99c21405 100644
--- a/res/cardsfolder/uproot.txt
+++ b/res/cardsfolder/uproot.txt
@@ -2,7 +2,7 @@ Name:Uproot
 ManaCost:3 G
 Types:Sorcery Arcane
 Text:no text
-A:SP$Bounce|Cost$3 G|ValidTgts$Land|TgtPrompt$Select target land|Destination$TopofLibrary|SpellDescription$Put target land on top of its owner's library.
+A:SP$Bounce | Cost$ 3 G | ValidTgts$ Land | TgtPrompt$ Select target land | Destination$ TopofLibrary | SpellDescription$ Put target land on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/uproot.jpg
 End
diff --git a/res/cardsfolder/wipe_clean.txt b/res/cardsfolder/wipe_clean.txt
index a5b3ef5aefa..9eb40b729cb 100644
--- a/res/cardsfolder/wipe_clean.txt
+++ b/res/cardsfolder/wipe_clean.txt
@@ -2,7 +2,7 @@ Name:Wipe Clean
 ManaCost:1 W
 Types:Instant
 Text:no text
-A:SP$Bounce|Cost$1 W|ValidTgts$Enchantment|TgtPrompt$Select target enchantment|Destination$Exile|SpellDescription$Exile target enchantment.
+A:SP$Bounce | Cost$ 1 W | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | Destination$ Exile | SpellDescription$ Exile target enchantment.
 K:Cycling:3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wipe_clean.jpg