diff --git a/.gitattributes b/.gitattributes
index cdf53f4b929..3e0588e50f2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1042,7 +1042,7 @@ res/cardsfolder/conflux.txt -text svneol=native#text/plain
 res/cardsfolder/confound.txt -text svneol=native#text/plain
 res/cardsfolder/congregate.txt -text svneol=native#text/plain
 res/cardsfolder/congregation_at_dawn.txt -text svneol=native#text/plain
-res/cardsfolder/conquering_manticore.txt -text svneol=native#text/plain
+res/cardsfolder/conquering_manticore.txt svneol=native#text/plain
 res/cardsfolder/conquerors_pledge.txt -text svneol=native#text/plain
 res/cardsfolder/conspiracy.txt -text svneol=native#text/plain
 res/cardsfolder/constricting_tendrils.txt -text svneol=native#text/plain
@@ -1350,7 +1350,7 @@ res/cardsfolder/denizen_of_the_deep.txt svneol=native#text/plain
 res/cardsfolder/dense_canopy.txt -text svneol=native#text/plain
 res/cardsfolder/deny_reality.txt -text svneol=native#text/plain
 res/cardsfolder/denying_wind.txt -text svneol=native#text/plain
-res/cardsfolder/deprive.txt -text svneol=native#text/plain
+res/cardsfolder/deprive.txt svneol=native#text/plain
 res/cardsfolder/deranged_hermit.txt -text svneol=native#text/plain
 res/cardsfolder/derelor.txt -text svneol=native#text/plain
 res/cardsfolder/descendant_of_soramaro.txt -text svneol=native#text/plain
@@ -1723,7 +1723,7 @@ res/cardsfolder/ertai_wizard_adept.txt -text svneol=native#text/plain
 res/cardsfolder/ertais_trickery.txt -text svneol=native#text/plain
 res/cardsfolder/escape_artist.txt -text svneol=native#text/plain
 res/cardsfolder/escape_routes.txt -text svneol=native#text/plain
-res/cardsfolder/escaped_null.txt -text svneol=native#text/plain
+res/cardsfolder/escaped_null.txt svneol=native#text/plain
 res/cardsfolder/esper_charm.txt -text svneol=native#text/plain
 res/cardsfolder/esper_cormorants.txt -text svneol=native#text/plain
 res/cardsfolder/esper_panorama.txt -text svneol=native#text/plain
@@ -1816,7 +1816,7 @@ res/cardsfolder/false_demise.txt svneol=native#text/plain
 res/cardsfolder/false_mourning.txt -text svneol=native#text/plain
 res/cardsfolder/false_summoning.txt -text svneol=native#text/plain
 res/cardsfolder/familiar_ground.txt -text svneol=native#text/plain
-res/cardsfolder/familiars_ruse.txt -text svneol=native#text/plain
+res/cardsfolder/familiars_ruse.txt svneol=native#text/plain
 res/cardsfolder/famine.txt -text svneol=native#text/plain
 res/cardsfolder/fanatical_devotion.txt -text svneol=native#text/plain
 res/cardsfolder/fanatical_fever.txt -text svneol=native#text/plain
@@ -2702,7 +2702,7 @@ res/cardsfolder/infernal_medusa.txt -text svneol=native#text/plain
 res/cardsfolder/infernal_tribute.txt -text svneol=native#text/plain
 res/cardsfolder/inferno.txt -text svneol=native#text/plain
 res/cardsfolder/inferno_titan.txt -text svneol=native#text/plain
-res/cardsfolder/infest.txt -text svneol=native#text/plain
+res/cardsfolder/infest.txt svneol=native#text/plain
 res/cardsfolder/infested_roothold.txt -text svneol=native#text/plain
 res/cardsfolder/infiltrate.txt -text svneol=native#text/plain
 res/cardsfolder/infiltrator_il_kor.txt -text svneol=native#text/plain
@@ -2941,7 +2941,7 @@ res/cardsfolder/kher_keep.txt -text svneol=native#text/plain
 res/cardsfolder/kiki_jiki_mirror_breaker.txt -text svneol=native#text/plain
 res/cardsfolder/killer_bees.txt -text svneol=native#text/plain
 res/cardsfolder/killer_whale.txt -text svneol=native#text/plain
