diff --git a/res/cardsfolder/a/abu_jafar.txt b/res/cardsfolder/a/abu_jafar.txt
index c21cd1309e1..c19588a739c 100644
--- a/res/cardsfolder/a/abu_jafar.txt
+++ b/res/cardsfolder/a/abu_jafar.txt
@@ -7,6 +7,7 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature.blockingSource,Creature.blockedBySource | NoRegen$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abu_jafar.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/55.jpg
 Oracle:When Abu Ja'far dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/57.jpg
+SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/55.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/active_volcano.txt b/res/cardsfolder/a/active_volcano.txt
index 4bfe46e41c0..458440f1190 100644
--- a/res/cardsfolder/a/active_volcano.txt
+++ b/res/cardsfolder/a/active_volcano.txt
@@ -8,6 +8,7 @@ SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/active_volcano.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/130.jpg
 Oracle:Choose one - Destroy target blue permanent; or return target Island to its owner's hand.
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/43.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/130.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/akron_legionnaire.txt b/res/cardsfolder/a/akron_legionnaire.txt
index 3caf63072cb..5372781cf13 100644
--- a/res/cardsfolder/a/akron_legionnaire.txt
+++ b/res/cardsfolder/a/akron_legionnaire.txt
@@ -6,7 +6,8 @@ PT:8/4
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+nonArtifact+notnamedAkron Legionnaire | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Except for creatures named CARDNAME and artifact creatures, creatures you control can't attack.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/akron_legionnaire.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/278.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/170.jpg
 Oracle:Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack.
+SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/278.jpg
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/58.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/170.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/aladdin.txt b/res/cardsfolder/a/aladdin.txt
index 100818e15a9..5bdcdde0ba4 100644
--- a/res/cardsfolder/a/aladdin.txt
+++ b/res/cardsfolder/a/aladdin.txt
@@ -6,6 +6,7 @@ PT:1/1
 A:AB$ GainControl | Cost$ 1 R R T | ValidTgts$ Artifact | TgtPrompt$ Select target artifact. | LoseControl$ LeavesPlay,LoseControl | SpellDescription$ Gain control of target artifact for as long as you control CARDNAME.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aladdin.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/42.jpg
 Oracle:{1}{R}{R}, {T}: Gain control of target artifact for as long as you control Aladdin.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/44.jpg
+SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/42.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/angelic_voices.txt b/res/cardsfolder/a/angelic_voices.txt
index 9df11e2b8ff..8ebb328ebcc 100644
--- a/res/cardsfolder/a/angelic_voices.txt
+++ b/res/cardsfolder/a/angelic_voices.txt
@@ -7,6 +7,7 @@ SVar:X:Count$Valid Creature.nonWhite+nonArtifact+YouCtrl
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_voices.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/173.jpg
 Oracle:Creatures you control get +1/+1 as long as you control no nonartifact, nonwhite creatures.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/59.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/173.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/arcades_sabboth.txt b/res/cardsfolder/a/arcades_sabboth.txt
index 194e498eb1f..e8ab9bd2ab9 100644
--- a/res/cardsfolder/a/arcades_sabboth.txt
+++ b/res/cardsfolder/a/arcades_sabboth.txt
@@ -9,6 +9,7 @@ S:Mode$ Continuous | Affected$ Creature.notattacking+untapped+YouCtrl | AddTough
 A:AB$ Pump | Cost$ W | NumDef$ +1 | SpellDescription$ CARDNAME gets +0/+1 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arcades_sabboth.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/258.jpg
 Oracle:Flying\nAt the beginning of your upkeep, sacrifice Arcades Sabboth unless you pay {G}{W}{U}.\nEach untapped creature you control gets +0/+2 as long as it's not attacking.\n{W}: Arcades Sabboth gets +0/+1 until end of turn.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/106.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/258.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/arena_of_the_ancients.txt b/res/cardsfolder/a/arena_of_the_ancients.txt
index f6efd21324c..cabfc02ec1b 100644
--- a/res/cardsfolder/a/arena_of_the_ancients.txt
+++ b/res/cardsfolder/a/arena_of_the_ancients.txt
@@ -8,6 +8,7 @@ SVar:TrigTapAll:AB$TapAll | Cost$ 0 | ValidCards$ Creature.Legendary
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arena_of_the_ancients.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/215.jpg
 Oracle:Legendary creatures don't untap during their controllers' untap steps.\nWhen Arena of the Ancients enters the battlefield, tap all legendary creatures.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/71.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/215.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/argothian_pixies.txt b/res/cardsfolder/a/argothian_pixies.txt
index 52d2bff57b6..22d777ddf0b 100644
--- a/res/cardsfolder/a/argothian_pixies.txt
+++ b/res/cardsfolder/a/argothian_pixies.txt
@@ -7,6 +7,7 @@ K:PreventAllDamageBy Artifact.Creature
 K:CantBeBlockedBy Artifact.Creature
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/argothian_pixies.jpg
-SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/59.jpg
 Oracle:Argothian Pixies can't be blocked by artifact creatures.\nPrevent all damage that would be dealt to Argothian Pixies by artifact creatures.
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/29.jpg
+SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/59.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/ashnods_altar.txt b/res/cardsfolder/a/ashnods_altar.txt
index eb00eabfd72..67364a04a56 100644
--- a/res/cardsfolder/a/ashnods_altar.txt
+++ b/res/cardsfolder/a/ashnods_altar.txt
@@ -6,8 +6,9 @@ A:AB$ Mana | Cost$ Sac<1/Creature>  | Produced$ 1 | Amount$ 2 | SpellDescription
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ashnods_altar.jpg
+Oracle:Sacrifice a creature: Add {2} to your mana pool.
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/349.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/72.jpg
 SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/274.jpg
 SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/3.jpg
-Oracle:Sacrifice a creature: Add {2} to your mana pool.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/ashnods_transmogrant.txt b/res/cardsfolder/a/ashnods_transmogrant.txt
index 58f245b3fd3..fb42610d10b 100644
--- a/res/cardsfolder/a/ashnods_transmogrant.txt
+++ b/res/cardsfolder/a/ashnods_transmogrant.txt
@@ -6,7 +6,8 @@ A:AB$ PutCounter | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.nonArtifact | T
 SVar:DBAnimate:DB$Animate | Defined$ Targeted | Types$ Artifact | Permanent$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ashnods_transmogrant.jpg
-SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/350.jpg
-SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/5.jpg
 Oracle:{T}, Sacrifice Ashnod's Transmogrant: Put a +1/+1 counter on target nonartifact creature. That creature becomes an artifact in addition to its other types.
+SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/350.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/73.jpg
+SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/5.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/axelrod_gunnarson.txt b/res/cardsfolder/a/axelrod_gunnarson.txt
index 6cda686a9c9..c189dc0a761 100644
--- a/res/cardsfolder/a/axelrod_gunnarson.txt
+++ b/res/cardsfolder/a/axelrod_gunnarson.txt
@@ -9,6 +9,7 @@ SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Sel
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/axelrod_gunnarson.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/259.jpg
 Oracle:Trample\nWhenever a creature dealt damage by Axelrod Gunnarson this turn dies, you gain 1 life and Axelrod deals 1 damage to target player.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/107.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/259.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/a/azure_drake.txt b/res/cardsfolder/a/azure_drake.txt
