diff --git a/.gitattributes b/.gitattributes
index 07af086b92e..7ae76376156 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -213,7 +213,7 @@ res/cardsfolder/angelic_curator.txt -text svneol=native#text/plain
 res/cardsfolder/angelic_favor.txt -text svneol=native#text/plain
 res/cardsfolder/angelic_page.txt -text svneol=native#text/plain
 res/cardsfolder/angelic_renewal.txt -text svneol=native#text/plain
-res/cardsfolder/angelic_shield.txt -text svneol=native#text/plain
+res/cardsfolder/angelic_shield.txt svneol=native#text/plain
 res/cardsfolder/angelic_voices.txt -text svneol=native#text/plain
 res/cardsfolder/angelic_wall.txt -text svneol=native#text/plain
 res/cardsfolder/angels_feather.txt -text svneol=native#text/plain
@@ -450,7 +450,7 @@ res/cardsfolder/balduvian_barbarians.txt -text svneol=native#text/plain
 res/cardsfolder/balduvian_bears.txt -text svneol=native#text/plain
 res/cardsfolder/balduvian_dead.txt svneol=native#text/plain
 res/cardsfolder/balduvian_horde.txt -text svneol=native#text/plain
-res/cardsfolder/balduvian_rage.txt -text svneol=native#text/plain
+res/cardsfolder/balduvian_rage.txt svneol=native#text/plain
 res/cardsfolder/balduvian_trading_post.txt -text svneol=native#text/plain
 res/cardsfolder/balduvian_war_makers.txt -text svneol=native#text/plain
 res/cardsfolder/balefire_liege.txt -text svneol=native#text/plain
@@ -593,7 +593,7 @@ res/cardsfolder/biorhythm.txt svneol=native#text/plain
 res/cardsfolder/birchlore_rangers.txt -text svneol=native#text/plain
 res/cardsfolder/bird_maiden.txt -text svneol=native#text/plain
 res/cardsfolder/birds_of_paradise.txt -text svneol=native#text/plain
-res/cardsfolder/biting_tether.txt -text svneol=native#text/plain
+res/cardsfolder/biting_tether.txt svneol=native#text/plain
 res/cardsfolder/bitterblossom.txt -text svneol=native#text/plain
 res/cardsfolder/bituminous_blast.txt -text svneol=native#text/plain
 res/cardsfolder/black_carriage.txt svneol=native#text/plain
@@ -661,7 +661,7 @@ res/cardsfolder/blistering_dieflyn.txt -text svneol=native#text/plain
 res/cardsfolder/blistering_firecat.txt -text svneol=native#text/plain
 res/cardsfolder/blisterstick_shaman.txt -text svneol=native#text/plain
 res/cardsfolder/blitz_hellion.txt -text svneol=native#text/plain
-res/cardsfolder/blizzard.txt -text svneol=native#text/plain
+res/cardsfolder/blizzard.txt svneol=native#text/plain
 res/cardsfolder/blizzard_elemental.txt -text svneol=native#text/plain
 res/cardsfolder/bloated_toad.txt -text svneol=native#text/plain
 res/cardsfolder/blockade_runner.txt -text svneol=native#text/plain
@@ -857,7 +857,7 @@ res/cardsfolder/brutal_nightstalker.txt -text svneol=native#text/plain
 res/cardsfolder/brute_force.txt -text svneol=native#text/plain
 res/cardsfolder/bubble_matrix.txt -text svneol=native#text/plain
 res/cardsfolder/bubbling_beebles.txt -text svneol=native#text/plain
-res/cardsfolder/bull_aurochs.txt -text svneol=native#text/plain
+res/cardsfolder/bull_aurochs.txt svneol=native#text/plain
 res/cardsfolder/bull_cerodon.txt -text svneol=native#text/plain
 res/cardsfolder/bull_hippo.txt -text svneol=native#text/plain
 res/cardsfolder/bull_rush.txt -text svneol=native#text/plain
@@ -972,7 +972,7 @@ res/cardsfolder/cateran_slaver.txt -text svneol=native#text/plain
 res/cardsfolder/cateran_summons.txt -text svneol=native#text/plain
 res/cardsfolder/cathartic_adept.txt -text svneol=native#text/plain
 res/cardsfolder/cathodion.txt -text svneol=native#text/plain
-res/cardsfolder/cauldron_of_souls.txt -text svneol=native#text/plain
+res/cardsfolder/cauldron_of_souls.txt svneol=native#text/plain
 res/cardsfolder/caustic_crawler.txt svneol=native#text/plain
 res/cardsfolder/caustic_hound.txt -text svneol=native#text/plain
 res/cardsfolder/caustic_rain.txt -text svneol=native#text/plain
@@ -1024,7 +1024,7 @@ res/cardsfolder/cerulean_wyvern.txt -text svneol=native#text/plain
 res/cardsfolder/cessation.txt -text svneol=native#text/plain
 res/cardsfolder/ceta_disciple.txt -text svneol=native#text/plain
 res/cardsfolder/chain_reaction.txt -text svneol=native#text/plain
-res/cardsfolder/chainbreaker.txt -text svneol=native#text/plain
+res/cardsfolder/chainbreaker.txt svneol=native#text/plain
 res/cardsfolder/chainer_dementia_master.txt -text svneol=native#text/plain
 res/cardsfolder/chainers_edict.txt -text svneol=native#text/plain
 res/cardsfolder/chainflinger.txt -text svneol=native#text/plain
@@ -1224,7 +1224,7 @@ res/cardsfolder/coral_eel.txt -text svneol=native#text/plain
 res/cardsfolder/coral_helm.txt -text svneol=native#text/plain
 res/cardsfolder/coral_merfolk.txt -text svneol=native#text/plain
 res/cardsfolder/coral_reef.txt svneol=native#text/plain
-res/cardsfolder/coral_trickster.txt -text svneol=native#text/plain
+res/cardsfolder/coral_trickster.txt svneol=native#text/plain
 res/cardsfolder/coralhelm_commander.txt -text svneol=native#text/plain
 res/cardsfolder/core_prowler.txt -text svneol=native#text/plain
 res/cardsfolder/coretapper.txt -text svneol=native#text/plain
@@ -1304,7 +1304,7 @@ res/cardsfolder/crosswinds.txt -text svneol=native#text/plain
 res/cardsfolder/crovax_ascendant_hero.txt -text svneol=native#text/plain
 res/cardsfolder/crowd_favorites.txt -text svneol=native#text/plain
 res/cardsfolder/crowd_of_cinders.txt -text svneol=native#text/plain
