diff --git a/.gitattributes b/.gitattributes
index d40f9375477..0ab3e35183a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2465,6 +2465,7 @@ res/cardsfolder/e/etherium_abomination.txt svneol=native#text/plain
 res/cardsfolder/e/etherium_astrolabe.txt svneol=native#text/plain
 res/cardsfolder/e/etherium_sculptor.txt svneol=native#text/plain
 res/cardsfolder/e/ethersworn_adjudicator.txt svneol=native#text/plain
+res/cardsfolder/e/ethersworn_shieldmage.txt -text
 res/cardsfolder/e/evacuation.txt svneol=native#text/plain
 res/cardsfolder/e/evaporate.txt svneol=native#text/plain
 res/cardsfolder/e/evasive_action.txt svneol=native#text/plain
diff --git a/res/cardsfolder/a/aven_liberator.txt b/res/cardsfolder/a/aven_liberator.txt
index d9f385e2142..8473da332df 100644
--- a/res/cardsfolder/a/aven_liberator.txt
+++ b/res/cardsfolder/a/aven_liberator.txt
@@ -1,14 +1,16 @@
-Name:Aven Liberator
-ManaCost:2 W W
-Types:Creature Bird Soldier
-Text:no text
-PT:2/3
-K:Flying
-K:Morph:3 W
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigProtect | TriggerDescription$ When CARDNAME is turned face up, target creature you control gains protection from the color of your choice until end of turn.
-SVar:TrigProtect:AB$ Protection | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Gains$ Choice | Choices$ AnyColor
-SVar:RemAIDeck:True
-SVar:RemRandomDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_liberator.jpg
+Name:Aven Liberator
+ManaCost:2 W W
+Types:Creature Bird Soldier
+Text:no text
+PT:2/3
+K:Flying
+K:Morph:3 W
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigProtect | TriggerDescription$ When CARDNAME is turned face up, target creature you control gains protection from the color of your choice until end of turn.
+SVar:TrigProtect:AB$ Protection | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Gains$ Choice | Choices$ AnyColor
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_liberator.jpg
+SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/4.jpg
+Oracle:Flying\nMorph {3}{W} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhen Aven Liberator is turned face up, target creature you control gains protection from the color of your choice until end of turn.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/d/dusk_urchins.txt b/res/cardsfolder/d/dusk_urchins.txt
index 2a315aebae3..0389b00f1b4 100644
--- a/res/cardsfolder/d/dusk_urchins.txt
+++ b/res/cardsfolder/d/dusk_urchins.txt
@@ -11,4 +11,6 @@ SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ X
 SVar:X:TriggeredCard$CardCounters.M1M1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dusk_urchins.jpg
+SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/65.jpg
+Oracle:Whenever Dusk Urchins attacks or blocks, put a -1/-1 counter on it.\nWhen Dusk Urchins dies, draw a card for each -1/-1 counter on it.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/e/elvish_healer.txt b/res/cardsfolder/e/elvish_healer.txt
index 664075b1781..84c1a571935 100644
--- a/res/cardsfolder/e/elvish_healer.txt
+++ b/res/cardsfolder/e/elvish_healer.txt
@@ -1,12 +1,14 @@
-Name:Elvish Healer
-ManaCost:2 W
-Types:Creature Elf Cleric
-Text:no text
-PT:1/2
-A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ X | RememberTargets$ True | SubAbility$ DBCleanup | SpellDescription$ Prevent the next 1 damage that would be dealt to target creature or player this turn. If that creature is green, prevent the next 2 damage instead.
-SVar:X:Remembered$Valid Creature.Green/Plus.1
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:RemRandomDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_healer.jpg
+Name:Elvish Healer
+ManaCost:2 W
+Types:Creature Elf Cleric
+Text:no text
+PT:1/2
+A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ X | RememberTargets$ True | SubAbility$ DBCleanup | SpellDescription$ Prevent the next 1 damage that would be dealt to target creature or player this turn. If that creature is green, prevent the next 2 damage instead.
+SVar:X:Remembered$Valid Creature.Green/Plus.1
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:RemRandomDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_healer.jpg
+SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/246.jpg
+Oracle:{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn. If that creature is green, prevent the next 2 damage instead.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/e/ethersworn_shieldmage.txt b/res/cardsfolder/e/ethersworn_shieldmage.txt
new file mode 100644
index 00000000000..4aa70f1943e
--- /dev/null
+++ b/res/cardsfolder/e/ethersworn_shieldmage.txt
@@ -0,0 +1,14 @@
+Name:Ethersworn Shieldmage
+ManaCost:1 W U
+Types:Artifact Creature Vedalken Wizard
+Text:no text
+PT:2/2
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When CARDNAME enters the battlefield, prevent all damage that would be dealt to artifact creatures this turn.
+SVar:TrigEffect:DB$Effect | Name$ Ethersworn Shieldmage Effect | StaticAbilities$ STPrevent | SpellDescription$ Prevent all damage that would be dealt to artifact creatures this turn.
+SVar:STPrevent:Mode$ PreventDamage | Target$ Creature.Artifact | Description$ Prevent all damage that would be dealt to artifact creatures this turn.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ethersworn_shieldmage.jpg
+SetInfo:ARB|Common|http://magiccards.info/scans/en/arb/4.jpg
+Oracle:Flash\nWhen Ethersworn Shieldmage enters the battlefield, prevent all damage that would be dealt to artifact creatures this turn.
+End
\ No newline at end of file
diff --git a/res/cardsfolder/g/ghazban_ogre.txt b/res/cardsfolder/g/ghazban_ogre.txt
index e16709d8090..a610834b824 100644
--- a/res/cardsfolder/g/ghazban_ogre.txt
+++ b/res/cardsfolder/g/ghazban_ogre.txt
@@ -1,14 +1,17 @@
-Name:Ghazban Ogre
-ManaCost:G
-Types:Creature Ogre
-Text:no text
-PT:2/2
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | LifeTotal$ Opponent | LifeAmount$ GTX | Execute$ TrigOppControl | TriggerDescription$ At the beginning of your upkeep, if a player has more life than each other player, the player with the most life gains control of CARDNAME.
-SVar:TrigOppControl:AB$ GainControl | Cost$ 0 | Defined$ Self | NewController$ Opponent
-SVar:X:Count$YourLifeTotal
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | LifeTotal$ You | LifeAmount$ GTY | Execute$ TrigYouControl | Secondary$ True | TriggerDescription$ At the beginning of your upkeep, if a player has more life than each other player, the player with the most life gains control of CARDNAME.
-SVar:TrigYouControl:AB$ GainControl | Cost$ 0 | Defined$ Self | NewController$ You
-SVar:Y:Count$OppLifeTotal
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ghazban_ogre.jpg
+Name:Ghazban Ogre
+ManaCost:G
+Types:Creature Ogre
+Text:no text
+PT:2/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | LifeTotal$ Opponent | LifeAmount$ GTX | Execute$ TrigOppControl | TriggerDescription$ At the beginning of your upkeep, if a player has more life than each other player, the player with the most life gains control of CARDNAME.
+SVar:TrigOppControl:AB$ GainControl | Cost$ 0 | Defined$ Self | NewController$ Opponent
+SVar:X:Count$YourLifeTotal
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | LifeTotal$ You | LifeAmount$ GTY | Execute$ TrigYouControl | Secondary$ True | TriggerDescription$ At the beginning of your upkeep, if a player has more life than each other player, the player with the most life gains control of CARDNAME.
+SVar:TrigYouControl:AB$ GainControl | Cost$ 0 | Defined$ Self | NewController$ You
+SVar:Y:Count$OppLifeTotal
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ghazban_ogre.jpg
+SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/160.jpg
+SetInfo:ARN|Common|http://magiccards.info/scans/en/an/33.jpg
+Oracle:At the beginning of your upkeep, if a player has more life than each other player, the player with the most life gains control of Ghazban Ogre.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/g/goblin_snowman.txt b/res/cardsfolder/g/goblin_snowman.txt
index 5d10f145a61..bb93d3cb103 100644
--- a/res/cardsfolder/g/goblin_snowman.txt
+++ b/res/cardsfolder/g/goblin_snowman.txt
@@ -1,11 +1,14 @@
-Name:Goblin Snowman
-ManaCost:3 R
-Types:Creature Goblin
-Text:no text
-PT:1/1
-T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | Execute$ TrigPrevent | TriggerDescription$ Whenever CARDNAME blocks, prevent all combat damage that would be dealt to and dealt by it this turn.
-SVar:TrigPrevent:AB$ Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME.
-A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.blockedBySource | TgtPrompt$ Select target creature Goblin Snowman is blocking | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature it's blocking.
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_snowman.jpg
+Name:Goblin Snowman
+ManaCost:3 R
+Types:Creature Goblin
+Text:no text
+PT:1/1
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | Execute$ TrigPrevent | TriggerDescription$ Whenever CARDNAME blocks, prevent all combat damage that would be dealt to and dealt by it this turn.
+SVar:TrigPrevent:AB$ Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN Prevent all combat damage that would be dealt to and dealt by CARDNAME.
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.blockedBySource | TgtPrompt$ Select target creature Goblin Snowman is blocking | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature it's blocking.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_snowman.jpg
+SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/64.jpg
+SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/191.jpg
+Oracle:Whenever Goblin Snowman blocks, prevent all combat damage that would be dealt to and dealt by it this turn.\n{T}: Goblin Snowman deals 1 damage to target creature it's blocking.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/g/grief_tyrant.txt b/res/cardsfolder/g/grief_tyrant.txt
index ed12761836a..a4d88d16be7 100644
--- a/res/cardsfolder/g/grief_tyrant.txt
+++ b/res/cardsfolder/g/grief_tyrant.txt
@@ -9,4 +9,6 @@ SVar:TrigCurse:AB$ PutCounter | Cost$ 0 | ValidTgts$ Creature | CounterType$ M1M
 SVar:X:TriggeredCard$CardCounters.M1M1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grief_tyrant.jpg
+SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/189.jpg
+Oracle:Grief Tyrant enters the battlefield with four -1/-1 counters on it.\nWhen Grief Tyrant dies, put a -1/-1 counter on target creature for each -1/-1 counter on Grief Tyrant.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/j/johtull_wurm.txt b/res/cardsfolder/j/johtull_wurm.txt
index ce3bf96b508..096e32992e9 100644
--- a/res/cardsfolder/j/johtull_wurm.txt
+++ b/res/cardsfolder/j/johtull_wurm.txt
@@ -1,12 +1,15 @@
-Name:Johtull Wurm
-ManaCost:5 G
-Types:Creature Wurm
-Text:no text
-PT:6/6
-T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it gets -2/-1 until end of turn for each creature blocking it beyond the first.
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ -X | NumDef$ -Y
-SVar:X:SVar$Y/Twice
-SVar:Y:TriggerCount$NumBlockers/Minus.1
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/johtull_wurm.jpg
+Name:Johtull Wurm
+ManaCost:5 G
+Types:Creature Wurm
+Text:no text
+PT:6/6
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME becomes blocked, it gets -2/-1 until end of turn for each creature blocking it beyond the first.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ -X | NumDef$ -Y
+SVar:X:SVar$Y/Twice
+SVar:Y:TriggerCount$NumBlockers/Minus.1
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/johtull_wurm.jpg
+SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/168.jpg
+SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/138.jpg
+Oracle:Whenever Johtull Wurm becomes blocked, it gets -2/-1 until end of turn for each creature blocking it beyond the first.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/l/lowland_basilisk.txt b/res/cardsfolder/l/lowland_basilisk.txt
index c83f837da6b..37b5db609c1 100644
--- a/res/cardsfolder/l/lowland_basilisk.txt
+++ b/res/cardsfolder/l/lowland_basilisk.txt
@@ -8,4 +8,6 @@ SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Each | Execute$ TrigD
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lowland_basilisk.jpg
+SetInfo:STH|Common|http://magiccards.info/scans/en/sh/59.jpg
+Oracle:Whenever Lowland Basilisk deals damage to a creature, destroy that creature at end of combat.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/m/martyrs_cry.txt b/res/cardsfolder/m/martyrs_cry.txt
index 3971dd635a8..306b5f01cff 100644
--- a/res/cardsfolder/m/martyrs_cry.txt
+++ b/res/cardsfolder/m/martyrs_cry.txt
@@ -11,4 +11,6 @@ SVar:X:Remembered$Amount
 SVar:Y:Remembered$Amount
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/martyrs_cry.jpg
-End
+SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/85.jpg
+Oracle:Exile all white creatures. For each creature exiled this way, its controller draws a card.
+End
\ No newline at end of file
diff --git a/res/cardsfolder/r/revered_unicorn.txt b/res/cardsfolder/r/revered_unicorn.txt
index 83754c38c07..415f1bddb10 100644
--- a/res/cardsfolder/r/revered_unicorn.txt
+++ b/res/cardsfolder/r/revered_unicorn.txt
@@ -9,4 +9,6 @@ SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X
 SVar:X:TriggeredCard$CardCounters.AGE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/revered_unicorn.jpg
+SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/139.jpg
+Oracle:Cumulative upkeep {1} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhen Revered Unicorn leaves the battlefield, you gain life equal to the number of age counters on it.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/safe_haven.txt b/res/cardsfolder/s/safe_haven.txt
index 6d454f2d545..c5165e73171 100644
--- a/res/cardsfolder/s/safe_haven.txt
+++ b/res/cardsfolder/s/safe_haven.txt
@@ -8,4 +8,7 @@ SVar:TrigReturn:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Defined$ Remembered | O
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/safe_haven.jpg
+SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/115.jpg
+SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/121.jpg
+Oracle:{2}, {T}: Exile target creature you control.\nAt the beginning of your upkeep, you may sacrifice Safe Haven. If you do, return each card exiled with Safe Haven to the battlefield under its owner's control.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/u/unnatural_selection.txt b/res/cardsfolder/u/unnatural_selection.txt
index 472c0e70f1b..ae1c7ba6ab3 100644
--- a/res/cardsfolder/u/unnatural_selection.txt
+++ b/res/cardsfolder/u/unnatural_selection.txt
@@ -1,10 +1,12 @@
-Name:Unnatural Selection
-ManaCost:1 U
-Types:Enchantment
-Text:no text
-A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | InvalidTypes$ Wall | SubAbility$ DBAnimate | SpellDescription$ Choose a creature type other than Wall. Target creature becomes that type until end of turn.
-SVar:DBAnimate:DB$ Animate | ValidTgts$ Creature | TgtPrompt$ Select target creature | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/unnatural_selection.jpg
+Name:Unnatural Selection
+ManaCost:1 U
+Types:Enchantment
+Text:no text
+A:AB$ ChooseType | Cost$ 1 | Defined$ You | Type$ Creature | InvalidTypes$ Wall | SubAbility$ DBAnimate | SpellDescription$ Choose a creature type other than Wall. Target creature becomes that type until end of turn.
+SVar:DBAnimate:DB$ Animate | ValidTgts$ Creature | TgtPrompt$ Select target creature | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/unnatural_selection.jpg
+SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/32.jpg
+Oracle:{1}: Choose a creature type other than Wall. Target creature becomes that type until end of turn.
 End
\ No newline at end of file