diff --git a/res/cardsfolder/magus_of_the_library.txt b/res/cardsfolder/magus_of_the_library.txt
index 5a3c576b821..0e5347136c0 100644
--- a/res/cardsfolder/magus_of_the_library.txt
+++ b/res/cardsfolder/magus_of_the_library.txt
@@ -3,8 +3,8 @@ ManaCost:G G
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$Mana|Cost$T|Produced$1|SpellDescription$Add 1 to your mana pool.
-A:AB$Draw | Cost$ T | NumCards$ 1 | ActivatingCardsInHand$ 7 | SpellDescription$ Draw a card. Activate this ability only if you have exactly seven cards in hand.
+A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
+A:AB$ Draw | Cost$ T | NumCards$ 1 | ActivatingCardsInHand$ 7 | SpellDescription$ Draw a card. Activate this ability only if you have exactly seven cards in hand.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/plc/en-us/card134741.jpg
diff --git a/res/cardsfolder/magus_of_the_unseen.txt b/res/cardsfolder/magus_of_the_unseen.txt
index 3ce1f5a04a8..eaa044ae850 100644
--- a/res/cardsfolder/magus_of_the_unseen.txt
+++ b/res/cardsfolder/magus_of_the_unseen.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$GainControl|Cost$ 1 U T|ValidTgts$Artifact.YouDontCtrl|TgtPrompt$Select target artifact opponent controls.|LoseControl$EOT|AddKWs$Haste|Untap$True|TapOnLose$True|SpellDescription$ Untap target artifact an opponent controls and gain control of it until end of turn. It gains haste until end of turn. When you lose control of the artifact, tap it.
+A:AB$ GainControl | Cost$ 1 U T | ValidTgts$ Artifact.YouDontCtrl | TgtPrompt$ Select target artifact opponent controls | LoseControl$ EOT | AddKWs$ Haste | Untap$ True | TapOnLose$ True | SpellDescription$ Untap target artifact an opponent controls and gain control of it until end of turn. It gains haste until end of turn. When you lose control of the artifact, tap it.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_unseen.jpg
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/102.jpg
diff --git a/res/cardsfolder/mana_crypt.txt b/res/cardsfolder/mana_crypt.txt
index 5801a7701e8..a5d3fc034f1 100644
--- a/res/cardsfolder/mana_crypt.txt
+++ b/res/cardsfolder/mana_crypt.txt
@@ -2,7 +2,7 @@ Name:Mana Crypt
 ManaCost:0
 Types:Artifact
 Text:At the beginning of your upkeep, flip a coin. If you lose the flip, CARDNAME deals 3 damage to you.
-A:AB$Mana | Cost$T | Produced$1 | Amount$2 | SpellDescription$Add 2 to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ 1 | Amount$ 2 | SpellDescription$ Add 2 to your mana pool.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_crypt.jpg
diff --git a/res/cardsfolder/mana_cylix.txt b/res/cardsfolder/mana_cylix.txt
index 811a17cd2f5..40476c91cdb 100644
--- a/res/cardsfolder/mana_cylix.txt
+++ b/res/cardsfolder/mana_cylix.txt
@@ -2,11 +2,11 @@ Name:Mana Cylix
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$Mana|Cost$1 T|Produced$W|SpellDescription$Add W 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$1 T|Produced$G|SpellDescription$Add G to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ W | SpellDescription$ Add W 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$ 1 T | Produced$ G | SpellDescription$ Add G to your mana pool.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_cylix.jpg
diff --git a/res/cardsfolder/mana_prism.txt b/res/cardsfolder/mana_prism.txt
index 706cc7ef13c..e3cbf62a2c0 100644
--- a/res/cardsfolder/mana_prism.txt
+++ b/res/cardsfolder/mana_prism.txt
@@ -2,12 +2,12 @@ Name:Mana Prism
 ManaCost:3
 Types:Artifact
 Text:no text
-A:AB$Mana|Cost$T|Produced$1|SpellDescription$Add 1 to your mana pool.
-A:AB$Mana|Cost$1 T|Produced$W|SpellDescription$Add W 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$1 T|Produced$G|SpellDescription$Add G to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ W | SpellDescription$ Add W 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$ 1 T | Produced$ G | SpellDescription$ Add G to your mana pool.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_prism.jpg
diff --git a/res/cardsfolder/mana_vault.txt b/res/cardsfolder/mana_vault.txt
index 0016001c5f8..41a74f6ccca 100644
--- a/res/cardsfolder/mana_vault.txt
+++ b/res/cardsfolder/mana_vault.txt
@@ -2,7 +2,7 @@ Name:Mana Vault
 ManaCost:1
 Types:Artifact
 Text:At the beginning of your upkeep, you may pay 4. If you do, untap Mana Vault.\r\nAt the beginning of your draw step, if Mana Vault is tapped, it deals 1 damage to you.