-res/cardsfolder/kiln_fiend.txt -text svneol=native#text/plain
+res/cardsfolder/kiln_fiend.txt svneol=native#text/plain
 res/cardsfolder/kindle.txt -text svneol=native#text/plain
 res/cardsfolder/kindled_fury.txt -text svneol=native#text/plain
 res/cardsfolder/king_cheetah.txt -text svneol=native#text/plain
@@ -3282,7 +3282,7 @@ res/cardsfolder/magma_mine.txt -text svneol=native#text/plain
 res/cardsfolder/magma_rift.txt -text svneol=native#text/plain
 res/cardsfolder/magma_spray.txt -text svneol=native#text/plain
 res/cardsfolder/magma_vein.txt -text svneol=native#text/plain
-res/cardsfolder/magmaw.txt -text svneol=native#text/plain
+res/cardsfolder/magmaw.txt svneol=native#text/plain
 res/cardsfolder/magnetic_flux.txt -text svneol=native#text/plain
 res/cardsfolder/magnify.txt -text svneol=native#text/plain
 res/cardsfolder/magnigoth_treefolk.txt -text svneol=native#text/plain
@@ -4183,9 +4183,9 @@ res/cardsfolder/quagmire.txt -text svneol=native#text/plain
 res/cardsfolder/quagmire_druid.txt -text svneol=native#text/plain
 res/cardsfolder/quagmire_lamprey.txt -text svneol=native#text/plain
 res/cardsfolder/quagnoth.txt -text svneol=native#text/plain
-res/cardsfolder/quest_for_ancient_secrets.txt -text svneol=native#text/plain
-res/cardsfolder/quest_for_the_gemblades.txt -text svneol=native#text/plain
-res/cardsfolder/quest_for_the_gravelord.txt -text svneol=native#text/plain
+res/cardsfolder/quest_for_ancient_secrets.txt svneol=native#text/plain
+res/cardsfolder/quest_for_the_gemblades.txt svneol=native#text/plain
+res/cardsfolder/quest_for_the_gravelord.txt svneol=native#text/plain
 res/cardsfolder/quick_sliver.txt -text svneol=native#text/plain
 res/cardsfolder/quicksand.txt -text svneol=native#text/plain
 res/cardsfolder/quicksilver_amulet.txt -text svneol=native#text/plain
@@ -4748,7 +4748,7 @@ res/cardsfolder/shapeshifter.txt -text svneol=native#text/plain
 res/cardsfolder/shard_convergence.txt -text svneol=native#text/plain
 res/cardsfolder/shard_phoenix.txt -text svneol=native#text/plain
 res/cardsfolder/shard_volley.txt -text svneol=native#text/plain
-res/cardsfolder/shared_discovery.txt -text svneol=native#text/plain
+res/cardsfolder/shared_discovery.txt svneol=native#text/plain
 res/cardsfolder/shared_triumph.txt -text svneol=native#text/plain
 res/cardsfolder/sharuum_the_hegemon.txt -text svneol=native#text/plain
 res/cardsfolder/shatter.txt -text svneol=native#text/plain
@@ -4796,7 +4796,7 @@ res/cardsfolder/shriek_of_dread.txt -text svneol=native#text/plain
 res/cardsfolder/shrieking_specter.txt -text svneol=native#text/plain
 res/cardsfolder/shriekmaw.txt -text svneol=native#text/plain
 res/cardsfolder/shrink.txt -text svneol=native#text/plain
-res/cardsfolder/shrivel.txt -text svneol=native#text/plain
+res/cardsfolder/shrivel.txt svneol=native#text/plain
 res/cardsfolder/shu_cavalry.txt -text svneol=native#text/plain
 res/cardsfolder/shu_elite_companions.txt -text svneol=native#text/plain
 res/cardsfolder/shu_elite_infantry.txt -text svneol=native#text/plain
@@ -5345,7 +5345,7 @@ res/cardsfolder/surging_might.txt -text svneol=native#text/plain
 res/cardsfolder/surging_sentinels.txt -text svneol=native#text/plain
 res/cardsfolder/surrakar_banisher.txt -text svneol=native#text/plain
 res/cardsfolder/surrakar_marauder.txt -text svneol=native#text/plain
