diff --git a/.gitattributes b/.gitattributes
index ff423c59ce5..5c89d27d6e5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -366,7 +366,7 @@ res/cardsfolder/aven_augur.txt -text svneol=native#text/plain
 res/cardsfolder/aven_brigadier.txt -text svneol=native#text/plain
 res/cardsfolder/aven_cloudchaser.txt -text svneol=native#text/plain
 res/cardsfolder/aven_envoy.txt -text svneol=native#text/plain
-res/cardsfolder/aven_farseer.txt -text svneol=native#text/plain
+res/cardsfolder/aven_farseer.txt svneol=native#text/plain
 res/cardsfolder/aven_fateshaper.txt -text svneol=native#text/plain
 res/cardsfolder/aven_fisher.txt -text svneol=native#text/plain
 res/cardsfolder/aven_flock.txt -text svneol=native#text/plain
@@ -419,7 +419,7 @@ res/cardsfolder/ballyrush_banneret.txt -text svneol=native#text/plain
 res/cardsfolder/baloth_woodcrasher.txt -text svneol=native#text/plain
 res/cardsfolder/balshan_collaborator.txt -text svneol=native#text/plain
 res/cardsfolder/balshan_griffin.txt -text svneol=native#text/plain
-res/cardsfolder/balthor_the_defiled.txt -text svneol=native#text/plain
+res/cardsfolder/balthor_the_defiled.txt svneol=native#text/plain
 res/cardsfolder/balthor_the_stout.txt -text svneol=native#text/plain
 res/cardsfolder/baneslayer_angel.txt -text svneol=native#text/plain
 res/cardsfolder/banishing_knack.txt -text svneol=native#text/plain
@@ -587,7 +587,7 @@ res/cardsfolder/blistergrub.txt -text svneol=native#text/plain
 res/cardsfolder/blistering_barrier.txt -text svneol=native#text/plain
 res/cardsfolder/blistering_dieflyn.txt -text svneol=native#text/plain
 res/cardsfolder/blistering_firecat.txt -text svneol=native#text/plain
-res/cardsfolder/blitz_hellion.txt -text svneol=native#text/plain
+res/cardsfolder/blitz_hellion.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
@@ -837,7 +837,7 @@ res/cardsfolder/carrion_wall.txt -text svneol=native#text/plain
 res/cardsfolder/cartographer.txt -text svneol=native#text/plain
 res/cardsfolder/carven_caryatid.txt -text svneol=native#text/plain
 res/cardsfolder/cascade_bluffs.txt -text svneol=native#text/plain
-res/cardsfolder/casting_of_bones.txt -text svneol=native#text/plain
+res/cardsfolder/casting_of_bones.txt svneol=native#text/plain
 res/cardsfolder/castle.txt -text svneol=native#text/plain
 res/cardsfolder/castle_raptors.txt -text svneol=native#text/plain
 res/cardsfolder/castle_sengir.txt -text svneol=native#text/plain
@@ -1155,7 +1155,7 @@ res/cardsfolder/crypt_of_agadeem.txt -text svneol=native#text/plain
 res/cardsfolder/crypt_ripper.txt -text svneol=native#text/plain
 res/cardsfolder/cryptic_command.txt svneol=native#text/plain
 res/cardsfolder/crystal_ball.txt -text svneol=native#text/plain
-res/cardsfolder/crystal_chimes.txt -text svneol=native#text/plain
+res/cardsfolder/crystal_chimes.txt svneol=native#text/plain
 res/cardsfolder/crystal_quarry.txt -text svneol=native#text/plain
 res/cardsfolder/crystal_rod.txt -text svneol=native#text/plain
 res/cardsfolder/crystal_vein.txt -text svneol=native#text/plain
@@ -1375,7 +1375,7 @@ res/cardsfolder/diabolic_tutor.txt -text svneol=native#text/plain
 res/cardsfolder/diamond_faerie.txt -text svneol=native#text/plain
 res/cardsfolder/diamond_valley.txt -text svneol=native#text/plain
 res/cardsfolder/didgeridoo.txt svneol=native#text/plain
-res/cardsfolder/diminishing_returns.txt -text svneol=native#text/plain
+res/cardsfolder/diminishing_returns.txt svneol=native#text/plain
 res/cardsfolder/dimir_aqueduct.txt -text svneol=native#text/plain
 res/cardsfolder/dimir_cutpurse.txt -text svneol=native#text/plain
 res/cardsfolder/dimir_guildmage.txt -text svneol=native#text/plain
@@ -1660,7 +1660,7 @@ res/cardsfolder/emmessi_tome.txt -text svneol=native#text/plain
 res/cardsfolder/emperor_crocodile.txt -text svneol=native#text/plain
 res/cardsfolder/empress_galina.txt -text svneol=native#text/plain
 res/cardsfolder/empty_shrine_kannushi.txt -text svneol=native#text/plain
-res/cardsfolder/empty_the_catacombs.txt -text svneol=native#text/plain
+res/cardsfolder/empty_the_catacombs.txt svneol=native#text/plain
 res/cardsfolder/empty_the_warrens.txt -text svneol=native#text/plain
 res/cardsfolder/empyrial_armor.txt -text svneol=native#text/plain
 res/cardsfolder/empyrial_plate.txt -text svneol=native#text/plain
@@ -1674,7 +1674,7 @@ res/cardsfolder/encroach.txt -text svneol=native#text/plain
 res/cardsfolder/endless_cockroaches.txt -text svneol=native#text/plain
 res/cardsfolder/enemy_of_the_guildpact.txt -text svneol=native#text/plain
 res/cardsfolder/energizer.txt -text svneol=native#text/plain
-res/cardsfolder/energy_arc.txt -text svneol=native#text/plain
+res/cardsfolder/energy_arc.txt svneol=native#text/plain
 res/cardsfolder/energy_flux.txt -text svneol=native#text/plain
 res/cardsfolder/energy_storm.txt -text svneol=native#text/plain
 res/cardsfolder/energy_tap.txt -text svneol=native#text/plain
@@ -1799,7 +1799,7 @@ res/cardsfolder/fallen_ideal.txt -text svneol=native#text/plain
 res/cardsfolder/fallow_earth.txt -text svneol=native#text/plain
 res/cardsfolder/fallowsage.txt -text svneol=native#text/plain
 res/cardsfolder/false_defeat.txt -text svneol=native#text/plain
-res/cardsfolder/false_demise.txt -text svneol=native#text/plain
+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
@@ -1851,7 +1851,7 @@ res/cardsfolder/fervent_charge.txt -text svneol=native#text/plain
 res/cardsfolder/fervent_denial.txt -text svneol=native#text/plain
 res/cardsfolder/fervor.txt -text svneol=native#text/plain
 res/cardsfolder/festering_evil.txt -text svneol=native#text/plain
-res/cardsfolder/festering_march.txt -text svneol=native#text/plain
+res/cardsfolder/festering_march.txt svneol=native#text/plain
 res/cardsfolder/festering_wound.txt -text svneol=native#text/plain
 res/cardsfolder/festival_of_trokin.txt -text svneol=native#text/plain
 res/cardsfolder/fetid_heath.txt -text svneol=native#text/plain
@@ -1949,7 +1949,7 @@ res/cardsfolder/fleetfoot_panther.txt -text svneol=native#text/plain
 res/cardsfolder/fleeting_distraction.txt -text svneol=native#text/plain
 res/cardsfolder/fleeting_image.txt -text svneol=native#text/plain
 res/cardsfolder/fleshgrafter.txt -text svneol=native#text/plain
-res/cardsfolder/fleshwrither.txt -text svneol=native#text/plain
+res/cardsfolder/fleshwrither.txt svneol=native#text/plain
 res/cardsfolder/flight.txt -text svneol=native#text/plain
 res/cardsfolder/flight_of_fancy.txt -text svneol=native#text/plain
 res/cardsfolder/flight_spellbomb.txt -text svneol=native#text/plain
@@ -2095,7 +2095,7 @@ res/cardsfolder/gangrenous_goliath.txt -text svneol=native#text/plain
 res/cardsfolder/gargoyle_castle.txt -text svneol=native#text/plain
 res/cardsfolder/garruk_wildspeaker.txt -text svneol=native#text/plain
 res/cardsfolder/garruks_companion.txt -text svneol=native#text/plain
-res/cardsfolder/garruks_packleader.txt -text svneol=native#text/plain
+res/cardsfolder/garruks_packleader.txt svneol=native#text/plain
 res/cardsfolder/garza_zol_plague_queen.txt -text svneol=native#text/plain
 res/cardsfolder/gaseous_form.txt -text svneol=native#text/plain
 res/cardsfolder/gate_hound.txt -text svneol=native#text/plain
@@ -2133,7 +2133,7 @@ res/cardsfolder/ghost_lit_raider.txt -text svneol=native#text/plain
 res/cardsfolder/ghost_lit_redeemer.txt -text svneol=native#text/plain
 res/cardsfolder/ghost_lit_stalker.txt -text svneol=native#text/plain
 res/cardsfolder/ghost_lit_warder.txt -text svneol=native#text/plain
-res/cardsfolder/ghost_quarter.txt -text svneol=native#text/plain
+res/cardsfolder/ghost_quarter.txt svneol=native#text/plain
 res/cardsfolder/ghost_ship.txt -text svneol=native#text/plain
 res/cardsfolder/ghost_tactician.txt -text svneol=native#text/plain
 res/cardsfolder/ghost_town.txt -text svneol=native#text/plain
@@ -2251,7 +2251,7 @@ res/cardsfolder/goblin_replica.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_rimerunner.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_ringleader.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_roughrider.txt -text svneol=native#text/plain
-res/cardsfolder/goblin_ruinblaster.txt -text svneol=native#text/plain
+res/cardsfolder/goblin_ruinblaster.txt svneol=native#text/plain
 res/cardsfolder/goblin_scouts.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_settler.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_sharpshooter.txt -text svneol=native#text/plain
@@ -2277,7 +2277,7 @@ res/cardsfolder/godless_shrine.txt -text svneol=native#text/plain
 res/cardsfolder/gods_eye_gate_to_the_reikai.txt -text svneol=native#text/plain
 res/cardsfolder/godsire.txt -text svneol=native#text/plain
 res/cardsfolder/godtoucher.txt -text svneol=native#text/plain
-res/cardsfolder/godtracker_of_jund.txt -text svneol=native#text/plain
+res/cardsfolder/godtracker_of_jund.txt svneol=native#text/plain
 res/cardsfolder/gold_myr.txt -text svneol=native#text/plain
 res/cardsfolder/golden_bear.txt -text svneol=native#text/plain
 res/cardsfolder/golden_urn.txt -text svneol=native#text/plain
@@ -2323,7 +2323,7 @@ res/cardsfolder/grassland_crusader.txt -text svneol=native#text/plain
 res/cardsfolder/grasslands.txt -text svneol=native#text/plain
 res/cardsfolder/gratuitous_violence.txt svneol=native#text/plain
 res/cardsfolder/grave_defiler.txt -text svneol=native#text/plain
-res/cardsfolder/grave_pact.txt -text svneol=native#text/plain
+res/cardsfolder/grave_pact.txt svneol=native#text/plain
 res/cardsfolder/grave_robbers.txt -text svneol=native#text/plain
 res/cardsfolder/grave_shell_scarab.txt -text svneol=native#text/plain
 res/cardsfolder/grave_titan.txt -text svneol=native#text/plain
@@ -2365,7 +2365,7 @@ res/cardsfolder/grim_tutor.txt -text svneol=native#text/plain
 res/cardsfolder/grindclock.txt -text svneol=native#text/plain
 res/cardsfolder/grindstone.txt -text svneol=native#text/plain
 res/cardsfolder/grinning_demon.txt -text svneol=native#text/plain
-res/cardsfolder/grinning_ignus.txt -text svneol=native#text/plain
+res/cardsfolder/grinning_ignus.txt svneol=native#text/plain
 res/cardsfolder/gristle_grinner.txt -text svneol=native#text/plain
 res/cardsfolder/grixis_battlemage.txt -text svneol=native#text/plain
 res/cardsfolder/grixis_grimblade.txt -text svneol=native#text/plain
@@ -2421,7 +2421,7 @@ res/cardsfolder/hallowed_fountain.txt -text svneol=native#text/plain
 res/cardsfolder/hallowed_ground.txt -text svneol=native#text/plain
 res/cardsfolder/halo_hunter.txt -text svneol=native#text/plain
 res/cardsfolder/halt_order.txt -text svneol=native#text/plain
-res/cardsfolder/hamletback_goliath.txt -text svneol=native#text/plain
+res/cardsfolder/hamletback_goliath.txt svneol=native#text/plain
 res/cardsfolder/hammer_mage.txt -text svneol=native#text/plain
 res/cardsfolder/hammer_of_bogardan.txt -text svneol=native#text/plain
 res/cardsfolder/hammerfist_giant.txt -text svneol=native#text/plain
@@ -2476,7 +2476,7 @@ res/cardsfolder/heart_sliver.txt -text svneol=native#text/plain
 res/cardsfolder/heart_warden.txt -text svneol=native#text/plain
 res/cardsfolder/hearthfire_hobgoblin.txt -text svneol=native#text/plain
 res/cardsfolder/heartmender.txt -text svneol=native#text/plain
