diff --git a/res/cardsfolder/j/jabaris_banner.txt b/res/cardsfolder/j/jabaris_banner.txt
index b00ddeb3718..2e51cdecc14 100644
--- a/res/cardsfolder/j/jabaris_banner.txt
+++ b/res/cardsfolder/j/jabaris_banner.txt
@@ -2,7 +2,6 @@ Name:Jabari's Banner
 ManaCost:2
 Types:Artifact
 A:AB$ Pump | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flanking | SpellDescription$ Target creature gains flanking until end of turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jabaris_banner.jpg
-SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/150.jpg
 Oracle:{1}, {T}: Target creature gains flanking until end of turn. (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)
+SetInfo:WTH Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jabaris_influence.txt b/res/cardsfolder/j/jabaris_influence.txt
index d64443de603..834f0ff89d4 100644
--- a/res/cardsfolder/j/jabaris_influence.txt
+++ b/res/cardsfolder/j/jabaris_influence.txt
@@ -3,7 +3,6 @@ ManaCost:3 W W
 Types:Instant
 A:SP$ GainControl | Cost$ 3 W W | ValidTgts$ Creature.nonBlack+nonArtifact+attackedThisTurn | TgtPrompt$Select target nonartifact, nonblack creature that attacked you this turn | OpponentTurn$ True | ActivationPhases$Main2->End of Turn | SubAbility$ DBPutCounter | SpellDescription$ Gain control of target nonartifact, nonblack creature that attacked you this turn and put a -1/-0 counter on it.
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ M1M0 | CounterNum$ 1
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jabaris_influence.jpg
-SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/228.jpg
 Oracle:Cast Jabari's Influence only after combat.\nGain control of target nonartifact, nonblack creature that attacked you this turn and put a -1/-0 counter on it.
+SetInfo:MIR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jace_architect_of_thought.txt b/res/cardsfolder/j/jace_architect_of_thought.txt
index b4a1cde6bf6..e9d2d02fb7e 100644
--- a/res/cardsfolder/j/jace_architect_of_thought.txt
+++ b/res/cardsfolder/j/jace_architect_of_thought.txt
@@ -14,7 +14,6 @@ SVar:JaceYourself:DB$ ChangeZone | Origin$ Library | Destination$ Exile | Define
 SVar:DBPlayIT:DB$ Play | Defined$ Remembered | Amount$ Thoughts | References$ Thoughts | Controller$ You | WithoutManaCost$ True | Optional$ True | RememberPlayed$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Thoughts:Remembered$Amount
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_architect_of_thought.jpg
-SetInfo:RTR|Mythic|http://magiccards.info/scans/en/rtr/44.jpg
 Oracle:[+1] Until your next turn, whenever a creature an opponent controls attacks, it gets -1/-0 until end of turn.\n[-2] Reveal the top three cards of your library. An opponent separates those cards into two piles. Put one pile into your hand and the other on the bottom of your library in any order.\n[-8] For each player, search that player's library for a nonland card and exile it, then that player shuffles his or her library. You may cast those cards without paying their mana costs.
+SetInfo:RTR Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/j/jace_beleren.txt b/res/cardsfolder/j/jace_beleren.txt
index 8f32311e28f..293ab73bfe3 100644
--- a/res/cardsfolder/j/jace_beleren.txt
+++ b/res/cardsfolder/j/jace_beleren.txt
@@ -5,9 +5,9 @@ Loyalty:3
 A:AB$ Draw | Cost$ AddCounter<2/LOYALTY> | Defined$ Each | Planeswalker$ True | SpellDescription$ Each player draws a card.
 A:AB$ Draw | Cost$ SubCounter<1/LOYALTY> | ValidTgts$ Player | Planeswalker$ True | SpellDescription$ Target player draws a card.
 A:AB$ Mill | Cost$ SubCounter<10/LOYALTY> | NumCards$ 20 | ValidTgts$ Player | Planeswalker$ True | Ultimate$ True | SpellDescription$ Target player puts the top twenty cards of his or her library into his or her graveyard.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_beleren.jpg
-SetInfo:M11|Mythic|http://magiccards.info/scans/en/m11/58.jpg
-SetInfo:M10|Mythic|http://magiccards.info/scans/en/m10/58.jpg
-SetInfo:LRW|Rare|http://magiccards.info/scans/en/lw/71.jpg
 Oracle:[+2] Each player draws a card.\n[-1] Target player draws a card.\n[-10] Target player puts the top twenty cards of his or her library into his or her graveyard.
+SetInfo:M11 Mythic
+SetInfo:DD2 Mythic
+SetInfo:LRW Rare
+SetInfo:M10 Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/j/jace_memory_adept.txt b/res/cardsfolder/j/jace_memory_adept.txt
index d3e1e603389..ea5217b677f 100644
--- a/res/cardsfolder/j/jace_memory_adept.txt
+++ b/res/cardsfolder/j/jace_memory_adept.txt
@@ -7,8 +7,7 @@ SVar:DBMill:DB$ Mill | ValidTgts$ Player | TgtPrompt$ Select target player | Num
 A:AB$ Mill | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 10 | Planeswalker$ True | SpellDescription$ Target player puts the top 10 cards of his or her library in his or her graveyard.
 A:AB$ Draw | Cost$ SubCounter<7/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ MaxTgt | References$ MaxTgt | NumCards$ 20 | Planeswalker$ True | Ultimate$ True | SpellDescription$ Any number of target players each draw 20 cards.
 SVar:MaxTgt:PlayerCountPlayers$Amount
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_memory_adept.jpg
-SetInfo:M13|Mythic|http://magiccards.info/scans/en/m13/56.jpg
-SetInfo:M12|Mythic|http://magiccards.info/scans/en/m12/58.jpg
 Oracle:[+1] Draw a card. Target player puts the top card of his or her library into his or her graveyard.\n[0] Target player puts the top ten cards of his or her library into his or her graveyard.\n[-7] Any number of target players each draw twenty cards.
+SetInfo:M13 Mythic
+SetInfo:M12 Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/j/jace_the_mind_sculptor.txt b/res/cardsfolder/j/jace_the_mind_sculptor.txt
index a38e18e4666..f8ec5694595 100644
--- a/res/cardsfolder/j/jace_the_mind_sculptor.txt
+++ b/res/cardsfolder/j/jace_the_mind_sculptor.txt
@@ -8,7 +8,6 @@ SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Library | ChangeT
 A:AB$ ChangeZone | Cost$ SubCounter<1/LOYALTY> | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature | TgtPrompt$ Select target creature | Planeswalker$ True | SpellDescription$ Return target creature to its owner's hand.
 A:AB$ ChangeZoneAll | Cost$ SubCounter<12/LOYALTY> | Origin$ Library | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | SubAbility$ DBChangeZone2 | Planeswalker$ True | Ultimate$ True | SpellDescription$ Exile all cards from target player's library, then that player shuffles his or her hand into his or her library.
 SVar:DBChangeZone2:DB$ ChangeZoneAll | Origin$ Hand | Destination$ Library | Defined$ Targeted | ChangeType$ Card | Shuffle$ True
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_the_mind_sculptor.jpg
-SetInfo:WWK|Mythic|http://magiccards.info/scans/en/wwk/31.jpg
 Oracle:[+2] Look at the top card of target player's library. You may put that card on the bottom of that player's library.\n[0] Draw three cards, then put two cards from your hand on top of your library in any order.\n[-1] Return target creature to its owner's hand.\n[-12] Exile all cards from target player's library, then that player shuffles his or her hand into his or her library.
+SetInfo:WWK Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/j/jaces_archivist.txt b/res/cardsfolder/j/jaces_archivist.txt
index 8182c6bad1c..6e470612929 100644
--- a/res/cardsfolder/j/jaces_archivist.txt
+++ b/res/cardsfolder/j/jaces_archivist.txt
@@ -7,11 +7,10 @@ SVar:DBTestHand:DB$ Cleanup | ClearRemembered$ True | ConditionCheckSVar$ HandSi
 SVar:DBOppDiscard1:DB$ Discard | Cost$ 0 | Defined$ Opponent | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | Mode$ Hand | SubAbility$ DBOppDiscard2 | References$ X
 SVar:DBOppDiscard2:DB$ Discard | Cost$ 0 | Defined$ Opponent | ConditionCheckSVar$ X | ConditionSVarCompare$ LT1 | RememberDiscarded$ True | Mode$ Hand | SubAbility$ DBDraw | References$ X
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | SubAbility$ DBOppDraw | References$ X
-SVar:DBOppDraw:DB$ Draw | Defined$ Opponent | NumCards$ X | SubAbility$ DBCleanup | References$ X 
+SVar:DBOppDraw:DB$ Draw | Defined$ Opponent | NumCards$ X | SubAbility$ DBCleanup | References$ X
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedSize
 SVar:HandSizeTest:Count$CardsInOppHand/Minus.X
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jaces_archivist.jpg
-SetInfo:M12|Rare|http://magiccards.info/scans/en/m12/59.jpg
 Oracle:{U}, {T}: Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way.
+SetInfo:M12 Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jaces_erasure.txt b/res/cardsfolder/j/jaces_erasure.txt
index 1d5dbd228ce..07bc75072e7 100644
--- a/res/cardsfolder/j/jaces_erasure.txt
+++ b/res/cardsfolder/j/jaces_erasure.txt
@@ -3,8 +3,7 @@ ManaCost:1 U
 Types:Enchantment
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMill | TriggerDescription$ Whenever you draw a card, you may have target player put the top card of his or her library into his or her graveyard.
 SVar:TrigMill:AB$Mill | Cost$ 0 | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jaces_erasure.jpg
-SetInfo:M11|Common|http://magiccards.info/scans/en/m11/59.jpg
-SetInfo:M12|Common|http://magiccards.info/scans/en/m12/60.jpg
 Oracle:Whenever you draw a card, you may have target player put the top card of his or her library into his or her graveyard.
+SetInfo:M11 Common
+SetInfo:M12 Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jaces_ingenuity.txt b/res/cardsfolder/j/jaces_ingenuity.txt
index 658b0ca4a46..feb5d8a1649 100644
--- a/res/cardsfolder/j/jaces_ingenuity.txt
+++ b/res/cardsfolder/j/jaces_ingenuity.txt
@@ -2,7 +2,6 @@ Name:Jace's Ingenuity
 ManaCost:3 U U
 Types:Instant
 A:SP$ Draw | Cost$ 3 U U | NumCards$ 3 | SpellDescription$ Draw three cards.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jaces_ingenuity.jpg
-SetInfo:M11|Uncommon|http://magiccards.info/scans/en/m11/60.jpg
 Oracle:Draw three cards.
+SetInfo:M11 Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jaces_phantasm.txt b/res/cardsfolder/j/jaces_phantasm.txt
index 0201e423e99..24d578194a4 100644
--- a/res/cardsfolder/j/jaces_phantasm.txt
+++ b/res/cardsfolder/j/jaces_phantasm.txt
@@ -5,7 +5,6 @@ PT:1/1
 K:Flying
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 4 | AddToughness$ 4 | CheckSVar$ X | SVarCompare$ GE10 | References$ X | Description$ CARDNAME gets +4/+4 as long as an opponent has ten or more cards in his or her graveyard.
 SVar:X:Count$InOppYard
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jaces_phantasm.jpg
-SetInfo:M13|Uncommon|http://magiccards.info/scans/en/m13/57.jpg
 Oracle:Flying\nJace's Phantasm gets +4/+4 as long as an opponent has ten or more cards in his or her graveyard.
+SetInfo:M13 Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jackal_familiar.txt b/res/cardsfolder/j/jackal_familiar.txt
index c9594ecadde..16e4cd33f92 100644
--- a/res/cardsfolder/j/jackal_familiar.txt
+++ b/res/cardsfolder/j/jackal_familiar.txt
@@ -3,7 +3,6 @@ ManaCost:R
 Types:Creature Hound
 PT:2/2
 K:CARDNAME can't attack or block alone.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jackal_familiar.jpg
-SetInfo:M10|Common|http://magiccards.info/scans/en/m10/143.jpg
 Oracle:Jackal Familiar can't attack or block alone.
+SetInfo:M10 Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jackal_pup.txt b/res/cardsfolder/j/jackal_pup.txt
index 35e37fb9982..9dab7735e3d 100644
--- a/res/cardsfolder/j/jackal_pup.txt
+++ b/res/cardsfolder/j/jackal_pup.txt
@@ -5,7 +5,7 @@ PT:2/1
 T:Mode$ DamageDone | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you.
 SVar:TrigDamage:AB$DealDamage | Cost$ 0 | NumDmg$ X | Defined$ You | References$ X
 SVar:X:TriggerCount$DamageAmount
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jackal_pup.jpg
-SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/183.jpg
 Oracle:Whenever Jackal Pup is dealt damage, it deals that much damage to you.
+SetInfo:TMP Uncommon
+SetInfo:PD2 Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jackalope_herd.txt b/res/cardsfolder/j/jackalope_herd.txt
index 4869b36be15..d151dd17d84 100644
--- a/res/cardsfolder/j/jackalope_herd.txt
+++ b/res/cardsfolder/j/jackalope_herd.txt
@@ -5,7 +5,6 @@ PT:4/5
 T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ When you cast a spell, return CARDNAME to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jackalope_herd.jpg
-SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/111.jpg
 Oracle:When you cast a spell, return Jackalope Herd to its owner's hand.