-res/cardsfolder/surrakar_spellblade.txt -text svneol=native#text/plain
+res/cardsfolder/surrakar_spellblade.txt svneol=native#text/plain
 res/cardsfolder/surveilling_sprite.txt -text svneol=native#text/plain
 res/cardsfolder/survival_of_the_fittest.txt -text svneol=native#text/plain
 res/cardsfolder/sustainer_of_the_realm.txt -text svneol=native#text/plain
@@ -5843,7 +5843,7 @@ res/cardsfolder/utopia_tree.txt -text svneol=native#text/plain
 res/cardsfolder/utvara_scalper.txt -text svneol=native#text/plain
 res/cardsfolder/vaevictis_asmadi.txt -text svneol=native#text/plain
 res/cardsfolder/vagrant_plowbeasts.txt -text svneol=native#text/plain
-res/cardsfolder/valakut_fireboar.txt -text svneol=native#text/plain
+res/cardsfolder/valakut_fireboar.txt svneol=native#text/plain
 res/cardsfolder/valakut_the_molten_pinnacle.txt -text svneol=native#text/plain
 res/cardsfolder/valeron_outlander.txt -text svneol=native#text/plain
 res/cardsfolder/valiant_guard.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/conquering_manticore.txt b/res/cardsfolder/conquering_manticore.txt
