diff --git a/.gitattributes b/.gitattributes
index 945f94e3824..a4ff9522d1b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1033,7 +1033,7 @@ res/cardsfolder/cemetery_reaper.txt -text svneol=native#text/plain
 res/cardsfolder/cenns_enlistment.txt -text svneol=native#text/plain
 res/cardsfolder/cenns_heir.txt -text svneol=native#text/plain
 res/cardsfolder/centaur_archer.txt -text svneol=native#text/plain
-res/cardsfolder/centaur_chieftain.txt -text svneol=native#text/plain
+res/cardsfolder/centaur_chieftain.txt svneol=native#text/plain
 res/cardsfolder/centaur_courser.txt -text svneol=native#text/plain
 res/cardsfolder/centaur_garden.txt -text svneol=native#text/plain
 res/cardsfolder/centaur_glade.txt -text svneol=native#text/plain
@@ -1616,7 +1616,7 @@ res/cardsfolder/destructive_flow.txt -text svneol=native#text/plain
 res/cardsfolder/destructive_force.txt -text svneol=native#text/plain
 res/cardsfolder/destructive_urge.txt -text svneol=native#text/plain
 res/cardsfolder/detonate.txt svneol=native#text/plain
-res/cardsfolder/deus_of_calamity.txt -text svneol=native#text/plain
+res/cardsfolder/deus_of_calamity.txt svneol=native#text/plain
 res/cardsfolder/devastate.txt svneol=native#text/plain
 res/cardsfolder/devastation.txt -text svneol=native#text/plain
 res/cardsfolder/devoted_druid.txt -text svneol=native#text/plain
@@ -1897,7 +1897,7 @@ res/cardsfolder/electric_eel.txt svneol=native#text/plain
 res/cardsfolder/electrolyze.txt -text svneol=native#text/plain
 res/cardsfolder/electropotence.txt -text svneol=native#text/plain
 res/cardsfolder/elemental_augury.txt -text svneol=native#text/plain
-res/cardsfolder/elemental_mastery.txt -text svneol=native#text/plain
+res/cardsfolder/elemental_mastery.txt svneol=native#text/plain
 res/cardsfolder/elephant_ambush.txt -text svneol=native#text/plain
 res/cardsfolder/elephant_graveyard.txt -text svneol=native#text/plain
 res/cardsfolder/elephant_guide.txt svneol=native#text/plain
@@ -3315,7 +3315,7 @@ res/cardsfolder/jade_idol.txt svneol=native#text/plain
 res/cardsfolder/jade_leech.txt -text svneol=native#text/plain
 res/cardsfolder/jade_statue.txt -text svneol=native#text/plain
 res/cardsfolder/jagged_lightning.txt -text svneol=native#text/plain
-res/cardsfolder/jagged_poppet.txt -text svneol=native#text/plain
+res/cardsfolder/jagged_poppet.txt svneol=native#text/plain
 res/cardsfolder/jagged_scar_archers.txt svneol=native#text/plain
 res/cardsfolder/jagwasp_swarm.txt -text svneol=native#text/plain
 res/cardsfolder/jalum_tome.txt -text svneol=native#text/plain
@@ -3464,7 +3464,7 @@ res/cardsfolder/keeper_of_tresserhorn.txt -text svneol=native#text/plain
 res/cardsfolder/keepers_of_the_faith.txt -text svneol=native#text/plain
 res/cardsfolder/keiga_the_tide_star.txt -text svneol=native#text/plain
 res/cardsfolder/keldon_arsonist.txt svneol=native#text/plain
-res/cardsfolder/keldon_battlewagon.txt -text svneol=native#text/plain
+res/cardsfolder/keldon_battlewagon.txt svneol=native#text/plain
 res/cardsfolder/keldon_berserker.txt svneol=native#text/plain
 res/cardsfolder/keldon_champion.txt -text svneol=native#text/plain
 res/cardsfolder/keldon_halberdier.txt -text svneol=native#text/plain
@@ -4660,7 +4660,7 @@ res/cardsfolder/oxidize.txt -text svneol=native#text/plain
 res/cardsfolder/oyobi_who_split_the_heavens.txt -text svneol=native#text/plain
 res/cardsfolder/pacifism.txt -text svneol=native#text/plain
 res/cardsfolder/pain_kami.txt svneol=native#text/plain
-res/cardsfolder/pain_magnification.txt -text svneol=native#text/plain
+res/cardsfolder/pain_magnification.txt svneol=native#text/plain
 res/cardsfolder/painsmith.txt -text svneol=native#text/plain
 res/cardsfolder/painters_servant.txt -text svneol=native#text/plain
 res/cardsfolder/paladin_en_vec.txt -text svneol=native#text/plain