+SetInfo:EXO Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jacques_le_vert.txt b/res/cardsfolder/j/jacques_le_vert.txt
index 00cb3a88875..77331b9719e 100644
--- a/res/cardsfolder/j/jacques_le_vert.txt
+++ b/res/cardsfolder/j/jacques_le_vert.txt
@@ -4,7 +4,6 @@ Types:Legendary Creature Human Warrior
 PT:3/2
 S:Mode$ Continuous | Affected$ Creature.Green+YouCtrl | AddToughness$ 2 | Description$ Green creatures you control get +0/+2.
 SVar:PlayMain1:TRUE
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jacques_le_vert.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/272.jpg
 Oracle:Green creatures you control get +0/+2.
+SetInfo:LEG Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jaddi_lifestrider.txt b/res/cardsfolder/j/jaddi_lifestrider.txt
index f0574e286fb..0345481795b 100644
--- a/res/cardsfolder/j/jaddi_lifestrider.txt
+++ b/res/cardsfolder/j/jaddi_lifestrider.txt
@@ -10,7 +10,6 @@ SVar:DBJaddiLifestriderCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:JaddiLifestriderX:Count$Valid Creature.YouCtrl
 SVar:JaddiLifestriderY:Remembered$Amount
 SVar:JaddiLifestriderZ:SVar$JaddiLifestriderY/Times.2
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jaddi_lifestrider.jpg
-SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/189.jpg
 Oracle:When Jaddi Lifestrider enters the battlefield, you may tap any number of untapped creatures you control. You gain 2 life for each creature tapped this way.
+SetInfo:ROE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jade_idol.txt b/res/cardsfolder/j/jade_idol.txt
index 7aadc456593..7428ab3cbd1 100644
--- a/res/cardsfolder/j/jade_idol.txt
+++ b/res/cardsfolder/j/jade_idol.txt
@@ -5,7 +5,6 @@ T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | Trig
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Spirit
 SVar:BuffedBy:Arcane,Spirit
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jade_idol.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/256.jpg
 Oracle:Whenever you cast a Spirit or Arcane spell, Jade Idol becomes a 4/4 Spirit artifact creature until end of turn.
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jade_leech.txt b/res/cardsfolder/j/jade_leech.txt
index 4e7e49a53cf..10a5535f341 100644
--- a/res/cardsfolder/j/jade_leech.txt
+++ b/res/cardsfolder/j/jade_leech.txt
@@ -3,7 +3,6 @@ ManaCost:2 G G
 Types:Creature Leech
 PT:5/5
 S:Mode$ RaiseCost | ValidCard$ Card.Green | Activator$ You | Type$ Spell | Color$ G | Amount$ 1 | Description$ Green spells you cast cost G more to cast.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jade_leech.jpg
-SetInfo:INV|Rare|http://magiccards.info/scans/en/in/190.jpg
 Oracle:Green spells you cast cost {G} more to cast.
+SetInfo:INV Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jade_mage.txt b/res/cardsfolder/j/jade_mage.txt
index 1e450c26aa1..89f750eb2fd 100644
--- a/res/cardsfolder/j/jade_mage.txt
+++ b/res/cardsfolder/j/jade_mage.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Human Shaman
 PT:2/1
 A:AB$ Token | Cost$ 2 G | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jade_mage.jpg
-SetInfo:M12|Uncommon|http://magiccards.info/scans/en/m12/181.jpg
 Oracle:{2}{G}: Put a 1/1 green Saproling creature token onto the battlefield.
+SetInfo:M12 Uncommon
+SetInfo:DDH Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jade_monolith.txt b/res/cardsfolder/j/jade_monolith.txt
index 45f58408580..1b7245d928f 100644
--- a/res/cardsfolder/j/jade_monolith.txt
+++ b/res/cardsfolder/j/jade_monolith.txt
@@ -12,13 +12,12 @@ SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jade_monolith.jpg
-SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/252.jpg
-SetInfo:LEB|Rare|http://magiccards.info/scans/en/be/254.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/381.jpg
-SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/347.jpg
-SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/293.jpg
-SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/255.jpg
-SetInfo:2ED|Rare|http://magiccards.info/scans/en/un/253.jpg
 Oracle:{1}: The next time a source of your choice would deal damage to target creature this turn, that source deals that damage to you instead.
+SetInfo:2ED Rare
+SetInfo:6ED Rare
+SetInfo:LEB Rare
+SetInfo:LEA Rare
+SetInfo:5ED Rare
+SetInfo:4ED Rare
+SetInfo:3ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jade_statue.txt b/res/cardsfolder/j/jade_statue.txt
index fad7e082450..6403e970c65 100644
--- a/res/cardsfolder/j/jade_statue.txt
+++ b/res/cardsfolder/j/jade_statue.txt
@@ -3,10 +3,9 @@ ManaCost:4
 Types:Artifact
 A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 3 | Toughness$ 6 | Types$ Creature,Artifact,Golem | UntilEndOfCombat$ True | ActivationPhases$ BeginCombat->EndCombat | SpellDescription$ CARDNAME becomes a 3/6 Golem artifact creature until end of combat. Activate this ability only during combat.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jade_statue.jpg
-SetInfo:LEA|Uncommon|http://magiccards.info/scans/en/al/253.jpg
-SetInfo:LEB|Uncommon|http://magiccards.info/scans/en/be/255.jpg
-SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/300.jpg
-SetInfo:2ED|Uncommon|http://magiccards.info/scans/en/un/254.jpg
 Oracle:{2}: Jade Statue becomes a 3/6 Golem artifact creature until end of combat. Activate this ability only during combat.
+SetInfo:LEB Uncommon
+SetInfo:LEA Uncommon
+SetInfo:9ED Rare
+SetInfo:2ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jaded_response.txt b/res/cardsfolder/j/jaded_response.txt
index 9c9579e9e9b..761b9784bed 100644
--- a/res/cardsfolder/j/jaded_response.txt
+++ b/res/cardsfolder/j/jaded_response.txt
@@ -4,5 +4,5 @@ Types:Instant
 A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | ValidTgts$ Card | AITgts$ Card.SharesColorWith Creature.YouCtrl | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X | SpellDescription$ Counter target spell if it shares a color with a creature you control.
 SVar:X:Targeted$Valid Card.SharesColorWith Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jaded_response.jpg
-SetInfo:APC|Common|http://magiccards.info/scans/en/ap/26.jpg
 Oracle:Counter target spell if it shares a color with a creature you control.
+SetInfo:APC Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jagged_lightning.txt b/res/cardsfolder/j/jagged_lightning.txt
index 6c9802678f9..891542b6ab8 100644
--- a/res/cardsfolder/j/jagged_lightning.txt
+++ b/res/cardsfolder/j/jagged_lightning.txt
@@ -2,9 +2,8 @@ Name:Jagged Lightning
 ManaCost:3 R R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 3 R R | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to each of two target creatures.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jagged_lightning.jpg
-SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/200.jpg
-SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/106.jpg
-SetInfo:S99|Uncommon|http://magiccards.info/scans/en/st/109.jpg
 Oracle:Jagged Lightning deals 3 damage to each of two target creatures.
+SetInfo:PO2 Uncommon
+SetInfo:S99 Uncommon
+SetInfo:USG Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jagged_poppet.txt b/res/cardsfolder/j/jagged_poppet.txt
index 1e8cd60160d..4e21df90114 100644
--- a/res/cardsfolder/j/jagged_poppet.txt
+++ b/res/cardsfolder/j/jagged_poppet.txt
@@ -9,7 +9,6 @@ SVar:TrigOppDiscard:AB$ Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$
 SVar:X:TriggerCount$DamageAmount
 SVar:NeedsToPlayVar:Y LE2
 SVar:Y:Count$CardsInYourHand
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jagged_poppet.jpg
-SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/115.jpg
 Oracle:Whenever Jagged Poppet is dealt damage, discard that many cards.\nHellbent - Whenever Jagged Poppet deals combat damage to a player, if you have no cards in hand, that player discards cards equal to the damage.
+SetInfo:DIS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jagged_scar_archers.txt b/res/cardsfolder/j/jagged_scar_archers.txt
index 968809a3e15..12bb6999149 100644
--- a/res/cardsfolder/j/jagged_scar_archers.txt
+++ b/res/cardsfolder/j/jagged_scar_archers.txt
@@ -8,7 +8,6 @@ A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.withFlying | TgtPrompt$ Select
 SVar:X:Count$CardPower
 SVar:BuffedBy:Permanent.Elf
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jagged_scar_archers.jpg
-SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/222.jpg
 Oracle:Jagged-Scar Archers's power and toughness are each equal to the number of Elves you control.\n{T}: Jagged-Scar Archers deals damage equal to its power to target creature with flying.
+SetInfo:LRW Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jagwasp_swarm.txt b/res/cardsfolder/j/jagwasp_swarm.txt
index f8b3979171c..d5698a50556 100644
--- a/res/cardsfolder/j/jagwasp_swarm.txt
+++ b/res/cardsfolder/j/jagwasp_swarm.txt
@@ -3,7 +3,6 @@ ManaCost:3 B
 Types:Creature Insect
 PT:3/2
 K:Flying
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jagwasp_swarm.jpg
-SetInfo:WWK|Common|http://magiccards.info/scans/en/wwk/58.jpg
 Oracle:Flying
+SetInfo:WWK Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jalum_tome.txt b/res/cardsfolder/j/jalum_tome.txt
index d7e457f169c..a89b8d76853 100644
--- a/res/cardsfolder/j/jalum_tome.txt
+++ b/res/cardsfolder/j/jalum_tome.txt
@@ -4,11 +4,10 @@ Types:Artifact
 A:AB$ Draw | Cost$ 2 T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 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
 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
+SetInfo:ATQ Uncommon
+SetInfo:5ED Rare
+SetInfo:7ED Rare
+SetInfo:CHR Rare
+SetInfo:6ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jamuraan_lion.txt b/res/cardsfolder/j/jamuraan_lion.txt
index 4c83637e75b..54b13f8de11 100644
--- a/res/cardsfolder/j/jamuraan_lion.txt
+++ b/res/cardsfolder/j/jamuraan_lion.txt
@@ -4,7 +4,6 @@ Types:Creature Cat
 PT:3/1
 A:AB$ Pump | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jamuraan_lion.jpg
-SetInfo:VIS|Common|http://magiccards.info/scans/en/vi/110.jpg
 Oracle:{W}, {T}: Target creature can't block this turn.
+SetInfo:VIS Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jandors_ring.txt b/res/cardsfolder/j/jandors_ring.txt
index b145dbd76be..42cda0ad8ec 100644
--- a/res/cardsfolder/j/jandors_ring.txt
+++ b/res/cardsfolder/j/jandors_ring.txt
@@ -3,7 +3,7 @@ ManaCost:6
 Types:Artifact
 A:AB$ Draw | Cost$ 2 T Discard<1/LastDrawn> | NumCards$ 1 | SpellDescription$  Draw a card.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jandors_ring.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/78.jpg
 Oracle:{2}, {T}, Discard the last card you drew this turn: Draw a card.
+SetInfo:3ED Rare
+SetInfo:ARN Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jandors_saddlebags.txt b/res/cardsfolder/j/jandors_saddlebags.txt
index 498c9cbd8d1..849671dd544 100644
--- a/res/cardsfolder/j/jandors_saddlebags.txt
+++ b/res/cardsfolder/j/jandors_saddlebags.txt
@@ -3,11 +3,10 @@ ManaCost:2
 Types:Artifact
 A:AB$ Untap | Cost$ 3 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Untap target creature.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jandors_saddlebags.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/383.jpg
-SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/257.jpg
-SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/348.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/79.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/304.jpg
 Oracle:{3}, {T}: Untap target creature.
+SetInfo:5ED Rare
+SetInfo:7ED Rare
+SetInfo:4ED Rare
+SetInfo:3ED Rare
+SetInfo:ARN Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jangling_automaton.txt b/res/cardsfolder/j/jangling_automaton.txt
index 53394e466a6..e63ee5a23bb 100644
--- a/res/cardsfolder/j/jangling_automaton.txt
+++ b/res/cardsfolder/j/jangling_automaton.txt
@@ -5,7 +5,6 @@ PT:3/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME attacks, untap all creatures defending player controls.
 SVar:TrigUntap:AB$UntapAll | Cost$ 0 | ValidCards$ Creature.DefenderCtrl
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jangling_automaton.jpg
-SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/151.jpg
 Oracle:Whenever Jangling Automaton attacks, untap all creatures defending player controls.
+SetInfo:WTH Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jar_of_eyeballs.txt b/res/cardsfolder/j/jar_of_eyeballs.txt
index 051f5845c30..f56b659eeac 100644
--- a/res/cardsfolder/j/jar_of_eyeballs.txt
+++ b/res/cardsfolder/j/jar_of_eyeballs.txt
@@ -6,7 +6,6 @@ SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ EYEBA
 A:AB$ Dig | Cost$ 3 T SubCounter<All/EYEBALL> | DigNum$ X | ChangeNum$ 1 | DestinationZone$ Hand | DestinationZone2$ Library | LibraryPosition$ -1 | References$ X | SpellDescription$ Look at the top X cards of your library where X is the number of eyeball counters removed this way. Put one of them into your hand and the rest on the bottom of your library in any order.
 SVar:X:SVar$CostCountersRemoved
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jar_of_eyeballs.jpg
-SetInfo:DKA|Rare|http://magiccards.info/scans/en/dka/152.jpg
 Oracle:Whenever a creature you control dies, put two eyeball counters on Jar of Eyeballs.\n{3}, {T}, Remove all eyeball counters from Jar of Eyeballs: Look at the top X cards of your library, where X is the number of eyeball counters removed this way. Put one of them into your hand and the rest on the bottom of your library in any order.