-res/cardsfolder/crown_of_flames.txt -text svneol=native#text/plain
+res/cardsfolder/crown_of_flames.txt svneol=native#text/plain
 res/cardsfolder/crucible_of_fire.txt -text svneol=native#text/plain
 res/cardsfolder/crucible_of_worlds.txt -text svneol=native#text/plain
 res/cardsfolder/crude_rampart.txt -text svneol=native#text/plain
@@ -1864,7 +1864,7 @@ res/cardsfolder/elvish_lyrist.txt -text svneol=native#text/plain
 res/cardsfolder/elvish_pathcutter.txt -text svneol=native#text/plain
 res/cardsfolder/elvish_pioneer.txt svneol=native#text/plain
 res/cardsfolder/elvish_piper.txt -text svneol=native#text/plain
-res/cardsfolder/elvish_promenade.txt -text svneol=native#text/plain
+res/cardsfolder/elvish_promenade.txt svneol=native#text/plain
 res/cardsfolder/elvish_ranger.txt -text svneol=native#text/plain
 res/cardsfolder/elvish_scout.txt svneol=native#text/plain
 res/cardsfolder/elvish_scrapper.txt -text svneol=native#text/plain
@@ -1950,7 +1950,7 @@ 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
-res/cardsfolder/esper_sojourners.txt -text svneol=native#text/plain
+res/cardsfolder/esper_sojourners.txt svneol=native#text/plain
 res/cardsfolder/esper_stormblade.txt -text svneol=native#text/plain
 res/cardsfolder/essence_drain.txt -text svneol=native#text/plain
 res/cardsfolder/essence_feed.txt -text svneol=native#text/plain
@@ -2136,7 +2136,7 @@ res/cardsfolder/fill_with_fright.txt -text svneol=native#text/plain
 res/cardsfolder/filth.txt -text svneol=native#text/plain
 res/cardsfolder/filthy_cur.txt -text svneol=native#text/plain
 res/cardsfolder/final_judgment.txt -text svneol=native#text/plain
-res/cardsfolder/final_revels.txt -text svneol=native#text/plain
+res/cardsfolder/final_revels.txt svneol=native#text/plain
 res/cardsfolder/final_sting_faerie.txt svneol=native#text/plain
 res/cardsfolder/final_strike.txt -text svneol=native#text/plain
 res/cardsfolder/finest_hour.txt -text svneol=native#text/plain
@@ -3210,7 +3210,7 @@ res/cardsfolder/joiner_adept.txt -text svneol=native#text/plain
 res/cardsfolder/jokulhaups.txt -text svneol=native#text/plain
 res/cardsfolder/jolraels_centaur.txt -text svneol=native#text/plain
 res/cardsfolder/jolraels_favor.txt svneol=native#text/plain
-res/cardsfolder/jolt.txt -text svneol=native#text/plain
+res/cardsfolder/jolt.txt svneol=native#text/plain
 res/cardsfolder/jolting_merfolk.txt -text svneol=native#text/plain
 res/cardsfolder/joraga_bard.txt -text svneol=native#text/plain
 res/cardsfolder/joraga_treespeaker.txt -text svneol=native#text/plain
@@ -3401,7 +3401,7 @@ res/cardsfolder/kobold_drill_sergeant.txt -text svneol=native#text/plain
 res/cardsfolder/kobold_overlord.txt -text svneol=native#text/plain
 res/cardsfolder/kobold_taskmaster.txt -text svneol=native#text/plain
 res/cardsfolder/kobolds_of_kher_keep.txt -text svneol=native#text/plain
-res/cardsfolder/kodama_of_the_center_tree.txt -text svneol=native#text/plain
+res/cardsfolder/kodama_of_the_center_tree.txt svneol=native#text/plain
 res/cardsfolder/kodama_of_the_north_tree.txt -text svneol=native#text/plain
 res/cardsfolder/kodamas_reach.txt -text svneol=native#text/plain
 res/cardsfolder/kokusho_the_evening_star.txt -text svneol=native#text/plain
@@ -3878,7 +3878,7 @@ res/cardsfolder/merrow_commerce.txt -text svneol=native#text/plain
 res/cardsfolder/merrow_grimeblotter.txt -text svneol=native#text/plain
 res/cardsfolder/merrow_harbinger.txt -text svneol=native#text/plain
 res/cardsfolder/merrow_levitator.txt -text svneol=native#text/plain
-res/cardsfolder/merrow_reejerey.txt -text svneol=native#text/plain
+res/cardsfolder/merrow_reejerey.txt svneol=native#text/plain
 res/cardsfolder/merrow_wavebreakers.txt -text svneol=native#text/plain
 res/cardsfolder/merrow_witsniper.txt svneol=native#text/plain
 res/cardsfolder/mesa_enchantress.txt -text svneol=native#text/plain
@@ -3930,7 +3930,7 @@ res/cardsfolder/mind_slash.txt -text svneol=native#text/plain
 res/cardsfolder/mind_sludge.txt -text svneol=native#text/plain
 res/cardsfolder/mind_spring.txt -text svneol=native#text/plain
 res/cardsfolder/mind_stone.txt -text svneol=native#text/plain
-res/cardsfolder/mind_swords.txt -text svneol=native#text/plain
+res/cardsfolder/mind_swords.txt svneol=native#text/plain
 res/cardsfolder/mind_twist.txt -text svneol=native#text/plain
 res/cardsfolder/mind_warp.txt -text svneol=native#text/plain
 res/cardsfolder/mindless_automaton.txt -text svneol=native#text/plain
@@ -3990,7 +3990,7 @@ res/cardsfolder/mistral_charger.txt -text svneol=native#text/plain
 res/cardsfolder/mistveil_plains.txt -text svneol=native#text/plain
 res/cardsfolder/mistvein_borderpost.txt -text svneol=native#text/plain
 res/cardsfolder/misty_rainforest.txt -text svneol=native#text/plain
-res/cardsfolder/mitotic_slime.txt -text svneol=native#text/plain
+res/cardsfolder/mitotic_slime.txt svneol=native#text/plain
 res/cardsfolder/mnemonic_nexus.txt -text svneol=native#text/plain
 res/cardsfolder/mnemonic_wall.txt -text svneol=native#text/plain
 res/cardsfolder/moaning_spirit.txt -text svneol=native#text/plain
@@ -4003,7 +4003,7 @@ res/cardsfolder/mogg_alarm.txt -text svneol=native#text/plain
 res/cardsfolder/mogg_fanatic.txt -text svneol=native#text/plain
 res/cardsfolder/mogg_hollows.txt -text svneol=native#text/plain
 res/cardsfolder/mogg_jailer.txt -text svneol=native#text/plain