-res/cardsfolder/heartstabber_mosquito.txt -text svneol=native#text/plain
+res/cardsfolder/heartstabber_mosquito.txt svneol=native#text/plain
 res/cardsfolder/heartstone.txt -text svneol=native#text/plain
 res/cardsfolder/heartwood_dryad.txt -text svneol=native#text/plain
 res/cardsfolder/heartwood_shard.txt -text svneol=native#text/plain
@@ -2679,8 +2679,8 @@ res/cardsfolder/inexorable_tide.txt -text svneol=native#text/plain
 res/cardsfolder/infantry_veteran.txt -text svneol=native#text/plain
 res/cardsfolder/infected_vermin.txt -text svneol=native#text/plain
 res/cardsfolder/infectious_horror.txt -text svneol=native#text/plain
-res/cardsfolder/infectious_host.txt -text svneol=native#text/plain
-res/cardsfolder/infernal_caretaker.txt -text svneol=native#text/plain
+res/cardsfolder/infectious_host.txt svneol=native#text/plain
+res/cardsfolder/infernal_caretaker.txt svneol=native#text/plain
 res/cardsfolder/infernal_contract.txt -text svneol=native#text/plain
 res/cardsfolder/infernal_kirin.txt -text svneol=native#text/plain
 res/cardsfolder/infernal_medusa.txt -text svneol=native#text/plain
@@ -2891,7 +2891,7 @@ res/cardsfolder/kazandu_blademaster.txt -text svneol=native#text/plain
 res/cardsfolder/kazandu_refuge.txt -text svneol=native#text/plain
 res/cardsfolder/kazandu_tuskcaller.txt -text svneol=native#text/plain
 res/cardsfolder/kazuul_warlord.txt -text svneol=native#text/plain
-res/cardsfolder/kederekt_leviathan.txt -text svneol=native#text/plain
+res/cardsfolder/kederekt_leviathan.txt svneol=native#text/plain
 res/cardsfolder/kederekt_parasite.txt -text svneol=native#text/plain
 res/cardsfolder/keen_eyed_archers.txt -text svneol=native#text/plain
 res/cardsfolder/keen_sense.txt -text svneol=native#text/plain
@@ -2935,7 +2935,7 @@ res/cardsfolder/kingfisher.txt -text svneol=native#text/plain
 res/cardsfolder/kings_assassin.txt -text svneol=native#text/plain
 res/cardsfolder/kinsbaile_borderguard.txt -text svneol=native#text/plain
 res/cardsfolder/kinsbaile_cavalier.txt -text svneol=native#text/plain
-res/cardsfolder/kinsbaile_skirmisher.txt -text svneol=native#text/plain
+res/cardsfolder/kinsbaile_skirmisher.txt svneol=native#text/plain
 res/cardsfolder/kird_ape.txt -text svneol=native#text/plain
 res/cardsfolder/kiri_onna.txt -text svneol=native#text/plain
 res/cardsfolder/kirtars_desire.txt -text svneol=native#text/plain
@@ -2988,13 +2988,13 @@ res/cardsfolder/kokusho_the_evening_star.txt -text svneol=native#text/plain
 res/cardsfolder/konda_lord_of_eiganjo.txt -text svneol=native#text/plain
 res/cardsfolder/kondas_hatamoto.txt -text svneol=native#text/plain
 res/cardsfolder/kongming_sleeping_dragon.txt -text svneol=native#text/plain
-res/cardsfolder/kor_aeronaut.txt -text svneol=native#text/plain
+res/cardsfolder/kor_aeronaut.txt svneol=native#text/plain
 res/cardsfolder/kor_cartographer.txt -text svneol=native#text/plain
 res/cardsfolder/kor_duelist.txt -text svneol=native#text/plain
 res/cardsfolder/kor_firewalker.txt -text svneol=native#text/plain
 res/cardsfolder/kor_haven.txt -text svneol=native#text/plain
 res/cardsfolder/kor_line_slinger.txt -text svneol=native#text/plain
-res/cardsfolder/kor_sanctifiers.txt -text svneol=native#text/plain
+res/cardsfolder/kor_sanctifiers.txt svneol=native#text/plain
 res/cardsfolder/kor_skyfisher.txt -text svneol=native#text/plain
 res/cardsfolder/kor_spiritdancer.txt -text svneol=native#text/plain
 res/cardsfolder/korlash_heir_to_blackblade.txt -text svneol=native#text/plain
@@ -3032,7 +3032,7 @@ res/cardsfolder/kuldotha_forgemaster.txt -text svneol=native#text/plain
 res/cardsfolder/kuldotha_phoenix.txt -text svneol=native#text/plain
 res/cardsfolder/kuldotha_rebirth.txt -text svneol=native#text/plain
 res/cardsfolder/kulrath_knight.txt -text svneol=native#text/plain
-res/cardsfolder/kurgadon.txt -text svneol=native#text/plain
+res/cardsfolder/kurgadon.txt svneol=native#text/plain
 res/cardsfolder/kuros_taken.txt -text svneol=native#text/plain
 res/cardsfolder/kyren_glider.txt -text svneol=native#text/plain
 res/cardsfolder/kyren_negotiations.txt -text svneol=native#text/plain
@@ -3100,11 +3100,11 @@ res/cardsfolder/leonin_skyhunter.txt -text svneol=native#text/plain
 res/cardsfolder/leonin_squire.txt -text svneol=native#text/plain
 res/cardsfolder/leonin_sun_standard.txt -text svneol=native#text/plain
 res/cardsfolder/leshracs_rite.txt -text svneol=native#text/plain
-res/cardsfolder/lethargy_trap.txt -text svneol=native#text/plain
+res/cardsfolder/lethargy_trap.txt svneol=native#text/plain
 res/cardsfolder/leveler.txt -text svneol=native#text/plain
 res/cardsfolder/levitation.txt -text svneol=native#text/plain
 res/cardsfolder/ley_druid.txt -text svneol=native#text/plain
-res/cardsfolder/leyline_of_lightning.txt -text svneol=native#text/plain
+res/cardsfolder/leyline_of_lightning.txt svneol=native#text/plain
 res/cardsfolder/leyline_of_punishment.txt -text svneol=native#text/plain
 res/cardsfolder/leyline_of_singularity.txt -text svneol=native#text/plain
 res/cardsfolder/leyline_of_the_meek.txt -text svneol=native#text/plain
@@ -3137,7 +3137,7 @@ res/cardsfolder/lightning_angel.txt -text svneol=native#text/plain
 res/cardsfolder/lightning_blast.txt -text svneol=native#text/plain
 res/cardsfolder/lightning_blow.txt -text svneol=native#text/plain
 res/cardsfolder/lightning_bolt.txt -text svneol=native#text/plain
-res/cardsfolder/lightning_cloud.txt -text svneol=native#text/plain
+res/cardsfolder/lightning_cloud.txt svneol=native#text/plain
 res/cardsfolder/lightning_crafter.txt -text svneol=native#text/plain
 res/cardsfolder/lightning_dragon.txt -text svneol=native#text/plain
 res/cardsfolder/lightning_elemental.txt -text svneol=native#text/plain
@@ -3496,7 +3496,7 @@ res/cardsfolder/mogg_squad.txt -text svneol=native#text/plain
 res/cardsfolder/mogg_war_marshal.txt -text svneol=native#text/plain
 res/cardsfolder/moggcatcher.txt -text svneol=native#text/plain
 res/cardsfolder/mold_adder.txt -text svneol=native#text/plain
-res/cardsfolder/mold_shambler.txt -text svneol=native#text/plain
+res/cardsfolder/mold_shambler.txt svneol=native#text/plain
 res/cardsfolder/molder_beast.txt -text svneol=native#text/plain
 res/cardsfolder/moldervine_cloak.txt -text svneol=native#text/plain
 res/cardsfolder/molimo_maro_sorcerer.txt -text svneol=native#text/plain
@@ -3540,7 +3540,7 @@ res/cardsfolder/morphling.txt -text svneol=native#text/plain
 res/cardsfolder/morsel_theft.txt -text svneol=native#text/plain
 res/cardsfolder/mortal_combat.txt -text svneol=native#text/plain
 res/cardsfolder/mortal_wound.txt -text svneol=native#text/plain
-res/cardsfolder/mortician_beetle.txt -text svneol=native#text/plain
+res/cardsfolder/mortician_beetle.txt svneol=native#text/plain
 res/cardsfolder/mortify.txt -text svneol=native#text/plain
 res/cardsfolder/mortipede.txt -text svneol=native#text/plain
 res/cardsfolder/mortiphobia.txt -text svneol=native#text/plain
@@ -3582,7 +3582,7 @@ res/cardsfolder/multanis_acolyte.txt -text svneol=native#text/plain
 res/cardsfolder/multanis_decree.txt -text svneol=native#text/plain
 res/cardsfolder/mungha_wurm.txt -text svneol=native#text/plain
 res/cardsfolder/muraganda_petroglyphs.txt -text svneol=native#text/plain
-res/cardsfolder/murasa_pyromancer.txt -text svneol=native#text/plain
+res/cardsfolder/murasa_pyromancer.txt svneol=native#text/plain
 res/cardsfolder/murderous_redcap.txt -text svneol=native#text/plain
 res/cardsfolder/murkfiend_liege.txt -text svneol=native#text/plain
 res/cardsfolder/murmuring_bosk.txt -text svneol=native#text/plain
@@ -3632,7 +3632,7 @@ res/cardsfolder/nantuko_shade.txt -text svneol=native#text/plain
 res/cardsfolder/nantuko_vigilante.txt svneol=native#text/plain
 res/cardsfolder/narcissism.txt -text svneol=native#text/plain
 res/cardsfolder/narcomoeba.txt svneol=native#text/plain
-res/cardsfolder/narrow_escape.txt -text svneol=native#text/plain
+res/cardsfolder/narrow_escape.txt svneol=native#text/plain
 res/cardsfolder/narwhal.txt -text svneol=native#text/plain
 res/cardsfolder/nath_of_the_gilt_leaf.txt -text svneol=native#text/plain
 res/cardsfolder/naths_buffoon.txt -text svneol=native#text/plain
@@ -3685,7 +3685,7 @@ res/cardsfolder/neurok_invisimancer.txt -text svneol=native#text/plain
 res/cardsfolder/neurok_replica.txt svneol=native#text/plain
 res/cardsfolder/neurok_spy.txt -text svneol=native#text/plain
 res/cardsfolder/nevinyrrals_disk.txt -text svneol=native#text/plain
-res/cardsfolder/new_benalia.txt -text svneol=native#text/plain
+res/cardsfolder/new_benalia.txt svneol=native#text/plain
 res/cardsfolder/nezumi_bone_reader.txt -text svneol=native#text/plain
 res/cardsfolder/nezumi_cutthroat.txt -text svneol=native#text/plain
 res/cardsfolder/nezumi_ronin.txt -text svneol=native#text/plain
@@ -3753,7 +3753,7 @@ res/cardsfolder/noxious_hatchling.txt -text svneol=native#text/plain
 res/cardsfolder/nucklavee.txt -text svneol=native#text/plain
 res/cardsfolder/null_brooch.txt -text svneol=native#text/plain
 res/cardsfolder/nullmage_shepherd.txt -text svneol=native#text/plain
-res/cardsfolder/nurturer_initiate.txt -text svneol=native#text/plain
+res/cardsfolder/nurturer_initiate.txt svneol=native#text/plain
 res/cardsfolder/nut_collector.txt -text svneol=native#text/plain
 res/cardsfolder/nyxathid.txt -text svneol=native#text/plain
 res/cardsfolder/oakenform.txt -text svneol=native#text/plain
@@ -3797,7 +3797,7 @@ res/cardsfolder/old_ghastbark.txt -text svneol=native#text/plain
 res/cardsfolder/old_man_of_the_sea.txt -text svneol=native#text/plain
 res/cardsfolder/omega_myr.txt -text svneol=native#text/plain
 res/cardsfolder/omen.txt -text svneol=native#text/plain
-res/cardsfolder/omen_of_fire.txt -text svneol=native#text/plain
+res/cardsfolder/omen_of_fire.txt svneol=native#text/plain
 res/cardsfolder/omnath_locus_of_mana.txt -text svneol=native#text/plain
 res/cardsfolder/ondu_cleric.txt -text svneol=native#text/plain
 res/cardsfolder/ondu_giant.txt -text svneol=native#text/plain
@@ -3891,7 +3891,7 @@ res/cardsfolder/panic.txt -text svneol=native#text/plain
 res/cardsfolder/panic_attack.txt -text svneol=native#text/plain
 res/cardsfolder/panic_spellbomb.txt -text svneol=native#text/plain
 res/cardsfolder/panther_warriors.txt -text svneol=native#text/plain
-res/cardsfolder/paradigm_shift.txt -text svneol=native#text/plain
+res/cardsfolder/paradigm_shift.txt svneol=native#text/plain
 res/cardsfolder/parallel_evolution.txt -text svneol=native#text/plain
 res/cardsfolder/paralyzing_grasp.txt -text svneol=native#text/plain
 res/cardsfolder/parapet_watchers.txt -text svneol=native#text/plain