@@ -6814,7 +6814,7 @@ res/cardsfolder/toils_of_night_and_day.txt svneol=native#text/plain
 res/cardsfolder/tolaria_west.txt -text svneol=native#text/plain
 res/cardsfolder/tolarian_academy.txt -text svneol=native#text/plain
 res/cardsfolder/tolarian_emissary.txt -text svneol=native#text/plain
-res/cardsfolder/tolarian_entrancer.txt -text svneol=native#text/plain
+res/cardsfolder/tolarian_entrancer.txt svneol=native#text/plain
 res/cardsfolder/tolarian_serpent.txt -text svneol=native#text/plain
 res/cardsfolder/tolsimir_wolfblood.txt -text svneol=native#text/plain
 res/cardsfolder/tome_scour.txt -text svneol=native#text/plain
@@ -7367,7 +7367,7 @@ res/cardsfolder/waterspout_weavers.txt -text svneol=native#text/plain
 res/cardsfolder/waterveil_cavern.txt -text svneol=native#text/plain
 res/cardsfolder/watery_grave.txt -text svneol=native#text/plain
 res/cardsfolder/wave_elemental.txt -text svneol=native#text/plain
-res/cardsfolder/wave_of_terror.txt -text svneol=native#text/plain
+res/cardsfolder/wave_of_terror.txt svneol=native#text/plain
 res/cardsfolder/waveskimmer_aven.txt -text svneol=native#text/plain
 res/cardsfolder/wayfaring_giant.txt -text svneol=native#text/plain
 res/cardsfolder/waylay.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/centaur_chieftain.txt b/res/cardsfolder/centaur_chieftain.txt