index 1f1c938587d..0c6d75c3559 100644
--- a/res/cardsfolder/a/azure_drake.txt
+++ b/res/cardsfolder/a/azure_drake.txt
@@ -6,9 +6,10 @@ PT:2/4
 K:Flying
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83084.jpg
+Oracle:Flying
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/46.jpg
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/73.jpg
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/15.jpg
 SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/63.jpg
 SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/46.jpg
-Oracle:Flying
 End
\ No newline at end of file
diff --git a/res/cardsfolder/b/banshee.txt b/res/cardsfolder/b/banshee.txt
index ca164c47e99..7dfd4abce67 100644
--- a/res/cardsfolder/b/banshee.txt
+++ b/res/cardsfolder/b/banshee.txt
@@ -11,6 +11,7 @@ SVar:HalfXUp:Count$xPaid/HalfUp
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/banshee.jpg
-SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/2.jpg
 Oracle:{X}, {T}: Banshee deals half X damage, rounded down, to target creature or player, and half X damage, rounded up, to you.
+SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/2.jpg
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/1.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/b/barls_cage.txt b/res/cardsfolder/b/barls_cage.txt
index 41540cf7c00..1c2f60118d5 100644
--- a/res/cardsfolder/b/barls_cage.txt
+++ b/res/cardsfolder/b/barls_cage.txt
@@ -4,7 +4,8 @@ Types:Artifact
 Text:3: Target creature doesn't untap during its controller's next untap step.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barls_cage.jpg
+Oracle:{3}: Target creature doesn't untap during its controller's next untap step.
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/352.jpg
 SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/93.jpg
-Oracle:{3}: Target creature doesn't untap during its controller's next untap step.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/74.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/b/beasts_of_bogardan.txt b/res/cardsfolder/b/beasts_of_bogardan.txt
index c48dc86b20e..7c4a2a66d69 100644
--- a/res/cardsfolder/b/beasts_of_bogardan.txt
+++ b/res/cardsfolder/b/beasts_of_bogardan.txt
@@ -8,6 +8,7 @@ S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | Check
 SVar:X:Count$Valid Permanent.White+YouDontCtrl
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/beasts_of_bogardan.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/133.jpg
 Oracle:Protection from red\nBeasts of Bogardan gets +1/+1 as long as an opponent controls a white permanent.
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/45.jpg
+SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/133.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/b/blood_moon.txt b/res/cardsfolder/b/blood_moon.txt
index e5692f61f0e..26caeb036d1 100644
--- a/res/cardsfolder/b/blood_moon.txt
+++ b/res/cardsfolder/b/blood_moon.txt
@@ -6,8 +6,9 @@ S:Mode$ Continuous | Affected$ Land.nonBasic | AddType$ Mountain | RemoveSubType
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_moon.jpg
+Oracle:Nonbasic lands are Mountains.
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/178.jpg
 SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/57.jpg
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/46.jpg
 SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/176.jpg
-Oracle:Nonbasic lands are Mountains.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/b/bog_rats.txt b/res/cardsfolder/b/bog_rats.txt
index 17960e369e6..7c03ffff5af 100644
--- a/res/cardsfolder/b/bog_rats.txt
+++ b/res/cardsfolder/b/bog_rats.txt
@@ -6,8 +6,9 @@ PT:1/1
 K:CARDNAME can't be blocked by Walls.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bog_rats.jpg
+Oracle:Bog Rats can't be blocked by Walls.
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/8.jpg
 SetInfo:DRK|Common|http://magiccards.info/scans/en/dk/4.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/2.jpg
 SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/117.jpg
-Oracle:Bog Rats can't be blocked by Walls.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/b/book_of_rass.txt b/res/cardsfolder/b/book_of_rass.txt
index 7720fecfab2..db99d32115e 100644
--- a/res/cardsfolder/b/book_of_rass.txt
+++ b/res/cardsfolder/b/book_of_rass.txt
@@ -5,6 +5,7 @@ Text:no text
 A:AB$ Draw | Cost$ 2 PayLife<2> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/book_of_rass.jpg
-SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/95.jpg
 Oracle:{2}, Pay 2 life: Draw a card.
+SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/95.jpg
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/75.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/b/boomerang.txt b/res/cardsfolder/b/boomerang.txt
index 67109c020d6..1d7da4ccd79 100644
--- a/res/cardsfolder/b/boomerang.txt
+++ b/res/cardsfolder/b/boomerang.txt
@@ -5,13 +5,14 @@ Text:no text
 A:SP$ ChangeZone | Cost$ U U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boomerang.jpg
+Oracle:Return target permanent to its owner's hand.
 SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/63.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/48.jpg
-SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/75.jpg
 SetInfo:7ED|Common|http://magiccards.info/scans/en/7e/64.jpg
+SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/75.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/48.jpg
 SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/66.jpg
 SetInfo:10E|Common|http://magiccards.info/scans/en/10e/70.jpg
-SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/58.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/16.jpg
 SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/56.jpg
-Oracle:Return target permanent to its owner's hand.
+SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/58.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/c/cat_warriors.txt b/res/cardsfolder/c/cat_warriors.txt
index 63a2fc18fb8..b58910bed13 100644
--- a/res/cardsfolder/c/cat_warriors.txt
+++ b/res/cardsfolder/c/cat_warriors.txt
@@ -6,8 +6,9 @@ PT:2/2
 K:Forestwalk
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/6e/en-us/card16450.jpg
+Oracle:Forestwalk
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/144.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/30.jpg
 SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/219.jpg
 SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/91.jpg
-Oracle:Forestwalk
 End
\ No newline at end of file
diff --git a/res/cardsfolder/c/chromium.txt b/res/cardsfolder/c/chromium.txt
index a7af76333d9..c2314a996a9 100644
--- a/res/cardsfolder/c/chromium.txt
+++ b/res/cardsfolder/c/chromium.txt
@@ -8,6 +8,7 @@ K:Rampage 2
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay W U B
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chromium.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/264.jpg
 Oracle:Flying\nRampage 2 (Whenever this creature becomes blocked, it gets +2/+2 until end of turn for each creature blocking it beyond the first.)\nAt the beginning of your upkeep, sacrifice Chromium unless you pay {W}{U}{B}.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/109.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/264.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/c/city_of_brass.txt b/res/cardsfolder/c/city_of_brass.txt
index 024b52f7b29..d20a3e2dd35 100644
--- a/res/cardsfolder/c/city_of_brass.txt
+++ b/res/cardsfolder/c/city_of_brass.txt
@@ -11,10 +11,11 @@ T:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerZones$ Battle
 SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/city_of_brass.jpg
+Oracle:Whenever City of Brass becomes tapped, it deals 1 damage to you.\n{T}: Add one mana of any color to your mana pool.
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/322.jpg
+SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/327.jpg
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/413.jpg
 SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/321.jpg
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/92.jpg
 SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/85.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/327.jpg
-Oracle:Whenever City of Brass becomes tapped, it deals 1 damage to you.\n{T}: Add one mana of any color to your mana pool.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/c/concordant_crossroads.txt b/res/cardsfolder/c/concordant_crossroads.txt
index b330d0ee3b9..ba87f5ed7f7 100644
--- a/res/cardsfolder/c/concordant_crossroads.txt
+++ b/res/cardsfolder/c/concordant_crossroads.txt
@@ -7,6 +7,7 @@ SVar:BuffedBy:Creature
 SVar:AntiBuffedBy:Creature
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/concordant_crossroads.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/93.jpg
 Oracle:All creatures have haste.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/32.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/93.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/c/craw_giant.txt b/res/cardsfolder/c/craw_giant.txt