-res/cardsfolder/mogg_maniac.txt -text svneol=native#text/plain
+res/cardsfolder/mogg_maniac.txt svneol=native#text/plain
 res/cardsfolder/mogg_raider.txt -text svneol=native#text/plain
 res/cardsfolder/mogg_sentry.txt -text svneol=native#text/plain
 res/cardsfolder/mogg_squad.txt -text svneol=native#text/plain
@@ -4617,7 +4617,7 @@ res/cardsfolder/piranha_marsh.txt -text svneol=native#text/plain
 res/cardsfolder/pirate_ship.txt -text svneol=native#text/plain
 res/cardsfolder/pistus_strike.txt -text svneol=native#text/plain
 res/cardsfolder/pit_imp.txt -text svneol=native#text/plain
-res/cardsfolder/pit_keeper.txt -text svneol=native#text/plain
+res/cardsfolder/pit_keeper.txt svneol=native#text/plain
 res/cardsfolder/pit_raptor.txt -text svneol=native#text/plain
 res/cardsfolder/pit_scorpion.txt -text svneol=native#text/plain
 res/cardsfolder/pit_trap.txt -text svneol=native#text/plain
@@ -5063,7 +5063,7 @@ res/cardsfolder/rime_dryad.txt svneol=native#text/plain
 res/cardsfolder/rimebound_dead.txt -text svneol=native#text/plain
 res/cardsfolder/rimescale_dragon.txt -text svneol=native#text/plain
 res/cardsfolder/rimewind_cryomancer.txt -text svneol=native#text/plain
-res/cardsfolder/rimewind_taskmage.txt -text svneol=native#text/plain
+res/cardsfolder/rimewind_taskmage.txt svneol=native#text/plain
 res/cardsfolder/ring_of_gix.txt -text svneol=native#text/plain
 res/cardsfolder/ring_of_immortals.txt -text svneol=native#text/plain
 res/cardsfolder/ring_of_renewal.txt -text svneol=native#text/plain
@@ -6216,7 +6216,7 @@ res/cardsfolder/tainted_wood.txt -text svneol=native#text/plain
 res/cardsfolder/tajuru_archer.txt -text svneol=native#text/plain
 res/cardsfolder/take_possession.txt -text svneol=native#text/plain
 res/cardsfolder/takenos_cavalry.txt -text svneol=native#text/plain
-res/cardsfolder/takenuma_bleeder.txt -text svneol=native#text/plain
+res/cardsfolder/takenuma_bleeder.txt svneol=native#text/plain
 res/cardsfolder/talas_air_ship.txt -text svneol=native#text/plain
 res/cardsfolder/talas_merchant.txt -text svneol=native#text/plain
 res/cardsfolder/talas_researcher.txt -text svneol=native#text/plain
@@ -6278,12 +6278,12 @@ res/cardsfolder/tel_jilad_fallen.txt -text svneol=native#text/plain
 res/cardsfolder/tel_jilad_justice.txt -text svneol=native#text/plain
 res/cardsfolder/tel_jilad_lifebreather.txt -text svneol=native#text/plain
 res/cardsfolder/tel_jilad_outrider.txt -text svneol=native#text/plain
-res/cardsfolder/telekinetic_bonds.txt -text svneol=native#text/plain
+res/cardsfolder/telekinetic_bonds.txt svneol=native#text/plain
 res/cardsfolder/telekinetic_sliver.txt -text svneol=native#text/plain
 res/cardsfolder/telethopter.txt svneol=native#text/plain
 res/cardsfolder/telimtors_darts.txt -text svneol=native#text/plain
 res/cardsfolder/telimtors_edict.txt -text svneol=native#text/plain
-res/cardsfolder/teller_of_tales.txt -text svneol=native#text/plain
+res/cardsfolder/teller_of_tales.txt svneol=native#text/plain
 res/cardsfolder/telling_time.txt -text svneol=native#text/plain
 res/cardsfolder/tempered_steel.txt -text svneol=native#text/plain
 res/cardsfolder/tempest_drake.txt -text svneol=native#text/plain
@@ -6421,7 +6421,7 @@ res/cardsfolder/thundersong_trumpeter.txt svneol=native#text/plain
 res/cardsfolder/thwart.txt -text svneol=native#text/plain
 res/cardsfolder/tibor_and_lumia.txt -text svneol=native#text/plain
 res/cardsfolder/ticking_gnomes.txt -text svneol=native#text/plain
-res/cardsfolder/tidal_bore.txt -text svneol=native#text/plain
+res/cardsfolder/tidal_bore.txt svneol=native#text/plain
 res/cardsfolder/tidal_control.txt -text svneol=native#text/plain
 res/cardsfolder/tidal_courier.txt -text svneol=native#text/plain
 res/cardsfolder/tidal_kraken.txt -text svneol=native#text/plain
@@ -6471,7 +6471,7 @@ res/cardsfolder/tivadar_of_thorn.txt -text svneol=native#text/plain
 res/cardsfolder/tivadars_crusade.txt -text svneol=native#text/plain
 res/cardsfolder/to_arms.txt -text svneol=native#text/plain
 res/cardsfolder/tobias_andrion.txt -text svneol=native#text/plain
-res/cardsfolder/toils_of_night_and_day.txt -text svneol=native#text/plain
+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
@@ -6603,7 +6603,7 @@ res/cardsfolder/tunnel.txt -text svneol=native#text/plain
 res/cardsfolder/turn_aside.txt -text svneol=native#text/plain
 res/cardsfolder/turn_the_tide.txt -text svneol=native#text/plain
 res/cardsfolder/turn_to_dust.txt -text svneol=native#text/plain
-res/cardsfolder/turnabout.txt -text svneol=native#text/plain
+res/cardsfolder/turnabout.txt svneol=native#text/plain
 res/cardsfolder/turntimber_grove.txt svneol=native#text/plain
 res/cardsfolder/turntimber_ranger.txt -text svneol=native#text/plain
 res/cardsfolder/turtleshell_changeling.txt -text svneol=native#text/plain
@@ -6948,7 +6948,7 @@ res/cardsfolder/wall_of_putrid_flesh.txt -text svneol=native#text/plain
 res/cardsfolder/wall_of_razors.txt -text svneol=native#text/plain
 res/cardsfolder/wall_of_reverence.txt -text svneol=native#text/plain
 res/cardsfolder/wall_of_roots.txt -text svneol=native#text/plain
-res/cardsfolder/wall_of_souls.txt -text svneol=native#text/plain
+res/cardsfolder/wall_of_souls.txt svneol=native#text/plain
 res/cardsfolder/wall_of_spears.txt -text svneol=native#text/plain
 res/cardsfolder/wall_of_stone.txt -text svneol=native#text/plain
 res/cardsfolder/wall_of_swords.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/angelic_shield.txt b/res/cardsfolder/angelic_shield.txt
