spjspj - Add in promos from scg to grabbag. Fixed some more issues with names

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/AltMtgOnlTokensImageSource.java

@@ -178,4 +178,8 @@ public class AltMtgOnlTokensImageSource implements CardImageSource {
     public Boolean isTokenSource() {
         return true;
     }
+    
+    @Override
+    public void doPause(String httpImageUrl) {
+    }
 }

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CardImageSource.java

@@ -16,4 +16,5 @@ public interface CardImageSource {
     Float getAverageSize();
     Integer getTotalImages();
     Boolean isTokenSource();
+    void doPause(String httpImageUrl);
 }

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java

@@ -27,6 +27,7 @@
  */
 package org.mage.plugins.card.dl.sources;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import org.apache.log4j.Logger;
@@ -68,7 +69,6 @@ public class GrabbagImageSource implements CardImageSource {
         for (String key : copyUrlToImageDone.keySet()) {
             if (copyUrlToImageDone.get(key) < maxTimes) {
                 copyUrlToImageDone.put(key, maxTimes);
-                doPause(key);
                 return getSourceName(key) + key;
             }
         }
@@ -78,7 +78,6 @@ public class GrabbagImageSource implements CardImageSource {
         for (String key : copyUrlToImageDone.keySet()) {
             if (copyUrlToImageDone.get(key) < maxTimes) {
                 copyUrlToImageDone.put(key, maxTimes);
-                doPause(key);
                 return getSourceName(key) + key;
             }
         }
@@ -120,49 +119,48 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/BNG/en/promo/ArbiterOfTheIdeal.jpg", "PTC.zip/PTC/Arbiter of the Ideal.full.jpg");
         copyUrlToImage.put("MTG/BNG/en/promo/CourserOfKruphix.jpg", "PTC.zip/PTC/Courser of Kruphix.full.jpg");
         copyUrlToImage.put("MTG/BNG/en/promo/EaterOfHope.jpg", "PTC.zip/PTC/Eater of Hope.full.jpg");
-        copyUrlToImage.put("MTG/BNG/en/promo/FatedConflagration.jpg", "PTC.zip/PTC/Fated Return.full.jpg");
+        copyUrlToImage.put("MTG/BNG/en/promo/FatedReturn.jpg", "PTC.zip/PTC/Fated Return.full.jpg");
         copyUrlToImage.put("MTG/BNG/en/promo/ForgestokerDragon.jpg", "PTC.zip/PTC/Forgestoker Dragon.full.jpg");
         copyUrlToImage.put("MTG/BNG/en/promo/NessianWildsRavager.jpg", "PTC.zip/PTC/Nessian Wilds Ravager.full.jpg");
         copyUrlToImage.put("MTG/BNG/en/promo/PainSeer.jpg", "PTC.zip/PTC/Pain Seer.full.jpg");
         copyUrlToImage.put("MTG/BNG/en/promo/SilentSentinel.jpg", "PTC.zip/PTC/Silent Sentinel.full.jpg");
-        copyUrlToImage.put("MTG/BNG/en/promo/Tromokratis.jpg", "PTC.zip/PTC/Triskaidekaphobia.full.jpg");
+        copyUrlToImage.put("MTG/BNG/en/promo/Tromokratis.jpg", "PTC.zip/PTC/Tromokratis.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/AleshaWhoSmilesatDeath.jpg", "PTC.zip/PTC/Alesha, Who Smiles at Death.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/AleshaWhoSmilesAtDeath.jpg", "PTC.zip/PTC/Alesha, Who Smiles at Death.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/Arcbond.jpg", "PTC.zip/PTC/Arcbond.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/ArchfiendofDepravity.jpg", "PTC.zip/PTC/Archfiend of Depravity.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/ArchfiendOfDepravity.jpg", "PTC.zip/PTC/Archfiend of Depravity.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/AtarkaWorldRender.jpg", "PTC.zip/PTC/Atarka, World Render.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/BrutalHordechief.jpg", "PTC.zip/PTC/Brutal Hordechief.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/DaghatartheAdamant.jpg", "PTC.zip/PTC/Daghatar the Adamant.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/DaghatarTheAdamant.jpg", "PTC.zip/PTC/Daghatar the Adamant.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/DragonscaleGeneral.jpg", "PTC.zip/PTC/Dragonscale General.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/DromokatheEternal.jpg", "PTC.zip/PTC/Dromoka, the Eternal.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/DromokaTheEternal.jpg", "PTC.zip/PTC/Dromoka, the Eternal.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/FlamerushRider.jpg", "PTC.zip/PTC/Flamerush Rider.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/FlamewakePhoenix.jpg", "PTC.zip/PTC/Flamewake Phoenix.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/JeskaiInfiltrator.jpg", "PTC.zip/PTC/Jeskai Infiltrator.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/KolaghantheStorm’sFury.jpg", "PTC.zip/PTC/Kolaghan, the Storm’s Fury.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/KolaghanTheStormsFury.jpg", "PTC.zip/PTC/Kolaghan, the Storm's Fury.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/MarduStrikeleader.jpg", "PTC.zip/PTC/Mardu Strike leader.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/MarduStrikeLeader.jpg", "PTC.zip/PTC/Mardu Strike leader.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/MasteryoftheUnseen.jpg", "PTC.zip/PTC/Mastery of the Unseen.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/MasteryOfTheUnseen.jpg", "PTC.zip/PTC/Mastery of the Unseen.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/OjutaiSoulofWinter.jpg", "PTC.zip/PTC/Ojutai, Soul of Winter.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/OjutaiSoulOfWinter.jpg", "PTC.zip/PTC/Ojutai, Soul of Winter.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/RallytheAncestors.jpg", "PTC.zip/PTC/Rally the Ancestors.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/RallyTheAncestors.jpg", "PTC.zip/PTC/Rally the Ancestors.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/Sage-EyeAvengers.jpg", "PTC.zip/PTC/Sage-Eye Avengers.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/SageEyeAvengers.jpg", "PTC.zip/PTC/Sage-Eye Avengers.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/SandsteppeMastodon.jpg", "PTC.zip/PTC/Sandsteppe Mastodon.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/ShamanOfTheGreatHunt.jpg", "PTC.zip/PTC/Shaman of the Great Hunt.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/ShamanicRevelation.jpg", "PTC.zip/PTC/Shamanic Revelation.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/ShamanoftheGreatHunt.jpg", "PTC.zip/PTC/Shaman of the Great Hunt.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/ShuYunTheSilentTempest.jpg", "PTC.zip/PTC/Shu Yun, the Silent Tempest.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/ShuYuntheSilentTempest.jpg", "PTC.zip/PTC/Shu Yun, the Silent Tempest.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/SilumgarTheDriftingDeath.jpg", "PTC.zip/PTC/Silumgar, the Drifting Death.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/SilumgartheDriftingDeath.jpg", "PTC.zip/PTC/Silumgar, the Drifting Death.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/SoulfireGrandMaster.jpg", "PTC.zip/PTC/Soulfire Grand Master.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/Soulflayer.jpg", "PTC.zip/PTC/Soulflayer.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/SupplantForm.jpg", "PTC.zip/PTC/Supplant Form.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/TasigurtheGoldenFang.jpg", "PTC.zip/PTC/Tasigur, the Golden Fang.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/TasigurTheGoldenFang.jpg", "PTC.zip/PTC/Tasigur, the Golden Fang.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/TorrentElemental.jpg", "PTC.zip/PTC/Torrent Elemental.full.jpg");
-        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/WardenoftheFirstTree.jpg", "PTC.zip/PTC/Warden of the First Tree.full.jpg");
+        copyUrlToImage.put("MTG/FRF/en/promo/prerelease/WardenOfTheFirstTree.jpg", "PTC.zip/PTC/Warden of the First Tree.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/Wildcall.jpg", "PTC.zip/PTC/Wildcall.full.jpg");
         copyUrlToImage.put("MTG/FRF/en/promo/prerelease/YasovaDragonclaw.jpg", "PTC.zip/PTC/Yasova Dragonclaw.full.jpg");
         copyUrlToImage.put("MTG/JOU/en/promo/DawnbringerCharioteers.jpg", "PTC.zip/PTC/Dawnbringer Charioteers.full.jpg");
         copyUrlToImage.put("MTG/JOU/en/promo/DictateOfKruphix.jpg", "PTC.zip/PTC/Dictate of Kruphix.full.jpg");
         copyUrlToImage.put("MTG/JOU/en/promo/DictateOfTheTwinGods.jpg", "PTC.zip/PTC/Dictate of the Twin Gods.full.jpg");
         copyUrlToImage.put("MTG/JOU/en/promo/DoomwakeGiant.jpg", "PTC.zip/PTC/Doomwake Giant.full.jpg");
-        copyUrlToImage.put("MTG/JOU/en/promo/EidolonOfBlossoms.jpg", "PTC.zip/PTC/Eidolon of the Great Revel.full.jpg");
+        copyUrlToImage.put("MTG/JOU/en/promo/EidolonOfBlossoms.jpg", "PTC.zip/PTC/Eidolon of Blossoms.full.jpg");
-        copyUrlToImage.put("MTG/JOU/en/promo/HeroesBane.jpg", "PTC.zip/PTC/Heroes' Podium.full.jpg");
+        copyUrlToImage.put("MTG/JOU/en/promo/ScourgeOfSkolaVale.jpg", "PTC.zip/PTC/Scourge of Skola Vale.full.jpg");
-        copyUrlToImage.put("MTG/JOU/en/promo/ScourgeOfFleets.jpg", "PTC.zip/PTC/Scourge of Skola Vale.full.jpg");
         copyUrlToImage.put("MTG/JOU/en/promo/SpawnOfThraxes.jpg", "PTC.zip/PTC/Spawn of Thraxes.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/AbzanAscendancy.jpg", "PTC.zip/PTC/Abzan Ascendancy.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/AnafenzaTheForemost.jpg", "PTC.zip/PTC/Anafenza, the Foremost.full.jpg");
@@ -174,19 +172,19 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/KTK/en/promo/CratersClaws.jpg", "PTC.zip/PTC/Crater's Claws.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/DeflectingPalm.jpg", "PTC.zip/PTC/Deflecting Palm.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/DigThroughTime.jpg", "PTC.zip/PTC/Dig Through Time.full.jpg");
-        copyUrlToImage.put("MTG/KTK/en/promo/DragonStyleTwins.jpg", "PTC.zip/PTC/Dragon Throne of Tarkir.full.jpg");
+        copyUrlToImage.put("MTG/KTK/en/promo/DragonStyleTwins.jpg", "PTC.zip/PTC/Dragon-Style Twins.full.jpg");
-        copyUrlToImage.put("MTG/KTK/en/promo/DragonThroneOfTarkir.jpg", "PTC.zip/PTC/Dragon-Style Twins.full.jpg");
+        copyUrlToImage.put("MTG/KTK/en/promo/DragonThroneOfTarkir.jpg", "PTC.zip/PTC/Dragon Throne of Tarkir.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/Duneblast.jpg", "PTC.zip/PTC/Duneblast.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/FlyingCraneTechnique.jpg", "PTC.zip/PTC/Flying Crane Technique.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/GrimHaruspex.jpg", "PTC.zip/PTC/Grim Haruspex.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/HardenedScales.jpg", "PTC.zip/PTC/Hardened Scales.full.jpg");
-        copyUrlToImage.put("MTG/KTK/en/promo/HeraldOfAnafenza.jpg", "PTC.zip/PTC/Herald of Torment.full.jpg");
+        copyUrlToImage.put("MTG/KTK/en/promo/HeraldOfTorment.jpg", "PTC.zip/PTC/Herald of Torment.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/HighSentinelsOfArashin.jpg", "PTC.zip/PTC/High Sentinels of Arashin.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/IcyBlast.jpg", "PTC.zip/PTC/Icy Blast.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/IvorytuskFortress.jpg", "PTC.zip/PTC/Ivorytusk Fortress.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/JeeringInstigator.jpg", "PTC.zip/PTC/Jeering Instigator.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/JeskaiAscendancy.jpg", "PTC.zip/PTC/Jeskai Ascendancy.full.jpg");
-        copyUrlToImage.put("MTG/KTK/en/promo/KheruLichLord.jpg", "PTC.zip/PTC/Kheru Spellsnatcher.full.jpg");
+        copyUrlToImage.put("MTG/KTK/en/promo/KheruSpellsnatcher.jpg", "PTC.zip/PTC/Kheru Spellsnatcher.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/MarduAscendancy.jpg", "PTC.zip/PTC/Mardu Ascendancy.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/MasterOfPearls.jpg", "PTC.zip/PTC/Master of Pearls.full.jpg");
         copyUrlToImage.put("MTG/KTK/en/promo/NarsetEnlightenedMaster.jpg", "PTC.zip/PTC/Narset, Enlightened Master.full.jpg");
@@ -209,7 +207,8 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/M15/en/promo/InGarruksWake.jpg", "PTC.zip/PTC/In Garruk's Wake.full.jpg");
         copyUrlToImage.put("MTG/M15/en/promo/IndulgentTormentor.jpg", "PTC.zip/PTC/Indulgent Tormentor.full.jpg");
         copyUrlToImage.put("MTG/M15/en/promo/MercurialPretender.jpg", "PTC.zip/PTC/Mercurial Pretender.full.jpg");
-        copyUrlToImage.put("MTG/M15/en/promo/Phytotitan.jpg", "PTC.zip/PTC/Phyrexian Revoker.full.jpg");
+        copyUrlToImage.put("MTG/M15/en/promo/PhyrexianRevoker.jpg", "PTC.zip/PTC/Phyrexian Revoker.full.jpg");
+        copyUrlToImage.put("MTG/M15/en/promo/Phytotitan.jpg", "PTC.zip/PTC/Phytotitan.full.jpg");
         copyUrlToImage.put("MTG/M15/en/promo/ResoluteArchangel.jpg", "PTC.zip/PTC/Resolute Archangel.full.jpg");
         copyUrlToImage.put("MTG/M15/en/promo/SiegeDragon.jpg", "PTC.zip/PTC/Siege Dragon.full.jpg");
         copyUrlToImage.put("MTG/M15/en/promo/SoulOfRavnica.jpg", "PTC.zip/PTC/Soul of Ravnica.full.jpg");
@@ -219,13 +218,12 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/BloodstainedMire.jpg", "JR.zip/JR/Bloodstained Mire.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/CommandBeacon.jpg", "JR.zip/JR/Command Beacon.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/DarkRitual.jpg", "JR.zip/JR/Dark Ritual.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Judge/DecreeofJustice.jpg", "JR.zip/JR/Decree of Justice.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Judge/DecreeOfJustice.jpg", "JR.zip/JR/Decree of Justice.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/DefenseOfTheHeart.jpg", "JR.zip/JR/Defense of the Heart.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/ExaltedAngel.jpg", "JR.zip/JR/Exalted Angel.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/FeldonOfTheThirdPath.jpg", "JR.zip/JR/Feldon of the Third Path.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/ForceOfWill.jpg", "JR.zip/JR/Force of Will.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/GaeasCradle.jpg", "JR.zip/JR/Gaea's Cradle.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Judge/Grindstone.jpg", "JR.zip/JR/Grindstone.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/ImperialRecruiter.jpg", "JR.zip/JR/Imperial Recruiter.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/LandTax.jpg", "JR.zip/JR/Land Tax.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/MindsDesire.jpg", "JR.zip/JR/Mind's Desire.full.jpg");
@@ -233,8 +231,10 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/RishadanPort.jpg", "JR.zip/JR/Rishadan Port.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/ShardlessAgent.jpg", "JR.zip/JR/Shardless Agent.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/ThawingGlaciers.jpg", "JR.zip/JR/Thawing Glaciers.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Judge/Vindicate.jpg", "JR.zip/JR/Vindicate.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Judge/Vindicate2007.jpg", "JR.zip/JR/Vindicate.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Judge/Wasteland.jpg", "JR.zip/JR/Wasteland.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Judge/Vindicate2013.jpg", "JR.zip/JR/Vindicate 1.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Judge/Wasteland2010.jpg", "JR.zip/JR/Wasteland 1.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Judge/Wasteland2015.jpg", "JR.zip/JR/Wasteland.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/WindsweptHeath.jpg", "JR.zip/JR/Windswept Heath.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/XiahouDunTheOneEyed.jpg", "JR.zip/JR/Xiahou Dun, the One-Eyed.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Judge/YawgmothsWill.jpg", "JR.zip/JR/Yawgmoth's Will.full.jpg");
@@ -256,7 +256,7 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/DefiantBloodlord.jpg", "PTC.zip/PTC/Defiant Bloodlord.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/DesolationTwin.jpg", "PTC.zip/PTC/Desolation Twin.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/DragonmasterOutcast.jpg", "PTC.zip/PTC/Dragonmaster Outcast.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/DranaLiberatorOfMalakir.jpg", "PTC.zip/PTC/Drana's Chosen.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/DranasChosen.jpg", "PTC.zip/PTC/Drana's Chosen.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/DrownerOfHope.jpg", "PTC.zip/PTC/Drowner of Hope.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/DustStalker.jpg", "PTC.zip/PTC/Dust Stalker.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/EmeriaShepherd.jpg", "PTC.zip/PTC/Emeria Shepherd.full.jpg");
@@ -270,15 +270,18 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/GruesomeSlaughter.jpg", "PTC.zip/PTC/Gruesome Slaughter.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/GuardianOfTazeem.jpg", "PTC.zip/PTC/Guardian of Tazeem.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/GuulDrazOverseer.jpg", "PTC.zip/PTC/Guul Draz Overseer.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/HeroOfGomaFada.jpg", "PTC.zip/PTC/Hero's Downfall.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/HeroOfGomaFada.jpg", "PTC.zip/PTC/Hero of Goma Fada.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/KioraMasterOfTheDepths.jpg", "PTC.zip/PTC/Kiora, the Crashing Wave.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/HerosDownfall.jpg", "PTC.zip/PTC/Hero's Downfall.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/KioraMasterOfTheDepths.jpg", "PTC.zip/PTC/Kiora, Master of the Depths.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/KioraTheCrashingWave.jpg", "PTC.zip/PTC/Kiora, the Crashing Wave.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/LanternScout.jpg", "PTC.zip/PTC/Lantern Scout.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/LumberingFalls.jpg", "PTC.zip/PTC/Lumbering Falls.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/MarchFromTheTomb.jpg", "PTC.zip/PTC/March from the Tomb.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/MundaAmbushLeader.jpg", "PTC.zip/PTC/Munda, Ambush Leader.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/NissasRenewal.jpg", "PTC.zip/PTC/Nissa's Renewal.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/NoyanDarRoilShaper.jpg", "PTC.zip/PTC/Noyan Dar, Roil Shaper.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/ObNixilisReignited.jpg", "PTC.zip/PTC/Ob Nixilis, Unshackled.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/ObNixilisReignited.jpg", "PTC.zip/PTC/Ob Nixilis Reignited.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/ObNixilisUnshackled.jpg", "PTC.zip/PTC/Ob Nixilis, Unshackled.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/OblivionSower.jpg", "PTC.zip/PTC/Oblivion Sower.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/OmnathLocusOfRage.jpg", "PTC.zip/PTC/Omnath, Locus of Rage.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/OranRiefHydra.jpg", "PTC.zip/PTC/Oran-Rief Hydra.full.jpg");
@@ -299,7 +302,8 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/SmolderingMarsh.jpg", "PTC.zip/PTC/Smoldering Marsh.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/SmotheringAbomination.jpg", "PTC.zip/PTC/Smothering Abomination.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/SunkenHollow.jpg", "PTC.zip/PTC/Sunken Hollow.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/UginsInsight.jpg", "PTC.zip/PTC/Ugin's Nexus.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/UginsInsight.jpg", "PTC.zip/PTC/Ugin's Insight.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/UginsNexus.jpg", "PTC.zip/PTC/Ugin's Nexus.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/UlamogTheCeaselessHunger.jpg", "PTC.zip/PTC/Ulamog, the Ceaseless Hunger.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/UndergrowthChampion.jpg", "PTC.zip/PTC/Undergrowth Champion.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/BFZ/VeteranWarleader.jpg", "PTC.zip/PTC/Veteran Warleader.full.jpg");
@@ -376,25 +380,29 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/KLD/VerdurousGearhulk.jpg", "PTC.zip/PTC/Verdurous Gearhulk.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/KLD/WildestDreams.jpg", "PTC.zip/PTC/Wildest Dreams.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/AyliEternalPilgrim.jpg", "PTC.zip/PTC/Ayli, Eternal Pilgrim.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/BearerOfSilence.jpg", "PTC.zip/PTC/Bearer of the Heavens.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/BearerOfSilence.jpg", "PTC.zip/PTC/Bearer of Silence.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/BearerOfTheHeavens.jpg", "PTC.zip/PTC/Bearer of the Heavens.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/CallTheGatewatch.jpg", "PTC.zip/PTC/Call the Gatewatch.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/CaptainsClaws.jpg", "PTC.zip/PTC/Captain's Claws.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/ChandraFlamecaller.jpg", "PTC.zip/PTC/Chandra, Pyromaster.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/ChandraFlamecaller.jpg", "PTC.zip/PTC/Chandra, Flamecaller.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/ChandraPyromaster.jpg", "PTC.zip/PTC/Chandra, Pyromaster.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/CorruptedCrossroads.jpg", "PTC.zip/PTC/Corrupted Crossroads.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/CrushOfTentacles.jpg", "PTC.zip/PTC/Crush of Tentacles.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/DeceiverOfForm.jpg", "PTC.zip/PTC/Deceiver of Form.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/DeepfathomSkulker.jpg", "PTC.zip/PTC/Deepfathom Skulker.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/DimensionalInfiltrator.jpg", "PTC.zip/PTC/Dimensional Infiltrator.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/DranasChosen.jpg", "PTC.zip/PTC/Drana, Liberator of Malakir.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/DranaLiberatorOfMalakir.jpg", "PTC.zip/PTC/Drana, Liberator of Malakir.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/DreadDefiler.jpg", "PTC.zip/PTC/Dread Defiler.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/EldraziDisplacer.jpg", "PTC.zip/PTC/Eldrazi Displacer.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/EldraziMimic.jpg", "PTC.zip/PTC/Eldrazi Mimic.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/EldraziObligator.jpg", "PTC.zip/PTC/Eldrazi Obligator.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/Endbringer.jpg", "PTC.zip/PTC/End Hostilities.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/EndHostilities.jpg", "PTC.zip/PTC/End Hostilities.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/Endbringer.jpg", "PTC.zip/PTC/Endbringer.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/FallOfTheTitans.jpg", "PTC.zip/PTC/Fall of the Titans.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/GeneralTazri.jpg", "PTC.zip/PTC/General Tazri.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/GladehartCavalry.jpg", "PTC.zip/PTC/Gladehart Cavalry.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/GoblinDarkDwellers.jpg", "PTC.zip/PTC/Goblin Rabblemaster.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/GoblinDarkDwellers.jpg", "PTC.zip/PTC/Goblin Dark-Dwellers.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/GoblinRabblemaster.jpg", "PTC.zip/PTC/Goblin Rabblemaster.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/HedronAlignment.jpg", "PTC.zip/PTC/Hedron Alignment.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/HissingQuagmire.jpg", "PTC.zip/PTC/Hissing Quagmire.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/InverterOfTruth.jpg", "PTC.zip/PTC/Inverter of Truth.full.jpg");
@@ -422,7 +430,8 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/SphinxOfTheFinalWord.jpg", "PTC.zip/PTC/Sphinx of the Final Word.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/StoneHavenOutfitter.jpg", "PTC.zip/PTC/Stone Haven Outfitter.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/StoneforgeMasterwork.jpg", "PTC.zip/PTC/Stoneforge Masterwork.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/SylvanAdvocate.jpg", "PTC.zip/PTC/Sylvan Caryatid.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/SylvanAdvocate.jpg", "PTC.zip/PTC/Sylvan Advocate.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/SylvanCaryatid.jpg", "PTC.zip/PTC/Sylvan Caryatid.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/ThoughtKnotSeer.jpg", "PTC.zip/PTC/Thought-Knot Seer.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/TyrantOfValakut.jpg", "PTC.zip/PTC/Tyrant of Valakut.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/OGW/VileRedeemer.jpg", "PTC.zip/PTC/Vile Redeemer.full.jpg");
@@ -436,7 +445,8 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/ArchangelAvacyn.jpg", "PTC.zip/PTC/Archangel Avacyn.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/ArlinnKord.jpg", "PTC.zip/PTC/Arlinn Kord.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/AsylumVisitor.jpg", "PTC.zip/PTC/Asylum Visitor.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/AvacynsJudgment.jpg", "PTC.zip/PTC/Avacyn, Guardian Angel.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/AvacynGuardianAngel.jpg", "PTC.zip/PTC/Avacyn, Guardian Angel.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/AvacynsJudgment.jpg", "PTC.zip/PTC/Avacyn's Judgement.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/BeholdTheBeyond.jpg", "PTC.zip/PTC/Behold the Beyond.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/BrainInAJar.jpg", "PTC.zip/PTC/Brain in a Jar.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/BurnFromWithin.jpg", "PTC.zip/PTC/Burn from Within.full.jpg");
@@ -464,14 +474,16 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/FortifiedVillage.jpg", "PTC.zip/PTC/Fortified Village.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/FromUnderTheFloorboards.jpg", "PTC.zip/PTC/From Under the Floorboards.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/GameTrail.jpg", "PTC.zip/PTC/Game Trail.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/GeierReachBandit.jpg", "PTC.zip/PTC/Geier Reach Sanitarium.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/GeierReachBandit.jpg", "PTC.zip/PTC/Geier Reach Bandit.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/GeierReachSanitarium.jpg", "PTC.zip/PTC/Geier Reach Sanitarium.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/GeralfsMasterpiece.jpg", "PTC.zip/PTC/Geralf's Masterpiece.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/GoldnightCastigator.jpg", "PTC.zip/PTC/Goldnight Castigator.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/HanweirMilitiaCaptain.jpg", "PTC.zip/PTC/Hanweir Militia Captain.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/HarnessTheStorm.jpg", "PTC.zip/PTC/Harness the Storm.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/InexorableBlob.jpg", "PTC.zip/PTC/Inexorable Blob.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/InvocationOfSaintTraft.jpg", "PTC.zip/PTC/Invocation of Saint Traft.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/JaceUnravelerOfSecrets.jpg", "PTC.zip/PTC/Jace, the Living Guildpact.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/JaceTheLivingGuildpact.jpg", "PTC.zip/PTC/Jace, the Living Guildpact.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/JaceUnravelerOfSecrets.jpg", "PTC.zip/PTC/Jace, Unraveler of Secrets.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/MarkovDreadknight.jpg", "PTC.zip/PTC/Markov Dreadknight.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/MindwrackDemon.jpg", "PTC.zip/PTC/Mindwrack Demon.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/NahiriTheHarbinger.jpg", "PTC.zip/PTC/Nahiri, the Harbinger.full.jpg");
@@ -491,24 +503,47 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/SilverfurPartisan.jpg", "PTC.zip/PTC/Silverfur Partisan.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/SinProdder.jpg", "PTC.zip/PTC/Sin Prodder.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/SlayersPlate.jpg", "PTC.zip/PTC/Slayer's Plate.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/SorinGrimNemesis.jpg", "PTC.zip/PTC/Sorin, Solemn Visitor.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/SorinGrimNemesis.jpg", "PTC.zip/PTC/Sorin, Grim Nemesis.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/SorinSolemnVisitor.jpg", "PTC.zip/PTC/Sorin, Solemn Visitor.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/SoulSwallower.jpg", "PTC.zip/PTC/Soul Swallower.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/StartledAwake.jpg", "PTC.zip/PTC/Startled Awake.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/TamiyosJournal.jpg", "PTC.zip/PTC/Tamiyo, Field Researcher.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/TamiyoFieldResearcher.jpg", "PTC.zip/PTC/Tamiyo, Field Researcher.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/ThaliasLieutenant.jpg", "PTC.zip/PTC/Thalia, Heretic Cathar.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/TamiyosJournal.jpg", "PTC.zip/PTC/Tamiyo's Journal.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/ThaliaHereticCathar.jpg", "PTC.zip/PTC/Thalia, Heretic Cathar.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/ThaliasLieutenant.jpg", "PTC.zip/PTC/Thalia's Lieutenant.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/TheGitrogMonster.jpg", "PTC.zip/PTC/The Gitrog Monster.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/ThingInTheIce.jpg", "PTC.zip/PTC/Thing in the Ice.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/TirelessTracker.jpg", "PTC.zip/PTC/Tireless Tracker.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/ToTheSlaughter.jpg", "PTC.zip/PTC/To the Slaughter.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/TraverseTheUlvenwald.jpg", "PTC.zip/PTC/Traverse the Ulvenwald.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/Triskaidekaphobia.jpg", "PTC.zip/PTC/Triad of Fates.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/Triskaidekaphobia.jpg", "PTC.zip/PTC/Triskaidekaphobia.full.jpg");
-        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/UlvenwaldHydra.jpg", "PTC.zip/PTC/Ulvenwald Observer.full.jpg");
+        copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/UlvenwaldObserver.jpg", "PTC.zip/PTC/Ulvenwald Observer.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/WelcomeToTheFold.jpg", "PTC.zip/PTC/Welcome to the Fold.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/WestvaleAbbey.jpg", "PTC.zip/PTC/Westvale Abbey.full.jpg");
         copyUrlToImage.put("MTG/PRM/en/foil/Prerelease/SOI/WolfOfDevilsBreach.jpg", "PTC.zip/PTC/Wolf of Devil's Breach.full.jpg");
-        copyUrlToImage.put("MTG/THS/en/promo/HerosDownfall.jpg", "PTC.zip/PTC/Heron's Grace Champion.full.jpg");
+        copyUrlToImage.put("MTG/THS/en/promo/HerosDownfall.jpg", "PTC.zip/PTC/Hero's Downfall.full.jpg");
         copyUrlToImage.put("MTG/THS/en/promo/ReaperOfTheWilds.jpg", "PTC.zip/PTC/Reaper of the Wilds.full.jpg");
         copyUrlToImage.put("MTG/THS/en/promo/WhipOfErebos.jpg", "PTC.zip/PTC/Whip of Erebos.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/AncientTomb.jpg", "EXP.zip/EXP/Ancient Tomb .full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/CascadeBluffs.jpg", "EXP.zip/EXP/Cascade Bluffs .full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/DustBowl.jpg", "EXP.zip/EXP/Dust Bowl .full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/EyeOfUgin.jpg", "EXP.zip/EXP/Eye of Ugin .full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/FetidHeath.jpg", "EXP.zip/EXP/Fetid Heath .full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/FireLitThicket.jpg", "EXP.zip/EXP/Fire-Lit Thicket .full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/FloodedGrove.jpg", "EXP.zip/EXP/Flooded Grove .full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/ForbiddenOrchard.jpg", "EXP.zip/EXP/Forbidden Orchard .full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/GravenCairns.jpg", "EXP.zip/EXP/Graven Cairns .full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/HorizonCanopy.jpg", "EXP.zip/EXP/Horizon Canopy.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/KorHaven.jpg", "EXP.zip/EXP/Kor Haven.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/ManaConfluence.jpg", "EXP.zip/EXP/Mana Confluence.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/MysticGate.jpg", "EXP.zip/EXP/Mystic Gate.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/RuggedPrairie.jpg", "EXP.zip/EXP/Rugged Prairie.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/StripMine.jpg", "EXP.zip/EXP/Strip Mine.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/SunkenRuins.jpg", "EXP.zip/EXP/Sunken Ruins.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/TectonicEdge.jpg", "EXP.zip/EXP/Tectonic Edge.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/TwilightMire.jpg", "EXP.zip/EXP/Twilight Mire.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/Wasteland.jpg", "EXP.zip/EXP/Wasteland.full.jpg");
+        copyUrlToImage.put("MTG/EXP/en/foil/WoodedBastion.jpg", "EXP.zip/EXP/Wooded Bastion.full.jpg");
         copyUrlToImage.put("apac/1.jpg", "APAC.zip/APAC/Forest.1.full.jpg");
         copyUrlToImage.put("apac/10.jpg", "APAC.zip/APAC/Swamp.10.full.jpg");
         copyUrlToImage.put("apac/11.jpg", "APAC.zip/APAC/Forest.11.full.jpg");
@@ -524,90 +559,94 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("apac/7.jpg", "APAC.zip/APAC/Island.12.full.jpg");
         copyUrlToImage.put("apac/8.jpg", "APAC.zip/APAC/Mountain.8.full.jpg");
         copyUrlToImage.put("apac/9.jpg", "APAC.zip/APAC/Plains.9.full.jpg");
-
+        copyUrlToImage.put("arena/1.jpg", "ARENA.zip/ARENA/Plains.1.full.jpg");
-
+        copyUrlToImage.put("arena/10.jpg", "ARENA.zip/ARENA/Swamp.10.full.jpg");
-        copyUrlToImage.put("arena/42.jpg", "ARENA.zip/ARENA/Arc Lightning.full.jpg");
+        copyUrlToImage.put("arena/11.jpg", "ARENA.zip/ARENA/Mountain.11.full.jpg");
-        copyUrlToImage.put("arena/66.jpg", "ARENA.zip/ARENA/Ashnod's Coupon.full.jpg");
-        copyUrlToImage.put("arena/52.jpg", "ARENA.zip/ARENA/Bonesplitter.full.jpg");
-        copyUrlToImage.put("arena/63.jpg", "ARENA.zip/ARENA/Booster Tutor.full.jpg");
-        copyUrlToImage.put("arena/80.jpg", "ARENA.zip/ARENA/Castigate.full.jpg");
-        copyUrlToImage.put("arena/19.jpg", "ARENA.zip/ARENA/Chill.full.jpg");
-        copyUrlToImage.put("arena/61.jpg", "ARENA.zip/ARENA/Circle of Protection Art.full.jpg");
-        copyUrlToImage.put("arena/82.jpg", "ARENA.zip/ARENA/Coiling Oracle.full.jpg");
-        copyUrlToImage.put("arena/28.jpg", "ARENA.zip/ARENA/Creeping Mold.full.jpg");
-        copyUrlToImage.put("arena/58.jpg", "ARENA.zip/ARENA/Darksteel Ingot.full.jpg");
-        copyUrlToImage.put("arena/43.jpg", "ARENA.zip/ARENA/Dauthi Slayer.full.jpg");
-        copyUrlToImage.put("arena/37.jpg", "ARENA.zip/ARENA/Diabolic Edict.full.jpg");
-        copyUrlToImage.put("arena/6.jpg", "ARENA.zip/ARENA/Disenchant.full.jpg");
-        copyUrlToImage.put("arena/29.jpg", "ARENA.zip/ARENA/Dismiss.full.jpg");
-        copyUrlToImage.put("arena/17.jpg", "ARENA.zip/ARENA/Duress.full.jpg");
-        copyUrlToImage.put("arena/51.jpg", "ARENA.zip/ARENA/Elvish Aberration.full.jpg");
-        copyUrlToImage.put("arena/31.jpg", "ARENA.zip/ARENA/Empyrial Armor.full.jpg");
-        copyUrlToImage.put("arena/21.jpg", "ARENA.zip/ARENA/Enlightened Tutor.full.jpg");
-        copyUrlToImage.put("arena/7.jpg", "ARENA.zip/ARENA/Fireball.full.jpg");
-        copyUrlToImage.put("arena/30.jpg", "ARENA.zip/ARENA/Fling.full.jpg");
-         copyUrlToImage.put("arena/5.jpg", "ARENA.zip/ARENA/Forest.5.full.jpg");
         copyUrlToImage.put("arena/12.jpg", "ARENA.zip/ARENA/Forest.12.full.jpg");
+        copyUrlToImage.put("arena/13.jpg", "ARENA.zip/ARENA/Pouncing Jaguar.full.jpg");
+        copyUrlToImage.put("arena/14.jpg", "ARENA.zip/ARENA/Skittering Skirge.full.jpg");
+        copyUrlToImage.put("arena/15.jpg", "ARENA.zip/ARENA/Rewind.full.jpg");
+        copyUrlToImage.put("arena/16.jpg", "ARENA.zip/ARENA/Karn, Silver Golem.full.jpg");
+        copyUrlToImage.put("arena/17.jpg", "ARENA.zip/ARENA/Duress.full.jpg");
+        copyUrlToImage.put("arena/18.jpg", "ARENA.zip/ARENA/Uktabi Orangutan.full.jpg");
+        copyUrlToImage.put("arena/19.jpg", "ARENA.zip/ARENA/Chill.full.jpg");
+        copyUrlToImage.put("arena/2.jpg", "ARENA.zip/ARENA/Island.2.full.jpg");
+        copyUrlToImage.put("arena/20.jpg", "ARENA.zip/ARENA/Pillage.full.jpg");
+        copyUrlToImage.put("arena/21.jpg", "ARENA.zip/ARENA/Enlightened Tutor.full.jpg");
+        copyUrlToImage.put("arena/22.jpg", "ARENA.zip/ARENA/Stupor.full.jpg");
+        copyUrlToImage.put("arena/23.jpg", "ARENA.zip/ARENA/Plains.23.full.jpg");
+        copyUrlToImage.put("arena/24.jpg", "ARENA.zip/ARENA/Island.24.full.jpg");
+        copyUrlToImage.put("arena/25.jpg", "ARENA.zip/ARENA/Swamp.25.full.jpg");
+        copyUrlToImage.put("arena/26.jpg", "ARENA.zip/ARENA/Mountain.26.full.jpg");
         copyUrlToImage.put("arena/27.jpg", "ARENA.zip/ARENA/Forest.27.full.jpg");
+        copyUrlToImage.put("arena/28.jpg", "ARENA.zip/ARENA/Creeping Mold.full.jpg");
+        copyUrlToImage.put("arena/29.jpg", "ARENA.zip/ARENA/Dismiss.full.jpg");
+        copyUrlToImage.put("arena/3.jpg", "ARENA.zip/ARENA/Swamp.3.full.jpg");
+        copyUrlToImage.put("arena/30.jpg", "ARENA.zip/ARENA/Fling.full.jpg");
+        copyUrlToImage.put("arena/31.jpg", "ARENA.zip/ARENA/Empyrial Armor.full.jpg");
+        copyUrlToImage.put("arena/32.jpg", "ARENA.zip/ARENA/Plains.32.full.jpg");
+        copyUrlToImage.put("arena/33.jpg", "ARENA.zip/ARENA/Island.33.full.jpg");
+        copyUrlToImage.put("arena/34.jpg", "ARENA.zip/ARENA/Swamp.34.full.jpg");
+        copyUrlToImage.put("arena/35.jpg", "ARENA.zip/ARENA/Mountain.35.full.jpg");
         copyUrlToImage.put("arena/36.jpg", "ARENA.zip/ARENA/Forest.36.full.jpg");
-         copyUrlToImage.put("arena/40.jpg", "ARENA.zip/ARENA/Forest.40.full.jpg");
+        copyUrlToImage.put("arena/37.jpg", "ARENA.zip/ARENA/Diabolic Edict.full.jpg");
-         copyUrlToImage.put("arena/57.jpg", "ARENA.zip/ARENA/Forest.57.full.jpg");
-         copyUrlToImage.put("arena/71.jpg", "ARENA.zip/ARENA/Forest.71.full.jpg");
         copyUrlToImage.put("arena/38.jpg", "ARENA.zip/ARENA/Gaea's Blessing.full.jpg");
-        copyUrlToImage.put("arena/72.jpg", "ARENA.zip/ARENA/Genju of the Spires.full.jpg");
+        copyUrlToImage.put("arena/39.jpg", "ARENA.zip/ARENA/Island.39.full.jpg");
+        copyUrlToImage.put("arena/4.jpg", "ARENA.zip/ARENA/Mountain.4.full.jpg");
+        copyUrlToImage.put("arena/40.jpg", "ARENA.zip/ARENA/Forest.40.full.jpg");
+        copyUrlToImage.put("arena/41.jpg", "ARENA.zip/ARENA/Man-o'-War.full.jpg");
+        copyUrlToImage.put("arena/42.jpg", "ARENA.zip/ARENA/Arc Lightning.full.jpg");
+        copyUrlToImage.put("arena/43.jpg", "ARENA.zip/ARENA/Dauthi Slayer.full.jpg");
+        copyUrlToImage.put("arena/44.jpg", "ARENA.zip/ARENA/Mana Leak.full.jpg");
+        copyUrlToImage.put("arena/45.jpg", "ARENA.zip/ARENA/Plains.45.full.jpg");
+        copyUrlToImage.put("arena/46.jpg", "ARENA.zip/ARENA/Island.46.full.jpg");
+        copyUrlToImage.put("arena/47.jpg", "ARENA.zip/ARENA/Swamp.47.full.jpg");
+        copyUrlToImage.put("arena/48.jpg", "ARENA.zip/ARENA/Mountain.48.full.jpg");
+        copyUrlToImage.put("arena/5.jpg", "ARENA.zip/ARENA/Forest.5.full.jpg");
+        copyUrlToImage.put("arena/50.jpg", "ARENA.zip/ARENA/Skirk Marauder.full.jpg");
+        copyUrlToImage.put("arena/51.jpg", "ARENA.zip/ARENA/Elvish Aberration.full.jpg");
+        copyUrlToImage.put("arena/52.jpg", "ARENA.zip/ARENA/Bonesplitter.full.jpg");
+        copyUrlToImage.put("arena/53.jpg", "ARENA.zip/ARENA/Plains.53.full.jpg");
+        copyUrlToImage.put("arena/54.jpg", "ARENA.zip/ARENA/Island.54.full.jpg");
+        copyUrlToImage.put("arena/55.jpg", "ARENA.zip/ARENA/Swamp.55.full.jpg");
+        copyUrlToImage.put("arena/56.jpg", "ARENA.zip/ARENA/Mountain.56.full.jpg");
+        copyUrlToImage.put("arena/57.jpg", "ARENA.zip/ARENA/Forest.57.full.jpg");
+        copyUrlToImage.put("arena/58.jpg", "ARENA.zip/ARENA/Darksteel Ingot.full.jpg");
+        copyUrlToImage.put("arena/59.jpg", "ARENA.zip/ARENA/Serum Visions.full.jpg");
+        copyUrlToImage.put("arena/6.jpg", "ARENA.zip/ARENA/Disenchant.full.jpg");
         copyUrlToImage.put("arena/60.jpg", "ARENA.zip/ARENA/Glacial Ray.full.jpg");
+        copyUrlToImage.put("arena/61.jpg", "ARENA.zip/ARENA/Circle of Protection Art.full.jpg");
+        copyUrlToImage.put("arena/62.jpg", "ARENA.zip/ARENA/Mise.full.jpg");
+        copyUrlToImage.put("arena/63.jpg", "ARENA.zip/ARENA/Booster Tutor.full.jpg");
         copyUrlToImage.put("arena/64.jpg", "ARENA.zip/ARENA/Goblin Mime.full.jpg");
         copyUrlToImage.put("arena/65.jpg", "ARENA.zip/ARENA/Granny's Payback.full.jpg");
-        copyUrlToImage.put("arena/2.jpg", "ARENA.zip/ARENA/Island.2.full.jpg");
+        copyUrlToImage.put("arena/66.jpg", "ARENA.zip/ARENA/Ashnod's Coupon.full.jpg");
-        copyUrlToImage.put("arena/9.jpg", "ARENA.zip/ARENA/Island.9.full.jpg");
-        copyUrlToImage.put("arena/24.jpg", "ARENA.zip/ARENA/Island.24.full.jpg");
-        copyUrlToImage.put("arena/33.jpg", "ARENA.zip/ARENA/Island.33.full.jpg");
-        copyUrlToImage.put("arena/39.jpg", "ARENA.zip/ARENA/Island.39.full.jpg");
-        copyUrlToImage.put("arena/46.jpg", "ARENA.zip/ARENA/Island.46.full.jpg");
-        copyUrlToImage.put("arena/54.jpg", "ARENA.zip/ARENA/Island.54.full.jpg");
-        copyUrlToImage.put("arena/68.jpg", "ARENA.zip/ARENA/Island.68.full.jpg");
-        copyUrlToImage.put("arena/76.jpg", "ARENA.zip/ARENA/Island.76.full.jpg");
-        copyUrlToImage.put("arena/16.jpg", "ARENA.zip/ARENA/Karn, Silver Golem.full.jpg");
-        copyUrlToImage.put("arena/41.jpg", "ARENA.zip/ARENA/Man-o'-War.full.jpg");
-        copyUrlToImage.put("arena/44.jpg", "ARENA.zip/ARENA/Mana Leak.full.jpg");
-        copyUrlToImage.put("arena/62.jpg", "ARENA.zip/ARENA/Mise.full.jpg");
-        copyUrlToImage.put("arena/4.jpg", "ARENA.zip/ARENA/Mountain.4.full.jpg");
-        copyUrlToImage.put("arena/11.jpg", "ARENA.zip/ARENA/Mountain.11.full.jpg");
-        copyUrlToImage.put("arena/26.jpg", "ARENA.zip/ARENA/Mountain.26.full.jpg");
-        copyUrlToImage.put("arena/35.jpg", "ARENA.zip/ARENA/Mountain.35.full.jpg");
-        copyUrlToImage.put("arena/48.jpg", "ARENA.zip/ARENA/Mountain.48.full.jpg");
-        copyUrlToImage.put("arena/56.jpg", "ARENA.zip/ARENA/Mountain.56.full.jpg");
-        copyUrlToImage.put("arena/70.jpg", "ARENA.zip/ARENA/Mountain.70.full.jpg");
-        copyUrlToImage.put("arena/78.jpg", "ARENA.zip/ARENA/Mountain.78.full.jpg");
-        copyUrlToImage.put("arena/73.jpg", "ARENA.zip/ARENA/Okina Nightwatch.full.jpg");
-        copyUrlToImage.put("arena/20.jpg", "ARENA.zip/ARENA/Pillage.full.jpg");
-        copyUrlToImage.put("arena/1.jpg", "ARENA.zip/ARENA/Plains.1.full.jpg");
-        copyUrlToImage.put("arena/8.jpg", "ARENA.zip/ARENA/Plains.8.full.jpg");
-        copyUrlToImage.put("arena/23.jpg", "ARENA.zip/ARENA/Plains.23.full.jpg");
-        copyUrlToImage.put("arena/32.jpg", "ARENA.zip/ARENA/Plains.32.full.jpg");
-        copyUrlToImage.put("arena/45.jpg", "ARENA.zip/ARENA/Plains.45.full.jpg");
-        copyUrlToImage.put("arena/53.jpg", "ARENA.zip/ARENA/Plains.53.full.jpg");
         copyUrlToImage.put("arena/67.jpg", "ARENA.zip/ARENA/Plains.67.full.jpg");
-        copyUrlToImage.put("arena/75.jpg", "ARENA.zip/ARENA/Plains.75.full.jpg");
+        copyUrlToImage.put("arena/68.jpg", "ARENA.zip/ARENA/Island.68.full.jpg");
-        copyUrlToImage.put("arena/13.jpg", "ARENA.zip/ARENA/Pouncing Jaguar.full.jpg");
-        copyUrlToImage.put("arena/15.jpg", "ARENA.zip/ARENA/Rewind.full.jpg");
-        copyUrlToImage.put("arena/59.jpg", "ARENA.zip/ARENA/Serum Visions.full.jpg");
-        copyUrlToImage.put("arena/50.jpg", "ARENA.zip/ARENA/Skirk Marauder.full.jpg");
-        copyUrlToImage.put("arena/14.jpg", "ARENA.zip/ARENA/Skittering Skirge.full.jpg");
-        copyUrlToImage.put("arena/74.jpg", "ARENA.zip/ARENA/Skyknight Legionnaire.full.jpg");
-        copyUrlToImage.put("arena/22.jpg", "ARENA.zip/ARENA/Stupor.full.jpg");
-        copyUrlToImage.put("arena/83.jpg", "ARENA.zip/ARENA/Surging Flame.full.jpg");
-        copyUrlToImage.put("arena/3.jpg", "ARENA.zip/ARENA/Swamp.3.full.jpg");
-        copyUrlToImage.put("arena/10.jpg", "ARENA.zip/ARENA/Swamp.10.full.jpg");
-        copyUrlToImage.put("arena/25.jpg", "ARENA.zip/ARENA/Swamp.25.full.jpg");
-        copyUrlToImage.put("arena/34.jpg", "ARENA.zip/ARENA/Swamp.34.full.jpg");
-        copyUrlToImage.put("arena/47.jpg", "ARENA.zip/ARENA/Swamp.47.full.jpg");
-        copyUrlToImage.put("arena/55.jpg", "ARENA.zip/ARENA/Swamp.55.full.jpg");
         copyUrlToImage.put("arena/69.jpg", "ARENA.zip/ARENA/Swamp.69.full.jpg");
+        copyUrlToImage.put("arena/7.jpg", "ARENA.zip/ARENA/Fireball.full.jpg");
+        copyUrlToImage.put("arena/70.jpg", "ARENA.zip/ARENA/Mountain.70.full.jpg");
+        copyUrlToImage.put("arena/71.jpg", "ARENA.zip/ARENA/Forest.71.full.jpg");
+        copyUrlToImage.put("arena/72.jpg", "ARENA.zip/ARENA/Genju of the Spires.full.jpg");
+        copyUrlToImage.put("arena/73.jpg", "ARENA.zip/ARENA/Okina Nightwatch.full.jpg");
+        copyUrlToImage.put("arena/74.jpg", "ARENA.zip/ARENA/Skyknight Legionnaire.full.jpg");
+        copyUrlToImage.put("arena/75.jpg", "ARENA.zip/ARENA/Plains.75.full.jpg");
+        copyUrlToImage.put("arena/76.jpg", "ARENA.zip/ARENA/Island.76.full.jpg");
         copyUrlToImage.put("arena/77.jpg", "ARENA.zip/ARENA/Swamp.77.full.jpg");
-        copyUrlToImage.put("arena/18.jpg", "ARENA.zip/ARENA/Uktabi Orangutan.full.jpg");
+        copyUrlToImage.put("arena/78.jpg", "ARENA.zip/ARENA/Mountain.78.full.jpg");
+        copyUrlToImage.put("arena/8.jpg", "ARENA.zip/ARENA/Plains.8.full.jpg");
+        copyUrlToImage.put("arena/80.jpg", "ARENA.zip/ARENA/Castigate.full.jpg");
         copyUrlToImage.put("arena/81.jpg", "ARENA.zip/ARENA/Wee Dragonauts.full.jpg");
+        copyUrlToImage.put("arena/82.jpg", "ARENA.zip/ARENA/Coiling Oracle.full.jpg");
+        copyUrlToImage.put("arena/83.jpg", "ARENA.zip/ARENA/Surging Flame.full.jpg");
+        copyUrlToImage.put("arena/9.jpg", "ARENA.zip/ARENA/Island.9.full.jpg");
         copyUrlToImage.put("euro/1.jpg", "EURO.zip/EURO/Forest.1.full.jpg");
+        copyUrlToImage.put("euro/10.jpg", "EURO.zip/EURO/Swamp.10.full.jpg");
+        copyUrlToImage.put("euro/11.jpg", "EURO.zip/EURO/Forest.11.full.jpg");
+        copyUrlToImage.put("euro/12.jpg", "EURO.zip/EURO/Island.12.full.jpg");
+        copyUrlToImage.put("euro/13.jpg", "EURO.zip/EURO/Mountain.13.full.jpg");
+        copyUrlToImage.put("euro/14.jpg", "EURO.zip/EURO/Plains.14.full.jpg");
+        copyUrlToImage.put("euro/15.jpg", "EURO.zip/EURO/Swamp.15.full.jpg");
         copyUrlToImage.put("euro/2.jpg", "EURO.zip/EURO/Island.2.full.jpg");
         copyUrlToImage.put("euro/3.jpg", "EURO.zip/EURO/Mountain.3.full.jpg");
         copyUrlToImage.put("euro/4.jpg", "EURO.zip/EURO/Plains.4.full.jpg");
@@ -616,12 +655,6 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("euro/7.jpg", "EURO.zip/EURO/Island.7.full.jpg");
         copyUrlToImage.put("euro/8.jpg", "EURO.zip/EURO/Mountain.8.full.jpg");
         copyUrlToImage.put("euro/9.jpg", "EURO.zip/EURO/Plains.9.full.jpg");
-        copyUrlToImage.put("euro/10.jpg", "EURO.zip/EURO/Swamp.10.full.jpg");
-        copyUrlToImage.put("euro/11.jpg", "EURO.zip/EURO/Forest.11.full.jpg");
-        copyUrlToImage.put("euro/12.jpg", "EURO.zip/EURO/Island.12.full.jpg");
-        copyUrlToImage.put("euro/13.jpg", "EURO.zip/EURO/Mountain.13.full.jpg");
-        copyUrlToImage.put("euro/14.jpg", "EURO.zip/EURO/Plains.14.full.jpg");
-        copyUrlToImage.put("euro/15.jpg", "EURO.zip/EURO/Swamp.15.full.jpg");
         copyUrlToImage.put("exp/1.jpg", "EXP.zip/EXP/Prairie Stream.full.jpg");
         copyUrlToImage.put("exp/10.jpg", "EXP.zip/EXP/Temple Garden.full.jpg");
         copyUrlToImage.put("exp/11.jpg", "EXP.zip/EXP/Godless Shrine.full.jpg");
@@ -742,7 +775,6 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("fnmp/182.jpg", "FNMP.zip/FNMP/Path to Exile.full.jpg");
         copyUrlToImage.put("fnmp/183.jpg", "FNMP.zip/FNMP/Serum Visions.full.jpg");
         copyUrlToImage.put("fnmp/184.jpg", "FNMP.zip/FNMP/Orator of Ojutai.full.jpg");
-        copyUrlToImage.put("fnmp/185.jpg", "FNMP.zip/FNMP/Ultimate Price.full.jpg");
         copyUrlToImage.put("fnmp/186.jpg", "FNMP.zip/FNMP/Roast.full.jpg");
         copyUrlToImage.put("fnmp/187.jpg", "FNMP.zip/FNMP/Anticipate.full.jpg");
         copyUrlToImage.put("fnmp/188.jpg", "FNMP.zip/FNMP/Nissa's Pilgrimage.full.jpg");
@@ -1378,116 +1410,40 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("ptc/136.jpg", "PTC.zip/PTC/Flamerush Rider.full.jpg");
         copyUrlToImage.put("ptc/137.jpg", "PTC.zip/PTC/Flamewake Phoenix.full.jpg");
         copyUrlToImage.put("ptc/138.jpg", "PTC.zip/PTC/Jeskai Infiltrator.full.jpg");
-        copyUrlToImage.put("ptc/139.jpg", "PTC.zip/PTC/Kolaghan, the Storm's Fury.full.jpg");
         copyUrlToImage.put("ptc/14.jpg", "PTC.zip/PTC/Fungal Shambler.full.jpg");
-        copyUrlToImage.put("ptc/140.jpg", "PTC.zip/PTC/Mardu Strike Leader.full.jpg");
         copyUrlToImage.put("ptc/141.jpg", "PTC.zip/PTC/Mastery of the Unseen.full.jpg");
         copyUrlToImage.put("ptc/142.jpg", "PTC.zip/PTC/Ojutai, Soul of Winter.full.jpg");
         copyUrlToImage.put("ptc/143.jpg", "PTC.zip/PTC/Rally the Ancestors.full.jpg");
-        copyUrlToImage.put("ptc/144.jpg", "PTC.zip/PTC/Sage-Eye Avengers.full.jpg");
         copyUrlToImage.put("ptc/145.jpg", "PTC.zip/PTC/Sandsteppe Mastodon.full.jpg");
-        copyUrlToImage.put("ptc/146.jpg", "PTC.zip/PTC/Shaman of the Great Hunt.full.jpg");
         copyUrlToImage.put("ptc/147.jpg", "PTC.zip/PTC/Shamanic Revelation.full.jpg");
-        copyUrlToImage.put("ptc/148.jpg", "PTC.zip/PTC/Shu Yun, the Silent Tempest.full.jpg");
-        copyUrlToImage.put("ptc/149.jpg", "PTC.zip/PTC/Silumgar, the Drifting Death.full.jpg");
         copyUrlToImage.put("ptc/15.jpg", "PTC.zip/PTC/Stone-Tongue Basilisk.full.jpg");
         copyUrlToImage.put("ptc/150.jpg", "PTC.zip/PTC/Soulfire Grand Master.full.jpg");
         copyUrlToImage.put("ptc/151.jpg", "PTC.zip/PTC/Soulflayer.full.jpg");
         copyUrlToImage.put("ptc/152.jpg", "PTC.zip/PTC/Supplant Form.full.jpg");
         copyUrlToImage.put("ptc/153.jpg", "PTC.zip/PTC/Tasigur, the Golden Fang.full.jpg");
         copyUrlToImage.put("ptc/154.jpg", "PTC.zip/PTC/Torrent Elemental.full.jpg");
-        copyUrlToImage.put("ptc/155.jpg", "PTC.zip/PTC/Warden of the First Tree.full.jpg");
-        copyUrlToImage.put("ptc/156.jpg", "PTC.zip/PTC/Wildcall.full.jpg");
         copyUrlToImage.put("ptc/157.jpg", "PTC.zip/PTC/Yasova Dragonclaw.full.jpg");
-        copyUrlToImage.put("ptc/158.jpg", "PTC.zip/PTC/Anafenza, Kin-Tree Spirit.full.jpg");
-        copyUrlToImage.put("ptc/159.jpg", "PTC.zip/PTC/Arashin Foremost.full.jpg");
         copyUrlToImage.put("ptc/16.jpg", "PTC.zip/PTC/Laquatus's Champion.full.jpg");
-        copyUrlToImage.put("ptc/160.jpg", "PTC.zip/PTC/Arashin Sovereign.full.jpg");
-        copyUrlToImage.put("ptc/161.jpg", "PTC.zip/PTC/Atarka's Command.full.jpg");
-        copyUrlToImage.put("ptc/162.jpg", "PTC.zip/PTC/Avatar of the Resolute.full.jpg");
-        copyUrlToImage.put("ptc/163.jpg", "PTC.zip/PTC/Blessed Reincarnation.full.jpg");
-        copyUrlToImage.put("ptc/164.jpg", "PTC.zip/PTC/Blood-Chin Fanatic.full.jpg");
-        copyUrlToImage.put("ptc/165.jpg", "PTC.zip/PTC/Boltwing Marauder.full.jpg");
         copyUrlToImage.put("ptc/166.jpg", "PTC.zip/PTC/Crater Elemental.full.jpg");
-        copyUrlToImage.put("ptc/167.jpg", "PTC.zip/PTC/Damnable Pact.full.jpg");
         copyUrlToImage.put("ptc/168.jpg", "PTC.zip/PTC/Deathbringer Regent.full.jpg");
-        copyUrlToImage.put("ptc/169.jpg", "PTC.zip/PTC/Den Protector.full.jpg");
         copyUrlToImage.put("ptc/17.jpg", "PTC.zip/PTC/Glory.full.jpg");
-        copyUrlToImage.put("ptc/170.jpg", "PTC.zip/PTC/Dragonlord Atarka.full.jpg");
-        copyUrlToImage.put("ptc/171.jpg", "PTC.zip/PTC/Dragonlord Dromoka.full.jpg");
-        copyUrlToImage.put("ptc/172.jpg", "PTC.zip/PTC/Dragonlord Kolaghan.full.jpg");
-        copyUrlToImage.put("ptc/173.jpg", "PTC.zip/PTC/Dragonlord Ojutai.full.jpg");
-        copyUrlToImage.put("ptc/174.jpg", "PTC.zip/PTC/Dragonlord Silumgar.full.jpg");
-        copyUrlToImage.put("ptc/175.jpg", "PTC.zip/PTC/Dromoka's Command.full.jpg");
-        copyUrlToImage.put("ptc/176.jpg", "PTC.zip/PTC/Foe-Razer Regent.full.jpg");
-        copyUrlToImage.put("ptc/177.jpg", "PTC.zip/PTC/Harbinger of the Hunt.full.jpg");
-        copyUrlToImage.put("ptc/178.jpg", "PTC.zip/PTC/Hidden Dragonslayer.full.jpg");
-        copyUrlToImage.put("ptc/179.jpg", "PTC.zip/PTC/Icefall Regent.full.jpg");
         copyUrlToImage.put("ptc/18.jpg", "PTC.zip/PTC/Silent Specter.full.jpg");
-        copyUrlToImage.put("ptc/180.jpg", "PTC.zip/PTC/Ire Shaman.full.jpg");
         copyUrlToImage.put("ptc/181.jpg", "PTC.zip/PTC/Kolaghan's Command.full.jpg");
-        copyUrlToImage.put("ptc/182.jpg", "PTC.zip/PTC/Living Lore.full.jpg");
         copyUrlToImage.put("ptc/183.jpg", "PTC.zip/PTC/Myth Realized.full.jpg");
-        copyUrlToImage.put("ptc/184.jpg", "PTC.zip/PTC/Necromaster Dragon.full.jpg");
         copyUrlToImage.put("ptc/185.jpg", "PTC.zip/PTC/Ojutai's Command.full.jpg");
-        copyUrlToImage.put("ptc/186.jpg", "PTC.zip/PTC/Pitiless Horde.full.jpg");
-        copyUrlToImage.put("ptc/187.jpg", "PTC.zip/PTC/Pristine Skywise.full.jpg");
-        copyUrlToImage.put("ptc/188.jpg", "PTC.zip/PTC/Profaner of the Dead.full.jpg");
-        copyUrlToImage.put("ptc/189.jpg", "PTC.zip/PTC/Sidisi, Undead Vizier.full.jpg");
         copyUrlToImage.put("ptc/19.jpg", "PTC.zip/PTC/Feral Throwback.full.jpg");
-        copyUrlToImage.put("ptc/190.jpg", "PTC.zip/PTC/Silumgar Assassin.full.jpg");
-        copyUrlToImage.put("ptc/191.jpg", "PTC.zip/PTC/Silumgar's Command.full.jpg");
-        copyUrlToImage.put("ptc/192.jpg", "PTC.zip/PTC/Stratus Dancer.full.jpg");
-        copyUrlToImage.put("ptc/193.jpg", "PTC.zip/PTC/Sunscorch Regent.full.jpg");
-        copyUrlToImage.put("ptc/194.jpg", "PTC.zip/PTC/Surrak, the Hunt Caller.full.jpg");
-        copyUrlToImage.put("ptc/195.jpg", "PTC.zip/PTC/Thunderbreak Regent.full.jpg");
         copyUrlToImage.put("ptc/196.jpg", "PTC.zip/PTC/Volcanic Vision.full.jpg");
-        copyUrlToImage.put("ptc/197.jpg", "PTC.zip/PTC/Zurgo Bellstriker.full.jpg");
         copyUrlToImage.put("ptc/198.jpg", "PTC.zip/PTC/Abbot of Keral Keep.full.jpg");
-        copyUrlToImage.put("ptc/199.jpg", "PTC.zip/PTC/Alhammarret, High Arbiter.full.jpg");
         copyUrlToImage.put("ptc/2.jpg", "PTC.zip/PTC/Revenant.full.jpg");
         copyUrlToImage.put("ptc/20.jpg", "PTC.zip/PTC/Soul Collector.full.jpg");
-        copyUrlToImage.put("ptc/200.jpg", "PTC.zip/PTC/Chandra's Ignition.full.jpg");
-        copyUrlToImage.put("ptc/201.jpg", "PTC.zip/PTC/Chandra, Fire of Kaladesh.full.jpg");
-        copyUrlToImage.put("ptc/202.jpg", "PTC.zip/PTC/Dark Petition.full.jpg");
-        copyUrlToImage.put("ptc/203.jpg", "PTC.zip/PTC/Despoiler of Souls.full.jpg");
-        copyUrlToImage.put("ptc/204.jpg", "PTC.zip/PTC/Dwynen, Gilt-Leaf Daen.full.jpg");
-        copyUrlToImage.put("ptc/205.jpg", "PTC.zip/PTC/Embermaw Hellion.full.jpg");
-        copyUrlToImage.put("ptc/206.jpg", "PTC.zip/PTC/Evolutionary Leap.full.jpg");
-        copyUrlToImage.put("ptc/207.jpg", "PTC.zip/PTC/Exquisite Firecraft.full.jpg");
-        copyUrlToImage.put("ptc/208.jpg", "PTC.zip/PTC/Gaea's Revenge.full.jpg");
-        copyUrlToImage.put("ptc/209.jpg", "PTC.zip/PTC/Gideon's Phalanx.full.jpg");
         copyUrlToImage.put("ptc/21.jpg", "PTC.zip/PTC/Sword of Kaldra.full.jpg");
         copyUrlToImage.put("ptc/210.jpg", "PTC.zip/PTC/Gilt-Leaf Winnower.full.jpg");
-        copyUrlToImage.put("ptc/211.jpg", "PTC.zip/PTC/Goblin Piledriver.full.jpg");
         copyUrlToImage.put("ptc/212.jpg", "PTC.zip/PTC/Graveblade Marauder.full.jpg");
-        copyUrlToImage.put("ptc/213.jpg", "PTC.zip/PTC/Harbinger of the Tides.full.jpg");
-        copyUrlToImage.put("ptc/214.jpg", "PTC.zip/PTC/Hixus, Prison Warden.full.jpg");
-        copyUrlToImage.put("ptc/215.jpg", "PTC.zip/PTC/Honored Hierarch.full.jpg");
         copyUrlToImage.put("ptc/216.jpg", "PTC.zip/PTC/Jace, Vryn's Prodigy.full.jpg");
-        copyUrlToImage.put("ptc/217.jpg", "PTC.zip/PTC/Knight of the White Orchid.full.jpg");
-        copyUrlToImage.put("ptc/218.jpg", "PTC.zip/PTC/Kothophed, Soul Hoarder.full.jpg");
-        copyUrlToImage.put("ptc/219.jpg", "PTC.zip/PTC/Kytheon's Irregulars.full.jpg");
         copyUrlToImage.put("ptc/22.jpg", "PTC.zip/PTC/Shield of Kaldra.full.jpg");
-        copyUrlToImage.put("ptc/220.jpg", "PTC.zip/PTC/Kytheon, Hero of Akros.full.jpg");
-        copyUrlToImage.put("ptc/221.jpg", "PTC.zip/PTC/Languish.full.jpg");
-        copyUrlToImage.put("ptc/222.jpg", "PTC.zip/PTC/Liliana, Heretical Healer.full.jpg");
-        copyUrlToImage.put("ptc/223.jpg", "PTC.zip/PTC/Managorger Hydra.full.jpg");
-        copyUrlToImage.put("ptc/224.jpg", "PTC.zip/PTC/Mizzium Meddler.full.jpg");
         copyUrlToImage.put("ptc/225.jpg", "PTC.zip/PTC/Nissa's Revelation.full.jpg");
-        copyUrlToImage.put("ptc/226.jpg", "PTC.zip/PTC/Nissa, Vastwood Seer.full.jpg");
         copyUrlToImage.put("ptc/227.jpg", "PTC.zip/PTC/Outland Colossus.full.jpg");
-        copyUrlToImage.put("ptc/228.jpg", "PTC.zip/PTC/Pia and Kiran Nalaar.full.jpg");
-        copyUrlToImage.put("ptc/229.jpg", "PTC.zip/PTC/Priest of the Blood Rite.full.jpg");
         copyUrlToImage.put("ptc/23.jpg", "PTC.zip/PTC/Helm of Kaldra.full.jpg");
-        copyUrlToImage.put("ptc/230.jpg", "PTC.zip/PTC/Relic Seeker.full.jpg");
-        copyUrlToImage.put("ptc/231.jpg", "PTC.zip/PTC/Scab-Clan Berserker.full.jpg");
-        copyUrlToImage.put("ptc/232.jpg", "PTC.zip/PTC/Soulblade Djinn.full.jpg");
-        copyUrlToImage.put("ptc/233.jpg", "PTC.zip/PTC/Talent of the Telepath.full.jpg");
-        copyUrlToImage.put("ptc/234.jpg", "PTC.zip/PTC/Thopter Spy Network.full.jpg");
-        copyUrlToImage.put("ptc/235.jpg", "PTC.zip/PTC/Tragic Arrogance.full.jpg");
-        copyUrlToImage.put("ptc/236.jpg", "PTC.zip/PTC/Vryn Wingmare.full.jpg");
-        copyUrlToImage.put("ptc/237.jpg", "PTC.zip/PTC/Willbreaker.full.jpg");
         copyUrlToImage.put("ptc/238.jpg", "PTC.zip/PTC/Akoum Firebird.full.jpg");
         copyUrlToImage.put("ptc/239.jpg", "PTC.zip/PTC/Akoum Hellkite.full.jpg");
         copyUrlToImage.put("ptc/24.jpg", "PTC.zip/PTC/Ryusei, the Falling Star.full.jpg");
@@ -1522,9 +1478,7 @@ public class GrabbagImageSource implements CardImageSource {
         copyUrlToImage.put("ptc/266.jpg", "PTC.zip/PTC/Gruesome Slaughter.full.jpg");
         copyUrlToImage.put("ptc/267.jpg", "PTC.zip/PTC/Guardian of Tazeem.full.jpg");
         copyUrlToImage.put("ptc/268.jpg", "PTC.zip/PTC/Guul Draz Overseer.full.jpg");
-        copyUrlToImage.put("ptc/269.jpg", "PTC.zip/PTC/Hero of Goma Fada.full.jpg");
         copyUrlToImage.put("ptc/27.jpg", "PTC.zip/PTC/Gleancrawler.full.jpg");
-        copyUrlToImage.put("ptc/270.jpg", "PTC.zip/PTC/Kiora, Master of the Depths.full.jpg");
         copyUrlToImage.put("ptc/271.jpg", "PTC.zip/PTC/Lantern Scout.full.jpg");
         copyUrlToImage.put("ptc/272.jpg", "PTC.zip/PTC/Lumbering Falls.full.jpg");
         copyUrlToImage.put("ptc/273.jpg", "PTC.zip/PTC/March from the Tomb.full.jpg");
@@ -1740,8 +1694,9 @@ public class GrabbagImageSource implements CardImageSource {
         }
     }
 
-    private void doPause(String httpImageUrl) {
+    @Override
-        if (!httpImageUrl.startsWith("MTG")) {
+    public void doPause(String httpImageUrl) {
+        if (!httpImageUrl.startsWith("/MTG")) {
             try {
                 Thread.sleep(2000);
             } catch (InterruptedException ex) {

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java

@@ -226,4 +226,8 @@ public class MagicCardsImageSource implements CardImageSource {
     public Boolean isTokenSource() {
         return true;
     }
+    
+    @Override
+    public void doPause(String httpImageUrl) {
+    }
 }

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgImageSource.java

@@ -115,4 +115,8 @@ public class MtgImageSource implements CardImageSource {
     public Boolean isTokenSource() {
         return false;
     }
+
+    @Override
+    public void doPause(String httpImageUrl) {
+    }
 }

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgOnlTokensImageSource.java

@@ -381,4 +381,8 @@ public class MtgOnlTokensImageSource implements CardImageSource {
     public Boolean isTokenSource() {
         return true;
     }
+    
+    @Override
+    public void doPause(String httpImageUrl) {
+    }
 }

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java

@@ -254,4 +254,8 @@ public class MythicspoilerComSource implements CardImageSource {
     public Boolean isTokenSource() {
         return false;
     }
+    
+    @Override
+    public void doPause(String httpImageUrl) {
+    }
 }

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/TokensMtgImageSource.java

@@ -339,4 +339,8 @@ public class TokensMtgImageSource implements CardImageSource {
     public Boolean isTokenSource() {
         return true;
     }
+    
+    @Override
+    public void doPause(String httpImageUrl) {
+    }
 }

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java

@@ -521,4 +521,8 @@ public class WizardCardsImageSource implements CardImageSource {
     public Boolean isTokenSource() {
         return false;
     }
+    
+    @Override
+    public void doPause(String httpImageUrl) {
+    }
 }

Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java

@@ -654,6 +654,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
                 if (temporaryFile != null && temporaryFile.length() > 100) {
                     useTempFile = true;
                 } else {
+                    cardImageSource.doPause(url.getPath());
                     httpConn = url.openConnection(p);
                     setUpConnection(httpConn);
                     httpConn.connect();