index 3822cf1ae53..8d7e68b86b7 100644
--- a/res/cardsfolder/centaur_chieftain.txt
+++ b/res/cardsfolder/centaur_chieftain.txt
@@ -1,11 +1,12 @@
-Name:Centaur Chieftain
-ManaCost:3 G
-Types:Creature Centaur
-Text:no text
-PT:3/3
-K:Haste
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | Threshold$ True | TriggerDescription$ Threshold - As long as seven or more cards are in your graveyard, CARDNAME has "When CARDNAME enters the battlefield, creatures you control get +1/+1 and gain trample until end of turn."
-SVar:TrigPumpAll:AB$PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Trample
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/centaur_chieftain.jpg
-End
+Name:Centaur Chieftain
+ManaCost:3 G
+Types:Creature Centaur
+Text:no text
+PT:3/3
+K:Haste
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | Threshold$ True | TriggerDescription$ Threshold - As long as seven or more cards are in your graveyard, CARDNAME has "When CARDNAME enters the battlefield, creatures you control get +1/+1 and gain trample until end of turn."
+SVar:TrigPumpAll:AB$PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Trample
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/centaur_chieftain.jpg
+SetInfo:TOR|Uncommon|http://magiccards.info/scans/en/tr/122.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/deus_of_calamity.txt b/res/cardsfolder/deus_of_calamity.txt
index 37b8ca46dac..fdfe9f6ef22 100644
--- a/res/cardsfolder/deus_of_calamity.txt
+++ b/res/cardsfolder/deus_of_calamity.txt
@@ -1,11 +1,12 @@
-Name:Deus of Calamity
-ManaCost:RG RG RG RG RG
-Types:Creature Spirit Avatar
-Text:no text
-PT:6/6
-K:Trample
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | DamageAmount$ GE6 | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME deals 6 or more damage to an opponent, destroy target land that player controls.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Land.YouDontCtrl | TgtPrompt$ Select target land opponent controls.
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/deus_of_calamity.jpg
+Name:Deus of Calamity
+ManaCost:RG RG RG RG RG
+Types:Creature Spirit Avatar
+Text:no text
+PT:6/6
+K:Trample
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | DamageAmount$ GE6 | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME deals 6 or more damage to an opponent, destroy target land that player controls.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Land.YouDontCtrl | TgtPrompt$ Select target land opponent controls.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/deus_of_calamity.jpg
+SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/204.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/elemental_mastery.txt b/res/cardsfolder/elemental_mastery.txt
index 2aca5aef41d..c231ee4014a 100644
--- a/res/cardsfolder/elemental_mastery.txt
+++ b/res/cardsfolder/elemental_mastery.txt
@@ -1,11 +1,12 @@
-Name:Elemental Mastery
-ManaCost:3 R
-Types:Enchantment Aura
-Text:no text
-K:Enchant Creature
-K:stPumpEnchanted:Creature.AttachedBy:0/0/SVar=Token & SVar=TokenCount:no Condition:Enchanted creature has ": Put X 1/1 red Elemental creature tokens with haste onto the battlefield, where X is this creature's power. Exile them at the beginning of the next end step."
-SVar:Token:AB$Token | Cost$ T | TokenAmount$ TokenCount | TokenImage$ r 1 1 elemental | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenKeywords$ Haste<>HIDDEN At the beginning of the end step, exile CARDNAME. | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put X 1/1 red Elemental creature tokens with haste onto the battlefield, where X is this creature's power. Exile them at the beginning of the next end step.
-SVar:TokenCount:Count$CardPower
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/elemental_mastery.jpg
+Name:Elemental Mastery
+ManaCost:3 R
+Types:Enchantment Aura
+Text:no text
+K:Enchant Creature
+K:stPumpEnchanted:Creature.AttachedBy:0/0/SVar=Token & SVar=TokenCount:no Condition:Enchanted creature has ": Put X 1/1 red Elemental creature tokens with haste onto the battlefield, where X is this creature's power. Exile them at the beginning of the next end step."
+SVar:Token:AB$Token | Cost$ T | TokenAmount$ TokenCount | TokenImage$ r 1 1 elemental | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenKeywords$ Haste<>HIDDEN At the beginning of the end step, exile CARDNAME. | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put X 1/1 red Elemental creature tokens with haste onto the battlefield, where X is this creature's power. Exile them at the beginning of the next end step.
+SVar:TokenCount:Count$CardPower
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/elemental_mastery.jpg
+SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/90.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/jagged_poppet.txt b/res/cardsfolder/jagged_poppet.txt
index 4aa0934e4aa..f7f1fd00526 100644
--- a/res/cardsfolder/jagged_poppet.txt
+++ b/res/cardsfolder/jagged_poppet.txt
@@ -1,13 +1,14 @@
-Name:Jagged Poppet
-ManaCost:1 B R
-Types:Creature Ogre Warrior
-Text:no text
-PT:3/4
-T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigYouDiscard | TriggerDescription$ Whenever CARDNAME is dealt damage, discard that many cards.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Hellbent$ True | CombatDamage$ True | Execute$ TrigOppDiscard | TriggerDescription$ Hellbent - Whenever CARDNAME deals combat damage to a player, if you have no cards in hand, that player discards cards equal to the damage.
-SVar:TrigYouDiscard:AB$Discard | Cost$ 0 | Defined$ You | NumCards$ X | Mode$ TgtChoose
-SVar:TrigOppDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ X | Mode$ TgtChoose
-SVar:X:Count$TriggeredDamageAmount
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/jagged_poppet.jpg
+Name:Jagged Poppet
+ManaCost:1 B R
+Types:Creature Ogre Warrior
+Text:no text
+PT:3/4
+T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigYouDiscard | TriggerDescription$ Whenever CARDNAME is dealt damage, discard that many cards.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Hellbent$ True | CombatDamage$ True | Execute$ TrigOppDiscard | TriggerDescription$ Hellbent - Whenever CARDNAME deals combat damage to a player, if you have no cards in hand, that player discards cards equal to the damage.
+SVar:TrigYouDiscard:AB$Discard | Cost$ 0 | Defined$ You | NumCards$ X | Mode$ TgtChoose
+SVar:TrigOppDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ X | Mode$ TgtChoose
+SVar:X:Count$TriggeredDamageAmount
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jagged_poppet.jpg
+SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/115.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/keldon_battlewagon.txt b/res/cardsfolder/keldon_battlewagon.txt
index c6e98bd43af..6050040b20f 100644
--- a/res/cardsfolder/keldon_battlewagon.txt
+++ b/res/cardsfolder/keldon_battlewagon.txt
@@ -1,16 +1,17 @@
-Name:Keldon Battlewagon
-ManaCost:5
-Types:Artifact Creature Juggernaut
-Text:no text
-PT:0/3
-K:Trample
-K:CARDNAME can't block.
-T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks, sacrifice it at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:AB$Sacrifice | Cost$ 0 | Defined$ Self
-A:AB$Pump | Cost$ tapXType<1/Creature> | NumAtt$ +X | SpellDescription$ CARDNAME gets +X/+0 until end of turn, where X is the power of the creature tapped this way.
-SVar:X:Tapped$CardPower
-SVar:RemRandomDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/keldon_battlewagon.jpg
+Name:Keldon Battlewagon
+ManaCost:5
+Types:Artifact Creature Juggernaut
+Text:no text
+PT:0/3
+K:Trample
+K:CARDNAME can't block.
+T:Mode$ Attacks | ValidCard$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks, sacrifice it at end of combat.
+SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
+SVar:TrigSacrifice:AB$Sacrifice | Cost$ 0 | Defined$ Self
+A:AB$Pump | Cost$ tapXType<1/Creature> | NumAtt$ +X | SpellDescription$ CARDNAME gets +X/+0 until end of turn, where X is the power of the creature tapped this way.
+SVar:X:Tapped$CardPower
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/keldon_battlewagon.jpg
+SetInfo:PCY|Rare|http://magiccards.info/scans/en/pr/139.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/pain_magnification.txt b/res/cardsfolder/pain_magnification.txt
index daab025cde7..ce402987521 100644
--- a/res/cardsfolder/pain_magnification.txt
+++ b/res/cardsfolder/pain_magnification.txt
@@ -1,9 +1,10 @@
-Name:Pain Magnification
-ManaCost:1 B R
-Types:Enchantment
-Text:no text
-T:Mode$ DamageDone | ValidTarget$ Opponent | DamageAmount$ GE3 | Execute$ TrigDestroy | TriggerDescription$ Whenever an opponent is dealt 3 or more damage by a single source, that player discards a card.
-SVar:TrigDestroy:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/pain_magnification.jpg
+Name:Pain Magnification
+ManaCost:1 B R
+Types:Enchantment
+Text:no text
+T:Mode$ DamageDone | ValidTarget$ Opponent | DamageAmount$ GE3 | Execute$ TrigDestroy | TriggerDescription$ Whenever an opponent is dealt 3 or more damage by a single source, that player discards a card.
+SVar:TrigDestroy:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/pain_magnification.jpg
+SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/121.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/tolarian_entrancer.txt b/res/cardsfolder/tolarian_entrancer.txt
index 1c2b9c32401..64657874975 100644
--- a/res/cardsfolder/tolarian_entrancer.txt
+++ b/res/cardsfolder/tolarian_entrancer.txt
@@ -1,11 +1,12 @@
-Name:Tolarian Entrancer
-ManaCost:1 U
-Types:Creature Human Wizard
-Text:no text
-PT:1/1
-T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Creature | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, gain control of that creature at end of combat.
-SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | Execute$ TrigGainControl | TriggerDescription$ Gain control of blocking creature.
-SVar:TrigGainControl:AB$GainControl | Cost$ 0 | Defined$ TriggeredBlocker
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/tolarian_entrancer.jpg
+Name:Tolarian Entrancer
+ManaCost:1 U
+Types:Creature Human Wizard
+Text:no text
+PT:1/1
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Creature | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, gain control of that creature at end of combat.
+SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | Execute$ TrigGainControl | TriggerDescription$ Gain control of blocking creature.
+SVar:TrigGainControl:AB$GainControl | Cost$ 0 | Defined$ TriggeredBlocker
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/tolarian_entrancer.jpg
+SetInfo:WTH|Rare|http://magiccards.info/scans/en/wl/56.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/wave_of_terror.txt b/res/cardsfolder/wave_of_terror.txt
index 4344b4f174f..887c7a6bf85 100644
--- a/res/cardsfolder/wave_of_terror.txt
+++ b/res/cardsfolder/wave_of_terror.txt
@@ -1,11 +1,12 @@
-Name:Wave of Terror
-ManaCost:2 B
-Types:Enchantment
-Text:no text
-K:Cumulative upkeep:1
-T:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDestroyAll | TriggerDescription$ At the beginning of your draw step, destroy each creature with converted mana cost equal to the number of age counters on CARDNAME. They can't be regenerated.
-SVar:TrigDestroyAll:AB$DestroyAll | Cost$ 0 | ValidCards$ Creature.cmcEQX | NoRegen$ True
-SVar:X:Count$CardCounters.AGE
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/wave_of_terror.jpg
+Name:Wave of Terror
+ManaCost:2 B
+Types:Enchantment
+Text:no text
+K:Cumulative upkeep:1
+T:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDestroyAll | TriggerDescription$ At the beginning of your draw step, destroy each creature with converted mana cost equal to the number of age counters on CARDNAME. They can't be regenerated.
+SVar:TrigDestroyAll:AB$DestroyAll | Cost$ 0 | ValidCards$ Creature.cmcEQX | NoRegen$ True
+SVar:X:Count$CardCounters.AGE
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/wave_of_terror.jpg
+SetInfo:WTH|Rare|http://magiccards.info/scans/en/wl/28.jpg
 End
\ No newline at end of file