@@ -4024,7 +4024,7 @@ res/cardsfolder/plague_wind.txt -text svneol=native#text/plain
 res/cardsfolder/plague_witch.txt -text svneol=native#text/plain
 res/cardsfolder/plagued_rusalka.txt -text svneol=native#text/plain
 res/cardsfolder/plains.txt -text svneol=native#text/plain
-res/cardsfolder/planar_birth.txt -text svneol=native#text/plain
+res/cardsfolder/planar_birth.txt svneol=native#text/plain
 res/cardsfolder/planar_cleansing.txt -text svneol=native#text/plain
 res/cardsfolder/planar_collapse.txt -text svneol=native#text/plain
 res/cardsfolder/planar_despair.txt -text svneol=native#text/plain
@@ -4067,7 +4067,7 @@ res/cardsfolder/predator_dragon.txt -text svneol=native#text/plain
 res/cardsfolder/predator_flagship.txt -text svneol=native#text/plain
 res/cardsfolder/predators_strike.txt -text svneol=native#text/plain
 res/cardsfolder/predatory_advantage.txt -text svneol=native#text/plain
-res/cardsfolder/predatory_nightstalker.txt -text svneol=native#text/plain
+res/cardsfolder/predatory_nightstalker.txt svneol=native#text/plain
 res/cardsfolder/preeminent_captain.txt -text svneol=native#text/plain
 res/cardsfolder/preemptive_strike.txt -text svneol=native#text/plain
 res/cardsfolder/preordain.txt -text svneol=native#text/plain
@@ -4127,13 +4127,13 @@ res/cardsfolder/pulverize.txt -text svneol=native#text/plain
 res/cardsfolder/puncture_bolt.txt -text svneol=native#text/plain
 res/cardsfolder/puncturing_light.txt -text svneol=native#text/plain
 res/cardsfolder/punish_ignorance.txt -text svneol=native#text/plain
-res/cardsfolder/punishing_fire.txt -text svneol=native#text/plain
+res/cardsfolder/punishing_fire.txt svneol=native#text/plain
 res/cardsfolder/puppet_strings.txt -text svneol=native#text/plain
 res/cardsfolder/puppeteer.txt -text svneol=native#text/plain
 res/cardsfolder/purge.txt -text svneol=native#text/plain
 res/cardsfolder/purify.txt -text svneol=native#text/plain
 res/cardsfolder/purity.txt -text svneol=native#text/plain
-res/cardsfolder/purraj_of_urborg.txt -text svneol=native#text/plain
+res/cardsfolder/purraj_of_urborg.txt svneol=native#text/plain
 res/cardsfolder/pus_kami.txt -text svneol=native#text/plain
 res/cardsfolder/putrefax.txt -text svneol=native#text/plain
 res/cardsfolder/putrefy.txt -text svneol=native#text/plain
@@ -4167,7 +4167,7 @@ res/cardsfolder/quicksilver_gargantuan.txt svneol=native#text/plain
 res/cardsfolder/quicksilver_wall.txt svneol=native#text/plain
 res/cardsfolder/quiet_purity.txt -text svneol=native#text/plain
 res/cardsfolder/quietus_spike.txt -text svneol=native#text/plain
-res/cardsfolder/quill_slinger_boggart.txt -text svneol=native#text/plain
+res/cardsfolder/quill_slinger_boggart.txt svneol=native#text/plain
 res/cardsfolder/quirion_dryad.txt -text svneol=native#text/plain
 res/cardsfolder/quirion_explorer.txt -text svneol=native#text/plain
 res/cardsfolder/quirion_ranger.txt -text svneol=native#text/plain
@@ -4254,7 +4254,7 @@ res/cardsfolder/razortooth_rats.txt -text svneol=native#text/plain
 res/cardsfolder/razorverge_thicket.txt -text svneol=native#text/plain
 res/cardsfolder/reach_of_branches.txt -text svneol=native#text/plain
 res/cardsfolder/reach_through_mists.txt -text svneol=native#text/plain
-res/cardsfolder/reality_strobe.txt -text svneol=native#text/plain
+res/cardsfolder/reality_strobe.txt svneol=native#text/plain
 res/cardsfolder/reanimate.txt -text svneol=native#text/plain
 res/cardsfolder/reaper_king.txt svneol=native#text/plain
 res/cardsfolder/reaping_the_graves.txt -text svneol=native#text/plain
@@ -4286,7 +4286,7 @@ res/cardsfolder/red_mana_battery.txt -text svneol=native#text/plain
 res/cardsfolder/red_ward.txt -text svneol=native#text/plain
 res/cardsfolder/reduce_to_dreams.txt -text svneol=native#text/plain
 res/cardsfolder/redwood_treefolk.txt -text svneol=native#text/plain
-res/cardsfolder/reef_pirates.txt -text svneol=native#text/plain
+res/cardsfolder/reef_pirates.txt svneol=native#text/plain
 res/cardsfolder/reflecting_pool.txt -text svneol=native#text/plain
 res/cardsfolder/reflex_sliver.txt -text svneol=native#text/plain
 res/cardsfolder/reflexes.txt -text svneol=native#text/plain
@@ -4407,7 +4407,7 @@ res/cardsfolder/river_kaijin.txt -text svneol=native#text/plain
 res/cardsfolder/river_merfolk.txt -text svneol=native#text/plain
 res/cardsfolder/riverfall_mimic.txt -text svneol=native#text/plain
 res/cardsfolder/rix_maadi_dungeon_palace.txt -text svneol=native#text/plain
-res/cardsfolder/roar_of_reclamation.txt -text svneol=native#text/plain
+res/cardsfolder/roar_of_reclamation.txt svneol=native#text/plain
 res/cardsfolder/roar_of_the_wurm.txt -text svneol=native#text/plain
 res/cardsfolder/robber_fly.txt -text svneol=native#text/plain
 res/cardsfolder/robe_of_mirrors.txt -text svneol=native#text/plain
@@ -4634,7 +4634,7 @@ res/cardsfolder/see_beyond.txt -text svneol=native#text/plain
 res/cardsfolder/seed_the_land.txt -text svneol=native#text/plain
 res/cardsfolder/seedborn_muse.txt -text svneol=native#text/plain
 res/cardsfolder/seedcradle_witch.txt -text svneol=native#text/plain
-res/cardsfolder/seedguide_ash.txt -text svneol=native#text/plain
+res/cardsfolder/seedguide_ash.txt svneol=native#text/plain
 res/cardsfolder/seek_the_horizon.txt -text svneol=native#text/plain
 res/cardsfolder/seeker.txt -text svneol=native#text/plain
 res/cardsfolder/seeker_of_skybreak.txt -text svneol=native#text/plain
@@ -4924,8 +4924,8 @@ res/cardsfolder/smash_to_smithereens.txt svneol=native#text/plain
 res/cardsfolder/smite.txt -text svneol=native#text/plain
 res/cardsfolder/smoke.txt -text svneol=native#text/plain
 res/cardsfolder/smokespew_invoker.txt -text svneol=native#text/plain
-res/cardsfolder/smokestack.txt -text svneol=native#text/plain
-res/cardsfolder/smolder_initiate.txt -text svneol=native#text/plain
+res/cardsfolder/smokestack.txt svneol=native#text/plain
+res/cardsfolder/smolder_initiate.txt svneol=native#text/plain
 res/cardsfolder/smoldering_butcher.txt -text svneol=native#text/plain
 res/cardsfolder/smoldering_crater.txt -text svneol=native#text/plain
 res/cardsfolder/smother.txt -text svneol=native#text/plain
@@ -4944,13 +4944,13 @@ res/cardsfolder/snow_covered_plains.txt -text svneol=native#text/plain
 res/cardsfolder/snow_covered_swamp.txt -text svneol=native#text/plain
 res/cardsfolder/snow_devil.txt -text svneol=native#text/plain
 res/cardsfolder/soaring_hope.txt svneol=native#text/plain
-res/cardsfolder/soaring_seacliff.txt -text svneol=native#text/plain
+res/cardsfolder/soaring_seacliff.txt svneol=native#text/plain
 res/cardsfolder/sokenzan_bruiser.txt -text svneol=native#text/plain
 res/cardsfolder/sol_ring.txt -text svneol=native#text/plain
 res/cardsfolder/solar_tide.txt -text svneol=native#text/plain
 res/cardsfolder/soldevi_adnate.txt -text svneol=native#text/plain
 res/cardsfolder/soldevi_digger.txt -text svneol=native#text/plain
-res/cardsfolder/soldevi_sage.txt -text svneol=native#text/plain
+res/cardsfolder/soldevi_sage.txt svneol=native#text/plain
 res/cardsfolder/soldevi_simulacrum.txt -text svneol=native#text/plain
 res/cardsfolder/soldevi_steam_beast.txt -text svneol=native#text/plain
 res/cardsfolder/soldier_replica.txt -text svneol=native#text/plain
@@ -5413,7 +5413,7 @@ res/cardsfolder/tectonic_edge.txt -text svneol=native#text/plain
 res/cardsfolder/tectonic_fiend.txt -text svneol=native#text/plain
 res/cardsfolder/tectonic_instability.txt -text svneol=native#text/plain
 res/cardsfolder/teekas_dragon.txt -text svneol=native#text/plain
-res/cardsfolder/teetering_peaks.txt -text svneol=native#text/plain
+res/cardsfolder/teetering_peaks.txt svneol=native#text/plain
 res/cardsfolder/teferis_puzzle_box.txt -text svneol=native#text/plain
 res/cardsfolder/teferis_response.txt -text svneol=native#text/plain
 res/cardsfolder/tek.txt -text svneol=native#text/plain
@@ -5519,7 +5519,7 @@ res/cardsfolder/thran_quarry.txt -text svneol=native#text/plain
 res/cardsfolder/thran_war_machine.txt -text svneol=native#text/plain
 res/cardsfolder/thrashing_mudspawn.txt -text svneol=native#text/plain
 res/cardsfolder/thrashing_wumpus.txt -text svneol=native#text/plain
-res/cardsfolder/thraximundar.txt -text svneol=native#text/plain
+res/cardsfolder/thraximundar.txt svneol=native#text/plain
 res/cardsfolder/threads_of_disloyalty.txt -text svneol=native#text/plain
 res/cardsfolder/threaten.txt -text svneol=native#text/plain
 res/cardsfolder/three_tragedies.txt -text svneol=native#text/plain
@@ -5569,7 +5569,7 @@ res/cardsfolder/time_of_heroes.txt -text svneol=native#text/plain
 res/cardsfolder/time_of_need.txt -text svneol=native#text/plain
 res/cardsfolder/time_reversal.txt -text svneol=native#text/plain
 res/cardsfolder/time_sieve.txt -text svneol=native#text/plain
-res/cardsfolder/time_spiral.txt -text svneol=native#text/plain
+res/cardsfolder/time_spiral.txt svneol=native#text/plain
 res/cardsfolder/time_stretch.txt -text svneol=native#text/plain
 res/cardsfolder/time_vault.txt -text svneol=native#text/plain
 res/cardsfolder/time_walk.txt -text svneol=native#text/plain
@@ -5710,7 +5710,7 @@ res/cardsfolder/tundra_wolves.txt -text svneol=native#text/plain
 res/cardsfolder/tunnel.txt -text svneol=native#text/plain
 res/cardsfolder/turn_aside.txt -text svneol=native#text/plain
 res/cardsfolder/turn_to_dust.txt -text svneol=native#text/plain
-res/cardsfolder/turntimber_grove.txt -text 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
 res/cardsfolder/twiddle.txt -text svneol=native#text/plain
@@ -5853,7 +5853,7 @@ res/cardsfolder/venerable_kumo.txt -text svneol=native#text/plain
 res/cardsfolder/venerable_monk.txt -text svneol=native#text/plain
 res/cardsfolder/venerated_teacher.txt -text svneol=native#text/plain
 res/cardsfolder/vengeance.txt -text svneol=native#text/plain
-res/cardsfolder/vengeful_dead.txt -text svneol=native#text/plain
+res/cardsfolder/vengeful_dead.txt svneol=native#text/plain
 res/cardsfolder/vengeful_dreams.txt -text svneol=native#text/plain
 res/cardsfolder/vengeful_firebrand.txt -text svneol=native#text/plain
 res/cardsfolder/vengevine.txt -text svneol=native#text/plain
@@ -6080,7 +6080,7 @@ res/cardsfolder/wei_scout.txt -text svneol=native#text/plain
 res/cardsfolder/wei_strike_force.txt -text svneol=native#text/plain
 res/cardsfolder/weirding_shaman.txt -text svneol=native#text/plain
 res/cardsfolder/welding_jar.txt -text svneol=native#text/plain
-res/cardsfolder/welkin_hawk.txt -text svneol=native#text/plain
+res/cardsfolder/welkin_hawk.txt svneol=native#text/plain
 res/cardsfolder/welkin_tern.txt -text svneol=native#text/plain
 res/cardsfolder/well_laid_plans.txt -text svneol=native#text/plain
 res/cardsfolder/wellwisher.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/aven_farseer.txt b/res/cardsfolder/aven_farseer.txt