index bf364709d2e..ff4d37bb479 100644
--- a/res/cardsfolder/conquering_manticore.txt
+++ b/res/cardsfolder/conquering_manticore.txt
@@ -1,11 +1,12 @@
-Name:Conquering Manticore
-ManaCost:4 R R
-Types:Creature Manticore
-Text:no text
-PT:5/5
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
-SVar:TrigChange:AB$GainControl | Cost$ 0 | TgtPrompt$ Choose target creature you don't control | ValidTgts$ Creature.YouDontCtrl | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/conquering_manticore.jpg
+Name:Conquering Manticore
+ManaCost:4 R R
+Types:Creature Manticore
+Text:no text
+PT:5/5
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
+SVar:TrigChange:AB$GainControl | Cost$ 0 | TgtPrompt$ Choose target creature you don't control | ValidTgts$ Creature.YouDontCtrl | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/conquering_manticore.jpg
+SetInfo:ROE|Rare|http://magiccards.info/scans/en/roe/139.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/deprive.txt b/res/cardsfolder/deprive.txt
index fd45c6f9d5d..226bc07dc42 100644
--- a/res/cardsfolder/deprive.txt
+++ b/res/cardsfolder/deprive.txt
@@ -1,9 +1,10 @@
-Name:Deprive
-ManaCost:U U
-Types:Instant
-Text:no text
-A:SP$ Counter | Cost$ U U Return<1/Land> | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell.
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/deprive.jpg
+Name:Deprive
+ManaCost:U U
+Types:Instant
+Text:no text
+A:SP$ Counter | Cost$ U U Return<1/Land> | Type$ Spell | Destination$ Graveyard | SpellDescription$ Counter target spell.
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/deprive.jpg
+SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/59.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/escaped_null.txt b/res/cardsfolder/escaped_null.txt
index 6cfe02bf222..83a5fe510cf 100644
--- a/res/cardsfolder/escaped_null.txt
+++ b/res/cardsfolder/escaped_null.txt
@@ -1,12 +1,13 @@
-Name:Escaped Null
-ManaCost:3 B
-Types:Creature Zombie Berserker
-Text:no text
-PT:1/2
-K:Lifelink
-T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets +5/+0 until end of turn.
-T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets +5/+0 until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ +5
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/escaped_null.jpg
+Name:Escaped Null
+ManaCost:3 B
+Types:Creature Zombie Berserker
+Text:no text
+PT:1/2
+K:Lifelink
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets +5/+0 until end of turn.
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked, it gets +5/+0 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ +5
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/escaped_null.jpg
+SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/109.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/familiars_ruse.txt b/res/cardsfolder/familiars_ruse.txt
index 9fa1c85b31f..2b8cc2e2d4f 100644
--- a/res/cardsfolder/familiars_ruse.txt
+++ b/res/cardsfolder/familiars_ruse.txt
@@ -1,9 +1,10 @@
-Name:Familiar's Ruse
-ManaCost:U U
-Types:Instant
-Text:no text.
-A:SP$ Counter | Cost$ U U Return<1/Creature.YouCtrl> | Type$ Spell | Destination$ Graveyard | SpellDescription$ As an additional cost to pay CARDNAME, return a creature you control to its owner's hand.
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/familiars_ruse.jpg
+Name:Familiar's Ruse
+ManaCost:U U
+Types:Instant
+Text:no text.
+A:SP$ Counter | Cost$ U U Return<1/Creature.YouCtrl> | Type$ Spell | Destination$ Graveyard | SpellDescription$ As an additional cost to pay CARDNAME, return a creature you control to its owner's hand.
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/familiars_ruse.jpg
+SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/64.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/infest.txt b/res/cardsfolder/infest.txt
index 9563849a0f7..797055c4a74 100644
--- a/res/cardsfolder/infest.txt
+++ b/res/cardsfolder/infest.txt
@@ -1,8 +1,10 @@
-Name:Infest
-ManaCost:1 B B
-Types:Sorcery
-Text:no text
-A:SP$PumpAll | Cost$ 1 B B | ValidCards$ Creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ All creatures get -2/-2 until end of turn.
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/infest.jpg
+Name:Infest
+ManaCost:1 B B
+Types:Sorcery
+Text:no text
+A:SP$PumpAll | Cost$ 1 B B | ValidCards$ Creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ All creatures get -2/-2 until end of turn.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/infest.jpg
+SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/157.jpg
+SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/80.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/kiln_fiend.txt b/res/cardsfolder/kiln_fiend.txt
index c68e9876c60..833ceb57cb9 100644
--- a/res/cardsfolder/kiln_fiend.txt
+++ b/res/cardsfolder/kiln_fiend.txt
@@ -1,11 +1,12 @@
-Name:Kiln Fiend
-ManaCost:1 R
-Types:Creature Elemental Beast
-Text:no text
-PT:1/2
-T:Mode$ SpellCast | ValidCard$ Instant.YouCtrl,Sorcery.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a instant or sorcery spell, CARDNAME gets +3/+0 until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | NumAtt$ +3 | NumDef$ +0 | Defined$ Self
-SVar:BuffedBy:Instant,Sorcery
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kiln_fiend.jpg
+Name:Kiln Fiend
+ManaCost:1 R
+Types:Creature Elemental Beast
+Text:no text
+PT:1/2
+T:Mode$ SpellCast | ValidCard$ Instant.YouCtrl,Sorcery.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a instant or sorcery spell, CARDNAME gets +3/+0 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | NumAtt$ +3 | NumDef$ +0 | Defined$ Self
+SVar:BuffedBy:Instant,Sorcery
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kiln_fiend.jpg
+SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/153.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/magmaw.txt b/res/cardsfolder/magmaw.txt
index dcb852bd924..8b3d5914ebe 100644
--- a/res/cardsfolder/magmaw.txt
+++ b/res/cardsfolder/magmaw.txt
@@ -1,9 +1,10 @@
-Name:Magmaw
-ManaCost:3 R R
-Types:Creature Elemental
-Text:no text
-PT:4/4
-A:AB$DealDamage | Cost$ 1 Sac<1/Permanent.nonLand> | Tgt$ TgtCP | NumDmg$ 1 | CostDesc$ 1, Sacrifice a nonland permanent: | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/magmaw.jpg
+Name:Magmaw
+ManaCost:3 R R
+Types:Creature Elemental
+Text:no text
+PT:4/4
+A:AB$DealDamage | Cost$ 1 Sac<1/Permanent.nonLand> | Tgt$ TgtCP | NumDmg$ 1 | CostDesc$ 1, Sacrifice a nonland permanent: | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/magmaw.jpg
+SetInfo:ROE|Rare|http://magiccards.info/scans/en/roe/158.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/quest_for_ancient_secrets.txt b/res/cardsfolder/quest_for_ancient_secrets.txt
index 068031143d3..5d4cabf766c 100644
--- a/res/cardsfolder/quest_for_ancient_secrets.txt
+++ b/res/cardsfolder/quest_for_ancient_secrets.txt
@@ -1,11 +1,11 @@
-Name:Quest for Ancient Secrets
-ManaCost:U
-Types:Enchantment
-Text:no text
-A:AB$ChangeZoneAll | Cost$ SubCounter<5/QUEST> Sac<1/CARDNAME> | TgtPrompt$ Select target player. | ValidTgts$ Player | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | Shuffle$ True | SpellDescription$ Target player shuffles his or her graveyard into his or her library.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Permanent.YouCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a card is put into your graveyard from anywhere, you may put a quest counter on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/quest_for_ancient_secrets.jpg
-End
-
+Name:Quest for Ancient Secrets
+ManaCost:U
+Types:Enchantment
+Text:no text
+A:AB$ChangeZoneAll | Cost$ SubCounter<5/QUEST> Sac<1/CARDNAME> | TgtPrompt$ Select target player. | ValidTgts$ Player | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | Shuffle$ True | SpellDescription$ Target player shuffles his or her graveyard into his or her library.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Permanent.YouCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a card is put into your graveyard from anywhere, you may put a quest counter on CARDNAME.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/quest_for_ancient_secrets.jpg
+SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/59.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/quest_for_the_gemblades.txt b/res/cardsfolder/quest_for_the_gemblades.txt
index 151ab346f66..2487fdabe7a 100644
--- a/res/cardsfolder/quest_for_the_gemblades.txt
+++ b/res/cardsfolder/quest_for_the_gemblades.txt
@@ -1,10 +1,11 @@
-Name:Quest for the Gemblades
-ManaCost:1 G
-Types:Enchantment
-Text:no text
-A:AB$PutCounter | Cost$ SubCounter<1/QUEST> Sac<1/CARDNAME> | Tgt$TgtC | CounterType$ P1P1 | CounterNum$ 4 | SpellDescription$ Put four +1/+1 counters on target creature.
-T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Creature | TriggerZones$ Battlefield | Optional$ True | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control deals combat damage to a creature, you may put a quest counter on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/Quest_for_the_Gemblades.jpg
-End
+Name:Quest for the Gemblades
+ManaCost:1 G
+Types:Enchantment
+Text:no text
+A:AB$PutCounter | Cost$ SubCounter<1/QUEST> Sac<1/CARDNAME> | Tgt$TgtC | CounterType$ P1P1 | CounterNum$ 4 | SpellDescription$ Put four +1/+1 counters on target creature.
+T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Creature | TriggerZones$ Battlefield | Optional$ True | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control deals combat damage to a creature, you may put a quest counter on CARDNAME.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/Quest_for_the_Gemblades.jpg
+SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/177.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/quest_for_the_gravelord.txt b/res/cardsfolder/quest_for_the_gravelord.txt
index bfc4c0ebcb2..9633be86093 100644
--- a/res/cardsfolder/quest_for_the_gravelord.txt
+++ b/res/cardsfolder/quest_for_the_gravelord.txt
@@ -1,10 +1,11 @@
-Name:Quest for the Gravelord
-ManaCost:B
-Types:Enchantment
-Text:no text
-A:AB$Token | Cost$ SubCounter<3/QUEST> Sac<1/CARDNAME> | TokenAmount$ 1 | TokenImage$ B 5 5 Zombie Giant | TokenName$ Zombie Giant | TokenColors$ Black | TokenTypes$ Creature,Zombie Giant | TokenPower$ 5 | TokenToughness$ 5 | TokenOwner$ Controller | TokenAmount$ 1 | SpellDescription$ Remove three quest counters from CARDNAME and sacrifice it: Put a 5/5 black Zombie Giant creature token onto the battlefield.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature is put into a graveyard from the battlefield, you may put a quest counter on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/Quest_for_the_Gravelord.jpg
-End
+Name:Quest for the Gravelord
+ManaCost:B
+Types:Enchantment
+Text:no text
+A:AB$Token | Cost$ SubCounter<3/QUEST> Sac<1/CARDNAME> | TokenAmount$ 1 | TokenImage$ B 5 5 Zombie Giant | TokenName$ Zombie Giant | TokenColors$ Black | TokenTypes$ Creature,Zombie Giant | TokenPower$ 5 | TokenToughness$ 5 | TokenOwner$ Controller | TokenAmount$ 1 | SpellDescription$ Remove three quest counters from CARDNAME and sacrifice it: Put a 5/5 black Zombie Giant creature token onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature is put into a graveyard from the battlefield, you may put a quest counter on CARDNAME.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/Quest_for_the_Gravelord.jpg
+SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/108.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/shared_discovery.txt b/res/cardsfolder/shared_discovery.txt
index 156f2d522be..eaaf27d4123 100644
--- a/res/cardsfolder/shared_discovery.txt
+++ b/res/cardsfolder/shared_discovery.txt
@@ -1,8 +1,9 @@
-Name:Shared Discovery
-ManaCost:U
-Types:Sorcery
-Text:no text
-A:SP$Draw | Cost$ U tapXType<4/Creature.YouCtrl> | NumCards$ 3 | SpellDescription$ As additional cost to cast CARDNAME tap four untapped creatures you control. Draw three cards.
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shared_discovery.jpg
-End
+Name:Shared Discovery
+ManaCost:U
+Types:Sorcery
+Text:no text
+A:SP$Draw | Cost$ U tapXType<4/Creature.YouCtrl> | NumCards$ 3 | SpellDescription$ As additional cost to cast CARDNAME tap four untapped creatures you control. Draw three cards.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shared_discovery.jpg
+SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/87.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/shrivel.txt b/res/cardsfolder/shrivel.txt
index 57084471136..dee59429c03 100644
--- a/res/cardsfolder/shrivel.txt
+++ b/res/cardsfolder/shrivel.txt
@@ -1,8 +1,9 @@
-Name:Shrivel
-ManaCost:1 B
-Types:Sorcery
-Text:no text
-A:SP$PumpAll | Cost$ 1 B | ValidCards$ Creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ All creatures get -1/-1 until end of turn.
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shrivel.jpg
+Name:Shrivel
+ManaCost:1 B
+Types:Sorcery
+Text:no text
+A:SP$PumpAll | Cost$ 1 B | ValidCards$ Creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ All creatures get -1/-1 until end of turn.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shrivel.jpg
+SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/126.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/surrakar_spellblade.txt b/res/cardsfolder/surrakar_spellblade.txt
index a9e963c3784..e773cab20e5 100644
--- a/res/cardsfolder/surrakar_spellblade.txt
+++ b/res/cardsfolder/surrakar_spellblade.txt
@@ -1,13 +1,14 @@
-Name:Surrakar Spellblade
-ManaCost:1 U U
-Types:Creature Surrakar
-Text:no text
-PT:2/1
-T:Mode$ SpellCast | ValidCard$ Instant.YouCtrl,Sorcery.YouCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a instant or sorcery spell, you may put a charge counter on CARDNAME.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Optional$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw X cards, where X is the number of charge counters on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
-SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ X
-SVar:X:Count$CardCounters.CHARGE
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/surrakar_spellblade.jpg
+Name:Surrakar Spellblade
+ManaCost:1 U U
+Types:Creature Surrakar
+Text:no text
+PT:2/1
+T:Mode$ SpellCast | ValidCard$ Instant.YouCtrl,Sorcery.YouCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a instant or sorcery spell, you may put a charge counter on CARDNAME.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Optional$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw X cards, where X is the number of charge counters on CARDNAME.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ X
+SVar:X:Count$CardCounters.CHARGE
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/surrakar_spellblade.jpg
+SetInfo:ROE|Rare|http://magiccards.info/scans/en/roe/90.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/valakut_fireboar.txt b/res/cardsfolder/valakut_fireboar.txt
index 69cf81d0492..a7c95043fe4 100644
--- a/res/cardsfolder/valakut_fireboar.txt
+++ b/res/cardsfolder/valakut_fireboar.txt
@@ -1,11 +1,12 @@
-Name:Valakut Fireboar
-ManaCost:4 R
-Types:Creature Elemental Boar
-Text:no text
-PT:1/7
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, switch its power and toughness until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN CARDNAME's power and toughness are switched
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/valakut_fireboar.jpg
+Name:Valakut Fireboar
+ManaCost:4 R
+Types:Creature Elemental Boar
+Text:no text
+PT:1/7
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, switch its power and toughness until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN CARDNAME's power and toughness are switched
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/valakut_fireboar.jpg
+SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/170.jpg
 End
\ No newline at end of file