+SetInfo:DKA Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jarad_golgari_lich_lord.txt b/res/cardsfolder/j/jarad_golgari_lich_lord.txt
index 7865e00e5b9..552f75a9e6a 100644
--- a/res/cardsfolder/j/jarad_golgari_lich_lord.txt
+++ b/res/cardsfolder/j/jarad_golgari_lich_lord.txt
@@ -7,7 +7,7 @@ A:AB$ LoseLife | Cost$ 1 B G Sac<1/Creature.Other/creature other than CARDNAME>
 A:AB$ ChangeZone | Cost$ Sac<1/Swamp> Sac<1/Forest> | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to your hand.
 SVar:X:Count$TypeInYourYard.Creature
 SVar:LichLeech:Sacrificed$CardPower
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jarad_golgari_lich_lord.jpg
-SetInfo:RTR|Mythic|http://magiccards.info/scans/en/rtr/174.jpg
 Oracle:Jarad, Golgari Lich Lord gets +1/+1 for each creature card in your graveyard.\n{1}{B}{G}, Sacrifice another creature: Each opponent loses life equal to the sacrificed creature's power.\nSacrifice a Swamp and a Forest: Return Jarad from your graveyard to your hand.
+SetInfo:DDJ Mythic
+SetInfo:RTR Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/j/jarads_orders.txt b/res/cardsfolder/j/jarads_orders.txt
index 1b1d2c2868b..5ca965f1173 100644
--- a/res/cardsfolder/j/jarads_orders.txt
+++ b/res/cardsfolder/j/jarads_orders.txt
@@ -5,7 +5,6 @@ A:SP$ ChangeZone | Cost$ 2 B G | Origin$ Library | Destination$ Library | Change
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your hand | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Creature.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card for your graveyard | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jarads_orders.jpg
-SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/175.jpg
 Oracle:Search your library for up to two creature cards and reveal them. Put one into your hand and the other into your graveyard. Then shuffle your library.
+SetInfo:RTR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jareth_leonine_titan.txt b/res/cardsfolder/j/jareth_leonine_titan.txt
index ef0a1952148..e7b1cae27df 100644
--- a/res/cardsfolder/j/jareth_leonine_titan.txt
+++ b/res/cardsfolder/j/jareth_leonine_titan.txt
@@ -5,7 +5,6 @@ PT:4/7
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks, it gets +7/+7 until end of turn.
 A:AB$ Protection | Cost$ W | Gains$ Choice | Choices$ AnyColor | SpellDescription$ CARDNAME gains protection from the color of your choice until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 7 | NumDef$ 7
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jareth_leonine_titan.jpg
-SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/43.jpg
 Oracle:Whenever Jareth, Leonine Titan blocks, it gets +7/+7 until end of turn.\n{W}: Jareth gains protection from the color of your choice until end of turn.
+SetInfo:ONS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jasmine_boreal.txt b/res/cardsfolder/j/jasmine_boreal.txt
index 54aeb74478b..b0362c7cddf 100644
--- a/res/cardsfolder/j/jasmine_boreal.txt
+++ b/res/cardsfolder/j/jasmine_boreal.txt
@@ -2,8 +2,7 @@ Name:Jasmine Boreal
 ManaCost:3 W G
 Types:Legendary Creature Human
 PT:4/5
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/tsb/en-us/card109764.jpg
-SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/93.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/273.jpg
 Oracle:
+SetInfo:LEG Uncommon
+SetInfo:TSB Special
\ No newline at end of file
diff --git a/res/cardsfolder/j/jasmine_seer.txt b/res/cardsfolder/j/jasmine_seer.txt
index f6bc1a0d5b2..09699a5d33e 100644
--- a/res/cardsfolder/j/jasmine_seer.txt
+++ b/res/cardsfolder/j/jasmine_seer.txt
@@ -7,7 +7,6 @@ SVar:DBJasmineLife:DB$ GainLife | LifeAmount$ JasmineX | SubAbility$ DBJasmineCl
 SVar:JasmineX:Remembered$Amount.Twice
 SVar:DBJasmineCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jasmine_seer.jpg
-SetInfo:UDS|Uncommon|http://magiccards.info/scans/en/ud/9.jpg
 Oracle:{2}{W}, {T}: Reveal any number of white cards in your hand. You gain 2 life for each card revealed this way.
+SetInfo:UDS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jawbone_skulkin.txt b/res/cardsfolder/j/jawbone_skulkin.txt
index 1662a868c73..f748b7b05af 100644
--- a/res/cardsfolder/j/jawbone_skulkin.txt
+++ b/res/cardsfolder/j/jawbone_skulkin.txt
@@ -3,7 +3,6 @@ ManaCost:1
 Types:Artifact Creature Scarecrow
 PT:1/1
 A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature.Red | TgtPrompt$ Select target red creature | KW$ Haste | SpellDescription$ Target red creature gains haste until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jawbone_skulkin.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/170.jpg
 Oracle:{2}: Target red creature gains haste until end of turn.
+SetInfo:EVE Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jaws_of_stone.txt b/res/cardsfolder/j/jaws_of_stone.txt
index 921c4cb0636..8cf1dc6ea2b 100644
--- a/res/cardsfolder/j/jaws_of_stone.txt
+++ b/res/cardsfolder/j/jaws_of_stone.txt
@@ -7,5 +7,7 @@ SVar:CountMountainsAtCast:DB$ StoreSVar | SVar$ OrigMountains | Type$ Count | Ex
 SVar:OrigMountains:Count$Valid Mountain.YouCtrl
 SVar:Min:SVar$OrigMountains/LimitMax.1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jaws_of_stone.jpg
-SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/97.jpg
 Oracle:Jaws of Stone deals X damage divided as you choose among any number of target creatures and/or players, where X is the number of Mountains you control as you cast Jaws of Stone.
+SetInfo:DDI Uncommon
+SetInfo:DDG Uncommon
+SetInfo:SHM Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jaya_ballard_avatar.txt b/res/cardsfolder/j/jaya_ballard_avatar.txt
index 8f04309f0c3..8e412b5f958 100644
--- a/res/cardsfolder/j/jaya_ballard_avatar.txt
+++ b/res/cardsfolder/j/jaya_ballard_avatar.txt
@@ -5,7 +5,6 @@ HandLifeModifier:+0/+1
 A:AB$ DealDamage | ActivationZone$ Command | Cost$ X | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ Y | References$ X,Y | ActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ CARDNAME deals an amount of damage chosen at random from 0 to X to target creature or player. Activate this ability only once each turn.
 SVar:X:Count$xPaid
 SVar:Y:Count$Random.0.X
-SVar:Rarity:Special
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/jaya_ballard_avatar.jpg
-SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo/jaya-ballard-task-mage.jpg
 Oracle:Hand +0, life +1\n{X}: Jaya Ballard Avatar deals an amount of damage chosen at random from 0 to X to target creature or player. Activate this ability only once each turn.
+SetInfo:VAN Special
\ No newline at end of file
diff --git a/res/cardsfolder/j/jaya_ballard_task_mage.txt b/res/cardsfolder/j/jaya_ballard_task_mage.txt
index 591d781de7e..d28234302a4 100644
--- a/res/cardsfolder/j/jaya_ballard_task_mage.txt
+++ b/res/cardsfolder/j/jaya_ballard_task_mage.txt
@@ -6,7 +6,7 @@ A:AB$ Destroy | Cost$ R T Discard<1/Card> | ValidTgts$ Permanent.Blue | TgtPromp
 A:AB$ DealDamage | Cost$ 1 R T Discard<1/Card> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SubAbility$ DBNoRegen | SpellDescription$ CARDNAME deals 3 damage to target creature or player. A creature dealt damage this way can't be regenerated this turn.
 A:AB$ DamageAll | Cost$ 5 R R T Discard<1/Card> | NumDmg$ 6 | ValidPlayers$ Each | ValidCards$ Creature | ValidDescription$ each creature and each player. | SpellDescription$ CARDNAME deals 6 damage to each creature and each player.
 SVar:DBNoRegen:DB$Pump | KW$ HIDDEN CARDNAME can't be regenerated. | Defined$ Targeted
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jaya_ballard_task_mage.jpg
-SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/166.jpg
 Oracle:{R}, {T}, Discard a card: Destroy target blue permanent.\n{1}{R}, {T}, Discard a card: Jaya Ballard, Task Mage deals 3 damage to target creature or player. A creature dealt damage this way can't be regenerated this turn.\n{5}{R}{R}, {T}, Discard a card: Jaya Ballard deals 6 damage to each creature and each player.
+SetInfo:PD2 Rare
+SetInfo:TSP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jayemdae_tome.txt b/res/cardsfolder/j/jayemdae_tome.txt
index c8197d352f7..00b8bc1c597 100644
--- a/res/cardsfolder/j/jayemdae_tome.txt
+++ b/res/cardsfolder/j/jayemdae_tome.txt
@@ -2,17 +2,16 @@ Name:Jayemdae Tome
 ManaCost:4
 Types:Artifact
 A:AB$ Draw | Cost$ 4 T | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jayemdae_tome.jpg
-SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/306.jpg
-SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/254.jpg
-SetInfo:LEB|Rare|http://magiccards.info/scans/en/be/256.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/305.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/384.jpg
-SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/349.jpg
-SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/295.jpg
-SetInfo:10E|Rare|http://magiccards.info/scans/en/10e/327.jpg
-SetInfo:M13|Uncommon|http://magiccards.info/scans/en/m13/207.jpg
-SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/258.jpg
-SetInfo:2ED|Rare|http://magiccards.info/scans/en/un/255.jpg
 Oracle:{4}, {T}: Draw a card.
+SetInfo:8ED Rare
+SetInfo:2ED Rare
+SetInfo:7ED Rare
+SetInfo:6ED Rare
+SetInfo:10E Rare
+SetInfo:LEB Rare
+SetInfo:M13 Uncommon
+SetInfo:LEA Rare
+SetInfo:5ED Rare
+SetInfo:4ED Rare
+SetInfo:3ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jedit_ojanen.txt b/res/cardsfolder/j/jedit_ojanen.txt
index 3c7b2e25372..a06c0920e1c 100644
--- a/res/cardsfolder/j/jedit_ojanen.txt
+++ b/res/cardsfolder/j/jedit_ojanen.txt
@@ -2,7 +2,6 @@ Name:Jedit Ojanen
 ManaCost:4 W W U
 Types:Legendary Creature Cat Warrior
 PT:5/5
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/le/en-us/card1660.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/274.jpg
 Oracle:
+SetInfo:LEG Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jedit_ojanen_of_efrava.txt b/res/cardsfolder/j/jedit_ojanen_of_efrava.txt
index 93319a38045..a12bf009a56 100644
--- a/res/cardsfolder/j/jedit_ojanen_of_efrava.txt
+++ b/res/cardsfolder/j/jedit_ojanen_of_efrava.txt
@@ -6,7 +6,6 @@ K:Forestwalk
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks or blocks, put a 2/2 green Cat Warrior creature token with forestwalk onto the battlefield.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, put a 2/2 green Cat Warrior creature token with forestwalk onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Cat Warrior | TokenTypes$ Creature,Cat,Warrior | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Forestwalk
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jedit_ojanen_of_efrava.jpg
-SetInfo:PLC|Rare|http://magiccards.info/scans/en/pc/131.jpg
 Oracle:Forestwalk\nWhenever Jedit Ojanen of Efrava attacks or blocks, put a 2/2 green Cat Warrior creature token with forestwalk onto the battlefield.
+SetInfo:PLC Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jedits_dragoons.txt b/res/cardsfolder/j/jedits_dragoons.txt
index c3109fb8765..04dc30619e9 100644
--- a/res/cardsfolder/j/jedits_dragoons.txt
+++ b/res/cardsfolder/j/jedits_dragoons.txt
@@ -5,7 +5,7 @@ PT:2/5
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 4 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | LifeAmount$ 4
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jedits_dragoons.jpg
-SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/25.jpg
 Oracle:Vigilance\nWhen Jedit's Dragoons enters the battlefield, you gain 4 life.
+SetInfo:DDI Common
+SetInfo:TSP Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jenara_asura_of_war.txt b/res/cardsfolder/j/jenara_asura_of_war.txt
index e9208f5c70a..87439d87ebe 100644
--- a/res/cardsfolder/j/jenara_asura_of_war.txt
+++ b/res/cardsfolder/j/jenara_asura_of_war.txt
@@ -4,7 +4,6 @@ Types:Legendary Creature Angel
 PT:3/3
 K:Flying
 A:AB$ PutCounter | Cost$ 1 W | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jenara_asura_of_war.jpg
-SetInfo:ARB|Mythic|http://magiccards.info/scans/en/arb/128.jpg
 Oracle:Flying\n{1}{W}: Put a +1/+1 counter on Jenara, Asura of War.
+SetInfo:ARB Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/j/jerrard_of_the_closed_fist.txt b/res/cardsfolder/j/jerrard_of_the_closed_fist.txt
index 6075a208a29..6b1e02cd70f 100644
--- a/res/cardsfolder/j/jerrard_of_the_closed_fist.txt
+++ b/res/cardsfolder/j/jerrard_of_the_closed_fist.txt
@@ -2,7 +2,6 @@ Name:Jerrard of the Closed Fist
 ManaCost:3 G G R
 Types:Legendary Creature Human Knight
 PT:6/5
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/le/en-us/card1661.jpg
-SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/275.jpg
 Oracle:
+SetInfo:LEG Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jeska_warrior_adept.txt b/res/cardsfolder/j/jeska_warrior_adept.txt
index d5ec3999a53..145d84704bc 100644
--- a/res/cardsfolder/j/jeska_warrior_adept.txt
+++ b/res/cardsfolder/j/jeska_warrior_adept.txt
@@ -5,7 +5,6 @@ PT:3/1
 K:First Strike
 K:Haste
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jeska_warrior_adept.jpg
-SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/93.jpg
 Oracle:First strike, haste\n{T}: Jeska, Warrior Adept deals 1 damage to target creature or player.
+SetInfo:JUD Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jesters_cap.txt b/res/cardsfolder/j/jesters_cap.txt
index 46bc280c6a8..5be8958af89 100644
--- a/res/cardsfolder/j/jesters_cap.txt
+++ b/res/cardsfolder/j/jesters_cap.txt
@@ -3,9 +3,9 @@ ManaCost:4
 Types:Artifact
 A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | ValidTgts$ Player | Chooser$ You | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 3 | IsCurse$ True | SpellDescription$ Search target player's library for three cards and exile them. Then that player shuffles his or her library.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jesters_cap.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/385.jpg
-SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/301.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/299.jpg
 Oracle:{2}, {T}, Sacrifice Jester's Cap: Search target player's library for three cards and exile them. Then that player shuffles his or her library.
+SetInfo:ICE Rare
+SetInfo:5ED Rare
+SetInfo:V10 Mythic
+SetInfo:9ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jesters_mask.txt b/res/cardsfolder/j/jesters_mask.txt
index 7c0b40ca138..c56fe77d311 100644
--- a/res/cardsfolder/j/jesters_mask.txt
+++ b/res/cardsfolder/j/jesters_mask.txt
@@ -7,7 +7,6 @@ SVar:DBMask:DB$ ChangeZone | DefinedPlayer$ Targeted | Origin$ Library | Destina
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jesters_mask.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/300.jpg
 Oracle:Jester's Mask enters the battlefield tapped.\n{1}, {T}, Sacrifice Jester's Mask: Target opponent puts the cards from his or her hand on top of his or her library. Search that player's library for that many cards. That player puts those cards into his or her hand, then shuffles his or her library.
+SetInfo:ICE Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jet_medallion.txt b/res/cardsfolder/j/jet_medallion.txt
index 172f63bb189..b157597deec 100644
--- a/res/cardsfolder/j/jet_medallion.txt
+++ b/res/cardsfolder/j/jet_medallion.txt
@@ -4,7 +4,6 @@ Types:Artifact
 S:Mode$ ReduceCost | ValidCard$ Card.Black | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Black spells you cast cost 1 less to cast.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Black
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jet_medallion.jpg
-SetInfo:TMP|Rare|http://magiccards.info/scans/en/tp/282.jpg
 Oracle:Black spells you cast cost {1} less to cast.
+SetInfo:TMP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jeweled_bird.txt b/res/cardsfolder/j/jeweled_bird.txt
index 93b7081439a..c14a7a8ef8a 100644
--- a/res/cardsfolder/j/jeweled_bird.txt
+++ b/res/cardsfolder/j/jeweled_bird.txt
@@ -10,6 +10,6 @@ SVar:Y:Remembered$Amount
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jeweled_bird.jpg
-SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/82.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/80.jpg
 Oracle:Remove Jeweled Bird from your deck before playing if you're not playing for ante.\n{T}: Put Jeweled Bird into the ante. If you do, put all other cards you own from the ante into your graveyard, then draw a card.
+SetInfo:CHR Rare
+SetInfo:ARN Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jeweled_spirit.txt b/res/cardsfolder/j/jeweled_spirit.txt
index d5ccbc2cc5f..e6ee856ad88 100644
--- a/res/cardsfolder/j/jeweled_spirit.txt
+++ b/res/cardsfolder/j/jeweled_spirit.txt
@@ -5,7 +5,6 @@ PT:3/3
 K:Flying
 A:AB$ Protection | Cost$ Sac<2/Land> | Gains$ Choice | Choices$ AnyColor,artifacts | SpellDescription$ CARDNAME gains protection from artifacts or from the color of your choice until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jeweled_spirit.jpg
-SetInfo:PCY|Rare|http://magiccards.info/scans/en/pr/12.jpg
 Oracle:Flying\nSacrifice two lands: Jeweled Spirit gains protection from artifacts or from the color of your choice until end of turn.
+SetInfo:PCY Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jeweled_torque.txt b/res/cardsfolder/j/jeweled_torque.txt
index 6c0c2373a4d..a241285cfd5 100644
--- a/res/cardsfolder/j/jeweled_torque.txt
+++ b/res/cardsfolder/j/jeweled_torque.txt
@@ -5,7 +5,6 @@ K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentInGame
 T:Mode$ SpellCast | ValidCard$ Card.ChosenColor | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a player casts a spell of the chosen color, you may pay 2. If you do, you gain 2 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 2 | Defined$ You | LifeAmount$ 2
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jeweled_torque.jpg
-SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/301.jpg
 Oracle:As Jeweled Torque enters the battlefield, choose a color.\nWhenever a player casts a spell of the chosen color, you may pay {2}. If you do, you gain 2 life.
+SetInfo:MMQ Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jhessian_balmgiver.txt b/res/cardsfolder/j/jhessian_balmgiver.txt
index a65be167e31..1339b1d76a6 100644
--- a/res/cardsfolder/j/jhessian_balmgiver.txt
+++ b/res/cardsfolder/j/jhessian_balmgiver.txt
@@ -4,7 +4,6 @@ Types:Creature Human Cleric
 PT:1/1
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to target creature or player this turn.
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature is unblockable this turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jhessian_balmgiver.jpg
-SetInfo:CFX|Uncommon|http://magiccards.info/scans/en/cfx/112.jpg
 Oracle:{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\n{T}: Target creature is unblockable this turn.
+SetInfo:CFX Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jhessian_infiltrator.txt b/res/cardsfolder/j/jhessian_infiltrator.txt
index 01f136bf028..1afc81dbc4c 100644
--- a/res/cardsfolder/j/jhessian_infiltrator.txt
+++ b/res/cardsfolder/j/jhessian_infiltrator.txt
@@ -3,7 +3,6 @@ ManaCost:G U
 Types:Creature Human Rogue
 PT:2/2
 K:Unblockable
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jhessian_infiltrator.jpg
-SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/174.jpg
 Oracle:Jhessian Infiltrator is unblockable.
+SetInfo:ALA Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jhessian_lookout.txt b/res/cardsfolder/j/jhessian_lookout.txt
index 186ad9b4491..bf1a79c82e3 100644
--- a/res/cardsfolder/j/jhessian_lookout.txt
+++ b/res/cardsfolder/j/jhessian_lookout.txt
@@ -2,7 +2,6 @@ Name:Jhessian Lookout
 ManaCost:1 U
 Types:Creature Human Scout
 PT:2/1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jhessian_lookout.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/46.jpg
 Oracle:
+SetInfo:ALA Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jhessian_zombies.txt b/res/cardsfolder/j/jhessian_zombies.txt
index a94151a3ba3..088af1370bf 100644
--- a/res/cardsfolder/j/jhessian_zombies.txt
+++ b/res/cardsfolder/j/jhessian_zombies.txt
@@ -5,7 +5,7 @@ PT:2/4
 K:Fear
 K:TypeCycling:Swamp:2
 K:TypeCycling:Island:2
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jhessian_zombies.jpg
-SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/22.jpg
 Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nIslandcycling {2}, swampcycling {2} ({2}, Discard this card: Search your library for an Island or Swamp card, reveal it, and put it into your hand. Then shuffle your library.)
+SetInfo:ARB Common
+SetInfo:DDH Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jhoira_of_the_ghitu.txt b/res/cardsfolder/j/jhoira_of_the_ghitu.txt
index 948dc7a2ee9..1e5dcc858e6 100644
--- a/res/cardsfolder/j/jhoira_of_the_ghitu.txt
+++ b/res/cardsfolder/j/jhoira_of_the_ghitu.txt
@@ -6,7 +6,6 @@ A:AB$ PutCounter | Cost$ 2 ExileFromHand<1/Card.nonLand/nonland card> | CostDesc
 SVar:GiveSuspend:DB$ PumpAll | ValidCards$ Card.IsRemembered+withoutSuspend | KW$ Suspend | PumpZone$ Exile | Permanent$ True | SubAbility$ DBCleanup | StackDescription$ If it doesn't have suspend, it gains suspend.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jhoira_of_the_ghitu.jpg
-SetInfo:FUT|Rare|http://magiccards.info/scans/en/fut/157.jpg
 Oracle:{2}, Exile a nonland card from your hand: Put four time counters on the exiled card. If it doesn't have suspend, it gains suspend. (At the beginning of your upkeep, remove a time counter from that card. When the last is removed, cast it without paying its mana cost. If it's a creature, it has haste.)
+SetInfo:FUT Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jhoiras_timebug.txt b/res/cardsfolder/j/jhoiras_timebug.txt
index ab14c3cae2f..9dfcca1f7e1 100644
--- a/res/cardsfolder/j/jhoiras_timebug.txt
+++ b/res/cardsfolder/j/jhoiras_timebug.txt
@@ -6,7 +6,6 @@ A:AB$ GenericChoice | Cost$ T | ValidTgts$ Permanent.inZoneBattlefield+YouCtrl,C
 SVar:LoseTime:DB$ RemoveCounter | Defined$ Targeted | TgtPrompt$ Select target permanent or suspended card. | CounterType$ TIME | CounterNum$ 1 | ChoiceDescription$ Remove a time counter.
 SVar:AddTime:DB$ PutCounter | Defined$ Targeted | TgtPrompt$ Select target permanent with a time counter on it or suspended card. | CounterType$ TIME | CounterNum$ 1 | TgtZone$ Battlefield,Exile | ChoiceDescription$ Add a time counter.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jhoiras_timebug.jpg
-SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/257.jpg
 Oracle:{T}: Choose target permanent you control or suspended card you own. If that permanent or card has a time counter on it, you may remove a time counter from it or put another time counter on it.
+SetInfo:TSP Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jhoiras_toolbox.txt b/res/cardsfolder/j/jhoiras_toolbox.txt
index d7f71624ea2..a45d0bb9589 100644
--- a/res/cardsfolder/j/jhoiras_toolbox.txt
+++ b/res/cardsfolder/j/jhoiras_toolbox.txt
@@ -3,7 +3,6 @@ ManaCost:2
 Types:Artifact Creature Insect
 PT:1/1
 A:AB$ Regenerate | Cost$ 2 | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature. | SpellDescription$ Regenerate target artifact creature.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jhoiras_toolbox.jpg
-SetInfo:ULG|Uncommon|http://magiccards.info/scans/en/ul/128.jpg
 Oracle:{2}: Regenerate target artifact creature.
+SetInfo:ULG Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jhovall_queen.txt b/res/cardsfolder/j/jhovall_queen.txt
index 6b470bb5ca2..cf0fc8a2720 100644
--- a/res/cardsfolder/j/jhovall_queen.txt
+++ b/res/cardsfolder/j/jhovall_queen.txt
@@ -3,7 +3,6 @@ ManaCost:4 W W
 Types:Creature Cat Rebel
 PT:4/7
 K:Vigilance
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jhovall_queen.jpg
-SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/25.jpg
 Oracle:Vigilance
+SetInfo:MMQ Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jhovall_rider.txt b/res/cardsfolder/j/jhovall_rider.txt
index 1f095aa5323..815e6197d25 100644
--- a/res/cardsfolder/j/jhovall_rider.txt
+++ b/res/cardsfolder/j/jhovall_rider.txt
@@ -3,7 +3,6 @@ ManaCost:4 W
 Types:Creature Human Rebel
 PT:3/3
 K:Trample
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/mm/en-us/card20172.jpg
-SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/26.jpg
 Oracle:Trample
+SetInfo:MMQ Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jihad.txt b/res/cardsfolder/j/jihad.txt
index 619b98d1078..f5e7aef6286 100644
--- a/res/cardsfolder/j/jihad.txt
+++ b/res/cardsfolder/j/jihad.txt
@@ -8,7 +8,6 @@ S:Mode$ Continuous | Affected$ Creature.White | AddPower$ 2 | AddToughness$ 1 |
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Permanent.nontoken+ChosenColor+YouDontCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When the chosen player controls no nontoken permanents of the chosen color, sacrifice CARDNAME.
 SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ Self
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jihad.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/60.jpg
 Oracle:As Jihad enters the battlefield, choose a color and an opponent.\nWhite creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color.\nWhen the chosen player controls no nontoken permanents of the chosen color, sacrifice Jihad.
+SetInfo:ARN Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jilt.txt b/res/cardsfolder/j/jilt.txt
index 773cc92cf2c..f80cf0c4d6b 100644
--- a/res/cardsfolder/j/jilt.txt
+++ b/res/cardsfolder/j/jilt.txt
@@ -4,7 +4,6 @@ Types:Instant
 A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature |TgtPrompt$ Select target creature | TargetUnique$ True | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. If CARDNAME was kicked, it deals 2 damage to another target creature.
 A:SP$ ChangeZone | Cost$ 2 U R | SetAsKicked$ True | ValidTgts$ Creature |TgtPrompt$ Select target creature | TargetUnique$ True | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBDamage | SpellDescription$ Kicker 1 R (You may pay an additional 1 R as you cast this spell.)
 SVar:DBDamage:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select another target creature | TargetUnique$ True | NumDmg$ 2
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jilt.jpg
-SetInfo:APC|Common|http://magiccards.info/scans/en/ap/27.jpg
 Oracle:Kicker {1}{R} (You may pay an additional {1}{R} as you cast this spell.)\nReturn target creature to its owner's hand. If Jilt was kicked, it deals 2 damage to another target creature.