index dfbb2e004b1..1a1ecabca79 100644
--- a/res/cardsfolder/aven_farseer.txt
+++ b/res/cardsfolder/aven_farseer.txt
@@ -1,11 +1,12 @@
-Name:Aven Farseer
-ManaCost:1 W
-Types:Creature Bird Soldier
-Text:no text
-PT:1/1
-K:Flying
-T:Mode$ TurnFaceUp | ValidCard$ Permanent | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a permanent is turned face up, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_farseer.jpg
+Name:Aven Farseer
+ManaCost:1 W
+Types:Creature Bird Soldier
+Text:no text
+PT:1/1
+K:Flying
+T:Mode$ TurnFaceUp | ValidCard$ Permanent | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a permanent is turned face up, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_farseer.jpg
+SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/3.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/balthor_the_defiled.txt b/res/cardsfolder/balthor_the_defiled.txt
index d34a2c247a0..4b9f596c185 100644
--- a/res/cardsfolder/balthor_the_defiled.txt
+++ b/res/cardsfolder/balthor_the_defiled.txt
@@ -1,11 +1,12 @@
-Name:Balthor the Defiled
-ManaCost:2 B B
-Types:Creature Zombie Dwarf
-Text:no text
-PT:2/2
-K:stPumpAll:Creature.Minion:1/1:No Condition:Minion creatures get +1/+1.
-A:AB$ChangeZoneAll | Cost$ B B B Exile<1/CARDNAME> | ChangeType$ Creature.Black,Creature.Red | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Each player returns all black and all red creature cards from his or her graveyard to the battlefield.
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/balthor_the_defiled.jpg
+Name:Balthor the Defiled
+ManaCost:2 B B
+Types:Creature Zombie Dwarf
+Text:no text
+PT:2/2
+K:stPumpAll:Creature.Minion:1/1:No Condition:Minion creatures get +1/+1.
+A:AB$ChangeZoneAll | Cost$ B B B Exile<1/CARDNAME> | ChangeType$ Creature.Black,Creature.Red | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Each player returns all black and all red creature cards from his or her graveyard to the battlefield.
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/balthor_the_defiled.jpg
+SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/61.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/blaze.txt b/res/cardsfolder/blaze.txt
index 97e756ac986..c6317b6afeb 100644
--- a/res/cardsfolder/blaze.txt
+++ b/res/cardsfolder/blaze.txt
@@ -7,9 +7,9 @@ SVar:X:Count$xPaid
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blaze.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/177.jpg
-SetInfo:PTK|Uncommon|http://magiccards.info/scans/en/p3k/102.jpg|2
+SetInfo:PTK|Uncommon|http://magiccards.info/scans/en/p3k/102.jpg
 SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/175.jpg
-SetInfo:POR|Uncommon|http://magiccards.info/scans/en/po/122.jpg
+SetInfo:POR|Uncommon|http://magiccards.info/scans/en/po/122.jpg|2
 SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/175.jpg
 SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/190.jpg
 SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/91.jpg
diff --git a/res/cardsfolder/blitz_hellion.txt b/res/cardsfolder/blitz_hellion.txt
index 8c909278c6d..66e9a461574 100644
--- a/res/cardsfolder/blitz_hellion.txt
+++ b/res/cardsfolder/blitz_hellion.txt
@@ -1,12 +1,13 @@
-Name:Blitz Hellion
-ManaCost:3 R G
-Types:Creature Hellion
-Text:no text
-PT:7/7
-K:Trample
-K:Haste
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ At the beginning of the end step, CARDNAME's owner shuffles it into his or her library.
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Library | Shuffle$ True | Defined$ Self
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/blitz_hellion.jpg
+Name:Blitz Hellion
+ManaCost:3 R G
+Types:Creature Hellion
+Text:no text
+PT:7/7
+K:Trample
+K:Haste
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ At the beginning of the end step, CARDNAME's owner shuffles it into his or her library.
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Library | Shuffle$ True | Defined$ Self
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/blitz_hellion.jpg
+SetInfo:ARB|Rare|http://magiccards.info/scans/en/arb/49.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/bloodfire_dwarf.txt b/res/cardsfolder/bloodfire_dwarf.txt
index a5b36fdf463..2f891ec1258 100644
--- a/res/cardsfolder/bloodfire_dwarf.txt
+++ b/res/cardsfolder/bloodfire_dwarf.txt
@@ -5,8 +5,6 @@ Text:no text
 PT:1/1
 A:AB$ DamageAll | Cost$ R Sac<1/CARDNAME> | ValidCards$ Creature.withoutFlying | NumDmg$ 1 | ValidDescription$ each creature without flying. | SpellDescription$ CARDNAME deals 1 damage to each creature without flying.
 SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodfire_colossus.jpg
+SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodfire_dwarf.jpg
 SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/55.jpg
-SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/177.jpg
-SetInfo:10E|Rare|http://magiccards.info/scans/en/10e/191.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/casting_of_bones.txt b/res/cardsfolder/casting_of_bones.txt
index ddc13b190fd..2f7a19a23bf 100644
--- a/res/cardsfolder/casting_of_bones.txt
+++ b/res/cardsfolder/casting_of_bones.txt
@@ -1,12 +1,13 @@
-Name:Casting of Bones
-ManaCost:2 B
-Types:Enchantment Aura
-Text:no text
-K:Enchant creature
-K:enPump:0/0
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigDraw | TriggerDescription$ When enchanted creature is put into a graveyard, draw three cards, then discard one of them.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 3 | SubAbility$ SVar=DBDiscard
-SVar:DBDiscard:DB$Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/casting_of_bones.jpg
+Name:Casting of Bones
+ManaCost:2 B
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+K:enPump:0/0
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigDraw | TriggerDescription$ When enchanted creature is put into a graveyard, draw three cards, then discard one of them.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 3 | SubAbility$ SVar=DBDiscard
+SVar:DBDiscard:DB$Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/casting_of_bones.jpg
+SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/2.jpg|2
 End
