diff --git a/res/cardsfolder/n/nacatl_hunt_pride.txt b/res/cardsfolder/n/nacatl_hunt_pride.txt
index 5fe37de42a4..b795340e242 100644
--- a/res/cardsfolder/n/nacatl_hunt_pride.txt
+++ b/res/cardsfolder/n/nacatl_hunt_pride.txt
@@ -6,7 +6,7 @@ K:Vigilance
 A:AB$ Pump | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | SpellDescription$ Target creature can't block this turn.
 A:AB$ Pump | Cost$ G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME blocks each turn if able. | SpellDescription$ Target creature blocks this turn if able.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nacatl_hunt_pride.jpg
-SetInfo:CFX|Uncommon|http://magiccards.info/scans/en/cfx/13.jpg
 Oracle:Vigilance\n{R}, {T}: Target creature can't block this turn.\n{G}, {T}: Target creature blocks this turn if able.
+SetInfo:DDH Uncommon
+SetInfo:CFX Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nacatl_outlander.txt b/res/cardsfolder/n/nacatl_outlander.txt
index 61a04a03b48..d8379fdd76f 100644
--- a/res/cardsfolder/n/nacatl_outlander.txt
+++ b/res/cardsfolder/n/nacatl_outlander.txt
@@ -3,7 +3,6 @@ ManaCost:R G
 Types:Creature Cat Scout
 PT:2/2
 K:Protection from blue
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nacatl_outlander.jpg
-SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/119.jpg
 Oracle:Protection from blue
+SetInfo:CFX Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nacatl_savage.txt b/res/cardsfolder/n/nacatl_savage.txt
index ca37799312d..1264f1e1d8f 100644
--- a/res/cardsfolder/n/nacatl_savage.txt
+++ b/res/cardsfolder/n/nacatl_savage.txt
@@ -3,7 +3,6 @@ ManaCost:1 G
 Types:Creature Cat Warrior
 PT:2/1
 K:Protection from artifacts
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nacatl_savage.jpg
-SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/86.jpg
 Oracle:Protection from artifacts
+SetInfo:CFX Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nacre_talisman.txt b/res/cardsfolder/n/nacre_talisman.txt
index 13470738b0a..e1ec10de95d 100644
--- a/res/cardsfolder/n/nacre_talisman.txt
+++ b/res/cardsfolder/n/nacre_talisman.txt
@@ -4,7 +4,6 @@ Types:Artifact
 T:Mode$ SpellCast | ValidCard$ Card.White | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever a player casts a white spell, you may pay 3. If you do, untap target permanent.
 SVar:TrigUntap:AB$Untap | Cost$ 3 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nacre_talisman.jpg
-SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/304.jpg
 Oracle:Whenever a player casts a white spell, you may pay {3}. If you do, untap target permanent.
+SetInfo:ICE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nafs_asp.txt b/res/cardsfolder/n/nafs_asp.txt
index 855959abeb2..7a5b2ae3447 100644
--- a/res/cardsfolder/n/nafs_asp.txt
+++ b/res/cardsfolder/n/nafs_asp.txt
@@ -8,8 +8,7 @@ SVar:DrawTrig:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | TriggerZones$ Comma
 SVar:Bleed:AB$ LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 1 | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:PayUp:AB$ ChangeZone | Cost$ 1 | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True | ActivationZone$ Command | AILogic$ Always | SpellDescription$ Pay 1 to remove this effect.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nafs_asp.jpg
-SetInfo:4ED|Common|http://magiccards.info/scans/en/4e/148.jpg
-SetInfo:ARN|Common|http://magiccards.info/scans/en/an/36.jpg|2
 Oracle:Whenever Nafs Asp deals damage to a player, that player loses 1 life at the beginning of his or her next draw step unless he or she pays {1} before that draw step.
+SetInfo:4ED Common
+SetInfo:ARN Common x2
\ No newline at end of file
diff --git a/res/cardsfolder/n/nagao_bound_by_honor.txt b/res/cardsfolder/n/nagao_bound_by_honor.txt
index a65092db9fc..39cd72b174f 100644
--- a/res/cardsfolder/n/nagao_bound_by_honor.txt
+++ b/res/cardsfolder/n/nagao_bound_by_honor.txt
@@ -6,7 +6,6 @@ K:Bushido 1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME attacks, Samurai creatures you control get +1/+1 until end of turn.
 SVar:TrigPumpAll:AB$PumpAll | Cost$ 0 | ValidCards$ Creature.Samurai+YouCtrl | NumAtt$ +1 | NumDef$ +1
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nagao_bound_by_honor.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/36.jpg
 Oracle:Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)\nWhenever Nagao, Bound by Honor attacks, Samurai creatures you control get +1/+1 until end of turn.
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nakaya_shade.txt b/res/cardsfolder/n/nakaya_shade.txt
index 70f0a36078c..5d2e344100e 100644
--- a/res/cardsfolder/n/nakaya_shade.txt
+++ b/res/cardsfolder/n/nakaya_shade.txt
@@ -3,7 +3,6 @@ ManaCost:1 B
 Types:Creature Shade
 PT:1/1
 A:AB$ Pump | Cost$ B | NumAtt$ 1 | NumDef$ 1 | UnlessCost$ 2 | UnlessPayer$ Player | SpellDescription$ CARDNAME gets +1/+1 until end of turn unless any player pays 2.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nakaya_shade.jpg
-SetInfo:PCY|Uncommon|http://magiccards.info/scans/en/pr/69.jpg
 Oracle:{B}: Nakaya Shade gets +1/+1 until end of turn unless any player pays {2}.
+SetInfo:PCY Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nameless_inversion.txt b/res/cardsfolder/n/nameless_inversion.txt
index da45eb5a304..b4b457b0715 100644
--- a/res/cardsfolder/n/nameless_inversion.txt
+++ b/res/cardsfolder/n/nameless_inversion.txt
@@ -4,7 +4,6 @@ Types:Tribal Instant Shapeshifter
 A:SP$ Pump | Cost$ 1 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ -3 | IsCurse$ True | SubAbility$ DBAnimate |SpellDescription$ Target creature gets +3/-3 and loses all creature types until end of turn.
 SVar:DBAnimate:DB$ Animate | Cost$ 0 | Defined$ Targeted | Types$ Creature | RemoveCreatureTypes$ True
 S:Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nameless_inversion.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/128.jpg
 Oracle:Changeling (This card is every creature type at all times.)\nTarget creature gets +3/-3 and loses all creature types until end of turn.
+SetInfo:LRW Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nameless_one.txt b/res/cardsfolder/n/nameless_one.txt
index 8adb3257d3e..f4c84fa8cce 100644
--- a/res/cardsfolder/n/nameless_one.txt
+++ b/res/cardsfolder/n/nameless_one.txt
@@ -8,7 +8,6 @@ SVar:X:Count$Valid Wizard
 SVar:Y:Count$Valid Card.Self+faceUp
 SVar:BuffedBy:Wizard
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nameless_one.jpg
-SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/100.jpg
 Oracle:Nameless One's power and toughness are each equal to the number of Wizards on the battlefield.\nMorph {2}{U} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
+SetInfo:ONS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nameless_race.txt b/res/cardsfolder/n/nameless_race.txt
index 760643b99da..3055d294a18 100644
--- a/res/cardsfolder/n/nameless_race.txt
+++ b/res/cardsfolder/n/nameless_race.txt
@@ -13,7 +13,6 @@ SVar:Buried:Count$ValidGraveyard Card.White+OppCtrl
 SVar:LifePaidOnETB:Number$0
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nameless_race.jpg
-SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/12.jpg
 Oracle:Trample\nAs Nameless Race enters the battlefield, pay any amount of life. The amount you pay can't be more than the total number of white nontoken permanents your opponents control plus the total number of white cards in their graveyards.\nNameless Race's power and toughness are each equal to the life paid as it entered the battlefield.
+SetInfo:DRK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_blightcutter.txt b/res/cardsfolder/n/nantuko_blightcutter.txt
index cfe976894d4..f6c9301625b 100644
--- a/res/cardsfolder/n/nantuko_blightcutter.txt
+++ b/res/cardsfolder/n/nantuko_blightcutter.txt
@@ -5,7 +5,6 @@ PT:2/2
 K:Protection from black
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | References$ X | Condition$ Threshold | Description$ Threshold - CARDNAME gets +1/+1 for each black permanent your opponents control as long as seven or more cards are in your graveyard.
 SVar:X:Count$Valid Permanent.Black+OppCtrl
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_blightcutter.jpg
-SetInfo:TOR|Rare|http://magiccards.info/scans/en/tr/131.jpg
 Oracle:Protection from black\nThreshold - Nantuko Blightcutter gets +1/+1 for each black permanent your opponents control as long as seven or more cards are in your graveyard.
+SetInfo:TOR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_calmer.txt b/res/cardsfolder/n/nantuko_calmer.txt
index 9603d3602a9..f5dfd5161de 100644
--- a/res/cardsfolder/n/nantuko_calmer.txt
+++ b/res/cardsfolder/n/nantuko_calmer.txt
@@ -5,7 +5,6 @@ PT:2/3
 A:AB$ Destroy | Cost$ G T Sac<1/CARDNAME> | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment.
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | Condition$ Threshold | Description$ Threshold - CARDNAME gets +1/+1 as long as seven or more cards are in your graveyard.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_calmer.jpg
-SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/132.jpg
 Oracle:{G}, {T}, Sacrifice Nantuko Calmer: Destroy target enchantment.\nThreshold - Nantuko Calmer gets +1/+1 as long as seven or more cards are in your graveyard.
+SetInfo:TOR Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_cultivator.txt b/res/cardsfolder/n/nantuko_cultivator.txt
index 9d1a6481302..e00471e3604 100644
--- a/res/cardsfolder/n/nantuko_cultivator.txt
+++ b/res/cardsfolder/n/nantuko_cultivator.txt
@@ -10,7 +10,6 @@ SVar:DBNantukoCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NantukoX:Count$TypeInYourHand.Land
 SVar:NantukoY:Remembered$Amount
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_cultivator.jpg
-SetInfo:TOR|Rare|http://magiccards.info/scans/en/tr/133.jpg
 Oracle:When Nantuko Cultivator enters the battlefield, you may discard any number of land cards. Put that many +1/+1 counters on Nantuko Cultivator and draw that many cards.
+SetInfo:TOR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_disciple.txt b/res/cardsfolder/n/nantuko_disciple.txt
index fbc6a0bbfc4..0e2a1f7b9b6 100644
--- a/res/cardsfolder/n/nantuko_disciple.txt
+++ b/res/cardsfolder/n/nantuko_disciple.txt
@@ -3,8 +3,7 @@ ManaCost:3 G
 Types:Creature Insect Druid
 PT:2/2
 A:AB$ Pump | Cost$ G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_disciple.jpg
-SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/268.jpg
-SetInfo:ODY|Common|http://magiccards.info/scans/en/od/253.jpg
 Oracle:{G}, {T}: Target creature gets +2/+2 until end of turn.
+SetInfo:8ED Common
+SetInfo:ODY Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_elder.txt b/res/cardsfolder/n/nantuko_elder.txt
index 6f9e8c1f47d..d14c97dd59f 100644
--- a/res/cardsfolder/n/nantuko_elder.txt
+++ b/res/cardsfolder/n/nantuko_elder.txt
@@ -4,7 +4,6 @@ Types:Creature Insect Druid
 PT:1/2
 A:AB$ Mana | Cost$ T | Produced$ 1 G | SpellDescription$ Add 1 G to your mana pool.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_elder.jpg
-SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/254.jpg
 Oracle:{T}: Add {1}{G} to your mana pool.
+SetInfo:ODY Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_husk.txt b/res/cardsfolder/n/nantuko_husk.txt
index bd327400eb1..0bf9bfe29a8 100644
--- a/res/cardsfolder/n/nantuko_husk.txt
+++ b/res/cardsfolder/n/nantuko_husk.txt
@@ -4,10 +4,9 @@ Types:Creature Zombie Insect
 PT:2/2
 A:AB$ Pump | Cost$ Sac<1/Creature> | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_husk.jpg
-SetInfo:ONS|Common|http://magiccards.info/scans/en/on/159.jpg
-SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/90.jpg
-SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/148.jpg
-SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/162.jpg
 Oracle:Sacrifice a creature: Nantuko Husk gets +2/+2 until end of turn.
+SetInfo:ONS Common
+SetInfo:COM Uncommon
+SetInfo:9ED Uncommon
+SetInfo:10E Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_mentor.txt b/res/cardsfolder/n/nantuko_mentor.txt
index 255f89499b0..7aec5335b86 100644
--- a/res/cardsfolder/n/nantuko_mentor.txt
+++ b/res/cardsfolder/n/nantuko_mentor.txt
@@ -5,7 +5,6 @@ PT:1/1
 A:AB$ Pump | Cost$ 2 G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | References$ X | SpellDescription$ Target creature gets +X/+X until end of turn, where X is that creature's power.
 SVar:X:Targeted$CardPower
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_mentor.jpg
-SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/255.jpg
 Oracle:{2}{G}, {T}: Target creature gets +X/+X until end of turn, where X is that creature's power.
+SetInfo:ODY Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_monastery.txt b/res/cardsfolder/n/nantuko_monastery.txt
index 0fbc4d0ea7a..babdc0f5826 100644
--- a/res/cardsfolder/n/nantuko_monastery.txt
+++ b/res/cardsfolder/n/nantuko_monastery.txt
@@ -4,7 +4,7 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ Animate | Cost$ G W | Activation$ Threshold | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Insect,Monk | Colors$ Green,White | Keywords$ First Strike | SpellDescription$ Threshold - CARDNAME becomes a 4/4 green and white Insect Monk creature with first strike until end of turn. It's still a land. Activate this ability only if seven or more cards are in your graveyard.
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_monastery.jpg
-SetInfo:JUD|Uncommon|http://magiccards.info/scans/en/ju/142.jpg
 Oracle:{T}: Add {1} to your mana pool.\nThreshold - {G}{W}: Nantuko Monastery becomes a 4/4 green and white Insect Monk creature with first strike until end of turn. It's still a land. Activate this ability only if seven or more cards are in your graveyard.
+SetInfo:ARC Uncommon
+SetInfo:JUD Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_shade.txt b/res/cardsfolder/n/nantuko_shade.txt
index f1e6af6520c..ffe33e16853 100644
--- a/res/cardsfolder/n/nantuko_shade.txt
+++ b/res/cardsfolder/n/nantuko_shade.txt
@@ -3,8 +3,7 @@ ManaCost:B B
 Types:Creature Insect Shade
 PT:2/1
 A:AB$ Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
-SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/tor/en-us/card35053.jpg
-SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/106.jpg
-SetInfo:TOR|Rare|http://magiccards.info/scans/en/tr/74.jpg
 Oracle:{B}: Nantuko Shade gets +1/+1 until end of turn.
+SetInfo:TOR Rare
+SetInfo:M11 Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_shaman.txt b/res/cardsfolder/n/nantuko_shaman.txt
index 29941973f42..03beb03d1f2 100644
--- a/res/cardsfolder/n/nantuko_shaman.txt
+++ b/res/cardsfolder/n/nantuko_shaman.txt
@@ -5,7 +5,6 @@ PT:3/2
 K:Suspend:1:2 G G
 T:Mode$ ChangesZone | ValidCard$ Card.Self | IsPresent$ Land.tapped+YouCtrl | PresentCompare$ EQ0 | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, if you control no tapped lands, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_shaman.jpg
-SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/208.jpg
 Oracle:When Nantuko Shaman enters the battlefield, if you control no tapped lands, draw a card.\nSuspend 1-{2}{G}{G} (Rather than cast this card from your hand, you may pay {2}{G}{G} and exile it with a time counter on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)
+SetInfo:TSP Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_shrine.txt b/res/cardsfolder/n/nantuko_shrine.txt
index 8b79de92a40..99fe0f67364 100644
--- a/res/cardsfolder/n/nantuko_shrine.txt
+++ b/res/cardsfolder/n/nantuko_shrine.txt
@@ -9,4 +9,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_shrine.jpg
 Oracle:Whenever a player casts a spell, that player puts X 1/1 green Squirrel creature tokens onto the battlefield, where X is the number of cards in all graveyards with the same name as that spell.
-SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/256.jpg
+SetInfo:ODY Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_tracer.txt b/res/cardsfolder/n/nantuko_tracer.txt
index 496ef5deffd..dcb2b87fa0a 100644
--- a/res/cardsfolder/n/nantuko_tracer.txt
+++ b/res/cardsfolder/n/nantuko_tracer.txt
@@ -4,7 +4,6 @@ Types:Creature Insect Druid
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may put target card from a graveyard on the bottom of its owner's library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | ValidTgts$ Card | TgtPrompt$ Select target card in a graveyard | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_tracer.jpg
-SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/125.jpg
 Oracle:When Nantuko Tracer enters the battlefield, you may put target card from a graveyard on the bottom of its owner's library.
+SetInfo:JUD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nantuko_vigilante.txt b/res/cardsfolder/n/nantuko_vigilante.txt
index 229e6ffa480..f2798e715aa 100644
--- a/res/cardsfolder/n/nantuko_vigilante.txt
+++ b/res/cardsfolder/n/nantuko_vigilante.txt
@@ -5,7 +5,6 @@ PT:3/2
 K:Morph:1 G
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, destroy target artifact or enchantment.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_vigilante.jpg
-SetInfo:LGN|Common|http://magiccards.info/scans/en/le/132.jpg
 Oracle:Morph {1}{G} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhen Nantuko Vigilante is turned face up, destroy target artifact or enchantment.
+SetInfo:LGN Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/narcissism.txt b/res/cardsfolder/n/narcissism.txt
index 4eb0223ae6a..d8117f338d2 100644
--- a/res/cardsfolder/n/narcissism.txt
+++ b/res/cardsfolder/n/narcissism.txt
@@ -4,7 +4,6 @@ Types:Enchantment
 A:AB$ Pump | Cost$ G Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
 A:AB$ Pump | Cost$ G Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/narcissism.jpg
-SetInfo:TOR|Uncommon|http://magiccards.info/scans/en/tr/134.jpg
 Oracle:{G}, Discard a card: Target creature gets +2/+2 until end of turn.\n{G}, Sacrifice Narcissism: Target creature gets +2/+2 until end of turn.
+SetInfo:TOR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/narcolepsy.txt b/res/cardsfolder/n/narcolepsy.txt
index c79a3b313b0..395affcb102 100644
--- a/res/cardsfolder/n/narcolepsy.txt
+++ b/res/cardsfolder/n/narcolepsy.txt
@@ -5,7 +5,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Curse
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | IsPresent$ Creature.AttachedBy+untapped | PresentCompare$ EQ1 | IsCurse$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ At the beginning of each upkeep, if enchanted creature is untapped, tap it.
 SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ Enchanted
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/narcolepsy.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/79.jpg
 Oracle:Enchant creature\nAt the beginning of each upkeep, if enchanted creature is untapped, tap it.
+SetInfo:ROE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/narcomoeba.txt b/res/cardsfolder/n/narcomoeba.txt
index 25b41b0785e..e54e41cd590 100644
--- a/res/cardsfolder/n/narcomoeba.txt
+++ b/res/cardsfolder/n/narcomoeba.txt
@@ -5,7 +5,6 @@ PT:1/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Library | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into your graveyard from your library, you may put it onto the battlefield.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/narcomoeba.jpg
-SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/54.jpg
 Oracle:Flying\nWhen Narcomoeba is put into your graveyard from your library, you may put it onto the battlefield.
+SetInfo:FUT Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/narrow_escape.txt b/res/cardsfolder/n/narrow_escape.txt
index 3a5ebcd14d4..aef52296f1a 100644
--- a/res/cardsfolder/n/narrow_escape.txt
+++ b/res/cardsfolder/n/narrow_escape.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Instant
 A:SP$ ChangeZone | Cost$ 2 W | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.YouCtrl | SubAbility$ DBGainLife | Defined$ TargetedController | TgtPrompt$ Select target permanent you control | SpellDescription$ Return target permanent you control to its owner's hand. You gain 4 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 4
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/Narrow_Escape.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/27.jpg
 Oracle:Return target permanent you control to its owner's hand. You gain 4 life.
+SetInfo:ZEN Common
+SetInfo:DDE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/narstad_scrapper.txt b/res/cardsfolder/n/narstad_scrapper.txt
index 1b2a361fa52..7e4e7ac519f 100644
--- a/res/cardsfolder/n/narstad_scrapper.txt
+++ b/res/cardsfolder/n/narstad_scrapper.txt
@@ -3,7 +3,6 @@ ManaCost:5
 Types:Artifact Creature Construct
 PT:3/3
 A:AB$ Pump | Cost$ 2 | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/narstad_scrapper.jpg
-SetInfo:AVR|Common|http://magiccards.info/scans/en/avr/218.jpg
 Oracle:{2}: Narstad Scrapper gets +1/+0 until end of turn.
+SetInfo:AVR Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/narwhal.txt b/res/cardsfolder/n/narwhal.txt
index ccf5fc630ba..54247d40950 100644
--- a/res/cardsfolder/n/narwhal.txt
+++ b/res/cardsfolder/n/narwhal.txt
@@ -4,7 +4,6 @@ Types:Creature Whale
 PT:2/2
 K:First Strike
 K:Protection from red
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/narwhal.jpg
-SetInfo:HML|Rare|http://magiccards.info/scans/en/hl/44.jpg
 Oracle:First strike, protection from red
+SetInfo:HML Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nath_of_the_gilt_leaf.txt b/res/cardsfolder/n/nath_of_the_gilt_leaf.txt
index ec32aa22a25..4b1ef05ff81 100644
--- a/res/cardsfolder/n/nath_of_the_gilt_leaf.txt
+++ b/res/cardsfolder/n/nath_of_the_gilt_leaf.txt
@@ -6,7 +6,6 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | E
 SVar:TrigDiscard:AB$ Discard | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumCards$ 1 | Mode$ Random
 T:Mode$ Discarded | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ Whenever an opponent discards a card, you may put a 1/1 green Elf Warrior creature token onto the battlefield.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nath_of_the_gilt_leaf.jpg
-SetInfo:LRW|Rare|http://magiccards.info/scans/en/lw/250.jpg
 Oracle:At the beginning of your upkeep, you may have target opponent discard a card at random.\nWhenever an opponent discards a card, you may put a 1/1 green Elf Warrior creature token onto the battlefield.
+SetInfo:LRW Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/naths_buffoon.txt b/res/cardsfolder/n/naths_buffoon.txt
index 88a8b770cb9..8f884c5f62f 100644
--- a/res/cardsfolder/n/naths_buffoon.txt
+++ b/res/cardsfolder/n/naths_buffoon.txt
@@ -3,7 +3,6 @@ ManaCost:1 B
 Types:Creature Goblin Rogue
 PT:1/1
 K:Protection:Elf:Protection from Elves
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naths_buffoon.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/129.jpg
 Oracle:Protection from Elves
+SetInfo:LRW Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/naths_elite.txt b/res/cardsfolder/n/naths_elite.txt
index 6663eeb0592..00a7793b333 100644
--- a/res/cardsfolder/n/naths_elite.txt
+++ b/res/cardsfolder/n/naths_elite.txt
@@ -6,7 +6,6 @@ K:All creatures able to block CARDNAME do so.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self |  Execute$ TrigClash | TriggerDescription$ When CARDNAME enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on CARDNAME.
 SVar:TrigClash:AB$Clash | Cost$ 0 | WinSubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naths_elite.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/231.jpg
 Oracle:All creatures able to block Nath's Elite do so.\nWhen Nath's Elite enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Nath's Elite. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
+SetInfo:LRW Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/natural_affinity.txt b/res/cardsfolder/n/natural_affinity.txt
index f58cc2d8d36..d8c16030ac8 100644
--- a/res/cardsfolder/n/natural_affinity.txt
+++ b/res/cardsfolder/n/natural_affinity.txt
@@ -3,9 +3,8 @@ ManaCost:2 G
 Types:Instant
 A:SP$ AnimateAll | Cost$ 2 G | ValidCards$ Land | Types$ Creature | Power$ 2 | Toughness$ 2 | SpellDescription$ All lands become 2/2 creatures until end of turn. They're still lands.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natural_affinity.jpg
-SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/269.jpg
-SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/260.jpg
-SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/256.jpg
 Oracle:All lands become 2/2 creatures until end of turn. They're still lands.
+SetInfo:MMQ Rare
+SetInfo:8ED Rare
+SetInfo:9ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/natural_emergence.txt b/res/cardsfolder/n/natural_emergence.txt
index 8b28ef716c5..820d4613918 100644
--- a/res/cardsfolder/n/natural_emergence.txt
+++ b/res/cardsfolder/n/natural_emergence.txt
@@ -5,7 +5,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Enchantment.YouCtrl+Red,Enchantment.YouCtrl+Green | ChangeNum$ 1 | Mandatory$ True
 S:Mode$ Continuous | Affected$ Land.YouCtrl | SetPower$ 2 | SetToughness$ 2 | AddType$ Creature | AddKeyword$ First Strike | Description$ Lands you control are 2/2 creatures with first strike. They're still lands.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natural_emergence.jpg
-SetInfo:PLS|Rare|http://magiccards.info/scans/en/ps/117.jpg
 Oracle:When Natural Emergence enters the battlefield, return a red or green enchantment you control to its owner's hand.\nLands you control are 2/2 creatures with first strike. They're still lands.
+SetInfo:PLS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/natural_end.txt b/res/cardsfolder/n/natural_end.txt
index 70997bfbef7..b5291ba3be6 100644
--- a/res/cardsfolder/n/natural_end.txt
+++ b/res/cardsfolder/n/natural_end.txt
@@ -3,7 +3,6 @@ ManaCost:2 G
 Types:Instant
 A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SubAbility$ NaturalLife | SpellDescription$ Destroy target artifact or enchantment. You gain 3 life.
 SVar:NaturalLife:DB$GainLife | Defined$ You | LifeAmount$ 3
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natural_end.jpg
-SetInfo:AVR|Common|http://magiccards.info/scans/en/avr/185.jpg
 Oracle:Destroy target artifact or enchantment. You gain 3 life.
+SetInfo:AVR Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/natural_order.txt b/res/cardsfolder/n/natural_order.txt
index 4db1ae95544..ed6e2857d8b 100644
--- a/res/cardsfolder/n/natural_order.txt
+++ b/res/cardsfolder/n/natural_order.txt
@@ -2,8 +2,7 @@ Name:Natural Order
 ManaCost:2 G G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 2 G G Sac<1/Creature.Green/green creature> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Green | ChangeNum$ 1 | SpellDescription$ Search your library for a green creature card and put it onto the battlefield. Then shuffle your library.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natural_order.jpg
-SetInfo:VIS|Rare|http://magiccards.info/scans/en/vi/64.jpg
-SetInfo:POR|Rare|http://magiccards.info/scans/en/po/101.jpg
 Oracle:As an additional cost to cast Natural Order, sacrifice a green creature.\nSearch your library for a green creature card and put it onto the battlefield. Then shuffle your library.
+SetInfo:VIS Rare
+SetInfo:POR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/natural_selection.txt b/res/cardsfolder/n/natural_selection.txt
index 2f59f365515..931adebc535 100644
--- a/res/cardsfolder/n/natural_selection.txt
+++ b/res/cardsfolder/n/natural_selection.txt
@@ -3,9 +3,8 @@ ManaCost:G
 Types:Instant
 A:SP$ RearrangeTopOfLibrary | Cost$ G | ValidTgts$ Player | TgtPrompt$ Choose target player. | NumCards$ 3 | MayShuffle$ True | SpellDescription$ Look at the top 3 cards of target player's library and put them back in any order. You may have that player shuffle his or her library.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natural_selection.jpg
-SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/121.jpg
-SetInfo:LEB|Rare|http://magiccards.info/scans/en/be/121.jpg
-SetInfo:2ED|Rare|http://magiccards.info/scans/en/un/121.jpg
 Oracle:Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library.
+SetInfo:LEB Rare
+SetInfo:LEA Rare
+SetInfo:2ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/natural_spring.txt b/res/cardsfolder/n/natural_spring.txt
index a851f2c414e..f4aebed4be8 100644
--- a/res/cardsfolder/n/natural_spring.txt
+++ b/res/cardsfolder/n/natural_spring.txt
@@ -2,12 +2,11 @@ Name:Natural Spring
 ManaCost:3 G G
 Types:Sorcery
 A:SP$ GainLife | Cost$ 3 G G | LifeAmount$ 8 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player gains 8 life.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natural_spring.jpg
-SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/133.jpg
-SetInfo:POR|Uncommon|http://magiccards.info/scans/en/po/102.jpg
-SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/257.jpg
-SetInfo:10E|Common|http://magiccards.info/scans/en/10e/281.jpg
-SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/74.jpg
-SetInfo:S99|Uncommon|http://magiccards.info/scans/en/st/134.jpg
 Oracle:Target player gains 8 life.
+SetInfo:PO2 Common
+SetInfo:S99 Uncommon
+SetInfo:9ED Common
+SetInfo:10E Common
+SetInfo:TMP Common
+SetInfo:POR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/naturalize.txt b/res/cardsfolder/n/naturalize.txt
index 5c9b0ea8649..9223039769c 100644
--- a/res/cardsfolder/n/naturalize.txt
+++ b/res/cardsfolder/n/naturalize.txt
@@ -2,18 +2,17 @@ Name:Naturalize
 ManaCost:1 G
 Types:Instant
 A:SP$ Destroy | Cost$ 1 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naturalize.jpg
-SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/270.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/199.jpg
-SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/127.jpg
-SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/258.jpg
-SetInfo:10E|Common|http://magiccards.info/scans/en/10e/282.jpg
-SetInfo:M11|Common|http://magiccards.info/scans/en/m11/186.jpg
-SetInfo:M10|Common|http://magiccards.info/scans/en/m10/195.jpg
-SetInfo:M13|Common|http://magiccards.info/scans/en/m13/178.jpg
-SetInfo:M12|Common|http://magiccards.info/scans/en/m12/185.jpg
-SetInfo:ONS|Common|http://magiccards.info/scans/en/on/275.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/141.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/197.jpg
 Oracle:Destroy target artifact or enchantment.
+SetInfo:8ED Common
+SetInfo:ROE Common
+SetInfo:GTC Common
+SetInfo:9ED Common
+SetInfo:ALA Common
+SetInfo:M11 Common
+SetInfo:M10 Common
+SetInfo:M13 Common
+SetInfo:M12 Common
+SetInfo:ONS Common
+SetInfo:10E Common
+SetInfo:ISD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/natures_chosen.txt b/res/cardsfolder/n/natures_chosen.txt
index 2aeb5a8d3d5..fa0ce0ec08f 100644
--- a/res/cardsfolder/n/natures_chosen.txt
+++ b/res/cardsfolder/n/natures_chosen.txt
@@ -6,7 +6,6 @@ A:SP$ Attach | Cost$ G | ValidTgts$ Creature | AILogic$ Pump
 A:AB$ Untap | Cost$ 0 | Defined$ Enchanted | ActivationLimit$ 1 | PlayerTurn$ True | SpellDescription$ Untap enchanted creature. Activate this ability only during your turn and only once each turn.
 A:AB$ Untap | Cost$ tapXType<1/Creature.AttachedBy+White> | CostDesc$ Tap enchanted creature: | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | ActivationLimit$ 1 | SpellDescription$ Untap target artifact, creature, or land. Activate this ability only if enchanted creature is white and is untapped and only once each turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natures_chosen.jpg
-SetInfo:ALL|Uncommon|http://magiccards.info/scans/en/ai/81.jpg
 Oracle:Enchant creature you control\n{0}: Untap enchanted creature. Activate this ability only during your turn and only once each turn.\nTap enchanted creature: Untap target artifact, creature, or land. Activate this ability only if enchanted creature is white and is untapped and only once each turn.
+SetInfo:ALL Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/natures_claim.txt b/res/cardsfolder/n/natures_claim.txt
index 6136331c7ac..1ce7140915e 100644
--- a/res/cardsfolder/n/natures_claim.txt
+++ b/res/cardsfolder/n/natures_claim.txt
@@ -3,7 +3,6 @@ ManaCost:G
 Types:Instant
 A:SP$ Destroy | Cost$ G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SubAbility$ DBGainLife | SpellDescription$ Destroy target artifact or enchantment. Its controller gains 4 life.
 SVar:DBGainLife:DB$GainLife | Defined$ TargetedController | LifeAmount$ 4
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natures_claim.jpg
-SetInfo:WWK|Common|http://magiccards.info/scans/en/wwk/108.jpg
 Oracle:Destroy target artifact or enchantment. Its controller gains 4 life.
+SetInfo:WWK Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/natures_cloak.txt b/res/cardsfolder/n/natures_cloak.txt
index d9306796ec4..1dd34a74f33 100644
--- a/res/cardsfolder/n/natures_cloak.txt
+++ b/res/cardsfolder/n/natures_cloak.txt
@@ -3,8 +3,7 @@ ManaCost:2 G
 Types:Sorcery
 A:SP$ PumpAll | Cost$ 2 G | ValidCards$ Creature.Green+YouCtrl | KW$ Forestwalk | SpellDescription$ Green creatures you control gain forestwalk until end of turn.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://serv3.tcgimages.eu/img/cards/Portal/natures_cloak.jpg
-SetInfo:S99|Rare|http://magiccards.info/scans/en/st/135.jpg
-SetInfo:POR|Rare|http://magiccards.info/scans/en/po/103.jpg
 Oracle:Green creatures you control gain forestwalk until end of turn.
+SetInfo:S99 Rare
+SetInfo:POR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/natures_kiss.txt b/res/cardsfolder/n/natures_kiss.txt
index 8c1175093a0..2cbdba3fcde 100644
--- a/res/cardsfolder/n/natures_kiss.txt
+++ b/res/cardsfolder/n/natures_kiss.txt
@@ -5,7 +5,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
 A:AB$ Pump | Cost$ 1 ExileFromGrave<1/Card.TopGraveyard>  | Defined$ Enchanted | NumAtt$ +1 | NumDef$ +1 | CostDesc$ 1, Exile the top card of your graveyard: | SpellDescription$ Enchanted creature gets +1/+1 until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natures_kiss.jpg
-SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/78.jpg
 Oracle:Enchant creature\n{1}, Exile the top card of your graveyard: Enchanted creature gets +1/+1 until end of turn.
+SetInfo:WTH Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/natures_lore.txt b/res/cardsfolder/n/natures_lore.txt
index fdcaa10581a..8b79604c5ad 100644
--- a/res/cardsfolder/n/natures_lore.txt
+++ b/res/cardsfolder/n/natures_lore.txt
@@ -2,11 +2,11 @@ Name:Nature's Lore
 ManaCost:1 G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 1 G | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest | ChangeNum$ 1 | SpellDescription$ Search your library for a Forest card and put that card onto the battlefield. Then shuffle your library.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natures_lore.jpg
-SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/75.jpg
-SetInfo:S99|Common|http://magiccards.info/scans/en/st/136.jpg
-SetInfo:POR|Common|http://magiccards.info/scans/en/po/104.jpg
-SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/143.jpg
-SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/178.jpg
 Oracle:Search your library for a Forest card and put that card onto the battlefield. Then shuffle your library.
+SetInfo:PO2 Common
+SetInfo:S99 Common
+SetInfo:5ED Common
+SetInfo:ICE Uncommon
+SetInfo:POR Common
+SetInfo:DDD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/natures_resurgence.txt b/res/cardsfolder/n/natures_resurgence.txt
index 7898356e036..e058bf6ca36 100644
--- a/res/cardsfolder/n/natures_resurgence.txt
+++ b/res/cardsfolder/n/natures_resurgence.txt
@@ -4,9 +4,8 @@ Types:Sorcery
 A:SP$ RepeatEach | Cost$ 2 G G | RepeatPlayers$ Player | RepeatSubAbility$ DBDraw | SpellDescription$ Each player draws a card for each creature card in his or her graveyard.
 SVar:DBDraw:DB$ Draw | Defined$ Remembered | NumCards$ X | References$ X
 SVar:X:Count$ValidGraveyard Creature.RememberedPlayerCtrl
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natures_resurgence.jpg
-SetInfo:WTH|Rare|http://magiccards.info/scans/en/wl/79.jpg
-SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/242.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/259.jpg
 Oracle:Each player draws a card for each creature card in his or her graveyard.
+SetInfo:7ED Rare
+SetInfo:WTH Rare
+SetInfo:6ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/natures_revolt.txt b/res/cardsfolder/n/natures_revolt.txt
index c5b67282923..4833bf61c46 100644
--- a/res/cardsfolder/n/natures_revolt.txt
+++ b/res/cardsfolder/n/natures_revolt.txt
@@ -3,8 +3,7 @@ ManaCost:3 G G
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Land | SetPower$ 2 | SetToughness$ 2 | AddType$ Creature | Description$ All lands are 2/2 creatures that are still lands.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natures_revolt.jpg
-SetInfo:TMP|Rare|http://magiccards.info/scans/en/tp/134.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/260.jpg
 Oracle:All lands are 2/2 creatures that are still lands.
+SetInfo:7ED Rare
+SetInfo:TMP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/natures_ruin.txt b/res/cardsfolder/n/natures_ruin.txt
index 89019737172..1a755cdbdec 100644
--- a/res/cardsfolder/n/natures_ruin.txt
+++ b/res/cardsfolder/n/natures_ruin.txt
@@ -3,7 +3,6 @@ ManaCost:2 B
 Types:Sorcery
 A:SP$ DestroyAll | Cost$ 2 B | ValidCards$ Creature.Green | SpellDescription$ Destroy all green creatures.
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal/natures_ruin.jpg
-SetInfo:POR|Uncommon|http://magiccards.info/scans/en/po/26.jpg
 Oracle:Destroy all green creatures.
+SetInfo:POR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/natures_spiral.txt b/res/cardsfolder/n/natures_spiral.txt
index 5c4d05560ae..677df7f2368 100644
--- a/res/cardsfolder/n/natures_spiral.txt
+++ b/res/cardsfolder/n/natures_spiral.txt
@@ -2,8 +2,7 @@ Name:Nature's Spiral
 ManaCost:1 G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 1 G | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouCtrl | SpellDescription$ Return target permanent card from your graveyard to your hand.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natures_spiral.jpg
-SetInfo:M11|Uncommon|http://magiccards.info/scans/en/m11/187.jpg
-SetInfo:M10|Uncommon|http://magiccards.info/scans/en/m10/196.jpg
 Oracle:Return target permanent card from your graveyard to your hand. (A permanent card is an artifact, creature, enchantment, land, or planeswalker card.)
+SetInfo:M11 Uncommon
+SetInfo:M10 Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/natures_wrath.txt b/res/cardsfolder/n/natures_wrath.txt
index 1d6ab224c89..e28f390cf10 100644
--- a/res/cardsfolder/n/natures_wrath.txt
+++ b/res/cardsfolder/n/natures_wrath.txt
@@ -8,7 +8,6 @@ T:Mode$ ChangesZone | ValidCard$ Swamp,Card.Black | Origin$ Any | Destination$ B
 SVar:TrigSacrificeBlack:AB$Sacrifice | Cost$ 0 | Defined$ TriggeredCardController | SacValid$ Swamp,Card.Black | SacMessage$ Swamp or a black permanent
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natures_wrath.jpg
-SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/82.jpg
 Oracle:At the beginning of your upkeep, sacrifice Nature's Wrath unless you pay {G}.\nWhenever a player puts an Island or blue permanent onto the battlefield, he or she sacrifices an Island or blue permanent.\nWhenever a player puts a Swamp or black permanent onto the battlefield, he or she sacrifices a Swamp or black permanent.
+SetInfo:ALL Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nausea.txt b/res/cardsfolder/n/nausea.txt
index bda007cf450..e03ed292efe 100644
--- a/res/cardsfolder/n/nausea.txt
+++ b/res/cardsfolder/n/nausea.txt
@@ -2,9 +2,8 @@ Name:Nausea
 ManaCost:1 B
 Types:Sorcery
 A:SP$ PumpAll | Cost$ 1 B | ValidCards$ Creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ All creatures get -1/-1 until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nausea.jpg
-SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/148.jpg
-SetInfo:7ED|Common|http://magiccards.info/scans/en/7e/148.jpg
-SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/67.jpg
 Oracle:All creatures get -1/-1 until end of turn.
+SetInfo:8ED Common
+SetInfo:7ED Common
+SetInfo:EXO Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nav_squad_commandos.txt b/res/cardsfolder/n/nav_squad_commandos.txt
index 488f82e8de4..acf34f1f1f7 100644
--- a/res/cardsfolder/n/nav_squad_commandos.txt
+++ b/res/cardsfolder/n/nav_squad_commandos.txt
@@ -7,5 +7,5 @@ SVar:TrigBattalionPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ 1 | NumDef$
 SVar:DBUntap:DB$ Untap | Defined$ Self
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nav_squad_commandos.jpg
-SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/22.jpg
 Oracle:Battalion - Whenever Nav Squad Commandos and at least two other creatures attack, Nav Squad Commandos gets +1/+1 until end of turn. Untap it.
+SetInfo:GTC Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/naya_battlemage.txt b/res/cardsfolder/n/naya_battlemage.txt
index cf5213bc30e..81d2205fd45 100644
--- a/res/cardsfolder/n/naya_battlemage.txt
+++ b/res/cardsfolder/n/naya_battlemage.txt
@@ -4,7 +4,6 @@ Types:Creature Human Shaman
 PT:2/2
 A:AB$ Pump | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | SpellDescription$ Target creature gets +2/+0 until end of turn.
 A:AB$ Tap | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naya_battlemage.jpg
-SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/142.jpg
 Oracle:{R}, {T}: Target creature gets +2/+0 until end of turn.\n{W}, {T}: Tap target creature.
+SetInfo:ALA Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/naya_charm.txt b/res/cardsfolder/n/naya_charm.txt
index 6e29b97b67b..e6807dbce84 100644
--- a/res/cardsfolder/n/naya_charm.txt
+++ b/res/cardsfolder/n/naya_charm.txt
@@ -6,7 +6,7 @@ SVar:DBDealDamage:DB$ DealDamage | NumDmg$ 3 | ValidTgts$ Creature | TgtPrompt$
 SVar:DBReturn:DB$ ChangeZone | ValidTgts$ Card | TgtPrompt$ Select target card in a graveyard | Origin$ Graveyard | Destination$ Hand | SpellDescription$ or return target card from a graveyard to its owner's hand;
 SVar:DBTapAll:DB$ TapAll | ValidCards$ Creature | ValidTgts$ Player | TgtPrompt$ Select target player | SpellDescription$ or tap all creatures target player controls.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naya_charm.jpg
-SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/180.jpg
 Oracle:Choose one - Naya Charm deals 3 damage to target creature; or return target card from a graveyard to its owner's hand; or tap all creatures target player controls.