+SetInfo:APC Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jin_gitaxias_core_augur.txt b/res/cardsfolder/j/jin_gitaxias_core_augur.txt
index fb81c3c29de..a622fa3c19d 100644
--- a/res/cardsfolder/j/jin_gitaxias_core_augur.txt
+++ b/res/cardsfolder/j/jin_gitaxias_core_augur.txt
@@ -6,7 +6,6 @@ K:Flash
 S:Mode$ Continuous | Affected$ Opponent | RaiseMaxHandSize$ -7 | Description$ Each opponent's maximum hand size is reduced by seven.
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, draw seven cards.
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 7
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jin_gitaxias_core_augur.jpg
-SetInfo:NPH|Mythic|http://magiccards.info/scans/en/nph/37.jpg
 Oracle:Flash\nAt the beginning of your end step, draw seven cards.\nEach opponent's maximum hand size is reduced by seven.
+SetInfo:NPH Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/j/jinx.txt b/res/cardsfolder/j/jinx.txt
index c4337b5f0bd..513615a26d7 100644
--- a/res/cardsfolder/j/jinx.txt
+++ b/res/cardsfolder/j/jinx.txt
@@ -5,7 +5,6 @@ A:SP$ ChooseType | Cost$ 1 U | Defined$ You | Type$ Basic Land | SubAbility$ DBA
 SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | NextUpkeep$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jinx.jpg
-SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/36.jpg
 Oracle:Target land becomes the basic land type of your choice until end of turn.\nDraw a card at the beginning of the next turn's upkeep.
+SetInfo:HML Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jinxed_idol.txt b/res/cardsfolder/j/jinxed_idol.txt
index 52fd2ea9058..1d43ec0ac3a 100644
--- a/res/cardsfolder/j/jinxed_idol.txt
+++ b/res/cardsfolder/j/jinxed_idol.txt
@@ -6,8 +6,7 @@ SVar:TrigDamage:DB$ DealDamage | Defined$ You | NumDmg$ 2
 A:AB$ GainControl | Cost$ Sac<1/Creature> | Defined$ Self | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SpellDescription$ Target opponent gains control of CARDNAME.
 SVar:SacMe:4
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jinxed_idol.jpg
-SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/208.jpg
-SetInfo:TMP|Rare|http://magiccards.info/scans/en/tp/283.jpg
 Oracle:At the beginning of your upkeep, Jinxed Idol deals 2 damage to you.\nSacrifice a creature: Target opponent gains control of Jinxed Idol.
+SetInfo:M11 Rare
+SetInfo:TMP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jinxed_ring.txt b/res/cardsfolder/j/jinxed_ring.txt
index 756c5febbed..fb2e17ef74f 100644
--- a/res/cardsfolder/j/jinxed_ring.txt
+++ b/res/cardsfolder/j/jinxed_ring.txt
@@ -6,7 +6,6 @@ SVar:TrigDamage:DB$ DealDamage | Defined$ You | NumDmg$ 1
 A:AB$ GainControl | Cost$ Sac<1/Creature> | Defined$ Self | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SpellDescription$ Target opponent gains control of CARDNAME. (This effect lasts indefinitely.)
 SVar:SacMe:4
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jinxed_ring.jpg
-SetInfo:STH|Rare|http://magiccards.info/scans/en/sh/131.jpg
 Oracle:Whenever a nontoken permanent is put into your graveyard from the battlefield, Jinxed Ring deals 1 damage to you.\nSacrifice a creature: Target opponent gains control of Jinxed Ring. (This effect lasts indefinitely.)
+SetInfo:STH Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jiwari_the_earth_aflame.txt b/res/cardsfolder/j/jiwari_the_earth_aflame.txt
index b23a15ae083..420ab3c24aa 100644
--- a/res/cardsfolder/j/jiwari_the_earth_aflame.txt
+++ b/res/cardsfolder/j/jiwari_the_earth_aflame.txt
@@ -5,7 +5,6 @@ PT:3/3
 A:AB$ DealDamage | Cost$ X R T | ValidTgts$ Creature.withoutFlying | TgtPrompt$ Select target creature without flying. | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals X damage to target creature without flying.
 A:AB$ DamageAll | PrecostDesc$ Channel - | Cost$ X R R R Discard<1/CARDNAME> | ActivationZone$ Hand | ValidCards$ Creature.withoutFlying | NumDmg$ X | ValidDescription$ each creature without flying. | References$ X | SpellDescription$ CARDNAME deals X damage to each creature without flying.
 SVar:X:Count$xPaid
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jiwari_the_earth_aflame.jpg
-SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/107.jpg
 Oracle:{X}{R}, {T}: Jiwari, the Earth Aflame deals X damage to target creature without flying.\nChannel - {X}{R}{R}{R}, Discard Jiwari: Jiwari deals X damage to each creature without flying.
+SetInfo:SOK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jodahs_avenger.txt b/res/cardsfolder/j/jodahs_avenger.txt
index f592feb0a66..bc062f0cc2a 100644
--- a/res/cardsfolder/j/jodahs_avenger.txt
+++ b/res/cardsfolder/j/jodahs_avenger.txt
@@ -7,7 +7,6 @@ A:AB$ Pump | Cost$ 0 | NumAtt$ -1 | NumDef$ -1 | SubAbility$ ProtectRed | SpellD
 SVar:ProtectRed:DB$ Protection | Defined$ Self | Gains$ red
 A:AB$ Pump | Cost$ 0 | NumAtt$ -1 | NumDef$ -1 | KW$ Vigilance | SpellDescription$ CARDNAME gets -1/-1 and gains vigilance until end of turn.
 A:AB$ Pump | Cost$ 0 | NumAtt$ -1 | NumDef$ -1 | KW$ Shadow | SpellDescription$ CARDNAME gets -1/-1 and gains shadow until end of turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jodahs_avenger.jpg
-SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/42.jpg
 Oracle:{0}: Until end of turn, Jodah's Avenger gets -1/-1 and gains your choice of double strike, protection from red, vigilance, or shadow. (A creature with shadow can block or be blocked by only creatures with shadow.)
+SetInfo:PLC Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/johtull_wurm.txt b/res/cardsfolder/j/johtull_wurm.txt
index 975ecbc8f4f..84ca478ffe5 100644
--- a/res/cardsfolder/j/johtull_wurm.txt
+++ b/res/cardsfolder/j/johtull_wurm.txt
@@ -6,8 +6,7 @@ T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDesc
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ -X | NumDef$ -Y | References$ X,Y
 SVar:X:SVar$Y/Twice
 SVar:Y:TriggerCount$NumBlockers/Minus.1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/johtull_wurm.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/168.jpg
-SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/138.jpg
 Oracle:Whenever Johtull Wurm becomes blocked, it gets -2/-1 until end of turn for each creature blocking it beyond the first.
+SetInfo:ICE Uncommon
+SetInfo:5ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/join_the_ranks.txt b/res/cardsfolder/j/join_the_ranks.txt
index 2b0f6c1ca68..7ae7c554021 100644
--- a/res/cardsfolder/j/join_the_ranks.txt
+++ b/res/cardsfolder/j/join_the_ranks.txt
@@ -4,7 +4,6 @@ Types:Instant
 Text:Put two 1/1 white Soldier Ally creature tokens onto the battlefield.
 A:SP$ Token | Cost$ 3 W | TokenAmount$ 2 | TokenName$ Soldier Ally | TokenTypes$ Creature,Soldier,Ally | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
 SVar:PlayMain1:TRUE
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/join_the_ranks.jpg
-SetInfo:WWK|Common|http://magiccards.info/scans/en/wwk/9.jpg
 Oracle:Put two 1/1 white Soldier Ally creature tokens onto the battlefield.
+SetInfo:WWK Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/joiner_adept.txt b/res/cardsfolder/j/joiner_adept.txt
index 956f5b6560f..4828366d8c8 100644
--- a/res/cardsfolder/j/joiner_adept.txt
+++ b/res/cardsfolder/j/joiner_adept.txt
@@ -4,8 +4,7 @@ Types:Creature Elf Druid
 PT:2/1
 S:Mode$ Continuous | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "Tap: Add one mana of any color to your mana pool."
 SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color to your mana pool.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/joiner_adept.jpg
-SetInfo:5DN|Rare|http://magiccards.info/scans/en/5dn/89.jpg
-SetInfo:10E|Rare|http://magiccards.info/scans/en/10e/271.jpg
 Oracle:Lands you control have "{T}: Add one mana of any color to your mana pool."
+SetInfo:5DN Rare
+SetInfo:10E Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/joint_assault.txt b/res/cardsfolder/j/joint_assault.txt
index 7a81761a5b6..20ac5060e8b 100644
--- a/res/cardsfolder/j/joint_assault.txt
+++ b/res/cardsfolder/j/joint_assault.txt
@@ -3,7 +3,6 @@ ManaCost:G
 Types:Instant
 A:SP$ Pump | Cost$ G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2 | NumDef$ 2 | SubAbility$ DBPumpAll | SpellDescription$ Target creature gets +2/+2 until end of turn. If it's paired with a creature, that creature also gets +2/+2 until end of turn.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Targeted.PairedWith | NumAtt$ 2 | NumDef$ 2
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/joint_assault.jpg
-SetInfo:AVR|Common|http://magiccards.info/scans/en/avr/183.jpg
 Oracle:Target creature gets +2/+2 until end of turn. If it's paired with a creature, that creature also gets +2/+2 until end of turn.
+SetInfo:AVR Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jokulhaups.txt b/res/cardsfolder/j/jokulhaups.txt
index 1fa9bff4f8a..3763d4b165f 100644
--- a/res/cardsfolder/j/jokulhaups.txt
+++ b/res/cardsfolder/j/jokulhaups.txt
@@ -3,9 +3,8 @@ ManaCost:4 R R
 Types:Sorcery
 A:SP$ DestroyAll | Cost$ 4 R R | ValidCards$ Artifact,Creature,Land | NoRegen$ True | SpellDescription$ Destroy all artifacts, creatures, and lands. They can't be regenerated.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/6e/en-us/card14653.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/246.jpg
-SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/192.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/195.jpg
 Oracle:Destroy all artifacts, creatures, and lands. They can't be regenerated.
+SetInfo:ICE Rare
+SetInfo:5ED Rare
+SetInfo:6ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jokulmorder.txt b/res/cardsfolder/j/jokulmorder.txt
index ce7f2c0c84e..cd0a1c9b225 100644
--- a/res/cardsfolder/j/jokulmorder.txt
+++ b/res/cardsfolder/j/jokulmorder.txt
@@ -11,7 +11,6 @@ T:Mode$ LandPlayed | ValidCard$ Island.YouCtrl | Execute$ TrigUntap | TriggerZon
 SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self
 SVar:NeedsToPlayVar:Y GE5
 SVar:Y:Count$Valid Land.YouCtrl
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jokulmorder.jpg
-SetInfo:CSP|Rare|http://magiccards.info/scans/en/cs/37.jpg
 Oracle:Trample\nJokulmorder enters the battlefield tapped.\nWhen Jokulmorder enters the battlefield, sacrifice it unless you sacrifice five lands.\nJokulmorder doesn't untap during your untap step.\nWhenever you play an Island, you may untap Jokulmorder.
+SetInfo:CSP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jolrael_empress_of_beasts.txt b/res/cardsfolder/j/jolrael_empress_of_beasts.txt
index 3c15169b284..85347bafdab 100644
--- a/res/cardsfolder/j/jolrael_empress_of_beasts.txt
+++ b/res/cardsfolder/j/jolrael_empress_of_beasts.txt
@@ -3,8 +3,7 @@ ManaCost:3 G G
 Types:Legendary Creature Human Spellshaper
 PT:3/3
 A:AB$ AnimateAll | Cost$ 2 G T Discard<2/Card> | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land | Power$ 3 | Toughness$ 3 | Types$ Creature | SpellDescription$ All lands target player controls become 3/3 creatures until end of turn. They're still lands.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jolrael_empress_of_beasts.jpg
 Oracle:{2}{G}, {T}, Discard two cards: All lands target player controls become 3/3 creatures until end of turn. They're still lands.