index b6b27349618..b652627d513 100644
--- a/res/cardsfolder/c/craw_giant.txt
+++ b/res/cardsfolder/c/craw_giant.txt
@@ -7,8 +7,9 @@ K:Trample
 K:Rampage 2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/craw_giant.jpg
+Oracle:Trample\nRampage 2 (Whenever this creature becomes blocked, it gets +2/+2 until end of turn for each creature blocking it beyond the first.)
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/147.jpg
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/33.jpg
 SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/76.jpg
 SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/94.jpg
-Oracle:Trample\nRampage 2 (Whenever this creature becomes blocked, it gets +2/+2 until end of turn for each creature blocking it beyond the first.)
 End
\ No newline at end of file
diff --git a/res/cardsfolder/d/dakkon_blackblade.txt b/res/cardsfolder/d/dakkon_blackblade.txt
index a5a9a04de34..d499832dcd2 100644
--- a/res/cardsfolder/d/dakkon_blackblade.txt
+++ b/res/cardsfolder/d/dakkon_blackblade.txt
@@ -8,6 +8,7 @@ SVar:X:Count$Valid Land.YouCtrl
 SVar:BuffedBy:Land
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dakkon_blackblade.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/265.jpg
 Oracle:Dakkon Blackblade's power and toughness are each equal to the number of lands you control.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/110.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/265.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/d/dance_of_many.txt b/res/cardsfolder/d/dance_of_many.txt
index 555a0f364f6..2a73c213885 100644
--- a/res/cardsfolder/d/dance_of_many.txt
+++ b/res/cardsfolder/d/dance_of_many.txt
@@ -12,7 +12,8 @@ K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U U
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dance_of_many.jpg
+Oracle:When Dance of Many enters the battlefield, put a token that's a copy of target nontoken creature onto the battlefield.\nWhen Dance of Many leaves the battlefield, exile the token.\nWhen the token leaves the battlefield, sacrifice Dance of Many.\nAt the beginning of your upkeep, sacrifice Dance of Many unless you pay {U}{U}.
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/78.jpg
 SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/21.jpg
-Oracle:When Dance of Many enters the battlefield, put a token that's a copy of target nontoken creature onto the battlefield.\nWhen Dance of Many leaves the battlefield, exile the token.\nWhen the token leaves the battlefield, sacrifice Dance of Many.\nAt the beginning of your upkeep, sacrifice Dance of Many unless you pay {U}{U}.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/17.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/d/davenant_archer.txt b/res/cardsfolder/d/davenant_archer.txt
index 40b419e73e7..2d2d9e0c6f0 100644
--- a/res/cardsfolder/d/davenant_archer.txt
+++ b/res/cardsfolder/d/davenant_archer.txt
@@ -6,8 +6,9 @@ PT:1/2
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target attacking or blocking creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/davenant_archer.jpg
+Oracle:{T}: D'Avenant Archer deals 1 damage to target attacking or blocking creature.
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/299.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/61.jpg
 SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/15.jpg
 SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/176.jpg
-Oracle:{T}: D'Avenant Archer deals 1 damage to target attacking or blocking creature.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/d/divine_offering.txt b/res/cardsfolder/d/divine_offering.txt
index 0c3f609d66f..5c4a8ae4da1 100644
--- a/res/cardsfolder/d/divine_offering.txt
+++ b/res/cardsfolder/d/divine_offering.txt
@@ -7,9 +7,10 @@ SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardManaCost
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/divine_offering.jpg
+Oracle:Destroy target artifact. You gain life equal to its converted mana cost.
 SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/215.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/303.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/62.jpg
 SetInfo:MBS|Common|http://magiccards.info/scans/en/mbs/5.jpg
 SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/178.jpg
-Oracle:Destroy target artifact. You gain life equal to its converted mana cost.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/e/emerald_dragonfly.txt b/res/cardsfolder/e/emerald_dragonfly.txt
index eb2850ec68a..f426b3d2889 100644
--- a/res/cardsfolder/e/emerald_dragonfly.txt
+++ b/res/cardsfolder/e/emerald_dragonfly.txt
@@ -7,6 +7,7 @@ K:Flying
 A:AB$ Pump | Cost$ G G | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/emerald_dragonfly.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/98.jpg
 Oracle:Flying\n{G}{G}: Emerald Dragonfly gains first strike until end of turn.
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/35.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/98.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/e/erhnam_djinn.txt b/res/cardsfolder/e/erhnam_djinn.txt
index fbf42e4ee47..ec671be0b2d 100644
--- a/res/cardsfolder/e/erhnam_djinn.txt
+++ b/res/cardsfolder/e/erhnam_djinn.txt
@@ -7,7 +7,8 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | E
 SVar:TrigPump:AB$ Pump | Cost$ 0 | ValidTgts$ Creature.nonWall+YouDontCtrl | TgtPrompt$ Select target non-Wall creature an opponent controls | KW$ Forestwalk | UntilYourNextUpkeep$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/erhnam_djinn.jpg
+Oracle:At the beginning of your upkeep, target non-Wall creature an opponent controls gains forestwalk until your next upkeep.
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/36.jpg
 SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/32.jpg
 SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/113.jpg
-Oracle:At the beginning of your upkeep, target non-Wall creature an opponent controls gains forestwalk until your next upkeep.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/f/fallen_angel.txt b/res/cardsfolder/f/fallen_angel.txt
index 139c45b44b1..efb54085151 100644
--- a/res/cardsfolder/f/fallen_angel.txt
+++ b/res/cardsfolder/f/fallen_angel.txt
@@ -7,11 +7,12 @@ K:Flying
 A:AB$ Pump | Cost$ Sac<1/Creature> | NumAtt$ +2 | NumDef$ +1 | SpellDescription$ CARDNAME gets +2/+1 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fallen_angel.jpg
+Oracle:Flying\nSacrifice a creature: Fallen Angel gets +2/+1 until end of turn.
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/133.jpg
 SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/134.jpg
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/23.jpg
 SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/11.jpg
 SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/127.jpg
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/4.jpg
 SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/82.jpg
-Oracle:Flying\nSacrifice a creature: Fallen Angel gets +2/+1 until end of turn.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/f/feldons_cane.txt b/res/cardsfolder/f/feldons_cane.txt
index 106d5d8b14f..b1ef86105df 100644
--- a/res/cardsfolder/f/feldons_cane.txt
+++ b/res/cardsfolder/f/feldons_cane.txt
@@ -6,8 +6,9 @@ A:AB$ ChangeZoneAll | Cost$ T Exile<1/CARDNAME> | ChangeType$ Card.YouOwn | Orig
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/feldons_cane.jpg
+Oracle:{T}, Exile Feldon's Cane: Shuffle your graveyard into your library.
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/368.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/77.jpg
 SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/109.jpg
 SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/15.jpg
-Oracle:{T}, Exile Feldon's Cane: Shuffle your graveyard into your library.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/f/fire_drake.txt b/res/cardsfolder/f/fire_drake.txt
index ae4a7bb0e9b..9cd855776b7 100644
--- a/res/cardsfolder/f/fire_drake.txt
+++ b/res/cardsfolder/f/fire_drake.txt
@@ -7,7 +7,8 @@ K:Flying
 A:AB$ Pump | Cost$ R | NumAtt$ +1 | ActivationLimit$ 1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn. Activate this ability only once each turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fire_drake.jpg
