diff --git a/.gitattributes b/.gitattributes
index 9e66e8f92f0..b7ddf63a240 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1284,7 +1284,7 @@ res/cardsfolder/cinder_shade.txt -text svneol=native#text/plain
 res/cardsfolder/cinder_storm.txt -text svneol=native#text/plain
 res/cardsfolder/cinder_wall.txt svneol=native#text/plain
 res/cardsfolder/cinderbones.txt -text svneol=native#text/plain
-res/cardsfolder/cinderhaze_wretch.txt -text svneol=native#text/plain
+res/cardsfolder/cinderhaze_wretch.txt svneol=native#text/plain
 res/cardsfolder/circular_logic.txt -text svneol=native#text/plain
 res/cardsfolder/citanul_centaurs.txt -text svneol=native#text/plain
 res/cardsfolder/citanul_druid.txt -text svneol=native#text/plain
@@ -6223,12 +6223,12 @@ res/cardsfolder/shepherd_of_the_lost.txt -text svneol=native#text/plain
 res/cardsfolder/shield_mate.txt -text svneol=native#text/plain
 res/cardsfolder/shield_of_duty_and_reason.txt -text svneol=native#text/plain
 res/cardsfolder/shield_of_kaldra.txt -text svneol=native#text/plain
-res/cardsfolder/shield_of_the_ages.txt -text svneol=native#text/plain
+res/cardsfolder/shield_of_the_ages.txt svneol=native#text/plain
 res/cardsfolder/shield_of_the_oversoul.txt -text svneol=native#text/plain
 res/cardsfolder/shield_sphere.txt -text svneol=native#text/plain
 res/cardsfolder/shield_wall.txt -text svneol=native#text/plain
 res/cardsfolder/shielding_plax.txt -text svneol=native#text/plain
-res/cardsfolder/shieldmates_blessing.txt -text svneol=native#text/plain
+res/cardsfolder/shieldmates_blessing.txt svneol=native#text/plain
 res/cardsfolder/shifting_sliver.txt svneol=native#text/plain
 res/cardsfolder/shifting_wall.txt -text svneol=native#text/plain
 res/cardsfolder/shimmer_myr.txt -text svneol=native#text/plain
@@ -6347,7 +6347,7 @@ res/cardsfolder/sinew_sliver.txt -text svneol=native#text/plain
 res/cardsfolder/singe_mind_ogre.txt -text svneol=native#text/plain
 res/cardsfolder/singing_tree.txt -text svneol=native#text/plain
 res/cardsfolder/sinkhole.txt -text svneol=native#text/plain
-res/cardsfolder/sinking_feeling.txt -text svneol=native#text/plain
+res/cardsfolder/sinking_feeling.txt svneol=native#text/plain
 res/cardsfolder/sir_shandlar_of_eberyn.txt -text svneol=native#text/plain
 res/cardsfolder/sire_of_the_storm.txt -text svneol=native#text/plain
 res/cardsfolder/sirens_call.txt -text svneol=native#text/plain
@@ -6752,7 +6752,7 @@ res/cardsfolder/squandered_resources.txt -text svneol=native#text/plain
 res/cardsfolder/squeaking_pie_grubfellows.txt -text svneol=native#text/plain
 res/cardsfolder/squee_goblin_nabob.txt -text svneol=native#text/plain
 res/cardsfolder/squees_embrace.txt -text svneol=native#text/plain
-res/cardsfolder/squees_toy.txt -text svneol=native#text/plain
+res/cardsfolder/squees_toy.txt svneol=native#text/plain
 res/cardsfolder/squeeze.txt -text svneol=native#text/plain
 res/cardsfolder/squelch.txt -text svneol=native#text/plain
 res/cardsfolder/squire.txt -text svneol=native#text/plain
@@ -7011,7 +7011,7 @@ res/cardsfolder/swarm_of_rats.txt -text svneol=native#text/plain
 res/cardsfolder/swarmyard.txt -text svneol=native#text/plain
 res/cardsfolder/swat.txt -text svneol=native#text/plain
 res/cardsfolder/swelter.txt -text svneol=native#text/plain
-res/cardsfolder/swift_maneuver.txt -text svneol=native#text/plain
+res/cardsfolder/swift_maneuver.txt svneol=native#text/plain
 res/cardsfolder/swirling_sandstorm.txt -text svneol=native#text/plain
 res/cardsfolder/sword_dancer.txt svneol=native#text/plain
 res/cardsfolder/sword_of_body_and_mind.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/cinderhaze_wretch.txt b/res/cardsfolder/cinderhaze_wretch.txt