-SetInfo:PCY|Rare|http://magiccards.info/scans/en/pr/115.jpg
-SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/81.jpg
+SetInfo:PCY Rare
+SetInfo:TSB Special
\ No newline at end of file
diff --git a/res/cardsfolder/j/jolraels_centaur.txt b/res/cardsfolder/j/jolraels_centaur.txt
index 8f90056ee94..dbbc18ee280 100644
--- a/res/cardsfolder/j/jolraels_centaur.txt
+++ b/res/cardsfolder/j/jolraels_centaur.txt
@@ -4,7 +4,6 @@ Types:Creature Centaur Archer
 PT:2/2
 K:Flanking
 K:Shroud
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jolraels_centaur.jpg
-SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/120.jpg
 Oracle:Shroud (This permanent can't be the target of spells or abilities.)\nFlanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)
+SetInfo:MIR Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jolraels_favor.txt b/res/cardsfolder/j/jolraels_favor.txt
index 1d668667a25..eb2c2bcc108 100644
--- a/res/cardsfolder/j/jolraels_favor.txt
+++ b/res/cardsfolder/j/jolraels_favor.txt
@@ -6,7 +6,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
 A:AB$ Regenerate | Cost$ 1 G | Defined$ Enchanted | SpellDescription$ Regenerate enchanted creature.
 #TODO - check rarity on this
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jolraels_favor.jpg
-SetInfo:PCY|Common|http://magiccards.info/scans/en/pr/116.jpg
 Oracle:Flash\nEnchant creature\n{1}{G}: Regenerate enchanted creature.
+SetInfo:PCY Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jolt.txt b/res/cardsfolder/j/jolt.txt
index 2e95091d1d2..71e72296eaa 100644
--- a/res/cardsfolder/j/jolt.txt
+++ b/res/cardsfolder/j/jolt.txt
@@ -4,7 +4,6 @@ Types:Instant
 A:SP$ TapOrUntap | Cost$ 2 U | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SubAbility$ DBDraw | SpellDescription$ You may tap or untap target artifact, creature, or land. Draw a card at the beginning of the next turn's upkeep.
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 1 | NextUpkeep$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jolt.jpg
-SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/70.jpg
 Oracle:You may tap or untap target artifact, creature, or land.\nDraw a card at the beginning of the next turn's upkeep.
+SetInfo:MIR Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jolting_merfolk.txt b/res/cardsfolder/j/jolting_merfolk.txt
index 18af25db6ba..53b5e8364c4 100644
--- a/res/cardsfolder/j/jolting_merfolk.txt
+++ b/res/cardsfolder/j/jolting_merfolk.txt
@@ -5,7 +5,6 @@ PT:2/2
 K:Fading:4
 A:AB$ Tap | Cost$ SubCounter<1/FADE> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jolting_merfolk.jpg
-SetInfo:NMS|Uncommon|http://magiccards.info/scans/en/ne/34.jpg
 Oracle:Fading 4 (This creature enters the battlefield with four fade counters on it. At the beginning of your upkeep, remove a fade counter from it. If you can't, sacrifice it.)\nRemove a fade counter from Jolting Merfolk: Tap target creature.
+SetInfo:NMS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jor_kadeen_the_prevailer.txt b/res/cardsfolder/j/jor_kadeen_the_prevailer.txt
index e2bd48b376a..17d86c9997d 100644
--- a/res/cardsfolder/j/jor_kadeen_the_prevailer.txt
+++ b/res/cardsfolder/j/jor_kadeen_the_prevailer.txt
@@ -6,7 +6,6 @@ K:First Strike
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 3 | Condition$ Metalcraft | Description$ Metalcraft - Creatures you control get +3/+0 as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:PlayMain1:TRUE
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jor_kadeen_the_prevailer.jpg
-SetInfo:NPH|Rare|http://magiccards.info/scans/en/nph/128.jpg
 Oracle:First strike\nMetalcraft - Creatures you control get +3/+0 as long as you control three or more artifacts.
+SetInfo:NPH Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/joraga_bard.txt b/res/cardsfolder/j/joraga_bard.txt
index ab2cb13e07f..392f3f81e5a 100644
--- a/res/cardsfolder/j/joraga_bard.txt
+++ b/res/cardsfolder/j/joraga_bard.txt
@@ -8,7 +8,6 @@ SVar:TrigPump:AB$PumpAll | Cost$ 0 | ValidCards$ Ally.YouCtrl | KW$ Vigilance
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
 SVar:RemRandomDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/joraga_bard.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/166.jpg
 Oracle:Whenever Joraga Bard or another Ally enters the battlefield under your control, you may have Ally creatures you control gain vigilance until end of turn.
+SetInfo:ZEN Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/joraga_treespeaker.txt b/res/cardsfolder/j/joraga_treespeaker.txt
index d224599bc1b..2ecdb3c8846 100644
--- a/res/cardsfolder/j/joraga_treespeaker.txt
+++ b/res/cardsfolder/j/joraga_treespeaker.txt
@@ -10,7 +10,6 @@ S:Mode$ Continuous | Affected$ Card.Elf+YouCtrl | AddAbility$ Mana | CheckSVar$
 SVar:Mana:AB$Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add G G to your mana pool.
 SVar:X:Count$Valid Card.Self+counters_GE1_LEVEL+counters_LT5_LEVEL
 SVar:Y:Count$Valid Card.Self+counters_GE5_LEVEL
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/joraga_treespeaker.jpg
-SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/190.jpg
 Oracle:Level up {1}{G} ({1}{G}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-4\n1/2\n{T}: Add {G}{G} to your mana pool.\nLEVEL 5+\n1/4\nElves you control have "{T}: Add {G}{G} to your mana pool."
+SetInfo:ROE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/joraga_warcaller.txt b/res/cardsfolder/j/joraga_warcaller.txt
index c0cb862c53b..96abf0df30d 100644
--- a/res/cardsfolder/j/joraga_warcaller.txt
+++ b/res/cardsfolder/j/joraga_warcaller.txt
@@ -9,7 +9,6 @@ S:Mode$ Continuous | Affected$ Creature.Elf+Other+YouCtrl | AddPower$ X | AddTou
 SVar:X:Count$CardCounters.P1P1
 SVar:XKicked:Count$TimesKicked
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/joraga_warcaller.jpg
-SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/106.jpg
 Oracle:Multikicker {1}{G} (You may pay an additional {1}{G} any number of times as you cast this spell.)\nJoraga Warcaller enters the battlefield with a +1/+1 counter on it for each time it was kicked.\nOther Elf creatures you control get +1/+1 for each +1/+1 counter on Joraga Warcaller.
+SetInfo:WWK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jotun_owl_keeper.txt b/res/cardsfolder/j/jotun_owl_keeper.txt
index 893c34d239a..6e5347f7683 100644
--- a/res/cardsfolder/j/jotun_owl_keeper.txt
+++ b/res/cardsfolder/j/jotun_owl_keeper.txt
@@ -6,7 +6,6 @@ K:Cumulative upkeep:WU
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a 1/1 white Bird creature token with flying onto the battlefield for each age counter on it.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ X | TokenName$ Bird | TokenImage$ W 1 1 Bird Flying | TokenTypes$ Creature,Bird | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | References$ X
 SVar:X:TriggeredCard$CardCounters.AGE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jotun_owl_keeper.jpg
-SetInfo:CSP|Uncommon|http://magiccards.info/scans/en/cs/9.jpg
 Oracle:Cumulative upkeep {W} or {U} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhen Jotun Owl Keeper dies, put a 1/1 white Bird creature token with flying onto the battlefield for each age counter on it.
+SetInfo:CSP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/journey_of_discovery.txt b/res/cardsfolder/j/journey_of_discovery.txt
index 272e2d1734d..c1dd0e09288 100644
--- a/res/cardsfolder/j/journey_of_discovery.txt
+++ b/res/cardsfolder/j/journey_of_discovery.txt
@@ -7,7 +7,6 @@ A:SP$ ChangeZone | Cost$ 4 G G | Origin$ Library | Destination$ Hand | ChangeTyp
 SVar:DBEffect:DB$ Effect | Cost$ 0 | Name$ Journey of Discovery Effect | StaticAbilities$ JourneyOfDis | AILogic$ Always
 SVar:JourneyOfDis:Mode$ Continuous | Affected$ You | AddKeyword$ AdjustLandPlays:2 | EffectZone$ Command | Description$ You may play two additional lands this turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/journey_of_discovery.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/123.jpg
 Oracle:Choose one - Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle your library; or you may play up to two additional lands this turn.\nEntwine {2}{G} (Choose both if you pay the entwine cost.)
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/journey_to_nowhere.txt b/res/cardsfolder/j/journey_to_nowhere.txt
index b83e962f568..9983d13bde8 100644
--- a/res/cardsfolder/j/journey_to_nowhere.txt
+++ b/res/cardsfolder/j/journey_to_nowhere.txt
@@ -6,8 +6,8 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.S
 SVar:TrigExile:DB$ChangeZone | Cost$ 0 | TargetMin$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberTargets$ True | ForgetOtherTargets$ True | Origin$ Battlefield | Destination$ Exile
 SVar:TrigReturn:DB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
 SVar:PlayMain1:TRUE
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/journey_to_nowhere.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/14.jpg
-SetInfo:COM|Common|http://magiccards.info/scans/en/cmd/17.jpg
 Oracle:When Journey to Nowhere enters the battlefield, exile target creature.\nWhen Journey to Nowhere leaves the battlefield, return the exiled card to the battlefield under its owner's control.
+SetInfo:COM Common
+SetInfo:ZEN Common
+SetInfo:DDF Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/journeyers_kite.txt b/res/cardsfolder/j/journeyers_kite.txt
index 65335769d7f..e4d4947f259 100644
--- a/res/cardsfolder/j/journeyers_kite.txt
+++ b/res/cardsfolder/j/journeyers_kite.txt
@@ -2,7 +2,7 @@ Name:Journeyer's Kite
 ManaCost:2
 Types:Artifact
 A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/journeyers_kite.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/257.jpg
 Oracle:{3}, {T}: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
+SetInfo:DDI Rare
+SetInfo:CHK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/joven.txt b/res/cardsfolder/j/joven.txt
index e9e878687ab..83bc37ed904 100644
--- a/res/cardsfolder/j/joven.txt
+++ b/res/cardsfolder/j/joven.txt
@@ -3,7 +3,6 @@ ManaCost:3 R R
 Types:Legendary Creature Human Rogue
 PT:3/3
 A:AB$ Destroy | Cost$ R R R T | ValidTgts$ Artifact.nonCreature | TgtPrompt$ Select target noncreature artifact | SpellDescription$ Destroy target noncreature artifact.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/joven.jpg
-SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/97.jpg
 Oracle:{R}{R}{R}, {T}: Destroy target noncreature artifact.
+SetInfo:HML Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jovens_tools.txt b/res/cardsfolder/j/jovens_tools.txt
index 1687a915830..42a26ae5ddd 100644
--- a/res/cardsfolder/j/jovens_tools.txt
+++ b/res/cardsfolder/j/jovens_tools.txt
@@ -2,8 +2,7 @@ Name:Joven's Tools
 ManaCost:6
 Types:Artifact
 A:AB$ Pump | Cost$ 4 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't be blocked except by Walls. | SpellDescription$ Target creature can't be blocked this turn except by Walls.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jovens_tools.jpg
-SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/133.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/386.jpg
 Oracle:{4}, {T}: Target creature can't be blocked this turn except by Walls.
+SetInfo:5ED Uncommon
+SetInfo:HML Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jovial_evil.txt b/res/cardsfolder/j/jovial_evil.txt
index 575e1cc384e..e6953400363 100644
--- a/res/cardsfolder/j/jovial_evil.txt
+++ b/res/cardsfolder/j/jovial_evil.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 A:SP$ DealDamage | Cost$ 2 B | ValidTgts$ Opponent | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals X damage to target opponent, where X is twice the number of white creatures that player controls.
 SVar:X:Count$NumTypeWhiteOppCtrl.Creature/Twice
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jovial_evil.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/23.jpg
 Oracle:Jovial Evil deals X damage to target opponent, where X is twice the number of white creatures that player controls.
+SetInfo:LEG Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/joyous_respite.txt b/res/cardsfolder/j/joyous_respite.txt
index d663ebe3218..fc90f32673e 100644
--- a/res/cardsfolder/j/joyous_respite.txt
+++ b/res/cardsfolder/j/joyous_respite.txt
@@ -3,7 +3,6 @@ ManaCost:3 G
 Types:Sorcery Arcane
 A:SP$ GainLife | Cost$ 3 G | LifeAmount$ X | References$ X | SpellDescription$ You gain 1 life for each land you control.
 SVar:X:Count$TypeYouCtrl.Land
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/joyous_respite.jpg
-SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/216.jpg
 Oracle:You gain 1 life for each land you control.
+SetInfo:CHK Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/judge_of_currents.txt b/res/cardsfolder/j/judge_of_currents.txt
index 4587e0a460e..8c5c656271c 100644
--- a/res/cardsfolder/j/judge_of_currents.txt
+++ b/res/cardsfolder/j/judge_of_currents.txt
@@ -4,7 +4,6 @@ Types:Creature Merfolk Wizard
 PT:1/1
 T:Mode$ Taps | ValidCard$ Merfolk.YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a Merfolk you control becomes tapped, you may gain 1 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/judge_of_currents.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/22.jpg
 Oracle:Whenever a Merfolk you control becomes tapped, you may gain 1 life.
+SetInfo:LRW Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/judge_unworthy.txt b/res/cardsfolder/j/judge_unworthy.txt
index a7527da524c..fca1ea56e3a 100644
--- a/res/cardsfolder/j/judge_unworthy.txt
+++ b/res/cardsfolder/j/judge_unworthy.txt
@@ -6,7 +6,6 @@ SVar:DBReveal:DB$ Dig | Cost$ 0 | DigNum$ 1 | Reveal$ True | DestinationZone$ Li
 SVar:DBDamage:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | References$ X
 SVar:X:Count$TopOfLibraryCMC
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/judge_unworthy.jpg
-SetInfo:FUT|Common|http://magiccards.info/scans/en/fut/9.jpg
 Oracle:Choose target attacking or blocking creature. Scry 3, then reveal the top card of your library. Judge Unworthy deals damage equal to that card's converted mana cost to that creature. (To scry 3, look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+SetInfo:FUT Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/judges_familiar.txt b/res/cardsfolder/j/judges_familiar.txt
index f440bde3f46..7b90158a173 100644
--- a/res/cardsfolder/j/judges_familiar.txt
+++ b/res/cardsfolder/j/judges_familiar.txt
@@ -5,7 +5,6 @@ PT:1/1
 K:Flying
 A:AB$ Counter | Cost$ Sac<1/CARDNAME> | TargetType$ Spell | ValidTgts$ Instant,Sorcery | TgtPrompt$ Select target Instant or Sorcery Spell | UnlessCost$ 1 | SpellDescription$ Counter target instant or sorcery spell unless its controller pays 1.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/judges_familiar.jpg
-SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/218.jpg
 Oracle:Flying\nSacrifice Judge's Familiar: Counter target instant or sorcery spell unless its controller pays {1}.
+SetInfo:RTR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jugan_the_rising_star.txt b/res/cardsfolder/j/jugan_the_rising_star.txt
index ded5c00ef80..ec5ead5c4eb 100644
--- a/res/cardsfolder/j/jugan_the_rising_star.txt
+++ b/res/cardsfolder/j/jugan_the_rising_star.txt
@@ -9,7 +9,6 @@ SVar:PutCounter2:DB$PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target
 SVar:PutCounter3:DB$PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature (3) | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ PutCounter4
 SVar:PutCounter4:DB$PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature (4) | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ PutCounter5
 SVar:PutCounter5:DB$PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature (5) | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jugan_the_rising_star.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/217.jpg
 Oracle:Flying\nWhen Jugan, the Rising Star dies, you may distribute five +1/+1 counters among any number of target creatures.
+SetInfo:CHK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/juggernaut.txt b/res/cardsfolder/j/juggernaut.txt
index 37a5cd2ce04..74187db14ef 100644
--- a/res/cardsfolder/j/juggernaut.txt
+++ b/res/cardsfolder/j/juggernaut.txt
@@ -4,13 +4,14 @@ Types:Artifact Creature Juggernaut
 PT:5/3
 K:CARDNAME attacks each turn if able.
 K:CARDNAME can't be blocked by Walls.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/juggernaut.jpg
-SetInfo:LEA|Uncommon|http://magiccards.info/scans/en/al/255.jpg
-SetInfo:LEB|Uncommon|http://magiccards.info/scans/en/be/257.jpg
-SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/125.jpg
-SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/328.jpg
-SetInfo:M11|Uncommon|http://magiccards.info/scans/en/m11/209.jpg
-SetInfo:3ED|Uncommon|http://magiccards.info/scans/en/rv/259.jpg
-SetInfo:2ED|Uncommon|http://magiccards.info/scans/en/un/256.jpg
 Oracle:Juggernaut attacks each turn if able.\nJuggernaut can't be blocked by Walls.
+SetInfo:2ED Uncommon
+SetInfo:DST Uncommon
+SetInfo:10E Uncommon
+SetInfo:M11 Uncommon
+SetInfo:LEB Uncommon
+SetInfo:ARC Uncommon
+SetInfo:LEA Uncommon
+SetInfo:DDF Uncommon
+SetInfo:3ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/juju_bubble.txt b/res/cardsfolder/j/juju_bubble.txt
index f8d1976c5f3..0d227ed2c6f 100644
--- a/res/cardsfolder/j/juju_bubble.txt
+++ b/res/cardsfolder/j/juju_bubble.txt
@@ -7,7 +7,6 @@ T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | TriggerZones$
 T:Mode$ LandPlayed | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigSac | Secondary$ True | TriggerDescription$ When you play a card, sacrifice CARDNAME.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/juju_bubble.jpg
-SetInfo:VIS|Uncommon|http://magiccards.info/scans/en/vi/147.jpg
 Oracle:Cumulative upkeep {1} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhen you play a card, sacrifice Juju Bubble.\n{2}: You gain 1 life.
+SetInfo:VIS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jukai_messenger.txt b/res/cardsfolder/j/jukai_messenger.txt
index bd300c22258..996445e7a5b 100644
--- a/res/cardsfolder/j/jukai_messenger.txt
+++ b/res/cardsfolder/j/jukai_messenger.txt
@@ -3,7 +3,6 @@ ManaCost:G
 Types:Creature Human Monk
 PT:1/1
 K:Forestwalk
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80525.jpg
-SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/218.jpg
 Oracle:Forestwalk
+SetInfo:CHK Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jump.txt b/res/cardsfolder/j/jump.txt
index fc466f658de..d8a4864e07a 100644
--- a/res/cardsfolder/j/jump.txt
+++ b/res/cardsfolder/j/jump.txt
@@ -2,12 +2,11 @@ Name:Jump
 ManaCost:U
 Types:Instant
 A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jump.jpg
-SetInfo:LEA|Common|http://magiccards.info/scans/en/al/61.jpg
-SetInfo:LEB|Common|http://magiccards.info/scans/en/be/61.jpg
-SetInfo:4ED|Common|http://magiccards.info/scans/en/4e/79.jpg
-SetInfo:M10|Common|http://magiccards.info/scans/en/m10/59.jpg
-SetInfo:3ED|Common|http://magiccards.info/scans/en/rv/62.jpg
-SetInfo:2ED|Common|http://magiccards.info/scans/en/un/61.jpg
 Oracle:Target creature gains flying until end of turn.
+SetInfo:2ED Common
+SetInfo:M10 Common
+SetInfo:LEB Common
+SetInfo:LEA Common
+SetInfo:4ED Common
+SetInfo:3ED Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jund_battlemage.txt b/res/cardsfolder/j/jund_battlemage.txt
index e2b79bea01e..160401b409a 100644
--- a/res/cardsfolder/j/jund_battlemage.txt
+++ b/res/cardsfolder/j/jund_battlemage.txt
@@ -4,7 +4,6 @@ Types:Creature Human Shaman
 PT:2/2
 A:AB$ LoseLife | Cost$ B T | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SpellDescription$ Target player loses 1 life.
 A:AB$ Token | Cost$ G T | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jund_battlemage.jpg
-SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/106.jpg
 Oracle:{B}, {T}: Target player loses 1 life.\n{G}, {T}: Put a 1/1 green Saproling creature token onto the battlefield.
+SetInfo:ALA Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jund_charm.txt b/res/cardsfolder/j/jund_charm.txt
index 5309511d206..79617bbe0cf 100644
--- a/res/cardsfolder/j/jund_charm.txt
+++ b/res/cardsfolder/j/jund_charm.txt
@@ -6,6 +6,5 @@ A:SP$ DamageAll | Cost$ R B G | NumDmg$ 2 | ValidCards$ Creature | SpellDescript
 A:SP$ PutCounter | Cost$ R B G | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ or put two +1/+1 counters on target creature.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jund_charm.jpg
-SVar:Rarity:Uncommon
-SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/175.jpg
 Oracle:Choose one - Exile all cards from target player's graveyard; or Jund Charm deals 2 damage to each creature; or put two +1/+1 counters on target creature.
+SetInfo:ALA Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jund_hackblade.txt b/res/cardsfolder/j/jund_hackblade.txt
index 4b7ae4fd19f..ff59341a1e3 100644
--- a/res/cardsfolder/j/jund_hackblade.txt
+++ b/res/cardsfolder/j/jund_hackblade.txt
@@ -6,7 +6,6 @@ S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKe
 SVar:X:Count$Valid Permanent.YouCtrl+MultiColor+Other
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Permanent.MultiColor
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jund_hackblade.jpg
-SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/138.jpg
 Oracle:As long as you control another multicolored permanent, Jund Hackblade gets +1/+1 and has haste.
+SetInfo:ARB Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jund_panorama.txt b/res/cardsfolder/j/jund_panorama.txt
index 60dd0fd2a8e..4019a065938 100644
--- a/res/cardsfolder/j/jund_panorama.txt
+++ b/res/cardsfolder/j/jund_panorama.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Swamp+Basic,Land.Mountain+Basic,Land.Forest+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Swamp, Mountain, or Forest card and put it onto the battlefield tapped. Then shuffle your library.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jund_panorama.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/225.jpg
 Oracle:{T}: Add {1} to your mana pool.\n{1}, {T}, Sacrifice Jund Panorama: Search your library for a basic Swamp, Mountain, or Forest card and put it onto the battlefield tapped. Then shuffle your library.
+SetInfo:ALA Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jund_sojourners.txt b/res/cardsfolder/j/jund_sojourners.txt
index 77290a3c450..7e911cd9e57 100644
--- a/res/cardsfolder/j/jund_sojourners.txt
+++ b/res/cardsfolder/j/jund_sojourners.txt
@@ -6,7 +6,6 @@ K:Cycling:2 R
 T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ When you cycle CARDNAME or it's put into a graveyard from the battlefield, you may have it deal 1 damage to target creature or player.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDamage | OptionalDecider$ You | Secondary$ True | TriggerDescription$ When you cycle CARDNAME or it's put into a graveyard from the battlefield, you may have it deal 1 damage to target creature or player.
 SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jund_sojourners.jpg
-SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/116.jpg
 Oracle:When you cycle Jund Sojourners or it dies, you may have it deal 1 damage to target creature or player.\nCycling {2}{R} ({2}{R}, Discard this card: Draw a card.)
+SetInfo:ARB Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jungle_barrier.txt b/res/cardsfolder/j/jungle_barrier.txt
index 3b46fa9467d..9c95ef226e1 100644
--- a/res/cardsfolder/j/jungle_barrier.txt
+++ b/res/cardsfolder/j/jungle_barrier.txt
@@ -5,7 +5,6 @@ PT:2/6
 K:Defender
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_barrier.jpg
-SetInfo:APC|Uncommon|http://magiccards.info/scans/en/ap/106.jpg
 Oracle:Defender (This creature can't attack.)\nWhen Jungle Barrier enters the battlefield, draw a card.
+SetInfo:APC Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jungle_basin.txt b/res/cardsfolder/j/jungle_basin.txt
index ed416b6c790..8bd99adaefc 100644
--- a/res/cardsfolder/j/jungle_basin.txt
+++ b/res/cardsfolder/j/jungle_basin.txt
@@ -6,7 +6,6 @@ A:AB$ Mana | Cost$ T | Produced$ 1 G | SpellDescription$ Add 1 G to your mana po
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return an untapped Forest you control to its owner's hand.
 SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Forest.untapped/untapped Forest> | UnlessPayer$ You
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_basin.jpg
-SetInfo:VIS|Uncommon|http://magiccards.info/scans/en/vi/164.jpg
 Oracle:Jungle Basin enters the battlefield tapped.\nWhen Jungle Basin enters the battlefield, sacrifice it unless you return an untapped Forest you control to its owner's hand.\n{T}: Add {1}{G} to your mana pool.
+SetInfo:VIS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jungle_lion.txt b/res/cardsfolder/j/jungle_lion.txt
index f798b9080b7..aba731ed643 100644
--- a/res/cardsfolder/j/jungle_lion.txt
+++ b/res/cardsfolder/j/jungle_lion.txt
@@ -3,7 +3,6 @@ ManaCost:G
 Types:Creature Cat
 PT:2/1
 K:CARDNAME can't block.
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/po/en-us/card4302.jpg
-SetInfo:POR|Common|http://magiccards.info/scans/en/po/96.jpg
 Oracle:Jungle Lion can't block.
+SetInfo:POR Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jungle_patrol.txt b/res/cardsfolder/j/jungle_patrol.txt
index 04913300d93..024993557ef 100644
--- a/res/cardsfolder/j/jungle_patrol.txt
+++ b/res/cardsfolder/j/jungle_patrol.txt
@@ -4,7 +4,6 @@ Types:Creature Human Soldier
 PT:3/2
 A:AB$ Token | Cost$ 1 G T | TokenAmount$ 1 | TokenName$ Wood | TokenTypes$ Creature,Wall | TokenOwner$ You | TokenColors$ Green | TokenPower$ 0 | TokenToughness$ 1 | TokenKeywords$ Defender | SpellDescription$ Put a 0/1 green Wall creature token with defender named Wood onto the battlefield.
 A:AB$ Mana | Cost$ Sac<1/Permanent.token+namedWood/token named Wood> | Produced$ R | SpellDescription$ Add R to your mana pool.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_patrol.jpg
-SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/121.jpg
 Oracle:{1}{G}, {T}:  Put a 0/1 green Wall creature token with defender named Wood onto the battlefield.\nSacrifice a token named Wood: Add {R} to your mana pool.
+SetInfo:MIR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jungle_shrine.txt b/res/cardsfolder/j/jungle_shrine.txt
index bfdd78712f1..001bddf39bf 100644
--- a/res/cardsfolder/j/jungle_shrine.txt
+++ b/res/cardsfolder/j/jungle_shrine.txt
@@ -5,7 +5,7 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_shrine.jpg
-SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/226.jpg
 Oracle:Jungle Shrine enters the battlefield tapped.\n{T}: Add {R}, {G}, or {W} to your mana pool.
+SetInfo:DDH Uncommon
+SetInfo:ALA Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jungle_troll.txt b/res/cardsfolder/j/jungle_troll.txt
index 7f00bfcfd1d..af446d4e247 100644
--- a/res/cardsfolder/j/jungle_troll.txt
+++ b/res/cardsfolder/j/jungle_troll.txt
@@ -4,7 +4,6 @@ Types:Creature Troll
 PT:2/1
 A:AB$ Regenerate | Cost$ R | SpellDescription$ Regenerate CARDNAME.
 A:AB$ Regenerate | Cost$ G | SpellDescription$ Regenerate CARDNAME.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_troll.jpg
-SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/329.jpg
 Oracle:{R}: Regenerate Jungle Troll.\n{G}: Regenerate Jungle Troll.
+SetInfo:MIR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jungle_weaver.txt b/res/cardsfolder/j/jungle_weaver.txt
index 02431ad3438..d4a86f68bb7 100644
--- a/res/cardsfolder/j/jungle_weaver.txt
+++ b/res/cardsfolder/j/jungle_weaver.txt
@@ -4,7 +4,6 @@ Types:Creature Spider
 PT:5/6
 K:Reach
 K:Cycling:2
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_weaver.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/134.jpg
 Oracle:Reach (This can block creatures with flying.)\nCycling {2} ({2}, Discard this card: Draw a card.)
+SetInfo:ALA Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jungle_wurm.txt b/res/cardsfolder/j/jungle_wurm.txt
index 4f0e351382d..d5809d95878 100644
--- a/res/cardsfolder/j/jungle_wurm.txt
+++ b/res/cardsfolder/j/jungle_wurm.txt
@@ -5,7 +5,6 @@ PT:5/5
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it gets -1/-1 until end of turn for each creature blocking it beyond the first.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ -X | NumDef$ -X | References$ X
 SVar:X:TriggerCount$NumBlockers/Minus.1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jungle_wurm.jpg
-SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/122.jpg
 Oracle:Whenever Jungle Wurm becomes blocked, it gets -1/-1 until end of turn for each creature blocking it beyond the first.
+SetInfo:MIR Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/juniper_order_advocate.txt b/res/cardsfolder/j/juniper_order_advocate.txt
index 623cfa4e620..ef943d613f4 100644
--- a/res/cardsfolder/j/juniper_order_advocate.txt
+++ b/res/cardsfolder/j/juniper_order_advocate.txt
@@ -7,7 +7,6 @@ SVar:X:Count$Valid Card.Self+untapped
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Green
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/juniper_order_advocate.jpg
-SetInfo:ALL|Uncommon|http://magiccards.info/scans/en/ai/132.jpg
 Oracle:As long as Juniper Order Advocate is untapped, green creatures you control get +1/+1.
+SetInfo:ALL Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/juniper_order_druid.txt b/res/cardsfolder/j/juniper_order_druid.txt
index bafa7acc6b7..4a7af1dff0a 100644
--- a/res/cardsfolder/j/juniper_order_druid.txt
+++ b/res/cardsfolder/j/juniper_order_druid.txt
@@ -4,7 +4,6 @@ Types:Creature Human Cleric Druid
 PT:1/1
 A:AB$ Untap | Cost$ T | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Untap target land.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/juniper_order_druid.jpg
-SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/139.jpg
 Oracle:{T}: Untap target land.
+SetInfo:ICE Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/juniper_order_ranger.txt b/res/cardsfolder/j/juniper_order_ranger.txt
index b0e92ffb854..42b5e815717 100644
--- a/res/cardsfolder/j/juniper_order_ranger.txt
+++ b/res/cardsfolder/j/juniper_order_ranger.txt
@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creatu
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:BuffedBy:Creature
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/juniper_order_ranger.jpg
-SetInfo:CSP|Uncommon|http://magiccards.info/scans/en/cs/130.jpg
 Oracle:Whenever another creature enters the battlefield under your control, put a +1/+1 counter on that creature and a +1/+1 counter on Juniper Order Ranger.
+SetInfo:DDG Uncommon
+SetInfo:CSP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/junk_diver.txt b/res/cardsfolder/j/junk_diver.txt
index dd9c393a0fc..e3a6c6fc689 100644
--- a/res/cardsfolder/j/junk_diver.txt
+++ b/res/cardsfolder/j/junk_diver.txt
@@ -6,7 +6,6 @@ K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return another target artifact card from your graveyard to your hand.
 SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Artifact.Other+YouCtrl | Cost$ 0
 SVar:SacMe:1
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/junk_diver.jpg
-SetInfo:UDS|Rare|http://magiccards.info/scans/en/ud/132.jpg
 Oracle:Flying\nWhen Junk Diver dies, return another target artifact card from your graveyard to your hand.
+SetInfo:UDS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/junk_golem.txt b/res/cardsfolder/j/junk_golem.txt
index d30b5d03a93..4a9c0ef9af4 100644
--- a/res/cardsfolder/j/junk_golem.txt
+++ b/res/cardsfolder/j/junk_golem.txt
@@ -7,7 +7,6 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | E
 SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ Self | UnlessCost$ SubCounter<1/P1P1> | UnlessPayer$ You
 A:AB$ PutCounter | Cost$ 1 Discard<1/Card> | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/junk_golem.jpg
-SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/300.jpg
 Oracle:Junk Golem enters the battlefield with three +1/+1 counters on it.\nAt the beginning of your upkeep, sacrifice Junk Golem unless you remove a +1/+1 counter from it.\n{1}, Discard a card: Put a +1/+1 counter on Junk Golem.
+SetInfo:ODY Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/junktroller.txt b/res/cardsfolder/j/junktroller.txt
index 67be9223e9f..813bd4883a4 100644
--- a/res/cardsfolder/j/junktroller.txt
+++ b/res/cardsfolder/j/junktroller.txt
@@ -4,7 +4,6 @@ Types:Artifact Creature Golem
 PT:0/6
 K:Defender
 A:AB$ ChangeZone | Cost$ T | ValidTgts$ Card | TgtPrompt$ Select target card | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put target card from a graveyard on the bottom of its owner's library.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/junktroller.jpg
-SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/264.jpg
 Oracle:Defender (This creature can't attack.)\n{T}: Put target card from a graveyard on the bottom of its owner's library.
+SetInfo:RAV Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/junkyo_bell.txt b/res/cardsfolder/j/junkyo_bell.txt
index 6d9c17aa9bc..cedc42fd9b5 100644
--- a/res/cardsfolder/j/junkyo_bell.txt
+++ b/res/cardsfolder/j/junkyo_bell.txt
@@ -5,7 +5,6 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | E
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +X | NumDef$ +X | KW$ At the beginning of the end step, sacrifice CARDNAME. | References$ X
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/junkyo_bell.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/258.jpg
 Oracle:At the beginning of your upkeep, you may have target creature you control get +X/+X until end of turn, where X is the number of creatures you control. If you do, sacrifice that creature at the beginning of the next end step.
+SetInfo:CHK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/juntu_stakes.txt b/res/cardsfolder/j/juntu_stakes.txt
index aff1c45514e..dacdaab48f3 100644
--- a/res/cardsfolder/j/juntu_stakes.txt
+++ b/res/cardsfolder/j/juntu_stakes.txt
@@ -4,7 +4,6 @@ Types:Artifact
 Text:Creatures with power 1 or less don't untap during their controllers' untap steps.
 K:Permanents don't untap during their controllers' untap steps:Creature.powerLE1
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/juntu_stakes.jpg
-SetInfo:INV|Rare|http://magiccards.info/scans/en/in/304.jpg
 Oracle:Creatures with power 1 or less don't untap during their controllers' untap steps.
+SetInfo:INV Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/junun_efreet.txt b/res/cardsfolder/j/junun_efreet.txt
index e6daa9c05b7..787aac37c3a 100644
--- a/res/cardsfolder/j/junun_efreet.txt
+++ b/res/cardsfolder/j/junun_efreet.txt
@@ -4,8 +4,7 @@ Types:Creature Efreet
 PT:3/3
 K:Flying
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay B B
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/junun_efreet.jpg
-SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/27.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/8.jpg
 Oracle:Flying\nAt the beginning of your upkeep, sacrifice Junun Efreet unless you pay {B}{B}.
+SetInfo:4ED Uncommon
+SetInfo:ARN Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jushi_apprentice_tomoya_the_revealer.txt b/res/cardsfolder/j/jushi_apprentice_tomoya_the_revealer.txt
index ca432e102f8..c603cccf661 100644
--- a/res/cardsfolder/j/jushi_apprentice_tomoya_the_revealer.txt
+++ b/res/cardsfolder/j/jushi_apprentice_tomoya_the_revealer.txt
@@ -7,7 +7,6 @@ SVar:DBFlip:DB$SetState | Defined$ Self | ConditionCheckSVar$ HandSize | Conditi
 SVar:HandSize:Count$InYourHand
 AlternateMode:Flip
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jushi_apprentice.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/70.jpg
 Oracle:{2}{U}, {T}: Draw a card. If you have nine or more cards in hand, flip Jushi Apprentice.
 
 ALTERNATE
@@ -20,5 +19,5 @@ PT:2/3
 A:AB$Draw | Cost$ 3 U U T | ValidTgts$ Player | NumCards$ X | References$ X | SpellDescription$ Target player draws X cards, where X is the number of cards in your hand.
 SVar:X:Count$InYourHand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tomoya_the_revealer.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/309.jpg
 Oracle:{3}{U}{U}, {T}: Target player draws X cards, where X is the number of cards in your hand.
+SetInfo:CHK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/just_fate.txt b/res/cardsfolder/j/just_fate.txt
index 756c56e2b18..eb0d75643dd 100644
--- a/res/cardsfolder/j/just_fate.txt
+++ b/res/cardsfolder/j/just_fate.txt
@@ -2,7 +2,6 @@ Name:Just Fate
 ManaCost:2 W
 Types:Instant
 A:SP$ Destroy | Cost$ 2 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | OpponentTurn$ True | ActivationPhases$ Declare Attackers - Play Instants and Abilities | SpellDescription$ Cast CARDNAME only during the declare attackers step and only if you've been attacked this step. Destroy target attacking creature.
-SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/p2/en-us/card6519.jpg
-SetInfo:PO2|Rare|http://magiccards.info/scans/en/po2/137.jpg
 Oracle:Cast Just Fate only during the declare attackers step and only if you've been attacked this step.\nDestroy target attacking creature.
+SetInfo:PO2 Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/justice.txt b/res/cardsfolder/j/justice.txt
index 5f5d76f61b4..f4658748ff0 100644
--- a/res/cardsfolder/j/justice.txt
+++ b/res/cardsfolder/j/justice.txt
@@ -7,8 +7,7 @@ T:Mode$ DamageDone | ValidSource$ Card.Red | Execute$ TrigDamage | TriggerZones$
 SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredSourceController | NumDmg$ X | References$ X
 SVar:X:TriggerCount$DamageAmount
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/justice.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/317.jpg
-SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/256.jpg
 Oracle:At the beginning of your upkeep, sacrifice Justice unless you pay {W}{W}.\nWhenever a red creature or spell deals damage, Justice deals that much damage to that creature's or spell's controller.
+SetInfo:ICE Uncommon
+SetInfo:5ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/juvenile_gloomwidow.txt b/res/cardsfolder/j/juvenile_gloomwidow.txt
index 34b1da0a500..a18b0b0f0b7 100644
--- a/res/cardsfolder/j/juvenile_gloomwidow.txt
+++ b/res/cardsfolder/j/juvenile_gloomwidow.txt
@@ -4,7 +4,6 @@ Types:Creature Spider
 PT:1/3
 K:Reach
 K:Wither
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/juvenile_gloomwidow.jpg
-SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/121.jpg
 Oracle:Reach (This can block creatures with flying.)\nWither (This deals damage to creatures in the form of -1/-1 counters.)
+SetInfo:SHM Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/juzam_djinn.txt b/res/cardsfolder/j/juzam_djinn.txt
index 982c78e167d..90267d297f0 100644
--- a/res/cardsfolder/j/juzam_djinn.txt
+++ b/res/cardsfolder/j/juzam_djinn.txt
@@ -4,7 +4,6 @@ Types:Creature Djinn
 PT:5/5
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 1 damage to you.
 SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/an/en-us/card922.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/9.jpg
 Oracle:At the beginning of your upkeep, Juzam Djinn deals 1 damage to you.
+SetInfo:ARN Rare
\ No newline at end of file
diff --git a/res/cardsfolder/j/jwar_isle_refuge.txt b/res/cardsfolder/j/jwar_isle_refuge.txt
index c1449f76216..8d8693d6426 100644
--- a/res/cardsfolder/j/jwar_isle_refuge.txt
+++ b/res/cardsfolder/j/jwar_isle_refuge.txt
@@ -6,9 +6,8 @@ A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | LifeAmount$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jwar_isle_refuge.jpg
-SetInfo:PC2|Uncommon|http://magiccards.info/scans/en/pc2/120.jpg
-SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/215.jpg
-SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/279.jpg
 Oracle:Jwar Isle Refuge enters the battlefield tapped.\nWhen Jwar Isle Refuge enters the battlefield, you gain 1 life.\n{T}: Add {U} or {B} to your mana pool.
+SetInfo:PC2 Uncommon
+SetInfo:COM Uncommon
+SetInfo:ZEN Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/j/jwari_scuttler.txt b/res/cardsfolder/j/jwari_scuttler.txt
index b7144dad533..aeee61b70bd 100644
--- a/res/cardsfolder/j/jwari_scuttler.txt
+++ b/res/cardsfolder/j/jwari_scuttler.txt
@@ -2,7 +2,6 @@ Name:Jwari Scuttler
 ManaCost:2 U
 Types:Creature Crab
 PT:2/3
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jwari_scuttler.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/73.jpg
 Oracle:
+SetInfo:ROE Common
\ No newline at end of file
diff --git a/res/cardsfolder/j/jwari_shapeshifter.txt b/res/cardsfolder/j/jwari_shapeshifter.txt
index 6662686c07b..6747cd6a75d 100644
--- a/res/cardsfolder/j/jwari_shapeshifter.txt
+++ b/res/cardsfolder/j/jwari_shapeshifter.txt
@@ -6,7 +6,6 @@ K:ETBReplacement:Copy:ChooseCreature:Optional
 SVar:ChooseCreature:DB$ ChooseCard | Cost$ 0 | Defined$ You | Amount$ 1 | Choices$ Creature.Ally+Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any Ally creature on the battlefield.
 SVar:DBCopy:DB$ Clone | Defined$ Remembered
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jwari_shapeshifter.jpg
-SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/32.jpg
 Oracle:You may have Jwari Shapeshifter enter the battlefield as a copy of any Ally creature on the battlefield.
+SetInfo:WWK Rare
\ No newline at end of file