\ No newline at end of file
diff --git a/res/cardsfolder/crystal_chimes.txt b/res/cardsfolder/crystal_chimes.txt
index 83a7dba6b81..9bea548b818 100644
--- a/res/cardsfolder/crystal_chimes.txt
+++ b/res/cardsfolder/crystal_chimes.txt
@@ -1,9 +1,10 @@
-Name:Crystal Chimes
-ManaCost:3
-Types:Artifact
-Text:no text
-A:AB$ChangeZoneAll | Cost$ 3 T Sac<1/CARDNAME> | ChangeType$ Enchantment.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return all enchantment cards from your graveyard to your hand.
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/crystal_chimes.jpg
+Name:Crystal Chimes
+ManaCost:3
+Types:Artifact
+Text:no text
+A:AB$ChangeZoneAll | Cost$ 3 T Sac<1/CARDNAME> | ChangeType$ Enchantment.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return all enchantment cards from your graveyard to your hand.
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/crystal_chimes.jpg
+SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/292.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/diminishing_returns.txt b/res/cardsfolder/diminishing_returns.txt
index e612091c78b..41a313b1147 100644
--- a/res/cardsfolder/diminishing_returns.txt
+++ b/res/cardsfolder/diminishing_returns.txt
@@ -1,12 +1,14 @@
-Name:Diminishing Returns
-ManaCost:2 U U
-Types:Sorcery
-Text:no text
-A:SP$ChangeZoneAll | Cost$ 2 U U | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | SubAbility$ SVar=DBChangeHand | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library.
-SVar:DBChangeHand:DB$ChangeZoneAll | ChangeType$ Card | Origin$ Hand | Destination$ Library | Shuffle$ True | SubAbility$ SVar=DBExile
-SVar:DBExile:DB$Mill | Defined$ You | NumCards$ 10 | Destination$ Exile | SubAbility$ SVar=DBDraw | SpellDescription$ You exile the top ten cards of your library.
-SVar:DBDraw:DB$Draw | Defined$ Each | NumCards$ 7 | SpellDescription$ Then each player draws up to seven cards.
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/diminishing_returns.jpg
+Name:Diminishing Returns
+ManaCost:2 U U
+Types:Sorcery
+Text:no text
+A:SP$ChangeZoneAll | Cost$ 2 U U | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | SubAbility$ SVar=DBChangeHand | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library.
+SVar:DBChangeHand:DB$ChangeZoneAll | ChangeType$ Card | Origin$ Hand | Destination$ Library | Shuffle$ True | SubAbility$ SVar=DBExile
+SVar:DBExile:DB$Mill | Defined$ You | NumCards$ 10 | Destination$ Exile | SubAbility$ SVar=DBDraw | SpellDescription$ You exile the top ten cards of your library.
+SVar:DBDraw:DB$Draw | Defined$ Each | NumCards$ 7 | SpellDescription$ Then each player draws up to seven cards.
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/diminishing_returns.jpg
+SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/65.jpg
+SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/39.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/empty_the_catacombs.txt b/res/cardsfolder/empty_the_catacombs.txt
index 586139e003f..d8994dad139 100644
--- a/res/cardsfolder/empty_the_catacombs.txt
+++ b/res/cardsfolder/empty_the_catacombs.txt
@@ -1,9 +1,10 @@
-Name:Empty the Catacombs
-ManaCost:3 B
-Types:Sorcery
-Text:no text
-A:SP$ChangeZoneAll | Cost$ 3 B | ChangeType$ Creature | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Each player returns all creature cards from his or her graveyard to his or her hand.
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/empty_the_catacombs.jpg
+Name:Empty the Catacombs
+ManaCost:3 B
+Types:Sorcery
+Text:no text
+A:SP$ChangeZoneAll | Cost$ 3 B | ChangeType$ Creature | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Each player returns all creature cards from his or her graveyard to his or her hand.
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/empty_the_catacombs.jpg
+SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/86.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/energy_arc.txt b/res/cardsfolder/energy_arc.txt
index c211f6aa717..af986fbc040 100644
--- a/res/cardsfolder/energy_arc.txt
+++ b/res/cardsfolder/energy_arc.txt
@@ -1,11 +1,12 @@
-Name:Energy Arc
-ManaCost:W U
-Types:Instant
-Text:no text
-A:SP$Untap | Cost$ W U | TargetMin$ 0 | TargetMax$ MaxTgts | TgtPrompt$ Choose any number of target creatures | ValidTgts$ Creature | SpellDescription$ Untap any number of target creatures. Prevent all combat damage that would be dealt to and dealt by those creatures this turn. | SubAbility$ SVar=DBPump
-SVar:DBPump:DB$Pump | Defined$ Targeted | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. & HIDDEN Prevent all combat damage that would be dealt to CARDNAME.
-SVar:MaxTgts:Count$Valid Creature
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/energy_arc.jpg
+Name:Energy Arc
+ManaCost:W U
+Types:Instant
+Text:no text
+A:SP$Untap | Cost$ W U | TargetMin$ 0 | TargetMax$ MaxTgts | TgtPrompt$ Choose any number of target creatures | ValidTgts$ Creature | SpellDescription$ Untap any number of target creatures. Prevent all combat damage that would be dealt to and dealt by those creatures this turn. | SubAbility$ SVar=DBPump
+SVar:DBPump:DB$Pump | Defined$ Targeted | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. & HIDDEN Prevent all combat damage that would be dealt to CARDNAME.
+SVar:MaxTgts:Count$Valid Creature
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/energy_arc.jpg
+SetInfo:ALL|Uncommon|http://magiccards.info/scans/en/ai/190.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/false_demise.txt b/res/cardsfolder/false_demise.txt
index d36e08f0091..acf39c48216 100644
--- a/res/cardsfolder/false_demise.txt
+++ b/res/cardsfolder/false_demise.txt
@@ -1,11 +1,13 @@
-Name:False Demise
-ManaCost:2 U
-Types:Enchantment Aura
-Text:no text
-K:Enchant creature
-K:enPump:0/0
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature is put into a graveyard, return that card to the battlefield under your control.
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ Triggered
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/false_demise.jpg
+Name:False Demise
+ManaCost:2 U
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+K:enPump:0/0
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature is put into a graveyard, return that card to the battlefield under your control.
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ Triggered
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/false_demise.jpg
+SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/40.jpg|2
+SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/80.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/festering_march.txt b/res/cardsfolder/festering_march.txt
index f6122415973..b12f5e589ae 100644
--- a/res/cardsfolder/festering_march.txt
+++ b/res/cardsfolder/festering_march.txt
@@ -1,11 +1,12 @@
-Name:Festering March
-ManaCost:3 B B
-Types:Sorcery
-Text:no text
-K:Suspend:3:2 B
-A:SP$PumpAll | Cost$ 3 B B | ValidCards$ Creature.YouDontCtrl | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SubAbility$ SVar=DBChange | SpellDescription$ Creatures your opponents control get -1/-1 until end of turn. Exile CARDNAME with three time counters on it.
-SVar:DBChange:DB$ChangeZone | Origin$ Stack | Destination$ Exile | SubAbility$ SVar=DBPutCounter
-SVar:DBPutCounter:DB$PutCounter | CounterType$ TIME | CounterNum$ 3
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/festering_march.jpg
+Name:Festering March
+ManaCost:3 B B
+Types:Sorcery
+Text:no text
+K:Suspend:3:2 B
+A:SP$PumpAll | Cost$ 3 B B | ValidCards$ Creature.YouDontCtrl | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SubAbility$ SVar=DBChange | SpellDescription$ Creatures your opponents control get -1/-1 until end of turn. Exile CARDNAME with three time counters on it.
+SVar:DBChange:DB$ChangeZone | Origin$ Stack | Destination$ Exile | SubAbility$ SVar=DBPutCounter
+SVar:DBPutCounter:DB$PutCounter | CounterType$ TIME | CounterNum$ 3
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/festering_march.jpg
+SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/65.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/fleshwrither.txt b/res/cardsfolder/fleshwrither.txt
index dbf3d8c8f36..e299b370fb5 100644
--- a/res/cardsfolder/fleshwrither.txt
+++ b/res/cardsfolder/fleshwrither.txt
@@ -1,9 +1,10 @@
-Name:Fleshwrither
-ManaCost:2 B B
-Types:Creature Horror
-Text:no text
-PT:3/3
-A:AB$ChangeZone | Cost$ 1 B B Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQ4 | ChangeNum$ 1 | SorcerySpeed$ True | SpellDescription$ Transfigure 1 B B ( 1 B B , Sacrifice this creature: Search your library for a creature card with the same converted mana cost as this creature and put that card onto the battlefield. Then shuffle your library. Transfigure only as a sorcery.)
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/fleshwrither.jpg
+Name:Fleshwrither
+ManaCost:2 B B
+Types:Creature Horror
+Text:no text
+PT:3/3
+A:AB$ChangeZone | Cost$ 1 B B Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQ4 | ChangeNum$ 1 | SorcerySpeed$ True | SpellDescription$ Transfigure 1 B B ( 1 B B , Sacrifice this creature: Search your library for a creature card with the same converted mana cost as this creature and put that card onto the battlefield. Then shuffle your library. Transfigure only as a sorcery.)
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/fleshwrither.jpg
+SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/84.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/garruks_packleader.txt b/res/cardsfolder/garruks_packleader.txt
index 5dad42c1750..628a6bd3099 100644
--- a/res/cardsfolder/garruks_packleader.txt
+++ b/res/cardsfolder/garruks_packleader.txt
@@ -1,10 +1,11 @@
-Name:Garruk's Packleader
-ManaCost:4 G
-Types:Creature Beast
-Text:no text
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE3+Other+YouCtrl | Optional$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another creature with power 3 or greater enters the battlefield under your control, you may draw a card.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/garruks_packleader.jpg
+Name:Garruk's Packleader
+ManaCost:4 G
+Types:Creature Beast
+Text:no text
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE3+Other+YouCtrl | Optional$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another creature with power 3 or greater enters the battlefield under your control, you may draw a card.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/garruks_packleader.jpg
+SetInfo:M11|Uncommon|http://magiccards.info/scans/en/m11/177.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/ghost_quarter.txt b/res/cardsfolder/ghost_quarter.txt
index 73826e34ffc..52a6c707b18 100644
--- a/res/cardsfolder/ghost_quarter.txt
+++ b/res/cardsfolder/ghost_quarter.txt
@@ -1,11 +1,12 @@
-Name:Ghost Quarter
-ManaCost:no cost
-Types:Land
-Text:no text
-A:AB$Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$Destroy | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ SVar=DBChange | SpellDescription$ Destroy target land. Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library.
-SVar:DBChange:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | Optional$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | Defined$ TargetedController
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ghost_quarter.jpg
+Name:Ghost Quarter
+ManaCost:no cost
+Types:Land
+Text:no text
+A:AB$Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
+A:AB$Destroy | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ SVar=DBChange | SpellDescription$ Destroy target land. Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library.
+SVar:DBChange:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | Optional$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | Defined$ TargetedController
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ghost_quarter.jpg
+SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/173.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/goblin_ruinblaster.txt b/res/cardsfolder/goblin_ruinblaster.txt
index 5668b739235..cce1ed52eb3 100644
--- a/res/cardsfolder/goblin_ruinblaster.txt
+++ b/res/cardsfolder/goblin_ruinblaster.txt
@@ -1,13 +1,14 @@
-Name:Goblin Ruinblaster
-ManaCost:2 R
-Types:Creature Goblin Shaman
-Text:no text
-PT:2/1
-K:Haste
-K:Kicker:R
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, destroy target nonbasic land.
-SVar:TrigKicker:AB$Destroy | Cost$ 0 | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land.
-SVar:PlayMain1:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_ruinblaster.jpg
-End
+Name:Goblin Ruinblaster
+ManaCost:2 R
+Types:Creature Goblin Shaman
+Text:no text
+PT:2/1
+K:Haste
+K:Kicker:R
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, destroy target nonbasic land.
+SVar:TrigKicker:AB$Destroy | Cost$ 0 | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land.
+SVar:PlayMain1:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_ruinblaster.jpg
+SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/127.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/godtracker_of_jund.txt b/res/cardsfolder/godtracker_of_jund.txt
index 89dc6cc7c07..d3fd2763fc1 100644
--- a/res/cardsfolder/godtracker_of_jund.txt
+++ b/res/cardsfolder/godtracker_of_jund.txt
@@ -1,10 +1,11 @@
-Name:Godtracker of Jund
-ManaCost:1 R G
-Types:Creature Elf Shaman
-Text:no text
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE5+Other+YouCtrl | Optional$ True | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ Whenever a creature with power 5 or greater enters the battlefield under your control, you may put a +1/+1 counter on Godtracker of Jund.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/godtracker_of_jund.jpg
+Name:Godtracker of Jund
+ManaCost:1 R G
+Types:Creature Elf Shaman
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE5+Other+YouCtrl | Optional$ True | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ Whenever a creature with power 5 or greater enters the battlefield under your control, you may put a +1/+1 counter on Godtracker of Jund.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/godtracker_of_jund.jpg
+SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/55.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/grave_pact.txt b/res/cardsfolder/grave_pact.txt
index a045a2fe654..4b8d296123e 100644
--- a/res/cardsfolder/grave_pact.txt
+++ b/res/cardsfolder/grave_pact.txt
@@ -1,9 +1,13 @@
-Name:Grave Pact
-ManaCost:1 B B B
-Types:Creature Enchantment
-Text:no text
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever a creature you control is put into a graveyard from the battlefield, each other player sacrifices a creature.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Opponent | SacValid$ Creature
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/grave_pact.jpg
+Name:Grave Pact
+ManaCost:1 B B B
+Types:Creature Enchantment
+Text:no text
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever a creature you control is put into a graveyard from the battlefield, each other player sacrifices a creature.
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Opponent | SacValid$ Creature
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/grave_pact.jpg
+SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/137.jpg
+SetInfo:STH|Rare|http://magiccards.info/scans/en/sh/10.jpg
+SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/135.jpg
+SetInfo:10E|Rare|http://magiccards.info/scans/en/10e/144.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/grinning_ignus.txt b/res/cardsfolder/grinning_ignus.txt
index 6e0a8758210..ef25518c3ef 100644
--- a/res/cardsfolder/grinning_ignus.txt
+++ b/res/cardsfolder/grinning_ignus.txt
@@ -1,10 +1,11 @@
-Name:Grinning Ignus
-ManaCost:2 R
-Types:Creature Elemental
-Text:no text
-PT:2/2
-A:AB$Mana | Cost$ R Return<1/CARDNAME> | Produced$ 2 R | Amount$ 1 | SorcerySpeed$ True | SpellDescription$ Add 2 R to your mana pool. Activate this ability only any time you could cast a sorcery.
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/grinning_ignus.jpg
+Name:Grinning Ignus
+ManaCost:2 R
+Types:Creature Elemental
+Text:no text
+PT:2/2
+A:AB$Mana | Cost$ R Return<1/CARDNAME> | Produced$ 2 R | Amount$ 1 | SorcerySpeed$ True | SpellDescription$ Add 2 R to your mana pool. Activate this ability only any time you could cast a sorcery.
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/grinning_ignus.jpg
+SetInfo:FUT|Common|http://magiccards.info/scans/en/fut/116.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/hamletback_goliath.txt b/res/cardsfolder/hamletback_goliath.txt
index 71506f0cedc..ee099afefa6 100644
--- a/res/cardsfolder/hamletback_goliath.txt
+++ b/res/cardsfolder/hamletback_goliath.txt
@@ -1,11 +1,12 @@
-Name:Hamletback Goliath
-ManaCost:6 R
-Types:Creature Giant Warrior
-Text:no text
-PT:6/6
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature enters the battlefield, you may put X +1/+1 counters on CARDNAME, where X is that creature's power.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
-SVar:X:Triggered$CardPower
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hamletback_goliath.jpg
+Name:Hamletback Goliath
+ManaCost:6 R
+Types:Creature Giant Warrior
+Text:no text
+PT:6/6
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature enters the battlefield, you may put X +1/+1 counters on CARDNAME, where X is that creature's power.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
+SVar:X:Triggered$CardPower
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hamletback_goliath.jpg
+SetInfo:LRW|Rare|http://magiccards.info/scans/en/lw/173.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/heartstabber_mosquito.txt b/res/cardsfolder/heartstabber_mosquito.txt
index aaa23f78db7..34c45ce3de1 100644
--- a/res/cardsfolder/heartstabber_mosquito.txt
+++ b/res/cardsfolder/heartstabber_mosquito.txt
@@ -1,12 +1,13 @@
-Name:Heartstabber Mosquito
-ManaCost:3 B
-Types:Creature Insect
-Text:no text
-PT:2/2
-K:Flying
-K:Kicker:2 B
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, destroy target creature.
-SVar:TrigKicker:AB$Destroy | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature.
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/Heartstabber_Mosquito.jpg
-End
+Name:Heartstabber Mosquito
+ManaCost:3 B
+Types:Creature Insect
+Text:no text
+PT:2/2
+K:Flying
+K:Kicker:2 B
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, destroy target creature.
+SVar:TrigKicker:AB$Destroy | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/Heartstabber_Mosquito.jpg
+SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/97.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/infectious_host.txt b/res/cardsfolder/infectious_host.txt
index 381e56b145e..dde4e9e6145 100644
--- a/res/cardsfolder/infectious_host.txt
+++ b/res/cardsfolder/infectious_host.txt
@@ -1,10 +1,11 @@
-Name:Infectious Host
-ManaCost:2 B
-Types:Creature Zombie
-Text:no text
-PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target player loses 2 life.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Tgt$ TgtP | LifeAmount$ 2
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/infectious_host.jpg
+Name:Infectious Host
+ManaCost:2 B
+Types:Creature Zombie
+Text:no text
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target player loses 2 life.
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Tgt$ TgtP | LifeAmount$ 2
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/infectious_host.jpg
+SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/91.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/infernal_caretaker.txt b/res/cardsfolder/infernal_caretaker.txt
index 551f04b2bc0..102c3532601 100644
--- a/res/cardsfolder/infernal_caretaker.txt
+++ b/res/cardsfolder/infernal_caretaker.txt
@@ -1,12 +1,13 @@
-Name:Infernal Caretaker
-ManaCost:3 B
-Types:Creature Human Cleric
-Text:no text
-PT:2/2
-K:Morph:3 B
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME is turned face up, return all Zombie cards from all graveyards to their owners' hands.
-SVar:TrigChange:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Zombie | Origin$ Graveyard | Destination$ Hand 
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/infernal_caretaker.jpg
+Name:Infernal Caretaker
+ManaCost:3 B
+Types:Creature Human Cleric
+Text:no text
+PT:2/2
+K:Morph:3 B
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME is turned face up, return all Zombie cards from all graveyards to their owners' hands.
+SVar:TrigChange:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Zombie | Origin$ Graveyard | Destination$ Hand
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/infernal_caretaker.jpg
+SetInfo:LGN|Common|http://magiccards.info/scans/en/le/76.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/kederekt_leviathan.txt b/res/cardsfolder/kederekt_leviathan.txt
index 1ad59d0b669..7efed647691 100644
--- a/res/cardsfolder/kederekt_leviathan.txt
+++ b/res/cardsfolder/kederekt_leviathan.txt
@@ -1,12 +1,13 @@
-Name:Kederekt Leviathan
-ManaCost:6 U U
-Types:Creature Leviathan
-Text:no text
-PT:5/5
-K:Unearth:6 U
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return all other nonland permanents to their owners' hands.
-SVar:TrigChange:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Permanent.nonLand+Other | Origin$ Battlefield | Destination$ Hand 
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kederekt_leviathan.jpg
+Name:Kederekt Leviathan
+ManaCost:6 U U
+Types:Creature Leviathan
+Text:no text
+PT:5/5
+K:Unearth:6 U
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return all other nonland permanents to their owners' hands.
+SVar:TrigChange:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Permanent.nonLand+Other | Origin$ Battlefield | Destination$ Hand
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kederekt_leviathan.jpg
+SetInfo:ALA|Rare|http://magiccards.info/scans/en/ala/48.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/kinsbaile_skirmisher.txt b/res/cardsfolder/kinsbaile_skirmisher.txt
index 0779c96d255..f8ce8606411 100644
--- a/res/cardsfolder/kinsbaile_skirmisher.txt
+++ b/res/cardsfolder/kinsbaile_skirmisher.txt
@@ -1,10 +1,11 @@
-Name:Kinsbaile Skirmisher
-ManaCost:1 W
-Types:Creature Kithkin Soldier
-Text:no text
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +1/+1 until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kinsbaile_skirmisher.jpg
+Name:Kinsbaile Skirmisher
+ManaCost:1 W
+Types:Creature Kithkin Soldier
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +1/+1 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kinsbaile_skirmisher.jpg
+SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/24.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/kor_aeronaut.txt b/res/cardsfolder/kor_aeronaut.txt
index 3c73bc45162..c9e0ba6b3d6 100644
--- a/res/cardsfolder/kor_aeronaut.txt
+++ b/res/cardsfolder/kor_aeronaut.txt
@@ -1,13 +1,14 @@
-Name:Kor Aeronaut
-ManaCost:W W
-Types:Creature Kor Soldier
-Text:no text
-PT:2/2
-K:Flying
-K:Kicker:1 W
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, target creature gains flying until end of turn.
-SVar:TrigKicker:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying
-SVar:PlayMain1:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/Kor_Aeronaut.jpg
-End
+Name:Kor Aeronaut
+ManaCost:W W
+Types:Creature Kor Soldier
+Text:no text
+PT:2/2
+K:Flying
+K:Kicker:1 W
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, target creature gains flying until end of turn.
+SVar:TrigKicker:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying
+SVar:PlayMain1:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/Kor_Aeronaut.jpg
+SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/17.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/kor_sanctifiers.txt b/res/cardsfolder/kor_sanctifiers.txt
index 94f23040469..2571ed8a568 100644
--- a/res/cardsfolder/kor_sanctifiers.txt
+++ b/res/cardsfolder/kor_sanctifiers.txt
@@ -1,11 +1,12 @@
-Name:Kor Sanctifiers
-ManaCost:2 W
-Types:Creature Kor Cleric
-Text:no text
-PT:2/3
-K:Kicker:W
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, destroy target artifact or enchantment.
-SVar:TrigKicker:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment.
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/Kor_sanctifiers.jpg
-End
+Name:Kor Sanctifiers
+ManaCost:2 W
+Types:Creature Kor Cleric
+Text:no text
+PT:2/3
+K:Kicker:W
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, destroy target artifact or enchantment.
+SVar:TrigKicker:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/Kor_sanctifiers.jpg
+SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/22.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/kurgadon.txt b/res/cardsfolder/kurgadon.txt
index 80c27ae203e..ea5771713e5 100644
--- a/res/cardsfolder/kurgadon.txt
+++ b/res/cardsfolder/kurgadon.txt
@@ -1,10 +1,11 @@
-Name:Kurgadon
-ManaCost:4 G
-Types:Creature Beast
-Text:no text
-PT:3/3
-T:Mode$ SpellCast | ValidCard$ Creature.cmcGE6+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a creature spell with converted mana cost 6 or more, put three +1/+1 counters on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 3
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kurgadon.jpg
+Name:Kurgadon
+ManaCost:4 G
+Types:Creature Beast
+Text:no text
+PT:3/3
+T:Mode$ SpellCast | ValidCard$ Creature.cmcGE6+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a creature spell with converted mana cost 6 or more, put three +1/+1 counters on CARDNAME.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 3
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kurgadon.jpg
+SetInfo:SCG|Uncommon|http://magiccards.info/scans/en/sc/124.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/lethargy_trap.txt b/res/cardsfolder/lethargy_trap.txt
index ea780721413..9bce5d0afdd 100644
--- a/res/cardsfolder/lethargy_trap.txt
+++ b/res/cardsfolder/lethargy_trap.txt
@@ -1,10 +1,11 @@
-Name:Lethargy Trap
-ManaCost:3 U
-Types:Instant Trap
-Text:no text
-A:SP$PumpAll | Cost$ 3 U | ValidCards$ Creature.attacking | NumAtt$ -3 | IsPresent$ Creature.attacking | PresentCompare$ LE2 | SpellDescription$ If three or more creatures are attacking, you may pay U rather than pay CARDNAME mana cost.
-A:SP$PumpAll | Cost$ U | ValidCards$ Creature.attacking | NumAtt$ -3 | IsPresent$ Creature.attacking | PresentCompare$ GE3 | SpellDescription$ Attacking creatures get -3/-0 until end of turn.
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/lethargy_trap.jpg
-End
+Name:Lethargy Trap
+ManaCost:3 U
+Types:Instant Trap
+Text:no text
+A:SP$PumpAll | Cost$ 3 U | ValidCards$ Creature.attacking | NumAtt$ -3 | IsPresent$ Creature.attacking | PresentCompare$ LE2 | SpellDescription$ If three or more creatures are attacking, you may pay U rather than pay CARDNAME mana cost.
+A:SP$PumpAll | Cost$ U | ValidCards$ Creature.attacking | NumAtt$ -3 | IsPresent$ Creature.attacking | PresentCompare$ GE3 | SpellDescription$ Attacking creatures get -3/-0 until end of turn.
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/lethargy_trap.jpg
+SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/51.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/leyline_of_lightning.txt b/res/cardsfolder/leyline_of_lightning.txt
index ac459d4d1d6..979d0fec866 100644
--- a/res/cardsfolder/leyline_of_lightning.txt
+++ b/res/cardsfolder/leyline_of_lightning.txt
@@ -1,9 +1,10 @@
-Name:Leyline of Lightning
-ManaCost:2 R R
-Types:Enchantment
-Text:If Leyline of Lightning is in your opening hand, you may begin the game with it on the battlefield.
-T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you cast a spell, you may pay 1. If you do, CARDNAME deals 1 damage to target player.
-SVar:TrigDealDamage:AB$DealDamage | Cost$ 1 | Tgt$ TgtP | NumDmg$ 1
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/leyline_of_lightning.jpg
-End
+Name:Leyline of Lightning
+ManaCost:2 R R
+Types:Enchantment
+Text:If Leyline of Lightning is in your opening hand, you may begin the game with it on the battlefield.
+T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you cast a spell, you may pay 1. If you do, CARDNAME deals 1 damage to target player.
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 1 | Tgt$ TgtP | NumDmg$ 1
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/leyline_of_lightning.jpg
+SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/68.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/lightning_cloud.txt b/res/cardsfolder/lightning_cloud.txt
index c839904674b..13d0bb77826 100644
--- a/res/cardsfolder/lightning_cloud.txt
+++ b/res/cardsfolder/lightning_cloud.txt
@@ -1,9 +1,10 @@
-Name:Lightning Cloud
-ManaCost:3 R
-Types:Enchantment
-Text:no text
-T:Mode$ SpellCast | ValidCard$ Card.Red | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever a player casts a red spell, you may pay R. If you do, CARDNAME deals 1 damage to target creature or player.
-SVar:TrigDealDamage:AB$DealDamage | Cost$ R | Tgt$ TgtCP | NumDmg$ 1
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_cloud.jpg
+Name:Lightning Cloud
+ManaCost:3 R
+Types:Enchantment
+Text:no text
+T:Mode$ SpellCast | ValidCard$ Card.Red | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever a player casts a red spell, you may pay R. If you do, CARDNAME deals 1 damage to target creature or player.
+SVar:TrigDealDamage:AB$DealDamage | Cost$ R | Tgt$ TgtCP | NumDmg$ 1
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_cloud.jpg
+SetInfo:VIS|Rare|http://magiccards.info/scans/en/vi/87.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/mold_shambler.txt b/res/cardsfolder/mold_shambler.txt
index a30ec4ccb9f..0ce71f67778 100644
--- a/res/cardsfolder/mold_shambler.txt
+++ b/res/cardsfolder/mold_shambler.txt
@@ -1,11 +1,12 @@
-Name:Mold Shambler
-ManaCost:3 G
-Types:Creature Fungus Beast
-Text:no text
-PT:3/3
-K:Kicker:1 G
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, destroy target noncreature permanent.
-SVar:TrigKicker:AB$Destroy | Cost$ 0 | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent.
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mold_shambler.jpg
-End
+Name:Mold Shambler
+ManaCost:3 G
+Types:Creature Fungus Beast
+Text:no text
+PT:3/3
+K:Kicker:1 G
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, destroy target noncreature permanent.
+SVar:TrigKicker:AB$Destroy | Cost$ 0 | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mold_shambler.jpg
+SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/169.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/mortician_beetle.txt b/res/cardsfolder/mortician_beetle.txt
index c66a172d160..fe0705d5090 100644
--- a/res/cardsfolder/mortician_beetle.txt
+++ b/res/cardsfolder/mortician_beetle.txt
@@ -1,10 +1,11 @@
-Name:Mortician Beetle
-ManaCost:B
-Types:Creature Insect
-Text:no text
-PT:1/1
-T:Mode$ Sacrificed | ValidCard$ Creature | Execute$ TrigPutCounter | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever a player sacrifices a creature, you may put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mortician_beetle.jpg
+Name:Mortician Beetle
+ManaCost:B
+Types:Creature Insect
+Text:no text
+PT:1/1
+T:Mode$ Sacrificed | ValidCard$ Creature | Execute$ TrigPutCounter | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever a player sacrifices a creature, you may put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mortician_beetle.jpg
+SetInfo:ROE|Rare|http://magiccards.info/scans/en/roe/117.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/murasa_pyromancer.txt b/res/cardsfolder/murasa_pyromancer.txt
index a06be60df49..e7933525341 100644
--- a/res/cardsfolder/murasa_pyromancer.txt
+++ b/res/cardsfolder/murasa_pyromancer.txt
@@ -1,12 +1,13 @@
-Name:Murasa Pyromancer
-ManaCost:4 R R
-Types:Creature Human Shaman Ally
-Text:no text
-PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Optional$ True | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control,
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | Optional$ True | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ you may have CARDNAME deal damage to target creature equal to the number of Allies you control.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtC | NumDmg$ NumAllies | TgtPrompt$ Select a target creature.
-SVar:NumAllies:Count$Valid Ally.YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/murasa_pyromancer.jpg
-SVar:Rarity:Uncommon
+Name:Murasa Pyromancer
+ManaCost:4 R R
+Types:Creature Human Shaman Ally
+Text:no text
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Optional$ True | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control,
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | Optional$ True | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ you may have CARDNAME deal damage to target creature equal to the number of Allies you control.
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtC | NumDmg$ NumAllies | TgtPrompt$ Select a target creature.
+SVar:NumAllies:Count$Valid Ally.YouCtrl
+SVar:Picture:http://www.wizards.com/global/images/magic/general/murasa_pyromancer.jpg
+SVar:Rarity:Uncommon
+SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/139.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/narrow_escape.txt b/res/cardsfolder/narrow_escape.txt
index 1b93af0d593..d03fb178118 100644
--- a/res/cardsfolder/narrow_escape.txt
+++ b/res/cardsfolder/narrow_escape.txt
@@ -1,10 +1,11 @@
-Name:Narrow Escape
-ManaCost:2 W
-Types:Instant
-Text:no text
-A:SP$ChangeZone | Cost$ 2 W | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.YouCtrl | SubAbility$ SVar=DBGainLife | Defined$ TargetedController | TgtPrompt$ Select target permanent you control. | SpellDescription$ Return target permanent you control to its owner's hand.  You gain 4 life.
-SVar:DBGainLife:DB$GainLife | LifeAmount$ 4
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/Narrow_Escape.jpg
-End
+Name:Narrow Escape
+ManaCost:2 W
+Types:Instant
+Text:no text
+A:SP$ChangeZone | Cost$ 2 W | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.YouCtrl | SubAbility$ SVar=DBGainLife | Defined$ TargetedController | TgtPrompt$ Select target permanent you control. | SpellDescription$ Return target permanent you control to its owner's hand.  You gain 4 life.
+SVar:DBGainLife:DB$GainLife | LifeAmount$ 4
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/Narrow_Escape.jpg
+SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/27.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/new_benalia.txt b/res/cardsfolder/new_benalia.txt
index 879096056d9..7808c01389d 100644
--- a/res/cardsfolder/new_benalia.txt
+++ b/res/cardsfolder/new_benalia.txt
@@ -1,12 +1,13 @@
-Name:New Benalia
-ManaCost:no cost
-Types:Land
-Text:no text
-K:CARDNAME enters the battlefield tapped.
-A:AB$Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
-SVar:TrigScry:AB$Scry | Cost$ 0 | ScryNum$ 1
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/new_benalia.jpg
+Name:New Benalia
+ManaCost:no cost
+Types:Land
+Text:no text
+K:CARDNAME enters the battlefield tapped.
+A:AB$Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
+SVar:TrigScry:AB$Scry | Cost$ 0 | ScryNum$ 1
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/new_benalia.jpg
+SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/172.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/nurturer_initiate.txt b/res/cardsfolder/nurturer_initiate.txt
index 9dcdc1daf1c..a75b4db1da1 100644
--- a/res/cardsfolder/nurturer_initiate.txt
+++ b/res/cardsfolder/nurturer_initiate.txt
@@ -1,10 +1,11 @@
-Name:Nurturer Initiate
-ManaCost:G
-Types:Creature Elf Shaman
-Text:no text
-PT:1/1
-T:Mode$ SpellCast | ValidCard$ Card.Green | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a player casts a green spell, you may pay 1. If you do, target creature gets +1/+1 until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/nurturer_initiate.jpg
+Name:Nurturer Initiate
+ManaCost:G
+Types:Creature Elf Shaman
+Text:no text
+PT:1/1
+T:Mode$ SpellCast | ValidCard$ Card.Green | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a player casts a green spell, you may pay 1. If you do, target creature gets +1/+1 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nurturer_initiate.jpg
+SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/124.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/omen_of_fire.txt b/res/cardsfolder/omen_of_fire.txt
index 56c0a67475c..f3b455148c4 100644
--- a/res/cardsfolder/omen_of_fire.txt
+++ b/res/cardsfolder/omen_of_fire.txt
@@ -1,13 +1,14 @@
-Name:Omen of Fire
-ManaCost:3 R R
-Types:Instant
-Text:no text
-A:SP$ChangeZoneAll | Cost$ 3 R R | ChangeType$ Island | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all Islands to their owners' hands. | SubAbility$ SVar=DBSacYou
-SVar:DBSacYou:DB$Sacrifice | Amount$ YouX | SacValid$ Plains,Permanent.White | Defined$ You | SubAbility$ SVar=DBSacOpp | SpellDescription$ Each player sacrifices a Plains or a white permanent for each white permanent he or she controls.
-SVar:DBSacOpp:DB$Sacrifice | Amount$ OppX | SacValid$ Plains,Permanent.White | Defined$ Opponent
-SVar:YouX:Count$Valid Permanent.White+YouCtrl
-SVar:OppX:Count$Valid Permanent.White+YouDontCtrl
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/omen_of_fire.jpg
+Name:Omen of Fire
+ManaCost:3 R R
+Types:Instant
+Text:no text
+A:SP$ChangeZoneAll | Cost$ 3 R R | ChangeType$ Island | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all Islands to their owners' hands. | SubAbility$ SVar=DBSacYou
+SVar:DBSacYou:DB$Sacrifice | Amount$ YouX | SacValid$ Plains,Permanent.White | Defined$ You | SubAbility$ SVar=DBSacOpp | SpellDescription$ Each player sacrifices a Plains or a white permanent for each white permanent he or she controls.
+SVar:DBSacOpp:DB$Sacrifice | Amount$ OppX | SacValid$ Plains,Permanent.White | Defined$ Opponent
+SVar:YouX:Count$Valid Permanent.White+YouCtrl
+SVar:OppX:Count$Valid Permanent.White+YouDontCtrl
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/omen_of_fire.jpg
+SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/112.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/paradigm_shift.txt b/res/cardsfolder/paradigm_shift.txt
index f9c49f6aa06..f130fcd15c0 100644
--- a/res/cardsfolder/paradigm_shift.txt
+++ b/res/cardsfolder/paradigm_shift.txt
@@ -1,10 +1,11 @@
-Name:Paradigm Shift
-ManaCost:1 U
-Types:Sorcery
-Text:no text
-A:SP$ChangeZoneAll | Cost$ 1 U | ChangeType$ Card.YouOwn | Origin$ Library | Destination$ Exile | SubAbility$ SVar=DBShuffle | SpellDescription$ Exile all cards from your library. Then shuffle your graveyard into your library.
-SVar:DBShuffle:DB$ChangeZoneAll | ChangeType$ Card.YouOwn | Origin$ Graveyard | Destination$ Library | Shuffle$ True 
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/paradigm_shift.jpg
+Name:Paradigm Shift
+ManaCost:1 U
+Types:Sorcery
+Text:no text
+A:SP$ChangeZoneAll | Cost$ 1 U | ChangeType$ Card.YouOwn | Origin$ Library | Destination$ Exile | SubAbility$ SVar=DBShuffle | SpellDescription$ Exile all cards from your library. Then shuffle your graveyard into your library.
+SVar:DBShuffle:DB$ChangeZoneAll | ChangeType$ Card.YouOwn | Origin$ Graveyard | Destination$ Library | Shuffle$ True
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/paradigm_shift.jpg
+SetInfo:WTH|Rare|http://magiccards.info/scans/en/wl/46.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/planar_birth.txt b/res/cardsfolder/planar_birth.txt
index 4d8c4c5692c..cd3a2aa2904 100644
--- a/res/cardsfolder/planar_birth.txt
+++ b/res/cardsfolder/planar_birth.txt
@@ -1,9 +1,10 @@
-Name:Planar Birth
-ManaCost:1 W
-Types:Sorcery
-Text:no text
-A:SP$ChangeZoneAll | Cost$ 1 W | ChangeType$ Land.Basic | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | SpellDescription$ Return all basic land cards from all graveyards to the battlefield tapped under their owners' control.
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/planar_birth.jpg
+Name:Planar Birth
+ManaCost:1 W
+Types:Sorcery
+Text:no text
+A:SP$ChangeZoneAll | Cost$ 1 W | ChangeType$ Land.Basic | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | SpellDescription$ Return all basic land cards from all graveyards to the battlefield tapped under their owners' control.
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/planar_birth.jpg
+SetInfo:USG|Rare|http://magiccards.info/scans/en/us/31.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/predatory_nightstalker.txt b/res/cardsfolder/predatory_nightstalker.txt
index 4e0b0f8bf16..83c46dd22be 100644
--- a/res/cardsfolder/predatory_nightstalker.txt
+++ b/res/cardsfolder/predatory_nightstalker.txt
@@ -1,10 +1,11 @@
-Name:Predatory Nightstalker
-ManaCost:3 B B
-Types:Creature Nightstalker
-Text:no text
-PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | Optional$ True | TriggerDescription$ When CARDNAME enters the battlefield, you may have target opponent sacrifice a creature.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | ValidTgts$ Opponent | SacValid$ Creature
-SVar:Rarity:Uncommon
-SVar:Picture:http://serv2.tcgimages.eu/img/cards/Portal_Second_Age/predatory_nightstalker.jpg
+Name:Predatory Nightstalker
+ManaCost:3 B B
+Types:Creature Nightstalker
+Text:no text
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | Optional$ True | TriggerDescription$ When CARDNAME enters the battlefield, you may have target opponent sacrifice a creature.
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | ValidTgts$ Opponent | SacValid$ Creature
+SVar:Rarity:Uncommon
+SVar:Picture:http://serv2.tcgimages.eu/img/cards/Portal_Second_Age/predatory_nightstalker.jpg
+SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/22.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/punishing_fire.txt b/res/cardsfolder/punishing_fire.txt
index c59b9154f9c..33b8c6682b0 100644
--- a/res/cardsfolder/punishing_fire.txt
+++ b/res/cardsfolder/punishing_fire.txt
@@ -1,10 +1,11 @@
-Name:Punishing Fire
-ManaCost:1 R
-Types:Instant
-Text:no text
-A:SP$DealDamage | Cost$ 1 R | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
-T:Mode$ LifeGained | ValidPlayer$ Opponent | TriggerZones$ Graveyard | Optional$ True | Execute$ TrigChange | TriggerDescription$ Whenever an opponent gains life, you may pay R. If you do, return CARDNAME from your graveyard to your hand.
-SVar:TrigChange:AB$ChangeZone | Cost$ R | Origin$ Graveyard | Destination$ Hand
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/punishing_fire.jpg
-End
+Name:Punishing Fire
+ManaCost:1 R
+Types:Instant
+Text:no text
+A:SP$DealDamage | Cost$ 1 R | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+T:Mode$ LifeGained | ValidPlayer$ Opponent | TriggerZones$ Graveyard | Optional$ True | Execute$ TrigChange | TriggerDescription$ Whenever an opponent gains life, you may pay R. If you do, return CARDNAME from your graveyard to your hand.
+SVar:TrigChange:AB$ChangeZone | Cost$ R | Origin$ Graveyard | Destination$ Hand
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/punishing_fire.jpg
+SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/142.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/purraj_of_urborg.txt b/res/cardsfolder/purraj_of_urborg.txt
index a0445c8b94c..03916cb7c9b 100644
--- a/res/cardsfolder/purraj_of_urborg.txt
+++ b/res/cardsfolder/purraj_of_urborg.txt
@@ -1,11 +1,12 @@
-Name:Purraj of Urborg
-ManaCost:3 B B
-Types:Legendary Creature Cat Warrior
-Text:no text
-PT:2/3
-K:stPumpSelf:Creature.attacking:0/0/First Strike:No Condition:Purraj of Urborg has first strike as long as it's attacking.
-T:Mode$SpellCast | ValidCard$ Card.Black | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a player casts a black spell, you may pay B. If you do, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ B | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/purraj_of_urborg.jpg
+Name:Purraj of Urborg
+ManaCost:3 B B
+Types:Legendary Creature Cat Warrior
+Text:no text
+PT:2/3
+K:stPumpSelf:Creature.attacking:0/0/First Strike:No Condition:Purraj of Urborg has first strike as long as it's attacking.
+T:Mode$SpellCast | ValidCard$ Card.Black | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a player casts a black spell, you may pay B. If you do, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ B | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/purraj_of_urborg.jpg
+SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/33.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/quill_slinger_boggart.txt b/res/cardsfolder/quill_slinger_boggart.txt
index 219ebbd6792..51d8d7cc873 100644
--- a/res/cardsfolder/quill_slinger_boggart.txt
+++ b/res/cardsfolder/quill_slinger_boggart.txt
@@ -1,10 +1,11 @@
-Name:Quill-Slinger Boggart
-ManaCost:3 B
-Types:Creature Goblin Warrior
-Text:no text
-PT:3/2
-T:Mode$SpellCast | ValidCard$ Card.Kithkin | TriggerZones$ Battlefield | Execute$ TrigLoseLife | Optional$ True | TriggerDescription$ Whenever a player casts a Kithkin spell, you may have target player lose 1 life.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Tgt$ TgtP | LifeAmount$ 1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/quill_slinger_boggart.jpg
+Name:Quill-Slinger Boggart
+ManaCost:3 B
+Types:Creature Goblin Warrior
+Text:no text
+PT:3/2
+T:Mode$SpellCast | ValidCard$ Card.Kithkin | TriggerZones$ Battlefield | Execute$ TrigLoseLife | Optional$ True | TriggerDescription$ Whenever a player casts a Kithkin spell, you may have target player lose 1 life.
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Tgt$ TgtP | LifeAmount$ 1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/quill_slinger_boggart.jpg
+SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/137.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/reality_strobe.txt b/res/cardsfolder/reality_strobe.txt
index 322db5aa36f..b0220a6dcfb 100644
--- a/res/cardsfolder/reality_strobe.txt
+++ b/res/cardsfolder/reality_strobe.txt
@@ -1,11 +1,12 @@
-Name:Reality Strobe
-ManaCost:4 U U
-Types:Sorcery
-Text:no text
-K:Suspend:3:2 U
-A:SP$ChangeZone | Cost$ 4 U U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | SubAbility$ SVar=DBChange | SpellDescription$ Return target permanent to its owner's hand. Exile CARDNAME with three time counters on it.
-SVar:DBChange:DB$ChangeZone | Origin$ Stack | Destination$ Exile | SubAbility$ SVar=DBPutCounter
-SVar:DBPutCounter:DB$PutCounter | CounterType$ TIME | CounterNum$ 3
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/reality_strobe.jpg
+Name:Reality Strobe
+ManaCost:4 U U
+Types:Sorcery
+Text:no text
+K:Suspend:3:2 U
+A:SP$ChangeZone | Cost$ 4 U U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | SubAbility$ SVar=DBChange | SpellDescription$ Return target permanent to its owner's hand. Exile CARDNAME with three time counters on it.
+SVar:DBChange:DB$ChangeZone | Origin$ Stack | Destination$ Exile | SubAbility$ SVar=DBPutCounter
+SVar:DBPutCounter:DB$PutCounter | CounterType$ TIME | CounterNum$ 3
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/reality_strobe.jpg
+SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/43.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/reef_pirates.txt b/res/cardsfolder/reef_pirates.txt
index c4b4f5035f1..72f23cde0ef 100644
--- a/res/cardsfolder/reef_pirates.txt
+++ b/res/cardsfolder/reef_pirates.txt
@@ -1,10 +1,12 @@
-Name:Reef Pirates
-ManaCost:1 U U
-Types:Creature Zombie Pirate
-Text:no text
-PT:2/2
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent  | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, that player puts the top card of his or her library into his or her graveyard.
-SVar:TrigMill:AB$Mill | Cost$ 0 | NumCards$ 1 | Defined$ Opponent
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/reef_pirates.jpg
+Name:Reef Pirates
+ManaCost:1 U U
+Types:Creature Zombie Pirate
+Text:no text
+PT:2/2
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent  | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, that player puts the top card of his or her library into his or her graveyard.
+SVar:TrigMill:AB$Mill | Cost$ 0 | NumCards$ 1 | Defined$ Opponent
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/reef_pirates.jpg
+SetInfo:HML|Common|http://magiccards.info/scans/en/hl/45.jpg|2
+SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/116.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/roar_of_reclamation.txt b/res/cardsfolder/roar_of_reclamation.txt
index f57243d3855..52d2c199bb4 100644
--- a/res/cardsfolder/roar_of_reclamation.txt
+++ b/res/cardsfolder/roar_of_reclamation.txt
@@ -1,9 +1,10 @@
-Name:Roar of Reclamation
-ManaCost:5 W W
-Types:Sorcery
-Text:no text
-A:SP$ChangeZoneAll | Cost$ 5 W W | ChangeType$ Artifact | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Each player returns all artifact cards from his or her graveyard to the battlefield.
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/roar_of_reclamation.jpg
+Name:Roar of Reclamation
+ManaCost:5 W W
+Types:Sorcery
+Text:no text
+A:SP$ChangeZoneAll | Cost$ 5 W W | ChangeType$ Artifact | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Each player returns all artifact cards from his or her graveyard to the battlefield.
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/roar_of_reclamation.jpg
+SetInfo:5DN|Rare|http://magiccards.info/scans/en/5dn/14.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/seedguide_ash.txt b/res/cardsfolder/seedguide_ash.txt
index f05373b0a60..a7d18206a85 100644
--- a/res/cardsfolder/seedguide_ash.txt
+++ b/res/cardsfolder/seedguide_ash.txt
@@ -1,10 +1,11 @@
-Name:Seedguide Ash
-ManaCost:4 G
-Types:Creature Treefolk Druid
-Text:no text
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may search your library for up to three Forest cards and put them onto the battlefield tapped. If you do, shuffle your library.
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest | Tapped$ True | ChangeNum$ 3
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/seedguide_ash.jpg
+Name:Seedguide Ash
+ManaCost:4 G
+Types:Creature Treefolk Druid
+Text:no text
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may search your library for up to three Forest cards and put them onto the battlefield tapped. If you do, shuffle your library.
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest | Tapped$ True | ChangeNum$ 3
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/seedguide_ash.jpg
+SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/235.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/smokestack.txt b/res/cardsfolder/smokestack.txt
index f38a4a07d0c..7f137728a5a 100644
--- a/res/cardsfolder/smokestack.txt
+++ b/res/cardsfolder/smokestack.txt
@@ -1,14 +1,15 @@
-Name:Smokestack
-ManaCost:3
-Types:Artifact
-Text:no text
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You |TriggerZones$ Battlefield | Execute$ TrigSacrifice | TriggerDescription$ At the beginning of your upkeep .
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent |TriggerZones$ Battlefield | Execute$ TriggerSacrifice | TriggerDescription$ that player sacrifices a Permanent for each soot counter on Smokestack
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, you may put a soot counter on CARDNAME.
-SVar:TrigSacrifice:AB$Sacrifice | Cost$ 0 | Amount$ X | SacValid$ Permanent | SacMessage$ Permanent
-SVar:TriggerSacrifice:AB$Sacrifice | Cost$ 0 | Defined$ Opponent | Amount$ X | SacValid$ Permanent | SacMessage$ Permanent
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ SOOT | CounterNum$ 1
-SVar:X:Count$CardCounters.SOOT
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/smokestack.jpg
-End
+Name:Smokestack
+ManaCost:3
+Types:Artifact
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You |TriggerZones$ Battlefield | Execute$ TrigSacrifice | TriggerDescription$ At the beginning of your upkeep .
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent |TriggerZones$ Battlefield | Execute$ TriggerSacrifice | TriggerDescription$ that player sacrifices a Permanent for each soot counter on Smokestack
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, you may put a soot counter on CARDNAME.
+SVar:TrigSacrifice:AB$Sacrifice | Cost$ 0 | Amount$ X | SacValid$ Permanent | SacMessage$ Permanent
+SVar:TriggerSacrifice:AB$Sacrifice | Cost$ 0 | Defined$ Opponent | Amount$ X | SacValid$ Permanent | SacMessage$ Permanent
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ SOOT | CounterNum$ 1
+SVar:X:Count$CardCounters.SOOT
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/smokestack.jpg
+SetInfo:USG|Rare|http://magiccards.info/scans/en/us/309.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/smolder_initiate.txt b/res/cardsfolder/smolder_initiate.txt
index f6a3aeb08c7..28af89b3a45 100644
--- a/res/cardsfolder/smolder_initiate.txt
+++ b/res/cardsfolder/smolder_initiate.txt
@@ -1,10 +1,11 @@
-Name:Smolder Initiate
-ManaCost:B
-Types:Creature Elemental Shaman
-Text:no text
-PT:1/1
-T:Mode$SpellCast | ValidCard$ Card.Black | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a player casts a black spell, you may pay 1. If you do, target player loses 1 life.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Tgt$ TgtP | LifeAmount$ 1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/smolder_initiate.jpg
+Name:Smolder Initiate
+ManaCost:B
+Types:Creature Elemental Shaman
+Text:no text
+PT:1/1
+T:Mode$SpellCast | ValidCard$ Card.Black | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a player casts a black spell, you may pay 1. If you do, target player loses 1 life.
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Tgt$ TgtP | LifeAmount$ 1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/smolder_initiate.jpg
+SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/78.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/soaring_seacliff.txt b/res/cardsfolder/soaring_seacliff.txt
index 3f0cfe7b348..020d7bd6179 100644
--- a/res/cardsfolder/soaring_seacliff.txt
+++ b/res/cardsfolder/soaring_seacliff.txt
@@ -1,12 +1,13 @@
-Name:Soaring Seacliff
-ManaCost:no cost
-Types:Land
-Text:no text
-K:CARDNAME enters the battlefield tapped.
-A:AB$Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gains flying until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/soaring_seacliff.jpg
+Name:Soaring Seacliff
+ManaCost:no cost
+Types:Land
+Text:no text
+K:CARDNAME enters the battlefield tapped.
+A:AB$Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gains flying until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/soaring_seacliff.jpg
+SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/225.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/soldevi_sage.txt b/res/cardsfolder/soldevi_sage.txt
index dfe3bd1803d..b9e1c85c947 100644
--- a/res/cardsfolder/soldevi_sage.txt
+++ b/res/cardsfolder/soldevi_sage.txt
@@ -1,9 +1,11 @@
-Name:Soldevi Sage
-ManaCost:1 U
-Types:Creature Human Wizard
-Text:no text
-PT:1/1
-A:AB$Draw | Cost$ T Sac<2/Land> | NumCards$ 3 | SpellDescription$ Draw three cards, then discard a card. | SubAbility$ YouDiscard/1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/soldevi_sage.jpg
+Name:Soldevi Sage
+ManaCost:1 U
+Types:Creature Human Wizard
+Text:no text
+PT:1/1
+A:AB$Draw | Cost$ T Sac<2/Land> | NumCards$ 3 | SpellDescription$ Draw three cards, then discard a card. | SubAbility$ YouDiscard/1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/soldevi_sage.jpg
+SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/99.jpg
+SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/51.jpg|2
 End