+Oracle:Flying\n{R}: Fire Drake gets +1/+0 until end of turn. Activate this ability only once each turn.
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/226.jpg
 SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/61.jpg
-Oracle:Flying\n{R}: Fire Drake gets +1/+0 until end of turn. Activate this ability only once each turn.
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/47.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/f/fishliver_oil.txt b/res/cardsfolder/f/fishliver_oil.txt
index bad0ec1c5d7..02e90756f32 100644
--- a/res/cardsfolder/f/fishliver_oil.txt
+++ b/res/cardsfolder/f/fishliver_oil.txt
@@ -7,7 +7,8 @@ A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Islandwalk | Description$ Enchanted creature has islandwalk. (This creature is unblockable as long as defending player controls an Island.)
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fishliver_oil.jpg
-SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/77.jpg
-SetInfo:ARN|Common|http://magiccards.info/scans/en/an/17.jpg|2
 Oracle:Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)\nEnchanted creature has islandwalk. (This creature is unblockable as long as defending player controls an Island.)
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/20.jpg
+SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/77.jpg
+SetInfo:ARN|Common|http://magiccards.info/scans/en/an/17.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/f/flash_flood.txt b/res/cardsfolder/f/flash_flood.txt
index d63a2286a28..8a3df69d43d 100644
--- a/res/cardsfolder/f/flash_flood.txt
+++ b/res/cardsfolder/f/flash_flood.txt
@@ -8,6 +8,7 @@ SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flash_flood.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/57.jpg
 Oracle:Choose one - Destroy target red permanent; or return target Mountain to its owner's hand.
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/21.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/57.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/f/fountain_of_youth.txt b/res/cardsfolder/f/fountain_of_youth.txt
index 6d78808385d..89b655cf0ea 100644
--- a/res/cardsfolder/f/fountain_of_youth.txt
+++ b/res/cardsfolder/f/fountain_of_youth.txt
@@ -5,9 +5,10 @@ Text:no text
 A:AB$ GainLife | Cost$ 2 T | LifeAmount$ 1 | SpellDescription$ You gain 1 life.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fountain_of_youth.jpg
+Oracle:{2}, {T}: You gain 1 life.
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/372.jpg
 SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/100.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/78.jpg
 SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/286.jpg
 SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/323.jpg
-Oracle:{2}, {T}: You gain 1 life.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/g/goblin_digging_team.txt b/res/cardsfolder/g/goblin_digging_team.txt
index 4bf7b9d90c5..f166c688298 100644
--- a/res/cardsfolder/g/goblin_digging_team.txt
+++ b/res/cardsfolder/g/goblin_digging_team.txt
@@ -6,9 +6,10 @@ PT:1/1
 A:AB$ Destroy | Cost$ Sac<1/CARDNAME> | ValidTgts$ Wall | TgtPrompt$ Select target Wall | SpellDescription$ Destroy target Wall.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_digging_team.jpg
+Oracle:{T}, Sacrifice Goblin Digging Team: Destroy target Wall.
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/234.jpg
 SetInfo:DRK|Common|http://magiccards.info/scans/en/dk/64.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/49.jpg
 SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/182.jpg
 SetInfo:7ED|Common|http://magiccards.info/scans/en/7e/186.jpg
-Oracle:{T}, Sacrifice Goblin Digging Team: Destroy target Wall.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/g/goblin_shrine.txt b/res/cardsfolder/g/goblin_shrine.txt
index f07b26c0681..62a52df9611 100644
--- a/res/cardsfolder/g/goblin_shrine.txt
+++ b/res/cardsfolder/g/goblin_shrine.txt
@@ -13,6 +13,7 @@ SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_shrine.jpg
-SetInfo:DRK|Common|http://magiccards.info/scans/en/dk/67.jpg
 Oracle:Enchant land\nAs long as enchanted land is a basic Mountain, Goblin creatures get +1/+0.\nWhen Goblin Shrine leaves the battlefield, it deals 1 damage to each Goblin creature.
+SetInfo:DRK|Common|http://magiccards.info/scans/en/dk/67.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/50.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/g/goblins_of_the_flarg.txt b/res/cardsfolder/g/goblins_of_the_flarg.txt
index a3676bb5aa4..d2a388c995c 100644
--- a/res/cardsfolder/g/goblins_of_the_flarg.txt
+++ b/res/cardsfolder/g/goblins_of_the_flarg.txt
@@ -8,6 +8,7 @@ T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Dwarf.YouCtrl | PresentC
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblins_of_the_flarg.jpg
-SetInfo:DRK|Common|http://magiccards.info/scans/en/dk/69.jpg
 Oracle:Mountainwalk\nWhen you control a Dwarf, sacrifice Goblins of the Flarg.
+SetInfo:DRK|Common|http://magiccards.info/scans/en/dk/69.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/51.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/h/hasran_ogress.txt b/res/cardsfolder/h/hasran_ogress.txt
index 83a2b060f62..ec953a5ce18 100644
--- a/res/cardsfolder/h/hasran_ogress.txt
+++ b/res/cardsfolder/h/hasran_ogress.txt
@@ -8,6 +8,7 @@ SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ 3 | UnlessCost$
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hasran_ogress.jpg
-SetInfo:ARN|Common|http://magiccards.info/scans/en/an/6.jpg
 Oracle:Whenever Hasran Ogress attacks, it deals 3 damage to you unless you pay {2}.
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/6.jpg
+SetInfo:ARN|Common|http://magiccards.info/scans/en/an/6.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/h/hells_caretaker.txt b/res/cardsfolder/h/hells_caretaker.txt
index 744f3140fa3..b26d00863ba 100644
--- a/res/cardsfolder/h/hells_caretaker.txt
+++ b/res/cardsfolder/h/hells_caretaker.txt
@@ -7,7 +7,8 @@ A:AB$ ChangeZone | Cost$ T Sac<1/Creature> | TgtPrompt$ Choose target creature c
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hells_caretaker.jpg
+Oracle:{T}, Sacrifice a creature: Return target creature card from your graveyard to the battlefield. Activate this ability only during your upkeep.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/7.jpg
 SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/137.jpg
 SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/19.jpg
-Oracle:{T}, Sacrifice a creature: Return target creature card from your graveyard to the battlefield. Activate this ability only during your upkeep.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/h/horn_of_deafening.txt b/res/cardsfolder/h/horn_of_deafening.txt
index 55f90525969..bea17fc522a 100644
--- a/res/cardsfolder/h/horn_of_deafening.txt
+++ b/res/cardsfolder/h/horn_of_deafening.txt
@@ -6,6 +6,7 @@ A:AB$ Pump | Cost$ 2 T | ValidTgts$ Creature | TgtPrompt$ Select target creature
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/horn_of_deafening.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/224.jpg
 Oracle:{2}, {T}: Prevent all combat damage that would be dealt by target creature this turn.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/80.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/224.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/i/indestructible_aura.txt b/res/cardsfolder/i/indestructible_aura.txt
index 40d0fe24117..ef3ea6abbe4 100644
--- a/res/cardsfolder/i/indestructible_aura.txt
+++ b/res/cardsfolder/i/indestructible_aura.txt
@@ -6,6 +6,7 @@ A:SP$ Pump | Cost$ W | KW$ HIDDEN Prevent all damage that would be dealt to CARD
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/indestructible_aura.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/190.jpg
 Oracle:Prevent all damage that would be dealt to target creature this turn.
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/63.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/190.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/i/ivory_guardians.txt b/res/cardsfolder/i/ivory_guardians.txt
index ef1e5e9d2e7..46fc4db6106 100644
--- a/res/cardsfolder/i/ivory_guardians.txt
+++ b/res/cardsfolder/i/ivory_guardians.txt
@@ -9,7 +9,8 @@ SVar:X:Count$Valid Permanent.Red+nonToken+YouDontCtrl
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ivory_guardians.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/316.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/192.jpg
 Oracle:Protection from red\nCreatures named Ivory Guardians get +1/+1 as long as an opponent controls a nontoken red permanent.
+SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/316.jpg
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/64.jpg
+SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/192.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/j/jalum_tome.txt b/res/cardsfolder/j/jalum_tome.txt
index 99c1c3c601c..f49691fde1f 100644
--- a/res/cardsfolder/j/jalum_tome.txt
+++ b/res/cardsfolder/j/jalum_tome.txt
@@ -7,8 +7,10 @@ SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jalum_tome.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/382.jpg
-SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/293.jpg
-SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/19.jpg
 Oracle:{2}, {T}: Draw a card, then discard a card.
+SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/382.jpg
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/81.jpg
+SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/303.jpg
+SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/294.jpg
+SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/19.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/k/keepers_of_the_faith.txt b/res/cardsfolder/k/keepers_of_the_faith.txt
index 16e86561764..a13dadd6565 100644
--- a/res/cardsfolder/k/keepers_of_the_faith.txt
+++ b/res/cardsfolder/k/keepers_of_the_faith.txt
@@ -5,6 +5,7 @@ Text:no text
 PT:2/3
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/ch/en-us/card2860.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/193.jpg
 Oracle:
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/65.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/193.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/k/kei_takahashi.txt b/res/cardsfolder/k/kei_takahashi.txt
index 678effcbe56..5974991a2ae 100644
--- a/res/cardsfolder/k/kei_takahashi.txt
+++ b/res/cardsfolder/k/kei_takahashi.txt
@@ -6,6 +6,7 @@ PT:2/2
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature | Amount$ 2 | TgtPrompt$ Select target creature | SpellDescription$ Prevent the next 2 damage that would be dealt to target creature this turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kei_takahashi.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/278.jpg
 Oracle:{T}: Prevent the next 2 damage that would be dealt to target creature this turn.
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/113.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/278.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/l/living_armor.txt b/res/cardsfolder/l/living_armor.txt
index 422007213b1..6cf3fdcbfb4 100644
--- a/res/cardsfolder/l/living_armor.txt
+++ b/res/cardsfolder/l/living_armor.txt
@@ -6,6 +6,7 @@ A:AB$ PutCounter | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Se
 SVar:X:Targeted$CardManaCost
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/living_armor.jpg
-SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/101.jpg
 Oracle:{T}, Sacrifice Living Armor: Put X +0/+1 counters on target creature, where X is that creature's converted mana cost.
+SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/101.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/83.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/m/marhault_elsdragon.txt b/res/cardsfolder/m/marhault_elsdragon.txt
index 4919453e711..21722bc319f 100644
--- a/res/cardsfolder/m/marhault_elsdragon.txt
+++ b/res/cardsfolder/m/marhault_elsdragon.txt
@@ -6,6 +6,7 @@ PT:4/6
 K:Rampage 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/marhault_elsdragon.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/284.jpg
 Oracle:Rampage 1 (Whenever this creature becomes blocked, it gets +1/+1 until end of turn for each creature blocking it beyond the first.)
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/114.jpg
+SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/284.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/m/mountain_yeti.txt b/res/cardsfolder/m/mountain_yeti.txt
index 1fe17138082..ef1702f25ec 100644
--- a/res/cardsfolder/m/mountain_yeti.txt
+++ b/res/cardsfolder/m/mountain_yeti.txt
@@ -7,6 +7,7 @@ K:Mountainwalk
 K:Protection from white
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mountain_yeti.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/156.jpg
 Oracle:Mountainwalk, protection from white
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/53.jpg
+SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/156.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/n/nebuchadnezzar.txt b/res/cardsfolder/n/nebuchadnezzar.txt
index c1d90c15575..3fe87c5041e 100644
--- a/res/cardsfolder/n/nebuchadnezzar.txt
+++ b/res/cardsfolder/n/nebuchadnezzar.txt
@@ -8,6 +8,7 @@ SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nebuchadnezzar.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/285.jpg
 Oracle:{X}, {T}: Name a card. Target opponent reveals X cards at random from his or her hand. Then that player discards all cards with that name revealed this way. Activate this ability only during your turn.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/115.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/285.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/n/nicol_bolas.txt b/res/cardsfolder/n/nicol_bolas.txt
index c5ce5e96cf4..6340961afd3 100644
--- a/res/cardsfolder/n/nicol_bolas.txt
+++ b/res/cardsfolder/n/nicol_bolas.txt
@@ -9,7 +9,8 @@ T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZon
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | Mode$ Hand
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nicol_bolas.jpg
+Oracle:Flying\nAt the beginning of your upkeep, sacrifice Nicol Bolas unless you pay {U}{B}{R}.\nWhenever Nicol Bolas deals damage to an opponent, that player discards his or her hand.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/116.jpg
 SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/98.jpg
 SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/286.jpg
-Oracle:Flying\nAt the beginning of your upkeep, sacrifice Nicol Bolas unless you pay {U}{B}{R}.\nWhenever Nicol Bolas deals damage to an opponent, that player discards his or her hand.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/o/obelisk_of_undoing.txt b/res/cardsfolder/o/obelisk_of_undoing.txt
index 4a9f95be1eb..deadbdbed84 100644
--- a/res/cardsfolder/o/obelisk_of_undoing.txt
+++ b/res/cardsfolder/o/obelisk_of_undoing.txt
@@ -5,7 +5,8 @@ Text:no text
 A:AB$ ChangeZone | Cost$ 6 T | ValidTgts$ Permanent.YouCtrl+YouOwn | TgtPrompt$ Select target permanent you both own and control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target permanent you both own and control to your hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_undoing.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/392.jpg
-SetInfo:ATQ|Rare|http://magiccards.info/scans/en/aq/23.jpg
 Oracle:{6}, {T}: Return target permanent you both own and control to your hand.
+SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/392.jpg
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/84.jpg
+SetInfo:ATQ|Rare|http://magiccards.info/scans/en/aq/23.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/p/palladia_mors.txt b/res/cardsfolder/p/palladia_mors.txt
index 24ec4287754..ce871b9117a 100644
--- a/res/cardsfolder/p/palladia_mors.txt
+++ b/res/cardsfolder/p/palladia_mors.txt
@@ -8,6 +8,7 @@ K:Trample
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay R G W
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/palladia_mors.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/287.jpg
 Oracle:Flying, trample\nAt the beginning of your upkeep, sacrifice Palladia-Mors unless you pay {R}{G}{W}.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/117.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/287.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/r/rabid_wombat.txt b/res/cardsfolder/r/rabid_wombat.txt
index d2aa13f2f22..308f67ac132 100644
--- a/res/cardsfolder/r/rabid_wombat.txt
+++ b/res/cardsfolder/r/rabid_wombat.txt
@@ -9,7 +9,8 @@ SVar:X:Count$Valid Aura.Attached/Times.2
 SVar:EnchantMe:Multiple
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rabid_wombat.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/181.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/112.jpg
 Oracle:Vigilance\nRabid Wombat gets +2/+2 for each Aura attached to it.
+SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/181.jpg
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/39.jpg
+SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/112.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/r/rakalite.txt b/res/cardsfolder/r/rakalite.txt
index 8ea6235650a..3643a8f1ac9 100644
--- a/res/cardsfolder/r/rakalite.txt
+++ b/res/cardsfolder/r/rakalite.txt
@@ -8,6 +8,7 @@ SVar:TrigBounce:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destinati
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakalite.jpg
-SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/27.jpg
 Oracle:{2}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Return Rakalite to its owner's hand at the beginning of the next end step.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/85.jpg
+SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/27.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/r/recall.txt b/res/cardsfolder/r/recall.txt
index d6f8910c51a..6cec7968211 100644
--- a/res/cardsfolder/r/recall.txt
+++ b/res/cardsfolder/r/recall.txt
@@ -5,8 +5,9 @@ Text:Discard X cards, then return a card from your graveyard to your hand for ea
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/recall.jpg
+Oracle:Discard X cards, then return a card from your graveyard to your hand for each card discarded this way. Exile Recall.
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/115.jpg
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/24.jpg
 SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/92.jpg
 SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/70.jpg
-Oracle:Discard X cards, then return a card from your graveyard to your hand for each card discarded this way. Exile Recall.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/r/remove_soul.txt b/res/cardsfolder/r/remove_soul.txt
index 4ddfd7f1a2e..237d8b96f56 100644
--- a/res/cardsfolder/r/remove_soul.txt
+++ b/res/cardsfolder/r/remove_soul.txt
@@ -5,13 +5,14 @@ Text:no text
 A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SpellDescription$ Counter target creature spell.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83228.jpg
+Oracle:Counter target creature spell.
 SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/95.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/72.jpg
-SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/117.jpg
 SetInfo:7ED|Common|http://magiccards.info/scans/en/7e/95.jpg
+SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/117.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/72.jpg
 SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/93.jpg
 SetInfo:10E|Common|http://magiccards.info/scans/en/10e/100.jpg
-SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/94.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/25.jpg
 SetInfo:S99|Common|http://magiccards.info/scans/en/st/49.jpg
-Oracle:Counter target creature spell.
+SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/94.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/r/repentant_blacksmith.txt b/res/cardsfolder/r/repentant_blacksmith.txt
index b8590d58cee..dff4c59b1f0 100644
--- a/res/cardsfolder/r/repentant_blacksmith.txt
+++ b/res/cardsfolder/r/repentant_blacksmith.txt
@@ -6,7 +6,8 @@ PT:1/2
 K:Protection from red
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/repentant_blacksmith.jpg
-SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/330.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/66.jpg
 Oracle:Protection from red
+SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/330.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/67.jpg
+SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/66.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/r/rubinia_soulsinger.txt b/res/cardsfolder/r/rubinia_soulsinger.txt
index df741f8b84b..8509256cab6 100644
--- a/res/cardsfolder/r/rubinia_soulsinger.txt
+++ b/res/cardsfolder/r/rubinia_soulsinger.txt
@@ -7,6 +7,7 @@ K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ GainControl | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ Untap,LeavesPlay,LoseControl | SpellDescription$ Gain control of target creature for as long as you control Rubinia and Rubinia remains tapped.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rubinia_soulsinger.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/296.jpg
 Oracle:You may choose not to untap Rubinia Soulsinger during your untap step.\n{T}: Gain control of target creature for as long as you control Rubinia and Rubinia remains tapped.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/118.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/296.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/safe_haven.txt b/res/cardsfolder/s/safe_haven.txt
index c5165e73171..f73d6e118c4 100644
--- a/res/cardsfolder/s/safe_haven.txt
+++ b/res/cardsfolder/s/safe_haven.txt
@@ -8,7 +8,8 @@ SVar:TrigReturn:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Defined$ Remembered | O
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/safe_haven.jpg
+Oracle:{2}, {T}: Exile target creature you control.\nAt the beginning of your upkeep, you may sacrifice Safe Haven. If you do, return each card exiled with Safe Haven to the battlefield under its owner's control.
 SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/115.jpg
 SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/121.jpg
-Oracle:{2}, {T}: Exile target creature you control.\nAt the beginning of your upkeep, you may sacrifice Safe Haven. If you do, return each card exiled with Safe Haven to the battlefield under its owner's control.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/93.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/scavenger_folk.txt b/res/cardsfolder/s/scavenger_folk.txt
index 1547984005e..9660c446f9f 100644
--- a/res/cardsfolder/s/scavenger_folk.txt
+++ b/res/cardsfolder/s/scavenger_folk.txt
@@ -6,8 +6,9 @@ PT:1/1
 A:AB$ Destroy | Cost$ G T Sac<1/CARDNAME> | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scavenger_folk.jpg
+Oracle:{G}, {T}, Sacrifice Scavenger Folk: Destroy target artifact.
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/185.jpg
 SetInfo:DRK|Common|http://magiccards.info/scans/en/dk/50.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/41.jpg
 SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/267.jpg
-Oracle:{G}, {T}, Sacrifice Scavenger Folk: Destroy target artifact.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/serpent_generator.txt b/res/cardsfolder/s/serpent_generator.txt
index 86f45f0aac7..4772b71b87e 100644
--- a/res/cardsfolder/s/serpent_generator.txt
+++ b/res/cardsfolder/s/serpent_generator.txt
@@ -7,7 +7,8 @@ SVar:TrigTokenPoison:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Pl
 SVar:TrigPoison:AB$ Poison | Cost$ 0 | Defined$ TriggeredTarget | Num$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serpent_generator.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/397.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/240.jpg
 Oracle:{4}, {T}: Put a 1/1 colorless Snake artifact creature token onto the battlefield. It has "Whenever this creature deals damage to a player, that player gets a poison counter." (A player with ten or more poison counters loses the game.)
+SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/397.jpg
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/88.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/240.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/shield_wall.txt b/res/cardsfolder/s/shield_wall.txt
index be6b941862c..a25de442046 100644
--- a/res/cardsfolder/s/shield_wall.txt
+++ b/res/cardsfolder/s/shield_wall.txt
@@ -5,8 +5,9 @@ Text:no text
 A:SP$ PumpAll | Cost$ 1 W | ValidCards$ Creature.YouCtrl | NumDef$ +2 | SpellDescription$ Creatures you control get +0/+2 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/7e/en-us/card11499.jpg
-SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/339.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/205.jpg
-SetInfo:7ED|Common|http://magiccards.info/scans/en/7e/44.jpg
 Oracle:Creatures you control get +0/+2 until end of turn.
+SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/339.jpg
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/68.jpg
+SetInfo:7ED|Common|http://magiccards.info/scans/en/7e/44.jpg
+SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/205.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/sivitri_scarzam.txt b/res/cardsfolder/s/sivitri_scarzam.txt
index bab3beef5f4..8b0feddd4e6 100644
--- a/res/cardsfolder/s/sivitri_scarzam.txt
+++ b/res/cardsfolder/s/sivitri_scarzam.txt
@@ -5,6 +5,7 @@ Text:no text
 PT:6/4
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/ch/en-us/card2879.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/298.jpg
 Oracle:
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/119.jpg
+SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/298.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/solkanar_the_swamp_king.txt b/res/cardsfolder/s/solkanar_the_swamp_king.txt
index 8bfe4a06c88..abb4cae084d 100644
--- a/res/cardsfolder/s/solkanar_the_swamp_king.txt
+++ b/res/cardsfolder/s/solkanar_the_swamp_king.txt
@@ -8,7 +8,8 @@ T:Mode$ SpellCast | ValidCard$ Card.Black | TriggerZones$ Battlefield | Execute$
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/solkanar_the_swamp_king.jpg
+Oracle:Swampwalk\nWhenever a player casts a black spell, you gain 1 life.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/120.jpg
 SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/100.jpg
 SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/299.jpg