index dbbd38851bf..e5d5ec27192 100644
--- a/res/cardsfolder/angelic_shield.txt
+++ b/res/cardsfolder/angelic_shield.txt
@@ -1,9 +1,10 @@
-Name:Angelic Shield
-ManaCost:W U
-Types:Enchantment
-Text:no text
-K:stPumpAll:Creature.YouCtrl:0/1:No Condition:Creatures you control get +0/+1.  
-A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_shield.jpg
+Name:Angelic Shield
+ManaCost:W U
+Types:Enchantment
+Text:no text
+K:stPumpAll:Creature.YouCtrl:0/1:No Condition:Creatures you control get +0/+1.
+A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_shield.jpg
+SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/228.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/balduvian_rage.txt b/res/cardsfolder/balduvian_rage.txt
index 91a7a388df8..8bfce6647e0 100644
--- a/res/cardsfolder/balduvian_rage.txt
+++ b/res/cardsfolder/balduvian_rage.txt
@@ -1,11 +1,12 @@
-Name:Balduvian Rage
-ManaCost:X R
-Types:Instant
-Text:no text
-A:SP$Pump | Cost$ X R | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ +X | SpellDescription$ Target attacking creature gets +X/+0 until end of turn. | SubAbility$ SVar=DBDraw
-SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
-SVar:X:Count$xPaid
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_rage.jpg
+Name:Balduvian Rage
+ManaCost:X R
+Types:Instant
+Text:no text
+A:SP$Pump | Cost$ X R | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ +X | SpellDescription$ Target attacking creature gets +X/+0 until end of turn. | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | SpellDescription$ Draw a card at the beginning of the next upkeep.
+SVar:X:Count$xPaid
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_rage.jpg
+SetInfo:CSP|Uncommon|http://magiccards.info/scans/en/cs/76.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/biting_tether.txt b/res/cardsfolder/biting_tether.txt
index a6dce18b6cf..354a7cdc6c4 100644
--- a/res/cardsfolder/biting_tether.txt
+++ b/res/cardsfolder/biting_tether.txt
@@ -1,11 +1,12 @@
-Name:Biting Tether
-ManaCost:4 U
-Types:Enchantment Aura
-Text:You control enchanted creature.
-K:Enchant creature
-K:enControlCreature
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, put a -1/-1 counter on enchanted creature.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Enchanted | CounterType$ M1M1 | CounterNum$ 1
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/biting_tether.jpg
+Name:Biting Tether
+ManaCost:4 U
+Types:Enchantment Aura
+Text:You control enchanted creature.
+K:Enchant creature
+K:enControlCreature
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, put a -1/-1 counter on enchanted creature.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Enchanted | CounterType$ M1M1 | CounterNum$ 1
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/biting_tether.jpg
+SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/29.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/blizzard.txt b/res/cardsfolder/blizzard.txt
index e2074c511e9..48a2297b887 100644
--- a/res/cardsfolder/blizzard.txt
+++ b/res/cardsfolder/blizzard.txt
@@ -1,9 +1,10 @@
-Name:Blizzard
-ManaCost:G G
-Types:Enchantment
-Text:Cast CARDNAME only if you control a snow land.\r\n\r\nCreatures with flying don't untap during their controllers' untap steps.
-K:Cumulative upkeep:2
-K:Permanents don't untap during their controllers' untap steps:Creature.withFlying
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/blizzard.jpg
+Name:Blizzard
+ManaCost:G G
+Types:Enchantment
+Text:Cast CARDNAME only if you control a snow land.\r\n\r\nCreatures with flying don't untap during their controllers' untap steps.
+K:Cumulative upkeep:2
+K:Permanents don't untap during their controllers' untap steps:Creature.withFlying
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/blizzard.jpg
+SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/115.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/boggart_shenanigans.txt b/res/cardsfolder/boggart_shenanigans.txt
index 268c52f7eb1..6566b3f6735 100644
--- a/res/cardsfolder/boggart_shenanigans.txt
+++ b/res/cardsfolder/boggart_shenanigans.txt
@@ -6,4 +6,5 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boggart_shenanigans.jpg
+SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/155.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/bull_aurochs.txt b/res/cardsfolder/bull_aurochs.txt
index ef3c3759304..7064bf7c67d 100644
--- a/res/cardsfolder/bull_aurochs.txt
+++ b/res/cardsfolder/bull_aurochs.txt
@@ -1,12 +1,13 @@
-Name:Bull Aurochs
-ManaCost:1 G
-Types:Creature Aurochs
-Text:no text
-PT:2/1
-K:Trample
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+0 until end of turn for each other attacking Aurochs.
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ X
-SVar:X:Count$Valid Aurochs.attacking+Other
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/bull_aurochs.jpg
+Name:Bull Aurochs
+ManaCost:1 G
+Types:Creature Aurochs
+Text:no text
+PT:2/1
+K:Trample
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+0 until end of turn for each other attacking Aurochs.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ X
+SVar:X:Count$Valid Aurochs.attacking+Other
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/bull_aurochs.jpg
+SetInfo:CSP|Common|http://magiccards.info/scans/en/cs/107.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/cauldron_of_souls.txt b/res/cardsfolder/cauldron_of_souls.txt
index 3b094ddd6ac..31e812f55a1 100644
--- a/res/cardsfolder/cauldron_of_souls.txt
+++ b/res/cardsfolder/cauldron_of_souls.txt
@@ -1,9 +1,10 @@
-Name:Cauldron of Souls
-ManaCost:5
-Types:Artifact
-Text:no text
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Select target creature | KW$ Persist | SpellDescription$ Choose any number of target creatures. Each of those creatures gains persist until end of turn.
-SVar:X:Count$Valid Creature
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cauldron_of_souls.jpg
-End
+Name:Cauldron of Souls
+ManaCost:5
+Types:Artifact
+Text:no text
+A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Select target creature | KW$ Persist | SpellDescription$ Choose any number of target creatures. Each of those creatures gains persist until end of turn.
+SVar:X:Count$Valid Creature
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/cauldron_of_souls.jpg
+SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/248.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/chainbreaker.txt b/res/cardsfolder/chainbreaker.txt
index 32dd0ee490c..966c4c44b9e 100644
--- a/res/cardsfolder/chainbreaker.txt
+++ b/res/cardsfolder/chainbreaker.txt
@@ -1,10 +1,11 @@
-Name:Chainbreaker
-ManaCost:2
-Types:Artifact Creature Scarecrow
-Text:no text
-PT:3/3
-K:etbCounter:M1M1:2
-A:AB$ RemoveCounter | Cost$ 3 T | ValidTgts$ Creature.countersGE1M1M1 | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 1 | SpellDescription$ Remove a -1/-1 counter from target creature.
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/chainbreaker.jpg
+Name:Chainbreaker
+ManaCost:2
+Types:Artifact Creature Scarecrow
+Text:no text
+PT:3/3
+K:etbCounter:M1M1:2
+A:AB$ RemoveCounter | Cost$ 3 T | ValidTgts$ Creature.countersGE1M1M1 | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 1 | SpellDescription$ Remove a -1/-1 counter from target creature.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/chainbreaker.jpg
+SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/249.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/coral_trickster.txt b/res/cardsfolder/coral_trickster.txt
index 9dc7178986f..6d007163a32 100644
--- a/res/cardsfolder/coral_trickster.txt
+++ b/res/cardsfolder/coral_trickster.txt
@@ -1,11 +1,12 @@
-Name:Coral Trickster
-ManaCost:1 U
-Types:Creature Merfolk Rogue
-Text:no text
-PT:2/1
-K:Morph:U
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigTapOrUntap | TriggerDescription$ When Coral Trickster is turned face up, you may tap or untap target permanent.
-SVar:TrigTapOrUntap:AB$TapOrUntap | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/coral_trickster.jpg
+Name:Coral Trickster
+ManaCost:1 U
+Types:Creature Merfolk Rogue
+Text:no text
+PT:2/1
+K:Morph:U
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigTapOrUntap | TriggerDescription$ When Coral Trickster is turned face up, you may tap or untap target permanent.
+SVar:TrigTapOrUntap:AB$TapOrUntap | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/coral_trickster.jpg
+SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/54.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/crown_of_flames.txt b/res/cardsfolder/crown_of_flames.txt
index 44f9fccc1b5..17aa0a41a4a 100644
--- a/res/cardsfolder/crown_of_flames.txt
+++ b/res/cardsfolder/crown_of_flames.txt
@@ -1,11 +1,13 @@
-Name:Crown of Flames
-ManaCost:R
-Types:Enchantment Aura
-Text:no text
-K:Enchant creature
-K:enPump:+0/+0
-A:AB$Pump | Cost$ R | Defined$ Enchanted | NumAtt$ +1 | SpellDescription$ Enchanted creature gets +1/+0 until end of turn.
-A:AB$ChangeZone | Cost$ R | Origin$ Battlefield | Destination$ Hand | Defined$ Self | SpellDescription$ Return CARDNAME to its owner's hand.
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/crown_of_flames.jpg
+Name:Crown of Flames
+ManaCost:R
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+K:enPump:+0/+0
+A:AB$Pump | Cost$ R | Defined$ Enchanted | NumAtt$ +1 | SpellDescription$ Enchanted creature gets +1/+0 until end of turn.
+A:AB$ChangeZone | Cost$ R | Origin$ Battlefield | Destination$ Hand | Defined$ Self | SpellDescription$ Return CARDNAME to its owner's hand.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/crown_of_flames.jpg
+SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/169.jpg
+SetInfo:INV|Common|http://magiccards.info/scans/en/in/142.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/elvish_promenade.txt b/res/cardsfolder/elvish_promenade.txt
index 0b1b3798717..24434248b20 100644
--- a/res/cardsfolder/elvish_promenade.txt
+++ b/res/cardsfolder/elvish_promenade.txt
@@ -1,10 +1,11 @@
-Name:Elvish Promenade
-ManaCost:3 G
-Types:Tribal Sorcery Elf
-Text:no text
-A:SP$Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Elf Warrior creature token onto the battlefield for each Elf you control.
-SVar:X:Count$Valid Elf.YouCtrl
-SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_promenade.jpg
+Name:Elvish Promenade
+ManaCost:3 G
+Types:Tribal Sorcery Elf
+Text:no text
+A:SP$Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Elf Warrior creature token onto the battlefield for each Elf you control.
+SVar:X:Count$Valid Elf.YouCtrl
+SVar:PlayMain1:TRUE
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_promenade.jpg
+SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/208.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/esper_sojourners.txt b/res/cardsfolder/esper_sojourners.txt
index 0b3adf8c666..5d7656727e1 100644
--- a/res/cardsfolder/esper_sojourners.txt
+++ b/res/cardsfolder/esper_sojourners.txt
@@ -1,11 +1,12 @@
-Name:Esper Sojourners
-ManaCost:W U B
-Types:Artifact Creature Vedalken Wizard
-Text:no text
-PT:2/3
-T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigTapOrUntap | Optional$ True | TriggerDescription$ When you cycle CARDNAME or it's put into a graveyard from the battlefield, you may tap or untap target permanent.
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigTapOrUntap | Optional$ True | Secondary$ True | TriggerDescription$ When you cycle CARDNAME or it's put into a graveyard from the battlefield, you may tap or untap target permanent.
-SVar:TrigTapOrUntap:AB$TapOrUntap | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/esper_sojourners.jpg
+Name:Esper Sojourners
+ManaCost:W U B
+Types:Artifact Creature Vedalken Wizard
+Text:no text
+PT:2/3
+T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigTapOrUntap | Optional$ True | TriggerDescription$ When you cycle CARDNAME or it's put into a graveyard from the battlefield, you may tap or untap target permanent.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigTapOrUntap | Optional$ True | Secondary$ True | TriggerDescription$ When you cycle CARDNAME or it's put into a graveyard from the battlefield, you may tap or untap target permanent.
+SVar:TrigTapOrUntap:AB$TapOrUntap | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/esper_sojourners.jpg
+SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/107.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/final_revels.txt b/res/cardsfolder/final_revels.txt
index 3e1ab33d47f..4ee107a355d 100644
--- a/res/cardsfolder/final_revels.txt
+++ b/res/cardsfolder/final_revels.txt
@@ -1,10 +1,11 @@
-Name:Final Revels
-ManaCost:4 B
-Types:Sorcery
-Text:no text
-A:SP$PumpAll | Cost$ 4 B | ValidCards$ Creature | NumAtt$ +2 | PrecostDesc$ Choose one - | SpellDescription$ All creatures get +2/+0 until end of turn;
-A:SP$PumpAll | Cost$ 4 B | ValidCards$ Creature | NumDef$ -2 | PrecostDesc$ or | SpellDescription$ all creatures get -0/-2 until end of turn.
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/final_revels.jpg
+Name:Final Revels
+ManaCost:4 B
+Types:Sorcery
+Text:no text
+A:SP$PumpAll | Cost$ 4 B | ValidCards$ Creature | NumAtt$ +2 | PrecostDesc$ Choose one - | SpellDescription$ All creatures get +2/+0 until end of turn;
+A:SP$PumpAll | Cost$ 4 B | ValidCards$ Creature | NumDef$ -2 | PrecostDesc$ or | SpellDescription$ all creatures get -0/-2 until end of turn.
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/final_revels.jpg
+SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/113.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/jolt.txt b/res/cardsfolder/jolt.txt
index 7449d0a65b8..890da8a4f2e 100644
--- a/res/cardsfolder/jolt.txt
+++ b/res/cardsfolder/jolt.txt
@@ -1,10 +1,11 @@
-Name:Jolt
-ManaCost:2 U
-Types:Instant
-Text:no text
-A:SP$TapOrUntap | Cost$ 2 U | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SubAbility$ SVar=DBDraw | SpellDescription$ You may tap or untap target artifact, creature, or land. Draw a card at the beginning of the next turn's upkeep.
-SVar:DBDraw:AB$Draw | Defined$ You | NumCards$ 1 | NextUpkeep$ True
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/jolt.jpg
+Name:Jolt
+ManaCost:2 U
+Types:Instant
+Text:no text
+A:SP$TapOrUntap | Cost$ 2 U | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SubAbility$ SVar=DBDraw | SpellDescription$ You may tap or untap target artifact, creature, or land. Draw a card at the beginning of the next turn's upkeep.
+SVar:DBDraw:AB$Draw | Defined$ You | NumCards$ 1 | NextUpkeep$ True
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jolt.jpg
+SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/70.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/kodama_of_the_center_tree.txt b/res/cardsfolder/kodama_of_the_center_tree.txt
index 4ed04582186..316783c7446 100644
--- a/res/cardsfolder/kodama_of_the_center_tree.txt
+++ b/res/cardsfolder/kodama_of_the_center_tree.txt
@@ -1,13 +1,14 @@
-Name:Kodama of the Center Tree
-ManaCost:4 G
-Types:Legendary Creature Spirit
-Text:no text
-PT:*/*
-K:stSetPT:Count$Valid Spirit.YouCtrl:Count$Valid Spirit.YouCtrl:CARDNAME's power and toughness are each equal to the number of Spirits you control.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | Optional$ True | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ CARDNAME has soulshift X, where X is the number of Spirits you control. (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost X or less from your graveyard to your hand.)
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Spirit.YouCtrl+cmcLEX
-SVar:X:Count$Valid Spirit.YouCtrl
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kodama_of_the_center_tree.jpg
+Name:Kodama of the Center Tree
+ManaCost:4 G
+Types:Legendary Creature Spirit
+Text:no text
+PT:*/*
+K:stSetPT:Count$Valid Spirit.YouCtrl:Count$Valid Spirit.YouCtrl:CARDNAME's power and toughness are each equal to the number of Spirits you control.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | Optional$ True | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ CARDNAME has soulshift X, where X is the number of Spirits you control. (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost X or less from your graveyard to your hand.)
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Spirit.YouCtrl+cmcLEX
+SVar:X:Count$Valid Spirit.YouCtrl
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kodama_of_the_center_tree.jpg
+SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/131.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/merrow_reejerey.txt b/res/cardsfolder/merrow_reejerey.txt
index 0ca5c97dee3..c61ad73fa1a 100644
--- a/res/cardsfolder/merrow_reejerey.txt
+++ b/res/cardsfolder/merrow_reejerey.txt
@@ -1,12 +1,13 @@
-Name:Merrow Reejerey
-ManaCost:2 U
-Types:Creature Merfolk Soldier
-Text:no text
-PT:2/2
-K:stPumpAll:Creature.Merfolk+Other+YouCtrl:1/1:No Condition:Other Merfolk creatures you control get +1/+1.
-T:Mode$ SpellCast | ValidCard$ Card.Merfolk+YouCtrl | Execute$ TrigTapOrUntap | Optional$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Merfolk spell, you may tap or untap target permanent.  
-SVar:TrigTapOrUntap:AB$TapOrUntap | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/merrow_reejerey.jpg
+Name:Merrow Reejerey
+ManaCost:2 U
+Types:Creature Merfolk Soldier
+Text:no text
+PT:2/2
+K:stPumpAll:Creature.Merfolk+Other+YouCtrl:1/1:No Condition:Other Merfolk creatures you control get +1/+1.
+T:Mode$ SpellCast | ValidCard$ Card.Merfolk+YouCtrl | Execute$ TrigTapOrUntap | Optional$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Merfolk spell, you may tap or untap target permanent.
+SVar:TrigTapOrUntap:AB$TapOrUntap | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/merrow_reejerey.jpg
+SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/74.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/mind_swords.txt b/res/cardsfolder/mind_swords.txt
index d299d3c1e0c..408227e8560 100644
--- a/res/cardsfolder/mind_swords.txt
+++ b/res/cardsfolder/mind_swords.txt
@@ -1,11 +1,12 @@
-Name:Mind Swords
-ManaCost:1 B
-Types:Sorcery
-Text:no text
-A:SP$ ChangeZone | Cost$ 1 B | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True | SubAbility$ SVar=DBExileOpp | SpellDescription$ Each player exiles two cards from his or her hand.
-A:SP$ ChangeZone | Cost$ Sac<1/Creature> | IsPresent$ Swamp.YouCtrl | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True | SubAbility$ SVar=DBExileOpp | CostDesc$ If you control a Swamp, you may sacrifice a creature | SpellDescription$ rather than pay CARDNAME's mana cost.
-SVar:DBExileOpp:DB$ChangeZone | Defined$ Opponent | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mind_swords.jpg
+Name:Mind Swords
+ManaCost:1 B
+Types:Sorcery
+Text:no text
+A:SP$ ChangeZone | Cost$ 1 B | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True | SubAbility$ SVar=DBExileOpp | SpellDescription$ Each player exiles two cards from his or her hand.
+A:SP$ ChangeZone | Cost$ Sac<1/Creature> | IsPresent$ Swamp.YouCtrl | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True | SubAbility$ SVar=DBExileOpp | CostDesc$ If you control a Swamp, you may sacrifice a creature | SpellDescription$ rather than pay CARDNAME's mana cost.
+SVar:DBExileOpp:DB$ChangeZone | Defined$ Opponent | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mind_swords.jpg
+SetInfo:NMS|Common|http://magiccards.info/scans/en/ne/60.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/mitotic_slime.txt b/res/cardsfolder/mitotic_slime.txt
index 330a632fe5e..9769b87e4b2 100644
--- a/res/cardsfolder/mitotic_slime.txt
+++ b/res/cardsfolder/mitotic_slime.txt
@@ -1,12 +1,13 @@
-Name:Mitotic Slime
-ManaCost:4 G
-Types:Creature Ooze
-Text:no text
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenSenior | TriggerDescription$ When Mitotic Slime is put into a graveyard from the battlefield, put two 2/2 green Ooze creature tokens onto the battlefield. They have "When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield."
-SVar:TrigTokenSenior:AB$Token | Cost$ 0 | TokenImage$ g 2 2 ooze | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenColors$ Green | TokenOwner$ Controller | TokenPower$ 2 | TokenToughness$ 2 | TokenAmount$ 2 | TokenTriggers$ TriggerJunior | TokenSVars$ TrigTokenJunior
-SVar:TriggerJunior:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenJunior | TriggerDescription$ When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield.
-SVar:TrigTokenJunior:AB$Token | Cost$ 0 | TokenImage$ g 1 1 ooze | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenColors$ Green | TokenOwner$ Controller | TokenPower$ 1 | TokenToughness$ 1 | TokenAmount$ 2
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mitotic_slime.jpg
+Name:Mitotic Slime
+ManaCost:4 G
+Types:Creature Ooze
+Text:no text
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenSenior | TriggerDescription$ When Mitotic Slime is put into a graveyard from the battlefield, put two 2/2 green Ooze creature tokens onto the battlefield. They have "When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield."
+SVar:TrigTokenSenior:AB$Token | Cost$ 0 | TokenImage$ g 2 2 ooze | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenColors$ Green | TokenOwner$ Controller | TokenPower$ 2 | TokenToughness$ 2 | TokenAmount$ 2 | TokenTriggers$ TriggerJunior | TokenSVars$ TrigTokenJunior
+SVar:TriggerJunior:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenJunior | TriggerDescription$ When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield.
+SVar:TrigTokenJunior:AB$Token | Cost$ 0 | TokenImage$ g 1 1 ooze | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenColors$ Green | TokenOwner$ Controller | TokenPower$ 1 | TokenToughness$ 1 | TokenAmount$ 2
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mitotic_slime.jpg
+SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/185.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/mogg_maniac.txt b/res/cardsfolder/mogg_maniac.txt
index ba92c3a533f..744eaa27415 100644
--- a/res/cardsfolder/mogg_maniac.txt
+++ b/res/cardsfolder/mogg_maniac.txt
@@ -1,11 +1,12 @@
-Name:Mogg Maniac
-ManaCost:1 R
-Types:Creature Goblin
-Text:no text
-PT:1/1
-T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target opponent.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ X
-SVar:X:Count$TriggeredDamageAmount
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mogg_maniac.jpg
+Name:Mogg Maniac
+ManaCost:1 R
+Types:Creature Goblin
+Text:no text
+PT:1/1
+T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to target opponent.
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ X
+SVar:X:Count$TriggeredDamageAmount
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mogg_maniac.jpg
+SetInfo:STH|Uncommon|http://magiccards.info/scans/en/sh/94.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/pardic_arsonist.txt b/res/cardsfolder/pardic_arsonist.txt
index df9747611f3..118830186ef 100644
--- a/res/cardsfolder/pardic_arsonist.txt
+++ b/res/cardsfolder/pardic_arsonist.txt
@@ -7,4 +7,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 3
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pardic_arsonist.jpg
+SetInfo:TOR|Uncommon|http://magiccards.info/scans/en/tr/105.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/pit_keeper.txt b/res/cardsfolder/pit_keeper.txt
index b28acbdc2d5..afdd04fa49a 100644
--- a/res/cardsfolder/pit_keeper.txt
+++ b/res/cardsfolder/pit_keeper.txt
@@ -1,10 +1,11 @@
-Name:Pit Keeper
-ManaCost:1 B
-Types:Creature Human Wizard
-Text:no text
+Name:Pit Keeper
+ManaCost:1 B
+Types:Creature Human Wizard
+Text:no text
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | Optional$ True | IsPresent$ Creature.YouCtrl | PresentZone$ Graveyard | PresentPlayer$ You | PresentCompare$ GE4 | TriggerDescription$ When CARDNAME enters the battlefield, if you have four or more creature cards in your graveyard, you may return target creature card from your graveyard to your hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/pit_keeper.jpg
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/pit_keeper.jpg
+SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/123.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/rimewind_taskmage.txt b/res/cardsfolder/rimewind_taskmage.txt
index 1970ea8aa66..722fba2d3b7 100644
--- a/res/cardsfolder/rimewind_taskmage.txt
+++ b/res/cardsfolder/rimewind_taskmage.txt
@@ -1,10 +1,11 @@
-Name:Rimewind Taskmage
-ManaCost:1 U
-Types:Creature Human Wizard
-Text:no text
-PT:1/2
-A:AB$TapOrUntap | Cost$ 1 T | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | IsPresent$ Permanent.Snow+YouCtrl | PresentCompare$ GE4 | SpellDescription$ You may tap or untap target permanent. Activate this ability only if you control four or more snow permanents.
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/rimewind_taskmage.jpg
-End
+Name:Rimewind Taskmage
+ManaCost:1 U
+Types:Creature Human Wizard
+Text:no text
+PT:1/2
+A:AB$TapOrUntap | Cost$ 1 T | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | IsPresent$ Permanent.Snow+YouCtrl | PresentCompare$ GE4 | SpellDescription$ You may tap or untap target permanent. Activate this ability only if you control four or more snow permanents.
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/rimewind_taskmage.jpg
+SetInfo:CSP|Common|http://magiccards.info/scans/en/cs/44.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/takenuma_bleeder.txt b/res/cardsfolder/takenuma_bleeder.txt
index 611a4a83dcd..ba62b9b60dd 100644
--- a/res/cardsfolder/takenuma_bleeder.txt
+++ b/res/cardsfolder/takenuma_bleeder.txt
@@ -1,11 +1,12 @@
-Name:Takenuma Bleeder
-ManaCost:2 B
-Types:Creature Ogre Shaman
-Text:no text
-PT:3/3
-T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Card.Demon+YouCtrl | PresentCompare$ EQ0 | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME attacks or blocks, you lose 1 life if you don't control a Demon.
-T:Mode$ Blocks | ValidCard$ Card.Self | IsPresent$ Card.Demon+YouCtrl | PresentCompare$ EQ0 | Execute$ TrigLoseLife | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, you lose 1 life if you don't control a Demon.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/takenuma_bleeder.jpg
+Name:Takenuma Bleeder
+ManaCost:2 B
+Types:Creature Ogre Shaman
+Text:no text
+PT:3/3
+T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Card.Demon+YouCtrl | PresentCompare$ EQ0 | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME attacks or blocks, you lose 1 life if you don't control a Demon.
+T:Mode$ Blocks | ValidCard$ Card.Self | IsPresent$ Card.Demon+YouCtrl | PresentCompare$ EQ0 | Execute$ TrigLoseLife | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, you lose 1 life if you don't control a Demon.
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/takenuma_bleeder.jpg
+SetInfo:BOK|Common|http://magiccards.info/scans/en/bok/86.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/telekinetic_bonds.txt b/res/cardsfolder/telekinetic_bonds.txt
index 17237b5fc12..a01c05fee6a 100644
--- a/res/cardsfolder/telekinetic_bonds.txt
+++ b/res/cardsfolder/telekinetic_bonds.txt
@@ -1,10 +1,11 @@
-Name:Telekinetic Bonds
-ManaCost:2 U U U
-Types:Enchantment
-Text:no text
-T:Mode$ Discarded | ValidPlayer$ Player | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigTapOrUntap | TriggerDescription$ Whenever a player discards a card, you may pay 1 U. If you do, you may tap or untap target permanent.
-SVar:TrigTapOrUntap:AB$TapOrUntap | Cost$ 1 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/telekinetic_bonds.jpg
+Name:Telekinetic Bonds
+ManaCost:2 U U U
+Types:Enchantment
+Text:no text
+T:Mode$ Discarded | ValidPlayer$ Player | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigTapOrUntap | TriggerDescription$ Whenever a player discards a card, you may pay 1 U. If you do, you may tap or untap target permanent.
+SVar:TrigTapOrUntap:AB$TapOrUntap | Cost$ 1 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/telekinetic_bonds.jpg
+SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/52.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/teller_of_tales.txt b/res/cardsfolder/teller_of_tales.txt
index 739a767478d..c60e9a7a470 100644
--- a/res/cardsfolder/teller_of_tales.txt
+++ b/res/cardsfolder/teller_of_tales.txt
@@ -1,12 +1,13 @@
-Name:Teller of Tales
-ManaCost:3 U U
-Types:Creature Spirit
-Text:no text
-PT:3/3
-K:Flying
-T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTapOrUntap | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may tap or untap target creature.
-SVar:TrigTapOrUntap:AB$TapOrUntap | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/teller_of_tales.jpg
+Name:Teller of Tales
+ManaCost:3 U U
+Types:Creature Spirit
+Text:no text
+PT:3/3
+K:Flying
+T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTapOrUntap | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may tap or untap target creature.
+SVar:TrigTapOrUntap:AB$TapOrUntap | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/teller_of_tales.jpg
+SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/95.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/tidal_bore.txt b/res/cardsfolder/tidal_bore.txt
index 6ea366db006..d378880de31 100644
--- a/res/cardsfolder/tidal_bore.txt
+++ b/res/cardsfolder/tidal_bore.txt
@@ -1,10 +1,11 @@
-Name:Tidal Bore
-ManaCost:1 U
-Types:Instant
-Text:no text
-A:SP$TapOrUntap | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ You may tap or untap target creature.
-SVar:AltCost:Return<1/Island>  
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/tidal_bore.jpg
+Name:Tidal Bore
+ManaCost:1 U
+Types:Instant
+Text:no text
+A:SP$TapOrUntap | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ You may tap or untap target creature.
+SVar:AltCost:Return<1/Island>
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/tidal_bore.jpg
+SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/109.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/toils_of_night_and_day.txt b/res/cardsfolder/toils_of_night_and_day.txt
index 50c7ab99d1a..eda5d4009f9 100644
--- a/res/cardsfolder/toils_of_night_and_day.txt
+++ b/res/cardsfolder/toils_of_night_and_day.txt
@@ -1,10 +1,11 @@
-Name:Toils of Night and Day
-ManaCost:2 U
-Types:Instant Arcane
-Text:no text
-A:SP$TapOrUntap | Cost$ 2 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SubAbility$ SVar=DBTapOrUntap| SpellDescription$ You may tap or untap target permanent, then you may tap or untap another target permanent.
-SVar:DBTapOrUntap:DB$TapOrUntap | ValidTgts$ Permanent | TgtPrompt$ Select target permanent (2)
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/toils_of_night_and_day.jpg
+Name:Toils of Night and Day
+ManaCost:2 U
+Types:Instant Arcane
+Text:no text
+A:SP$TapOrUntap | Cost$ 2 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SubAbility$ SVar=DBTapOrUntap| SpellDescription$ You may tap or untap target permanent, then you may tap or untap another target permanent.
+SVar:DBTapOrUntap:DB$TapOrUntap | ValidTgts$ Permanent | TgtPrompt$ Select target permanent (2)
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/toils_of_night_and_day.jpg
+SetInfo:BOK|Common|http://magiccards.info/scans/en/bok/57.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/turnabout.txt b/res/cardsfolder/turnabout.txt
index 810e235fff5..1c72482d706 100644
--- a/res/cardsfolder/turnabout.txt
+++ b/res/cardsfolder/turnabout.txt
@@ -1,8 +1,9 @@
-Name:Turnabout
-ManaCost:2 U U
-Types:Instant
-Text:Choose artifact, creature, or land. Tap all untapped permanents of the chosen type target player controls, or untap all tapped permanents of that type that player controls.
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/turnabout.jpg
+Name:Turnabout
+ManaCost:2 U U
+Types:Instant
+Text:Choose artifact, creature, or land. Tap all untapped permanents of the chosen type target player controls, or untap all tapped permanents of that type that player controls.
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/turnabout.jpg
+SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/105.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/wall_of_essence.txt b/res/cardsfolder/wall_of_essence.txt
index 5f07847d334..cdbca275ec3 100644
--- a/res/cardsfolder/wall_of_essence.txt
+++ b/res/cardsfolder/wall_of_essence.txt
@@ -9,4 +9,5 @@ SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X
 SVar:X:Count$TriggeredDamageAmount
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_essence.jpg
+SetInfo:STH|Uncommon|http://magiccards.info/scans/en/sh/122.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/wall_of_souls.txt b/res/cardsfolder/wall_of_souls.txt
index ae1f251bfcb..a2dcc6e98d9 100644
--- a/res/cardsfolder/wall_of_souls.txt
+++ b/res/cardsfolder/wall_of_souls.txt
@@ -1,11 +1,12 @@
-Name:Wall of Souls
-ManaCost:1 B
-Types:Creature Wall
-Text:no text
-PT:0/4
-K:Defender
-T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigDamage | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME is dealt combat damage, it deals that much damage to target opponent.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ X
-SVar:X:Count$TriggeredDamageAmount
-SVar:Rarity:Uncommon
+Name:Wall of Souls
+ManaCost:1 B
+Types:Creature Wall
+Text:no text
+PT:0/4
+K:Defender
+T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigDamage | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME is dealt combat damage, it deals that much damage to target opponent.
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ X
+SVar:X:Count$TriggeredDamageAmount
+SVar:Rarity:Uncommon
+SetInfo:STH|Uncommon|http://magiccards.info/scans/en/sh/25.jpg
 End
\ No newline at end of file