\ No newline at end of file
diff --git a/res/cardsfolder/teetering_peaks.txt b/res/cardsfolder/teetering_peaks.txt
index 784cc857965..ff72bf40609 100644
--- a/res/cardsfolder/teetering_peaks.txt
+++ b/res/cardsfolder/teetering_peaks.txt
@@ -1,12 +1,13 @@
-Name:Teetering Peaks
-ManaCost:no cost
-Types:Land
-Text:no text
-K:CARDNAME enters the battlefield tapped.
-A:AB$Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +2/+0 until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +0
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/teetering_peaks.jpg
-End
+Name:Teetering Peaks
+ManaCost:no cost
+Types:Land
+Text:no text
+K:CARDNAME enters the battlefield tapped.
+A:AB$Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +2/+0 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +0
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/teetering_peaks.jpg
+SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/226.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/thraximundar.txt b/res/cardsfolder/thraximundar.txt
index 9ded5dc75e5..1a76a87d27d 100644
--- a/res/cardsfolder/thraximundar.txt
+++ b/res/cardsfolder/thraximundar.txt
@@ -1,13 +1,14 @@
-Name:Thraximundar
-ManaCost:4 U B R
-Types:Legendary Creature Zombie Assassin
-Text:no text
-PT:6/6
-K:Haste
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ Whenever Thraximundar attacks, defending player sacrifices a creature.
-T:Mode$ Sacrificed | ValidCard$ Creature | Execute$ TrigPutCounter | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever a player sacrifices a creature, you may put a +1/+1 counter on CARDNAME.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Opponent | SacValid$ Creature
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Mythic
-SVar:Picture:http://www.wizards.com/global/images/magic/general/thraximundar.jpg
+Name:Thraximundar
+ManaCost:4 U B R
+Types:Legendary Creature Zombie Assassin
+Text:no text
+PT:6/6
+K:Haste
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ Whenever Thraximundar attacks, defending player sacrifices a creature.
+T:Mode$ Sacrificed | ValidCard$ Creature | Execute$ TrigPutCounter | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever a player sacrifices a creature, you may put a +1/+1 counter on CARDNAME.
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Opponent | SacValid$ Creature
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:Rarity:Mythic
+SVar:Picture:http://www.wizards.com/global/images/magic/general/thraximundar.jpg
+SetInfo:ARB|Mythic|http://magiccards.info/scans/en/arb/113.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/time_spiral.txt b/res/cardsfolder/time_spiral.txt
index 1f0e6c4e0ff..1c28103d294 100644
--- a/res/cardsfolder/time_spiral.txt
+++ b/res/cardsfolder/time_spiral.txt
@@ -1,12 +1,13 @@
-Name:Time Spiral
-ManaCost:4 U U
-Types:Sorcery
-Text:no text
-A:SP$ChangeZoneAll | Cost$ 4 U U |  ChangeType$ Card | Origin$ Hand | Destination$ Library | Shuffle$ True  | SubAbility$ SVar=DBChangeAll | SpellDescription$ Each player shuffles his or her graveyard and hand into his or her library
-SVar:DBChangeAll:DB$ChangeZoneAll | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | SubAbility$ SVar=DBDraw
-SVar:DBDraw:DB$Draw | NumCards$ 7 | Defined$ Each | SubAbility$ SVar=DBChange | SpellDescription$ , then draws seven cards.
-SVar:DBChange:DB$ChangeZone | Origin$ Stack | Destination$ Exile | SubAbility$ YouUntapUpTo/6/Land | SpellDescription$ Exile Time Spiral.  You untap up to six lands.
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/time_spiral.jpg
-End
+Name:Time Spiral
+ManaCost:4 U U
+Types:Sorcery
+Text:no text
+A:SP$ChangeZoneAll | Cost$ 4 U U |  ChangeType$ Card | Origin$ Hand | Destination$ Library | Shuffle$ True  | SubAbility$ SVar=DBChangeAll | SpellDescription$ Each player shuffles his or her graveyard and hand into his or her library
+SVar:DBChangeAll:DB$ChangeZoneAll | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | SubAbility$ SVar=DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 7 | Defined$ Each | SubAbility$ SVar=DBChange | SpellDescription$ , then draws seven cards.
+SVar:DBChange:DB$ChangeZone | Origin$ Stack | Destination$ Exile | SubAbility$ YouUntapUpTo/6/Land | SpellDescription$ Exile Time Spiral.  You untap up to six lands.
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/time_spiral.jpg
+SetInfo:USG|Rare|http://magiccards.info/scans/en/us/103.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/turntimber_grove.txt b/res/cardsfolder/turntimber_grove.txt
index fbfd5f72fba..3f94b696b0e 100644
--- a/res/cardsfolder/turntimber_grove.txt
+++ b/res/cardsfolder/turntimber_grove.txt
@@ -1,11 +1,12 @@
-Name:Turntimber Grove
-ManaCost:no cost
-Types:Legendary Land
-Text:no text
-K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +1/+1 until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/turntimber_grove.jpg
+Name:Turntimber Grove
+ManaCost:no cost
+Types:Legendary Land
+Text:no text
+K:CARDNAME enters the battlefield tapped.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +1/+1 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/turntimber_grove.jpg
+SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/227.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/vengeful_dead.txt b/res/cardsfolder/vengeful_dead.txt
index 0276d6619eb..28784fe0b51 100644
--- a/res/cardsfolder/vengeful_dead.txt
+++ b/res/cardsfolder/vengeful_dead.txt
@@ -1,11 +1,12 @@
-Name:Vengeful Dead
-ManaCost:3 B
-Types:Creature Zombie
-Text:no text
-PT:3/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Zombie.Other | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another Zombie is put into a graveyard from the battlefield, each opponent loses 1 life.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Zombie.Other | TriggerZones$ Battlefield | Execute$ TrigLoseLife
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/vengeful_dead.jpg
+Name:Vengeful Dead
+ManaCost:3 B
+Types:Creature Zombie
+Text:no text
+PT:3/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Zombie.Other | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another Zombie is put into a graveyard from the battlefield, each opponent loses 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Zombie.Other | TriggerZones$ Battlefield | Execute$ TrigLoseLife
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/vengeful_dead.jpg
+SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/80.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/welkin_hawk.txt b/res/cardsfolder/welkin_hawk.txt
index 068aee4fef8..9d8b9d31540 100644
--- a/res/cardsfolder/welkin_hawk.txt
+++ b/res/cardsfolder/welkin_hawk.txt
@@ -1,11 +1,12 @@
-Name:Welkin Hawk
-ManaCost:1 W
-Types:Creature Bird
-Text:no text
-PT:1/1
-K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may search your library for a card named Welkin Hawk, reveal that card, put it into your hand, then shuffle your library.
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedWelkin Hawk | ChangeNum$ 1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/welkin_hawk.jpg
+Name:Welkin Hawk
+ManaCost:1 W
+Types:Creature Bird
+Text:no text
+PT:1/1
+K:Flying
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may search your library for a card named Welkin Hawk, reveal that card, put it into your hand, then shuffle your library.
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedWelkin Hawk | ChangeNum$ 1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/welkin_hawk.jpg
+SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/25.jpg
 End
\ No newline at end of file