-Oracle:Swampwalk\nWhenever a player casts a black spell, you gain 1 life.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/stangg.txt b/res/cardsfolder/s/stangg.txt
index fcd27f925a3..5d9e26960a1 100644
--- a/res/cardsfolder/s/stangg.txt
+++ b/res/cardsfolder/s/stangg.txt
@@ -5,6 +5,7 @@ Text:When Stangg enters the battlefield, if Stangg is on the battlefield, put a
 PT:3/4
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stangg.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/300.jpg
 Oracle:When Stangg enters the battlefield, put a legendary 3/4 red and green Human Warrior creature token named Stangg Twin onto the battlefield. When Stangg leaves the battlefield, exile that token. When that token leaves the battlefield, sacrifice Stangg.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/121.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/300.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/storm_seeker.txt b/res/cardsfolder/s/storm_seeker.txt
index 7a1f982623a..aebbba32d74 100644
--- a/res/cardsfolder/s/storm_seeker.txt
+++ b/res/cardsfolder/s/storm_seeker.txt
@@ -7,6 +7,7 @@ SVar:X:TargetedPlayer$CardsInHand
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_seeker.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/119.jpg
 Oracle:Storm Seeker deals damage equal to the number of cards in target player's hand to that player.
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/42.jpg
+SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/119.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/t/teleport.txt b/res/cardsfolder/t/teleport.txt
index df60dc5386b..e5c04bd7793 100644
--- a/res/cardsfolder/t/teleport.txt
+++ b/res/cardsfolder/t/teleport.txt
@@ -6,6 +6,7 @@ A:SP$ Pump | Cost$ U U U | ActivationPhases$ Declare Attackers - Play Instants a
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/teleport.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/80.jpg
 Oracle:Cast Teleport only during the declare attackers step.\nTarget creature is unblockable this turn.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/26.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/80.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/t/tobias_andrion.txt b/res/cardsfolder/t/tobias_andrion.txt
index 6d57590c9d5..7a9d7dca1ec 100644
--- a/res/cardsfolder/t/tobias_andrion.txt
+++ b/res/cardsfolder/t/tobias_andrion.txt
@@ -5,6 +5,7 @@ Text:no text
 PT:4/4
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/le/en-us/card1691.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/304.jpg
 Oracle:
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/122.jpg
+SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/304.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/t/tor_wauki.txt b/res/cardsfolder/t/tor_wauki.txt
index be12b6272e4..3364d3b2545 100644
--- a/res/cardsfolder/t/tor_wauki.txt
+++ b/res/cardsfolder/t/tor_wauki.txt
@@ -7,6 +7,7 @@ A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | T
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tor_wauki.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/305.jpg
 Oracle:{T}: Tor Wauki deals 2 damage to target attacking or blocking creature.
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/123.jpg
+SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/305.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/t/tormods_crypt.txt b/res/cardsfolder/t/tormods_crypt.txt
index 023d8d7cc8b..d91a7a73526 100644
--- a/res/cardsfolder/t/tormods_crypt.txt
+++ b/res/cardsfolder/t/tormods_crypt.txt
@@ -6,7 +6,8 @@ A:AB$ ChangeZoneAll | Cost$ T Exile<1/CARDNAME> | Origin$ Graveyard | Destinatio
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tormods_crypt.jpg
+Oracle:{T}, Sacrifice Tormod's Crypt: Exile all cards from target player's graveyard.
 SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/109.jpg
 SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/115.jpg
-Oracle:{T}, Sacrifice Tormod's Crypt: Exile all cards from target player's graveyard.
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/89.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/t/transmutation.txt b/res/cardsfolder/t/transmutation.txt
index ba3a894d20a..a6a8f690fe2 100644
--- a/res/cardsfolder/t/transmutation.txt
+++ b/res/cardsfolder/t/transmutation.txt
@@ -6,6 +6,7 @@ A:SP$ Pump | Cost$ 1 B | ValidTgts$ Creature | TgtPrompt$ Select target creature
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/transmutation.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/37.jpg
 Oracle:Switch target creature's power and toughness until end of turn.
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/12.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/37.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/t/triassic_egg.txt b/res/cardsfolder/t/triassic_egg.txt
index 6eb4561ab0a..cd5454a83f2 100644
--- a/res/cardsfolder/t/triassic_egg.txt
+++ b/res/cardsfolder/t/triassic_egg.txt
@@ -8,6 +8,7 @@ A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | IsPresent$ Card.Self+counters_GE2_HAT
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/triassic_egg.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/242.jpg
 Oracle:{3}, {T}: Put a hatchling counter on Triassic Egg.\nSacrifice Triassic Egg: Choose one - You may put a creature card from your hand onto the battlefield; or return target creature card from your graveyard to the battlefield. Activate this ability only if two or more hatchling counters are on Triassic Egg.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/90.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/242.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/u/urzas_mine.txt b/res/cardsfolder/u/urzas_mine.txt
index f0551c0d6ed..f9d1868b709 100644
--- a/res/cardsfolder/u/urzas_mine.txt
+++ b/res/cardsfolder/u/urzas_mine.txt
@@ -6,10 +6,10 @@ A:AB$ Mana | Cost$ T | Produced$ 1 | Bonus $UrzaLands | BonusProduced$ 1 | Spell
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_mine.jpg
+Oracle:{T}: Add {1} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {2} to your mana pool instead.
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/328.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/447.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/94.jpg
 SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/327.jpg
-SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/75.jpg|4
-SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/94.jpg|4
-Oracle:{T}: Add {1} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {2} to your mana pool instead.
+SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/75.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/u/urzas_power_plant.txt b/res/cardsfolder/u/urzas_power_plant.txt
index c65624017a6..d03bb785692 100644
--- a/res/cardsfolder/u/urzas_power_plant.txt
+++ b/res/cardsfolder/u/urzas_power_plant.txt
@@ -6,10 +6,10 @@ A:AB$ Mana | Cost$ T | Produced$ 1 | Bonus$ UrzaLands | BonusProduced$ 1 | Spell
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_power_plant.jpg
+Oracle:{T}: Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {2} to your mana pool instead.
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/329.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/448.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/98.jpg
 SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/328.jpg
-SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/79.jpg|4
-SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/98.jpg|4
-Oracle:{T}: Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {2} to your mana pool instead.
+SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/79.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/u/urzas_tower.txt b/res/cardsfolder/u/urzas_tower.txt
index d6f0fa80ff9..380b6a4e9fa 100644
--- a/res/cardsfolder/u/urzas_tower.txt
+++ b/res/cardsfolder/u/urzas_tower.txt
@@ -6,10 +6,10 @@ A:AB$ Mana | Cost$ T | Produced$ 1 | Bonus$ UrzaLands | BonusProduced$ 2 | Spell
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_tower.jpg
+Oracle:{T}: Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {3} to your mana pool instead.
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/330.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/449.jpg
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/102.jpg
 SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/329.jpg
-SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/83.jpg|4
-SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/102.jpg|4
-Oracle:{T}: Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {3} to your mana pool instead.
+SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/83.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/v/vaevictis_asmadi.txt b/res/cardsfolder/v/vaevictis_asmadi.txt
index 04dcfbc1194..751f5af5515 100644
--- a/res/cardsfolder/v/vaevictis_asmadi.txt
+++ b/res/cardsfolder/v/vaevictis_asmadi.txt
@@ -10,6 +10,7 @@ A:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until
 A:AB$ Pump | Cost$ G | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vaevictis_asmadi.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/309.jpg
 Oracle:Flying\nAt the beginning of your upkeep, sacrifice Vaevictis Asmadi unless you pay {B}{R}{G}.\n{B}: Vaevictis Asmadi gets +1/+0 until end of turn.\n{R}: Vaevictis Asmadi gets +1/+0 until end of turn.\n{G}: Vaevictis Asmadi gets +1/+0 until end of turn.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/124.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/309.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/v/voodoo_doll.txt b/res/cardsfolder/v/voodoo_doll.txt
index 504254c0926..76a075c7cbd 100644
--- a/res/cardsfolder/v/voodoo_doll.txt
+++ b/res/cardsfolder/v/voodoo_doll.txt
@@ -12,6 +12,7 @@ SVar:X:Count$CardCounters.PIN
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/voodoo_doll.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/243.jpg
 Oracle:At the beginning of your upkeep, put a pin counter on Voodoo Doll.\nAt the beginning of your end step, if Voodoo Doll is untapped, destroy Voodoo Doll and it deals damage to you equal to the number of pin counters on it.\n{X}{X}, {T}: Voodoo Doll deals damage equal to the number of pin counters on it to target creature or player. X is the number of pin counters on Voodoo Doll.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/91.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/243.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/w/wall_of_heat.txt b/res/cardsfolder/w/wall_of_heat.txt
index 226ea0297d2..02c5dac4617 100644
--- a/res/cardsfolder/w/wall_of_heat.txt
+++ b/res/cardsfolder/w/wall_of_heat.txt
@@ -6,6 +6,7 @@ PT:2/6
 K:Defender
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_heat.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/167.jpg
 Oracle:Defender (This creature can't attack.)
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/55.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/167.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/w/wall_of_opposition.txt b/res/cardsfolder/w/wall_of_opposition.txt
index 3685bece0bc..a3b2e0ffa04 100644
--- a/res/cardsfolder/w/wall_of_opposition.txt
+++ b/res/cardsfolder/w/wall_of_opposition.txt
@@ -7,6 +7,7 @@ K:Defender
 A:AB$ Pump | Cost$ 1 | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_opposition.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/168.jpg
 Oracle:Defender (This creature can't attack.)\n{1}: Wall of Opposition gets +1/+0 until end of turn.
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/56.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/168.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/w/wall_of_vapor.txt b/res/cardsfolder/w/wall_of_vapor.txt
index fb8406f5892..a8d678654cf 100644
--- a/res/cardsfolder/w/wall_of_vapor.txt
+++ b/res/cardsfolder/w/wall_of_vapor.txt
@@ -8,6 +8,7 @@ K:PreventAllDamageBy Creature.blockedBySource
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_vapor.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/84.jpg
 Oracle:Defender (This creature can't attack.)\nPrevent all damage that would be dealt to Wall of Vapor by creatures it's blocking.
+SetInfo:CHR|Common|http://magiccards.info/scans/en/ch/27.jpg
+SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/84.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/w/wall_of_wonder.txt b/res/cardsfolder/w/wall_of_wonder.txt
index c5c29be9b4d..8985e5fa2df 100644
--- a/res/cardsfolder/w/wall_of_wonder.txt
+++ b/res/cardsfolder/w/wall_of_wonder.txt
@@ -7,7 +7,8 @@ K:Defender
 A:AB$ Pump | Cost$ 2 U U | KW$ HIDDEN CARDNAME can attack as though it didn't have defender. | NumAtt$ +4 | NumDef$ -4 | SpellDescription$ CARDNAME gets +4/-4 until end of turn and can attack this turn as though it didn't have defender.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_wonder.jpg
+Oracle:Defender (This creature can't attack.)\n{2}{U}{U}: Wall of Wonder gets +4/-4 until end of turn and can attack this turn as though it didn't have defender.
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/28.jpg
 SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/112.jpg
 SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/85.jpg
-Oracle:Defender (This creature can't attack.)\n{2}{U}{U}: Wall of Wonder gets +4/-4 until end of turn and can attack this turn as though it didn't have defender.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/w/witch_hunter.txt b/res/cardsfolder/w/witch_hunter.txt
index 87d9b1fa9f8..08f7f68adb5 100644
--- a/res/cardsfolder/w/witch_hunter.txt
+++ b/res/cardsfolder/w/witch_hunter.txt
@@ -7,7 +7,8 @@ A:AB$ DealDamage | Cost$ T | NumDmg$ 1 | Tgt$ TgtP | SpellDescription$ CARDNAME
 A:AB$ ChangeZone | Cost$ 1 W W T | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature you don't control to its owner's hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/witch_hunter.jpg
+Oracle:{T}: Witch Hunter deals 1 damage to target player.\n{1}{W}{W}, {T}: Return target creature an opponent controls to its owner's hand.
 SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/92.jpg
 SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/17.jpg
-Oracle:{T}: Witch Hunter deals 1 damage to target player.\n{1}{W}{W}, {T}: Return target creature an opponent controls to its owner's hand.
+SetInfo:CHR|Uncommon|http://magiccards.info/scans/en/ch/70.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/x/xira_arien.txt b/res/cardsfolder/x/xira_arien.txt
index 1056eeadf58..0cb9e140ffd 100644
--- a/res/cardsfolder/x/xira_arien.txt
+++ b/res/cardsfolder/x/xira_arien.txt
@@ -7,6 +7,7 @@ K:Flying
 A:AB$ Draw | Cost$ B R G T | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws a card.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/xira_arien.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/310.jpg
 Oracle:Flying\n{B}{R}{G}, {T}: Target player draws a card.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/125.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/310.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/y/yawgmoth_demon.txt b/res/cardsfolder/y/yawgmoth_demon.txt
index f2ba877c083..dea414d917b 100644
--- a/res/cardsfolder/y/yawgmoth_demon.txt
+++ b/res/cardsfolder/y/yawgmoth_demon.txt
@@ -8,7 +8,8 @@ K:First Strike
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/yawgmoth_demon.jpg
+Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nFirst strike (This creature deals combat damage before creatures without first strike.)\nAt the beginning of your upkeep, you may sacrifice an artifact. If you don't, tap Yawgmoth Demon and it deals 2 damage to you.
+SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/14.jpg
 SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/170.jpg
 SetInfo:ATQ|Rare|http://magiccards.info/scans/en/aq/51.jpg
-Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nFirst strike (This creature deals combat damage before creatures without first strike.)\nAt the beginning of your upkeep, you may sacrifice an artifact. If you don't, tap Yawgmoth Demon and it deals 2 damage to you.
 End
\ No newline at end of file
diff --git a/res/setInfoScript.py b/res/setInfoScript.py
index e53858f8c84..3f9a56007c3 100755
--- a/res/setInfoScript.py
+++ b/res/setInfoScript.py
@@ -60,6 +60,7 @@ def initSets():
 	allSets['The Dark'] = 'DRK'
 	allSets['Fallen Empires'] = 'FEM'
 	allSets['Homelands'] = 'HML'
+	allSets['Chronicles'] = 'CHR'
 
 	# Ice Age
 	allSets['Ice Age'] = 'ICE'