+SetInfo:DDH Uncommon
+SetInfo:ALA Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/naya_hushblade.txt b/res/cardsfolder/n/naya_hushblade.txt
index 0fabfe7bbe6..512e6645e18 100644
--- a/res/cardsfolder/n/naya_hushblade.txt
+++ b/res/cardsfolder/n/naya_hushblade.txt
@@ -5,7 +5,6 @@ PT:2/1
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Shroud | CheckSVar$ X | SVarCompare$ GE1 | References$ X | Description$ As long as you control another multicolored permanent, CARDNAME gets +1/+1 and has shroud. (It can't be the target of spells or abilities.)
 SVar:X:Count$Valid Permanent.MultiColor+Other+YouCtrl
 SVar:BuffedBy:Permanent.MultiColor
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naya_hushblade.jpg
-SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/141.jpg
 Oracle:As long as you control another multicolored permanent, Naya Hushblade gets +1/+1 and has shroud. (It can't be the target of spells or abilities.)
+SetInfo:ARB Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/naya_panorama.txt b/res/cardsfolder/n/naya_panorama.txt
index 808172e2414..17b809a73da 100644
--- a/res/cardsfolder/n/naya_panorama.txt
+++ b/res/cardsfolder/n/naya_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.Mountain+Basic,Land.Forest+Basic,Land.Plains+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Mountain, Forest, or Plains 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/naya_panorama.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/227.jpg
 Oracle:{T}: Add {1} to your mana pool.\n{1}, {T}, Sacrifice Naya Panorama: Search your library for a basic Mountain, Forest, or Plains 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/n/naya_sojourners.txt b/res/cardsfolder/n/naya_sojourners.txt
index 6fc657793f3..5aa3b1e4e86 100644
--- a/res/cardsfolder/n/naya_sojourners.txt
+++ b/res/cardsfolder/n/naya_sojourners.txt
@@ -6,7 +6,6 @@ K:Cycling:2 G
 T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ When you cycle CARDNAME or it's put into a graveyard from the battlefield, you may put a +1/+1 counter on target creature.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPutCounter | OptionalDecider$ You | Secondary$ True | TriggerDescription$ When you cycle CARDNAME or it's put into a graveyard from the battlefield, you may put a +1/+1 counter on target creature.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naya_sojourners.jpg
-SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/122.jpg
 Oracle:When you cycle Naya Sojourners or it dies, you may put a +1/+1 counter on target creature.\nCycling {2}{G} ({2}{G}, Discard this card: Draw a card.)
+SetInfo:ARB Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/near_death_experience.txt b/res/cardsfolder/n/near_death_experience.txt
index 6a63f011e52..5cc43dfc049 100644
--- a/res/cardsfolder/n/near_death_experience.txt
+++ b/res/cardsfolder/n/near_death_experience.txt
@@ -4,7 +4,6 @@ Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | LifeTotal$ You | LifeAmount$ EQ1 | TriggerZones$ Battlefield | Execute$ TrigWin | TriggerDescription$ At the beginning of your upkeep, if you have exactly 1 life, you win the game.
 SVar:TrigWin:AB$WinsGame | Cost$ 0 | Defined$ You
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/near_death_experience.jpg
-SetInfo:ROE|Rare|http://magiccards.info/scans/en/roe/38.jpg
 Oracle:At the beginning of your upkeep, if you have exactly 1 life, you win the game.
+SetInfo:ROE Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nearheath_pilgrim.txt b/res/cardsfolder/n/nearheath_pilgrim.txt
index e62a27d01ea..4e925494aef 100644
--- a/res/cardsfolder/n/nearheath_pilgrim.txt
+++ b/res/cardsfolder/n/nearheath_pilgrim.txt
@@ -4,7 +4,6 @@ Types:Creature Human Cleric
 PT:2/1
 K:Soulbond
 S:Mode$ Continuous | Affected$ Creature.PairedWith,Creature.Self+Paired | AddKeyword$ Lifelink | Description$ As long as CARDNAME is paired with another creature, both creatures have lifelink.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nearheath_pilgrim.jpg
-SetInfo:AVR|Uncommon|http://magiccards.info/scans/en/avr/31.jpg
 Oracle:Soulbond (You may pair this creature with another unpaired creature when either enters the battlefield. They remain paired for as long as you control both of them.)\nAs long as Nearheath Pilgrim is paired with another creature, both creatures have lifelink.
+SetInfo:AVR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nearheath_stalker.txt b/res/cardsfolder/n/nearheath_stalker.txt
index 987cd2ba6f7..f0ec227948e 100644
--- a/res/cardsfolder/n/nearheath_stalker.txt
+++ b/res/cardsfolder/n/nearheath_stalker.txt
@@ -3,7 +3,6 @@ ManaCost:4 R
 Types:Creature Vampire Rogue
 PT:4/1
 K:Undying
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nearheath_stalker.jpg
 Oracle:Undying (When this creature dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it.)
-SetInfo:DKA|Common|http://magiccards.info/scans/en/dka/100.jpg
+SetInfo:DKA Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nebuchadnezzar.txt b/res/cardsfolder/n/nebuchadnezzar.txt
index ba1e08e51f9..ab711332369 100644
--- a/res/cardsfolder/n/nebuchadnezzar.txt
+++ b/res/cardsfolder/n/nebuchadnezzar.txt
@@ -5,8 +5,7 @@ PT:3/3
 #This is necessary for cost payment, but not used.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nebuchadnezzar.jpg
 Oracle:{X}, {T}: Name a card. Target opponent reveals X cards at random from his or her hand. Then that player discards all cards with that name revealed this way. Activate this ability only during your turn.
-SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/115.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/285.jpg
+SetInfo:CHR Rare
+SetInfo:LEG Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/neck_snap.txt b/res/cardsfolder/n/neck_snap.txt
index adf2eaac8d9..67e334f8751 100644
--- a/res/cardsfolder/n/neck_snap.txt
+++ b/res/cardsfolder/n/neck_snap.txt
@@ -2,7 +2,6 @@ Name:Neck Snap
 ManaCost:3 W
 Types:Instant
 A:SP$ Destroy | Cost$ 3 W | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | SpellDescription$ Destroy target attacking or blocking creature.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neck_snap.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/32.jpg
 Oracle:Destroy target attacking or blocking creature.
+SetInfo:LRW Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/necra_disciple.txt b/res/cardsfolder/n/necra_disciple.txt
index 9e3cf34182d..c500265013e 100644
--- a/res/cardsfolder/n/necra_disciple.txt
+++ b/res/cardsfolder/n/necra_disciple.txt
@@ -4,7 +4,6 @@ Types:Creature Human Wizard
 PT:1/1
 A:AB$ PreventDamage | Cost$ W 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$ Mana | Cost$ G T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necra_disciple.jpg
-SetInfo:APC|Common|http://magiccards.info/scans/en/ap/44.jpg
 Oracle:{G}, {T}: Add one mana of any color to your mana pool.\n{W}, {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.
+SetInfo:APC Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/necra_sanctuary.txt b/res/cardsfolder/n/necra_sanctuary.txt
index b3bb00c5c01..072433e9701 100644
--- a/res/cardsfolder/n/necra_sanctuary.txt
+++ b/res/cardsfolder/n/necra_sanctuary.txt
@@ -8,7 +8,6 @@ SVar:Y:Count$Valid Permanent.Green+YouCtrl/LimitMax.1
 SVar:Z:Count$Valid Permanent.White+YouCtrl/LimitMax.1
 SVar:X:SVar$Y/Plus.Z
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necra_sanctuary.jpg
-SetInfo:APC|Uncommon|http://magiccards.info/scans/en/ap/45.jpg
 Oracle:At the beginning of your upkeep, if you control a green or white permanent, target player loses 1 life. If you control a green permanent and a white permanent, that player loses 3 life instead.
+SetInfo:APC Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/necratog.txt b/res/cardsfolder/n/necratog.txt
index 9776f9049a2..4d810111cc4 100644
--- a/res/cardsfolder/n/necratog.txt
+++ b/res/cardsfolder/n/necratog.txt
@@ -3,7 +3,6 @@ ManaCost:1 B B
 Types:Creature Atog
 PT:1/2
 A:AB$ Pump | Cost$ ExileFromGrave<1/Card.TopGraveyardCreature> | CostDesc$ Exile the top creature card of your graveyard: | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necratog.jpg
-SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/18.jpg
 Oracle:Exile the top creature card of your graveyard: Necratog gets +2/+2 until end of turn.
+SetInfo:WTH Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/necravolver.txt b/res/cardsfolder/n/necravolver.txt
index b1ba79f865b..b34ff967db7 100644
--- a/res/cardsfolder/n/necravolver.txt
+++ b/res/cardsfolder/n/necravolver.txt
@@ -14,7 +14,6 @@ SVar:PseudoLifelink:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ VolverT
 SVar:VolverTrigGain:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ VolverX | References$ VolverX
 SVar:VolverX:TriggerCount$DamageAmount
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necravolver.jpg
-SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/46.jpg
 Oracle:Kicker {1}{G} and/or {W} (You may pay an additional {1}{G} and/or {W} as you cast this spell.)\nIf Necravolver was kicked with its {1}{G} kicker, it enters the battlefield with two +1/+1 counters on it and with trample.\nIf Necravolver was kicked with its {W} kicker, it enters the battlefield with a +1/+1 counter on it and with "Whenever Necravolver deals damage, you gain that much life."
+SetInfo:APC Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrite.txt b/res/cardsfolder/n/necrite.txt
index c159fd98bc1..df09d8c41c1 100644
--- a/res/cardsfolder/n/necrite.txt
+++ b/res/cardsfolder/n/necrite.txt
@@ -5,8 +5,7 @@ PT:2/2
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may sacrifice it. If you do, destroy target creature defending player controls. It can't be regenerated.
 SVar:TrigDestroy:AB$Destroy | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature defending player controls | NoRegen$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrite.jpg
-SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/43.jpg
-SetInfo:FEM|Common|http://magiccards.info/scans/en/fe/22.jpg|3
 Oracle:Whenever Necrite attacks and isn't blocked, you may sacrifice it. If you do, destroy target creature defending player controls. It can't be regenerated.
+SetInfo:5ED Common
+SetInfo:FEM Common x3
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrobite.txt b/res/cardsfolder/n/necrobite.txt
index b0a327e3657..7ca4a08930b 100644
--- a/res/cardsfolder/n/necrobite.txt
+++ b/res/cardsfolder/n/necrobite.txt
@@ -3,7 +3,6 @@ ManaCost:2 B
 Types:Instant
 A:SP$ Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Deathtouch | SubAbility$ DBRegen | SpellDescription$ Target creature gains deathtouch until end of turn. Regenerate it
 SVar:DBRegen:DB$ Regenerate | Cost$ 0 | Defined$ Targeted
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrobite.jpg
-SetInfo:AVR|Common|http://magiccards.info/scans/en/avr/115.jpg
 Oracle:Target creature gains deathtouch until end of turn. Regenerate it.
+SetInfo:AVR Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrogen_censer.txt b/res/cardsfolder/n/necrogen_censer.txt
index 090cf6626e4..b5ce5d5503d 100644
--- a/res/cardsfolder/n/necrogen_censer.txt
+++ b/res/cardsfolder/n/necrogen_censer.txt
@@ -3,7 +3,6 @@ ManaCost:3
 Types:Artifact
 K:etbCounter:CHARGE:2
 A:AB$ LoseLife | Cost$ T SubCounter<1/CHARGE> | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 2 | SpellDescription$ Target player loses 2 life.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrogen_censer.jpg
-SetInfo:SOM|Common|http://magiccards.info/scans/en/som/184.jpg
 Oracle:Necrogen Censer enters the battlefield with two charge counters on it.\n{T}, Remove a charge counter from Necrogen Censer: Target player loses 2 life.
+SetInfo:SOM Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrogen_mists.txt b/res/cardsfolder/n/necrogen_mists.txt
index 6a2014a48e7..3f769e0ce2c 100644
--- a/res/cardsfolder/n/necrogen_mists.txt
+++ b/res/cardsfolder/n/necrogen_mists.txt
@@ -4,7 +4,6 @@ Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ At the beginning of each player's upkeep, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredPlayer | NumCards$ 1 | Mode$ TgtChoose
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrogen_mists.jpg
-SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/69.jpg
 Oracle:At the beginning of each player's upkeep, that player discards a card.
+SetInfo:MRD Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrogen_scudder.txt b/res/cardsfolder/n/necrogen_scudder.txt
index 1f2a8776bb8..f8383c2346b 100644
--- a/res/cardsfolder/n/necrogen_scudder.txt
+++ b/res/cardsfolder/n/necrogen_scudder.txt
@@ -5,7 +5,6 @@ PT:3/3
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters the battlefield, you lose 3 life.
 SVar:TrigLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ 3
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrogen_scudder.jpg
-SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/71.jpg
 Oracle:Flying\nWhen Necrogen Scudder enters the battlefield, you lose 3 life.
+SetInfo:SOM Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrogen_spellbomb.txt b/res/cardsfolder/n/necrogen_spellbomb.txt
index a262917429c..1cce74a7a17 100644
--- a/res/cardsfolder/n/necrogen_spellbomb.txt
+++ b/res/cardsfolder/n/necrogen_spellbomb.txt
@@ -4,7 +4,6 @@ Types:Artifact
 A:AB$ Discard | Cost$ B Sac<1/CARDNAME> | ValidTgts$ Player | NumCards$ 1 | Mode$ TgtChoose | SpellDescription$ Target player discards a card.
 A:AB$ Draw | Cost$ 1 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemRandomDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrogen_spellbomb.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/216.jpg
 Oracle:{B}, Sacrifice Necrogen Spellbomb: Target player discards a card.\n{1}, Sacrifice Necrogen Spellbomb: Draw a card.
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrogenesis.txt b/res/cardsfolder/n/necrogenesis.txt
index 65a0e43de4e..129f2c595ac 100644
--- a/res/cardsfolder/n/necrogenesis.txt
+++ b/res/cardsfolder/n/necrogenesis.txt
@@ -4,8 +4,7 @@ Types:Enchantment
 A:AB$ ChangeZone | Cost$ 2 | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Creature | TgtPrompt$ Select target creature from a graveyard | SubAbility$ DBToken | SpellDescription$ Exile target creature card from a graveyard. Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrogenesis.jpg
-SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/212.jpg
-SetInfo:ALA|Uncommon|http://magiccards.info/scans/en/ala/181.jpg
 Oracle:{2}: Exile target creature card from a graveyard. Put a 1/1 green Saproling creature token onto the battlefield.
+SetInfo:COM Uncommon
+SetInfo:ALA Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrologia.txt b/res/cardsfolder/n/necrologia.txt
index 5ab5493d675..42d1aa794d9 100644
--- a/res/cardsfolder/n/necrologia.txt
+++ b/res/cardsfolder/n/necrologia.txt
@@ -6,8 +6,7 @@ A:SP$ Draw | Cost$ 3 B B PayLife<X> | NumCards$ ChosenX | Defined$ You | Activat
 SVar:X:XChoice
 #ChosenX SVar created by Cost payment
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrologia.jpg
-SetInfo:EXO|Uncommon|http://magiccards.info/scans/en/ex/68.jpg
-SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/149.jpg
 Oracle:Cast Necrologia only during your end step.\nAs an additional cost to cast Necrologia, pay X life.\nDraw X cards.
+SetInfo:7ED Uncommon
+SetInfo:EXO Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/necromancers_covenant.txt b/res/cardsfolder/n/necromancers_covenant.txt
index 746046d7b26..dc0b7635082 100644
--- a/res/cardsfolder/n/necromancers_covenant.txt
+++ b/res/cardsfolder/n/necromancers_covenant.txt
@@ -8,7 +8,6 @@ S:Mode$ Continuous | Affected$ Zombie.YouCtrl | AddKeyword$ Lifelink | Descripti
 SVar:DBClearRemember:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:PlayMain1:TRUE
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necromancers_covenant.jpg
-SetInfo:ARB|Rare|http://magiccards.info/scans/en/arb/82.jpg
 Oracle:When Necromancer's Covenant enters the battlefield, exile all creature cards from target player's graveyard, then put a 2/2 black Zombie creature token onto the battlefield for each card exiled this way.\nZombies you control have lifelink.
+SetInfo:ARB Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/necromancers_magemark.txt b/res/cardsfolder/n/necromancers_magemark.txt
index 35a7cb68cdf..63a31d63402 100644
--- a/res/cardsfolder/n/necromancers_magemark.txt
+++ b/res/cardsfolder/n/necromancers_magemark.txt
@@ -6,7 +6,6 @@ A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.enchanted+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control that are enchanted get +1/+1.
 R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.enchanted+YouCtrl | ReplaceWith$ ReturnToHand | Description$ If a creature you control that's enchanted would die, return it to its owner's hand instead.
 SVar:ReturnToHand:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ ReplacedCard
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necromancers_magemark.jpg
-SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/53.jpg
 Oracle:Enchant creature\nCreatures you control that are enchanted get +1/+1.\nIf a creature you control that's enchanted would die, return it to its owner's hand instead.
+SetInfo:GPT Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/necromancy.txt b/res/cardsfolder/n/necromancy.txt
index ee0d770194c..af1cac62fa5 100644
--- a/res/cardsfolder/n/necromancy.txt
+++ b/res/cardsfolder/n/necromancy.txt
@@ -15,7 +15,6 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.S
 SVar:TrigSac:AB$ SacrificeAll | Cost$ 0 | ValidCards$ Triggered.EnchantedBy
 SVar:NeedsToPlayVar:Y GE1
 SVar:Y:Count$TypeInYourYard.Creature
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necromancy.jpg
-SetInfo:VIS|Uncommon|http://magiccards.info/scans/en/vi/14.jpg
 Oracle:You may cast Necromancy as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.\nWhen Necromancy enters the battlefield, if it's on the battlefield, it becomes an Aura with "enchant creature put onto the battlefield with Necromancy." Put target creature card from a graveyard onto the battlefield under your control and attach Necromancy to it. When Necromancy leaves the battlefield, that creature's controller sacrifices it.
+SetInfo:VIS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/necromantic_thirst.txt b/res/cardsfolder/n/necromantic_thirst.txt
index 8807a02638e..91b21f1688b 100644
--- a/res/cardsfolder/n/necromantic_thirst.txt
+++ b/res/cardsfolder/n/necromantic_thirst.txt
@@ -5,7 +5,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 2 B B | ValidTgts$ Creature | AITgts$ Card.powerGE1 | AILogic$ Pump
 T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigReturn | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever enchanted creature deals combat damage to a player, you may return target creature card from your graveyard to your hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necromantic_thirst.jpg
-SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/97.jpg
 Oracle:Enchant creature\nWhenever enchanted creature deals combat damage to a player, you may return target creature card from your graveyard to your hand.
+SetInfo:RAV Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/necropede.txt b/res/cardsfolder/n/necropede.txt
index 63c26fa418f..abeb1e82b7c 100644
--- a/res/cardsfolder/n/necropede.txt
+++ b/res/cardsfolder/n/necropede.txt
@@ -5,7 +5,6 @@ PT:1/1
 K:Infect
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ TriggeredCardController | Execute$ TrigPutCounter | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may put a -1/-1 counter on target creature.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ M1M1 | IsCurse$ True | CounterNum$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necropede.jpg
-SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/185.jpg
 Oracle:Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)\nWhen Necropede dies, you may put a -1/-1 counter on target creature.
+SetInfo:SOM Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/necroplasm.txt b/res/cardsfolder/n/necroplasm.txt
index e9a30d6eb4e..f2bd9736a5d 100644
--- a/res/cardsfolder/n/necroplasm.txt
+++ b/res/cardsfolder/n/necroplasm.txt
@@ -9,7 +9,6 @@ SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1
 SVar:TrigDestroy:AB$DestroyAll | Cost$ 0 | ValidCards$ Creature.cmcEQX | References$ X
 SVar:X:Count$CardCounters.P1P1
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necroplasm.jpg
-SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/98.jpg
 Oracle:At the beginning of your upkeep, put a +1/+1 counter on Necroplasm.\nAt the beginning of your end step, destroy each creature with converted mana cost equal to the number of +1/+1 counters on Necroplasm.\nDredge 2 (If you would draw a card, instead you may put exactly two cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)
+SetInfo:RAV Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/necropolis.txt b/res/cardsfolder/n/necropolis.txt
index 8536dac578f..44441546ec0 100644
--- a/res/cardsfolder/n/necropolis.txt
+++ b/res/cardsfolder/n/necropolis.txt
@@ -5,7 +5,6 @@ PT:0/1
 K:Defender
 A:AB$ PutCounter | Cost$ ExileFromGrave<1/Creature> | CounterType$ P0P1 | CounterNum$ X | References$ X | SpellDescription$ Put X +0/+1 counters on CARDNAME, where X is the exiled card's converted mana cost.
 SVar:X:Exiled$CardManaCost
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necropolis.jpg
-SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/102.jpg
 Oracle:Defender (This creature can't attack.)\nExile a creature card from your graveyard: Put X +0/+1 counters on Necropolis, where X is the exiled card's converted mana cost.
+SetInfo:DRK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/necropolis_regent.txt b/res/cardsfolder/n/necropolis_regent.txt
index 556ae49d6fe..5ee47fffdc4 100644
--- a/res/cardsfolder/n/necropolis_regent.txt
+++ b/res/cardsfolder/n/necropolis_regent.txt
@@ -6,7 +6,6 @@ K:Flying
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control deals combat damage to a player, put that many +1/+1 counters on it.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ TriggeredSource | CounterType$ P1P1 | CounterNum$ X | References$ X
 SVar:X:TriggerCount$DamageAmount
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necropolis_regent.jpg
-SetInfo:RTR|Mythic|http://magiccards.info/scans/en/rtr/71.jpg
 Oracle:Flying\nWhenever a creature you control deals combat damage to a player, put that many +1/+1 counters on it.
+SetInfo:RTR Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/n/necropotence.txt b/res/cardsfolder/n/necropotence.txt
index cedc85e7a2b..db167e458d5 100644
--- a/res/cardsfolder/n/necropotence.txt
+++ b/res/cardsfolder/n/necropotence.txt
@@ -9,8 +9,8 @@ SVar:DelayedReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Valid
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Hand | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necropotence.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/44.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/42.jpg
 Oracle:Skip your draw step.\nWhenever you discard a card, exile that card from your graveyard.\nPay 1 life: Exile the top card of your library face down. Put that card into your hand at the beginning of your next end step.
+SetInfo:ICE Rare
+SetInfo:5ED Rare
+SetInfo:V09 Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/n/necropotence_avatar.txt b/res/cardsfolder/n/necropotence_avatar.txt
index 2fb1c01bd14..24edc89b928 100644
--- a/res/cardsfolder/n/necropotence_avatar.txt
+++ b/res/cardsfolder/n/necropotence_avatar.txt
@@ -9,8 +9,7 @@ SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ X | SubAbility$ DBLoseLife | Re
 SVar:DBLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:Count$CardCounters.DEATH
 SVar:Turns:Count$TotalTurns
-SVar:Rarity:Special
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/necropotence_avatar.jpg
 SVar:RemAIDeck:True
-SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo-2/necropotence.jpg
 Oracle:Hand +0, life +4\nSkip your draw step.\nAt the beginning of your end step, if it's not the first turn of the game, put a death counter on Necropotence Avatar. You draw X cards and you lose X life, where X is the number of death counters on Necropotence Avatar.
+SetInfo:VAN Special
\ No newline at end of file
diff --git a/res/cardsfolder/n/necropouncer.txt b/res/cardsfolder/n/necropouncer.txt
index 535efb2fff4..2a84ac9ee7f 100644
--- a/res/cardsfolder/n/necropouncer.txt
+++ b/res/cardsfolder/n/necropouncer.txt
@@ -4,7 +4,6 @@ Types:Artifact Equipment
 K:Equip 2
 K:Living Weapon
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddToughness$ 1 | AddKeyword$ Haste | Description$ Equipped creature gets +3/+1 and has haste.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necropouncer.jpg
-SetInfo:NPH|Uncommon|http://magiccards.info/scans/en/nph/147.jpg
 Oracle:Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.)\nEquipped creature gets +3/+1 and has haste.\nEquip {2}
+SetInfo:NPH Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrosavant.txt b/res/cardsfolder/n/necrosavant.txt
index 9de36c5e009..529f1f58201 100644
--- a/res/cardsfolder/n/necrosavant.txt
+++ b/res/cardsfolder/n/necrosavant.txt
@@ -4,8 +4,7 @@ Types:Creature Zombie Giant
 PT:5/5
 A:AB$ ChangeZone | Cost$3 B B Sac<1/Creature> | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | PlayerTurn$ True | ActivationPhases$ Upkeep | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate this ability only during your upkeep.
 SVar:DiscardMe:1
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrosavant.jpg
-SetInfo:VIS|Rare|http://magiccards.info/scans/en/vi/15.jpg
-SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/145.jpg
 Oracle:{3}{B}{B}, Sacrifice a creature: Return Necrosavant from your graveyard to the battlefield. Activate this ability only during your upkeep.
+SetInfo:VIS Rare
+SetInfo:6ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/necroskitter.txt b/res/cardsfolder/n/necroskitter.txt
index 92a6eb3e57d..f158354400d 100644
--- a/res/cardsfolder/n/necroskitter.txt
+++ b/res/cardsfolder/n/necroskitter.txt
@@ -5,7 +5,6 @@ PT:1/4
 K:Wither
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl+counters_GE1_M1M1 | TriggerZones$ Battlefield | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ Whenever a creature an opponent controls with a -1/-1 counter on it is put into a graveyard, you may return that card to the battlefield under your control.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredCard
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necroskitter.jpg
-SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/38.jpg
 Oracle:Wither (This deals damage to creatures in the form of -1/-1 counters.)\nWhenever a creature an opponent controls with a -1/-1 counter on it dies, you may return that card to the battlefield under your control.
+SetInfo:EVE Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrotic_ooze.txt b/res/cardsfolder/n/necrotic_ooze.txt
index 87c787d8cf1..c5343c12487 100644
--- a/res/cardsfolder/n/necrotic_ooze.txt
+++ b/res/cardsfolder/n/necrotic_ooze.txt
@@ -5,5 +5,5 @@ PT:4/3
 S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Creature | GainsAbilitiesOfZones$ Graveyard | Description$ As long as CARDNAME is on the battlefield, it has all activated abilities of all creature cards in all graveyards.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrotic_ooze.jpg
-SetInfo:SOM|Rare|http://magiccards.info/scans/en/som/72.jpg
 Oracle:As long as Necrotic Ooze is on the battlefield, it has all activated abilities of all creature cards in all graveyards.
+SetInfo:SOM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/necrotic_sliver.txt b/res/cardsfolder/n/necrotic_sliver.txt
index 0332f7c8bf1..82692d8fb18 100644
--- a/res/cardsfolder/n/necrotic_sliver.txt
+++ b/res/cardsfolder/n/necrotic_sliver.txt
@@ -4,7 +4,7 @@ Types:Creature Sliver
 PT:2/2
 S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Destroy | Description$ All Slivers have "3, Sacrifice this permanent: Destroy target permanent."
 SVar:Destroy:AB$Destroy | Cost$ 3 Sac<1/CARDNAME> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Destroy target permanent.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necrotic_sliver.jpg
-SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/159.jpg
 Oracle:All Slivers have "{3}, Sacrifice this permanent: Destroy target permanent."
+SetInfo:H09 Uncommon
+SetInfo:PLC Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nectar_faerie.txt b/res/cardsfolder/n/nectar_faerie.txt
index 0f547e5d34b..7489883d0f6 100644
--- a/res/cardsfolder/n/nectar_faerie.txt
+++ b/res/cardsfolder/n/nectar_faerie.txt
@@ -5,7 +5,6 @@ PT:1/1
 K:Flying
 A:AB$ Pump | Cost$ B T | ValidTgts$ Faerie,Elf | TgtPrompt$ Select target Faerie or Elf  | KW$ Lifelink | SpellDescription$ Target Faerie or Elf gains lifelink until end of turn. (Damage dealt by the creature also causes its controller to gain that much life.)
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nectar_faerie.jpg
-SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/130.jpg
 Oracle:Flying\n{B}, {T}: Target Faerie or Elf gains lifelink until end of turn. (Damage dealt by the creature also causes its controller to gain that much life.)
+SetInfo:LRW Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/need_for_speed.txt b/res/cardsfolder/n/need_for_speed.txt
index 19659b83e15..85ed64da838 100644
--- a/res/cardsfolder/n/need_for_speed.txt
+++ b/res/cardsfolder/n/need_for_speed.txt
@@ -3,7 +3,6 @@ ManaCost:R
 Types:Enchantment
 A:AB$ Pump | Cost$ Sac<1/Land> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SpellDescription$ Target creature gains haste until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/need_for_speed.jpg
-SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/209.jpg
 Oracle:Sacrifice a land: Target creature gains haste until end of turn.
+SetInfo:ODY Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/needle_drop.txt b/res/cardsfolder/n/needle_drop.txt
index 2cc443d8d2c..c88ac25dec0 100644
--- a/res/cardsfolder/n/needle_drop.txt
+++ b/res/cardsfolder/n/needle_drop.txt
@@ -3,7 +3,6 @@ ManaCost:R
 Types:Instant
 A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature.wasDealtDamageThisTurn,Player.wasDealtDamageThisTurn | TgtPrompt$ Select target creature or player that was dealt damage this turn | NumDmg$ 1 | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals 1 damage to target creature or player that was dealt damage this turn.
 SVar:DBDraw:DB$Draw | NumCards$ 1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/needle_drop.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/186.jpg
 Oracle:Needle Drop deals 1 damage to target creature or player that was dealt damage this turn.\nDraw a card.
+SetInfo:LRW Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/needle_specter.txt b/res/cardsfolder/n/needle_specter.txt
index 7dbaa6e29ff..fe5908b531f 100644
--- a/res/cardsfolder/n/needle_specter.txt
+++ b/res/cardsfolder/n/needle_specter.txt
@@ -7,7 +7,6 @@ K:Wither
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards that many cards.
 SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ X | References$ X | Mode$ TgtChoose
 SVar:X:TriggerCount$DamageAmount
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/needle_specter.jpg
-SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/39.jpg
 Oracle:Flying\nWither (This deals damage to creatures in the form of -1/-1 counters.)\nWhenever Needle Specter deals combat damage to a player, that player discards that many cards.
+SetInfo:EVE Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/needle_storm.txt b/res/cardsfolder/n/needle_storm.txt
index 010db9bf0d7..9f16e20b5f3 100644
--- a/res/cardsfolder/n/needle_storm.txt
+++ b/res/cardsfolder/n/needle_storm.txt
@@ -2,9 +2,8 @@ Name:Needle Storm
 ManaCost:2 G
 Types:Sorcery
 A:SP$ DamageAll | Cost$ 2 G | NumDmg$ 4 | ValidCards$ Creature.withFlying | ValidDescription$ each creature with flying. | SpellDescription$ CARDNAME deals 4 damage to each creature with flying.
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/po/en-us/card4311.jpg
-SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/135.jpg
-SetInfo:POR|Uncommon|http://magiccards.info/scans/en/po/105.jpg
-SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/259.jpg
 Oracle:Needle Storm deals 4 damage to each creature with flying.
+SetInfo:TMP Uncommon
+SetInfo:POR Uncommon
+SetInfo:9ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/needlebug.txt b/res/cardsfolder/n/needlebug.txt
index 763439cc842..dc65b56664a 100644
--- a/res/cardsfolder/n/needlebug.txt
+++ b/res/cardsfolder/n/needlebug.txt
@@ -4,7 +4,6 @@ Types:Artifact Creature Insect
 PT:2/2
 K:Flash
 K:Protection from artifacts
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/needlebug.jpg
-SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/217.jpg
 Oracle:Flash\nProtection from artifacts
+SetInfo:MRD Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/needlepeak_spider.txt b/res/cardsfolder/n/needlepeak_spider.txt
index 8189cd4ce4a..5291a6db698 100644
--- a/res/cardsfolder/n/needlepeak_spider.txt
+++ b/res/cardsfolder/n/needlepeak_spider.txt
@@ -3,7 +3,6 @@ ManaCost:3 R
 Types:Creature Spider
 PT:4/2
 K:Reach
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/plc/en-us/card122268.jpg
-SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/105.jpg
 Oracle:Reach (This creature can block creatures with flying.)
+SetInfo:PLC Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/needleshot_gourna.txt b/res/cardsfolder/n/needleshot_gourna.txt
index 7884d9e858e..51a7067e336 100644
--- a/res/cardsfolder/n/needleshot_gourna.txt
+++ b/res/cardsfolder/n/needleshot_gourna.txt
@@ -3,7 +3,6 @@ ManaCost:4 G G
 Types:Creature Beast
 PT:3/6
 K:Reach
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/lgn/en-us/card42039.jpg
-SetInfo:LGN|Common|http://magiccards.info/scans/en/le/133.jpg
 Oracle:Reach (This creature can block creatures with flying.)
+SetInfo:LGN Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nefarox_overlord_of_grixis.txt b/res/cardsfolder/n/nefarox_overlord_of_grixis.txt
index 6fedfe87437..7b4b22702db 100644
--- a/res/cardsfolder/n/nefarox_overlord_of_grixis.txt
+++ b/res/cardsfolder/n/nefarox_overlord_of_grixis.txt
@@ -7,7 +7,6 @@ K:Exalted
 T:Mode$ Attacks | ValidCard$ Card.Self | Alone$ True | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME attacks alone, defending player sacrifices a creature.
 SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ DefendingPlayer | SacValid$ Creature
 SVar:HasAttackEffect:TRUE
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nefarox_overlord_of_grixis.jpg
-SetInfo:M13|Rare|http://magiccards.info/scans/en/m13/103.jpg
 Oracle:Flying\nExalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)\nWhenever Nefarox, Overlord of Grixis attacks alone, defending player sacrifices a creature.
+SetInfo:M13 Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nefashu.txt b/res/cardsfolder/n/nefashu.txt
index d4a9970b0a7..b3c3f58be48 100644
--- a/res/cardsfolder/n/nefashu.txt
+++ b/res/cardsfolder/n/nefashu.txt
@@ -5,7 +5,7 @@ PT:5/3
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigShrink | TriggerDescription$ Whenever CARDNAME attacks, up to five target creatures each get -1/-1 until end of turn.
 SVar:TrigShrink:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ 5 | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True
 SVar:HasAttackEffect:TRUE
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nefashu.jpg
-SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/70.jpg
 Oracle:Whenever Nefashu attacks, up to five target creatures each get -1/-1 until end of turn.
+SetInfo:SCG Rare
+SetInfo:HOP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/negate.txt b/res/cardsfolder/n/negate.txt
index 5c391ec1aa0..d76ca43681a 100644
--- a/res/cardsfolder/n/negate.txt
+++ b/res/cardsfolder/n/negate.txt
@@ -2,11 +2,10 @@ Name:Negate
 ManaCost:1 U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target nonCreature Spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/negate.jpg
-SetInfo:M11|Common|http://magiccards.info/scans/en/m11/68.jpg
-SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/43.jpg
-SetInfo:M13|Common|http://magiccards.info/scans/en/m13/62.jpg
-SetInfo:M12|Common|http://magiccards.info/scans/en/m12/69.jpg
-SetInfo:M10|Common|http://magiccards.info/scans/en/m10/65.jpg
 Oracle:Counter target noncreature spell.
+SetInfo:M11 Common
+SetInfo:MOR Common
+SetInfo:M13 Common
+SetInfo:M12 Common
+SetInfo:M10 Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/neko_te.txt b/res/cardsfolder/n/neko_te.txt
index 19d74a8f69d..c24c87be017 100644
--- a/res/cardsfolder/n/neko_te.txt
+++ b/res/cardsfolder/n/neko_te.txt
@@ -7,7 +7,6 @@ SVar:TrigNekoTeTap:AB$ Tap | Cost$ 0 | Defined$ TriggeredTarget | SubAbility$ DB
 SVar:DBNekoTeAnimate:DB$ Animate | Defined$ TriggeredTarget | HiddenKeywords$ CARDNAME doesn't untap during your untap step. | UntilHostLeavesPlay$ True
 T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Player | Execute$ TrigNekoTeLoseLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals damage to a player, that player loses 1 life.
 SVar:TrigNekoTeLoseLife:AB$ LoseLife | Cost$ 0 | LifeAmount$ 1 | Defined$ TriggeredTarget
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neko_te.jpg
-SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/155.jpg
 Oracle:Whenever equipped creature deals damage to a creature, tap that creature. That creature doesn't untap during its controller's untap step for as long as Neko-Te remains on the battlefield.\nWhenever equipped creature deals damage to a player, that player loses 1 life.\nEquip {2}
+SetInfo:BOK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nekrataal.txt b/res/cardsfolder/n/nekrataal.txt
index 4b01383cf64..11cb1b5b6a6 100644
--- a/res/cardsfolder/n/nekrataal.txt
+++ b/res/cardsfolder/n/nekrataal.txt
@@ -6,10 +6,9 @@ K:First Strike
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target nonartifact, nonblack creature.
 SVar:TrigDestroy:DB$Destroy | ValidTgts$ Creature.nonArtifact+nonBlack | NoRegen$ True | TgtPrompt$ Select target nonartifact, nonblack creature.
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nekrataal.jpg
-SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/149.jpg
-SetInfo:VIS|Uncommon|http://magiccards.info/scans/en/vi/16.jpg
-SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/149.jpg
-SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/163.jpg
 Oracle:First strike (This creature deals combat damage before creatures without first strike.)\nWhen Nekrataal enters the battlefield, destroy target nonartifact, nonblack creature. That creature can't be regenerated.
+SetInfo:8ED Uncommon
+SetInfo:VIS Uncommon
+SetInfo:9ED Uncommon
+SetInfo:10E Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nekrataal_avatar.txt b/res/cardsfolder/n/nekrataal_avatar.txt
index f4dfac04dae..0f9aa3f57fd 100644
--- a/res/cardsfolder/n/nekrataal_avatar.txt
+++ b/res/cardsfolder/n/nekrataal_avatar.txt
@@ -4,7 +4,6 @@ Types:Vanguard
 HandLifeModifier:-1/-4
 S:Mode$ ReduceCost | EffectZone$ Command | ValidCard$ Creature | Type$ Spell | Activator$ You | Amount$ 1 | Color$ B | Description$ Creature spells you cast cost B less to cast. This effect reduces only the amount of colored mana you pay.
 SVar:RemRandomDeck:True
-SVar:Rarity:Special
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/nekrataal_avatar.jpg
-SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo/nekrataal.jpg
 Oracle:Hand -1, life -4\nCreature spells you cast cost {B} less to cast. This effect reduces only the amount of colored mana you pay.
+SetInfo:VAN Special
\ No newline at end of file
diff --git a/res/cardsfolder/n/nema_siltlurker.txt b/res/cardsfolder/n/nema_siltlurker.txt
index 25305b70bd4..8613712cff8 100644
--- a/res/cardsfolder/n/nema_siltlurker.txt
+++ b/res/cardsfolder/n/nema_siltlurker.txt
@@ -2,7 +2,6 @@ Name:Nema Siltlurker
 ManaCost:4 G
 Types:Creature Lizard
 PT:3/5
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nema_siltlurker.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/200.jpg
 Oracle:
+SetInfo:ROE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nemata_grove_guardian.txt b/res/cardsfolder/n/nemata_grove_guardian.txt
index 10ce9790a1a..3f74b4f9940 100644
--- a/res/cardsfolder/n/nemata_grove_guardian.txt
+++ b/res/cardsfolder/n/nemata_grove_guardian.txt
@@ -5,7 +5,6 @@ PT:4/5
 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.
 A:AB$ PumpAll | Cost$ Sac<1/Saproling> | ValidCards$ Creature.Saproling | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Saproling creatures get +1/+1 until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nemata_grove_guardian.jpg
-SetInfo:PLS|Rare|http://magiccards.info/scans/en/ps/85.jpg
 Oracle:{2}{G}: Put a 1/1 green Saproling creature token onto the battlefield.\nSacrifice a Saproling: Saproling creatures get +1/+1 until end of turn.
+SetInfo:PLS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nemesis_mask.txt b/res/cardsfolder/n/nemesis_mask.txt
index 49f20dfb628..87b6ca23fc9 100644
--- a/res/cardsfolder/n/nemesis_mask.txt
+++ b/res/cardsfolder/n/nemesis_mask.txt
@@ -3,7 +3,6 @@ ManaCost:3
 Types:Artifact Equipment
 K:Equip 3
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ All creatures able to block CARDNAME do so. | Description$ All creatures able to block equipped creature do so.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nemesis_mask.jpg
-SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/134.jpg
 Oracle:All creatures able to block equipped creature do so.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
+SetInfo:DST Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nemesis_of_reason.txt b/res/cardsfolder/n/nemesis_of_reason.txt
index dc1ffaf9c9c..17e69dce8a2 100644
--- a/res/cardsfolder/n/nemesis_of_reason.txt
+++ b/res/cardsfolder/n/nemesis_of_reason.txt
@@ -5,7 +5,6 @@ PT:3/7
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME attacks, defending player puts the top ten cards of his or her library into his or her graveyard.
 SVar:TrigMill:AB$ Mill | Cost$ 0 | Defined$ DefendingPlayer | NumCards$ 10
 SVar:HasAttackEffect:TRUE
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nemesis_of_reason.jpg
-SetInfo:ARB|Rare|http://magiccards.info/scans/en/arb/28.jpg
 Oracle:Whenever Nemesis of Reason attacks, defending player puts the top ten cards of his or her library into his or her graveyard.
+SetInfo:ARB Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nemesis_trap.txt b/res/cardsfolder/n/nemesis_trap.txt
index 31c4425af6b..41a063f8a0e 100644
--- a/res/cardsfolder/n/nemesis_trap.txt
+++ b/res/cardsfolder/n/nemesis_trap.txt
@@ -4,8 +4,7 @@ Types:Instant Trap
 A:SP$ ChangeZone | Cost$ 4 B B | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ NemesisToken | SpellDescription$ Exile target attacking creature. Put a token that's a copy of that creature onto the battlefield. Exile it at the beginning of the next end step.
 A:SP$ ChangeZone | Cost$ B B | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ NemesisToken | IsPresent$ Creature.White+attacking | SpellDescription$ If a white creature is attacking, you may pay B B rather than pay CARDNAME's mana cost.
 SVar:NemesisToken:DB$ CopyPermanent | Defined$ Targeted | AtEOT$ Exile
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nemesis_trap.jpg
-SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/91.jpg
-SetInfo:WWK|Uncommon|http://magiccards.info/scans/en/wwk/61.jpg
 Oracle:If a white creature is attacking, you may pay {B}{B} rather than pay Nemesis Trap's mana cost.\nExile target attacking creature. Put a token that's a copy of that creature onto the battlefield. Exile it at the beginning of the next end step.
+SetInfo:COM Uncommon
+SetInfo:WWK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nephalia_drownyard.txt b/res/cardsfolder/n/nephalia_drownyard.txt
index 49abd60d03e..ef9ee3d015e 100644
--- a/res/cardsfolder/n/nephalia_drownyard.txt
+++ b/res/cardsfolder/n/nephalia_drownyard.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$ Mill | Cost$ 1 U B T | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top three cards of his or her library into his or her graveyard.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nephalia_drownyard.jpg
-SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/245.jpg
 Oracle:{T}: Add {1} to your mana pool.\n{1}{U}{B}, {T}: Target player puts the top three cards of his or her library into his or her graveyard.
+SetInfo:ISD Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nephalia_seakite.txt b/res/cardsfolder/n/nephalia_seakite.txt
index f754573f1e4..6030d7f6365 100644
--- a/res/cardsfolder/n/nephalia_seakite.txt
+++ b/res/cardsfolder/n/nephalia_seakite.txt
@@ -4,7 +4,6 @@ Types:Creature Bird
 PT:2/3
 K:Flash
 K:Flying
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nephalia_seakite.jpg
-SetInfo:DKA|Common|http://magiccards.info/scans/en/dka/43.jpg
 Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying
+SetInfo:DKA Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nephalia_smuggler.txt b/res/cardsfolder/n/nephalia_smuggler.txt
index eb8848a30ad..2be8d3e2f7a 100644
--- a/res/cardsfolder/n/nephalia_smuggler.txt
+++ b/res/cardsfolder/n/nephalia_smuggler.txt
@@ -5,7 +5,6 @@ PT:1/1
 A:AB$ChangeZone | Cost$ 3 U T | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ SmuggleIn | SpellDescription$ Exile another target creature you control, then return that card to the battlefield under your control.
 SVar:SmuggleIn:DB$ChangeZone | Defined$ Targeted | Origin$ Exile | Destination$ Battlefield | GainControl$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nephalia_smuggler.jpg
-SetInfo:AVR|Uncommon|http://magiccards.info/scans/en/avr/69.jpg
 Oracle:{3}{U}, {T}: Exile another target creature you control, then return that card to the battlefield under your control.
+SetInfo:AVR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nessian_courser.txt b/res/cardsfolder/n/nessian_courser.txt
index 340a93b1766..80847f7347b 100644
--- a/res/cardsfolder/n/nessian_courser.txt
+++ b/res/cardsfolder/n/nessian_courser.txt
@@ -2,7 +2,6 @@ Name:Nessian Courser
 ManaCost:2 G
 Types:Creature Centaur Warrior
 PT:3/3
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card136138.jpg
-SetInfo:FUT|Common|http://magiccards.info/scans/en/fut/148.jpg
 Oracle:
+SetInfo:FUT Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nest_invader.txt b/res/cardsfolder/n/nest_invader.txt
index 616e2d0db54..43b54e457ed 100644
--- a/res/cardsfolder/n/nest_invader.txt
+++ b/res/cardsfolder/n/nest_invader.txt
@@ -5,8 +5,7 @@ PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have "Sacrifice this creature: Add 1 to your mana pool."
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana
 SVar:ABMana:AB$Mana | Cost$ Sac<1/CARDNAME> | Produced$ 1 | Amount$ 1 | SpellDescription$ Add 1 to your mana pool.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nest_invader.jpg
-SetInfo:PC2|Common|http://magiccards.info/scans/en/pc2/69.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/201.jpg
 Oracle:When Nest Invader enters the battlefield, put a 0/1 colorless Eldrazi Spawn creature token onto the battlefield. It has "Sacrifice this creature: Add {1} to your mana pool."
+SetInfo:PC2 Common
+SetInfo:ROE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nested_ghoul.txt b/res/cardsfolder/n/nested_ghoul.txt
index c3315af840d..ab25d6500e7 100644
--- a/res/cardsfolder/n/nested_ghoul.txt
+++ b/res/cardsfolder/n/nested_ghoul.txt
@@ -5,7 +5,6 @@ PT:4/2
 T:Mode$ DamageDone | ValidTarget$ Creature.Self | Execute$ TrigZombie | TriggerDescription$ Whenever a source deals damage to CARDNAME, put a 2/2 black Zombie creature token onto the battlefield.
 SVar:TrigZombie:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2
 SVar:HasCombatEffect:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nested_ghoul.jpg
-SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/48.jpg
 Oracle:Whenever a source deals damage to Nested Ghoul, put a 2/2 black Zombie creature token onto the battlefield.
+SetInfo:MBS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nesting_wurm.txt b/res/cardsfolder/n/nesting_wurm.txt
index 6b701943ee1..5ceb2f1bcdc 100644
--- a/res/cardsfolder/n/nesting_wurm.txt
+++ b/res/cardsfolder/n/nesting_wurm.txt
@@ -5,7 +5,6 @@ PT:4/3
 K:Trample
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for up to three cards named CARDNAME, reveal them, and put them into your hand. If you do, shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedNesting Wurm | ChangeNum$ 3
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nesting_wurm.jpg
-SetInfo:NMS|Uncommon|http://magiccards.info/scans/en/ne/107.jpg
 Oracle:Trample\nWhen Nesting Wurm enters the battlefield, you may search your library for up to three cards named Nesting Wurm, reveal them, and put them into your hand. If you do, shuffle your library.
+SetInfo:NMS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nether_horror.txt b/res/cardsfolder/n/nether_horror.txt
index 58a19597edd..a24a09e4694 100644
--- a/res/cardsfolder/n/nether_horror.txt
+++ b/res/cardsfolder/n/nether_horror.txt
@@ -2,7 +2,6 @@ Name:Nether Horror
 ManaCost:3 B
 Types:Creature Horror
 PT:4/2
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nether_horror.jpg
-SetInfo:M11|Common|http://magiccards.info/scans/en/m11/108.jpg
 Oracle:
+SetInfo:M11 Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nether_shadow.txt b/res/cardsfolder/n/nether_shadow.txt
index aa53c2659ab..e60f404b18f 100644
--- a/res/cardsfolder/n/nether_shadow.txt
+++ b/res/cardsfolder/n/nether_shadow.txt
@@ -6,12 +6,11 @@ K:Haste
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | IsPresent$ Creature.YouOwn+Above | PresentZone$ Graveyard | PresentCompare$ GE3 | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard with three or more creature cards above it, you may put CARDNAME onto the battlefield.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
 SVar:DiscardMe:2
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nether_shadow.jpg
-SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/25.jpg
-SetInfo:LEB|Rare|http://magiccards.info/scans/en/be/25.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/45.jpg
-SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/33.jpg
-SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/26.jpg
-SetInfo:2ED|Rare|http://magiccards.info/scans/en/un/25.jpg
 Oracle:Haste\nAt the beginning of your upkeep, if Nether Shadow is in your graveyard with three or more creature cards above it, you may put Nether Shadow onto the battlefield.
+SetInfo:2ED 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/n/nether_spirit.txt b/res/cardsfolder/n/nether_spirit.txt
index 87c3bc664ac..16bb8d6d89e 100644
--- a/res/cardsfolder/n/nether_spirit.txt
+++ b/res/cardsfolder/n/nether_spirit.txt
@@ -4,7 +4,6 @@ Types:Creature Spirit
 PT:2/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | IsPresent$ Creature.YouOwn | PresentZone$ Graveyard | PresentCompare$ EQ1 | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is the only creature card in your graveyard, you may return CARDNAME to the battlefield.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nether_spirit.jpg
-SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/149.jpg
 Oracle:At the beginning of your upkeep, if Nether Spirit is the only creature card in your graveyard, you may return Nether Spirit to the battlefield.
+SetInfo:MMQ Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nether_traitor.txt b/res/cardsfolder/n/nether_traitor.txt
index 830578254a9..b0d12bd13d5 100644
--- a/res/cardsfolder/n/nether_traitor.txt
+++ b/res/cardsfolder/n/nether_traitor.txt
@@ -8,7 +8,6 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigReturn:AB$ChangeZone | Cost$ B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
 SVar:SacMe:1
 SVar:DiscardMe:1
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nether_traitor.jpg
-SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/120.jpg
 Oracle:Haste\nShadow (This creature can block or be blocked by only creatures with shadow.)\nWhenever another creature is put into your graveyard from the battlefield, you may pay {B}. If you do, return Nether Traitor from your graveyard to the battlefield.
+SetInfo:TSP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nether_void.txt b/res/cardsfolder/n/nether_void.txt
index d286848eb0b..1c47dbf5005 100644
--- a/res/cardsfolder/n/nether_void.txt
+++ b/res/cardsfolder/n/nether_void.txt
@@ -5,7 +5,6 @@ T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Player | TriggerZon
 SVar:TrigCounter:DB$ Counter | Cost$ 0 | UnlessCost$ 3 | Defined$ TriggeredSpellAbility | UnlessPayer$ TriggeredCardController
 SVar:RemRandomDeck:True
 SVar:SpellsNeedExtraMana:3
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nether_void.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/27.jpg
 Oracle:Whenever a player casts a spell, counter it unless its controller pays {3}.
+SetInfo:LEG Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/netherborn_phalanx.txt b/res/cardsfolder/n/netherborn_phalanx.txt
index 4fc564a2b03..78bf9fb2004 100644
--- a/res/cardsfolder/n/netherborn_phalanx.txt
+++ b/res/cardsfolder/n/netherborn_phalanx.txt
@@ -8,7 +8,6 @@ SVar:TrigEachOpp:AB$ RepeatEach | Cost$ 0 | RepeatPlayers$ Player.Opponent | Rep
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/netherborn_phalanx.jpg
-SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/99.jpg
 Oracle:When Netherborn Phalanx enters the battlefield, each opponent loses 1 life for each creature he or she controls.\nTransmute {1}{B}{B} ({1}{B}{B}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)
+SetInfo:RAV Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/netter_en_dal.txt b/res/cardsfolder/n/netter_en_dal.txt
index 79df246239e..46407fbb160 100644
--- a/res/cardsfolder/n/netter_en_dal.txt
+++ b/res/cardsfolder/n/netter_en_dal.txt
@@ -4,7 +4,6 @@ Types:Creature Human Spellshaper
 PT:1/1
 A:AB$ Pump | Cost$ W T Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't attack. | IsCurse$ True | SpellDescription$ Target creature can't attack this turn.
 SVar:PlayMain1:TRUE
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/netter_en_dal.jpg
-SetInfo:NMS|Common|http://magiccards.info/scans/en/ne/13.jpg
 Oracle:{W}, {T}, Discard a card: Target creature can't attack this turn.
+SetInfo:NMS Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nettle_sentinel.txt b/res/cardsfolder/n/nettle_sentinel.txt
index 46c7f172b1a..75036b8a867 100644
--- a/res/cardsfolder/n/nettle_sentinel.txt
+++ b/res/cardsfolder/n/nettle_sentinel.txt
@@ -5,7 +5,6 @@ PT:2/2
 K:CARDNAME doesn't untap during your untap step.
 T:Mode$ SpellCast | ValidCard$ Card.Green | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever you cast a green spell, you may untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nettle_sentinel.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/71.jpg
 Oracle:Nettle Sentinel doesn't untap during your untap step.\nWhenever you cast a green spell, you may untap Nettle Sentinel.
+SetInfo:EVE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nettle_swine.txt b/res/cardsfolder/n/nettle_swine.txt
index edc3fe577d2..7096643ce30 100644
--- a/res/cardsfolder/n/nettle_swine.txt
+++ b/res/cardsfolder/n/nettle_swine.txt
@@ -2,7 +2,6 @@ Name:Nettle Swine
 ManaCost:3 G
 Types:Creature Boar
 PT:4/3
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nettle_swine.jpg
-SetInfo:AVR|Common|http://magiccards.info/scans/en/avr/186.jpg
 Oracle:
+SetInfo:AVR Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nettletooth_djinn.txt b/res/cardsfolder/n/nettletooth_djinn.txt
index 691b5fd94c5..f344e196331 100644
--- a/res/cardsfolder/n/nettletooth_djinn.txt
+++ b/res/cardsfolder/n/nettletooth_djinn.txt
@@ -4,7 +4,6 @@ Types:Creature Djinn
 PT:4/4
 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://www.wizards.com/global/images/magic/general/nettletooth_djinn.jpg
-SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/130.jpg
 Oracle:At the beginning of your upkeep, Nettletooth Djinn deals 1 damage to you.
+SetInfo:MIR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nettling_curse.txt b/res/cardsfolder/n/nettling_curse.txt
index d6d3dfcd67a..459aad30084 100644
--- a/res/cardsfolder/n/nettling_curse.txt
+++ b/res/cardsfolder/n/nettling_curse.txt
@@ -9,7 +9,6 @@ T:Mode$ Blocks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execut
 SVar:TrigLoseLifeAttack:AB$LoseLife | Cost$ 0 | LifeAmount$ 3 | Defined$ TriggeredAttackerController
 SVar:TrigLoseLifeBlock:AB$LoseLife | Cost$ 0 | LifeAmount$ 3 | Defined$ TriggeredBlockerController
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nettling_curse.jpg
-SetInfo:DIS|Common|http://magiccards.info/scans/en/di/48.jpg
 Oracle:Enchant creature\nWhenever enchanted creature attacks or blocks, its controller loses 3 life.\n{1}{R}: Enchanted creature attacks this turn if able.
+SetInfo:DIS Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nettling_imp.txt b/res/cardsfolder/n/nettling_imp.txt
index a8263ca2bb6..9c21cc60c0e 100644
--- a/res/cardsfolder/n/nettling_imp.txt
+++ b/res/cardsfolder/n/nettling_imp.txt
@@ -7,10 +7,9 @@ SVar:DestroyPacifist:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Tri
 SVar:TrigDestroy:DB$ Destroy | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nettling_imp.jpg
-SetInfo:LEA|Uncommon|http://magiccards.info/scans/en/al/26.jpg
-SetInfo:LEB|Uncommon|http://magiccards.info/scans/en/be/26.jpg
-SetInfo:3ED|Uncommon|http://magiccards.info/scans/en/rv/27.jpg
-SetInfo:2ED|Uncommon|http://magiccards.info/scans/en/un/26.jpg
 Oracle:{T}: Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That creature attacks this turn if able. If it doesn't, destroy it at the beginning of the next end step. Activate this ability only during an opponent's turn, before attackers are declared.
+SetInfo:LEB Uncommon
+SetInfo:LEA Uncommon
+SetInfo:3ED Uncommon
+SetInfo:2ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/neurok_commando.txt b/res/cardsfolder/n/neurok_commando.txt
index 820f84e2315..94543b660cd 100644
--- a/res/cardsfolder/n/neurok_commando.txt
+++ b/res/cardsfolder/n/neurok_commando.txt
@@ -5,7 +5,6 @@ PT:2/1
 K:Shroud
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_commando.jpg
-SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/28.jpg
 Oracle:Shroud\nWhenever Neurok Commando deals combat damage to a player, you may draw a card.
+SetInfo:MBS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/neurok_familiar.txt b/res/cardsfolder/n/neurok_familiar.txt
index ccdfac833a4..86c674b2790 100644
--- a/res/cardsfolder/n/neurok_familiar.txt
+++ b/res/cardsfolder/n/neurok_familiar.txt
@@ -5,7 +5,6 @@ PT:1/1
 K:Flying
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, reveal the top card of your library. If it's an artifact card, put it into your hand. Otherwise, put it into your graveyard.
 SVar:TrigDig:AB$Dig | Cost$ 0 | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Artifact | DestinationZone2$ Graveyard
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_familiar.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/43.jpg
 Oracle:Flying\nWhen Neurok Familiar enters the battlefield, reveal the top card of your library. If it's an artifact card, put it into your hand. Otherwise, put it into your graveyard.
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/neurok_hoversail.txt b/res/cardsfolder/n/neurok_hoversail.txt
index b90c43fd933..80a64a2ad39 100644
--- a/res/cardsfolder/n/neurok_hoversail.txt
+++ b/res/cardsfolder/n/neurok_hoversail.txt
@@ -3,7 +3,6 @@ ManaCost:1
 Types:Artifact Equipment
 K:Equip 2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Flying | Description$ Equipped creature has flying.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_hoversail.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/218.jpg
 Oracle:Equipped creature has flying.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/neurok_invisimancer.txt b/res/cardsfolder/n/neurok_invisimancer.txt
index 815ef12391c..af3fe97226f 100644
--- a/res/cardsfolder/n/neurok_invisimancer.txt
+++ b/res/cardsfolder/n/neurok_invisimancer.txt
@@ -6,7 +6,7 @@ K:Unblockable
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature is unblockable this turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable
 SVar:PlayMain1:TRUE
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_invisimancer.jpg
-SetInfo:SOM|Common|http://magiccards.info/scans/en/som/37.jpg
 Oracle:Neurok Invisimancer is unblockable.\nWhen Neurok Invisimancer enters the battlefield, target creature is unblockable this turn.
+SetInfo:DDI Common
+SetInfo:SOM Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/neurok_prodigy.txt b/res/cardsfolder/n/neurok_prodigy.txt
index d7104bf0b50..b888fc2c438 100644
--- a/res/cardsfolder/n/neurok_prodigy.txt
+++ b/res/cardsfolder/n/neurok_prodigy.txt
@@ -4,7 +4,6 @@ Types:Creature Human Wizard
 PT:2/1
 K:Flying
 A:AB$ ChangeZone | Cost$ Discard<1/Artifact> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_prodigy.jpg
-SetInfo:DST|Common|http://magiccards.info/scans/en/ds/26.jpg
 Oracle:Flying\nDiscard an artifact card: Return Neurok Prodigy to its owner's hand.
+SetInfo:DST Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/neurok_replica.txt b/res/cardsfolder/n/neurok_replica.txt
index 47666f629ac..353f5bb2b8b 100644
--- a/res/cardsfolder/n/neurok_replica.txt
+++ b/res/cardsfolder/n/neurok_replica.txt
@@ -4,7 +4,6 @@ Types:Artifact Creature Wizard
 PT:1/4
 A:AB$ ChangeZone | Cost$ 1 U Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_replica.jpg
-SetInfo:SOM|Common|http://magiccards.info/scans/en/som/186.jpg
 Oracle:{1}{U}, Sacrifice Neurok Replica: Return target creature to its owner's hand.
+SetInfo:SOM Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/neurok_spy.txt b/res/cardsfolder/n/neurok_spy.txt
index cf95e6ecc4b..746f1b07e62 100644
--- a/res/cardsfolder/n/neurok_spy.txt
+++ b/res/cardsfolder/n/neurok_spy.txt
@@ -4,7 +4,6 @@ Types:Creature Human Rogue
 PT:2/2
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ GE1 | References$ X | Description$ CARDNAME is unblockable as long as defending player controls an artifact.
 SVar:X:Count$Valid Artifact.YouDontCtrl
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_spy.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/44.jpg
 Oracle:Neurok Spy is unblockable as long as defending player controls an artifact.
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/neurok_stealthsuit.txt b/res/cardsfolder/n/neurok_stealthsuit.txt
index ea35539dc59..0ecb959f064 100644
--- a/res/cardsfolder/n/neurok_stealthsuit.txt
+++ b/res/cardsfolder/n/neurok_stealthsuit.txt
@@ -4,7 +4,6 @@ Types:Artifact Equipment
 K:Equip 1
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Shroud | Description$ Equipped creature has shroud. (It can't be the target of spells or abilities.)
 A:AB$ Attach | Cost$ U U | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SpellDescription$ Attach CARDNAME to target creature you control.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_stealthsuit.jpg
-SetInfo:5DN|Common|http://magiccards.info/scans/en/5dn/140.jpg
 Oracle:Equipped creature has shroud. (It can't be the target of spells or abilities.)\n{U}{U}: Attach Neurok Stealthsuit to target creature you control.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+SetInfo:5DN Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/neurok_transmuter.txt b/res/cardsfolder/n/neurok_transmuter.txt
index 2e18f036c58..e55bd054b5e 100644
--- a/res/cardsfolder/n/neurok_transmuter.txt
+++ b/res/cardsfolder/n/neurok_transmuter.txt
@@ -5,7 +5,6 @@ PT:2/2
 A:AB$ Animate | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Types$ Artifact | SpellDescription$ Target creature becomes an artifact in addition to its other types until end of turn.
 A:AB$ Animate | Cost$ U | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature | Colors$ Blue | OverwriteColors$ True | RemoveTypes$ Artifact | SpellDescription$ Until end of turn, target artifact creature becomes blue and isn't an artifact.
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_transmuter.jpg
-SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/27.jpg
 Oracle:{U}: Target creature becomes an artifact in addition to its other types until end of turn.\n{U}: Until end of turn, target artifact creature becomes blue and isn't an artifact.
+SetInfo:DST Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/neverending_torment.txt b/res/cardsfolder/n/neverending_torment.txt
index ee7337348b5..16722d0daed 100644
--- a/res/cardsfolder/n/neverending_torment.txt
+++ b/res/cardsfolder/n/neverending_torment.txt
@@ -4,8 +4,7 @@ Types:Sorcery
 K:Epic
 A:SP$ ChangeZone | Cost$ 4 B B | Origin$ Library | Destination$ Exile | ValidTgts$ Player | ChangeType$ Card | ChangeNum$ X | References$ X | IsCurse$ True | SpellDescription$ Search target player's library for X cards, where X is the number of cards in your hand, and exile it. Then that player shuffles his or her library.
 SVar:X:Count$InYourHand
-SVar:Rarity:Rare
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neverending_torment.jpg
 Oracle:Search target player's library for X cards, where X is the number of cards in your hand, and exile them. Then that player shuffles his or her library.\nEpic (For the rest of the game, you can't cast spells. At the beginning of each of your upkeeps, copy this spell except for its epic ability. You may choose a new target for the copy.)
-SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/83.jpg
+SetInfo:SOK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nevermaker.txt b/res/cardsfolder/n/nevermaker.txt
index 180f84b5cbb..9e61a9652cb 100644
--- a/res/cardsfolder/n/nevermaker.txt
+++ b/res/cardsfolder/n/nevermaker.txt
@@ -8,7 +8,6 @@ K:Evoke:3 U
 SVar:TrigBounce:DB$ChangeZone | Cost$ 0 | ValidTgts$ Permanent.nonLand | TgtPrompt$ Choose target non-Land permanent | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+evoked | Execute$ TrigSac | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it by it's evoke cost, sacrifice it.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nevermaker.jpg
-SetInfo:MOR|Uncommon|http://magiccards.info/scans/en/mt/44.jpg
 Oracle:Flying\nWhen Nevermaker leaves the battlefield, put target nonland permanent on top of its owner's library.\nEvoke {3}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
+SetInfo:MOR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nevermore.txt b/res/cardsfolder/n/nevermore.txt
index 28ea3a1b68a..c464fcb8906 100644
--- a/res/cardsfolder/n/nevermore.txt
+++ b/res/cardsfolder/n/nevermore.txt
@@ -5,7 +5,6 @@ K:ETBReplacement:Other:DBNameCard
 SVar:DBNameCard:DB$ NameCard | Defined$ You | ValidCards$ Card.nonLand | ValidDesc$ nonland | SpellDescription$ As CARDNAME enters the battlefield, name a nonland card.
 S:Mode$ CantBeCast | ValidCard$ Card.NamedCard | Description$ The named card can't be cast.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nevermore.jpg
-SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/25.jpg
 Oracle:As Nevermore enters the battlefield, name a nonland card.\nThe named card can't be cast.
+SetInfo:ISD Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nevinyrrals_disk.txt b/res/cardsfolder/n/nevinyrrals_disk.txt
index 39dc9e032d5..6d019fc7f8d 100644
--- a/res/cardsfolder/n/nevinyrrals_disk.txt
+++ b/res/cardsfolder/n/nevinyrrals_disk.txt
@@ -3,12 +3,12 @@ ManaCost:4
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
 A:AB$ DestroyAll | Cost$ 1 T | ValidCards$ Artifact,Creature,Enchantment | SpellDescription$ Destroy all artifacts, creatures, and enchantments.
-SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/5e/en-us/card3803.jpg
-SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/266.jpg
-SetInfo:LEB|Rare|http://magiccards.info/scans/en/be/268.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/391.jpg
-SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/356.jpg
-SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/267.jpg
-SetInfo:2ED|Rare|http://magiccards.info/scans/en/un/267.jpg
 Oracle:Nevinyrral's Disk enters the battlefield tapped.\n{1}, {T}: Destroy all artifacts, creatures, and enchantments.
+SetInfo:2ED Rare
+SetInfo:V10 Mythic
+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/n/new_benalia.txt b/res/cardsfolder/n/new_benalia.txt
index 6a1ffd1cc70..6ef96330d9a 100644
--- a/res/cardsfolder/n/new_benalia.txt
+++ b/res/cardsfolder/n/new_benalia.txt
@@ -6,7 +6,7 @@ A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
 SVar:TrigScry:AB$Scry | Cost$ 0 | ScryNum$ 1
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/new_benalia.jpg
-SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/172.jpg
 Oracle:New Benalia enters the battlefield tapped.\nWhen New Benalia enters the battlefield, scry 1. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)\n{T}: Add {W} to your mana pool.
+SetInfo:FUT Uncommon
+SetInfo:DDI Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/new_frontiers.txt b/res/cardsfolder/n/new_frontiers.txt
index 9c725485f8e..2be47a18cfe 100644
--- a/res/cardsfolder/n/new_frontiers.txt
+++ b/res/cardsfolder/n/new_frontiers.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 A:SP$ ChangeZone | Cost$ X G | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | DefinedPlayer$ Each | ChangeNum$ X | Tapped$ True | References$ X | Shuffle$ True | SpellDescription$ Each player may search his or her library for up to X basic land cards and put them onto the battlefield tapped. Then each player who searched his or her library this way shuffles it.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/new_frontiers.jpg
-SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/257.jpg
 Oracle:Each player may search his or her library for up to X basic land cards and put them onto the battlefield tapped. Then each player who searched his or her library this way shuffles it.
+SetInfo:ODY Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/new_prahv_guildmage.txt b/res/cardsfolder/n/new_prahv_guildmage.txt
index 8212163033e..da68836e244 100644
--- a/res/cardsfolder/n/new_prahv_guildmage.txt
+++ b/res/cardsfolder/n/new_prahv_guildmage.txt
@@ -4,7 +4,6 @@ Types:Creature Human Wizard
 PT:2/2
 A:AB$ Pump | Cost$ W U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
 A:AB$Pump | Cost$ 3 W U | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent your opponent controls to detain. | KW$ HIDDEN CARDNAME can't attack or block. & HIDDEN CARDNAME's activated abilities can't be activated. | IsCurse$ True | UntilYourNextTurn$ True | SpellDescription$ Detain target nonland permanent an opponent controls. (Until your next turn, that permanent can't attack or block and its activated abilities can't be activated.)
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/new_prahv_guildmage.jpg
-SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/181.jpg
 Oracle:{W}{U}: Target creature gains flying until end of turn.\n{3}{W}{U}: Detain target nonland permanent an opponent controls. (Until your next turn, that permanent can't attack or block and its activated abilities can't be activated.)
+SetInfo:RTR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nezumi_bone_reader.txt b/res/cardsfolder/n/nezumi_bone_reader.txt
index 7f390f3480c..cd4c76c5d52 100644
--- a/res/cardsfolder/n/nezumi_bone_reader.txt
+++ b/res/cardsfolder/n/nezumi_bone_reader.txt
@@ -4,7 +4,6 @@ Types:Creature Rat Shaman
 PT:1/1
 A:AB$ Discard | Cost$ B Sac<1/Creature> | ValidTgts$ Player | SorcerySpeed$ True | NumCards$ 1 | Mode$ TgtChoose | SpellDescription$ Target player discards a card. Activate this ability only any time you could cast a sorcery.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nezumi_bone_reader.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/127.jpg
 Oracle:{B}, Sacrifice a creature: Target player discards a card. Activate this ability only any time you could cast a sorcery.
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nezumi_cutthroat.txt b/res/cardsfolder/n/nezumi_cutthroat.txt
index e442aed436a..32a9b14f620 100644
--- a/res/cardsfolder/n/nezumi_cutthroat.txt
+++ b/res/cardsfolder/n/nezumi_cutthroat.txt
@@ -4,7 +4,6 @@ Types:Creature Rat Warrior
 PT:2/1
 K:Fear
 K:CARDNAME can't block.
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80521.jpg
-SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/128.jpg
 Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nNezumi Cutthroat can't block.
+SetInfo:CHK Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt b/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt
index db02525c849..9efabf60129 100644
--- a/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt
+++ b/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt
@@ -7,7 +7,6 @@ SVar:DBFlip:DB$SetState | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarC
 SVar:X:Count$InOppYard
 AlternateMode:Flip
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nezumi_graverobber.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/129a.jpg
 #SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/92a.jpg
 Oracle:{1}{B}: Exile target card from an opponent's graveyard. If no cards are in that graveyard, flip Nezumi Graverobber.
 #I removed the Commander SetInfo because magiccards doesn't have a properly flipped image for COM Nighteyes.
@@ -21,6 +20,7 @@ Types:Legendary Creature Rat Wizard
 PT:4/2
 A:AB$ ChangeZone | Cost$ 4 B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature. | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nighteyes_the_desecrator.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/129b.jpg
 #SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/92b.jpg
 Oracle:{4}{B}: Put target creature card from a graveyard onto the battlefield under your control.
+SetInfo:CHK Uncommon
+SetInfo:COM Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nezumi_ronin.txt b/res/cardsfolder/n/nezumi_ronin.txt
index 94374d2e883..f6a7face147 100644
--- a/res/cardsfolder/n/nezumi_ronin.txt
+++ b/res/cardsfolder/n/nezumi_ronin.txt
@@ -3,7 +3,6 @@ ManaCost:2 B
 Types:Creature Rat Samurai
 PT:3/1
 K:Bushido 1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nezumi_ronin.jpg
-SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/130.jpg
 Oracle:Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
+SetInfo:CHK Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nezumi_shadow_watcher.txt b/res/cardsfolder/n/nezumi_shadow_watcher.txt
index 37bff3cdd69..65f06403060 100644
--- a/res/cardsfolder/n/nezumi_shadow_watcher.txt
+++ b/res/cardsfolder/n/nezumi_shadow_watcher.txt
@@ -4,7 +4,6 @@ Types:Creature Rat Warrior
 PT:1/1
 A:AB$ Destroy | Cost$ Sac<1/CARDNAME> | ValidTgts$ Ninja | TgtPrompt$ Select target Ninja | SpellDescription$ Destroy target Ninja.
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nezumi_shadow_watcher.jpg
-SetInfo:BOK|Uncommon|http://magiccards.info/scans/en/bok/74.jpg
 Oracle:Sacrifice Nezumi Shadow-Watcher: Destroy target Ninja.
+SetInfo:BOK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt b/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt
index 5ed084906c7..c819d4667ad 100644
--- a/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt
+++ b/res/cardsfolder/n/nezumi_shortfang_stabwhisker_the_odious.txt
@@ -7,7 +7,6 @@ SVar:DBFlip:DB$ SetState | Defined$ Self | ConditionCheckSVar$ A | ConditionSVar
 SVar:A:TargetedPlayer$CardsInHand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nezumi_shortfang.jpg
 AlternateMode:Flip
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/131a.jpg
 Oracle:{1}{B}, {T}: Target opponent discards a card. Then if that player has no cards in hand, flip Nezumi Shortfang.
 
 ALTERNATE
@@ -21,5 +20,5 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefiel
 SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ DiffX | References$ DiffX
 SVar:DiffX:TriggeredPlayer$CardsInHand/NMinus.3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stabwhisker_the_odious.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/131b.jpg
 Oracle:At the beginning of each opponent's upkeep, that player loses 1 life for each card fewer than three in his or her hand.
+SetInfo:CHK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/niall_silvain.txt b/res/cardsfolder/n/niall_silvain.txt
index dcc0d25d1da..901b5a5e135 100644
--- a/res/cardsfolder/n/niall_silvain.txt
+++ b/res/cardsfolder/n/niall_silvain.txt
@@ -3,7 +3,6 @@ ManaCost:G G G
 Types:Creature Ouphe
 PT:2/2
 A:AB$ Regenerate | Cost$ G G G G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Regenerate target creature.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/niall_silvain.jpg
-SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/45.jpg
 Oracle:{G}{G}{G}{G}, {T}: Regenerate target creature.
+SetInfo:DRK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/niblis_of_the_breath.txt b/res/cardsfolder/n/niblis_of_the_breath.txt
index 2232435ddd7..bae8e20304a 100644
--- a/res/cardsfolder/n/niblis_of_the_breath.txt
+++ b/res/cardsfolder/n/niblis_of_the_breath.txt
@@ -6,5 +6,5 @@ K:Flying
 A:AB$ TapOrUntap | Cost$ U T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ You may tap or untap target creature.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/niblis_of_the_breath.jpg
-SetInfo:DKA|Uncommon|http://magiccards.info/scans/en/dka/44.jpg
 Oracle:Flying\n{U}, {T}: You may tap or untap target creature.
+SetInfo:DKA Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/niblis_of_the_mist.txt b/res/cardsfolder/n/niblis_of_the_mist.txt
index 73013826613..ee778fcfda9 100644
--- a/res/cardsfolder/n/niblis_of_the_mist.txt
+++ b/res/cardsfolder/n/niblis_of_the_mist.txt
@@ -6,7 +6,6 @@ K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, you may tap target creature.
 SVar:TrigTap:AB$Tap | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature
 SVar:PlayMain1:TRUE
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/niblis_of_the_mist.jpg
-SetInfo:DKA|Common|http://magiccards.info/scans/en/dka/15.jpg
 Oracle:Flying\nWhen Niblis of the Mist enters the battlefield, you may tap target creature.
+SetInfo:DKA Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/niblis_of_the_urn.txt b/res/cardsfolder/n/niblis_of_the_urn.txt
index 27f14158f9e..64b65043350 100644
--- a/res/cardsfolder/n/niblis_of_the_urn.txt
+++ b/res/cardsfolder/n/niblis_of_the_urn.txt
@@ -6,5 +6,5 @@ K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may tap target creature.
 SVar:TrigTap:AB$ Tap | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/niblis_of_the_urn.jpg
-SetInfo:DKA|Uncommon|http://magiccards.info/scans/en/dka/16.jpg
 Oracle:Flying\nWhenever Niblis of the Urn attacks, you may tap target creature.
+SetInfo:DKA Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nicol_bolas.txt b/res/cardsfolder/n/nicol_bolas.txt
index ba7d0171797..09125ef375b 100644
--- a/res/cardsfolder/n/nicol_bolas.txt
+++ b/res/cardsfolder/n/nicol_bolas.txt
@@ -6,9 +6,9 @@ K:Flying
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U B R
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, that player discards his or her hand.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | Mode$ Hand
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nicol_bolas.jpg
 Oracle:Flying\nAt the beginning of your upkeep, sacrifice Nicol Bolas unless you pay {U}{B}{R}.\nWhenever Nicol Bolas deals damage to an opponent, that player discards his or her hand.
-SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/116.jpg
-SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/98.jpg
-SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/286.jpg
+SetInfo:DRB Rare
+SetInfo:CHR Rare
+SetInfo:LEG Rare
+SetInfo:TSB Special
\ No newline at end of file
diff --git a/res/cardsfolder/n/nicol_bolas_planeswalker.txt b/res/cardsfolder/n/nicol_bolas_planeswalker.txt
index e01ed44506f..88882a7050f 100644
--- a/res/cardsfolder/n/nicol_bolas_planeswalker.txt
+++ b/res/cardsfolder/n/nicol_bolas_planeswalker.txt
@@ -7,8 +7,8 @@ A:AB$ GainControl | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature | Planeswa
 A:AB$ DealDamage | Cost$ SubCounter<9/LOYALTY> | NumDmg$ 7 | ValidTgts$ Player | Planeswalker$ True | Ultimate$ True | SubAbility$ DBDiscard | SpellDescription$ CARDNAME deals 7 damage to target player. That player discards seven cards, then sacrifices seven permanents.
 SVar:DBDiscard:DB$Discard | Defined$ Targeted | NumCards$ 7 | Mode$ TgtChoose | SubAbility$ DBSac
 SVar:DBSac:DB$Sacrifice | Defined$ Targeted | SacValid$ Permanent | Amount$ 7
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nicol_bolas_planeswalker.jpg
-SetInfo:M13|Mythic|http://magiccards.info/scans/en/m13/199.jpg
-SetInfo:CFX|Mythic|http://magiccards.info/scans/en/cfx/120.jpg
 Oracle:[+3] Destroy target noncreature permanent.\n[-2] Gain control of target creature.\n[-9] Nicol Bolas, Planeswalker deals 7 damage to target player. That player discards seven cards, then sacrifices seven permanents.
+SetInfo:M13 Mythic
+SetInfo:DDH Mythic
+SetInfo:CFX Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/n/night_dealings.txt b/res/cardsfolder/n/night_dealings.txt
index 947407afda8..cf9f28ee340 100644
--- a/res/cardsfolder/n/night_dealings.txt
+++ b/res/cardsfolder/n/night_dealings.txt
@@ -8,5 +8,5 @@ SVar:X:XChoice
 SVar:Y:TriggerCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/night_dealings.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/132.jpg
 Oracle:Whenever a source you control deals damage to another player, put that many theft counters on Night Dealings.\n{2}{B}{B}, Remove X theft counters from Night Dealings: Search your library for a nonland card with converted mana cost X, reveal it, and put it into your hand. Then shuffle your library.
+SetInfo:CHK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/night_of_souls_betrayal.txt b/res/cardsfolder/n/night_of_souls_betrayal.txt
index 99c04730cd3..5f4ca8edcf2 100644
--- a/res/cardsfolder/n/night_of_souls_betrayal.txt
+++ b/res/cardsfolder/n/night_of_souls_betrayal.txt
@@ -3,7 +3,6 @@ ManaCost:2 B B
 Types:Legendary Enchantment
 S:Mode$ Continuous | Affected$ Creature | AddPower$ -1 | AddToughness$ -1 | Description$ All creatures get -1/-1.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/night_of_souls_betrayal.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/133.jpg
 Oracle:All creatures get -1/-1.
+SetInfo:CHK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/night_revelers.txt b/res/cardsfolder/n/night_revelers.txt
index 409ff3a5fcf..aa5be6fda9d 100644
--- a/res/cardsfolder/n/night_revelers.txt
+++ b/res/cardsfolder/n/night_revelers.txt
@@ -4,7 +4,6 @@ Types:Creature Vampire
 PT:4/4
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Haste | CheckSVar$ X | SVarCompare$ GE1 | References$ X | Description$ CARDNAME has haste as long as an opponent controls a human.
 SVar:X:Count$Valid Human.OppCtrl
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/night_revelers.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/153.jpg
 Oracle:Night Revelers has haste as long as an opponent controls a Human.
+SetInfo:ISD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/night_soil.txt b/res/cardsfolder/n/night_soil.txt
index 11f8190f29e..2d04cf9c163 100644
--- a/res/cardsfolder/n/night_soil.txt
+++ b/res/cardsfolder/n/night_soil.txt
@@ -3,7 +3,6 @@ ManaCost:G G
 Types:Enchantment
 A:AB$ Token | Cost$ 1 ExileSameGrave<2/Creature> | 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:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/night_soil.jpg
-SetInfo:FEM|Common|http://magiccards.info/scans/en/fe/80.jpg|3
 Oracle:{1}, Exile two creature cards from a single graveyard: Put a 1/1 green Saproling creature token onto the battlefield.
+SetInfo:FEM Common x3
\ No newline at end of file
diff --git a/res/cardsfolder/n/night_terrors.txt b/res/cardsfolder/n/night_terrors.txt
index ef6c28f307b..2fe4fb283b0 100644
--- a/res/cardsfolder/n/night_terrors.txt
+++ b/res/cardsfolder/n/night_terrors.txt
@@ -2,7 +2,6 @@ Name:Night Terrors
 ManaCost:2 B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 2 B | Origin$ Hand | Destination$ Exile | ValidTgts$ Player | ChangeType$ Card.nonLand | ChangeNum$ 1 | IsCurse$ True | Mandatory$ True | SpellDescription$ Target player reveals his or her hand. You choose a nonland card from it. Exile that card.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/night_terrors.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/111.jpg
 Oracle:Target player reveals his or her hand. You choose a nonland card from it. Exile that card.
+SetInfo:ISD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightbirds_clutches.txt b/res/cardsfolder/n/nightbirds_clutches.txt
index 66d855755e3..a87085707db 100644
--- a/res/cardsfolder/n/nightbirds_clutches.txt
+++ b/res/cardsfolder/n/nightbirds_clutches.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 K:Flashback 3 R
 A:SP$ Pump | Cost$ 1 R | ValidTgts$ Creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select up to two target creatures | SpellDescription$ Up to two target creatures can't block this turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightbirds_clutches.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/154.jpg
 Oracle:Up to two target creatures can't block this turn.\nFlashback {3}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+SetInfo:ISD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightcreep.txt b/res/cardsfolder/n/nightcreep.txt
index fc3f2c5e73e..5b18e9cafc5 100644
--- a/res/cardsfolder/n/nightcreep.txt
+++ b/res/cardsfolder/n/nightcreep.txt
@@ -4,7 +4,6 @@ Types:Instant
 A:SP$ AnimateAll | Cost$ B B | ValidCards$ Creature | Colors$ Black | OverwriteColors$ True | SubAbility$ AnimateSwamp | SpellDescription$ Until end of turn, all creatures become black and all lands become Swamps.
 SVar:AnimateSwamp:DB$AnimateAll | ValidCards$ Land | Types$ Swamp | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightcreep.jpg
-SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/49.jpg
 Oracle:Until end of turn, all creatures become black and all lands become Swamps.
+SetInfo:DIS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightguard_patrol.txt b/res/cardsfolder/n/nightguard_patrol.txt
index d7a18a243ed..41a0a72afa7 100644
--- a/res/cardsfolder/n/nightguard_patrol.txt
+++ b/res/cardsfolder/n/nightguard_patrol.txt
@@ -4,7 +4,6 @@ Types:Creature Human Soldier
 PT:2/1
 K:First Strike
 K:Vigilance
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightguard_patrol.jpg
-SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/26.jpg
 Oracle:First strike, vigilance
+SetInfo:RAV Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nighthaze.txt b/res/cardsfolder/n/nighthaze.txt
index 691d4974afd..d6512ce6fb8 100644
--- a/res/cardsfolder/n/nighthaze.txt
+++ b/res/cardsfolder/n/nighthaze.txt
@@ -3,7 +3,6 @@ ManaCost:B
 Types:Sorcery
 A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Swampwalk | SpellDescription$ Target creature gains swampwalk until end of turn. | SubAbility$ DBDraw
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nighthaze.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/118.jpg
 Oracle:Target creature gains swampwalk until end of turn.\nDraw a card.
+SetInfo:ROE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightmare.txt b/res/cardsfolder/n/nightmare.txt
index 840a281cd6b..afdfba77496 100644
--- a/res/cardsfolder/n/nightmare.txt
+++ b/res/cardsfolder/n/nightmare.txt
@@ -6,18 +6,17 @@ K:Flying
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | References$ X | Description$ CARDNAME's power and toughness are each equal to the number of Swamps you control.
 SVar:X:Count$Valid Swamp.YouCtrl
 SVar:BuffedBy:Swamp
-SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83186.jpg
-SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/150.jpg
-SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/27.jpg
-SetInfo:LEB|Rare|http://magiccards.info/scans/en/be/27.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/150.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/46.jpg
-SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/34.jpg
-SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/150.jpg
-SetInfo:10E|Rare|http://magiccards.info/scans/en/10e/164.jpg
-SetInfo:M10|Rare|http://magiccards.info/scans/en/m10/107.jpg
-SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/146.jpg
-SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/28.jpg
-SetInfo:2ED|Rare|http://magiccards.info/scans/en/un/27.jpg
 Oracle:Flying\nNightmare's power and toughness are each equal to the number of Swamps you control.
+SetInfo:8ED Rare
+SetInfo:2ED Rare
+SetInfo:7ED Rare
+SetInfo:6ED Rare
+SetInfo:M10 Rare
+SetInfo:9ED Rare
+SetInfo:10E 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/n/nightmare_incursion.txt b/res/cardsfolder/n/nightmare_incursion.txt
index 964378a3984..527bcb2fc94 100644
--- a/res/cardsfolder/n/nightmare_incursion.txt
+++ b/res/cardsfolder/n/nightmare_incursion.txt
@@ -3,7 +3,6 @@ ManaCost:5 B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 5 B | Origin$ Library | Destination$ Exile | ValidTgts$ Player | ChangeType$ Card | ChangeNum$ X | References$ X | IsCurse$ True | Shuffle$ True | SpellDescription$ Search target player's library for up to X cards, where X is the number of Swamps you control, and exile them. Then that player shuffles his or her library.
 SVar:X:Count$Valid Swamp.YouCtrl
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightmare_incursion.jpg
-SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/40.jpg
 Oracle:Search target player's library for up to X cards, where X is the number of Swamps you control, and exile them. Then that player shuffles his or her library.
+SetInfo:EVE Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightmare_lash.txt b/res/cardsfolder/n/nightmare_lash.txt
index fbbf0e250ac..d4784c8b08f 100644
--- a/res/cardsfolder/n/nightmare_lash.txt
+++ b/res/cardsfolder/n/nightmare_lash.txt
@@ -6,7 +6,6 @@ S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X |
 SVar:X:Count$Valid Swamp.YouCtrl
 SVar:BuffedBy:Swamp
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightmare_lash.jpg
-SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/219.jpg
 Oracle:Equipped creature gets +1/+1 for each Swamp you control.\nEquip-Pay 3 life. (Pay 3 life: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
+SetInfo:MRD Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightmare_void.txt b/res/cardsfolder/n/nightmare_void.txt
index 4994279ae37..bb18b03d7c8 100644
--- a/res/cardsfolder/n/nightmare_void.txt
+++ b/res/cardsfolder/n/nightmare_void.txt
@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Sorcery
 K:Dredge 2
 A:SP$ Discard | Cost$ 3 B | ValidTgts$ Player | Mode$ RevealYouChoose | NumCards$ 1 | SpellDescription$ Target player reveals his or her hand. You choose a card from it. That player discards that card.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightmare_void.jpg
-SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/100.jpg
 Oracle:Target player reveals his or her hand. You choose a card from it. That player discards that card.\nDredge 2 (If you would draw a card, instead you may put exactly two cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)
+SetInfo:RAV Uncommon
+SetInfo:DDJ Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nights_whisper.txt b/res/cardsfolder/n/nights_whisper.txt
index 941dbd4b9de..340f037eb7c 100644
--- a/res/cardsfolder/n/nights_whisper.txt
+++ b/res/cardsfolder/n/nights_whisper.txt
@@ -3,7 +3,6 @@ ManaCost:1 B
 Types:Sorcery
 A:SP$ Draw | Cost$ 1 B | NumCards$ 2 | SubAbility$ DBLoseLife | SpellDescription$ You draw two cards and you lose 2 life.
 SVar:DBLoseLife:DB$LoseLife | LifeAmount$ 2
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/5dn/en-us/card51178.jpg
-SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/55.jpg
 Oracle:You draw two cards and you lose 2 life.
+SetInfo:5DN Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightscape_apprentice.txt b/res/cardsfolder/n/nightscape_apprentice.txt
index 859f417d4eb..1063a055842 100644
--- a/res/cardsfolder/n/nightscape_apprentice.txt
+++ b/res/cardsfolder/n/nightscape_apprentice.txt
@@ -5,7 +5,6 @@ PT:1/1
 A:AB$ ChangeZone | Cost$ U T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put target creature you control on top of its owner's library.
 A:AB$ Pump | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | SpellDescription$ Target creature gains first strike until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightscape_apprentice.jpg
-SetInfo:INV|Common|http://magiccards.info/scans/en/in/112.jpg
 Oracle:{U}, {T}: Put target creature you control on top of its owner's library.\n{R}, {T}: Target creature gains first strike until end of turn.
+SetInfo:INV Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightscape_battlemage.txt b/res/cardsfolder/n/nightscape_battlemage.txt
index f70c2a6520e..3329a17c101 100644
--- a/res/cardsfolder/n/nightscape_battlemage.txt
+++ b/res/cardsfolder/n/nightscape_battlemage.txt
@@ -9,7 +9,6 @@ SVar:TrigKicker:DB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.nonBlack | TgtPro
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked 2 R | Execute$ TrigKicker2 | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked with its 2 R kicker, destroy target land.
 SVar:TrigKicker2:DB$ Destroy | Cost$ 0 | ValidTgts$ Land | TgtPrompt$ Select target land
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightscape_battlemage.jpg
-SetInfo:PLS|Uncommon|http://magiccards.info/scans/en/ps/47.jpg
 Oracle:Kicker {2}{U} and/or {2}{R} (You may pay an additional {2}{U} and/or {2}{R} as you cast this spell.)\nWhen Nightscape Battlemage enters the battlefield, if it was kicked with its {2}{U} kicker, return up to two target nonblack creatures to their owners' hands.\nWhen Nightscape Battlemage enters the battlefield, if it was kicked with its {2}{R} kicker, destroy target land.
+SetInfo:PLS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightscape_familiar.txt b/res/cardsfolder/n/nightscape_familiar.txt
index 2aefbf99f4f..78c0c3113c4 100644
--- a/res/cardsfolder/n/nightscape_familiar.txt
+++ b/res/cardsfolder/n/nightscape_familiar.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie
 PT:1/1
 A:AB$ Regenerate | Cost$ 1 B | SpellDescription$ Regenerate CARDNAME.
 S:Mode$ ReduceCost | ValidCard$ Card.Blue,Card.Red | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Blue spells and red spells you cast cost 1 less to cast.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightscape_familiar.jpg
-SetInfo:PLS|Common|http://magiccards.info/scans/en/ps/48.jpg
 Oracle:Blue spells and red spells you cast cost {1} less to cast.\n{1}{B}: Regenerate Nightscape Familiar.
+SetInfo:PLS Common
+SetInfo:DDH Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightscape_master.txt b/res/cardsfolder/n/nightscape_master.txt
index 4456c2907e2..2898f1a23a5 100644
--- a/res/cardsfolder/n/nightscape_master.txt
+++ b/res/cardsfolder/n/nightscape_master.txt
@@ -6,7 +6,6 @@ A:AB$ ChangeZone | Cost$ U U T | ValidTgts$ Creature | TgtPrompt$ Select target
 A:AB$ DealDamage | Cost$ R R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Red|Blue
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightscape_master.jpg
-SetInfo:INV|Rare|http://magiccards.info/scans/en/in/113.jpg
 Oracle:{U}{U}, {T}: Return target creature to its owner's hand.\n{R}{R}, {T}: Nightscape Master deals 2 damage to target creature.
+SetInfo:INV Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightshade_assassin.txt b/res/cardsfolder/n/nightshade_assassin.txt
index 4118ddf67bf..fef56569408 100644
--- a/res/cardsfolder/n/nightshade_assassin.txt
+++ b/res/cardsfolder/n/nightshade_assassin.txt
@@ -10,7 +10,6 @@ SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature |
 SVar:DBNightshadeCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount.Negative
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightshade_assassin.jpg
-SetInfo:TSP|Uncommon|http://magiccards.info/scans/en/ts/121.jpg
 Oracle:First strike\nWhen Nightshade Assassin enters the battlefield, you may reveal X black cards in your hand. If you do, target creature gets -X/-X until end of turn.\nMadness {1}{B} (If you discard this card, you may cast it for its madness cost instead of putting it into your graveyard.)
+SetInfo:TSP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightshade_peddler.txt b/res/cardsfolder/n/nightshade_peddler.txt
index 8d0f08c2a98..3475c03ef82 100644
--- a/res/cardsfolder/n/nightshade_peddler.txt
+++ b/res/cardsfolder/n/nightshade_peddler.txt
@@ -4,7 +4,6 @@ Types:Creature Human Druid
 PT:1/1
 K:Soulbond
 S:Mode$ Continuous | Affected$ Creature.PairedWith,Creature.Self+Paired | AddKeyword$ Deathtouch | Description$ As long as CARDNAME is paired with another creature, both creatures have deathtouch.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightshade_peddler.jpg
-SetInfo:AVR|Common|http://magiccards.info/scans/en/avr/187.jpg
 Oracle:Soulbond (You may pair this creature with another unpaired creature when either enters the battlefield. They remain paired for as long as you control both of them.)\nAs long as Nightshade Peddler is paired with another creature, both creatures have deathtouch.
+SetInfo:AVR Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightshade_schemers.txt b/res/cardsfolder/n/nightshade_schemers.txt
index 0a9513f6fd5..98def7c3e87 100644
--- a/res/cardsfolder/n/nightshade_schemers.txt
+++ b/res/cardsfolder/n/nightshade_schemers.txt
@@ -8,7 +8,6 @@ SVar:TrigKinship:DB$ PeekAndReveal | PeekAmount$ 1 | RevealValid$ Card.sharesCre
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 2 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightshade_schemers.jpg
-SetInfo:MOR|Uncommon|http://magiccards.info/scans/en/mt/69.jpg
 Oracle:Flying\nKinship - At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Nightshade Schemers, you may reveal it. If you do, each opponent loses 2 life.
+SetInfo:MOR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightshade_seer.txt b/res/cardsfolder/n/nightshade_seer.txt
index e677206b6fe..b717dc6d0e6 100644
--- a/res/cardsfolder/n/nightshade_seer.txt
+++ b/res/cardsfolder/n/nightshade_seer.txt
@@ -7,7 +7,6 @@ SVar:DBNightshadePump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target
 SVar:DBNightshadeCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NightshadeX:Remembered$Amount.Negative
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightshade_seer.jpg
-SetInfo:UDS|Uncommon|http://magiccards.info/scans/en/ud/62.jpg
 Oracle:{2}{B}, {T}: Reveal any number of black cards in your hand. Target creature gets -X/-X until end of turn, where X is the number of cards revealed this way.
+SetInfo:UDS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightshade_stinger.txt b/res/cardsfolder/n/nightshade_stinger.txt
index b8b2d24daaf..79657f9b484 100644
--- a/res/cardsfolder/n/nightshade_stinger.txt
+++ b/res/cardsfolder/n/nightshade_stinger.txt
@@ -4,7 +4,6 @@ Types:Creature Faerie Rogue
 PT:1/1
 K:Flying
 K:CARDNAME can't block.
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/lrw/en/card139456.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/132.jpg
 Oracle:Flying\nNightshade Stinger can't block.
+SetInfo:LRW Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightsky_mimic.txt b/res/cardsfolder/n/nightsky_mimic.txt
index 307ef227b9c..bdd59f19c61 100644
--- a/res/cardsfolder/n/nightsky_mimic.txt
+++ b/res/cardsfolder/n/nightsky_mimic.txt
@@ -5,7 +5,6 @@ PT:2/1
 T:Mode$ SpellCast | ValidCard$ Card.White+Black | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ Whenever you cast a spell that's both white and black, CARDNAME becomes 4/4 and gains flying until end of turn.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 4 | Toughness$ 4 | Keywords$ Flying
 SVar:BuffedBy:Card.Black+White
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightsky_mimic.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/91.jpg
 Oracle:Whenever you cast a spell that's both white and black, Nightsky Mimic becomes 4/4 and gains flying until end of turn.
+SetInfo:EVE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightsoil_kami.txt b/res/cardsfolder/n/nightsoil_kami.txt
index f65e55568ef..a6d685bb72d 100644
--- a/res/cardsfolder/n/nightsoil_kami.txt
+++ b/res/cardsfolder/n/nightsoil_kami.txt
@@ -3,7 +3,6 @@ ManaCost:4 G G
 Types:Creature Spirit
 PT:6/4
 K:Soulshift 5
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightsoil_kami.jpg
-SetInfo:SOK|Common|http://magiccards.info/scans/en/sok/139.jpg
 Oracle:Soulshift 5 (When this creature dies, you may return target Spirit card with converted mana cost 5 or less from your graveyard to your hand.)
+SetInfo:SOK Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightstalker_engine.txt b/res/cardsfolder/n/nightstalker_engine.txt
index a995d48c488..9dfe0cb3bb0 100644
--- a/res/cardsfolder/n/nightstalker_engine.txt
+++ b/res/cardsfolder/n/nightstalker_engine.txt
@@ -4,7 +4,6 @@ Types:Creature Nightstalker
 PT:*/3
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | References$ X | Description$ CARDNAME's power is equal to the number of creature cards in your graveyard.
 SVar:X:Count$TypeInYourYard.Creature
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightstalker_engine.jpg
-SetInfo:PO2|Rare|http://magiccards.info/scans/en/po2/21.jpg
 Oracle:Nightstalker Engine's power is equal to the number of creature cards in your graveyard.
+SetInfo:PO2 Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightveil_specter.txt b/res/cardsfolder/n/nightveil_specter.txt
index 6e9130dd0d1..917e751c79c 100644
--- a/res/cardsfolder/n/nightveil_specter.txt
+++ b/res/cardsfolder/n/nightveil_specter.txt
@@ -13,7 +13,6 @@ SVar:DBForget:DB$ Pump | Defined$ TriggeredCard | ForgetObjects$ TriggeredCard
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.Self | Execute$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightveil_specter.jpg
-SetInfo:GTC|Rare|http://magiccards.info/scans/en/gtc/222.jpg
 Oracle:Flying\nWhenever Nightveil Specter deals combat damage to a player, that player exiles the top card of his or her library.\nYou may play cards exiled with Nightveil Specter.
+SetInfo:GTC Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightwind_glider.txt b/res/cardsfolder/n/nightwind_glider.txt
index 0dd0c8c76f3..163a5b32a41 100644
--- a/res/cardsfolder/n/nightwind_glider.txt
+++ b/res/cardsfolder/n/nightwind_glider.txt
@@ -4,7 +4,6 @@ Types:Creature Human Rebel
 PT:2/1
 K:Flying
 K:Protection from black
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightwind_glider.jpg
-SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/31.jpg
 Oracle:Flying, protection from black
+SetInfo:MMQ Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nightwing_shade.txt b/res/cardsfolder/n/nightwing_shade.txt
index c537aaeec4a..2af8916d8f7 100644
--- a/res/cardsfolder/n/nightwing_shade.txt
+++ b/res/cardsfolder/n/nightwing_shade.txt
@@ -4,7 +4,6 @@ Types:Creature Shade
 PT:2/2
 K:Flying
 A:AB$ Pump | Cost$ 1 B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightwing_shade.jpg
-SetInfo:M11|Common|http://magiccards.info/scans/en/m11/109.jpg
 Oracle:Flying\n{1}{B}: Nightwing Shade gets +1/+1 until end of turn.
+SetInfo:M11 Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nihil_spellbomb.txt b/res/cardsfolder/n/nihil_spellbomb.txt
index 0ecb0a3aea5..c836cb547af 100644
--- a/res/cardsfolder/n/nihil_spellbomb.txt
+++ b/res/cardsfolder/n/nihil_spellbomb.txt
@@ -5,7 +5,6 @@ A:AB$ ChangeZoneAll | Cost$ T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ TriggeredCardController | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may pay B. If you do, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ B | NumCards$ 1
 SVar:RemRandomDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nihil_spellbomb.jpg
-SetInfo:SOM|Common|http://magiccards.info/scans/en/som/187.jpg
 Oracle:{T}, Sacrifice Nihil Spellbomb: Exile all cards from target player's graveyard.\nWhen Nihil Spellbomb is put into a graveyard from the battlefield, you may pay {B}. If you do, draw a card.
+SetInfo:SOM Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nihilistic_glee.txt b/res/cardsfolder/n/nihilistic_glee.txt
index 2b9b98e2dcb..cf1f803afab 100644
--- a/res/cardsfolder/n/nihilistic_glee.txt
+++ b/res/cardsfolder/n/nihilistic_glee.txt
@@ -5,7 +5,6 @@ A:AB$ LoseLife | Cost$ 2 B Discard<1/Card> | ValidTgts$ Opponent | LifeAmount$ 1
 A:AB$ Draw | Cost$ 1 PayLife<2> | NumCards$ 1 | Activation$ Hellbent | PrecostDesc$ Hellbent - | SpellDescription$ Draw a card. Activate this ability only if you have no cards in hand.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nihilistic_glee.jpg
-SetInfo:DIS|Rare|http://magiccards.info/scans/en/di/50.jpg
 Oracle:{2}{B}, Discard a card: Target opponent loses 1 life and you gain 1 life.\nHellbent - {1}, Pay 2 life: Draw a card. Activate this ability only if you have no cards in hand.
+SetInfo:DIS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nihilith.txt b/res/cardsfolder/n/nihilith.txt
index 07447f024b0..965403f74b9 100644
--- a/res/cardsfolder/n/nihilith.txt
+++ b/res/cardsfolder/n/nihilith.txt
@@ -6,7 +6,6 @@ K:Fear
 K:Suspend:7:1 B
 T:Mode$ ChangesZone | ValidCard$ Card.nonToken+OppOwn | Origin$ Any | Destination$ Graveyard | IsPresent$ Card.Self+suspended | PresentZone$ Exile | TriggerZones$ Exile | Execute$ TrigRemoveCounter | OptionalDecider$ You | TriggerDescription$ Whenever a card is put into an opponent's graveyard from anywhere, if CARDNAME is suspended, you may remove a time counter from CARDNAME.
 SVar:TrigRemoveCounter:AB$RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ TIME | CounterNum$ 1
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nihilith.jpg
-SetInfo:FUT|Rare|http://magiccards.info/scans/en/fut/72.jpg
 Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nSuspend 7-{1}{B} (Rather than cast this card from your hand, you may pay {1}{B} and exile it with seven time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)\nWhenever a card is put into an opponent's graveyard from anywhere, if Nihilith is suspended, you may remove a time counter from Nihilith.
+SetInfo:FUT Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nikko_onna.txt b/res/cardsfolder/n/nikko_onna.txt
index c039dce9aa9..fe5b7d1da37 100644
--- a/res/cardsfolder/n/nikko_onna.txt
+++ b/res/cardsfolder/n/nikko_onna.txt
@@ -6,7 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:TrigDestroy:DB$Destroy | ValidTgts$ Enchantment | TgtPrompt$ Choose target enchantment
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nikko_onna.jpg
-SetInfo:SOK|Uncommon|http://magiccards.info/scans/en/sok/21.jpg
 Oracle:When Nikko-Onna enters the battlefield, destroy target enchantment.\nWhenever you cast a Spirit or Arcane spell, you may return Nikko-Onna to its owner's hand.
+SetInfo:SOK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nim_abomination.txt b/res/cardsfolder/n/nim_abomination.txt
index f55a1662fe6..66c70290f7b 100644
--- a/res/cardsfolder/n/nim_abomination.txt
+++ b/res/cardsfolder/n/nim_abomination.txt
@@ -4,7 +4,6 @@ Types:Creature Zombie
 PT:3/4
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Card.Self+untapped | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your end step, if CARDNAME is untapped, you lose 3 life.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 3
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nim_abomination.jpg
-SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/49.jpg
 Oracle:At the beginning of your end step, if Nim Abomination is untapped, you lose 3 life.
+SetInfo:DST Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nim_deathmantle.txt b/res/cardsfolder/n/nim_deathmantle.txt
index 8a45a79f7ba..e3a288c43a1 100644
--- a/res/cardsfolder/n/nim_deathmantle.txt
+++ b/res/cardsfolder/n/nim_deathmantle.txt
@@ -2,12 +2,11 @@ Name:Nim Deathmantle
 ManaCost:2
 Types:Artifact Equipment
 K:Equip 4
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Intimidate | AddType$ Zombie | RemoveCreatureTypes$ True | SetColor$ Black | Description$ Equipped creature gets +2/+2, has intimidate, and is a black Zombie. 
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Intimidate | AddType$ Zombie | RemoveCreatureTypes$ True | SetColor$ Black | Description$ Equipped creature gets +2/+2, has intimidate, and is a black Zombie.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+YouOwn | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay 4. If you do, return that card to the battlefield and attach CARDNAME to it.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 4 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | RememberChanged$ True | SubAbility$ DBAttach
 SVar:DBAttach:DB$ Attach | Cost$ 0 | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nim_deathmantle.jpg
-SetInfo:SOM|Rare|http://magiccards.info/scans/en/som/188.jpg
 Oracle:Equipped creature gets +2/+2, has intimidate, and is a black Zombie.\nWhenever a nontoken creature is put into your graveyard from the battlefield, you may pay {4}. If you do, return that card to the battlefield and attach Nim Deathmantle to it.\nEquip {4}
+SetInfo:SOM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nim_devourer.txt b/res/cardsfolder/n/nim_devourer.txt
index ef278c4c71f..a9eb1cd8d9a 100644
--- a/res/cardsfolder/n/nim_devourer.txt
+++ b/res/cardsfolder/n/nim_devourer.txt
@@ -8,7 +8,6 @@ A:AB$ ChangeZone | Cost$ B B | Origin$ Graveyard | Destination$ Battlefield | Ac
 SVar:DBSac:DB$ Sacrifice | Defined$ You | SacValid$ Creature
 SVar:BuffedBy:Artifact
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nim_devourer.jpg
-SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/70.jpg
 Oracle:Nim Devourer gets +1/+0 for each artifact you control.\n{B}{B}: Return Nim Devourer from your graveyard to the battlefield, then sacrifice a creature. Activate this ability only during your upkeep.
+SetInfo:MRD Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nim_grotesque.txt b/res/cardsfolder/n/nim_grotesque.txt
index 0029860af0f..4b299adb865 100644
--- a/res/cardsfolder/n/nim_grotesque.txt
+++ b/res/cardsfolder/n/nim_grotesque.txt
@@ -6,7 +6,6 @@ S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | References$ X | Descrip
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:BuffedBy:Artifact
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nim_grotesque.jpg
-SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/56.jpg
 Oracle:Nim Grotesque gets +1/+0 for each artifact you control.
+SetInfo:5DN Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nim_lasher.txt b/res/cardsfolder/n/nim_lasher.txt
index 5b5ddeb3e3d..cd784597a08 100644
--- a/res/cardsfolder/n/nim_lasher.txt
+++ b/res/cardsfolder/n/nim_lasher.txt
@@ -6,7 +6,6 @@ S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | References$ X | Descrip
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:BuffedBy:Artifact
 SVar:RemRandomDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nim_lasher.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/71.jpg
 Oracle:Nim Lasher gets +1/+0 for each artifact you control.
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nim_replica.txt b/res/cardsfolder/n/nim_replica.txt
index 67ca2dce410..09728b81152 100644
--- a/res/cardsfolder/n/nim_replica.txt
+++ b/res/cardsfolder/n/nim_replica.txt
@@ -4,7 +4,6 @@ Types:Artifact Creature Zombie
 PT:3/1
 A:AB$ Pump | Cost$ 2 B Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-1 until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nim_replica.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/220.jpg
 Oracle:{2}{B}, Sacrifice Nim Replica: Target creature gets -1/-1 until end of turn.
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nim_shambler.txt b/res/cardsfolder/n/nim_shambler.txt
index 3e8171bdb4e..17b8c71fb02 100644
--- a/res/cardsfolder/n/nim_shambler.txt
+++ b/res/cardsfolder/n/nim_shambler.txt
@@ -7,7 +7,6 @@ A:AB$ Regenerate | Cost$ Sac<1/Artifact> | SpellDescription$ Regenerate CARDNAME
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:BuffedBy:Artifact
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nim_shambler.jpg
-SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/72.jpg
 Oracle:Nim Shambler gets +1/+0 for each artifact you control.\nSacrifice a creature: Regenerate Nim Shambler.
+SetInfo:MRD Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nim_shrieker.txt b/res/cardsfolder/n/nim_shrieker.txt
index d2835444ff3..3d7fae6c3aa 100644
--- a/res/cardsfolder/n/nim_shrieker.txt
+++ b/res/cardsfolder/n/nim_shrieker.txt
@@ -8,7 +8,6 @@ SVar:X:Count$Valid Artifact.YouCtrl
 SVar:NeedsToPlayVar:X GE2
 SVar:RemRandomDeck:True
 SVar:BuffedBy:Artifact
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nim_shrieker.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/73.jpg
 Oracle:Flying\nNim Shrieker gets +1/+0 for each artifact you control.
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nimana_sell_sword.txt b/res/cardsfolder/n/nimana_sell_sword.txt
index 64e12c17f58..635fcc53a84 100644
--- a/res/cardsfolder/n/nimana_sell_sword.txt
+++ b/res/cardsfolder/n/nimana_sell_sword.txt
@@ -6,7 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:BuffedBy:Ally
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nimana_sell_sword.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/106.jpg
 Oracle:Whenever Nimana Sell-Sword or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Nimana Sell-Sword.
+SetInfo:ZEN Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nimble_mongoose.txt b/res/cardsfolder/n/nimble_mongoose.txt
index b0339c933e0..1a8c9a77823 100644
--- a/res/cardsfolder/n/nimble_mongoose.txt
+++ b/res/cardsfolder/n/nimble_mongoose.txt
@@ -4,7 +4,6 @@ Types:Creature Mongoose
 PT:1/1
 K:Shroud
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold - CARDNAME gets +2/+2 as long as seven or more cards are in your graveyard.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nimble_mongoose.jpg
-SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/258.jpg
 Oracle:Shroud (This permanent can't be the target of spells or abilities.)\nThreshold - Nimble Mongoose gets +2/+2 as long as seven or more cards are in your graveyard.
+SetInfo:ODY Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nimbus_maze.txt b/res/cardsfolder/n/nimbus_maze.txt
index de7a0e6ae36..f265e8cc9d9 100644
--- a/res/cardsfolder/n/nimbus_maze.txt
+++ b/res/cardsfolder/n/nimbus_maze.txt
@@ -4,7 +4,6 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ W | IsPresent$ Island.YouCtrl | SpellDescription$ Add W to your mana pool. Activate this ability only if you control an Island.
 A:AB$ Mana | Cost$ T | Produced$ U | IsPresent$ Plains.YouCtrl | SpellDescription$ Add U to your mana pool. Activate this ability only if you control a Plains.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nimbus_maze.jpg
-SetInfo:FUT|Rare|http://magiccards.info/scans/en/fut/178.jpg
 Oracle:{T}: Add {1} to your mana pool.\n{T}: Add {W} to your mana pool. Activate this ability only if you control an Island.\n{T}: Add {U} to your mana pool. Activate this ability only if you control a Plains.
+SetInfo:FUT Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nimbus_swimmer.txt b/res/cardsfolder/n/nimbus_swimmer.txt
index d19d64b7c72..c7ed35493a9 100644
--- a/res/cardsfolder/n/nimbus_swimmer.txt
+++ b/res/cardsfolder/n/nimbus_swimmer.txt
@@ -5,7 +5,6 @@ PT:0/0
 K:Flying
 K:etbCounter:P1P1:X
 SVar:X:Count$xPaid
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nimbus_swimmer.jpg
-SetInfo:GTC|Uncommon|http://magiccards.info/scans/en/gtc/181.jpg
 Oracle:Flying\nNimbus Swimmer enters the battlefield with X +1/+1 counters on it.
+SetInfo:GTC Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nimbus_wings.txt b/res/cardsfolder/n/nimbus_wings.txt
index 918443ee12f..74c1da0b023 100644
--- a/res/cardsfolder/n/nimbus_wings.txt
+++ b/res/cardsfolder/n/nimbus_wings.txt
@@ -4,7 +4,6 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 2 | AddKeyword$ Flying | Description$ Enchanted creature gets +1/+2 and has flying.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nimbus_wings.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/28.jpg
 Oracle:Enchant creature\nEnchanted creature gets +1/+2 and has flying.
+SetInfo:ZEN Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nin_the_pain_artist.txt b/res/cardsfolder/n/nin_the_pain_artist.txt
index edd2b95bdc3..05db6030365 100644
--- a/res/cardsfolder/n/nin_the_pain_artist.txt
+++ b/res/cardsfolder/n/nin_the_pain_artist.txt
@@ -6,7 +6,6 @@ A:AB$ DealDamage | Cost$ X U R T | ValidTgts$ Creature | TgtPrompt$ Select targe
 SVar:DBDraw:DB$Draw | Defined$ TargetedController | NumCards$ X | References$ X
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nin_the_pain_artist.jpg
-SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/213.jpg
 Oracle:{X}{U}{R}, {T}: Nin, the Pain Artist deals X damage to target creature. That creature's controller draws X cards.
+SetInfo:COM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nine_ringed_bo.txt b/res/cardsfolder/n/nine_ringed_bo.txt
index ff4785c62d1..655f4142f68 100644
--- a/res/cardsfolder/n/nine_ringed_bo.txt
+++ b/res/cardsfolder/n/nine_ringed_bo.txt
@@ -4,7 +4,6 @@ Types:Artifact
 A:AB$ DealDamage | Cost$ T |  ValidTgts$ Creature.Spirit | NumDmg$ 1 | SubAbility$ DB | SpellDescription$ CARDNAME deals 1 damage to target Spirit creature. If that creature would be put into a graveyard this turn, exile it instead.
 SVar:DB:DB$Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nine_ringed_bo.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/263.jpg
 Oracle:{T}: Nine-Ringed Bo deals 1 damage to target Spirit creature. If that creature would die this turn, exile it instead.
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/ninja_of_the_deep_hours.txt b/res/cardsfolder/n/ninja_of_the_deep_hours.txt
index 3010ca5507b..72c1a9fff09 100644
--- a/res/cardsfolder/n/ninja_of_the_deep_hours.txt
+++ b/res/cardsfolder/n/ninja_of_the_deep_hours.txt
@@ -5,8 +5,7 @@ PT:2/2
 A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (1 U, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDraw | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ninja_of_the_deep_hours.jpg
-SetInfo:PC2|Common|http://magiccards.info/scans/en/pc2/21.jpg
-SetInfo:BOK|Common|http://magiccards.info/scans/en/bok/44.jpg
 Oracle:Ninjutsu {1}{U} ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nWhenever Ninja of the Deep Hours deals combat damage to a player, you may draw a card.
+SetInfo:PC2 Common
+SetInfo:BOK Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nip_gwyllion.txt b/res/cardsfolder/n/nip_gwyllion.txt
index 3a8af89d9d8..f053336e93d 100644
--- a/res/cardsfolder/n/nip_gwyllion.txt
+++ b/res/cardsfolder/n/nip_gwyllion.txt
@@ -3,7 +3,6 @@ ManaCost:WB
 Types:Creature Hag
 PT:1/1
 K:Lifelink
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nip_gwyllion.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/92.jpg
 Oracle:Lifelink (Damage dealt by this creature also causes you to gain that much life.)
+SetInfo:EVE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nirkana_cutthroat.txt b/res/cardsfolder/n/nirkana_cutthroat.txt
index 944bfe1f8fb..be49e9bfe25 100644
--- a/res/cardsfolder/n/nirkana_cutthroat.txt
+++ b/res/cardsfolder/n/nirkana_cutthroat.txt
@@ -8,7 +8,6 @@ S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 3 | AddKe
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 5 | SetToughness$ 4 | AddKeyword$ First Strike & Deathtouch | CheckSVar$ Y | SVarCompare$ EQ1 | References$ Y | Description$ LEVEL 3+ 5/4 CARDNAME has First Strike and Deathtouch
 SVar:X:Count$Valid Card.Self+counters_GE1_LEVEL+counters_LE2_LEVEL
 SVar:Y:Count$Valid Card.Self+counters_GE3_LEVEL
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nirkana_cutthroat.jpg
-SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/119.jpg
 Oracle:Level up {2}{B} ({2}{B}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-2\n4/3\nDeathtouch\nLEVEL 3+\n5/4\nFirst strike, deathtouch
+SetInfo:ROE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nirkana_revenant.txt b/res/cardsfolder/n/nirkana_revenant.txt
index 78b5d995583..326b6f88cac 100644
--- a/res/cardsfolder/n/nirkana_revenant.txt
+++ b/res/cardsfolder/n/nirkana_revenant.txt
@@ -6,7 +6,6 @@ A:AB$ Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets
 T:Mode$ TapsForMana | ValidCard$ Swamp.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a Swamp for mana, add B to your mana pool (in addition to the mana the land produces).
 SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ B | Amount$ 1
 SVar:RemAIDeck:True
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nirkana_revenant.jpg
-SetInfo:ROE|Mythic|http://magiccards.info/scans/en/roe/120.jpg
 Oracle:Whenever you tap a Swamp for mana, add {B} to your mana pool (in addition to the mana the land produces).\n{B}: Nirkana Revenant gets +1/+1 until end of turn.
+SetInfo:ROE Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/n/nissa_revane.txt b/res/cardsfolder/n/nissa_revane.txt
index 297f58b34fb..dcdd667f0a1 100644
--- a/res/cardsfolder/n/nissa_revane.txt
+++ b/res/cardsfolder/n/nissa_revane.txt
@@ -8,7 +8,6 @@ A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$
 SVar:XLife:Count$TypeYouCtrl.Elf/Times.2
 SVar:XFetch:Count$TypeInYourLibrary.Elf
 SVar:RemRandomDeck:True
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nissa_revane.jpg
-SetInfo:ZEN|Mythic|http://magiccards.info/scans/en/zen/170.jpg
 Oracle:[+1] Search your library for a card named Nissa's Chosen and put it onto the battlefield. Then shuffle your library.\n[+1] You gain 2 life for each Elf you control.\n[-7] Search your library for any number of Elf creature cards and put them onto the battlefield. Then shuffle your library.
+SetInfo:ZEN Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/n/nissas_chosen.txt b/res/cardsfolder/n/nissas_chosen.txt
index 399dfbddcb6..713e3354eef 100644
--- a/res/cardsfolder/n/nissas_chosen.txt
+++ b/res/cardsfolder/n/nissas_chosen.txt
@@ -3,7 +3,6 @@ ManaCost:G G
 Types:Creature Elf Warrior
 Text:If Nissa's Chosen would be put into a graveyard from the battlefield, put it on the bottom of its owner's library instead.
 PT:2/3
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nissas_chosen.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/171.jpg
 Oracle:If Nissa's Chosen would die, put it on the bottom of its owner's library instead.
+SetInfo:ZEN Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/niv_mizzet_dracogenius.txt b/res/cardsfolder/n/niv_mizzet_dracogenius.txt
index c6cdec3069d..d139df4062e 100644
--- a/res/cardsfolder/n/niv_mizzet_dracogenius.txt
+++ b/res/cardsfolder/n/niv_mizzet_dracogenius.txt
@@ -6,7 +6,6 @@ K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals damage to a player, you may draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 A:AB$ DealDamage | Cost$ U R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/niv_mizzet_dracogenius.jpg
-SetInfo:RTR|Mythic|http://magiccards.info/scans/en/rtr/183.jpg
 Oracle:Flying\nWhenever Niv-Mizzet, Dracogenius deals damage to a player, you may draw a card.\n{U}{R}: Niv-Mizzet, Dracogenius deals 1 damage to target creature or player.
+SetInfo:RTR Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/n/niv_mizzet_the_firemind.txt b/res/cardsfolder/n/niv_mizzet_the_firemind.txt
index 4abefd55bdf..33ac5f09ddf 100644
--- a/res/cardsfolder/n/niv_mizzet_the_firemind.txt
+++ b/res/cardsfolder/n/niv_mizzet_the_firemind.txt
@@ -6,7 +6,8 @@ K:Flying
 A:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card.
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you draw a card, CARDNAME deals 1 damage to target creature or player.
 SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/niv_mizzet_the_firemind.jpg
-SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/123.jpg
 Oracle:Flying\nWhenever you draw a card, Niv-Mizzet, the Firemind deals 1 damage to target creature or player.\n{T}: Draw a card.
+SetInfo:GPT Rare
+SetInfo:DDJ Mythic
+SetInfo:DRB Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/niveous_wisps.txt b/res/cardsfolder/n/niveous_wisps.txt
index 869a0fc5869..0e0bdb8d1ff 100644
--- a/res/cardsfolder/n/niveous_wisps.txt
+++ b/res/cardsfolder/n/niveous_wisps.txt
@@ -5,7 +5,6 @@ A:SP$ Animate | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creatur
 SVar:DBDraw:DB$Draw | SubAbility$ DBTap | NumCards$ 1
 SVar:DBTap:DB$Tap | Defined$ Targeted
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/niveous_wisps.jpg
-SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/15.jpg
 Oracle:Target creature becomes white until end of turn. Tap that creature.\nDraw a card.
+SetInfo:SHM Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nivix_aerie_of_the_firemind.txt b/res/cardsfolder/n/nivix_aerie_of_the_firemind.txt
index c68de192dc0..8063d915f50 100644
--- a/res/cardsfolder/n/nivix_aerie_of_the_firemind.txt
+++ b/res/cardsfolder/n/nivix_aerie_of_the_firemind.txt
@@ -6,7 +6,7 @@ A:AB$ Dig | Cost$ T 2 U R | DigNum$ 1 | ChangeNum$ All | ChangeValid$ Card | Des
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played | PumpZone$ Exile | SubAbility$ DBCleanup | UntilYourNextTurn$ True | ConditionDefined$ Remembered | ConditionPresent$ Instant,Sorcery | ConditionCompare$ EQ1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nivix_aerie_of_the_firemind.jpg
-SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/160.jpg
 Oracle:{T}: Add {1} to your mana pool.\n{2}{U}{R}, {T}: Exile the top card of your library. Until your next turn, you may cast that card if it's an instant or sorcery.
+SetInfo:GPT Uncommon
+SetInfo:DDJ Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nivix_guildmage.txt b/res/cardsfolder/n/nivix_guildmage.txt
index 67050742f6f..772bfa3b842 100644
--- a/res/cardsfolder/n/nivix_guildmage.txt
+++ b/res/cardsfolder/n/nivix_guildmage.txt
@@ -5,7 +5,6 @@ PT:2/2
 A:AB$ Draw | Cost$ 1 U R  | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 A:AB$ CopySpellAbility | Cost$ 2 U R | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nivix_guildmage.jpg
-SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/182.jpg
 Oracle:{1}{U}{R}: Draw a card, then discard a card.\n{2}{U}{R}: Copy target instant or sorcery spell you control. You may choose new targets for the copy.
+SetInfo:RTR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nivmagus_elemental.txt b/res/cardsfolder/n/nivmagus_elemental.txt
index 427fe6cc285..5d924e5d087 100644
--- a/res/cardsfolder/n/nivmagus_elemental.txt
+++ b/res/cardsfolder/n/nivmagus_elemental.txt
@@ -4,7 +4,6 @@ Types:Creature Elemental
 PT:1/2
 A:AB$ PutCounter | Cost$ ExileFromStack<1/Spell.Instant+YouCtrl;Spell.Sorcery+YouCtrl/instant or sorcery spell> | CostDesc$ Exile an instant or sorcery spell you control: | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on CARDNAME. (That spell won't resolve.)
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nivmagus_elemental.jpg
-SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/219.jpg
 Oracle:Exile an instant or sorcery spell you control: Put two +1/+1 counters on Nivmagus Elemental. (That spell won't resolve.)
+SetInfo:RTR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/no_dachi.txt b/res/cardsfolder/n/no_dachi.txt
index 1c092d9d108..8605252b000 100644
--- a/res/cardsfolder/n/no_dachi.txt
+++ b/res/cardsfolder/n/no_dachi.txt
@@ -3,7 +3,6 @@ ManaCost:2
 Types:Artifact Equipment
 K:Equip 3
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ First Strike | Description$ Equipped creature gets +2/+0 and has first strike.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/no_dachi.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/264.jpg
 Oracle:Equipped creature gets +2/+0 and has first strike.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/no_mercy.txt b/res/cardsfolder/n/no_mercy.txt
index 36a4ce7f108..92f7c99b850 100644
--- a/res/cardsfolder/n/no_mercy.txt
+++ b/res/cardsfolder/n/no_mercy.txt
@@ -3,7 +3,6 @@ ManaCost:2 B B
 Types:Enchantment
 T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ You  | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature deals damage to you, destroy it.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredSource
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/no_mercy.jpg
-SetInfo:ULG|Rare|http://magiccards.info/scans/en/ul/56.jpg
 Oracle:Whenever a creature deals damage to you, destroy it.
+SetInfo:ULG Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/no_rest_for_the_wicked.txt b/res/cardsfolder/n/no_rest_for_the_wicked.txt
index 8bc3d84c55d..4cf245794d2 100644
--- a/res/cardsfolder/n/no_rest_for_the_wicked.txt
+++ b/res/cardsfolder/n/no_rest_for_the_wicked.txt
@@ -2,8 +2,7 @@ Name:No Rest for the Wicked
 ManaCost:1 B
 Types:Enchantment
 A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Hand | Defined$ ThisTurnEntered_Graveyard_from_Battlefield_Card.Creature+YouCtrl | SpellDescription$ Return to your hand all creature cards in your graveyard that were put there from the battlefield this turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/no_rest_for_the_wicked.jpg
-SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/142.jpg
-SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/165.jpg
 Oracle:Sacrifice No Rest for the Wicked: Return to your hand all creature cards in your graveyard that were put there from the battlefield this turn.
+SetInfo:10E Uncommon
+SetInfo:USG Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nobilis_of_war.txt b/res/cardsfolder/n/nobilis_of_war.txt
index 2f92ca2d4ae..e6b3a6d6fc4 100644
--- a/res/cardsfolder/n/nobilis_of_war.txt
+++ b/res/cardsfolder/n/nobilis_of_war.txt
@@ -5,7 +5,6 @@ PT:3/4
 K:Flying
 S:Mode$ Continuous | Affected$ Creature.attacking+YouCtrl | AddPower$ 2 | Description$ Attacking creatures you control get +2/+0.
 SVar:PlayMain1:TRUE
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nobilis_of_war.jpg
-SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/144.jpg
 Oracle:Flying\nAttacking creatures you control get +2/+0.
+SetInfo:EVE Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/noble_benefactor.txt b/res/cardsfolder/n/noble_benefactor.txt
index 8063a789c56..373ceb3c8c5 100644
--- a/res/cardsfolder/n/noble_benefactor.txt
+++ b/res/cardsfolder/n/noble_benefactor.txt
@@ -4,7 +4,6 @@ Types:Creature Human Cleric
 PT:2/2
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, each player may search his or her library for a card and put that card into his or her hand. Then each player who searched his or her library this way shuffles it.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | DefinedPlayer$ Each | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Shuffle$ True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_benefactor.jpg
-SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/44.jpg
 Oracle:When Noble Benefactor dies, each player may search his or her library for a card and put that card into his or her hand. Then each player who searched his or her library this way shuffles it.
+SetInfo:WTH Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/noble_hierarch.txt b/res/cardsfolder/n/noble_hierarch.txt
index 3b28836cea3..e187ac63526 100644
--- a/res/cardsfolder/n/noble_hierarch.txt
+++ b/res/cardsfolder/n/noble_hierarch.txt
@@ -6,7 +6,6 @@ A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
 K:Exalted
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_hierarch.jpg
-SetInfo:CFX|Rare|http://magiccards.info/scans/en/cfx/87.jpg
 Oracle:Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)\n{T}: Add {G}, {W}, or {U} to your mana pool.
+SetInfo:CFX Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/noble_panther.txt b/res/cardsfolder/n/noble_panther.txt
index e6ccefc3aea..b97bd156943 100644
--- a/res/cardsfolder/n/noble_panther.txt
+++ b/res/cardsfolder/n/noble_panther.txt
@@ -3,7 +3,6 @@ ManaCost:1 G W
 Types:Creature Cat
 PT:3/3
 A:AB$ Pump | Cost$ 1 | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_panther.jpg
-SetInfo:INV|Rare|http://magiccards.info/scans/en/in/257.jpg
 Oracle:{1}: Noble Panther gains first strike until end of turn.
+SetInfo:INV Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/noble_purpose.txt b/res/cardsfolder/n/noble_purpose.txt
index 6c343786719..399e8b4c55e 100644
--- a/res/cardsfolder/n/noble_purpose.txt
+++ b/res/cardsfolder/n/noble_purpose.txt
@@ -4,8 +4,7 @@ Types:Enchantment
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | Execute$ TrigGain | TriggerZones$ Battlefield | CombatDamage$ True | TriggerDescription$ Whenever a creature you control deals combat damage, you gain that much life.
 SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:TriggerCount$DamageAmount
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_purpose.jpg
-SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/31.jpg
-SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/32.jpg
 Oracle:Whenever a creature you control deals combat damage, you gain that much life.
+SetInfo:MMQ Uncommon
+SetInfo:8ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/noble_stand.txt b/res/cardsfolder/n/noble_stand.txt
index bd1b6708081..34281a0cf72 100644
--- a/res/cardsfolder/n/noble_stand.txt
+++ b/res/cardsfolder/n/noble_stand.txt
@@ -3,7 +3,6 @@ ManaCost:4 W
 Types:Enchantment
 T:Mode$ Blocks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature you control blocks, you gain 2 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 2
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_stand.jpg
-SetInfo:NMS|Uncommon|http://magiccards.info/scans/en/ne/14.jpg
 Oracle:Whenever a creature you control blocks, you gain 2 life.
+SetInfo:NMS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/noble_steeds.txt b/res/cardsfolder/n/noble_steeds.txt
index 953592a6cc5..cb26690b880 100644
--- a/res/cardsfolder/n/noble_steeds.txt
+++ b/res/cardsfolder/n/noble_steeds.txt
@@ -2,7 +2,6 @@ Name:Noble Steeds
 ManaCost:2 W
 Types:Enchantment
 A:AB$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | SpellDescription$ Target creature gains first strike until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_steeds.jpg
-SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/140.jpg|2
 Oracle:{1}{W}: Target creature gains first strike until end of turn.
+SetInfo:ALL Common x2
\ No newline at end of file
diff --git a/res/cardsfolder/n/noble_templar.txt b/res/cardsfolder/n/noble_templar.txt
index df86bb9028d..6453268de06 100644
--- a/res/cardsfolder/n/noble_templar.txt
+++ b/res/cardsfolder/n/noble_templar.txt
@@ -4,7 +4,6 @@ Types:Creature Human Cleric Soldier
 PT:3/6
 K:Vigilance
 K:TypeCycling:Plains:2
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_templar.jpg
-SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/19.jpg
 Oracle:Vigilance\nPlainscycling {2} ({2}, Discard this card: Search your library for a Plains card, reveal it, and put it into your hand. Then shuffle your library.)
+SetInfo:SCG Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/noble_vestige.txt b/res/cardsfolder/n/noble_vestige.txt
index af2f764dd28..abe352a63a4 100644
--- a/res/cardsfolder/n/noble_vestige.txt
+++ b/res/cardsfolder/n/noble_vestige.txt
@@ -4,7 +4,6 @@ Types:Creature Spirit
 PT:1/2
 K:Flying
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Player | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to target player this turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_vestige.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/29.jpg
 Oracle:Flying\n{T}: Prevent the next 1 damage that would be dealt to target player this turn.
+SetInfo:ZEN Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nocturnal_raid.txt b/res/cardsfolder/n/nocturnal_raid.txt
index c985325107c..773a6b7d6db 100644
--- a/res/cardsfolder/n/nocturnal_raid.txt
+++ b/res/cardsfolder/n/nocturnal_raid.txt
@@ -2,8 +2,7 @@ Name:Nocturnal Raid
 ManaCost:2 B B
 Types:Instant
 A:SP$ PumpAll | Cost$ 2 B B | ValidCards$ Creature.Black | NumAtt$ +2 | SpellDescription$ Black creatures get +2/+0 until end of turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/7e/en-us/card25633.jpg
-SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/30.jpg
-SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/151.jpg
 Oracle:Black creatures get +2/+0 until end of turn.
+SetInfo:7ED Uncommon
+SetInfo:MIR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/noetic_scales.txt b/res/cardsfolder/n/noetic_scales.txt
index 13b6c88c9e3..ec4733d4acf 100644
--- a/res/cardsfolder/n/noetic_scales.txt
+++ b/res/cardsfolder/n/noetic_scales.txt
@@ -8,7 +8,6 @@ SVar:TrigBounceOpp:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Creature.YouDontCtrl
 SVar:X:Count$InYourHand
 SVar:Y:Count$InOppHand
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noetic_scales.jpg
-SetInfo:USG|Rare|http://magiccards.info/scans/en/us/304.jpg
 Oracle:At the beginning of each player's upkeep, return to its owner's hand each creature that player controls with power greater than the number of cards in his or her hand.
+SetInfo:USG Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/noggle_bandit.txt b/res/cardsfolder/n/noggle_bandit.txt
index c81a092f661..efabdf826cd 100644
--- a/res/cardsfolder/n/noggle_bandit.txt
+++ b/res/cardsfolder/n/noggle_bandit.txt
@@ -4,7 +4,6 @@ Types:Creature Noggle Rogue
 Text:CARDNAME can't be blocked except by creatures with defender.
 PT:2/2
 K:CantBeBlockedBy Creature.withoutDefender
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noggle_bandit.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/106.jpg
 Oracle:Noggle Bandit can't be blocked except by creatures with defender.
+SetInfo:EVE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/noggle_bridgebreaker.txt b/res/cardsfolder/n/noggle_bridgebreaker.txt
index 8259f075195..331c90b16df 100644
--- a/res/cardsfolder/n/noggle_bridgebreaker.txt
+++ b/res/cardsfolder/n/noggle_bridgebreaker.txt
@@ -4,7 +4,6 @@ Types:Creature Noggle Rogue
 PT:4/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noggle_bridgebreaker.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/107.jpg
 Oracle:When Noggle Bridgebreaker enters the battlefield, return a land you control to its owner's hand.
+SetInfo:EVE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/noggle_hedge_mage.txt b/res/cardsfolder/n/noggle_hedge_mage.txt
index 4014312b66d..9751332e687 100644
--- a/res/cardsfolder/n/noggle_hedge_mage.txt
+++ b/res/cardsfolder/n/noggle_hedge_mage.txt
@@ -6,7 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Mountain.YouCtrl | PresentCompare$ GE2 | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Mountains, you may have CARDNAME deal 2 damage to target player.
 SVar:TrigTap:AB$Tap | Cost$ 0 | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Permanent
 SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 2
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noggle_hedge_mage.jpg
-SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/108.jpg
 Oracle:When Noggle Hedge-Mage enters the battlefield, if you control two or more Islands, you may tap two target permanents.\nWhen Noggle Hedge-Mage enters the battlefield, if you control two or more Mountains, you may have Noggle Hedge-Mage deal 2 damage to target player.
+SetInfo:EVE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/noggle_ransacker.txt b/res/cardsfolder/n/noggle_ransacker.txt
index 4e7138da856..698fb69c011 100644
--- a/res/cardsfolder/n/noggle_ransacker.txt
+++ b/res/cardsfolder/n/noggle_ransacker.txt
@@ -5,8 +5,7 @@ PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, each player draws two cards, then discards a card at random.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ Each | NumCards$ 2 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ Each | Mode$ Random | NumCards$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noggle_ransacker.jpg
-SetInfo:PC2|Uncommon|http://magiccards.info/scans/en/pc2/102.jpg
-SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/109.jpg
 Oracle:When Noggle Ransacker enters the battlefield, each player draws two cards, then discards a card at random.
+SetInfo:PC2 Uncommon
+SetInfo:EVE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nomad_decoy.txt b/res/cardsfolder/n/nomad_decoy.txt
index 97ea5c1c6e4..d61b9a61987 100644
--- a/res/cardsfolder/n/nomad_decoy.txt
+++ b/res/cardsfolder/n/nomad_decoy.txt
@@ -5,7 +5,6 @@ PT:1/2
 A:AB$ Tap | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
 A:AB$ Tap | Cost$ W W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 2 | TargetMax$ 2 | CheckSVar$ X | SVarCompare$ GE7 | References$ X | SpellDescription$ Threshold - Tap two target creatures. Activate this ability only if seven or more cards are in your graveyard.
 SVar:X:Count$InYourYard
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nomad_decoy.jpg
-SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/37.jpg
 Oracle:{W}, {T}: Tap target creature.\nThreshold - {W}{W}, {T}: Tap two target creatures. Activate this ability only if seven or more cards are in your graveyard.
+SetInfo:ODY Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nomad_mythmaker.txt b/res/cardsfolder/n/nomad_mythmaker.txt
index 996ccce07c0..968ec1ced24 100644
--- a/res/cardsfolder/n/nomad_mythmaker.txt
+++ b/res/cardsfolder/n/nomad_mythmaker.txt
@@ -3,8 +3,7 @@ ManaCost:2 W
 Types:Creature Human Nomad Cleric
 PT:2/2
 A:AB$ ChangeZone | Cost$ W T | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Aura | GainControl$ True | AttachedTo$ Creature.CanBeEnchantedBySource+YouCtrl | SpellDescription$ Put target Aura card from a graveyard onto the battlefield under your control attached to a creature you control.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nomad_mythmaker.jpg
-SetInfo:JUD|Rare|http://magiccards.info/scans/en/ju/15.jpg
-SetInfo:10E|Rare|http://magiccards.info/scans/en/10e/30.jpg
 Oracle:{W}, {T}: Put target Aura card from a graveyard onto the battlefield under your control attached to a creature you control.
+SetInfo:JUD Rare
+SetInfo:10E Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nomad_stadium.txt b/res/cardsfolder/n/nomad_stadium.txt
index 2336a6d6f59..110a0651d3c 100644
--- a/res/cardsfolder/n/nomad_stadium.txt
+++ b/res/cardsfolder/n/nomad_stadium.txt
@@ -5,7 +5,6 @@ A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add
 A:AB$ GainLife | Cost$ W T Sac<1/CARDNAME> | LifeAmount$ 4 | Activation$ Threshold | PrecostDesc$ Threshold - | SpellDescription$ You gain 4 life. Activate this ability only if seven or more cards are in your graveyard.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nomad_stadium.jpg
-SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/322.jpg
 Oracle:{T}: Add {W} to your mana pool. Nomad Stadium deals 1 damage to you.\nThreshold - {W}, {T}, Sacrifice Nomad Stadium: You gain 4 life. Activate this ability only if seven or more cards are in your graveyard.
+SetInfo:ODY Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nomadic_elf.txt b/res/cardsfolder/n/nomadic_elf.txt
index 7884b3e5bc4..a559e6a9253 100644
--- a/res/cardsfolder/n/nomadic_elf.txt
+++ b/res/cardsfolder/n/nomadic_elf.txt
@@ -4,7 +4,7 @@ Types:Creature Elf Nomad
 PT:2/2
 A:AB$ Mana | Cost$ 1 G | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nomadic_elf.jpg
-SetInfo:INV|Common|http://magiccards.info/scans/en/in/200.jpg
 Oracle:{1}{G}: Add one mana of any color to your mana pool.
+SetInfo:DDE Common
+SetInfo:INV Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nomads_assembly.txt b/res/cardsfolder/n/nomads_assembly.txt
index 00b887221c7..113b0a2aeec 100644
--- a/res/cardsfolder/n/nomads_assembly.txt
+++ b/res/cardsfolder/n/nomads_assembly.txt
@@ -5,5 +5,5 @@ K:Rebound
 A:SP$ Token | Cost$ 4 W W | TokenAmount$ X | References$ X | TokenName$ Kor Soldier | TokenTypes$ Creature,Kor,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 white Kor Soldier creature token onto the battlefield for each creature you control.
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nomads_assembly.jpg
-SetInfo:ROE|Rare|http://magiccards.info/scans/en/roe/39.jpg
 Oracle:Put a 1/1 white Kor Soldier creature token onto the battlefield for each creature you control.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
+SetInfo:ROE Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nomads_en_kor.txt b/res/cardsfolder/n/nomads_en_kor.txt
index 0fad092d6d3..7b91b2666f7 100644
--- a/res/cardsfolder/n/nomads_en_kor.txt
+++ b/res/cardsfolder/n/nomads_en_kor.txt
@@ -14,7 +14,6 @@ SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$
 SVar:X:ReplaceCount$DamageAmount/Minus.1
 SVar:Y:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nomads_en_kor.jpg
-SetInfo:STH|Common|http://magiccards.info/scans/en/sh/109.jpg
 Oracle:{0}: The next 1 damage that would be dealt to Nomads en-Kor this turn is dealt to target creature you control instead.
+SetInfo:STH Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/norin_the_wary.txt b/res/cardsfolder/n/norin_the_wary.txt
index 82929992aaa..0afe01f0598 100644
--- a/res/cardsfolder/n/norin_the_wary.txt
+++ b/res/cardsfolder/n/norin_the_wary.txt
@@ -8,7 +8,6 @@ SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | D
 SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Exile | Destination$ Battlefield
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/norin_the_wary.jpg
-SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/171.jpg
 Oracle:When a player casts a spell or a creature attacks, exile Norin the Wary. Return it to the battlefield under its owner's control at the beginning of the next end step.
+SetInfo:TSP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/norns_annex.txt b/res/cardsfolder/n/norns_annex.txt
index 3b96e5df543..68312736df5 100644
--- a/res/cardsfolder/n/norns_annex.txt
+++ b/res/cardsfolder/n/norns_annex.txt
@@ -2,7 +2,6 @@ Name:Norn's Annex
 ManaCost:3 PW PW
 Types:Artifact
 S:Mode$ CantAttackUnless | ValidCard$ Creature | Target$ You,Planeswalker.YouCtrl | Cost$ PW | Description$ Creatures can't attack you or a planeswalker you control unless their controller pays PW for each of those creatures.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/norns_annex.jpg
-SetInfo:NPH|Rare|http://magiccards.info/scans/en/nph/17.jpg
 Oracle:({W/P} can be paid with either {W} or 2 life.)\nCreatures can't attack you or a planeswalker you control unless their controller pays {W/P} for each of those creatures.
+SetInfo:NPH Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/norritt.txt b/res/cardsfolder/n/norritt.txt
index c819bdfae1e..8541db89de3 100644
--- a/res/cardsfolder/n/norritt.txt
+++ b/res/cardsfolder/n/norritt.txt
@@ -8,7 +8,6 @@ SVar:DestroyPacifist:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Tri
 SVar:TrigDestroy:DB$Destroy | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/norritt.jpg
-SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/43.jpg
 Oracle:{T}: Untap target blue creature.\n{T}: Choose target non-Wall creature the active player has controlled continuously since the beginning of the turn. That creature attacks this turn if able. If it doesn't, destroy it at the beginning of the next end step. Activate this ability only before attackers are declared.
+SetInfo:ICE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/northern_paladin.txt b/res/cardsfolder/n/northern_paladin.txt
index 9c0f70ef96f..1f0abb2d0ad 100644
--- a/res/cardsfolder/n/northern_paladin.txt
+++ b/res/cardsfolder/n/northern_paladin.txt
@@ -4,12 +4,11 @@ Types:Creature Human Knight
 PT:3/3
 A:AB$ Destroy | Cost$ W W T | ValidTgts$ Permanent.Black | TgtPrompt$ Select target black permanent | SpellDescription$ Destroy target black permanent.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/northern_paladin.jpg
-SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/213.jpg
-SetInfo:LEB|Rare|http://magiccards.info/scans/en/be/215.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/28.jpg
-SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/287.jpg
-SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/213.jpg
-SetInfo:2ED|Rare|http://magiccards.info/scans/en/un/214.jpg
 Oracle:{W}{W}, {T}: Destroy target black permanent.
+SetInfo:2ED Rare
+SetInfo:7ED Rare
+SetInfo:LEB Rare
+SetInfo:LEA Rare
+SetInfo:4ED Rare
+SetInfo:3ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/norwood_archers.txt b/res/cardsfolder/n/norwood_archers.txt
index 65255a91a7a..4f7181626dc 100644
--- a/res/cardsfolder/n/norwood_archers.txt
+++ b/res/cardsfolder/n/norwood_archers.txt
@@ -3,8 +3,7 @@ ManaCost:3 G
 Types:Creature Elf Archer
 PT:3/3
 K:Reach
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/p3/en-us/card21054.jpg
-SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/76.jpg
-SetInfo:S99|Common|http://magiccards.info/scans/en/st/137.jpg
 Oracle:Reach (This creature can block creatures with flying.)
+SetInfo:PO2 Common
+SetInfo:S99 Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/norwood_priestess.txt b/res/cardsfolder/n/norwood_priestess.txt
index c1208d43c60..d19c9b6a9ff 100644
--- a/res/cardsfolder/n/norwood_priestess.txt
+++ b/res/cardsfolder/n/norwood_priestess.txt
@@ -3,7 +3,6 @@ ManaCost:2 G G
 Types:Creature Elf Druid
 A:AB$ ChangeZone | Cost$ T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Green | ChangeNum$ 1 | PlayerTurn$ True | ActivationPhases$ Upkeep->BeginCombat | SpellDescription$ You may put a green creature card from your hand onto the battlefield. Activate this ability only during your turn, before attackers are declared.
 PT:1/1
-SVar:Rarity:Rare
 SVar:Picture:http://serv2.tcgimages.eu/img/cards/Portal_Second_Age/norwood_priestess.jpg
-SetInfo:PO2|Rare|http://magiccards.info/scans/en/po2/77.jpg
 Oracle:{T}: You may put a green creature card from your hand onto the battlefield. Activate this ability only during your turn, before attackers are declared.
+SetInfo:PO2 Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/norwood_ranger.txt b/res/cardsfolder/n/norwood_ranger.txt
index e0369c85c77..8e43b935b82 100644
--- a/res/cardsfolder/n/norwood_ranger.txt
+++ b/res/cardsfolder/n/norwood_ranger.txt
@@ -2,10 +2,9 @@ Name:Norwood Ranger
 ManaCost:G
 Types:Creature Elf Scout
 PT:1/2
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83188.jpg
-SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/271.jpg
-SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/78.jpg
-SetInfo:S99|Common|http://magiccards.info/scans/en/st/138.jpg
-SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/260.jpg
 Oracle:
+SetInfo:PO2 Common
+SetInfo:S99 Common
+SetInfo:8ED Common
+SetInfo:9ED Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/norwood_riders.txt b/res/cardsfolder/n/norwood_riders.txt
index 673c37d7c82..ba01fe1f7ff 100644
--- a/res/cardsfolder/n/norwood_riders.txt
+++ b/res/cardsfolder/n/norwood_riders.txt
@@ -3,7 +3,6 @@ ManaCost:3 G
 Types:Creature Elf
 PT:3/3
 K:CARDNAME can't be blocked by more than one creature.
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/p2/en-us/card6615.jpg
-SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/79.jpg
 Oracle:Norwood Riders can't be blocked by more than one creature.
+SetInfo:PO2 Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/norwood_warrior.txt b/res/cardsfolder/n/norwood_warrior.txt
index aa11ae790f3..a1386be8b8b 100644
--- a/res/cardsfolder/n/norwood_warrior.txt
+++ b/res/cardsfolder/n/norwood_warrior.txt
@@ -5,6 +5,5 @@ PT:2/2
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it gets +1/+1 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 1 | NumDef$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/norwood_warrior.jpg
-SVar:Rarity:Common
-SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/80.jpg
 Oracle:Whenever Norwood Warrior becomes blocked, it gets +1/+1 until end of turn.
+SetInfo:PO2 Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nostalgic_dreams.txt b/res/cardsfolder/n/nostalgic_dreams.txt
index c9bafbee330..4c92d6273f8 100644
--- a/res/cardsfolder/n/nostalgic_dreams.txt
+++ b/res/cardsfolder/n/nostalgic_dreams.txt
@@ -6,7 +6,6 @@ SVar:DBChange:DB$ChangeZone | Origin$ Stack | Destination$ Exile
 SVar:MaxTgts:Count$InYourYard
 SVar:X:Targeted$Amount
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nostalgic_dreams.jpg
-SetInfo:TOR|Rare|http://magiccards.info/scans/en/tr/135.jpg
 Oracle:As an additional cost to cast Nostalgic Dreams, discard X cards.\nReturn X target cards from your graveyard to your hand. Exile Nostalgic Dreams.
+SetInfo:TOR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nosy_goblin.txt b/res/cardsfolder/n/nosy_goblin.txt
index 92a3d5b8931..16b086eb389 100644
--- a/res/cardsfolder/n/nosy_goblin.txt
+++ b/res/cardsfolder/n/nosy_goblin.txt
@@ -4,7 +4,6 @@ Types:Creature Goblin
 PT:2/1
 A:AB$ Destroy | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.faceDown | TgtPrompt$ Select target face-down creature | SpellDescription$ Destroy target face-down creature.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nosy_goblin.jpg
-SetInfo:ONS|Common|http://magiccards.info/scans/en/on/220.jpg
 Oracle:{T}, Sacrifice Nosy Goblin: Destroy target face-down creature.
+SetInfo:ONS Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/not_of_this_world.txt b/res/cardsfolder/n/not_of_this_world.txt
index bb30bde2ab7..d22c1900bac 100644
--- a/res/cardsfolder/n/not_of_this_world.txt
+++ b/res/cardsfolder/n/not_of_this_world.txt
@@ -6,5 +6,5 @@ SVar:X:Count$Compare CheckTgt GE1.0.7
 SVar:CheckTgt:TargetedByTarget$Valid Card.powerGE7+YouCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/not_of_this_world.jpg
-SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/8.jpg
-Oracle:Counter target spell or ability that targets a permanent you control.\nNot of This World costs {7} less to cast if it targets a spell or ability that targets a creature you control with power 7 or greater.
\ No newline at end of file
+Oracle:Counter target spell or ability that targets a permanent you control.\nNot of This World costs {7} less to cast if it targets a spell or ability that targets a creature you control with power 7 or greater.
+SetInfo:ROE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nothing_can_stop_me_now.txt b/res/cardsfolder/n/nothing_can_stop_me_now.txt
index 4d40f9e35b0..22235628d38 100644
--- a/res/cardsfolder/n/nothing_can_stop_me_now.txt
+++ b/res/cardsfolder/n/nothing_can_stop_me_now.txt
@@ -6,7 +6,6 @@ S:Mode$ PreventDamage | EffectZone$ Command | Target$ You | Source$ Card.OppCtrl
 T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE5 | TriggerZones$ Command | Execute$ Abandon | TriggerDescription$ At the beginning of each end step, if you've been dealt 5 or more damage this turn, abandon this scheme.
 SVar:Abandon:AB$ Abandon | Cost$ 0
 SVar:X:Count$YourDamageThisTurn
-SVar:Rarity:Common
 SVar:Picture:http://www.cardforge.org/fpics/lq_schemes/nothing_can_stop_me_now.jpg
-SetInfo:ARC|Common|http://magiccards.info/extras/scheme/archenemy/nothing-can-stop-me-now.jpg
 Oracle:(An ongoing scheme remains face up until it's abandoned.)\nIf a source an opponent controls would deal damage to you, prevent 1 of that damage.\nAt the beginning of each end step, if you've been dealt 5 or more damage this turn, abandon this scheme.
+SetInfo:ARC Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/notorious_assassin.txt b/res/cardsfolder/n/notorious_assassin.txt
index 6bf6351c81f..9ada5e927e1 100644
--- a/res/cardsfolder/n/notorious_assassin.txt
+++ b/res/cardsfolder/n/notorious_assassin.txt
@@ -3,7 +3,6 @@ ManaCost:3 B
 Types:Creature Human Spellshaper Assassin
 PT:2/2
 A:AB$ Destroy | Cost$ 2 B T Discard<1/Card> | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SpellDescription$ Destroy target nonblack creature. It can't be regenerated.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/notorious_assassin.jpg
-SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/150.jpg
 Oracle:{2}{B}, {T}, Discard a card: Destroy target nonblack creature. It can't be regenerated.
+SetInfo:MMQ Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/notorious_throng.txt b/res/cardsfolder/n/notorious_throng.txt
index 39f5e48ff67..253c7a6b903 100644
--- a/res/cardsfolder/n/notorious_throng.txt
+++ b/res/cardsfolder/n/notorious_throng.txt
@@ -7,7 +7,6 @@ A:SP$ Token | Cost$ 3 U | TokenAmount$ X | References$ X | TokenColors$ Black |
 SVar:X:Count$OppDamageThisTurn
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/notorious_throng.jpg
-SetInfo:MOR|Rare|http://magiccards.info/scans/en/mt/45.jpg
 Oracle:Prowl {5}{U} (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Rogue.)\nPut X 1/1 black Faerie Rogue creature tokens with flying onto the battlefield, where X is the damage dealt to your opponents this turn. If Notorious Throng's prowl cost was paid, take an extra turn after this one.
+SetInfo:MOR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nourish.txt b/res/cardsfolder/n/nourish.txt
index d8b4e162303..e7420939d36 100644
--- a/res/cardsfolder/n/nourish.txt
+++ b/res/cardsfolder/n/nourish.txt
@@ -2,7 +2,6 @@ Name:Nourish
 ManaCost:G G
 Types:Instant
 A:SP$ GainLife | Cost$ G G | LifeAmount$ 6 | SpellDescription$ You gain 6 life.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nourish.jpg
-SetInfo:DST|Common|http://magiccards.info/scans/en/ds/78.jpg
 Oracle:You gain 6 life.
+SetInfo:DST Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nourishing_shoal.txt b/res/cardsfolder/n/nourishing_shoal.txt
index 0a7739b475a..0a38d4f1e2d 100644
--- a/res/cardsfolder/n/nourishing_shoal.txt
+++ b/res/cardsfolder/n/nourishing_shoal.txt
@@ -6,7 +6,6 @@ A:SP$ GainLife | Cost$ ExileFromHand<1/Card.Green> | CostDesc$ You may exile a g
 SVar:X:Count$xPaid
 SVar:Y:Exiled$CardManaCost
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nourishing_shoal.jpg
-SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/137.jpg
 Oracle:You may exile a green card with converted mana cost X from your hand rather than pay Nourishing Shoal's mana cost.\nYou gain X life.
+SetInfo:BOK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nova_chaser.txt b/res/cardsfolder/n/nova_chaser.txt
index 27ee371d967..1f17ad53740 100644
--- a/res/cardsfolder/n/nova_chaser.txt
+++ b/res/cardsfolder/n/nova_chaser.txt
@@ -5,7 +5,6 @@ PT:10/2
 K:Trample
 K:Champion:Elemental
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nova_chaser.jpg
-SetInfo:LRW|Rare|http://magiccards.info/scans/en/lw/187.jpg
 Oracle:Trample\nChampion an Elemental (When this enters the battlefield, sacrifice it unless you exile another Elemental you control. When this leaves the battlefield, that card returns to the battlefield.)
+SetInfo:LRW Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nova_cleric.txt b/res/cardsfolder/n/nova_cleric.txt
index c795cd6b5b9..e450c5cd0d9 100644
--- a/res/cardsfolder/n/nova_cleric.txt
+++ b/res/cardsfolder/n/nova_cleric.txt
@@ -4,7 +4,6 @@ Types:Creature Human Cleric
 PT:1/2
 A:AB$ DestroyAll | Cost$ 2 W T Sac<1/CARDNAME> | ValidCards$ Enchantment | SpellDescription$ Destroy all enchantments.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nova_cleric.jpg
-SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/45.jpg
 Oracle:{2}{W}, {T}, Sacrifice Nova Cleric: Destroy all enchantments.
+SetInfo:ONS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/novablast_wurm.txt b/res/cardsfolder/n/novablast_wurm.txt
index 4defd9bba7f..3e282b81f63 100644
--- a/res/cardsfolder/n/novablast_wurm.txt
+++ b/res/cardsfolder/n/novablast_wurm.txt
@@ -4,7 +4,6 @@ Types:Creature Wurm
 PT:7/7
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDestroyAll | TriggerDescription$ Whenever CARDNAME attacks, destroy all other creatures.
 SVar:TrigDestroyAll:AB$DestroyAll | Cost$ 0 | ValidCards$ Creature.Other
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/novablast_wurm.jpg
-SetInfo:WWK|Mythic|http://magiccards.info/scans/en/wwk/119.jpg
 Oracle:Whenever Novablast Wurm attacks, destroy all other creatures.
+SetInfo:WWK Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/n/novijen_heart_of_progress.txt b/res/cardsfolder/n/novijen_heart_of_progress.txt
index 87b0db0f4c8..154f3c3d7c3 100644
--- a/res/cardsfolder/n/novijen_heart_of_progress.txt
+++ b/res/cardsfolder/n/novijen_heart_of_progress.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$ PutCounterAll | Cost$ G U T | CounterType$ P1P1 | CounterNum$ 1 | ValidCards$ Creature.enteredBattlefieldThisTurn | SpellDescription$ Put a +1/+1 counter on each creature that entered the battlefield this turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/novijen_heart_of_progress.jpg
-SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/175.jpg
 Oracle:{T}: Add {1} to your mana pool.\n{G}{U}, {T}: Put a +1/+1 counter on each creature that entered the battlefield this turn.
+SetInfo:DIS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/noxious_field.txt b/res/cardsfolder/n/noxious_field.txt
index fe58cd84e9d..b1d357b0a29 100644
--- a/res/cardsfolder/n/noxious_field.txt
+++ b/res/cardsfolder/n/noxious_field.txt
@@ -5,7 +5,6 @@ K:Enchant land
 A:SP$ Attach | Cost$ 1 B B | ValidTgts$ Land | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ DamageAll | Description$ Enchanted land has "tap: This land deals 1 damage to each creature and player."
 SVar:DamageAll:AB$ DamageAll | Cost$ T | NumDmg$ 1 | ValidCards$ Creature | ValidPlayers$ Each | ValidDescription$ each creature and each player. | SpellDescription$ CARDNAME deals 1 damage to each creature and each player.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noxious_field.jpg
-SetInfo:PCY|Uncommon|http://magiccards.info/scans/en/pr/70.jpg
 Oracle:Enchant land\nEnchanted land has "{T}: This land deals 1 damage to each creature and each player."
+SetInfo:PCY Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/noxious_ghoul.txt b/res/cardsfolder/n/noxious_ghoul.txt
index 8a93482b9e4..dd541a11f4d 100644
--- a/res/cardsfolder/n/noxious_ghoul.txt
+++ b/res/cardsfolder/n/noxious_ghoul.txt
@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Zombie.Other | Execute$ TrigPumpAll | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Zombie enters the battlefield, all non-Zombie creatures get -1/-1 until end of turn.
 SVar:TrigPumpAll:AB$PumpAll | Cost$ 0 | ValidCards$ Creature.nonZombie | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noxious_ghoul.jpg
-SetInfo:LGN|Uncommon|http://magiccards.info/scans/en/le/77.jpg
 Oracle:Whenever Noxious Ghoul or another Zombie enters the battlefield, all non-Zombie creatures get -1/-1 until end of turn.
+SetInfo:LGN Uncommon
+SetInfo:HOP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/noxious_hatchling.txt b/res/cardsfolder/n/noxious_hatchling.txt
index b64f834e4b5..c7e4a2cd471 100644
--- a/res/cardsfolder/n/noxious_hatchling.txt
+++ b/res/cardsfolder/n/noxious_hatchling.txt
@@ -8,7 +8,6 @@ T:Mode$ SpellCast | ValidCard$ Card.Black | ValidActivatingPlayer$ You | Trigger
 T:Mode$ SpellCast | ValidCard$ Card.Green | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever you cast a green spell, remove a -1/-1 counter from CARDNAME.
 SVar:TrigRemoveCounter:AB$ RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ M1M1 | CounterNum$ 1
 SVar:BuffedBy:Card.Black,Card.Green
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noxious_hatchling.jpg
-SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/124.jpg
 Oracle:Noxious Hatchling enters the battlefield with four -1/-1 counters on it.\nWither (This deals damage to creatures in the form of -1/-1 counters.)\nWhenever you cast a black spell, remove a -1/-1 counter from Noxious Hatchling.\nWhenever you cast a green spell, remove a -1/-1 counter from Noxious Hatchling.
+SetInfo:EVE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/noxious_revival.txt b/res/cardsfolder/n/noxious_revival.txt
index 2406b9f25a1..4aa9dd49eba 100644
--- a/res/cardsfolder/n/noxious_revival.txt
+++ b/res/cardsfolder/n/noxious_revival.txt
@@ -3,7 +3,6 @@ ManaCost:PG
 Types:Instant
 A:SP$ ChangeZone | Cost$ PG | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | ValidTgts$ Card | TgtPrompt$ Select target card from a graveyard | SpellDescription$ Put target card from a graveyard on top of its owner's library.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noxious_revival.jpg
-SetInfo:NPH|Uncommon|http://magiccards.info/scans/en/nph/118.jpg
 Oracle:({G/P} can be paid with either {G} or 2 life.)\nPut target card from a graveyard on top of its owner's library.
+SetInfo:NPH Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/noxious_toad.txt b/res/cardsfolder/n/noxious_toad.txt
index e9655db38b7..3a24f0f6671 100644
--- a/res/cardsfolder/n/noxious_toad.txt
+++ b/res/cardsfolder/n/noxious_toad.txt
@@ -5,7 +5,6 @@ PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, each opponent discards a card.
 SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ Player.Opponent | NumCards$ 1 | Mode$ TgtChoose
 SVar:SacMe:1
-SVar:Rarity:Uncommon
 SVar:Picture:http://serv2.tcgimages.eu/img/cards/Portal/noxious_toad.jpg
-SetInfo:POR|Uncommon|http://magiccards.info/scans/en/po/27.jpg
 Oracle:When Noxious Toad dies, each opponent discards a card.
+SetInfo:POR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nucklavee.txt b/res/cardsfolder/n/nucklavee.txt
index b5a2f459ac8..1d59fa51920 100644
--- a/res/cardsfolder/n/nucklavee.txt
+++ b/res/cardsfolder/n/nucklavee.txt
@@ -6,8 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigChangeZoneRed:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Sorcery.Red+YouCtrl
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZoneBlue | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target blue instant card from your graveyard to your hand.
 SVar:TrigChangeZoneBlue:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Instant.Blue+YouCtrl
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nucklavee.jpg
-SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/214.jpg
-SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/110.jpg
 Oracle:When Nucklavee enters the battlefield, you may return target red sorcery card from your graveyard to your hand.\nWhen Nucklavee enters the battlefield, you may return target blue instant card from your graveyard to your hand.
+SetInfo:COM Uncommon
+SetInfo:EVE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nuisance_engine.txt b/res/cardsfolder/n/nuisance_engine.txt
index 6b8c3ca9bc6..20fae3d82c3 100644
--- a/res/cardsfolder/n/nuisance_engine.txt
+++ b/res/cardsfolder/n/nuisance_engine.txt
@@ -2,7 +2,7 @@ Name:Nuisance Engine
 ManaCost:3
 Types:Artifact
 A:AB$ Token | Cost$ 2 T | TokenAmount$ 1 | TokenName$ Pest | TokenTypes$ Artifact,Creature,Pest | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenOwner$ You | SpellDescription$ Put a 0/1 colorless Pest artifact creature token onto the battlefield.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nuisance_engine.jpg
-SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/221.jpg
 Oracle:{2}, {T}: Put a 0/1 colorless Pest artifact creature token onto the battlefield.
+SetInfo:MRD Uncommon
+SetInfo:HOP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/null_brooch.txt b/res/cardsfolder/n/null_brooch.txt
index 0f21bdac66b..618da1d6201 100644
--- a/res/cardsfolder/n/null_brooch.txt
+++ b/res/cardsfolder/n/null_brooch.txt
@@ -3,7 +3,6 @@ ManaCost:4
 Types:Artifact
 A:AB$ Counter | Cost$ 2 T Discard<0/Hand> | TargetType$ Spell | TgtPrompt$ Select target nonCreature spell | ValidTgts$ Card.nonCreature| SpellDescription$ Counter target noncreature spell.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/null_brooch.jpg
-SetInfo:EXO|Rare|http://magiccards.info/scans/en/ex/136.jpg
 Oracle:{2}, {T}, Discard your hand: Counter target noncreature spell.
+SetInfo:EXO Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/null_champion.txt b/res/cardsfolder/n/null_champion.txt
index 42c1e798b7f..c8df0554370 100644
--- a/res/cardsfolder/n/null_champion.txt
+++ b/res/cardsfolder/n/null_champion.txt
@@ -9,7 +9,6 @@ S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 7 | SetToughness$ 3 | AddAb
 SVar:Regen:AB$Regenerate | Cost$ B | SpellDescription$ Regenerate CARDNAME.
 SVar:X:Count$Valid Card.Self+counters_GE1_LEVEL+counters_LE3_LEVEL
 SVar:Y:Count$Valid Card.Self+counters_GE4_LEVEL
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/null_champion.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/121.jpg
 Oracle:Level up {3} ({3}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-3\n4/2\nLEVEL 4+\n7/3\n{B}: Regenerate Null Champion.
+SetInfo:ROE Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/null_profusion.txt b/res/cardsfolder/n/null_profusion.txt
index e70492a9644..356a9997d77 100644
--- a/res/cardsfolder/n/null_profusion.txt
+++ b/res/cardsfolder/n/null_profusion.txt
@@ -7,7 +7,6 @@ T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | TriggerZones$
 T:Mode$ LandPlayed | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | Secondary$ True | TriggerDescription$ Whenever you play a card, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/null_profusion.jpg
-SetInfo:PLC|Rare|http://magiccards.info/scans/en/pc/89.jpg
 Oracle:Skip your draw step.\nWhenever you play a card, draw a card.\nYour maximum hand size is two.
+SetInfo:PLC Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/null_rod.txt b/res/cardsfolder/n/null_rod.txt
index 246d516e9ca..328679d60a9 100644
--- a/res/cardsfolder/n/null_rod.txt
+++ b/res/cardsfolder/n/null_rod.txt
@@ -3,7 +3,6 @@ ManaCost:2
 Types:Artifact
 S:Mode$ Continuous | Affected$ Artifact | AddHiddenKeyword$ CARDNAME's activated abilities can't be activated. | Description$ Activated abilities of artifacts can't be activated.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/null_rod.jpg
-SetInfo:WTH|Rare|http://magiccards.info/scans/en/wl/154.jpg
 Oracle:Activated abilities of artifacts can't be activated.
+SetInfo:WTH Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nullmage_advocate.txt b/res/cardsfolder/n/nullmage_advocate.txt
index b13ddcd460a..880689acc01 100644
--- a/res/cardsfolder/n/nullmage_advocate.txt
+++ b/res/cardsfolder/n/nullmage_advocate.txt
@@ -5,8 +5,7 @@ PT:2/3
 A:AB$ ChangeZone | Cost$ T | ValidTgts$ Card.OppOwn | TargetMin$ 2 | TargetMax$ 2 | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBDestroy | SpellDescription$ Return two target cards from an opponent's graveyard to his or her hand. Destroy target artifact or enchantment.
 SVar:DBDestroy:DB$Destroy | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nullmage_advocate.jpg
-SetInfo:PC2|Common|http://magiccards.info/scans/en/pc2/70.jpg
-SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/126.jpg
 Oracle:{T}: Return two target cards from an opponent's graveyard to his or her hand. Destroy target artifact or enchantment.
+SetInfo:PC2 Common
+SetInfo:JUD Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nullmage_shepherd.txt b/res/cardsfolder/n/nullmage_shepherd.txt
index 7d52d8a9beb..5f63338de58 100644
--- a/res/cardsfolder/n/nullmage_shepherd.txt
+++ b/res/cardsfolder/n/nullmage_shepherd.txt
@@ -4,7 +4,6 @@ Types:Creature Elf Shaman
 PT:2/4
 A:AB$ Destroy | Cost$ tapXType<4/Creature> | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nullmage_shepherd.jpg
-SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/174.jpg
 Oracle:Tap four untapped creatures you control: Destroy target artifact or enchantment.
+SetInfo:RAV Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nulltread_gargantuan.txt b/res/cardsfolder/n/nulltread_gargantuan.txt
index b5e20400061..2397f68091a 100644
--- a/res/cardsfolder/n/nulltread_gargantuan.txt
+++ b/res/cardsfolder/n/nulltread_gargantuan.txt
@@ -5,7 +5,6 @@ PT:5/6
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, put a creature you control on top of its owner's library.
 SVar:TrigChange:DB$ChangeZone | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | Hidden$ True | ChangeType$ Creature.YouCtrl | Mandatory$ True
 SVar:NeedsToPlay:Creature.cmcLE2+YouCtrl
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nulltread_gargantuan.jpg
-SetInfo:ARB|Uncommon|http://magiccards.info/scans/en/arb/102.jpg
 Oracle:When Nulltread Gargantuan enters the battlefield, put a creature you control on top of its owner's library.
+SetInfo:ARB Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/numai_outcast.txt b/res/cardsfolder/n/numai_outcast.txt
index 85a3c2b0020..815ea03a99c 100644
--- a/res/cardsfolder/n/numai_outcast.txt
+++ b/res/cardsfolder/n/numai_outcast.txt
@@ -5,7 +5,6 @@ PT:1/1
 K:Bushido 2
 A:AB$ Regenerate | Cost$ B PayLife<5> | SpellDescription$ Regenerate CARDNAME.
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/numai_outcast.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/134.jpg
 Oracle:Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)\n{B}, Pay 5 life: Regenerate Numai Outcast.
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/numbing_dose.txt b/res/cardsfolder/n/numbing_dose.txt
index 4f60f0a83e7..d1e776a1e46 100644
--- a/res/cardsfolder/n/numbing_dose.txt
+++ b/res/cardsfolder/n/numbing_dose.txt
@@ -6,7 +6,6 @@ A:SP$ Attach | Cost$ 3 U U | ValidTgts$ Artifact,Creature | TgtPrompt$ Select ta
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Enchanted permanent doesn't untap during its controller's untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of the upkeep of enchanted permanent's controller, that player loses 1 life.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/numbing_dose.jpg
-SetInfo:NPH|Common|http://magiccards.info/scans/en/nph/40.jpg
 Oracle:Enchant artifact or creature\nEnchanted permanent doesn't untap during its controller's untap step.\nAt the beginning of the upkeep of enchanted permanent's controller, that player loses 1 life.
+SetInfo:NPH Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/numot_the_devastator.txt b/res/cardsfolder/n/numot_the_devastator.txt
index d705afb2a33..35a1012237b 100644
--- a/res/cardsfolder/n/numot_the_devastator.txt
+++ b/res/cardsfolder/n/numot_the_devastator.txt
@@ -5,8 +5,7 @@ PT:6/6
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay 2 R. If you do, destroy up to two target lands.
 SVar:TrigDestroy:AB$ Destroy | Cost$ 2 R | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target land
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/numot_the_devastator.jpg
-SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/215.jpg
-SetInfo:PLC|Rare|http://magiccards.info/scans/en/pc/160.jpg
 Oracle:Flying\nWhenever Numot, the Devastator deals combat damage to a player, you may pay {2}{R}. If you do, destroy up to two target lands.
+SetInfo:COM Rare
+SetInfo:PLC Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nurturer_initiate.txt b/res/cardsfolder/n/nurturer_initiate.txt
index db3a1fdd876..a59238bd6a7 100644
--- a/res/cardsfolder/n/nurturer_initiate.txt
+++ b/res/cardsfolder/n/nurturer_initiate.txt
@@ -4,7 +4,6 @@ Types:Creature Elf Shaman
 PT:1/1
 T:Mode$ SpellCast | ValidCard$ Card.Green | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a player casts a green spell, you may pay 1. If you do, target creature gets +1/+1 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nurturer_initiate.jpg
-SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/124.jpg
 Oracle:Whenever a player casts a green spell, you may pay {1}. If you do, target creature gets +1/+1 until end of turn.
+SetInfo:SHM Common
\ No newline at end of file
diff --git a/res/cardsfolder/n/nurturing_licid.txt b/res/cardsfolder/n/nurturing_licid.txt
index 028cdd86737..fec15deb1c4 100644
--- a/res/cardsfolder/n/nurturing_licid.txt
+++ b/res/cardsfolder/n/nurturing_licid.txt
@@ -7,9 +7,7 @@ SVar:DBAttach:DB$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
 #If the value of AlternateMode isn't Flip or DoubleFaced, it will be the name of the state defined below, so you can switch to it with SetState+NewState$.The name of the first state defined is always "Original".
 AlternateMode:Licid
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nurturing_licid.jpg
-SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/136.jpg
 Oracle:{G}, {T}: Nurturing Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {G} to end this effect./n{G}: Regenerate enchanted creature.
 
 ALTERNATE
@@ -24,7 +22,6 @@ A:SP$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
 A:AB$ Regenerate | Cost$ G | Defined$ Enchanted | SpellDescription$ Regenerate enchanted creature.
 A:AB$ SetState | Cost$ G | Defined$ Self | NewState$ Original | SpellDescription$ End this effect.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nurturing_licid.jpg
-SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/136.jpg
 Oracle:{G}, {T}: Nurturing Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {G} to end this effect./n{G}: Regenerate enchanted creature.
+SetInfo:TMP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/n/nut_collector.txt b/res/cardsfolder/n/nut_collector.txt
index 7e3a03683e4..8468ff8ead4 100644
--- a/res/cardsfolder/n/nut_collector.txt
+++ b/res/cardsfolder/n/nut_collector.txt
@@ -5,7 +5,6 @@ PT:1/1
 S:Mode$ Continuous | Affected$ Creature.Squirrel | AddPower$ 2 | AddToughness$ 2 | Condition$ Threshold | Description$ Threshold - Squirrel creatures get +2/+2 as long as seven or more cards are in your graveyard.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, you may put a 1/1 green Squirrel creature token onto the battlefield.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nut_collector.jpg
-SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/259.jpg
 Oracle:At the beginning of your upkeep, you may put a 1/1 green Squirrel creature token onto the battlefield.\nThreshold - Squirrel creatures get +2/+2 as long as seven or more cards are in your graveyard.
+SetInfo:ODY Rare
\ No newline at end of file
diff --git a/res/cardsfolder/n/nyxathid.txt b/res/cardsfolder/n/nyxathid.txt
index 43ca8c77ea1..b41e414cb33 100644
--- a/res/cardsfolder/n/nyxathid.txt
+++ b/res/cardsfolder/n/nyxathid.txt
@@ -8,7 +8,6 @@ S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Refer
 SVar:X:Count$InChosenHand/Negative
 SVar:NeedsToPlayVar:Y LE5
 SVar:Y:Count$InChosenHand
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nyxathid.jpg
-SetInfo:CFX|Rare|http://magiccards.info/scans/en/cfx/49.jpg
 Oracle:As Nyxathid enters the battlefield, choose an opponent.\nNyxathid gets -1/-1 for each card in the chosen player's hand.
+SetInfo:CFX Rare
\ No newline at end of file