diff --git a/res/cardsfolder/o/oak_street_innkeeper.txt b/res/cardsfolder/o/oak_street_innkeeper.txt
index e93051d4424..251a895ecd7 100644
--- a/res/cardsfolder/o/oak_street_innkeeper.txt
+++ b/res/cardsfolder/o/oak_street_innkeeper.txt
@@ -3,7 +3,6 @@ ManaCost:2 G
 Types:Creature Elf
 PT:1/2
 S:Mode$ Continuous | Affected$ Creature.tapped+YouCtrl | AddKeyword$ Hexproof | Condition$ NotPlayerTurn | Description$ As long as it's not your turn, tapped creatures you control have hexproof.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oak_street_innkeeper.jpg
-SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/131.jpg
 Oracle:As long as it's not your turn, tapped creatures you control have hexproof.
+SetInfo:RTR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/oaken_brawler.txt b/res/cardsfolder/o/oaken_brawler.txt
index e7795dada74..486bb546252 100644
--- a/res/cardsfolder/o/oaken_brawler.txt
+++ b/res/cardsfolder/o/oaken_brawler.txt
@@ -5,7 +5,6 @@ PT:2/4
 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/oaken_brawler.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/33.jpg
 Oracle:When Oaken Brawler enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Oaken Brawler. (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/o/oakenform.txt b/res/cardsfolder/o/oakenform.txt
index 2ae59b2bafc..f05792fcf7b 100644
--- a/res/cardsfolder/o/oakenform.txt
+++ b/res/cardsfolder/o/oakenform.txt
@@ -4,7 +4,6 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | Description$ Enchanted creature gets +3/+3.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oakenform.jpg
-SetInfo:M10|Common|http://magiccards.info/scans/en/m10/197.jpg
 Oracle:Enchant creature\nEnchanted creature gets +3/+3.
+SetInfo:M10 Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oakgnarl_warrior.txt b/res/cardsfolder/o/oakgnarl_warrior.txt
index 93045460d30..57260f1d771 100644
--- a/res/cardsfolder/o/oakgnarl_warrior.txt
+++ b/res/cardsfolder/o/oakgnarl_warrior.txt
@@ -4,7 +4,6 @@ Types:Creature Treefolk Warrior
 PT:5/7
 K:Vigilance
 K:Trample
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/lrw/en/card139494.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/232.jpg
 Oracle:Vigilance, trample
+SetInfo:LRW Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oasis.txt b/res/cardsfolder/o/oasis.txt
index 614b40ed69c..910ed65b0c7 100644
--- a/res/cardsfolder/o/oasis.txt
+++ b/res/cardsfolder/o/oasis.txt
@@ -2,8 +2,7 @@ Name:Oasis
 ManaCost:no cost
 Types:Land
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature | Amount$ 1 | TgtPrompt$ Select target creature | SpellDescription$ Prevent the next 1 damage that would be dealt to target creature this turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oasis.jpg
-SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/185.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/92.jpg
 Oracle:{T}: Prevent the next 1 damage that would be dealt to target creature this turn.
+SetInfo:4ED Uncommon
+SetInfo:ARN Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/oath_of_druids.txt b/res/cardsfolder/o/oath_of_druids.txt
index ea20dc23eb2..42a5b1e1682 100644
--- a/res/cardsfolder/o/oath_of_druids.txt
+++ b/res/cardsfolder/o/oath_of_druids.txt
@@ -2,7 +2,6 @@ Name:Oath of Druids
 ManaCost:1 G
 Types:Enchantment
 Text:At the beginning of each player's upkeep, that player chooses target player who controls more creatures than he or she does and is his or her opponent. The first player may reveal cards from the top of his or her library until he or she reveals a creature card. If he or she does, that player puts that card onto the battlefield and all other cards revealed this way into his or her graveyard.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oath_of_druids.jpg
-SetInfo:EXO|Rare|http://magiccards.info/scans/en/ex/115.jpg
 Oracle:At the beginning of each player's upkeep, that player chooses target player who controls more creatures than he or she does and is his or her opponent. The first player may reveal cards from the top of his or her library until he or she reveals a creature card. If he or she does, that player puts that card onto the battlefield and all other cards revealed this way into his or her graveyard.
+SetInfo:EXO Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oath_of_ghouls.txt b/res/cardsfolder/o/oath_of_ghouls.txt
index 9dfe05e8466..a18f027558a 100644
--- a/res/cardsfolder/o/oath_of_ghouls.txt
+++ b/res/cardsfolder/o/oath_of_ghouls.txt
@@ -2,7 +2,6 @@ Name:Oath of Ghouls
 ManaCost:1 B
 Types:Enchantment
 Text:At the beginning of each player's upkeep, that player chooses target player whose graveyard has fewer creature cards in it than his or her graveyard does and is his or her opponent. The first player may return a creature card from his or her graveyard to his or her hand.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oath_of_ghouls.jpg
-SetInfo:EXO|Rare|http://magiccards.info/scans/en/ex/69.jpg
 Oracle:At the beginning of each player's upkeep, that player chooses target player whose graveyard has fewer creature cards in it than his or her graveyard does and is his or her opponent. The first player may return a creature card from his or her graveyard to his or her hand.
+SetInfo:EXO Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oath_of_lim_dul.txt b/res/cardsfolder/o/oath_of_lim_dul.txt
index 7ac50c115e2..b93bbb92eef 100644
--- a/res/cardsfolder/o/oath_of_lim_dul.txt
+++ b/res/cardsfolder/o/oath_of_lim_dul.txt
@@ -7,7 +7,6 @@ SVar:DBSac:DB$ Sacrifice | SacValid$ Permanent.Other | Amount$ 1 | UnlessCost$ D
 A:AB$ Draw | Cost$ B B | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:X:TriggerCount$LifeAmount
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oath_of_lim_dul.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/44.jpg
 Oracle:Whenever you lose life, for each 1 life you lost, sacrifice a permanent other than Oath of Lim-Dul unless you discard a card. (Damage dealt to you causes you to lose life.)\n{B}{B}: Draw a card.
+SetInfo:ICE Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oathsworn_giant.txt b/res/cardsfolder/o/oathsworn_giant.txt
index 3ff6e04375f..d7bc5725e46 100644
--- a/res/cardsfolder/o/oathsworn_giant.txt
+++ b/res/cardsfolder/o/oathsworn_giant.txt
@@ -5,7 +5,6 @@ PT:3/4
 K:Vigilance
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddToughness$ 2 | AddKeyword$ Vigilance | Description$ Other creatures you control get +0/+2 and have vigilance.
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oathsworn_giant.jpg
-SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/27.jpg
 Oracle:Vigilance\nOther creatures you control get +0/+2 and have vigilance.
+SetInfo:RAV Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ob_nixilis_the_fallen.txt b/res/cardsfolder/o/ob_nixilis_the_fallen.txt
index 5f69c575cf1..e7ef005a5ed 100644
--- a/res/cardsfolder/o/ob_nixilis_the_fallen.txt
+++ b/res/cardsfolder/o/ob_nixilis_the_fallen.txt
@@ -6,7 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.Y
 SVar:TrigLose:AB$LoseLife | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 3 | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 3
 SVar:BuffedBy:Land
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ob_nixilis_the_fallen.jpg
-SetInfo:ZEN|Mythic|http://magiccards.info/scans/en/zen/107.jpg
 Oracle:Landfall - Whenever a land enters the battlefield under your control, you may have target player lose 3 life. If you do, put three +1/+1 counters on Ob Nixilis, the Fallen.
+SetInfo:ZEN Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/o/obelisk_of_alara.txt b/res/cardsfolder/o/obelisk_of_alara.txt
index 6dede645c1d..a932677868a 100644
--- a/res/cardsfolder/o/obelisk_of_alara.txt
+++ b/res/cardsfolder/o/obelisk_of_alara.txt
@@ -7,7 +7,6 @@ SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 A:AB$ Pump | Cost$ 1 B T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.
 A:AB$ DealDamage | Cost$ 1 R T | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target player.
 A:AB$ Pump | Cost$ 1 G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +4 | NumDef$ +4 | SpellDescription$ Target creature gets +4/+4 until end of turn.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_alara.jpg
-SetInfo:CFX|Rare|http://magiccards.info/scans/en/cfx/140.jpg
 Oracle:{1}{W}, {T}: You gain 5 life.\n{1}{U}, {T}: Draw a card, then discard a card.\n{1}{B}, {T}: Target creature gets -2/-2 until end of turn.\n{1}{R}, {T}: Obelisk of Alara deals 3 damage to target player.\n{1}{G}, {T}: Target creature gets +4/+4 until end of turn.
+SetInfo:CFX Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/obelisk_of_bant.txt b/res/cardsfolder/o/obelisk_of_bant.txt
index 57a9491225b..b14dec1c358 100644
--- a/res/cardsfolder/o/obelisk_of_bant.txt
+++ b/res/cardsfolder/o/obelisk_of_bant.txt
@@ -4,7 +4,6 @@ Types:Artifact
 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.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_bant.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/212.jpg
 Oracle:{T}: Add {G}, {W}, or {U} to your mana pool.
+SetInfo:ALA Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/obelisk_of_esper.txt b/res/cardsfolder/o/obelisk_of_esper.txt
index af3763e6965..bfad7b70795 100644
--- a/res/cardsfolder/o/obelisk_of_esper.txt
+++ b/res/cardsfolder/o/obelisk_of_esper.txt
@@ -4,7 +4,7 @@ Types:Artifact
 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$ B | SpellDescription$ Add B to your mana pool.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_esper.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/213.jpg
 Oracle:{T}: Add {W}, {U}, or {B} to your mana pool.
+SetInfo:ARC Common
+SetInfo:ALA Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/obelisk_of_grixis.txt b/res/cardsfolder/o/obelisk_of_grixis.txt
index 151dd24ba4b..c4f2ae0ed0a 100644
--- a/res/cardsfolder/o/obelisk_of_grixis.txt
+++ b/res/cardsfolder/o/obelisk_of_grixis.txt
@@ -4,7 +4,7 @@ Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_grixis.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/214.jpg
 Oracle:{T}: Add {U}, {B}, or {R} to your mana pool.
+SetInfo:DDH Common
+SetInfo:ALA Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/obelisk_of_jund.txt b/res/cardsfolder/o/obelisk_of_jund.txt
index 252f3f6a950..5617a4bb4ed 100644
--- a/res/cardsfolder/o/obelisk_of_jund.txt
+++ b/res/cardsfolder/o/obelisk_of_jund.txt
@@ -4,7 +4,6 @@ Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_jund.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/215.jpg
 Oracle:{T}: Add {B}, {R}, or {G} to your mana pool.
+SetInfo:ALA Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/obelisk_of_naya.txt b/res/cardsfolder/o/obelisk_of_naya.txt
index 9e08f6ea354..1ffb8d55ada 100644
--- a/res/cardsfolder/o/obelisk_of_naya.txt
+++ b/res/cardsfolder/o/obelisk_of_naya.txt
@@ -4,7 +4,6 @@ Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_naya.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/216.jpg
 Oracle:{T}: Add {R}, {G}, or {W} to your mana pool.
+SetInfo:ALA Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/obelisk_of_undoing.txt b/res/cardsfolder/o/obelisk_of_undoing.txt
index 0302b2bf5cc..a5fc6cb2fea 100644
--- a/res/cardsfolder/o/obelisk_of_undoing.txt
+++ b/res/cardsfolder/o/obelisk_of_undoing.txt
@@ -2,9 +2,8 @@ Name:Obelisk of Undoing
 ManaCost:1
 Types:Artifact
 A:AB$ ChangeZone | Cost$ 6 T | ValidTgts$ Permanent.YouCtrl+YouOwn | TgtPrompt$ Select target permanent you both own and control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target permanent you both own and control to your hand.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_undoing.jpg
 Oracle:{6}, {T}: Return target permanent you both own and control to your hand.
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/392.jpg
-SetInfo:CHR|Rare|http://magiccards.info/scans/en/ch/84.jpg
-SetInfo:ATQ|Rare|http://magiccards.info/scans/en/aq/23.jpg
+SetInfo:ATQ Rare
+SetInfo:5ED Rare
+SetInfo:CHR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oblation.txt b/res/cardsfolder/o/oblation.txt
index f06db9fe490..d85056c726a 100644
--- a/res/cardsfolder/o/oblation.txt
+++ b/res/cardsfolder/o/oblation.txt
@@ -3,8 +3,7 @@ ManaCost:2 W
 Types:Instant
 A:SP$ ChangeZone | Cost$ 2 W | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SubAbility$ DBDraw| SpellDescription$ The owner of target nonland permanent shuffles it into his or her library, then draws two cards.
 SVar:DBDraw:DB$ Draw | Defined$ TargetedOwner | NumCards$ 2
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oblation.jpg
-SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/46.jpg
-SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/22.jpg
 Oracle:The owner of target nonland permanent shuffles it into his or her library, then draws two cards.
+SetInfo:ONS Rare
+SetInfo:COM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/obliterate.txt b/res/cardsfolder/o/obliterate.txt
index 5026238c5f8..d1590f34477 100644
--- a/res/cardsfolder/o/obliterate.txt
+++ b/res/cardsfolder/o/obliterate.txt
@@ -3,8 +3,7 @@ ManaCost:6 R R
 Types:Sorcery
 A:SP$ DestroyAll | Cost$ 6 R R | ValidCards$ Artifact,Creature,Land | NoRegen$ True | SpellDescription$ Destroy all artifacts, creatures, and lands. They can't be regenerated.
 K:CARDNAME can't be countered.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obliterate.jpg
-SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/204.jpg
-SetInfo:INV|Rare|http://magiccards.info/scans/en/in/156.jpg
 Oracle:Obliterate can't be countered.\nDestroy all artifacts, creatures, and lands. They can't be regenerated.
+SetInfo:8ED Rare
+SetInfo:INV Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oblivion_crown.txt b/res/cardsfolder/o/oblivion_crown.txt
index 5cc23b9d71b..c4ec713bc5c 100644
--- a/res/cardsfolder/o/oblivion_crown.txt
+++ b/res/cardsfolder/o/oblivion_crown.txt
@@ -7,7 +7,6 @@ A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Pump | Description$ Enchanted creature has "Discard a card: This creature gets +1/+1 until end of turn."
 SVar:Pump:AB$ Pump | Cost$ Discard<1/Card> | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oblivion_crown.jpg
-SetInfo:FUT|Common|http://magiccards.info/scans/en/fut/73.jpg
 Oracle:Flash (You may cast this spell any time you could cast an instant.)\nEnchant creature\nEnchanted creature has "Discard a card: This creature gets +1/+1 until end of turn."
+SetInfo:FUT Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oblivion_ring.txt b/res/cardsfolder/o/oblivion_ring.txt
index b5c079a8fc1..8dd9a52370a 100644
--- a/res/cardsfolder/o/oblivion_ring.txt
+++ b/res/cardsfolder/o/oblivion_ring.txt
@@ -6,11 +6,14 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.S
 SVar:TrigExile:DB$ ChangeZone | Cost$ 0 | TargetMin$ 1 | IsCurse$ True | ValidTgts$ Permanent.nonLand+Other | TgtPrompt$ Choose target nonland permanent other than Oblivion Ring | RememberTargets$ True | ForgetOtherTargets$ True | Origin$ Battlefield | Destination$ Exile
 SVar:TrigReturn:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
 SVar:PlayMain1:TRUE
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/lrw/en/card139414.jpg
-SetInfo:M13|Uncommon|http://magiccards.info/scans/en/m13/22.jpg
-SetInfo:M12|Uncommon|http://magiccards.info/scans/en/m12/27.jpg
-SetInfo:COM|Common|http://magiccards.info/scans/en/cmd/23.jpg
-SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/34.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/20.jpg
 Oracle:When Oblivion Ring enters the battlefield, exile another target nonland permanent.\nWhen Oblivion Ring leaves the battlefield, return the exiled card to the battlefield under its owner's control.
+SetInfo:LRW Common
+SetInfo:COM Common
+SetInfo:M13 Uncommon
+SetInfo:ALA Common
+SetInfo:DDI Uncommon
+SetInfo:ARC Common
+SetInfo:HOP Common
+SetInfo:M12 Uncommon
+SetInfo:DDG Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oblivion_stone.txt b/res/cardsfolder/o/oblivion_stone.txt
index f588d7cc25e..0b93bad097d 100644
--- a/res/cardsfolder/o/oblivion_stone.txt
+++ b/res/cardsfolder/o/oblivion_stone.txt
@@ -5,8 +5,7 @@ A:AB$ PutCounter | Cost$ 4 T | ValidTgts$ Permanent | TgtPrompt$ Select target p
 A:AB$ DestroyAll | Cost$ 5 T Sac<1/CARDNAME> | ValidCards$ Permanent.nonLand+counters_LT1_FATE | SubAbility$ DBRemove | SpellDescription$ Destroy each nonland permanent without a fate counter on it, then remove all fate counters from all permanents.
 SVar:DBRemove:DB$ RemoveCounterAll | Cost$ 0 | ValidCards$ Permanent | CounterType$ FATE | AllCounters$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oblivion_stone.jpg
-SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/222.jpg
-SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/254.jpg
 Oracle:{4}, {T}: Put a fate counter on target permanent.\n{5}, {T}, Sacrifice Oblivion Stone: Destroy each nonland permanent without a fate counter on it, then remove all fate counters from all permanents.
+SetInfo:MRD Rare
+SetInfo:COM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oboro_breezecaller.txt b/res/cardsfolder/o/oboro_breezecaller.txt
index 56a89af0128..836338591e2 100644
--- a/res/cardsfolder/o/oboro_breezecaller.txt
+++ b/res/cardsfolder/o/oboro_breezecaller.txt
@@ -5,7 +5,6 @@ PT:1/1
 K:Flying
 A:AB$ Untap | Cost$ 2 Return<1/Land> | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Untap target land.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oboro_breezecaller.jpg
-SetInfo:SOK|Common|http://magiccards.info/scans/en/sok/48.jpg
 Oracle:Flying\n{2}, Return a land you control to its owner's hand: Untap target land.
+SetInfo:SOK Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oboro_envoy.txt b/res/cardsfolder/o/oboro_envoy.txt
index dd5abe54089..f9d3f409e71 100644
--- a/res/cardsfolder/o/oboro_envoy.txt
+++ b/res/cardsfolder/o/oboro_envoy.txt
@@ -6,7 +6,6 @@ K:Flying
 A:AB$ Pump | Cost$ 2 Return<1/Land> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -X | References$ X | IsCurse$ True | SpellDescription$ Target creature gets -X/-0 until end of turn, where X is the number of cards in your hand.
 SVar:X:Count$InYourHand
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oboro_envoy.jpg
-SetInfo:SOK|Uncommon|http://magiccards.info/scans/en/sok/49.jpg
 Oracle:Flying\n{2}, Return a land you control to its owner's hand: Target creature gets -X/-0 until end of turn, where X is the number of cards in your hand.
+SetInfo:SOK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/oboro_palace_in_the_clouds.txt b/res/cardsfolder/o/oboro_palace_in_the_clouds.txt
index e9c99324361..676f97c82cd 100644
--- a/res/cardsfolder/o/oboro_palace_in_the_clouds.txt
+++ b/res/cardsfolder/o/oboro_palace_in_the_clouds.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Legendary Land
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
 A:AB$ ChangeZone | Cost$ 1 | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oboro_palace_in_the_clouds.jpg
-SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/164.jpg
 Oracle:{T}: Add {U} to your mana pool.\n{1}: Return Oboro, Palace in the Clouds to its owner's hand.
+SetInfo:SOK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/obsessive_search.txt b/res/cardsfolder/o/obsessive_search.txt
index cf09495ab12..4fdcbf33cad 100644
--- a/res/cardsfolder/o/obsessive_search.txt
+++ b/res/cardsfolder/o/obsessive_search.txt
@@ -3,7 +3,6 @@ ManaCost:U
 Types:Instant
 A:SP$ Draw | Cost$ U | NumCards$ 1 | SpellDescription$ Draw a card.
 K:Madness:U
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obsessive_search.jpg
-SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/43.jpg
 Oracle:Draw a card.\nMadness {U} (If you discard this card, you may cast it for its madness cost instead of putting it into your graveyard.)
+SetInfo:TOR Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/obsianus_golem.txt b/res/cardsfolder/o/obsianus_golem.txt
index a75e966b5cb..5628312335b 100644
--- a/res/cardsfolder/o/obsianus_golem.txt
+++ b/res/cardsfolder/o/obsianus_golem.txt
@@ -2,12 +2,12 @@ Name:Obsianus Golem
 ManaCost:6
 Types:Artifact Creature Golem
 PT:4/6
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/6e/en-us/card15401.jpg
-SetInfo:LEA|Uncommon|http://magiccards.info/scans/en/al/267.jpg
-SetInfo:LEB|Uncommon|http://magiccards.info/scans/en/be/269.jpg
-SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/357.jpg
-SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/302.jpg
-SetInfo:3ED|Uncommon|http://magiccards.info/scans/en/rv/268.jpg
-SetInfo:2ED|Uncommon|http://magiccards.info/scans/en/un/268.jpg
 Oracle:
+SetInfo:2ED Uncommon
+SetInfo:6ED Uncommon
+SetInfo:S00 Uncommon
+SetInfo:LEB Uncommon
+SetInfo:LEA Uncommon
+SetInfo:4ED Uncommon
+SetInfo:3ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/obsidian_acolyte.txt b/res/cardsfolder/o/obsidian_acolyte.txt
index e2f7ddf40e6..748b91314b5 100644
--- a/res/cardsfolder/o/obsidian_acolyte.txt
+++ b/res/cardsfolder/o/obsidian_acolyte.txt
@@ -4,7 +4,6 @@ Types:Creature Human Cleric
 PT:1/1
 K:Protection from black
 A:AB$ Protection | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Gains$ black | SpellDescription$ Target creature gains protection from black until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obsidian_acolyte.jpg
-SetInfo:INV|Common|http://magiccards.info/scans/en/in/22.jpg
 Oracle:Protection from black\n{W}: Target creature gains protection from black until end of turn.
+SetInfo:INV Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/obsidian_battle_axe.txt b/res/cardsfolder/o/obsidian_battle_axe.txt
index e55e833d0fd..452dd969431 100644
--- a/res/cardsfolder/o/obsidian_battle_axe.txt
+++ b/res/cardsfolder/o/obsidian_battle_axe.txt
@@ -6,7 +6,6 @@ S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Warrior | TriggerZones$ Battlefield | Execute$ TrigAttach | OptionalDecider$ You | TriggerDescription$ Whenever a Warrior creature enters the battlefield, you may attach CARDNAME to it.
 SVar:TrigAttach:DB$ Attach | Cost$ 0 | Defined$ TriggeredCard
 SVar:BuffedBy:Creature.Warrior
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obsidian_battle_axe.jpg
-SetInfo:MOR|Uncommon|http://magiccards.info/scans/en/mt/144.jpg
 Oracle:Equipped creature gets +2/+1 and has haste.\nWhenever a Warrior creature enters the battlefield, you may attach Obsidian Battle-Axe to it.\nEquip {3}
+SetInfo:MOR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/obsidian_fireheart.txt b/res/cardsfolder/o/obsidian_fireheart.txt
index e15b83ff8cd..9fa1445f04d 100644
--- a/res/cardsfolder/o/obsidian_fireheart.txt
+++ b/res/cardsfolder/o/obsidian_fireheart.txt
@@ -3,7 +3,6 @@ ManaCost:1 R R R
 Types:Creature Elemental
 PT:4/4
 A:AB$ PutCounter | Cost$ 1 R R | IsCurse$ True | ValidTgts$ Land.counters_EQ0_BLAZE | TgtPrompt$ Select target Land without a Blaze Counter | CounterType$ BLAZE | CounterNum$ 1 | SpellDescription$ Put a blaze counter on target land without a blaze counter on it. For as long as that land has a blaze counter on it, it has "At the beginning of your upkeep, this land deals 1 damage to you." (The land continues to burn after Obsidian Fireheart has left the battlefield.)
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obsidian_fireheart.jpg
-SetInfo:ZEN|Mythic|http://magiccards.info/scans/en/zen/140.jpg
 Oracle:{1}{R}{R}: Put a blaze counter on target land without a blaze counter on it. For as long as that land has a blaze counter on it, it has "At the beginning of your upkeep, this land deals 1 damage to you." (The land continues to burn after Obsidian Fireheart has left the battlefield.)
+SetInfo:ZEN Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/o/obsidian_giant.txt b/res/cardsfolder/o/obsidian_giant.txt
index 136e97f749b..cf963601934 100644
--- a/res/cardsfolder/o/obsidian_giant.txt
+++ b/res/cardsfolder/o/obsidian_giant.txt
@@ -2,7 +2,6 @@ Name:Obsidian Giant
 ManaCost:4 R
 Types:Creature Giant
 PT:4/4
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/p2/en-us/card6599.jpg
-SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/109.jpg
 Oracle:
+SetInfo:PO2 Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/obstinate_baloth.txt b/res/cardsfolder/o/obstinate_baloth.txt
index 58d252ee369..99077682116 100644
--- a/res/cardsfolder/o/obstinate_baloth.txt
+++ b/res/cardsfolder/o/obstinate_baloth.txt
@@ -7,7 +7,6 @@ SVar:TrigGainLife:AB$GainLife | Cost$ 0 | LifeAmount$ 4
 R:Event$ Discard | ActiveZones$ Hand | ValidCard$ Card.Self | ValidSource$ Card.OppCtrl | ReplaceWith$ SurpriseETB | DiscardFromEffect$ True | Description$ If a spell or ability an opponent controls causes you to discard CARDNAME, put it onto the battlefield instead of putting it into your graveyard.
 SVar:SurpriseETB:DB$ ChangeZone | DefinedPlayer$ ReplacedPlayer | Defined$ ReplacedCard | Origin$ Hand | Destination$ Battlefield
 SVar:DiscardMeByOpp:2
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obstinate_baloth.jpg
-SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/188.jpg
 Oracle:When Obstinate Baloth enters the battlefield, you gain 4 life.\nIf a spell or ability an opponent controls causes you to discard Obstinate Baloth, put it onto the battlefield instead of putting it into your graveyard.
+SetInfo:M11 Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/obstinate_familiar.txt b/res/cardsfolder/o/obstinate_familiar.txt
index df9666f5730..3e3d04560ab 100644
--- a/res/cardsfolder/o/obstinate_familiar.txt
+++ b/res/cardsfolder/o/obstinate_familiar.txt
@@ -4,7 +4,6 @@ Types:Creature Lizard
 PT:1/1
 R:Event$ Draw | ActiveZones$ Battlefield | ValidPlayer$ You | Optional$ True | Prevent$ True | AICheckSVar$ AIHandling | AISVarCompare$ EQ0 | References$ AIHandling | Description$ If you would draw a card, you may skip that draw instead.
 SVar:AIHandling:Count$InYourLibrary
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obstinate_familiar.jpg
 Oracle:If you would draw a card, you may skip that draw instead.
-SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/210.jpg
+SetInfo:ODY Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/obzedat_ghost_council.txt b/res/cardsfolder/o/obzedat_ghost_council.txt
index 55c46687cb4..60787a6968e 100644
--- a/res/cardsfolder/o/obzedat_ghost_council.txt
+++ b/res/cardsfolder/o/obzedat_ghost_council.txt
@@ -12,7 +12,6 @@ SVar:TrigEOT:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ ObzedatRe
 SVar:ObzedatReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ ObzedatPump
 SVar:ObzedatPump:DB$ Pump | Defined$ Remembered | KW$ Haste | Permanent$ True | SubAbility$ ObzedatCleanup
 SVar:ObzedatCleanup:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obzedat_ghost_council.jpg
-SetInfo:GTC|Mythic|http://magiccards.info/scans/en/gtc/182.jpg
 Oracle:When Obzedat, Ghost Council enters the battlefield, target opponent loses 2 life and you gain 2 life.\nAt the beginning of your end step, you may exile Obzedat. If you do, return it to the battlefield under its owner's control at the beginning of your next upkeep. It gains haste.
+SetInfo:GTC Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/o/ocular_halo.txt b/res/cardsfolder/o/ocular_halo.txt
index 0a80b29da8a..ebd3eb7dc94 100644
--- a/res/cardsfolder/o/ocular_halo.txt
+++ b/res/cardsfolder/o/ocular_halo.txt
@@ -6,7 +6,6 @@ A:SP$ Attach | Cost$ 3 U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Draw | Description$ Enchanted creature has "Tap: Draw a card."
 A:AB$ Pump | Cost$ W | Defined$ Enchanted | KW$ Vigilance | SpellDescription$ Enchanted creature gains vigilance until end of turn.
 SVar:Draw:AB$Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ocular_halo.jpg
-SetInfo:DIS|Common|http://magiccards.info/scans/en/di/28.jpg
 Oracle:Enchant creature\nEnchanted creature has "{T}: Draw a card."\n{W}: Enchanted creature gains vigilance until end of turn.
+SetInfo:DIS Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oculus.txt b/res/cardsfolder/o/oculus.txt
index 1c2a6154b7b..e6ee9e35248 100644
--- a/res/cardsfolder/o/oculus.txt
+++ b/res/cardsfolder/o/oculus.txt
@@ -5,7 +5,6 @@ PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ TriggeredCardController | NumCards$ 1
 SVar:SacMe:1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oculus.jpg
-SetInfo:MBS|Common|http://magiccards.info/scans/en/mbs/29.jpg
 Oracle:When Oculus dies, you may draw a card.
+SetInfo:MBS Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/odious_trow.txt b/res/cardsfolder/o/odious_trow.txt
index 8d1076890fd..f751ae523bb 100644
--- a/res/cardsfolder/o/odious_trow.txt
+++ b/res/cardsfolder/o/odious_trow.txt
@@ -3,7 +3,6 @@ ManaCost:BG
 Types:Creature Troll
 PT:1/1
 A:AB$ Regenerate | Cost$ 1 BG | SpellDescription$ Regenerate CARDNAME.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/odious_trow.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/125.jpg
 Oracle:{1}{B/G}: Regenerate Odious Trow.
+SetInfo:EVE Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/odylic_wraith.txt b/res/cardsfolder/o/odylic_wraith.txt
index e8bc0e66faf..9b4e27e5b12 100644
--- a/res/cardsfolder/o/odylic_wraith.txt
+++ b/res/cardsfolder/o/odylic_wraith.txt
@@ -5,7 +5,6 @@ PT:2/2
 K:Swampwalk
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player  | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/odylic_wraith.jpg
-SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/19.jpg
 Oracle:Swampwalk\nWhenever Odylic Wraith deals damage to a player, that player discards a card.
+SetInfo:WTH Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/off_balance.txt b/res/cardsfolder/o/off_balance.txt
index fd89e2f4d2d..7acb3cb04a8 100644
--- a/res/cardsfolder/o/off_balance.txt
+++ b/res/cardsfolder/o/off_balance.txt
@@ -3,7 +3,6 @@ ManaCost:W
 Types:Instant
 A:SP$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't attack or block. | IsCurse$ True | SpellDescription$ Target creature can't attack or block this turn.
 SVar:PlayMain1:TRUE
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/off_balance.jpg
-SetInfo:NMS|Common|http://magiccards.info/scans/en/ne/15.jpg
 Oracle:Target creature can't attack or block this turn.
+SetInfo:NMS Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/offalsnout.txt b/res/cardsfolder/o/offalsnout.txt
index 082bba5a777..a41f5492749 100644
--- a/res/cardsfolder/o/offalsnout.txt
+++ b/res/cardsfolder/o/offalsnout.txt
@@ -9,7 +9,6 @@ K:Evoke:B
 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:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/offalsnout.jpg
-SetInfo:MOR|Uncommon|http://magiccards.info/scans/en/mt/71.jpg
 Oracle:Flash\nWhen Offalsnout leaves the battlefield, exile target card from a graveyard.\nEvoke {B} (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/o/offering_to_asha.txt b/res/cardsfolder/o/offering_to_asha.txt
index f76b94eba4b..25d4ff95fd7 100644
--- a/res/cardsfolder/o/offering_to_asha.txt
+++ b/res/cardsfolder/o/offering_to_asha.txt
@@ -3,7 +3,6 @@ ManaCost:2 W U
 Types:Instant
 A:SP$ Counter | Cost$ 2 W U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 4 | SubAbility$ DBGainLife | SpellDescription$ Counter target spell unless its controller pays 4. You gain 4 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 4
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/offering_to_asha.jpg
-SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/9.jpg
 Oracle:Counter target spell unless its controller pays {4}. You gain 4 life.
+SetInfo:ARB Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_arsonist.txt b/res/cardsfolder/o/ogre_arsonist.txt
index 3d871e2555d..3a901fb7c02 100644
--- a/res/cardsfolder/o/ogre_arsonist.txt
+++ b/res/cardsfolder/o/ogre_arsonist.txt
@@ -4,7 +4,6 @@ Types:Creature Ogre
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target land.
 SVar:TrigDestroy:DB$Destroy | ValidTgts$ Land | TgtPrompt$ Select a land.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_arsonist.jpg
-SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/110.jpg
 Oracle:When Ogre Arsonist enters the battlefield, destroy target land.
+SetInfo:PO2 Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_berserker.txt b/res/cardsfolder/o/ogre_berserker.txt
index 94db0db773a..9879055a027 100644
--- a/res/cardsfolder/o/ogre_berserker.txt
+++ b/res/cardsfolder/o/ogre_berserker.txt
@@ -3,7 +3,6 @@ ManaCost:4 R
 Types:Creature Ogre Berserker
 PT:4/2
 K:Haste
-SVar:Rarity:Common
 SVar:Picture:http://serv3.tcgimages.eu/img/cards/Portal_Second_Age/ogre_berserker.jpg
-SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/111.jpg
 Oracle:Haste
+SetInfo:PO2 Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_gatecrasher.txt b/res/cardsfolder/o/ogre_gatecrasher.txt
index 6d3a32ef4d3..63ccd329578 100644
--- a/res/cardsfolder/o/ogre_gatecrasher.txt
+++ b/res/cardsfolder/o/ogre_gatecrasher.txt
@@ -4,7 +4,6 @@ Types:Creature Ogre Rogue
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target creature with defender.
 SVar:TrigDestroy:DB$Destroy | ValidTgts$ Creature.withDefender | TgtPrompt$ Select target creature with defender.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_gatecrasher.jpg
-SetInfo:DIS|Common|http://magiccards.info/scans/en/di/67.jpg
 Oracle:When Ogre Gatecrasher enters the battlefield, destroy target creature with defender.
+SetInfo:DIS Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_jailbreaker.txt b/res/cardsfolder/o/ogre_jailbreaker.txt
index 05b11f721ec..0ba481885ea 100644
--- a/res/cardsfolder/o/ogre_jailbreaker.txt
+++ b/res/cardsfolder/o/ogre_jailbreaker.txt
@@ -6,7 +6,6 @@ K:Defender
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can attack as though it didn't have defender. | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME can attack as though it didn't have defender as long as you control a Gate.
 SVar:X:Count$Valid Gate.YouCtrl
 DeckHints:Type$Gate
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_jailbreaker.jpg
-SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/72.jpg
 Oracle:Defender\nOgre Jailbreaker can attack as though it didn't have defender as long as you control a Gate.
+SetInfo:RTR Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_leadfoot.txt b/res/cardsfolder/o/ogre_leadfoot.txt
index db5b96af368..d3239f37015 100644
--- a/res/cardsfolder/o/ogre_leadfoot.txt
+++ b/res/cardsfolder/o/ogre_leadfoot.txt
@@ -4,7 +4,6 @@ Types:Creature Ogre
 PT:3/3
 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Creature.Artifact | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME becomes blocked by an artifact creature, destroy that creature.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredBlocker
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_leadfoot.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/102.jpg
 Oracle:Whenever Ogre Leadfoot becomes blocked by an artifact creature, destroy that creature.
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_marauder.txt b/res/cardsfolder/o/ogre_marauder.txt
index cfa3a922c56..984ee53cef7 100644
--- a/res/cardsfolder/o/ogre_marauder.txt
+++ b/res/cardsfolder/o/ogre_marauder.txt
@@ -8,7 +8,6 @@ SVar:DBOgreMarauderPump:DB$ Pump | Defined$ Self | KW$ HIDDEN Unblockable | Cond
 SVar:DBOgreMarauderCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_marauder.jpg
-SetInfo:BOK|Uncommon|http://magiccards.info/scans/en/bok/75.jpg
 Oracle:Whenever Ogre Marauder attacks, it gains "Ogre Marauder is unblockable" until end of turn unless defending player sacrifices a creature.
+SetInfo:BOK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_menial.txt b/res/cardsfolder/o/ogre_menial.txt
index 757ef9e820b..dd7c4fbe0bb 100644
--- a/res/cardsfolder/o/ogre_menial.txt
+++ b/res/cardsfolder/o/ogre_menial.txt
@@ -4,7 +4,6 @@ Types:Creature Ogre
 PT:0/4
 K:Infect
 A:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_menial.jpg
-SetInfo:NPH|Common|http://magiccards.info/scans/en/nph/89.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.)\n{R}: Ogre Menial gets +1/+0 until end of turn.
+SetInfo:NPH Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_recluse.txt b/res/cardsfolder/o/ogre_recluse.txt
index f0aafef17be..347f8dc32e0 100644
--- a/res/cardsfolder/o/ogre_recluse.txt
+++ b/res/cardsfolder/o/ogre_recluse.txt
@@ -6,7 +6,6 @@ T:Mode$ SpellCast | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescri
 SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ Self
 SVar:AntiBuffedBy:Card
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_recluse.jpg
-SetInfo:BOK|Uncommon|http://magiccards.info/scans/en/bok/113.jpg
 Oracle:Whenever a player casts a spell, tap Ogre Recluse.
+SetInfo:BOK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_resister.txt b/res/cardsfolder/o/ogre_resister.txt
index 6c4d67ec124..776a2f1998a 100644
--- a/res/cardsfolder/o/ogre_resister.txt
+++ b/res/cardsfolder/o/ogre_resister.txt
@@ -2,7 +2,6 @@ Name:Ogre Resister
 ManaCost:2 R R
 Types:Creature Ogre
 PT:4/3
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_resister.jpg
-SetInfo:MBS|Common|http://magiccards.info/scans/en/mbs/72.jpg
 Oracle:
+SetInfo:MBS Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_savant.txt b/res/cardsfolder/o/ogre_savant.txt
index 3c4d316297c..e88c985dd62 100644
--- a/res/cardsfolder/o/ogre_savant.txt
+++ b/res/cardsfolder/o/ogre_savant.txt
@@ -7,7 +7,8 @@ SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Ha
 SVar:ManaNeededToAvoidNegativeEffect:blue
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Blue
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_savant.jpg
-SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/70.jpg
 Oracle:When Ogre Savant enters the battlefield, if {U} was spent to cast Ogre Savant, return target creature to its owner's hand.
+SetInfo:GPT Common
+SetInfo:DDJ Common
+SetInfo:DDH Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_sentry.txt b/res/cardsfolder/o/ogre_sentry.txt
index 74500b59038..85d752e023c 100644
--- a/res/cardsfolder/o/ogre_sentry.txt
+++ b/res/cardsfolder/o/ogre_sentry.txt
@@ -3,7 +3,6 @@ ManaCost:1 R
 Types:Creature Ogre Warrior
 PT:3/3
 K:Defender
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_sentry.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/159.jpg
 Oracle:Defender
+SetInfo:ROE Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_shaman.txt b/res/cardsfolder/o/ogre_shaman.txt
index 628cd7b09ef..40b96e4fb4d 100644
--- a/res/cardsfolder/o/ogre_shaman.txt
+++ b/res/cardsfolder/o/ogre_shaman.txt
@@ -3,7 +3,6 @@ ManaCost:3 R R
 Types:Creature Ogre Shaman
 PT:3/3
 A:AB$ DealDamage | Cost$ 2 Discard<1/Random> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_shaman.jpg
-SetInfo:EXO|Rare|http://magiccards.info/scans/en/ex/91.jpg
 Oracle:{2}, Discard a card at random: Ogre Shaman deals 2 damage to target creature or player.
+SetInfo:EXO Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_slumlord.txt b/res/cardsfolder/o/ogre_slumlord.txt
index bf2469aef8e..1923f799596 100644
--- a/res/cardsfolder/o/ogre_slumlord.txt
+++ b/res/cardsfolder/o/ogre_slumlord.txt
@@ -6,5 +6,5 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Rat | TokenTypes$ Creature,Rat | TokenOwner$ You | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1
 S:Mode$ Continuous | Affected$ Creature.Rat+YouCtrl | AddKeyword$ Deathtouch | Description$ Rats you control have deathtouch.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_slumlord.jpg
-SetInfo:GTC|Rare|http://magiccards.info/scans/en/gtc/74.jpg
 Oracle:Whenever another nontoken creature dies, you may put a 1/1 black Rat creature token onto the battlefield.\nRats you control have deathtouch.
+SetInfo:GTC Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_taskmaster.txt b/res/cardsfolder/o/ogre_taskmaster.txt
index 208982c3800..df9c9080969 100644
--- a/res/cardsfolder/o/ogre_taskmaster.txt
+++ b/res/cardsfolder/o/ogre_taskmaster.txt
@@ -3,11 +3,10 @@ ManaCost:3 R
 Types:Creature Ogre
 PT:4/3
 K:CARDNAME can't block.
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/p2/en-us/card6588.jpg
-SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/205.jpg
-SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/112.jpg
-SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/206.jpg
-SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/205.jpg
-SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/203.jpg
 Oracle:Ogre Taskmaster can't block.
+SetInfo:PO2 Uncommon
+SetInfo:8ED Uncommon
+SetInfo:7ED Uncommon
+SetInfo:MMQ Uncommon
+SetInfo:9ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogre_warrior.txt b/res/cardsfolder/o/ogre_warrior.txt
index 74b3fa6a470..7017f0c0667 100644
--- a/res/cardsfolder/o/ogre_warrior.txt
+++ b/res/cardsfolder/o/ogre_warrior.txt
@@ -2,8 +2,8 @@ Name:Ogre Warrior
 ManaCost:3 R
 Types:Creature Ogre Warrior
 PT:3/3
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/p4/en-us/card25476.jpg
-SetInfo:PO2|Common|http://magiccards.info/scans/en/po2/113.jpg
-SetInfo:S99|Common|http://magiccards.info/scans/en/st/113.jpg
 Oracle:
+SetInfo:PO2 Common
+SetInfo:S99 Common
+SetInfo:S00 Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ogres_cleaver.txt b/res/cardsfolder/o/ogres_cleaver.txt
index c8332d7fde7..d9fb8859e92 100644
--- a/res/cardsfolder/o/ogres_cleaver.txt
+++ b/res/cardsfolder/o/ogres_cleaver.txt
@@ -3,7 +3,6 @@ ManaCost:2
 Types:Artifact Equipment
 K:Equip 5
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 5 | Description$ Equipped creature gets +5/+0.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ogres_cleaver.jpg
-SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/220.jpg
 Oracle:Equipped creature gets +5/+0.\nEquip {5}
+SetInfo:ROE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ohran_viper.txt b/res/cardsfolder/o/ohran_viper.txt
index 439bb043bb4..922aced34e9 100644
--- a/res/cardsfolder/o/ohran_viper.txt
+++ b/res/cardsfolder/o/ohran_viper.txt
@@ -7,7 +7,6 @@ SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ Tri
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | 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:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ohran_viper.jpg
-SetInfo:CSP|Rare|http://magiccards.info/scans/en/cs/115.jpg
 Oracle:Whenever Ohran Viper deals combat damage to a creature, destroy that creature at end of combat.\nWhenever Ohran Viper deals combat damage to a player, you may draw a card.
+SetInfo:CSP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/ohran_yeti.txt b/res/cardsfolder/o/ohran_yeti.txt
index 9b4716201db..a39236f60b1 100644
--- a/res/cardsfolder/o/ohran_yeti.txt
+++ b/res/cardsfolder/o/ohran_yeti.txt
@@ -3,7 +3,6 @@ ManaCost:3 R
 Types:Snow Creature Yeti
 PT:3/3
 A:AB$ Pump | Cost$ 2 S | ValidTgts$ Creature.Snow | TgtPrompt$ Select target snow creature | KW$ First Strike | SpellDescription$ Target snow creature gains first strike until end of turn. (S can be paid with one mana from a snow permanent.)
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ohran_yeti.jpg
-SetInfo:CSP|Common|http://magiccards.info/scans/en/cs/93.jpg
 Oracle:{2}{S}: Target snow creature gains first strike until end of turn. ({S} can be paid with one mana from a snow permanent.)
+SetInfo:CSP Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/okiba_gang_shinobi.txt b/res/cardsfolder/o/okiba_gang_shinobi.txt
index 9f8da85af92..d0cbdda5ff5 100644
--- a/res/cardsfolder/o/okiba_gang_shinobi.txt
+++ b/res/cardsfolder/o/okiba_gang_shinobi.txt
@@ -5,8 +5,7 @@ PT:3/2
 A:AB$ ChangeZone | Cost$ 3 B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 3 B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (3 B, 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$ Player | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards two cards.
 SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 2 | Mode$ TgtChoose
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/okiba_gang_shinobi.jpg
-SetInfo:PC2|Common|http://magiccards.info/scans/en/pc2/35.jpg
-SetInfo:BOK|Common|http://magiccards.info/scans/en/bok/76.jpg
 Oracle:Ninjutsu {3}{B} ({3}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nWhenever Okiba-Gang Shinobi deals combat damage to a player, that player discards two cards.
+SetInfo:PC2 Common
+SetInfo:BOK Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/okina_nightwatch.txt b/res/cardsfolder/o/okina_nightwatch.txt
index 72a9343d365..4327766b850 100644
--- a/res/cardsfolder/o/okina_nightwatch.txt
+++ b/res/cardsfolder/o/okina_nightwatch.txt
@@ -5,7 +5,6 @@ PT:4/3
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | CheckSVar$ X | SVarCompare$ GTY | References$ X,Y | Description$ As long as you have more cards in hand than each opponent, CARDNAME gets +3/+3.
 SVar:X:Count$InYourHand
 SVar:Y:PlayerCountOpponents$HighestCardsInHand
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/okina_nightwatch.jpg
-SetInfo:SOK|Common|http://magiccards.info/scans/en/sok/140.jpg
 Oracle:As long as you have more cards in hand than each opponent, Okina Nightwatch gets +3/+3.
+SetInfo:SOK Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/okina_temple_to_the_grandfathers.txt b/res/cardsfolder/o/okina_temple_to_the_grandfathers.txt
index 77219e2ccf8..0399a589441 100644
--- a/res/cardsfolder/o/okina_temple_to_the_grandfathers.txt
+++ b/res/cardsfolder/o/okina_temple_to_the_grandfathers.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Legendary Land
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
 A:AB$ Pump | Cost$ G T | ValidTgts$ Creature.Legendary | TgtPrompt$ Select target legendary creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target legendary creature gets +1/+1 until end of turn.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/okina_temple_to_the_grandfathers.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/280.jpg
 Oracle:{T}: Add {G} to your mana pool.\n{G}, {T}: Target legendary creature gets +1/+1 until end of turn.
+SetInfo:CHK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/old_ghastbark.txt b/res/cardsfolder/o/old_ghastbark.txt
index d8f34b2c9d3..81b21ea5bfd 100644
--- a/res/cardsfolder/o/old_ghastbark.txt
+++ b/res/cardsfolder/o/old_ghastbark.txt
@@ -2,7 +2,6 @@ Name:Old Ghastbark
 ManaCost:3 GW GW
 Types:Creature Treefolk Warrior
 PT:3/6
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/old_ghastbark.jpg
-SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/232.jpg
 Oracle:
+SetInfo:SHM Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/old_man_of_the_sea.txt b/res/cardsfolder/o/old_man_of_the_sea.txt
index 8c1f49a5ad5..fd4754db22b 100644
--- a/res/cardsfolder/o/old_man_of_the_sea.txt
+++ b/res/cardsfolder/o/old_man_of_the_sea.txt
@@ -5,7 +5,6 @@ PT:2/3
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ GainControl | Cost$ T | ValidTgts$ Creature.powerLEX | References$ X | TgtPrompt$ Select target creature with power less than or equal to Old Man's. | LoseControl$ Untap,LeavesPlay,LoseControl | SpellDescription$ Gain control of target creature with power less than or equal to Old Man of the Sea's power for as long as Old Man of the Sea remains tapped and that creature's power remains less than or equal to Old Man of the Sea's power.
 SVar:X:Count$CardPower
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/old_man_of_the_sea.jpg
-SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/24.jpg
 Oracle:You may choose not to untap Old Man of the Sea during your untap step.\n{T}: Gain control of target creature with power less than or equal to Old Man of the Sea's power for as long as Old Man of the Sea remains tapped and that creature's power remains less than or equal to Old Man of the Sea's power.
+SetInfo:ARN Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/olivia_voldaren.txt b/res/cardsfolder/o/olivia_voldaren.txt
index ea09efc6307..608072a2539 100644
--- a/res/cardsfolder/o/olivia_voldaren.txt
+++ b/res/cardsfolder/o/olivia_voldaren.txt
@@ -7,7 +7,6 @@ A:AB$ DealDamage | Cost$ 1 R | ValidTgts$ Creature.Other | NumDmg$ 1 | SubAbilit
 SVar:Animate:DB$Animate | Defined$ Targeted | Types$ Vampire | Permanent$ True | SubAbility$ PutCounter
 SVar:PutCounter:DB$PutCounter | Cost$ 0 | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ GainControl | Cost$ 3 B B | ValidTgts$ Creature.Vampire | TgtPrompt$ Select target Vampire | LoseControl$ LeavesPlay,LoseControl | SpellDescription$ Gain control of target vampire for as long as you control CARDNAME.
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/olivia_voldaren.jpg
-SetInfo:ISD|Mythic|http://magiccards.info/scans/en/isd/215.jpg
 Oracle:Flying\n{1}{R}: Olivia Voldaren deals 1 damage to another target creature. That creature becomes a Vampire in addition to its other types. Put a +1/+1 counter on Olivia Voldaren.\n{3}{B}{B}: Gain control of target Vampire for as long as you control Olivia Voldaren.
+SetInfo:ISD Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/o/omega_myr.txt b/res/cardsfolder/o/omega_myr.txt
index 12a6c012a37..db3f597f6a2 100644
--- a/res/cardsfolder/o/omega_myr.txt
+++ b/res/cardsfolder/o/omega_myr.txt
@@ -2,7 +2,6 @@ Name:Omega Myr
 ManaCost:2
 Types:Artifact Creature Myr
 PT:1/2
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/mrd/en-us/card48605.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/223.jpg
 Oracle:
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/omen.txt b/res/cardsfolder/o/omen.txt
index e856209eaff..a195166040c 100644
--- a/res/cardsfolder/o/omen.txt
+++ b/res/cardsfolder/o/omen.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 A:SP$ RearrangeTopOfLibrary | Cost$ 1 U | Defined$ You | NumCards$ 3 | MayShuffle$ True | SubAbility$ DBDraw | SpellDescription$ Look at the top three cards of your library, then put them back in any order. You may shuffle your library. Draw a card.
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 1
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal/omen.jpg
-SetInfo:POR|Common|http://magiccards.info/scans/en/po/63.jpg
 Oracle:Look at the top three cards of your library, then put them back in any order. You may shuffle your library.\nDraw a card.
+SetInfo:POR Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/omen_machine.txt b/res/cardsfolder/o/omen_machine.txt
index 9272bc12199..fbaa4a2361f 100644
--- a/res/cardsfolder/o/omen_machine.txt
+++ b/res/cardsfolder/o/omen_machine.txt
@@ -12,7 +12,6 @@ SVar:TrigOmenExileCardOpp:AB$ Mill | Cost$ 0 | NumCards$ 1 | Destination$ Exile
 SVar:DBOmenLandOpp:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | ChangeType$ Remembered.Land+YouDontCtrl | DefinedPlayer$ Opponent | ChangeNum$ 1 | Hidden$ True | Mandatory$ True | SubAbility$ DBOmenPlayOpp
 SVar:DBOmenPlayOpp:DB$ Play | ValidZone$ Exile | Controller$ TriggeredPlayer | Valid$ Card.IsRemembered | WithoutManaCost$ True | SubAbility$ DBOmenCleanup
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omen_machine.jpg
-SetInfo:NPH|Rare|http://magiccards.info/scans/en/nph/148.jpg
 Oracle:Players can't draw cards.\nAt the beginning of each player's draw step, that player exiles the top card of his or her library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able.
+SetInfo:NPH Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/omen_of_fire.txt b/res/cardsfolder/o/omen_of_fire.txt
index 84ecc86039a..2d0f9616a57 100644
--- a/res/cardsfolder/o/omen_of_fire.txt
+++ b/res/cardsfolder/o/omen_of_fire.txt
@@ -7,7 +7,6 @@ SVar:DBSacOpp:DB$Sacrifice | Amount$ OppX | SacValid$ Plains,Permanent.White | D
 SVar:YouX:Count$Valid Permanent.White+YouCtrl
 SVar:OppX:Count$Valid Permanent.White+YouDontCtrl
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omen_of_fire.jpg
-SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/112.jpg
 Oracle:Return all Islands to their owners' hands.\nEach player sacrifices a Plains or a white permanent for each white permanent he or she controls.
+SetInfo:ALL Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/omnath_locus_of_mana.txt b/res/cardsfolder/o/omnath_locus_of_mana.txt
index 53830e2402a..36f7ae29471 100644
--- a/res/cardsfolder/o/omnath_locus_of_mana.txt
+++ b/res/cardsfolder/o/omnath_locus_of_mana.txt
@@ -6,7 +6,7 @@ S:Mode$ Continuous | Affected$ You | AddKeyword$ Green mana doesn't empty from y
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | References$ X | Description$ CARDNAME gets +1/+1 for each green mana in your mana pool.
 SVar:X:Count$ManaPool:green
 SVar:RemAIDeck:True
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omnath_locus_of_mana.jpg
-SetInfo:WWK|Mythic|http://magiccards.info/scans/en/wwk/109.jpg
 Oracle:Green mana doesn't empty from your mana pool as steps and phases end.\nOmnath, Locus of Mana gets +1/+1 for each green mana in your mana pool.
+SetInfo:V11 Mythic
+SetInfo:WWK Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/o/omnibian.txt b/res/cardsfolder/o/omnibian.txt
index 96f71b0dbe1..3760fdfebe0 100644
--- a/res/cardsfolder/o/omnibian.txt
+++ b/res/cardsfolder/o/omnibian.txt
@@ -4,7 +4,6 @@ Types:Creature Frog
 PT:3/3
 A:AB$ Animate | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Power$ 3 | Toughness$ 3 | Types$ Frog | RemoveCreatureTypes$ True | SpellDescription$ Target creature becomes a 3/3 Frog until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omnibian.jpg
-SetInfo:DIS|Rare|http://magiccards.info/scans/en/di/119.jpg
 Oracle:{T}: Target creature becomes a 3/3 Frog until end of turn.
+SetInfo:DIS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/omniscience.txt b/res/cardsfolder/o/omniscience.txt
index 8aa48e499a9..36afc53a62c 100644
--- a/res/cardsfolder/o/omniscience.txt
+++ b/res/cardsfolder/o/omniscience.txt
@@ -3,7 +3,6 @@ ManaCost:7 U U U
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Card.nonLand+YouOwn | AddHiddenKeyword$ May be played without paying its mana cost | AffectedZone$ Hand | Description$ You may cast nonland cards from your hand without paying their mana costs.
 SVar:RemRandomDeck:True
-SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omniscience.jpg
-SetInfo:M13|Mythic|http://magiccards.info/scans/en/m13/63.jpg
 Oracle:You may cast nonland cards from your hand without paying their mana costs.
+SetInfo:M13 Mythic
\ No newline at end of file
diff --git a/res/cardsfolder/o/ondu_cleric.txt b/res/cardsfolder/o/ondu_cleric.txt
index cecd57e1492..09ed3903633 100644
--- a/res/cardsfolder/o/ondu_cleric.txt
+++ b/res/cardsfolder/o/ondu_cleric.txt
@@ -8,7 +8,6 @@ SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | Referen
 SVar:X:Count$Valid Ally.YouCtrl
 SVar:BuffedBy:Ally
 SVar:RemRandomDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ondu_cleric.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/30.jpg
 Oracle:Whenever Ondu Cleric or another Ally enters the battlefield under your control, you may gain life equal to the number of Allies you control.
+SetInfo:ZEN Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ondu_giant.txt b/res/cardsfolder/o/ondu_giant.txt
index 8b237371271..9b198007f1e 100644
--- a/res/cardsfolder/o/ondu_giant.txt
+++ b/res/cardsfolder/o/ondu_giant.txt
@@ -4,8 +4,7 @@ Types:Creature Giant Druid
 PT:2/4
 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 a basic land card, put that card onto the battlefield tapped, then shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ondu_giant.jpg
-SetInfo:PC2|Common|http://magiccards.info/scans/en/pc2/71.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/202.jpg
 Oracle:When Ondu Giant enters the battlefield, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
+SetInfo:PC2 Common
+SetInfo:ROE Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/one_dozen_eyes.txt b/res/cardsfolder/o/one_dozen_eyes.txt
index 015eb2ebafa..71f7ebd03c9 100644
--- a/res/cardsfolder/o/one_dozen_eyes.txt
+++ b/res/cardsfolder/o/one_dozen_eyes.txt
@@ -5,7 +5,6 @@ A:SP$ Token | Cost$ 5 G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creatu
 A:SP$ Token | Cost$ 5 G | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ or put five 1/1 green Insect creature tokens onto the battlefield.
 A:SP$ Token | Cost$ 5 G G G G | PrecostDesc$ Entwine | CostDesc$ G G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBToken2
 SVar:DBToken2:DB$Token | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/one_dozen_eyes.jpg
-SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/126.jpg
 Oracle:Choose one - Put a 5/5 green Beast creature token onto the battlefield; or put five 1/1 green Insect creature tokens onto the battlefield.\nEntwine {G}{G}{G} (Choose both if you pay the entwine cost.)
+SetInfo:MRD Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/one_eyed_scarecrow.txt b/res/cardsfolder/o/one_eyed_scarecrow.txt
index 0b98aabfe30..f1c5b48eede 100644
--- a/res/cardsfolder/o/one_eyed_scarecrow.txt
+++ b/res/cardsfolder/o/one_eyed_scarecrow.txt
@@ -4,7 +4,6 @@ Types:Artifact Creature Scarecrow
 PT:2/3
 K:Defender
 S:Mode$ Continuous | Affected$ Creature.withFlying+OppCtrl | AddPower$ -1 | AddToughness$ 0 | Description$ Creatures with flying your opponents control get -1/-0.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/one_eyed_scarecrow.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/230.jpg
 Oracle:Defender\nCreatures with flying your opponents control get -1/-0.
+SetInfo:ISD Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/one_thousand_lashes.txt b/res/cardsfolder/o/one_thousand_lashes.txt
index d678e5bfdd2..9dbeef5e46a 100644
--- a/res/cardsfolder/o/one_thousand_lashes.txt
+++ b/res/cardsfolder/o/one_thousand_lashes.txt
@@ -6,7 +6,6 @@ A:SP$ Attach | Cost$ 2 W B | ValidTgts$ Creature | AILogic$ Curse
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. & CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't attack or block and its activated abilities can't be activated.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of the upkeep of enchanted creature'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/one_thousand_lashes.jpg
-SetInfo:GTC|Uncommon|http://magiccards.info/scans/en/gtc/183.jpg
 Oracle:Enchant creature\nEnchanted creature can't attack or block, and its activated abilities can't be activated.\nAt the beginning of the upkeep of enchanted creature's controller, that player loses 1 life.
+SetInfo:GTC Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/one_with_nature.txt b/res/cardsfolder/o/one_with_nature.txt
index 7e97e07e3a4..5e8dc883f6c 100644
--- a/res/cardsfolder/o/one_with_nature.txt
+++ b/res/cardsfolder/o/one_with_nature.txt
@@ -5,7 +5,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ G | ValidTgts$ Creature | AITgts$ Card.powerGE1 | AILogic$ Pump
 T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigChange | CombatDamage$ True | TriggerDescription$ Whenever enchanted creature deals combat damage to a player, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/one_with_nature.jpg
-SetInfo:SCG|Uncommon|http://magiccards.info/scans/en/sc/125.jpg
 Oracle:Enchant creature\nWhenever enchanted creature deals combat damage to a player, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library.
+SetInfo:SCG Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/one_with_nothing.txt b/res/cardsfolder/o/one_with_nothing.txt
index 57b741cbd19..5986c778af5 100644
--- a/res/cardsfolder/o/one_with_nothing.txt
+++ b/res/cardsfolder/o/one_with_nothing.txt
@@ -3,7 +3,6 @@ ManaCost:B
 Types:Sorcery
 A:SP$ Discard | Cost$ B | Mode$ Hand | SpellDescription$ Discard your hand.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/one_with_nothing.jpg
-SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/84.jpg
 Oracle:Discard your hand.
+SetInfo:SOK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oni_of_wild_places.txt b/res/cardsfolder/o/oni_of_wild_places.txt
index 85668cf6b83..361f61b59f6 100644
--- a/res/cardsfolder/o/oni_of_wild_places.txt
+++ b/res/cardsfolder/o/oni_of_wild_places.txt
@@ -6,8 +6,7 @@ K:Haste
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigBounce | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, return a red creature you control to its owner's hand.
 SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Mandatory$ True | Hidden$ True | ChangeType$ Creature.Red+YouCtrl
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oni_of_wild_places.jpg
-SetInfo:SOK|Uncommon|http://magiccards.info/scans/en/sok/108.jpg
-SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/130.jpg
 Oracle:Haste\nAt the beginning of your upkeep, return a red creature you control to its owner's hand.
+SetInfo:SOK Uncommon
+SetInfo:COM Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/oni_of_wild_places_avatar.txt b/res/cardsfolder/o/oni_of_wild_places_avatar.txt
index a49878622aa..e2ac16a9bbc 100644
--- a/res/cardsfolder/o/oni_of_wild_places_avatar.txt
+++ b/res/cardsfolder/o/oni_of_wild_places_avatar.txt
@@ -5,7 +5,6 @@ HandLifeModifier:+0/-2
 S:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddKeyword$ Haste | Description$ Creatures you control have haste.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Creature | PresentZone$ Battlefield | PresentPlayer$ You | Execute$ TrigBounce | TriggerZones$ Command | TriggerDescription$ At the beginning of your upkeep, return a creature you control to its owner's hand.
 SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Mandatory$ True | Hidden$ True | ChangeType$ Creature.YouCtrl
-SVar:Rarity:Special
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/oni_of_wild_places_avatar.jpg
-SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo/oni-of-wild-places.jpg
 Oracle:Hand +0, life -2\nCreatures you control have haste.\nAt the beginning of your upkeep, return a creature you control to its owner's hand.
+SetInfo:VAN Special
\ No newline at end of file
diff --git a/res/cardsfolder/o/oni_possession.txt b/res/cardsfolder/o/oni_possession.txt
index 56b19fb361b..82b85bb0f2f 100644
--- a/res/cardsfolder/o/oni_possession.txt
+++ b/res/cardsfolder/o/oni_possession.txt
@@ -8,7 +8,7 @@ S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddType$ Demon & Spirit |
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ At the beginning of your upkeep, sacrifice a creature.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ You | SacValid$ Creature
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oni_possession.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/135.jpg
 Oracle:Enchant creature\nAt the beginning of your upkeep, sacrifice a creature.\nEnchanted creature gets +3/+3 and has trample.\nEnchanted creature is a Demon Spirit.
+SetInfo:DDC Uncommon
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/onslaught.txt b/res/cardsfolder/o/onslaught.txt
index 26a39cb187b..9f633cb7d93 100644
--- a/res/cardsfolder/o/onslaught.txt
+++ b/res/cardsfolder/o/onslaught.txt
@@ -4,7 +4,6 @@ Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever you cast a creature spell, tap target creature.
 SVar:TrigTap:AB$Tap | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature
 SVar:BuffedBy:Creature
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/onslaught.jpg
-SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/92.jpg
 Oracle:Whenever you cast a creature spell, tap target creature.
+SetInfo:EXO Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/onulet.txt b/res/cardsfolder/o/onulet.txt
index e6ef1df9287..cc94302b621 100644
--- a/res/cardsfolder/o/onulet.txt
+++ b/res/cardsfolder/o/onulet.txt
@@ -4,9 +4,8 @@ Types:Artifact Creature Construct
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you gain 2 life.
 SVar:TrigSac:AB$GainLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 2
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/onulet.jpg
-SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/269.jpg
-SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/358.jpg
-SetInfo:ATQ|Uncommon|http://magiccards.info/scans/en/aq/24.jpg
 Oracle:When Onulet dies, you gain 2 life.
+SetInfo:ATQ Uncommon
+SetInfo:4ED Rare
+SetInfo:3ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/onyx_goblet.txt b/res/cardsfolder/o/onyx_goblet.txt
index b99e0c28b96..52c8089abe5 100644
--- a/res/cardsfolder/o/onyx_goblet.txt
+++ b/res/cardsfolder/o/onyx_goblet.txt
@@ -2,7 +2,6 @@ Name:Onyx Goblet
 ManaCost:2 B
 Types:Artifact
 A:AB$ LoseLife | Cost$ T | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SpellDescription$ Target player loses 1 life.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/onyx_goblet.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/81.jpg
 Oracle:{T}: Target player loses 1 life.
+SetInfo:ALA Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/onyx_mage.txt b/res/cardsfolder/o/onyx_mage.txt
index c9b5544a032..edf8d4b0808 100644
--- a/res/cardsfolder/o/onyx_mage.txt
+++ b/res/cardsfolder/o/onyx_mage.txt
@@ -3,7 +3,6 @@ ManaCost:1 B
 Types:Creature Human Wizard
 PT:2/1
 A:AB$ Pump | Cost$ 1 B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Deathtouch | SpellDescription$ Target creature you control gains deathtouch until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/onyx_mage.jpg
-SetInfo:M12|Uncommon|http://magiccards.info/scans/en/m12/103.jpg
 Oracle:{1}{B}: Target creature you control gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.)
+SetInfo:M12 Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/onyx_talisman.txt b/res/cardsfolder/o/onyx_talisman.txt
index 880fce539a8..29c24ed64c4 100644
--- a/res/cardsfolder/o/onyx_talisman.txt
+++ b/res/cardsfolder/o/onyx_talisman.txt
@@ -4,7 +4,6 @@ Types:Artifact
 T:Mode$ SpellCast | ValidCard$ Card.Black | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever a player casts a black 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/onyx_talisman.jpg
-SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/306.jpg
 Oracle:Whenever a player casts a black 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/o/oona_queen_of_the_fae.txt b/res/cardsfolder/o/oona_queen_of_the_fae.txt
index 5d9737d4e48..450aa8728b9 100644
--- a/res/cardsfolder/o/oona_queen_of_the_fae.txt
+++ b/res/cardsfolder/o/oona_queen_of_the_fae.txt
@@ -10,7 +10,7 @@ SVar:Clear:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$xPaid
 SVar:Y:Remembered$Valid Card.ChosenColor
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oona_queen_of_the_fae.jpg
-SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/172.jpg
 Oracle:Flying\n{X}{U/B}: Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, put a 1/1 blue and black Faerie Rogue creature token with flying onto the battlefield.
+SetInfo:V11 Mythic
+SetInfo:SHM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oonas_blackguard.txt b/res/cardsfolder/o/oonas_blackguard.txt
index c4b471d51d5..cf7e3ac7560 100644
--- a/res/cardsfolder/o/oonas_blackguard.txt
+++ b/res/cardsfolder/o/oonas_blackguard.txt
@@ -9,7 +9,6 @@ SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield |
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl+counters_GE1_P1P1 | ValidTarget$ Player | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigDiscardOpp | TriggerDescription$ Whenever a creature you control with a +1/+1 counter on it deals combat damage to a player, that player discards a card.
 SVar:TrigDiscardOpp:AB$ Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oonas_blackguard.jpg
-SetInfo:MOR|Uncommon|http://magiccards.info/scans/en/mt/72.jpg
 Oracle:Flying\nEach other Rogue creature you control enters the battlefield with an additional +1/+1 counter on it.\nWhenever a creature you control with a +1/+1 counter on it deals combat damage to a player, that player discards a card.
+SetInfo:MOR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/oonas_gatewarden.txt b/res/cardsfolder/o/oonas_gatewarden.txt
index c0c80fc91d8..ff92a7b4b0d 100644
--- a/res/cardsfolder/o/oonas_gatewarden.txt
+++ b/res/cardsfolder/o/oonas_gatewarden.txt
@@ -5,7 +5,6 @@ PT:2/1
 K:Flying
 K:Defender
 K:Wither
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oonas_gatewarden.jpg
-SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/173.jpg
 Oracle:Defender, flying\nWither (This deals damage to creatures in the form of -1/-1 counters.)
+SetInfo:SHM Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oonas_grace.txt b/res/cardsfolder/o/oonas_grace.txt
index 02d659107e2..48c00c66b79 100644
--- a/res/cardsfolder/o/oonas_grace.txt
+++ b/res/cardsfolder/o/oonas_grace.txt
@@ -4,6 +4,5 @@ Types:Instant
 A:SP$ Draw | Cost$ 2 U | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws a card.
 A:SP$ Draw | Cost$ 2 U Discard<1/Land> | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | ActivationZone$ Graveyard | CostDesc$ Retrace | NonBasicSpell$ True | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oonas_grace.jpg
-SVar:Rarity:Common
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/27.jpg
 Oracle:Target player draws a card.\nRetrace (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
+SetInfo:EVE Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oonas_prowler.txt b/res/cardsfolder/o/oonas_prowler.txt
index 404a6da4fd4..fa7599f6171 100644
--- a/res/cardsfolder/o/oonas_prowler.txt
+++ b/res/cardsfolder/o/oonas_prowler.txt
@@ -5,7 +5,6 @@ PT:3/1
 K:Flying
 A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | NumAtt$ -2 | AnyPlayer$ True | SpellDescription$ Oona's Prowler gets -2/-0 until end of turn. Any player may activate this ability.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oonas_prowler.jpg
-SetInfo:LRW|Rare|http://magiccards.info/scans/en/lw/133.jpg
 Oracle:Flying\nDiscard a card: Oona's Prowler gets -2/-0 until end of turn. Any player may activate this ability.
+SetInfo:LRW Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/ooze_garden.txt b/res/cardsfolder/o/ooze_garden.txt
index 9e7d53745db..74612f84dd6 100644
--- a/res/cardsfolder/o/ooze_garden.txt
+++ b/res/cardsfolder/o/ooze_garden.txt
@@ -3,7 +3,6 @@ ManaCost:1 G
 Types:Enchantment
 A:AB$ Token | Cost$ 1 G Sac<1/Creature.nonOoze/non-Ooze creature> | TokenAmount$ 1 | TokenName$ Ooze | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | References$ X | TokenTypes$ Creature,Ooze | TokenColors$ Green | SorcerySpeed$ True | SpellDescription$ Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery.
 SVar:X:Sacrificed$CardPower
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ooze_garden.jpg
-SetInfo:ALA|Rare|http://magiccards.info/scans/en/ala/143.jpg
 Oracle:{1}{G}, Sacrifice a non-Ooze creature: Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery.
+SetInfo:ALA Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/opal_acrolith.txt b/res/cardsfolder/o/opal_acrolith.txt
index 17497aea514..cdab40513c0 100644
--- a/res/cardsfolder/o/opal_acrolith.txt
+++ b/res/cardsfolder/o/opal_acrolith.txt
@@ -5,7 +5,6 @@ T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ Opponent | Trig
 A:AB$ Animate | Cost$ 0 | Defined$ Self | Types$ Enchantment | OverwriteTypes$ True | Permanent$ True | SpellDescription$ CARDNAME becomes an enchantment.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 2 | Toughness$ 4  | Types$ Creature,Soldier | OverwriteTypes$ True | Permanent$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_acrolith.jpg
-SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/22.jpg
 Oracle:Whenever an opponent casts a creature spell, if Opal Acrolith is an enchantment, Opal Acrolith becomes a 2/4 Soldier creature.\n{0}: Opal Acrolith becomes an enchantment.
+SetInfo:USG Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/opal_archangel.txt b/res/cardsfolder/o/opal_archangel.txt
index b4df0e2d00a..41a955edd19 100644
--- a/res/cardsfolder/o/opal_archangel.txt
+++ b/res/cardsfolder/o/opal_archangel.txt
@@ -3,7 +3,6 @@ ManaCost:4 W
 Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment| Execute$ TrigAnimate | TriggerDescription$ When an opponent casts a creature spell, if CARDNAME is an enchantment, CARDNAME becomes a 5/5 Angel creature with flying and vigilance.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 5 | Toughness$ 5  | Keywords$ Flying & Vigilance | Types$ Creature,Angel | OverwriteTypes$ True | Permanent$ True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_archangel.jpg
-SetInfo:USG|Rare|http://magiccards.info/scans/en/us/23.jpg
 Oracle:When an opponent casts a creature spell, if Opal Archangel is an enchantment, Opal Archangel becomes a 5/5 Angel creature with flying and vigilance.
+SetInfo:USG Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/opal_avenger.txt b/res/cardsfolder/o/opal_avenger.txt
index 71e749beb69..3fc9fb219d6 100644
--- a/res/cardsfolder/o/opal_avenger.txt
+++ b/res/cardsfolder/o/opal_avenger.txt
@@ -3,7 +3,6 @@ ManaCost:2 W
 Types:Enchantment
 T:Mode$ Always | LifeTotal$ You | LifeAmount$ LE10 | TriggerZones$ Battlefield | Execute$ TrigOpalAvengerAnimate | IsPresent$ Card.Self+Enchantment | TriggerDescription$ When you have 10 or less life, if CARDNAME is an enchantment, CARDNAME becomes a 3/5 Soldier creature.
 SVar:TrigOpalAvengerAnimate:AB$ Animate | Cost$ 0 | Types$ Creature,Soldier | Power$ 3 | Toughness$ 5 | OverwriteTypes$ True | Permanent$ True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_avenger.jpg
-SetInfo:ULG|Rare|http://magiccards.info/scans/en/ul/15.jpg
 Oracle:When you have 10 or less life, if Opal Avenger is an enchantment, Opal Avenger becomes a 3/5 Soldier creature.
+SetInfo:ULG Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/opal_caryatid.txt b/res/cardsfolder/o/opal_caryatid.txt
index 2de0dba8dc3..c2d4936b87f 100644
--- a/res/cardsfolder/o/opal_caryatid.txt
+++ b/res/cardsfolder/o/opal_caryatid.txt
@@ -3,7 +3,6 @@ ManaCost:W
 Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When an opponent casts a creature spell, if CARDNAME is an enchantment, CARDNAME becomes a 2/2 Soldier creature.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Soldier | OverwriteTypes$ True | Permanent$ True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_caryatid.jpg
-SetInfo:USG|Common|http://magiccards.info/scans/en/us/24.jpg
 Oracle:When an opponent casts a creature spell, if Opal Caryatid is an enchantment, Opal Caryatid becomes a 2/2 Soldier creature.
+SetInfo:USG Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/opal_champion.txt b/res/cardsfolder/o/opal_champion.txt
index 213d6c679d3..8aff34cf669 100644
--- a/res/cardsfolder/o/opal_champion.txt
+++ b/res/cardsfolder/o/opal_champion.txt
@@ -3,7 +3,6 @@ ManaCost:2 W
 Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment| Execute$ TrigAnimate | TriggerDescription$ When an opponent casts a creature spell, if CARDNAME is an enchantment, CARDNAME becomes a 3/3 Knight creature with first strike.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 3 | Toughness$ 3  | Keywords$ First Strike | Types$ Creature,Knight | OverwriteTypes$ True | Permanent$ True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_champion.jpg
-SetInfo:ULG|Common|http://magiccards.info/scans/en/ul/16.jpg
 Oracle:When an opponent casts a creature spell, if Opal Champion is an enchantment, Opal Champion becomes a 3/3 Knight creature with first strike.
+SetInfo:ULG Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/opal_eye_kondas_yojimbo.txt b/res/cardsfolder/o/opal_eye_kondas_yojimbo.txt
index 6a7a53c91c1..85279d12b22 100644
--- a/res/cardsfolder/o/opal_eye_kondas_yojimbo.txt
+++ b/res/cardsfolder/o/opal_eye_kondas_yojimbo.txt
@@ -15,7 +15,6 @@ SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$
 SVar:Y:ReplaceCount$DamageAmount
 A:AB$ PreventDamage | Cost$ 1 W | Defined$ Self | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to CARDNAME this turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_eye_kondas_yojimbo.jpg
-SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/17.jpg
 Oracle:Defender (This creature can't attack.)\nBushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)\n{T}: The next time a source of your choice would deal damage this turn, that damage is dealt to Opal-Eye, Konda's Yojimbo instead.\n{1}{W}: Prevent the next 1 damage that would be dealt to Opal-Eye this turn.
+SetInfo:BOK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/opal_gargoyle.txt b/res/cardsfolder/o/opal_gargoyle.txt
index f617631c8d4..8973b8cada9 100644
--- a/res/cardsfolder/o/opal_gargoyle.txt
+++ b/res/cardsfolder/o/opal_gargoyle.txt
@@ -3,7 +3,6 @@ ManaCost:1 W
 Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When an opponent casts a creature spell, if CARDNAME is an enchantment, CARDNAME becomes a 2/2 Gargoyle creature with flying.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Gargoyle | Keywords$ Flying | OverwriteTypes$ True | Permanent$ True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_gargoyle.jpg
-SetInfo:USG|Common|http://magiccards.info/scans/en/us/25.jpg
 Oracle:When an opponent casts a creature spell, if Opal Gargoyle is an enchantment, Opal Gargoyle becomes a 2/2 Gargoyle creature with flying.
+SetInfo:USG Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/opal_guardian.txt b/res/cardsfolder/o/opal_guardian.txt
index 8e4296ebcd3..66977a2c552 100644
--- a/res/cardsfolder/o/opal_guardian.txt
+++ b/res/cardsfolder/o/opal_guardian.txt
@@ -3,7 +3,6 @@ ManaCost:W W W
 Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When an opponent casts a creature spell, if CARDNAME is an enchantment, CARDNAME becomes a 3/4 Gargoyle creature with flying and protection from red.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 3 | Toughness$ 4 | Types$ Creature,Gargoyle | Keywords$ Flying & Protection from red | OverwriteTypes$ True | Permanent$ True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_guardian.jpg
-SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/30.jpg
 Oracle:When an opponent casts a creature spell, if Opal Guardian is an enchantment, Opal Guardian becomes a 3/4 Gargoyle creature with flying and protection from red.
+SetInfo:TSP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/opal_titan.txt b/res/cardsfolder/o/opal_titan.txt
index d123a3c53c1..40c47e8bb55 100644
--- a/res/cardsfolder/o/opal_titan.txt
+++ b/res/cardsfolder/o/opal_titan.txt
@@ -8,7 +8,6 @@ SVar:DBOpalTitanProtectionBlue:DB$ Protection | Gains$ blue | ConditionDefined$
 SVar:DBOpalTitanProtectionBlack:DB$ Protection | Gains$ black | ConditionDefined$ TriggeredCard | ConditionPresent$ Card.Black | ConditionCompare$ GE1 | SubAbility$ DBOpalTitanProtectionGreen | Permanent$ True
 SVar:DBOpalTitanProtectionGreen:DB$ Protection | Gains$ green | ConditionDefined$ TriggeredCard | ConditionPresent$ Card.Green | ConditionCompare$ GE1 | SubAbility$ DBOpalTitanProtectionRed | Permanent$ True
 SVar:DBOpalTitanProtectionRed:DB$ Protection | Gains$ red | ConditionDefined$ TriggeredCard | ConditionPresent$ Card.Red | ConditionCompare$ GE1 | Permanent$ True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opal_titan.jpg
-SetInfo:USG|Rare|http://magiccards.info/scans/en/us/26.jpg
 Oracle:When an opponent casts a creature spell, if Opal Titan is an enchantment, Opal Titan becomes a 4/4 Giant creature with protection from each of that spell's colors.
+SetInfo:USG Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/opalescence.txt b/res/cardsfolder/o/opalescence.txt
index b035dd3be59..a773bea4836 100644
--- a/res/cardsfolder/o/opalescence.txt
+++ b/res/cardsfolder/o/opalescence.txt
@@ -5,7 +5,6 @@ S:Mode$ Continuous | Affected$ Enchantment.nonAura+Other | SetPower$ AffectedX |
 SVar:AffectedX:Count$CardManaCost
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opalescence.jpg
-SetInfo:UDS|Rare|http://magiccards.info/scans/en/ud/13.jpg
 Oracle:Each other non-Aura enchantment is a creature with power and toughness each equal to its converted mana cost. It's still an enchantment.
+SetInfo:UDS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/opaline_bracers.txt b/res/cardsfolder/o/opaline_bracers.txt
index dc1800c8e6e..f5984cebdba 100644
--- a/res/cardsfolder/o/opaline_bracers.txt
+++ b/res/cardsfolder/o/opaline_bracers.txt
@@ -6,7 +6,6 @@ S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X |
 K:Sunburst
 SVar:X:Count$CardCounters.CHARGE
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opaline_bracers.jpg
-SetInfo:5DN|Common|http://magiccards.info/scans/en/5dn/141.jpg
 Oracle:Sunburst (This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)\nEquipped creature gets +X/+X, where X is the number of charge counters on Opaline Bracers.\nEquip {2} ({2}: 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/o/opaline_sliver.txt b/res/cardsfolder/o/opaline_sliver.txt
index 34579ac853d..9b767acb3d8 100644
--- a/res/cardsfolder/o/opaline_sliver.txt
+++ b/res/cardsfolder/o/opaline_sliver.txt
@@ -6,7 +6,6 @@ S:Mode$ Continuous | Affected$ Sliver | AddTrigger$ TrigTargetSpell | AddSVar$ O
 SVar:TrigTargetSpell:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Instant.OppCtrl,Sorcery.OppCtrl | Execute$ OpalineTrigDraw | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes the target of a spell an opponent controls, you may draw a card.
 SVar:OpalineTrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 1 | Defined$ You
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opaline_sliver.jpg
-SetInfo:TSP|Uncommon|http://magiccards.info/scans/en/ts/244.jpg
 Oracle:All Slivers have "Whenever this permanent becomes the target of a spell an opponent controls, you may draw a card."
+SetInfo:TSP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/open_the_vaults.txt b/res/cardsfolder/o/open_the_vaults.txt
index b5eda613c11..17f988d8006 100644
--- a/res/cardsfolder/o/open_the_vaults.txt
+++ b/res/cardsfolder/o/open_the_vaults.txt
@@ -3,7 +3,6 @@ ManaCost:4 W W
 Types:Sorcery
 A:SP$ ChangeZoneAll | Cost$ 4 W W | ChangeType$ Artifact,Enchantment | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return all artifact and enchantment cards from all graveyards to the battlefield under their owners' control.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/open_the_vaults.jpg
-SetInfo:M10|Rare|http://magiccards.info/scans/en/m10/21.jpg
 Oracle:Return all artifact and enchantment cards from all graveyards to the battlefield under their owners' control. (Auras with nothing to enchant remain in graveyards.)
+SetInfo:M10 Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/ophidian.txt b/res/cardsfolder/o/ophidian.txt
index 95c7f8987ce..b5c862c1e6b 100644
--- a/res/cardsfolder/o/ophidian.txt
+++ b/res/cardsfolder/o/ophidian.txt
@@ -6,7 +6,7 @@ T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | E
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBPump
 SVar:DBPump:DB$Pump | Cost$ 0 | KW$ HIDDEN CARDNAME assigns no combat damage
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ophidian.jpg
-SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/45.jpg
 Oracle:Whenever Ophidian attacks and isn't blocked, you may draw a card. If you do, Ophidian assigns no combat damage this turn.
+SetInfo:DD2 Common
+SetInfo:WTH Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ophidian_eye.txt b/res/cardsfolder/o/ophidian_eye.txt
index 7870e752b62..69f736f5ca2 100644
--- a/res/cardsfolder/o/ophidian_eye.txt
+++ b/res/cardsfolder/o/ophidian_eye.txt
@@ -6,7 +6,6 @@ K:Flash
 A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Opponent | Execute$ TrigDraw | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever enchanted creature deals damage to an opponent, 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/ophidian_eye.jpg
-SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/70.jpg
 Oracle:Flash (You may cast this spell any time you could cast an instant.)\nEnchant creature\nWhenever enchanted creature deals damage to an opponent, you may draw a card.
+SetInfo:TSP Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/opportunist.txt b/res/cardsfolder/o/opportunist.txt
index a1e305eeb63..9b1795bdd03 100644
--- a/res/cardsfolder/o/opportunist.txt
+++ b/res/cardsfolder/o/opportunist.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Human Soldier
 PT:2/2
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.wasDealtDamageThisTurn | TgtPrompt$ Select target creature that was dealt damage this turn | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature that was dealt damage this turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opportunist.jpg
-SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/194.jpg
 Oracle:{T}: Opportunist deals 1 damage to target creature that was dealt damage this turn.
+SetInfo:TMP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/opportunity.txt b/res/cardsfolder/o/opportunity.txt
index 276cf538e0b..2d23e854ba9 100644
--- a/res/cardsfolder/o/opportunity.txt
+++ b/res/cardsfolder/o/opportunity.txt
@@ -2,8 +2,7 @@ Name:Opportunity
 ManaCost:4 U U
 Types:Instant
 A:SP$ Draw | Cost$ 4 U U | NumCards$ 4 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws four cards.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opportunity.jpg
-SetInfo:ULG|Uncommon|http://magiccards.info/scans/en/ul/37.jpg
-SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/91.jpg
 Oracle:Target player draws four cards.
+SetInfo:ULG Uncommon
+SetInfo:7ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/opposition.txt b/res/cardsfolder/o/opposition.txt
index e37dcaf358b..d3efca26e38 100644
--- a/res/cardsfolder/o/opposition.txt
+++ b/res/cardsfolder/o/opposition.txt
@@ -3,8 +3,7 @@ ManaCost:2 U U
 Types:Enchantment
 A:AB$ Tap | Cost$ tapXType<1/Creature> | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature or land | SpellDescription$ Tap target artifact, creature or land.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opposition.jpg
-SetInfo:UDS|Rare|http://magiccards.info/scans/en/ud/40.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/92.jpg
 Oracle:Tap an untapped creature you control: Tap target artifact, creature, or land.
+SetInfo:7ED Rare
+SetInfo:UDS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oppression.txt b/res/cardsfolder/o/oppression.txt
index 630fa6711b0..12c58b4da9f 100644
--- a/res/cardsfolder/o/oppression.txt
+++ b/res/cardsfolder/o/oppression.txt
@@ -4,8 +4,7 @@ Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Card | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever a player casts a spell, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredActivator | NumCards$ 1 | Mode$ TgtChoose
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oppression.jpg
-SetInfo:USG|Rare|http://magiccards.info/scans/en/us/143.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/152.jpg
 Oracle:Whenever a player casts a spell, that player discards a card.
+SetInfo:7ED Rare
+SetInfo:USG Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oppressive_will.txt b/res/cardsfolder/o/oppressive_will.txt
index 788b8113f48..16f715b2f40 100644
--- a/res/cardsfolder/o/oppressive_will.txt
+++ b/res/cardsfolder/o/oppressive_will.txt
@@ -4,7 +4,6 @@ Types:Instant
 A:SP$ Counter | Cost$ 2 U | Type $ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | References$ X | SpellDescription$ Counter target spell unless its controller pays 1 for each card in your hand.
 SVar:X:Count$InYourHand
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oppressive_will.jpg
-SetInfo:SOK|Common|http://magiccards.info/scans/en/sok/50.jpg
 Oracle:Counter target spell unless its controller pays {1} for each card in your hand.
+SetInfo:SOK Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/opt.txt b/res/cardsfolder/o/opt.txt
index ab86aa157cd..4d6da033707 100644
--- a/res/cardsfolder/o/opt.txt
+++ b/res/cardsfolder/o/opt.txt
@@ -4,7 +4,6 @@ Types:Instant
 A:SP$ Dig | Cost$ U | DigNum$ 1 | ChangeNum$ 1 | DestinationZone$ Library | LibraryPosition$ -1 | Optional$ True | LibraryPosition2$ 0 | SubAbility$ DBDraw | SpellDescription$ Look at the top card of your library. You may put that card on the bottom of your library. Draw a card.
 SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 1
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/opt.jpg
-SetInfo:INV|Common|http://magiccards.info/scans/en/in/64.jpg
 Oracle:Look at the top card of your library. You may put that card on the bottom of your library.\nDraw a card.
+SetInfo:INV Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oracle.txt b/res/cardsfolder/o/oracle.txt
index bd7f5f3f502..de9bbb022b2 100644
--- a/res/cardsfolder/o/oracle.txt
+++ b/res/cardsfolder/o/oracle.txt
@@ -5,7 +5,6 @@ HandLifeModifier:+1/+9
 A:AB$ Untap | ActivationZone$ Command | Cost$ 0 | ValidTgts$ Creature.attacking+youCtrl | TgtPrompt$ Select target attacking creature you control | SubAbility$ Reconsider | SpellDescription$ Untap target attacking creature you control and remove it from combat.
 SVar:Reconsider:DB$ RemoveFromCombat | Defined$ Targeted
 SVar:RemAIDeck:True
-SVar:Rarity:Special
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/oracle.jpg
-SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard/oracle.jpg
 Oracle:Hand +1, life +9\n{0}: Untap target attacking creature you control and remove it from combat.
+SetInfo:VAN Special
\ No newline at end of file
diff --git a/res/cardsfolder/o/oracle_of_mul_daya.txt b/res/cardsfolder/o/oracle_of_mul_daya.txt
index c82bec47799..d457f79d8e0 100644
--- a/res/cardsfolder/o/oracle_of_mul_daya.txt
+++ b/res/cardsfolder/o/oracle_of_mul_daya.txt
@@ -5,7 +5,6 @@ S:Mode$ Continuous | Affected$ You | AddKeyword$ AdjustLandPlays:1 | Description
 PT:2/2
 K:Play with the top card of your library revealed.
 S:Mode$ Continuous | Affected$ Land.TopLibrary+YouCtrl | AffectedZone$ Library | AddHiddenKeyword$ May be played | Description$ You may play the top card of your library if it's a land card.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oracle_of_mul_daya.jpg
-SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/172.jpg
 Oracle:You may play an additional land on each of your turns.\nPlay with the top card of your library revealed.\nYou may play the top card of your library if it's a land card.
+SetInfo:ZEN Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oracle_of_nectars.txt b/res/cardsfolder/o/oracle_of_nectars.txt
index 53f3b4c6528..2c14ee4e1d8 100644
--- a/res/cardsfolder/o/oracle_of_nectars.txt
+++ b/res/cardsfolder/o/oracle_of_nectars.txt
@@ -4,7 +4,6 @@ Types:Creature Elf Cleric
 PT:2/2
 A:AB$ GainLife | LifeAmount$ X | Cost$ T X | References$ X | SpellDescription$ You gain X life.
 SVar:X:Count$xPaid
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oracle_of_nectars.jpg
-SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/233.jpg
 Oracle:{X}, {T}: You gain X life.
+SetInfo:SHM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oracles_attendants.txt b/res/cardsfolder/o/oracles_attendants.txt
index fb996822186..36b8048c864 100644
--- a/res/cardsfolder/o/oracles_attendants.txt
+++ b/res/cardsfolder/o/oracles_attendants.txt
@@ -13,9 +13,8 @@ SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:ReplaceCount$DamageAmount
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oracles_attendants.jpg
-SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/32.jpg
-SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/30.jpg
-SetInfo:NMS|Rare|http://magiccards.info/scans/en/ne/16.jpg
 Oracle:{T}: All damage that would be dealt to target creature this turn by a source of your choice is dealt to Oracle's Attendants instead.
+SetInfo:8ED Rare
+SetInfo:NMS Rare
+SetInfo:9ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oran_rief_recluse.txt b/res/cardsfolder/o/oran_rief_recluse.txt
index e79066b7df6..4f0f33779d1 100644
--- a/res/cardsfolder/o/oran_rief_recluse.txt
+++ b/res/cardsfolder/o/oran_rief_recluse.txt
@@ -7,7 +7,6 @@ K:Reach
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, destroy target creature with flying.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oran_rief_recluse.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/173.jpg
 Oracle:Kicker {2}{G} (You may pay an additional {2}{G} as you cast this spell.)\nReach (This creature can block creatures with flying.)\nWhen Oran-Rief Recluse enters the battlefield, if it was kicked, destroy target creature with flying.
+SetInfo:ZEN Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oran_rief_survivalist.txt b/res/cardsfolder/o/oran_rief_survivalist.txt
index 5a7706b3d29..37057b3bf79 100644
--- a/res/cardsfolder/o/oran_rief_survivalist.txt
+++ b/res/cardsfolder/o/oran_rief_survivalist.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/oran_rief_survivalist.jpg
-SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/174.jpg
 Oracle:Whenever Oran-Rief Survivalist or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Oran-Rief Survivalist.
+SetInfo:ZEN Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oran_rief_the_vastwood.txt b/res/cardsfolder/o/oran_rief_the_vastwood.txt
index 89256903719..cca4c7c0101 100644
--- a/res/cardsfolder/o/oran_rief_the_vastwood.txt
+++ b/res/cardsfolder/o/oran_rief_the_vastwood.txt
@@ -4,7 +4,6 @@ Types:Land
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
 A:AB$PutCounterAll | Cost$ T | ValidCards$ Creature.Green+enteredBattlefieldThisTurn | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each green creature that entered the battlefield this turn.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oran_rief_the_vastwood.jpg
-SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/221.jpg
 Oracle:Oran-Rief, the Vastwood enters the battlefield tapped.\n{T}: Add {G} to your mana pool.\n{T}: Put a +1/+1 counter on each green creature that entered the battlefield this turn.
+SetInfo:ZEN Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oraxid.txt b/res/cardsfolder/o/oraxid.txt
index 0b9d5e374b0..d80180f439f 100644
--- a/res/cardsfolder/o/oraxid.txt
+++ b/res/cardsfolder/o/oraxid.txt
@@ -3,7 +3,6 @@ ManaCost:3 U
 Types:Creature Crab Beast
 PT:2/3
 K:Protection from red
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oraxid.jpg
-SetInfo:NMS|Common|http://magiccards.info/scans/en/ne/35.jpg
 Oracle:Protection from red
+SetInfo:NMS Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orb_of_dreams.txt b/res/cardsfolder/o/orb_of_dreams.txt
index 63d730d7c49..6396c7c049c 100644
--- a/res/cardsfolder/o/orb_of_dreams.txt
+++ b/res/cardsfolder/o/orb_of_dreams.txt
@@ -3,7 +3,6 @@ ManaCost:3
 Types:Artifact
 S:Mode$ ETBTapped | ValidCard$ Permanent | Description$ Permanents enter the battlefield tapped.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orb_of_dreams.jpg
-SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/156.jpg
 Oracle:Permanents enter the battlefield tapped.
+SetInfo:BOK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/orbweaver_kumo.txt b/res/cardsfolder/o/orbweaver_kumo.txt
index ab5e5f860df..fde07b9d40a 100644
--- a/res/cardsfolder/o/orbweaver_kumo.txt
+++ b/res/cardsfolder/o/orbweaver_kumo.txt
@@ -7,7 +7,6 @@ T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | Trig
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ Forestwalk
 SVar:BuffedBy:Arcane,Spirit
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orbweaver_kumo.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/231.jpg
 Oracle:Reach (This creature can block creatures with flying.)\nWhenever you cast a Spirit or Arcane spell, Orbweaver Kumo gains forestwalk until end of turn.
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orc_general.txt b/res/cardsfolder/o/orc_general.txt
index 3d27e60ae73..4ee31a227bf 100644
--- a/res/cardsfolder/o/orc_general.txt
+++ b/res/cardsfolder/o/orc_general.txt
@@ -4,7 +4,6 @@ Types:Creature Orc Warrior
 PT:2/2
 A:AB$ PumpAll | Cost$ T Sac<1/Goblin.Other;Orc.Other/another Orc or Goblin> | ValidCards$ Creature.Orc+Other | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Other Orc creatures get +1/+1 until end of turn.
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orc_general.jpg
-SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/72.jpg
 Oracle:{T}, Sacrifice another Orc or Goblin: Other Orc creatures get +1/+1 until end of turn.
+SetInfo:DRK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orchard_spirit.txt b/res/cardsfolder/o/orchard_spirit.txt
index 23cfe734640..0d4f02561f5 100644
--- a/res/cardsfolder/o/orchard_spirit.txt
+++ b/res/cardsfolder/o/orchard_spirit.txt
@@ -4,7 +4,6 @@ Types:Creature Spirit
 Text:CARDNAME can't be blocked except by creatures with flying or reach.
 PT:2/2
 K:CantBeBlockedBy Creature.withoutFlying+withoutReach
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orchard_spirit.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/198.jpg
 Oracle:Orchard Spirit can't be blocked except by creatures with flying or reach.
+SetInfo:ISD Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orchard_warden.txt b/res/cardsfolder/o/orchard_warden.txt
index 5cb00c913be..527f7ef6d1b 100644
--- a/res/cardsfolder/o/orchard_warden.txt
+++ b/res/cardsfolder/o/orchard_warden.txt
@@ -5,7 +5,6 @@ PT:4/6
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Treefolk.YouCtrl+Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ Whenever another Treefolk creature enters the battlefield under your control, you may gain life equal to that creature's toughness.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ Life | References$ Life
 SVar:Life:TriggeredCard$CardToughness
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orchard_warden.jpg
-SetInfo:MOR|Uncommon|http://magiccards.info/scans/en/mt/131.jpg
 Oracle:Whenever another Treefolk creature enters the battlefield under your control, you may gain life equal to that creature's toughness.
+SetInfo:MOR Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_artillery.txt b/res/cardsfolder/o/orcish_artillery.txt
index c65ea78ffce..86038288afd 100644
--- a/res/cardsfolder/o/orcish_artillery.txt
+++ b/res/cardsfolder/o/orcish_artillery.txt
@@ -5,17 +5,16 @@ PT:1/3
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you.
 SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83193.jpg
-SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/207.jpg
-SetInfo:LEA|Uncommon|http://magiccards.info/scans/en/al/166.jpg
-SetInfo:LEB|Uncommon|http://magiccards.info/scans/en/be/167.jpg
-SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/205.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/253.jpg
-SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/232.jpg
-SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/206.jpg
-SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/220.jpg
-SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/196.jpg
-SetInfo:3ED|Uncommon|http://magiccards.info/scans/en/rv/167.jpg
-SetInfo:2ED|Uncommon|http://magiccards.info/scans/en/un/166.jpg
 Oracle:{T}: Orcish Artillery deals 2 damage to target creature or player and 3 damage to you.
+SetInfo:8ED Uncommon
+SetInfo:2ED Uncommon
+SetInfo:7ED Uncommon
+SetInfo:6ED Uncommon
+SetInfo:9ED Uncommon
+SetInfo:10E Uncommon
+SetInfo:LEB Uncommon
+SetInfo:LEA Uncommon
+SetInfo:5ED Uncommon
+SetInfo:4ED Uncommon
+SetInfo:3ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_bloodpainter.txt b/res/cardsfolder/o/orcish_bloodpainter.txt
index b4e3b3be4b8..b4575acf074 100644
--- a/res/cardsfolder/o/orcish_bloodpainter.txt
+++ b/res/cardsfolder/o/orcish_bloodpainter.txt
@@ -4,7 +4,6 @@ Types:Creature Orc Shaman
 PT:2/1
 A:AB$ DealDamage | Cost$ T Sac<1/Creature> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_bloodpainter.jpg
-SetInfo:CSP|Common|http://magiccards.info/scans/en/cs/94.jpg
 Oracle:{T}, Sacrifice a creature: Orcish Bloodpainter deals 1 damage to target creature or player.
+SetInfo:CSP Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_cannonade.txt b/res/cardsfolder/o/orcish_cannonade.txt
index e2c1663a673..e8d18c93b87 100644
--- a/res/cardsfolder/o/orcish_cannonade.txt
+++ b/res/cardsfolder/o/orcish_cannonade.txt
@@ -5,7 +5,6 @@ A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select
 SVar:DB1:DB$DealDamage | NumDmg$ 3 | Defined$ You | SubAbility$ DB2
 SVar:DB2:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_cannonade.jpg
-SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/172.jpg
 Oracle:Orcish Cannonade deals 2 damage to target creature or player and 3 damage to you.\nDraw a card.
+SetInfo:TSP Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_cannoneers.txt b/res/cardsfolder/o/orcish_cannoneers.txt
index 8c5f7630e9d..bc6a48df857 100644
--- a/res/cardsfolder/o/orcish_cannoneers.txt
+++ b/res/cardsfolder/o/orcish_cannoneers.txt
@@ -5,7 +5,6 @@ PT:1/3
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you.
 SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_cannoneers.jpg
-SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/205.jpg
 Oracle:{T}: Orcish Cannoneers deals 2 damage to target creature or player and 3 damage to you.
+SetInfo:ICE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_captain.txt b/res/cardsfolder/o/orcish_captain.txt
index bb88cf77a57..504639c4328 100644
--- a/res/cardsfolder/o/orcish_captain.txt
+++ b/res/cardsfolder/o/orcish_captain.txt
@@ -6,8 +6,7 @@ A:AB$ FlipACoin | Cost$ 1 | ValidTgts$ Creature.Orc | TgtPrompt$ Select target O
 SVar:DBPumpPlus:DB$ Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ 2 | NumDef$ 0
 SVar:DBPumpMinus:DB$ Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ 0 | NumDef$ -2
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_captain.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/254.jpg
-SetInfo:FEM|Uncommon|http://magiccards.info/scans/en/fe/123.jpg
 Oracle:{1}: Flip a coin. If you win the flip, target Orc creature gets +2/+0 until end of turn. If you lose the flip, it gets -0/-2 until end of turn.
+SetInfo:5ED Uncommon
+SetInfo:FEM Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_farmer.txt b/res/cardsfolder/o/orcish_farmer.txt
index 292213d749d..ecba09c4539 100644
--- a/res/cardsfolder/o/orcish_farmer.txt
+++ b/res/cardsfolder/o/orcish_farmer.txt
@@ -4,8 +4,7 @@ Types:Creature Orc
 PT:2/2
 A:AB$ Animate | Cost$ T | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ Swamp | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True | UntilControllerNextUntap$ True | SpellDescription$ Target land becomes a Swamp until its controller's next untap step.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_farmer.jpg
-SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/256.jpg
-SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/207.jpg
 Oracle:{T}: Target land becomes a Swamp until its controller's next untap step.
+SetInfo:ICE Common
+SetInfo:5ED Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_healer.txt b/res/cardsfolder/o/orcish_healer.txt
index 32c8555bdd9..bac42cd09bc 100644
--- a/res/cardsfolder/o/orcish_healer.txt
+++ b/res/cardsfolder/o/orcish_healer.txt
@@ -7,7 +7,6 @@ A:AB$ Regenerate | Cost$ B B R T | ValidTgts$ Creature.Black,Creature.Green | Tg
 A:AB$ Regenerate | Cost$ R G G T | ValidTgts$ Creature.Black,Creature.Green | TgtPrompt$ Select target black or green creature | SpellDescription$ Regenerate target black or green creature.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Green|Black
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_healer.jpg
-SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/208.jpg
 Oracle:{R}{R}, {T}: Target creature can't be regenerated this turn.\n{B}{B}{R}, {T}: Regenerate target black or green creature.\n{R}{G}{G}, {T}: Regenerate target black or green creature.
+SetInfo:ICE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_librarian.txt b/res/cardsfolder/o/orcish_librarian.txt
index e45770eb711..01caac91bee 100644
--- a/res/cardsfolder/o/orcish_librarian.txt
+++ b/res/cardsfolder/o/orcish_librarian.txt
@@ -4,8 +4,7 @@ Types:Creature Orc
 PT:1/1
 A:AB$ Dig | Cost$ R T | Defined$ You | DigNum$ 8 | ChangeNum$ 4 | RandomChange$ True | DestinationZone$ Exile | LibraryPosition2$ 0 | DestinationZone2$ Library | SpellDescription$ Look at the top eight cards of your library. Exile four of them at random, then put the rest on top of your library in any order.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_librarian.jpg
-SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/66.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/209.jpg
 Oracle:{R}, {T}: Look at the top eight cards of your library. Exile four of them at random, then put the rest on top of your library in any order.
+SetInfo:ICE Rare
+SetInfo:TSB Special
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_lumberjack.txt b/res/cardsfolder/o/orcish_lumberjack.txt
index 25e48cd0c1a..670fd9ea71d 100644
--- a/res/cardsfolder/o/orcish_lumberjack.txt
+++ b/res/cardsfolder/o/orcish_lumberjack.txt
@@ -4,7 +4,6 @@ Types:Creature Orc
 PT:1/1
 A:AB$ Mana | Cost$ T Sac<1/Forest> | Produced$ Combo R G | Amount$ 3 | SpellDescription$ Add three mana in any combination of R and/or G to your mana pool.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_lumberjack.jpg
-SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/210.jpg
 Oracle:{T}, Sacrifice a Forest: Add three mana in any combination of {R} and/or {G} to your mana pool.
+SetInfo:ICE Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_mechanics.txt b/res/cardsfolder/o/orcish_mechanics.txt
index f351333efaa..15b28ff5444 100644
--- a/res/cardsfolder/o/orcish_mechanics.txt
+++ b/res/cardsfolder/o/orcish_mechanics.txt
@@ -4,7 +4,6 @@ Types:Creature Orc
 PT:1/1
 A:AB$ DealDamage | Cost$ T Sac<1/Artifact> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_mechanics.jpg
-SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/92.jpg
 Oracle:{T}, Sacrifice an artifact: Orcish Mechanics deals 2 damage to target creature or player.
+SetInfo:ATQ Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_mine.txt b/res/cardsfolder/o/orcish_mine.txt
index 868616ae970..26453ae211b 100644
--- a/res/cardsfolder/o/orcish_mine.txt
+++ b/res/cardsfolder/o/orcish_mine.txt
@@ -9,7 +9,6 @@ T:Mode$ Taps | ValidCard$ Card.AttachedBy | Execute$ TrigRemoveCounter | Seconda
 SVar:TrigRemoveCounter:AB$ RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ ORE | CounterNum$ 1 | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | Defined$ EnchantedController | NumDmg$ 2 | ConditionPresent$ Card.Self+counters_LE0_Ore | SubAbility$ DBDestroy | ConditionDescription$ If there are no ore counters on CARDNAME,
 SVar:DBDestroy:DB$ Destroy | Defined$ Enchanted | ConditionPresent$ Card.Self+counters_LE0_Ore
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_mine.jpg
-SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/98.jpg
 Oracle:Enchant land\nOrcish Mine enters the battlefield with three ore counters on it.\nAt the beginning of your upkeep and whenever enchanted land becomes tapped, remove an ore counter from Orcish Mine. If there are no ore counters on Orcish Mine, destroy that land and Orcish Mine deals 2 damage to its controller.
+SetInfo:HML Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_oriflamme.txt b/res/cardsfolder/o/orcish_oriflamme.txt
index 682a645d106..9d919573c6f 100644
--- a/res/cardsfolder/o/orcish_oriflamme.txt
+++ b/res/cardsfolder/o/orcish_oriflamme.txt
@@ -3,14 +3,14 @@ ManaCost:3 R
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.attacking+YouCtrl | AddPower$ 1 | Description$ Attacking creatures you control get +1/+0.
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_oriflamme.jpg
-SetInfo:LEA|Uncommon|http://magiccards.info/scans/en/al/167.jpg
-SetInfo:LEB|Uncommon|http://magiccards.info/scans/en/be/168.jpg
-SetInfo:7ED|Uncommon|http://magiccards.info/scans/en/7e/206.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/257.jpg
-SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/233.jpg
-SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/197.jpg
-SetInfo:3ED|Uncommon|http://magiccards.info/scans/en/rv/168.jpg
-SetInfo:2ED|Uncommon|http://magiccards.info/scans/en/un/167.jpg
 Oracle:Attacking creatures you control get +1/+0.
+SetInfo:2ED Uncommon
+SetInfo:7ED Uncommon
+SetInfo:6ED Uncommon
+SetInfo:S00 Uncommon
+SetInfo:LEB Uncommon
+SetInfo:LEA Uncommon
+SetInfo:5ED Uncommon
+SetInfo:4ED Uncommon
+SetInfo:3ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_settlers.txt b/res/cardsfolder/o/orcish_settlers.txt
index cbb2753ca82..eba10d0e675 100644
--- a/res/cardsfolder/o/orcish_settlers.txt
+++ b/res/cardsfolder/o/orcish_settlers.txt
@@ -6,7 +6,6 @@ A:AB$ Destroy | Cost$ X X R T Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ MaxTgt
 SVar:X:Targeted$Amount
 SVar:MaxTgts:Count$Valid Land
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_settlers.jpg
-SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/112.jpg
 Oracle:{X}{X}{R}, {T}, Sacrifice Orcish Settlers: Destroy X target lands.
+SetInfo:WTH Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_spy.txt b/res/cardsfolder/o/orcish_spy.txt
index 169adc0febc..e0e9b81f74f 100644
--- a/res/cardsfolder/o/orcish_spy.txt
+++ b/res/cardsfolder/o/orcish_spy.txt
@@ -3,8 +3,7 @@ ManaCost:R
 Types:Creature Orc Rogue
 PT:1/1
 A:AB$ Dig | Cost$ T | ValidTgts$ Player | TgtPrompt$ Select target player | DigNum$ 3 | NoMove$ True | SpellDescription$ Look at the top three cards of target player's library.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_spy.jpg
-SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/208.jpg
-SetInfo:FEM|Common|http://magiccards.info/scans/en/fe/124.jpg|3
 Oracle:{T}: Look at the top three cards of target player's library.
+SetInfo:8ED Common
+SetInfo:FEM Common x3
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_squatters.txt b/res/cardsfolder/o/orcish_squatters.txt
index 4d70e186d67..db3fd5e594b 100644
--- a/res/cardsfolder/o/orcish_squatters.txt
+++ b/res/cardsfolder/o/orcish_squatters.txt
@@ -5,8 +5,7 @@ PT:2/3
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may gain control of target land defending player controls for as long as you control CARDNAME. If you do, CARDNAME assigns no combat damage this turn.
 SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | ValidTgts$ Land.DefenderCtrl | TgtPrompt$ Select target land defending player controls | LoseControl$ LoseControl,LeavesPlay | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_squatters.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/258.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/211.jpg
 Oracle:Whenever Orcish Squatters attacks and isn't blocked, you may gain control of target land defending player controls for as long as you control Orcish Squatters. If you do, Orcish Squatters assigns no combat damage this turn.
+SetInfo:ICE Rare
+SetInfo:5ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_squatters_avatar.txt b/res/cardsfolder/o/orcish_squatters_avatar.txt
index 7aea47a95a4..1475bb8534a 100644
--- a/res/cardsfolder/o/orcish_squatters_avatar.txt
+++ b/res/cardsfolder/o/orcish_squatters_avatar.txt
@@ -7,7 +7,6 @@ SVar:TrigGetMana:AB$ Pump | Cost$ 0 | ValidTgts$ Player | RememberObjects$ Targe
 SVar:DBMana:DB$ Mana | Produced$ 1 | Amount$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Land.RememberedPlayerCtrl
-SVar:Rarity:Special
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/orcish_squatters_avatar.jpg
-SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo-2/orcish-squatters.jpg
 Oracle:Hand -1, life -1\nAt the beginning of your precombat main phase, add {X} to your mana pool, where X is the number of lands target opponent controls.
+SetInfo:VAN Special
\ No newline at end of file
diff --git a/res/cardsfolder/o/orcish_veteran.txt b/res/cardsfolder/o/orcish_veteran.txt
index 0d1fabf17e7..4288422b6fd 100644
--- a/res/cardsfolder/o/orcish_veteran.txt
+++ b/res/cardsfolder/o/orcish_veteran.txt
@@ -5,7 +5,6 @@ Text:CARDNAME can't block white creatures with power 2 or greater.
 PT:2/2
 K:CantBlock Creature.White+powerGE2
 A:AB$ Pump | Cost$ R | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_veteran.jpg
-SetInfo:FEM|Common|http://magiccards.info/scans/en/fe/127.jpg|4
 Oracle:Orcish Veteran can't block white creatures with power 2 or greater.\n{R}: Orcish Veteran gains first strike until end of turn.
+SetInfo:FEM Common x4
\ No newline at end of file
diff --git a/res/cardsfolder/o/order_of_leitbur.txt b/res/cardsfolder/o/order_of_leitbur.txt
index b5063c9c228..eaddafd6248 100644
--- a/res/cardsfolder/o/order_of_leitbur.txt
+++ b/res/cardsfolder/o/order_of_leitbur.txt
@@ -5,7 +5,6 @@ PT:2/1
 K:Protection from black
 A:AB$ Pump | Cost$ W | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 A:AB$ Pump | Cost$ W W | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_leitbur.jpg
-SetInfo:FEM|Common|http://magiccards.info/scans/en/fe/163.jpg|3
 Oracle:Protection from black\n{W}: Order of Leitbur gains first strike until end of turn.\n{W}{W}: Order of Leitbur gets +1/+0 until end of turn.
+SetInfo:FEM Common x3
\ No newline at end of file
diff --git a/res/cardsfolder/o/order_of_the_ebon_hand.txt b/res/cardsfolder/o/order_of_the_ebon_hand.txt
index 68152572f3b..44132b72a63 100644
--- a/res/cardsfolder/o/order_of_the_ebon_hand.txt
+++ b/res/cardsfolder/o/order_of_the_ebon_hand.txt
@@ -5,7 +5,6 @@ PT:2/1
 K:Protection from white
 A:AB$ Pump | Cost$ B | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 A:AB$ Pump | Cost$ B B | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_the_ebon_hand.jpg
-SetInfo:FEM|Common|http://magiccards.info/scans/en/fe/25.jpg|3
 Oracle:Protection from white\n{B}: Order of the Ebon Hand gains first strike until end of turn.\n{B}{B}: Order of the Ebon Hand gets +1/+0 until end of turn.
+SetInfo:FEM Common x3
\ No newline at end of file
diff --git a/res/cardsfolder/o/order_of_the_golden_cricket.txt b/res/cardsfolder/o/order_of_the_golden_cricket.txt
index e42594decec..f2cee4aa16a 100644
--- a/res/cardsfolder/o/order_of_the_golden_cricket.txt
+++ b/res/cardsfolder/o/order_of_the_golden_cricket.txt
@@ -4,7 +4,6 @@ Types:Creature Kithkin Knight
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, you may pay W. If you do, it gains flying until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ W | Defined$ Self | KW$ Flying
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_the_golden_cricket.jpg
-SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/19.jpg
 Oracle:Whenever Order of the Golden Cricket attacks, you may pay {W}. If you do, it gains flying until end of turn.
+SetInfo:MOR Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/order_of_the_sacred_bell.txt b/res/cardsfolder/o/order_of_the_sacred_bell.txt
index c2e58ca82cd..916467e833c 100644
--- a/res/cardsfolder/o/order_of_the_sacred_bell.txt
+++ b/res/cardsfolder/o/order_of_the_sacred_bell.txt
@@ -2,8 +2,7 @@ Name:Order of the Sacred Bell
 ManaCost:3 G
 Types:Creature Human Monk
 PT:4/3
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card82943.jpg
-SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/232.jpg
-SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/261.jpg
 Oracle:
+SetInfo:CHK Common
+SetInfo:9ED Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/order_of_the_sacred_torch.txt b/res/cardsfolder/o/order_of_the_sacred_torch.txt
index e1a4b0c7a90..a69f374bd36 100644
--- a/res/cardsfolder/o/order_of_the_sacred_torch.txt
+++ b/res/cardsfolder/o/order_of_the_sacred_torch.txt
@@ -4,9 +4,8 @@ Types:Creature Human Knight
 PT:2/2
 A:AB$ Counter | Cost$ T PayLife<1> | TargetType$ Spell | TgtPrompt$ Select target Black spell | ValidTgts$ Card.Black | SpellDescription$ Counter target black spell.
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_the_sacred_torch.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/324.jpg
-SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/32.jpg
-SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/269.jpg
 Oracle:{T}, Pay 1 life: Counter target black spell.
+SetInfo:ICE Rare
+SetInfo:5ED Rare
+SetInfo:6ED Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/order_of_the_stars.txt b/res/cardsfolder/o/order_of_the_stars.txt
index 70963f80938..99ffb6aad97 100644
--- a/res/cardsfolder/o/order_of_the_stars.txt
+++ b/res/cardsfolder/o/order_of_the_stars.txt
@@ -6,7 +6,6 @@ K:Defender
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentInHumanDeck
 K:Protection:Card.ChosenColor:CARDNAME has protection from the chosen color.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_the_stars.jpg
-SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/13.jpg
 Oracle:Defender (This creature can't attack.)\nAs Order of the Stars enters the battlefield, choose a color.\nOrder of the Stars has protection from the chosen color.
+SetInfo:GPT Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/order_of_the_white_shield.txt b/res/cardsfolder/o/order_of_the_white_shield.txt
index 99179ba8016..1f18b2bd3fb 100644
--- a/res/cardsfolder/o/order_of_the_white_shield.txt
+++ b/res/cardsfolder/o/order_of_the_white_shield.txt
@@ -5,8 +5,7 @@ PT:2/1
 K:Protection from black
 A:AB$ Pump | Cost$ W | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 A:AB$ Pump | Cost$ W W | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_the_white_shield.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/325.jpg
-SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/270.jpg
 Oracle:Protection from black\n{W}: Order of the White Shield gains first strike until end of turn.\n{W}{W}: Order of the White Shield gets +1/+0 until end of turn.
+SetInfo:ICE Uncommon
+SetInfo:5ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/order_of_whiteclay.txt b/res/cardsfolder/o/order_of_whiteclay.txt
index 14efd26dc7b..89a5406340b 100644
--- a/res/cardsfolder/o/order_of_whiteclay.txt
+++ b/res/cardsfolder/o/order_of_whiteclay.txt
@@ -3,7 +3,6 @@ ManaCost:1 W W
 Types:Creature Kithkin Cleric
 PT:1/4
 A:AB$ ChangeZone | Cost$ 1 W W Untap | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.cmcLE3+YouCtrl | TgtPrompt$ Select a creature card with converted mana cost 3 or less from your graveyard | ChangeNum$ 1 | SpellDescription$ Return target creature card with converted mana cost 3 or less from your graveyard to the battlefield.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_whiteclay.jpg
-SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/16.jpg
 Oracle:{1}{W}{W}, {Q}: Return target creature card with converted mana cost 3 or less from your graveyard to the battlefield. ({Q} is the untap symbol.)
+SetInfo:SHM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/order_of_yawgmoth.txt b/res/cardsfolder/o/order_of_yawgmoth.txt
index 37897d9cd66..8c092ac6d8d 100644
--- a/res/cardsfolder/o/order_of_yawgmoth.txt
+++ b/res/cardsfolder/o/order_of_yawgmoth.txt
@@ -5,7 +5,7 @@ PT:2/2
 K:Fear
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player  | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_yawgmoth.jpg
-SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/144.jpg
 Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nWhenever Order of Yawgmoth deals damage to a player, that player discards a card.
+SetInfo:DDE Uncommon
+SetInfo:USG Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ordered_migration.txt b/res/cardsfolder/o/ordered_migration.txt
index 744b55482b9..bda8d44a743 100644
--- a/res/cardsfolder/o/ordered_migration.txt
+++ b/res/cardsfolder/o/ordered_migration.txt
@@ -5,7 +5,6 @@ Text:Domain - Put a 1/1 blue Bird creature token with flying onto the battlefiel
 A:SP$ Token | Cost$ 3 W U | TokenAmount$ X | References$ X | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:X:Count$Domain
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ordered_migration.jpg
-SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/258.jpg
 Oracle:Domain - Put a 1/1 blue Bird creature token with flying onto the battlefield for each basic land type among lands you control.
+SetInfo:INV Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ordruun_commando.txt b/res/cardsfolder/o/ordruun_commando.txt
index 71f0c5a1dc0..c4c3282b2b0 100644
--- a/res/cardsfolder/o/ordruun_commando.txt
+++ b/res/cardsfolder/o/ordruun_commando.txt
@@ -5,7 +5,6 @@ PT:4/1
 A:AB$ PreventDamage | Cost$ W | Defined$ Self | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to CARDNAME this turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$white
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ordruun_commando.jpg
-SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/137.jpg
 Oracle:{W}: Prevent the next 1 damage that would be dealt to Ordruun Commando this turn.
+SetInfo:RAV Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ordruun_veteran.txt b/res/cardsfolder/o/ordruun_veteran.txt
index 9410522b23f..11c37deb62f 100644
--- a/res/cardsfolder/o/ordruun_veteran.txt
+++ b/res/cardsfolder/o/ordruun_veteran.txt
@@ -5,7 +5,6 @@ PT:3/1
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, CARDNAME gains double strike until end of turn.
 SVar:TrigBattalionPump:AB$ Pump | Cost$ 0 | KW$ Double Strike
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ordruun_veteran.jpg
-SetInfo:GTC|Uncommon|http://magiccards.info/scans/en/gtc/184.jpg
 Oracle:Battalion - Whenever Ordruun Veteran and at least two other creatures attack, Ordruun Veteran gains double strike until end of turn. (It deals both first-strike and regular combat damage.)
+SetInfo:GTC Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ore_gorger.txt b/res/cardsfolder/o/ore_gorger.txt
index 47c64702a30..38aaebb3180 100644
--- a/res/cardsfolder/o/ore_gorger.txt
+++ b/res/cardsfolder/o/ore_gorger.txt
@@ -5,7 +5,6 @@ PT:3/1
 T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDestroy | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may destroy target nonbasic land.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ore_gorger.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/182.jpg
 Oracle:Whenever you cast a Spirit or Arcane spell, you may destroy target nonbasic land.
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/organ_grinder.txt b/res/cardsfolder/o/organ_grinder.txt
index 906705a9cdd..edd8ad2c267 100644
--- a/res/cardsfolder/o/organ_grinder.txt
+++ b/res/cardsfolder/o/organ_grinder.txt
@@ -3,7 +3,6 @@ ManaCost:2 B
 Types:Creature Zombie
 PT:3/1
 A:AB$ LoseLife | Cost$ T ExileFromGrave<3/Card>  | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | SpellDescription$ Target player loses 3 life.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/organ_grinder.jpg
-SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/75.jpg
 Oracle:{T}, Exile three cards from your graveyard: Target player loses 3 life.
+SetInfo:TOR Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orgg.txt b/res/cardsfolder/o/orgg.txt
index 633ce7a8db5..acb56e9d0e6 100644
--- a/res/cardsfolder/o/orgg.txt
+++ b/res/cardsfolder/o/orgg.txt
@@ -6,9 +6,8 @@ PT:6/6
 K:Trample
 K:CARDNAME can't attack if defending player controls an untapped creature with power 3 or greater.
 K:CantBlock Creature.powerGE3
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orgg.jpg
-SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/259.jpg
-SetInfo:FEM|Rare|http://magiccards.info/scans/en/fe/131.jpg
-SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/67.jpg
 Oracle:Trample\nOrgg can't attack if defending player controls an untapped creature with power 3 or greater.\nOrgg can't block creatures with power 3 or greater.
+SetInfo:5ED Rare
+SetInfo:TSB Special
+SetInfo:FEM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/origin_spellbomb.txt b/res/cardsfolder/o/origin_spellbomb.txt
index eab157ccc1c..f382a58540c 100644
--- a/res/cardsfolder/o/origin_spellbomb.txt
+++ b/res/cardsfolder/o/origin_spellbomb.txt
@@ -4,7 +4,6 @@ Types:Artifact
 A:AB$ Token | Cost$ 1 T Sac<1/CARDNAME> | TokenImage$ C 1 1 Myr | TokenColors$ Colorless | TokenAmount$ 1 | TokenName$ Myr | TokenTypes$ Artifact,Creature,Myr | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 colorless Myr artifact creature token onto the battlefield.
 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 W. If you do, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ W | NumCards$ 1
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/origin_spellbomb.jpg
-SetInfo:SOM|Common|http://magiccards.info/scans/en/som/189.jpg
 Oracle:{1}, {T}, Sacrifice Origin Spellbomb: Put a 1/1 colorless Myr artifact creature token onto the battlefield.\nWhen Origin Spellbomb is put into a graveyard from the battlefield, you may pay {W}. If you do, draw a card.
+SetInfo:SOM Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orim.txt b/res/cardsfolder/o/orim.txt
index 18c26064f92..17477d4b696 100644
--- a/res/cardsfolder/o/orim.txt
+++ b/res/cardsfolder/o/orim.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+0/+12
 S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl | AddKeyword$ Reach | Description$ Creatures you control have reach.
-SVar:Rarity:Special
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/orim.jpg
-SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard/orim.jpg
 Oracle:Hand +0, life +12\nCreatures you control have reach.
+SetInfo:VAN Special
\ No newline at end of file
diff --git a/res/cardsfolder/o/orim_samite_healer.txt b/res/cardsfolder/o/orim_samite_healer.txt
index 32006361e88..837dfed4984 100644
--- a/res/cardsfolder/o/orim_samite_healer.txt
+++ b/res/cardsfolder/o/orim_samite_healer.txt
@@ -3,7 +3,6 @@ ManaCost:1 W W
 Types:Legendary Creature Human Cleric
 PT:1/3
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 3 | SpellDescription$ Prevent the next 3 damage that would be dealt to target creature or player this turn.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orim_samite_healer.jpg
-SetInfo:TMP|Rare|http://magiccards.info/scans/en/tp/244.jpg
 Oracle:{T}: Prevent the next 3 damage that would be dealt to target creature or player this turn.
+SetInfo:TMP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/orims_chant.txt b/res/cardsfolder/o/orims_chant.txt
index 47f626b143d..1330916e907 100644
--- a/res/cardsfolder/o/orims_chant.txt
+++ b/res/cardsfolder/o/orims_chant.txt
@@ -5,7 +5,6 @@ A:SP$ Effect | Cost$ W | Name$ Orim's Chant Effect | IsCurse$ True | StaticAbili
 SVar:CantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card | Caster$ Player.IsRemembered | Description$ Target player can't cast spells this turn.
 A:SP$ Effect | Cost$ W W | SetAsKicked$ True | Name$ Orim's Chant Effect | IsCurse$ True | StaticAbilities$ CantBeCast,CantAttack | ValidTgts$ Player | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SpellDescription$ Kicker W W (You may pay an additional W W as you cast this spell.)
 SVar:CantAttack:Mode$ Continuous | EffectZone$ Command | Affected$ Creature | AffectedZone$ Battlefield | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Creatures can't attack this turn.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orims_chant.jpg
-SetInfo:PLS|Rare|http://magiccards.info/scans/en/ps/11.jpg
 Oracle:Kicker {W} (You may pay an additional {W} as you cast this spell.)\nTarget player can't cast spells this turn.\nIf Orim's Chant was kicked, creatures can't attack this turn.
+SetInfo:PLS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/orims_cure.txt b/res/cardsfolder/o/orims_cure.txt
index 16ed92f638e..4a764fead05 100644
--- a/res/cardsfolder/o/orims_cure.txt
+++ b/res/cardsfolder/o/orims_cure.txt
@@ -3,7 +3,6 @@ ManaCost:1 W
 Types:Instant
 A:SP$ PreventDamage | Cost$ tapXType<1/Creature> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 4 | IsPresent$ Plains.YouCtrl | CostDesc$ If you control a Plains, | SpellDescription$ you may tap an untapped creature you control rather than pay CARDNAME's mana cost.
 A:SP$ PreventDamage | Cost$ 1 W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 4 | SpellDescription$ Prevent the next 4 damage that would be dealt to target creature or player this turn.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orims_cure.jpg
-SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/33.jpg
 Oracle:If you control a Plains, you may tap an untapped creature you control rather than pay Orim's Cure's mana cost.\nPrevent the next 4 damage that would be dealt to target creature or player this turn.
+SetInfo:MMQ Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orims_prayer.txt b/res/cardsfolder/o/orims_prayer.txt
index e96b47f754c..a00b8a90b2f 100644
--- a/res/cardsfolder/o/orims_prayer.txt
+++ b/res/cardsfolder/o/orims_prayer.txt
@@ -4,7 +4,6 @@ Types:Enchantment
 T:Mode$ AttackersDeclared | AttackingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever one or more creatures attack you, you gain 1 life for each attacking creature.
 SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | LifeAmount$ X | References$ X
 SVar:X:Count$Valid Creature.attacking
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orims_prayer.jpg
-SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/245.jpg
 Oracle:Whenever one or more creatures attack you, you gain 1 life for each attacking creature.
+SetInfo:TMP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orims_thunder.txt b/res/cardsfolder/o/orims_thunder.txt
index 009b5dc3d1e..ac04b577988 100644
--- a/res/cardsfolder/o/orims_thunder.txt
+++ b/res/cardsfolder/o/orims_thunder.txt
@@ -5,8 +5,8 @@ A:SP$ Destroy | Cost$ 2 W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select
 A:SP$ Destroy | Cost$ 2 W R | SetAsKicked$ True | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DBDamage | SpellDescription$ Kicker R (You may pay an additional R as you cast this spell.) If CARDNAME was kicked, it deals damage equal to that permanent's converted mana cost to target creature.
 SVar:DBDamage:DB$DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | References$ X
 SVar:X:Remembered$CardManaCost
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orims_thunder.jpg
-SetInfo:APC|Common|http://magiccards.info/scans/en/ap/15.jpg
-SetInfo:COM|Common|http://magiccards.info/scans/en/cmd/24.jpg
 Oracle:Kicker {R} (You may pay an additional {R} as you cast this spell.)\nDestroy target artifact or enchantment. If Orim's Thunder was kicked, it deals damage equal to that permanent's converted mana cost to target creature.
+SetInfo:APC Common
+SetInfo:COM Common
+SetInfo:HOP Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orims_touch.txt b/res/cardsfolder/o/orims_touch.txt
index 85f874e098d..c44c058dc5b 100644
--- a/res/cardsfolder/o/orims_touch.txt
+++ b/res/cardsfolder/o/orims_touch.txt
@@ -4,7 +4,6 @@ Types:Instant
 K:Kicker 1
 A:SP$ PreventDamage | Cost$ W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ X | References$ X | SpellDescription$ Prevent the next 2 damage that would be dealt to target creature or player this turn. If CARDNAME was kicked, prevent the next 4 damage that would be dealt to that creature or player this turn instead.
 SVar:X:Count$Kicked.4.2
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orims_touch.jpg
-SetInfo:INV|Common|http://magiccards.info/scans/en/in/23.jpg
 Oracle:Kicker {1} (You may pay an additional {1} as you cast this spell.)\nPrevent the next 2 damage that would be dealt to target creature or player this turn. If Orim's Touch was kicked, prevent the next 4 damage that would be dealt to that creature or player this turn instead.
+SetInfo:INV Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oriss_samite_guardian.txt b/res/cardsfolder/o/oriss_samite_guardian.txt
index c57ee28542a..055a393a2af 100644
--- a/res/cardsfolder/o/oriss_samite_guardian.txt
+++ b/res/cardsfolder/o/oriss_samite_guardian.txt
@@ -7,7 +7,6 @@ A:AB$ Effect | Cost$ Discard<1/Card.namedOriss, Samite Guardian> | CostDesc$ Gra
 SVar:CantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card | Caster$ Player.IsRemembered | Description$ Targeted player can't cast spells this turn.
 SVar:CantAttack:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Creatures targeted player controls can't attack this turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oriss_samite_guardian.jpg
-SetInfo:FUT|Rare|http://magiccards.info/scans/en/fut/28.jpg
 Oracle:{T}: Prevent all damage that would be dealt to target creature this turn.\nGrandeur - Discard another card named Oriss, Samite Guardian: Target player can't cast spells this turn, and creatures that player controls can't attack this turn.
+SetInfo:FUT Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/ornate_kanzashi.txt b/res/cardsfolder/o/ornate_kanzashi.txt
index 424f294b151..fb6f9ac7fca 100644
--- a/res/cardsfolder/o/ornate_kanzashi.txt
+++ b/res/cardsfolder/o/ornate_kanzashi.txt
@@ -5,7 +5,6 @@ A:AB$ Mill | Cost$ 2 T | ValidTgts$ Opponent | TgtPrompt$ Select target opponent
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played by your opponent | PumpZone$ Exile | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ornate_kanzashi.jpg
-SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/157.jpg
 Oracle:{2}, {T}: Target opponent exiles the top card of his or her library. You may play that card this turn.
+SetInfo:BOK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/ornithopter.txt b/res/cardsfolder/o/ornithopter.txt
index 51556a34136..e4a05603b83 100644
--- a/res/cardsfolder/o/ornithopter.txt
+++ b/res/cardsfolder/o/ornithopter.txt
@@ -3,16 +3,15 @@ ManaCost:0
 Types:Artifact Creature Thopter
 PT:0/2
 K:Flying
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card95220.jpg
-SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/393.jpg
-SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/359.jpg
-SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/305.jpg
-SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/336.jpg
-SetInfo:M11|Uncommon|http://magiccards.info/scans/en/m11/211.jpg
-SetInfo:M10|Uncommon|http://magiccards.info/scans/en/m10/216.jpg
-SetInfo:6ED|Uncommon|http://magiccards.info/scans/en/6e/303.jpg
-SetInfo:3ED|Uncommon|http://magiccards.info/scans/en/rv/270.jpg
-SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/25.jpg
-SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/224.jpg
 Oracle:Flying
+SetInfo:M11 Uncommon
+SetInfo:6ED Uncommon
+SetInfo:M10 Uncommon
+SetInfo:9ED Uncommon
+SetInfo:10E Uncommon
+SetInfo:ATQ Common
+SetInfo:MRD Uncommon
+SetInfo:5ED Uncommon
+SetInfo:4ED Uncommon
+SetInfo:3ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orochi_eggwatcher_shidako_broodmistress.txt b/res/cardsfolder/o/orochi_eggwatcher_shidako_broodmistress.txt
index d4595e560da..2ee4deee247 100644
--- a/res/cardsfolder/o/orochi_eggwatcher_shidako_broodmistress.txt
+++ b/res/cardsfolder/o/orochi_eggwatcher_shidako_broodmistress.txt
@@ -5,10 +5,8 @@ PT:1/1
 A:AB$Token | Cost$ 2 G T | TokenAmount$ 1 | TokenOwner$ You | TokenName$ Snake | TokenTypes$ Creature,Snake | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SubAbility$ DBFlip | SpellDescription$ Put a 1/1 green Snake creature token onto the battlefield. If you control ten or more creatures, flip CARDNAME.
 SVar:DBFlip:DB$SetState | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ GE10 | References$ X | Mode$ Flip
 SVar:X:Count$Valid Creature.YouCtrl
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orochi_eggwatcher.jpg
 AlternateMode:Flip
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/233a.jpg
 Oracle:{2}{G}, {T}: Put a 1/1 green Snake creature token onto the battlefield. If you control ten or more creatures, flip Orochi Eggwatcher.
 
 ALTERNATE
@@ -18,7 +16,6 @@ Colors:green
 Types:Legendary Creature Snake Shaman
 PT:3/3
 A:AB$Pump | Cost$ G Sac<1/Creature> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | SpellDescription$ Target creature gets +3/+3 until end of turn.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shidako_broodmistress.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/233b.jpg
 Oracle:{G}, Sacrifice a creature: Target creature gets +3/+3 until end of turn.
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orochi_hatchery.txt b/res/cardsfolder/o/orochi_hatchery.txt
index 2cebf38ff96..d13ce3b0719 100644
--- a/res/cardsfolder/o/orochi_hatchery.txt
+++ b/res/cardsfolder/o/orochi_hatchery.txt
@@ -6,7 +6,6 @@ A:AB$ Token | Cost$ 5 T | TokenAmount$ Y | References$ Y | TokenController$ You
 SVar:X:Count$xPaid
 SVar:Y:Count$CardCounters.CHARGE
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orochi_hatchery.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/266.jpg
 Oracle:Orochi Hatchery enters the battlefield with X charge counters on it.\n{5}, {T}: Put a 1/1 green Snake creature token onto the battlefield for each charge counter on Orochi Hatchery.
+SetInfo:CHK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/orochi_leafcaller.txt b/res/cardsfolder/o/orochi_leafcaller.txt
index d360fb91dbe..f58eec4b15b 100644
--- a/res/cardsfolder/o/orochi_leafcaller.txt
+++ b/res/cardsfolder/o/orochi_leafcaller.txt
@@ -4,7 +4,6 @@ Types:Creature Snake Shaman
 PT:1/1
 A:AB$ Mana | Cost$ 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/orochi_leafcaller.jpg
-SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/234.jpg
 Oracle:{G}: Add one mana of any color to your mana pool.
+SetInfo:CHK Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orochi_ranger.txt b/res/cardsfolder/o/orochi_ranger.txt
index 4578e3554fc..333d0d543b8 100644
--- a/res/cardsfolder/o/orochi_ranger.txt
+++ b/res/cardsfolder/o/orochi_ranger.txt
@@ -6,7 +6,6 @@ T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDama
 SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredTarget | SubAbility$ DBPump
 SVar:DBPump:DB$Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True
 SVar:HasCombatEffect:TRUE
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orochi_ranger.jpg
-SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/235.jpg
 Oracle:Whenever Orochi Ranger deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
+SetInfo:CHK Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orochi_sustainer.txt b/res/cardsfolder/o/orochi_sustainer.txt
index 5e45975b9a5..906e16675b2 100644
--- a/res/cardsfolder/o/orochi_sustainer.txt
+++ b/res/cardsfolder/o/orochi_sustainer.txt
@@ -3,7 +3,6 @@ ManaCost:1 G
 Types:Creature Snake Shaman
 PT:1/2
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
-SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card75403.jpg
-SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/236.jpg
 Oracle:{T}: Add {G} to your mana pool.
+SetInfo:CHK Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oros_the_avenger.txt b/res/cardsfolder/o/oros_the_avenger.txt
index b132bfe16ed..53abffcdd6d 100644
--- a/res/cardsfolder/o/oros_the_avenger.txt
+++ b/res/cardsfolder/o/oros_the_avenger.txt
@@ -5,8 +5,7 @@ PT:6/6
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDamageAll | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay 2 W.  If you do, CARDNAME deals 3 damage to each nonwhite creature.
 SVar:TrigDamageAll:AB$DamageAll | Cost$ 2 W | ValidCards$ Creature.nonWhite | NumDmg$ 3
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oros_the_avenger.jpg
-SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/216.jpg
-SetInfo:PLC|Rare|http://magiccards.info/scans/en/pc/161.jpg
 Oracle:Flying\nWhenever Oros, the Avenger deals combat damage to a player, you may pay {2}{W}. If you do, Oros deals 3 damage to each nonwhite creature.
+SetInfo:COM Rare
+SetInfo:PLC Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/orzhov_basilica.txt b/res/cardsfolder/o/orzhov_basilica.txt
index b6cf66e9141..ff415e10033 100644
--- a/res/cardsfolder/o/orzhov_basilica.txt
+++ b/res/cardsfolder/o/orzhov_basilica.txt
@@ -6,8 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
 A:AB$ Mana | Cost$ T | Produced$ W B | SpellDescription$ Add W B to your mana pool.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_basilica.jpg
-SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/161.jpg
-SetInfo:COM|Common|http://magiccards.info/scans/en/cmd/283.jpg
 Oracle:Orzhov Basilica enters the battlefield tapped.\nWhen Orzhov Basilica enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {W}{B} to your mana pool.
+SetInfo:GPT Common
+SetInfo:COM Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orzhov_charm.txt b/res/cardsfolder/o/orzhov_charm.txt
index 2a5d92b1ba4..80db8fdb2df 100644
--- a/res/cardsfolder/o/orzhov_charm.txt
+++ b/res/cardsfolder/o/orzhov_charm.txt
@@ -10,7 +10,6 @@ SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:Targeted$CardToughness
 SVar:DBZombify:DB$ ChangeZone | ValidTgts$ Creature.cmcLE1+YouOwn | TgtPrompt$ Select target creature card with converted mana cost 1 or less in your graveyard | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return target creature card with converted mana cost 1 or less from your graveyard to the battlefield.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_charm.jpg
-SetInfo:GTC|Uncommon|http://magiccards.info/scans/en/gtc/185.jpg
 Oracle:Choose one — Return target creature you control and all Auras you control attached to it to their owner's hand; or destroy target creature and you lose life equal to its toughness; or return target creature card with converted mana cost 1 or less from your graveyard to the battlefield.
+SetInfo:GTC Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orzhov_euthanist.txt b/res/cardsfolder/o/orzhov_euthanist.txt
index 94f8d94fe32..f7c4e98cedf 100644
--- a/res/cardsfolder/o/orzhov_euthanist.txt
+++ b/res/cardsfolder/o/orzhov_euthanist.txt
@@ -5,5 +5,5 @@ PT:2/2
 K:Haunt:TrigDestroy:Destroy target creature that was dealt damage this turn.
 SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | ValidTgts$ Creature.wasDealtDamageThisTurn | TgtPrompt$ Select target creature that was dealt damage this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_euthanist.jpg
-SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/54.jpg
 Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Orzhov Euthanist enters the battlefield or the creature it haunts dies, destroy target creature that was dealt damage this turn.
+SetInfo:GPT Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orzhov_guildgate.txt b/res/cardsfolder/o/orzhov_guildgate.txt
index 76182980756..3af8dae946a 100644
--- a/res/cardsfolder/o/orzhov_guildgate.txt
+++ b/res/cardsfolder/o/orzhov_guildgate.txt
@@ -4,7 +4,6 @@ Types:Land Gate
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_guildgate.jpg
-SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/244.jpg
 Oracle:Orzhov Guildgate enters the battlefield tapped.\n{T}: Add {W} or {B} to your mana pool.
+SetInfo:GTC Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orzhov_guildmage.txt b/res/cardsfolder/o/orzhov_guildmage.txt
index c2a11ea6571..0931f66f370 100644
--- a/res/cardsfolder/o/orzhov_guildmage.txt
+++ b/res/cardsfolder/o/orzhov_guildmage.txt
@@ -4,8 +4,7 @@ Types:Creature Human Wizard
 PT:2/2
 A:AB$ GainLife | Cost$ 2 W | LifeAmount$ 1 | ValidTgts$ Player | TgtPrompt$ Select target player | SpellDescription$ Target player gains 1 life.
 A:AB$ LoseLife | Cost$ 2 B | LifeAmount$ 1 | Defined$ Each | SpellDescription$ Each player loses 1 life.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_guildmage.jpg
-SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/147.jpg
-SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/217.jpg
 Oracle:{2}{W}: Target player gains 1 life.\n{2}{B}: Each player loses 1 life.
+SetInfo:GPT Uncommon
+SetInfo:COM Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orzhov_keyrune.txt b/res/cardsfolder/o/orzhov_keyrune.txt
index 45429815627..6dc31629b1f 100644
--- a/res/cardsfolder/o/orzhov_keyrune.txt
+++ b/res/cardsfolder/o/orzhov_keyrune.txt
@@ -6,7 +6,6 @@ A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
 A:AB$ Animate | Cost$ W B | Defined$ Self | Power$ 1 | Toughness$ 4 | Types$ Artifact,Creature,Thrull | Colors$ White,Black | Keywords$ Lifelink | SpellDescription$ CARDNAME becomes a 1/4 white and black Thrull artifact creature with lifelink until end of turn.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$White|Black
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_keyrune.jpg
-SetInfo:GTC|Uncommon|http://magiccards.info/scans/en/gtc/233.jpg
 Oracle:{T}: Add {W} or {B} to your mana pool.\n{W}{B}: Orzhov Keyrune becomes a 1/4 white and black Thrull artifact creature with lifelink until end of turn.
+SetInfo:GTC Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/orzhov_pontiff.txt b/res/cardsfolder/o/orzhov_pontiff.txt
index 0e79c10abdf..c91d0947faf 100644
--- a/res/cardsfolder/o/orzhov_pontiff.txt
+++ b/res/cardsfolder/o/orzhov_pontiff.txt
@@ -7,7 +7,6 @@ SVar:TrigChoose:AB$ Charm | Cost$ 0 | Choices$ DBPump,DBCurse | CharmNum$ 1
 SVar:DBPump:DB$ PumpAll | ValidCards$ Card.Creature+YouCtrl | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
 SVar:DBCurse:DB$ PumpAll | ValidCards$ Card.Creature+YouDontCtrl | NumAtt$ -1 | NumDef$ -1 | SpellDescription$ Creatures you don't control get -1/-1 until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_pontiff.jpg
-SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/124.jpg
 Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Orzhov Pontiff enters the battlefield or the creature it haunts dies, choose one - Creatures you control get +1/+1 until end of turn; or creatures you don't control get -1/-1 until end of turn.
+SetInfo:GPT Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/orzhov_signet.txt b/res/cardsfolder/o/orzhov_signet.txt
index 54b2befe218..965dc7d0465 100644
--- a/res/cardsfolder/o/orzhov_signet.txt
+++ b/res/cardsfolder/o/orzhov_signet.txt
@@ -3,8 +3,7 @@ ManaCost:2
 Types:Artifact
 A:AB$ Mana | Cost$ 1 T | Produced$ W B | SpellDescription$ Add W B to your mana pool.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_signet.jpg
-SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/155.jpg
-SetInfo:COM|Common|http://magiccards.info/scans/en/cmd/255.jpg
 Oracle:{1}, {T}: Add {W}{B} to your mana pool.
+SetInfo:GPT Common
+SetInfo:COM Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/orzhova_the_church_of_deals.txt b/res/cardsfolder/o/orzhova_the_church_of_deals.txt
index 2ecbb0c04c1..0e9aed29f0d 100644
--- a/res/cardsfolder/o/orzhova_the_church_of_deals.txt
+++ b/res/cardsfolder/o/orzhova_the_church_of_deals.txt
@@ -4,7 +4,6 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ LoseLife | Cost$ 3 W B T | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 1 life and you gain 1 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhova_the_church_of_deals.jpg
-SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/162.jpg
 Oracle:{T}: Add {1} to your mana pool.\n{3}{W}{B}, {T}: Target player loses 1 life and you gain 1 life.
+SetInfo:GPT Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/osai_vultures.txt b/res/cardsfolder/o/osai_vultures.txt
index a3dfed93012..87996c9983a 100644
--- a/res/cardsfolder/o/osai_vultures.txt
+++ b/res/cardsfolder/o/osai_vultures.txt
@@ -7,8 +7,7 @@ T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE1 | TriggerZo
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | CounterType$ CARRION | CounterNum$ 1 | Defined$ Self
 A:AB$ Pump | Cost$ SubCounter<2/CARRION> | NumAtt$ 1 | NumDef$ 1 | Defined$ Self | CostDesc$ Remove two carrion counters from Osai Vultures: | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/osai_vultures.jpg
-SetInfo:4ED|Uncommon|http://magiccards.info/scans/en/4e/288.jpg
-SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/198.jpg
 Oracle:Flying\nAt the beginning of each end step, if a creature died this turn, put a carrion counter on Osai Vultures.\nRemove two carrion counters from Osai Vultures: Osai Vultures gets +1/+1 until end of turn.
+SetInfo:LEG Common
+SetInfo:4ED Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ostiary_thrull.txt b/res/cardsfolder/o/ostiary_thrull.txt
index 652df670962..1b5fb2b095e 100644
--- a/res/cardsfolder/o/ostiary_thrull.txt
+++ b/res/cardsfolder/o/ostiary_thrull.txt
@@ -5,7 +5,6 @@ PT:2/2
 A:AB$ Tap | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
 SVar:RemRandomDeck:True
 DeckNeeds:Color$white
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ostiary_thrull.jpg
-SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/55.jpg
 Oracle:{W}, {T}: Tap target creature.
+SetInfo:GPT Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/ostracize.txt b/res/cardsfolder/o/ostracize.txt
index f75bb896953..0931268a922 100644
--- a/res/cardsfolder/o/ostracize.txt
+++ b/res/cardsfolder/o/ostracize.txt
@@ -2,8 +2,7 @@ Name:Ostracize
 ManaCost:B
 Types:Sorcery
 A:SP$ Discard | Cost$ B | ValidTgts$ Opponent | NumCards$ 1 | DiscardValid$ Creature | Mode$ RevealYouChoose | SpellDescription$ Target opponent reveals his or her hand. You choose a creature card from it. That player discards that card.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ostracize.jpg
-SetInfo:ULG|Common|http://magiccards.info/scans/en/ul/57.jpg
-SetInfo:7ED|Common|http://magiccards.info/scans/en/7e/153.jpg
 Oracle:Target opponent reveals his or her hand. You choose a creature card from it. That player discards that card.
+SetInfo:ULG Common
+SetInfo:7ED Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/otarian_juggernaut.txt b/res/cardsfolder/o/otarian_juggernaut.txt
index c9f65cb6e7f..55779e74b35 100644
--- a/res/cardsfolder/o/otarian_juggernaut.txt
+++ b/res/cardsfolder/o/otarian_juggernaut.txt
@@ -4,7 +4,6 @@ Types:Artifact Creature Juggernaut
 PT:2/3
 K:CARDNAME can't be blocked by Walls.
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddKeyword$ CARDNAME attacks each turn if able. | Condition$ Threshold | Description$ Threshold - As long as seven or more cards are in your graveyard, CARDNAME gets +3/+0 and attacks each turn if able.
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/otarian_juggernaut.jpg
-SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/305.jpg
 Oracle:Otarian Juggernaut can't be blocked by Walls.\nThreshold - As long as seven or more cards are in your graveyard, Otarian Juggernaut gets +3/+0 and attacks each turn if able.
+SetInfo:ODY Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/otherworld_atlas.txt b/res/cardsfolder/o/otherworld_atlas.txt
index 1d957111c46..482835cd4b1 100644
--- a/res/cardsfolder/o/otherworld_atlas.txt
+++ b/res/cardsfolder/o/otherworld_atlas.txt
@@ -5,7 +5,6 @@ A:AB$ PutCounter | Cost$ T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescript
 A:AB$ Draw | Cost$ T | Defined$ Each | NumCards$ X | References$ X | SpellDescription$ Each player draws a card for each charge counter on CARDNAME.
 SVar:X:Count$CardCounters.CHARGE
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/otherworld_atlas.jpg
-SetInfo:AVR|Rare|http://magiccards.info/scans/en/avr/219.jpg
 Oracle:{T}: Put a charge counter on Otherworld Atlas.\n{T}: Each player draws a card for each charge counter on Otherworld Atlas.
+SetInfo:AVR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/otherworldly_journey.txt b/res/cardsfolder/o/otherworldly_journey.txt
index b539677fb27..bd7c265b722 100644
--- a/res/cardsfolder/o/otherworldly_journey.txt
+++ b/res/cardsfolder/o/otherworldly_journey.txt
@@ -5,7 +5,7 @@ A:SP$ ChangeZone | Cost$ 1 W | Origin$ Battlefield | Destination$ Exile | ValidT
 SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled card to the battlefield with a +1/+1 counter on it.
 SVar:TrigReturn:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBAddCounter
 SVar:DBAddCounter:DB$ PutCounter | Cost$ 0 | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/otherworldly_journey.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/37.jpg
 Oracle:Exile target creature. At the beginning of the next end step, return that card to the battlefield under its owner's control with a +1/+1 counter on it.
+SetInfo:DDC Uncommon
+SetInfo:CHK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/oubliette.txt b/res/cardsfolder/o/oubliette.txt
index ec76859c284..9f584ced221 100644
--- a/res/cardsfolder/o/oubliette.txt
+++ b/res/cardsfolder/o/oubliette.txt
@@ -7,7 +7,6 @@ SVar:TrigExile:DB$ChangeZone | Cost$ 0 | TargetMin$ 1 | ValidTgts$ Creature | Tg
 SVar:TrigReturn:DB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
-SVar:Rarity:
 SVar:Picture:http://resources.wizards.com/magic/cards/med/en-us/card159135.jpg
-SetInfo:ARN|Common|http://magiccards.info/scans/en/an/11.jpg|2
 Oracle:When Oubliette enters the battlefield, exile target creature and all Auras attached to it. Note the number and kind of counters that were on that creature.\nWhen Oubliette leaves the battlefield, return the exiled card to the battlefield under its owner's control tapped with the noted number and kind of counters on it. If you do, return the exiled Aura cards to the battlefield under their owner's control attached to that permanent.
+SetInfo:ARN Common x2
\ No newline at end of file
diff --git a/res/cardsfolder/o/ouphe_vandals.txt b/res/cardsfolder/o/ouphe_vandals.txt
index 05b4079517e..2667287144c 100644
--- a/res/cardsfolder/o/ouphe_vandals.txt
+++ b/res/cardsfolder/o/ouphe_vandals.txt
@@ -5,7 +5,6 @@ PT:2/2
 A:AB$ Counter | Cost$ G Sac<1/CARDNAME> | TargetType$ Activated | TgtPrompt$ Select target ability | ValidTgts$ Artifact | SubAbility$ DBDestroy | RememberTargets$ True | SpellDescription$ Counter target activated ability from an artifact source and destroy that artifact if it's on the battlefield. (Mana abilities can't be targeted.)
 SVar:DBDestroy:DB$ Destroy | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ouphe_vandals.jpg
-SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/90.jpg
 Oracle:{G}, Sacrifice Ouphe Vandals: Counter target activated ability from an artifact source and destroy that artifact if it's on the battlefield. (Mana abilities can't be targeted.)
+SetInfo:5DN Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/oust.txt b/res/cardsfolder/o/oust.txt
index 7b08a9c9b49..99af778c5f5 100644
--- a/res/cardsfolder/o/oust.txt
+++ b/res/cardsfolder/o/oust.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 A:SP$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Library | ValidTgts$ Creature | LibraryPosition$ 1 | SubAbility$ DBGainLife | SpellDescription$ Put target creature into its owner's library second from the top. Its controller gains 3 life.
 # Library Position is zero indexed. So 1 is second from the top
 SVar:DBGainLife:DB$GainLife | Defined$ TargetedController | LifeAmount$ 3
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oust.jpg
-SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/40.jpg
 Oracle:Put target creature into its owner's library second from the top. Its controller gains 3 life.
+SetInfo:ROE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/outbreak.txt b/res/cardsfolder/o/outbreak.txt
index 544a4eeccef..90011e9186d 100644
--- a/res/cardsfolder/o/outbreak.txt
+++ b/res/cardsfolder/o/outbreak.txt
@@ -5,7 +5,6 @@ A:SP$ ChooseType | Cost$ 3 B | Defined$ You | Type$ Creature | SubAbility$ DBPum
 SVar:DBPumpAll:DB$PumpAll | ValidCards$ Creature.ChosenType | IsCurse$ True | NumAtt$ -1 | NumDef$ -1 | PumpAllDescription$ All creatures of that type get -1/-1 until end of turn.
 SVar:AltCost:Cost$ Discard<1/Swamp>
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/outbreak.jpg
-SetInfo:PCY|Uncommon|http://magiccards.info/scans/en/pr/71.jpg
 Oracle:You may discard a Swamp card rather than pay Outbreak's mana cost.\nChoose a creature type. All creatures of that type get -1/-1 until end of turn.
+SetInfo:PCY Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/outmaneuver.txt b/res/cardsfolder/o/outmaneuver.txt
index a6de655745d..01635d89515 100644
--- a/res/cardsfolder/o/outmaneuver.txt
+++ b/res/cardsfolder/o/outmaneuver.txt
@@ -6,7 +6,6 @@ A:SP$ Pump | Cost$ X R | KW$ HIDDEN CARDNAME assigns its combat damage as though
 SVar:X:Targeted$Amount
 SVar:MaxTgts:Count$Valid Creature
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/outmaneuver.jpg
-SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/205.jpg
 Oracle:X target blocked creatures assign their combat damage this turn as though they weren't blocked.
+SetInfo:USG Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/outrage_shaman.txt b/res/cardsfolder/o/outrage_shaman.txt
index 434c1f3e973..77584ee3c5d 100644
--- a/res/cardsfolder/o/outrage_shaman.txt
+++ b/res/cardsfolder/o/outrage_shaman.txt
@@ -6,7 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigDealDamage:DB$DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | References$ X
 SVar:X:Count$Chroma.R
 SVar:PlayMain1:TRUE
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/outrage_shaman.jpg
-SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/59.jpg
 Oracle:Chroma - When Outrage Shaman enters the battlefield, it deals damage to target creature equal to the number of red mana symbols in the mana costs of permanents you control.
+SetInfo:EVE Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/outrider_en_kor.txt b/res/cardsfolder/o/outrider_en_kor.txt
index b57e8e008e6..4fcd338208e 100644
--- a/res/cardsfolder/o/outrider_en_kor.txt
+++ b/res/cardsfolder/o/outrider_en_kor.txt
@@ -15,7 +15,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:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/outrider_en_kor.jpg
-SetInfo:TSP|Uncommon|http://magiccards.info/scans/en/ts/31.jpg
 Oracle:Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)\n{0}: The next 1 damage that would be dealt to Outrider en-Kor this turn is dealt to target creature you control instead.
+SetInfo:TSP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/outrider_of_jhess.txt b/res/cardsfolder/o/outrider_of_jhess.txt
index 47dfe9f655f..45c275f5277 100644
--- a/res/cardsfolder/o/outrider_of_jhess.txt
+++ b/res/cardsfolder/o/outrider_of_jhess.txt
@@ -3,7 +3,6 @@ ManaCost:3 U
 Types:Creature Human Knight
 PT:2/2
 K:Exalted
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/outrider_of_jhess.jpg
-SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/52.jpg
 Oracle:Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)
+SetInfo:ALA Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/outwit.txt b/res/cardsfolder/o/outwit.txt
index 37b48509c95..5c2dabdde4c 100644
--- a/res/cardsfolder/o/outwit.txt
+++ b/res/cardsfolder/o/outwit.txt
@@ -2,7 +2,6 @@ Name:Outwit
 ManaCost:U
 Types:Instant
 A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | TargetValidTargeting$ Player | SpellDescription$ Counter target spell that targets a player.
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/outwit.jpg
-SetInfo:AVR|Common|http://magiccards.info/scans/en/avr/70.jpg
 Oracle:Counter target spell that targets a player.
+SetInfo:AVR Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/overbeing_of_myth.txt b/res/cardsfolder/o/overbeing_of_myth.txt
index 1f1e20f99e0..e17164a6a3d 100644
--- a/res/cardsfolder/o/overbeing_of_myth.txt
+++ b/res/cardsfolder/o/overbeing_of_myth.txt
@@ -6,7 +6,6 @@ S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$
 SVar:X:Count$InYourHand
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your draw step, draw an additional card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1 | Defined$ You
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overbeing_of_myth.jpg
-SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/157.jpg
 Oracle:Overbeing of Myth's power and toughness are each equal to the number of cards in your hand.\nAt the beginning of your draw step, draw an additional card.
+SetInfo:EVE Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/overblaze.txt b/res/cardsfolder/o/overblaze.txt
index e721a31b9a1..b0b29b89a7c 100644
--- a/res/cardsfolder/o/overblaze.txt
+++ b/res/cardsfolder/o/overblaze.txt
@@ -11,7 +11,6 @@ SVar:X:ReplaceCount$DamageAmount/Times.2
 SVar:PlayMain1:TRUE
 SVar:RemAIdeck:True
 SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overblaze.jpg
-SetInfo:BOK|Uncommon|http://magiccards.info/scans/en/bok/114.jpg
 Oracle:Each time target permanent would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.\nSplice onto Arcane {2}{R}{R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+SetInfo:BOK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/overburden.txt b/res/cardsfolder/o/overburden.txt
index 92384681d7d..fea61bbcc59 100644
--- a/res/cardsfolder/o/overburden.txt
+++ b/res/cardsfolder/o/overburden.txt
@@ -6,7 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creatu
 SVar:TrigBounceYou:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ChangeType$ Land.YouCtrl | ChangeNum$ 1 | Mandatory$ True | DefinedPlayer$ You | Hidden$ True
 SVar:TrigBounceOpp:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ChangeType$ Land.YouDontCtrl | ChangeNum$ 1 |  Mandatory$ True | DefinedPlayer$ Opponent | Hidden$ True
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overburden.jpg
-SetInfo:PCY|Rare|http://magiccards.info/scans/en/pr/39.jpg
 Oracle:Whenever a player puts a nontoken creature onto the battlefield, that player returns a land he or she controls to its owner's hand.
+SetInfo:PCY Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/overeager_apprentice.txt b/res/cardsfolder/o/overeager_apprentice.txt
index 90435d86bea..fae5c9b90d4 100644
--- a/res/cardsfolder/o/overeager_apprentice.txt
+++ b/res/cardsfolder/o/overeager_apprentice.txt
@@ -4,7 +4,7 @@ Types:Creature Human Minion
 PT:1/2
 A:AB$ Mana | Cost$ Discard<1/Card> Sac<1/CARDNAME> | Produced$ B | Amount$ 3 | SpellDescription$ Add B B B to your mana pool.
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overeager_apprentice.jpg
-SetInfo:ODY|Common|http://magiccards.info/scans/en/od/154.jpg
 Oracle:Discard a card, Sacrifice Overeager Apprentice: Add {B}{B}{B} to your mana pool.
+SetInfo:DDC Common
+SetInfo:ODY Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/overgrown_battlement.txt b/res/cardsfolder/o/overgrown_battlement.txt
index c531a51a0b8..8757bf84e94 100644
--- a/res/cardsfolder/o/overgrown_battlement.txt
+++ b/res/cardsfolder/o/overgrown_battlement.txt
@@ -5,7 +5,6 @@ PT:0/4
 K:Defender
 A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add G to your mana pool for each Creature with defender you control.
 SVar:X:Count$Valid Creature.withDefender+YouCtrl
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overgrown_battlement.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/203.jpg
 Oracle:Defender\n{T}: Add {G} to your mana pool for each creature with defender you control.
+SetInfo:ROE Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/overgrown_estate.txt b/res/cardsfolder/o/overgrown_estate.txt
index 2cb060a5a40..4b394dfdca4 100644
--- a/res/cardsfolder/o/overgrown_estate.txt
+++ b/res/cardsfolder/o/overgrown_estate.txt
@@ -3,7 +3,6 @@ ManaCost:B G W
 Types:Enchantment
 A:AB$ GainLife | Cost$ Sac<1/Land> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overgrown_estate.jpg
-SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/113.jpg
 Oracle:Sacrifice a land: You gain 3 life.
+SetInfo:APC Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/overgrown_tomb.txt b/res/cardsfolder/o/overgrown_tomb.txt
index 59e33bbf8d2..396a9fa9b43 100644
--- a/res/cardsfolder/o/overgrown_tomb.txt
+++ b/res/cardsfolder/o/overgrown_tomb.txt
@@ -2,8 +2,7 @@ Name:Overgrown Tomb
 ManaCost:no cost
 Types:Land Swamp Forest
 Text:As CARDNAME enters the battlefield, you may pay 2 life. If you don't, CARDNAME enters the battlefield tapped.
-SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/rav/en-us/card89072.jpg
-SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/279.jpg
-SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/243.jpg
 Oracle:({T}: Add {B} or {G} to your mana pool.)\nAs Overgrown Tomb enters the battlefield, you may pay 2 life. If you don't, Overgrown Tomb enters the battlefield tapped.
+SetInfo:RAV Rare
+SetInfo:RTR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/overgrowth.txt b/res/cardsfolder/o/overgrowth.txt
index 996ddad24e7..6f0a9ad84be 100644
--- a/res/cardsfolder/o/overgrowth.txt
+++ b/res/cardsfolder/o/overgrowth.txt
@@ -6,9 +6,8 @@ A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
 T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds G G to his or her mana pool (in addition to the mana the land produces).
 SVar:TrigMana:AB$ Mana | Cost$ 0 | Produced$ G | Amount$ 2 | Defined$ TriggeredCardController
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overgrowth.jpg
-SetInfo:STH|Common|http://magiccards.info/scans/en/sh/61.jpg
-SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/262.jpg
-SetInfo:10E|Common|http://magiccards.info/scans/en/10e/283.jpg
 Oracle:Enchant land (Target a land as you cast this. This card enters the battlefield attached to that land.)\nWhenever enchanted land is tapped for mana, its controller adds {G}{G} to his or her mana pool (in addition to the mana the land produces).
+SetInfo:10E Common
+SetInfo:9ED Common
+SetInfo:STH Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/overlaid_terrain.txt b/res/cardsfolder/o/overlaid_terrain.txt
index c213f27dec1..05ac50b14b9 100644
--- a/res/cardsfolder/o/overlaid_terrain.txt
+++ b/res/cardsfolder/o/overlaid_terrain.txt
@@ -7,7 +7,6 @@ S:Mode$ Continuous | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$
 SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color to your mana pool.
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overlaid_terrain.jpg
-SetInfo:NMS|Rare|http://magiccards.info/scans/en/ne/108.jpg
 Oracle:As Overlaid Terrain enters the battlefield, sacrifice all lands you control.\nLands you control have "{T}: Add two mana of any one color to your mana pool."
+SetInfo:NMS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/overload.txt b/res/cardsfolder/o/overload.txt
index 6f8b86e72e8..af8ae2d7ec6 100644
--- a/res/cardsfolder/o/overload.txt
+++ b/res/cardsfolder/o/overload.txt
@@ -5,7 +5,6 @@ K:Kicker 2
 A:SP$ Destroy | Cost$ R | ValidTgts$ Artifact | AITgts$ Artifact.cmcLEX | References$ X,Y | TgtPrompt$ Select target artifact with converted mana cost 2 or less (5 or less if kicked) | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX | SpellDescription$ Destroy target artifact if its converted mana cost is 2 or less. If CARDNAME was kicked, destroy that artifact if its converted mana cost is 5 or less instead.
 SVar:X:Count$Kicked.5.2
 SVar:Y:Targeted$CardManaCost
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overload.jpg
-SetInfo:INV|Common|http://magiccards.info/scans/en/in/157.jpg
 Oracle:Kicker {2} (You may pay an additional {2} as you cast this spell.)\nDestroy target artifact if its converted mana cost is 2 or less. If Overload was kicked, destroy that artifact if its converted mana cost is 5 or less instead.
+SetInfo:INV Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/overmaster.txt b/res/cardsfolder/o/overmaster.txt
index f70abddd5e8..8907f9101fc 100644
--- a/res/cardsfolder/o/overmaster.txt
+++ b/res/cardsfolder/o/overmaster.txt
@@ -7,7 +7,6 @@ SVar:SpellCastTrig:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatin
 SVar:Mastery:AB$ Pump | Cost$ 0 | Defined$ TriggeredCard | KW$ HIDDEN CARDNAME can't be countered. | PumpZone$ Stack | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Graveyard
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overmaster.jpg
-SetInfo:TOR|Rare|http://magiccards.info/scans/en/tr/104.jpg
 Oracle:The next instant or sorcery spell you cast this turn can't be countered by spells or abilities.\nDraw a card.
+SetInfo:TOR Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/override.txt b/res/cardsfolder/o/override.txt
index e80b170073d..e78a5014be8 100644
--- a/res/cardsfolder/o/override.txt
+++ b/res/cardsfolder/o/override.txt
@@ -5,7 +5,6 @@ A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell |
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/override.jpg
-SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/45.jpg
 Oracle:Counter target spell unless its controller pays {1} for each artifact you control.
+SetInfo:MRD Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/overrule.txt b/res/cardsfolder/o/overrule.txt
index ab261668e2a..fcfec5a91b5 100644
--- a/res/cardsfolder/o/overrule.txt
+++ b/res/cardsfolder/o/overrule.txt
@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ Counter | Cost$ X W U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | References$ X | SubAbility$ DBGainLife | SpellDescription$ Counter target spell unless its controller pays X. You gain X life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ X | References$ X
 SVar:X:Count$xPaid
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overrule.jpg
-SetInfo:DIS|Common|http://magiccards.info/scans/en/di/120.jpg
 Oracle:Counter target spell unless its controller pays {X}. You gain X life.
+SetInfo:DDI Common
+SetInfo:DIS Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/overrun.txt b/res/cardsfolder/o/overrun.txt
index 79fcacc17f5..4bd62ed1454 100644
--- a/res/cardsfolder/o/overrun.txt
+++ b/res/cardsfolder/o/overrun.txt
@@ -2,12 +2,12 @@ Name:Overrun
 ManaCost:2 G G G
 Types:Sorcery
 A:SP$ PumpAll | Cost$ 2 G G G | ValidCards$ Creature.YouCtrl | NumAtt$ +3 | NumDef$ +3 | KW$ Trample | SpellDescription$ Creatures you control get +3/+3 and gain trample until end of turn.
-SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/10e/en/card130506.jpg
-SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/137.jpg
-SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/260.jpg
-SetInfo:PC2|Uncommon|http://magiccards.info/scans/en/pc2/72.jpg
-SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/284.jpg
-SetInfo:M10|Uncommon|http://magiccards.info/scans/en/m10/198.jpg
-SetInfo:M12|Uncommon|http://magiccards.info/scans/en/m12/186.jpg
 Oracle:Creatures you control get +3/+3 and gain trample until end of turn.
+SetInfo:PC2 Uncommon
+SetInfo:ODY Uncommon
+SetInfo:10E Uncommon
+SetInfo:M10 Uncommon
+SetInfo:M12 Uncommon
+SetInfo:TMP Uncommon
+SetInfo:DDD Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/oversold_cemetery.txt b/res/cardsfolder/o/oversold_cemetery.txt
index 641d2a766ba..cfea4b44581 100644
--- a/res/cardsfolder/o/oversold_cemetery.txt
+++ b/res/cardsfolder/o/oversold_cemetery.txt
@@ -3,7 +3,6 @@ ManaCost:1 B
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | OptionalDecider$ You | IsPresent$ Creature.YouCtrl | PresentZone$ Graveyard | PresentCompare$ GE4 | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if you have four or more creature cards in your graveyard, you may return target creature card from your graveyard to your hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Hidden$ True | ChangeType$ Creature.YouOwn | ChangeNum$ 1
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oversold_cemetery.jpg
-SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/160.jpg
 Oracle:At the beginning of your upkeep, if you have four or more creature cards in your graveyard, you may return target creature card from your graveyard to your hand.
+SetInfo:ONS Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/oversoul_of_dusk.txt b/res/cardsfolder/o/oversoul_of_dusk.txt
index 5df557db87b..e1e63e47eab 100644
--- a/res/cardsfolder/o/oversoul_of_dusk.txt
+++ b/res/cardsfolder/o/oversoul_of_dusk.txt
@@ -5,7 +5,6 @@ PT:5/5
 K:Protection from blue
 K:Protection from black
 K:Protection from red
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oversoul_of_dusk.jpg
-SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/234.jpg
 Oracle:Protection from blue, from black, and from red
+SetInfo:SHM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/overtaker.txt b/res/cardsfolder/o/overtaker.txt
index 7beeb2a6891..6cc136ce541 100644
--- a/res/cardsfolder/o/overtaker.txt
+++ b/res/cardsfolder/o/overtaker.txt
@@ -4,7 +4,7 @@ Types:Creature Merfolk Spellshaper
 PT:1/1
 A:AB$ GainControl | Cost$ 3 U T Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | AddKWs$ Haste | Untap$ True | SpellDescription$ Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overtaker.jpg
-SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/89.jpg
 Oracle:{3}{U}, {T}, Discard a card: Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn.
+SetInfo:MMQ Rare
+SetInfo:MBP Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/overwhelm.txt b/res/cardsfolder/o/overwhelm.txt
index 5bf40eb3bd9..32d79b472ac 100644
--- a/res/cardsfolder/o/overwhelm.txt
+++ b/res/cardsfolder/o/overwhelm.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 K:Convoke
 A:SP$PumpAll | Cost$ 5 G G | ValidCards$ Creature.YouCtrl | NumAtt$ 3 | NumDef$ 3 | SpellDescription$ Creatures you control get +3/+3 until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overwhelm.jpg
-SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/175.jpg
 Oracle:Convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.)\nCreatures you control get +3/+3 until end of turn.
+SetInfo:RAV Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/overwhelming_forces.txt b/res/cardsfolder/o/overwhelming_forces.txt
index e014dab4013..cc6f60ba146 100644
--- a/res/cardsfolder/o/overwhelming_forces.txt
+++ b/res/cardsfolder/o/overwhelming_forces.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 A:SP$ DestroyAll | Cost$ 6 B B | ValidCards$ Creature | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | RememberDestroyed$ True | SubAbility$ DBDrawCard | SpellDescription$ Destroy all creatures target opponent controls. Draw a card for each creature destroyed this way.
 SVar:DBDrawCard:DB$ Draw | NumCards$ X | References$ X
 SVar:X:Remembered$Amount
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overwhelming_forces.jpg
-SetInfo:PTK|Rare|http://magiccards.info/scans/en/p3k/79.jpg
 Oracle:Destroy all creatures target opponent controls. Draw a card for each creature destroyed this way.
+SetInfo:PTK Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/overwhelming_instinct.txt b/res/cardsfolder/o/overwhelming_instinct.txt
index db4f0ed90d6..bd9899aa542 100644
--- a/res/cardsfolder/o/overwhelming_instinct.txt
+++ b/res/cardsfolder/o/overwhelming_instinct.txt
@@ -4,7 +4,6 @@ Types:Enchantment
 T:Mode$ AttackersDeclared | Execute$ TrigDraw | CheckSVar$ OverwhelmInstinct | SVarCompare$ GE3 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with three or more creatures, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 1
 SVar:OverwhelmInstinct:Count$Valid Creature.attacking
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overwhelming_instinct.jpg
-SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/276.jpg
 Oracle:Whenever you attack with three or more creatures, draw a card.
+SetInfo:ONS Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/overwhelming_intellect.txt b/res/cardsfolder/o/overwhelming_intellect.txt
index aa6073225d9..3716aba9f5d 100644
--- a/res/cardsfolder/o/overwhelming_intellect.txt
+++ b/res/cardsfolder/o/overwhelming_intellect.txt
@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ Counter | Cost$ 4 U U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SubAbility$ DBDraw |  SpellDescription$ Counter target creature spell. Draw cards equal to that spell's converted mana cost.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | References$ X
 SVar:X:Targeted$CardManaCost
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overwhelming_intellect.jpg
-SetInfo:SOK|Uncommon|http://magiccards.info/scans/en/sok/51.jpg
 Oracle:Counter target creature spell. Draw cards equal to that spell's converted mana cost.
+SetInfo:DDJ Uncommon
+SetInfo:SOK Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/overwhelming_stampede.txt b/res/cardsfolder/o/overwhelming_stampede.txt
index 565708dadf3..739ff3e1402 100644
--- a/res/cardsfolder/o/overwhelming_stampede.txt
+++ b/res/cardsfolder/o/overwhelming_stampede.txt
@@ -3,7 +3,6 @@ ManaCost:3 G G
 Types:Sorcery
 A:SP$ PumpAll | Cost$ 3 G G | ValidCards$ Creature.YouCtrl | NumAtt$ +X | NumDef$ +X | References$ X | KW$ Trample | SpellDescription$ Until end of turn, creatures you control gain trample and get +X/+X, where X is the greatest power among creatures you control.
 SVar:X:Count$GreatestPowerYouControl
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overwhelming_stampede.jpg
-SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/189.jpg
 Oracle:Until end of turn, creatures you control gain trample and get +X/+X, where X is the greatest power among creatures you control. (If a creature you control would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
+SetInfo:M11 Rare
\ No newline at end of file
diff --git a/res/cardsfolder/o/ovinize.txt b/res/cardsfolder/o/ovinize.txt
index 96b321d78e5..ce578fb1032 100644
--- a/res/cardsfolder/o/ovinize.txt
+++ b/res/cardsfolder/o/ovinize.txt
@@ -3,7 +3,6 @@ ManaCost:1 U
 Types:Instant
 A:SP$ Animate | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Power$ 0 | Toughness$ 1 | RemoveAllAbilities$ True | SpellDescription$ Target creature loses all abilities and becomes 0/1 until end of turn.
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ovinize.jpg
-SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/57.jpg
 Oracle:Target creature loses all abilities and becomes 0/1 until end of turn.
+SetInfo:PLC Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/ovinomancer.txt b/res/cardsfolder/o/ovinomancer.txt
index 659f7ec4ac2..27e1b386958 100644
--- a/res/cardsfolder/o/ovinomancer.txt
+++ b/res/cardsfolder/o/ovinomancer.txt
@@ -10,8 +10,7 @@ SVar:DBSacSelf:DB$ Sacrifice | Defined$ Self | SubAbility$ DBCleanup | Condition
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ovinomancer.jpg
-SetInfo:VIS|Uncommon|http://magiccards.info/scans/en/vi/39.jpg
-SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/27.jpg
 Oracle:When Ovinomancer enters the battlefield, sacrifice it unless you return three basic lands you control to their owner's hand.\n{T}, Return Ovinomancer to its owner's hand: Destroy target creature. It can't be regenerated. That creature's controller puts a 0/1 green Sheep creature token onto the battlefield.
+SetInfo:VIS Uncommon
+SetInfo:TSB Special
\ No newline at end of file
diff --git a/res/cardsfolder/o/owl_familiar.txt b/res/cardsfolder/o/owl_familiar.txt
index d24d1460186..e7d8e58ecbc 100644
--- a/res/cardsfolder/o/owl_familiar.txt
+++ b/res/cardsfolder/o/owl_familiar.txt
@@ -7,8 +7,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/owl_familiar.jpg
-SetInfo:S99|Uncommon|http://magiccards.info/scans/en/st/43.jpg
-SetInfo:POR|Common|http://magiccards.info/scans/en/po/64.jpg
 Oracle:Flying\nWhen Owl Familiar enters the battlefield, draw a card, then discard a card.
+SetInfo:S99 Uncommon
+SetInfo:POR Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oxidda_daredevil.txt b/res/cardsfolder/o/oxidda_daredevil.txt
index b9a70db20eb..d36a75ef4b9 100644
--- a/res/cardsfolder/o/oxidda_daredevil.txt
+++ b/res/cardsfolder/o/oxidda_daredevil.txt
@@ -5,7 +5,6 @@ PT:2/1
 A:AB$ Pump | Cost$ Sac<1/Artifact> | KW$ Haste | SpellDescription$ Oxidda Daredevil gains haste until end of turn.
 SVar:PlayMain1:TRUE
 SVar:RemAIDeck:True
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oxidda_daredevil.jpg
-SetInfo:SOM|Common|http://magiccards.info/scans/en/som/100.jpg
 Oracle:Sacrifice an artifact: Oxidda Daredevil gains haste until end of turn.
+SetInfo:SOM Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oxidda_golem.txt b/res/cardsfolder/o/oxidda_golem.txt
index 6276b565340..40b9eee01e2 100644
--- a/res/cardsfolder/o/oxidda_golem.txt
+++ b/res/cardsfolder/o/oxidda_golem.txt
@@ -7,7 +7,7 @@ S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone
 SVar:X:Count$Valid Mountain.YouCtrl
 SVar:RemRandomDeck:True
 DeckNeeds:Color$Red
-SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oxidda_golem.jpg
-SetInfo:DST|Common|http://magiccards.info/scans/en/ds/135.jpg
 Oracle:Affinity for Mountains (This spell costs {1} less to cast for each Mountain you control.)\nHaste
+SetInfo:DD2 Common
+SetInfo:DST Common
\ No newline at end of file
diff --git a/res/cardsfolder/o/oxidda_scrapmelter.txt b/res/cardsfolder/o/oxidda_scrapmelter.txt
index 47eaff38b77..0d0b66d81e4 100644
--- a/res/cardsfolder/o/oxidda_scrapmelter.txt
+++ b/res/cardsfolder/o/oxidda_scrapmelter.txt
@@ -4,7 +4,6 @@ Types:Creature Beast
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact.
 SVar:TrigDestroy:DB$Destroy | ValidTgts$ Artifact | TgtPrompt$ Choose target artifact.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oxidda_scrapmelter.jpg
-SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/101.jpg
 Oracle:When Oxidda Scrapmelter enters the battlefield, destroy target artifact.
+SetInfo:SOM Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/oxidize.txt b/res/cardsfolder/o/oxidize.txt
index c06f2bf6215..44a2c32c1eb 100644
--- a/res/cardsfolder/o/oxidize.txt
+++ b/res/cardsfolder/o/oxidize.txt
@@ -2,7 +2,6 @@ Name:Oxidize
 ManaCost:G
 Types:Instant
 A:SP$ Destroy | Cost$ G | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | NoRegen$ True | SpellDescription$ Destroy target artifact. It can't be regenerated.
-SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oxidize.jpg
-SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/79.jpg
 Oracle:Destroy target artifact. It can't be regenerated.
+SetInfo:DST Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/o/oyobi_who_split_the_heavens.txt b/res/cardsfolder/o/oyobi_who_split_the_heavens.txt
index dc615b34b78..334be77ab96 100644
--- a/res/cardsfolder/o/oyobi_who_split_the_heavens.txt
+++ b/res/cardsfolder/o/oyobi_who_split_the_heavens.txt
@@ -6,7 +6,6 @@ K:Flying
 T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, put a 3/3 white Spirit creature token with flying onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 3 3 Spirit | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 3 | TokenToughness$ 3 | TokenKeywords$ Flying
 SVar:RemRandomDeck:True
-SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oyobi_who_split_the_heavens.jpg
-SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/18.jpg
 Oracle:Flying\nWhenever you cast a Spirit or Arcane spell, put a 3/3 white Spirit creature token with flying onto the battlefield.
+SetInfo:BOK Rare
\ No newline at end of file