-A:AB$Mana|Cost$T|Produced$1|Amount$3|SpellDescription$Add 3 to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ 1 | Amount$ 3 | SpellDescription$ Add 3 to your mana pool.
 K:CARDNAME doesn't untap during your untap step.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/manakin.txt b/res/cardsfolder/manakin.txt
index 25978a0835f..9b1f3445a7b 100644
--- a/res/cardsfolder/manakin.txt
+++ b/res/cardsfolder/manakin.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact Creature Construct
 Text:no text
 PT:1/1
-A:AB$Mana|Cost$T|Produced$1|SpellDescription$Add 1 to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/manakin.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/286.jpg
diff --git a/res/cardsfolder/marble_diamond.txt b/res/cardsfolder/marble_diamond.txt
index 7ee9f61ec01..3a1ee0fe9c1 100644
--- a/res/cardsfolder/marble_diamond.txt
+++ b/res/cardsfolder/marble_diamond.txt
@@ -2,7 +2,7 @@ Name:Marble Diamond
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$Mana|Cost$T|Produced$W|SpellDescription$Add W to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 K:CARDNAME enters the battlefield tapped.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/marble_diamond.jpg
diff --git a/res/cardsfolder/marjhan.txt b/res/cardsfolder/marjhan.txt
index b17f5e832e1..0927a58f74e 100644
--- a/res/cardsfolder/marjhan.txt
+++ b/res/cardsfolder/marjhan.txt
@@ -6,9 +6,9 @@ PT:8/8
 K:CARDNAME doesn't untap during your untap step.
 K:CARDNAME can't attack unless defending player controls an Island.
 K:When you control no Islands, sacrifice CARDNAME.
-A:AB$Untap | Cost$ U U Sac<1/Creature> | ActivatingPhases$ Upkeep|PlayerTurn$True | SpellDescription$ Untap CARDNAME. Activate this ability only during your upkeep.
-A:AB$DealDamage | Cost$ U U | NumDmg$1 |ValidTgts$Creature.attacking+withoutFlying|TgtPrompt$ Select target attacking creature without flying| SubAbility$ SVar=DBPump|SpellDescription$ CARDNAME gets -1/-0 until end of turn and deals 1 damage to target attacking creature without flying.
-SVar:DBPump:DB$Pump | NumAtt$-1| Defined$ Self
+A:AB$ Untap | Cost$ U U Sac<1/Creature> | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Untap CARDNAME. Activate this ability only during your upkeep.
+A:AB$ DealDamage | Cost$ U U | NumDmg$1 | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | SubAbility$ SVar=DBPump | SpellDescription$ CARDNAME gets -1/-0 until end of turn and deals 1 damage to target attacking creature without flying.
+SVar:DBPump:DB$Pump | NumAtt$ -1| Defined$ Self
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/marjhan.jpg
diff --git a/res/cardsfolder/meloku_the_clouded_mirror.txt b/res/cardsfolder/meloku_the_clouded_mirror.txt
index 7dcf89c44bd..c5456d721dc 100644
--- a/res/cardsfolder/meloku_the_clouded_mirror.txt
+++ b/res/cardsfolder/meloku_the_clouded_mirror.txt
@@ -4,8 +4,7 @@ Types:Legendary Creature Moonfolk Wizard
 Text:no text
 PT:2/4
 K:Flying
-#K:abMakeToken 1 Return<1/Land><>1<>Illusion<>U 1 1 Illusion<>Controller<>U<>Creature;Illusion<>1<>1<>Flying<>Put a 1/1 blue Illusion creature token with flying onto the battlefield.
-A:AB$Token | Cost$ 1 Return<1/Land> | TokenAmount$ 1 | TokenName$ Illusion | TokenTypes$ Creature,Illusion | TokenOwner$ Controller | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put a 1/1 blue Illusion creature token with flying onto the battlefield.
+A:AB$ Token | Cost$ 1 Return<1/Land> | TokenAmount$ 1 | TokenName$ Illusion | TokenTypes$ Creature,Illusion | TokenOwner$ Controller | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put a 1/1 blue Illusion creature token with flying onto the battlefield.
 SVar:Rarity:Rare
 SVar:RemAIDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card75268.jpg