index 8a5a5b81dcc..b07791cb2fc 100644
--- a/res/cardsfolder/cinderhaze_wretch.txt
+++ b/res/cardsfolder/cinderhaze_wretch.txt
@@ -1,11 +1,12 @@
-Name:Cinderhaze Wretch
-ManaCost:4 B
-Types:Creature Elemental Shaman
-Text:no text
-PT:3/2
-A:AB$ Discard | Cost$ T | ValidTgts$ Player | NumCards$ 1 | Mode$ TgtChoose | PlayerTurn$ True | SpellDescription$ Target player discards a card. Activate this ability only during your turn.
-A:AB$ Untap | Cost$ AddCounter<1/M1M1> | SpellDescription$ Untap CARDNAME.
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cinderhaze_wretch.jpg
+Name:Cinderhaze Wretch
+ManaCost:4 B
+Types:Creature Elemental Shaman
+Text:no text
+PT:3/2
+A:AB$ Discard | Cost$ T | ValidTgts$ Player | NumCards$ 1 | Mode$ TgtChoose | PlayerTurn$ True | SpellDescription$ Target player discards a card. Activate this ability only during your turn.
+A:AB$ Untap | Cost$ AddCounter<1/M1M1> | SpellDescription$ Untap CARDNAME.
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/cinderhaze_wretch.jpg
+SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/60.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/shield_of_the_ages.txt b/res/cardsfolder/shield_of_the_ages.txt
index 61cd528d408..e970abf8f39 100644
--- a/res/cardsfolder/shield_of_the_ages.txt
+++ b/res/cardsfolder/shield_of_the_ages.txt
@@ -1,8 +1,9 @@
-Name:Shield of the Ages
-ManaCost:2
-Types:Artifact
-Text:no text
-A:AB$ PreventDamage | Cost$ 2 | Defined$ You | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to you this turn.
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shield_of_the_ages.jpg
+Name:Shield of the Ages
+ManaCost:2
+Types:Artifact
+Text:no text
+A:AB$ PreventDamage | Cost$ 2 | Defined$ You | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to you this turn.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shield_of_the_ages.jpg
+SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/310.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/shieldmates_blessing.txt b/res/cardsfolder/shieldmates_blessing.txt
index 6d1d887c968..e8bb8452f46 100644
--- a/res/cardsfolder/shieldmates_blessing.txt
+++ b/res/cardsfolder/shieldmates_blessing.txt
@@ -1,8 +1,9 @@
-Name:Shieldmate's Blessing
-ManaCost:W
-Types:Instant
-Text:no text
-A:SP$ PreventDamage | Cost$ W | Tgt$ TgtCP | Amount$ 3 | SpellDescription$ Prevent the next 3 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/shieldmates_blessing.jpg
+Name:Shieldmate's Blessing
+ManaCost:W
+Types:Instant
+Text:no text
+A:SP$ PreventDamage | Cost$ W | Tgt$ TgtCP | Amount$ 3 | SpellDescription$ Prevent the next 3 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/shieldmates_blessing.jpg
+SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/35.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/sinking_feeling.txt b/res/cardsfolder/sinking_feeling.txt
index a164d14507d..4919cefdfb0 100644
--- a/res/cardsfolder/sinking_feeling.txt
+++ b/res/cardsfolder/sinking_feeling.txt
@@ -1,11 +1,12 @@
-Name:Sinking Feeling
-ManaCost:2 U
-Types:Enchantment Aura
-Text:no text
-K:Enchant creature
-K:enPumpCurse:HIDDEN CARDNAME doesn't untap during your untap step.:Enchanted creature doesn't untap during its controller's untap step.
-K:stPumpEnchanted:Creature:0/0/SVar=Untap:No Condition:Enchanted creature has "1, Put a -1/-1 counter on this creature: Untap this creature."
-SVar:Untap:AB$ Untap | Cost$ 1 AddCounter<1/M1M1> | SpellDescription$ Untap CARDNAME.
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sinking_feeling.jpg
+Name:Sinking Feeling
+ManaCost:2 U
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+K:enPumpCurse:HIDDEN CARDNAME doesn't untap during your untap step.:Enchanted creature doesn't untap during its controller's untap step.
+K:stPumpEnchanted:Creature:0/0/SVar=Untap:No Condition:Enchanted creature has "1, Put a -1/-1 counter on this creature: Untap this creature."
+SVar:Untap:AB$ Untap | Cost$ 1 AddCounter<1/M1M1> | SpellDescription$ Untap CARDNAME.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sinking_feeling.jpg
+SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/51.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/squees_toy.txt b/res/cardsfolder/squees_toy.txt
index 736b25699b2..8d03d0399ef 100644
--- a/res/cardsfolder/squees_toy.txt
+++ b/res/cardsfolder/squees_toy.txt
@@ -1,8 +1,9 @@
-Name:Squee's Toy
-ManaCost:1
-Types:Artifact
-Text:no text
-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:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/squees_toy.jpg
+Name:Squee's Toy
+ManaCost:1
+Types:Artifact
+Text:no text
+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:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/squees_toy.jpg
+SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/299.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/swift_maneuver.txt b/res/cardsfolder/swift_maneuver.txt
index d869a7fc05c..d91ed716d08 100644
--- a/res/cardsfolder/swift_maneuver.txt
+++ b/res/cardsfolder/swift_maneuver.txt
@@ -1,9 +1,10 @@
-Name:Swift Maneuver
-ManaCost:1 W
-Types:Instant
-Text:no text
-A:SP$ PreventDamage | Cost$ 1 W | Tgt$ TgtCP | Amount$ 2 | SubAbility$ SVar=DBDraw | SpellDescription$ Prevent the next 2 damage that would be dealt to target creature or player this turn. Draw a card at the beginning of the next turn's upkeep.
-SVar:DBDraw:DB$Draw | Cost$ 0 | NumCards$ 1 | NextUpkeep$ True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/swift_maneuver.jpg
+Name:Swift Maneuver
+ManaCost:1 W
+Types:Instant
+Text:no text
+A:SP$ PreventDamage | Cost$ 1 W | Tgt$ TgtCP | Amount$ 2 | SubAbility$ SVar=DBDraw | SpellDescription$ Prevent the next 2 damage that would be dealt to target creature or player this turn. Draw a card at the beginning of the next turn's upkeep.
+SVar:DBDraw:DB$Draw | Cost$ 0 | NumCards$ 1 | NextUpkeep$ True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/swift_maneuver.jpg
+SetInfo:CSP|Common|http://magiccards.info/scans/en/cs/21.jpg
 End
\ No newline at end of file