diff --git a/res/cardsfolder/g/goblin_machinist.txt b/res/cardsfolder/g/goblin_machinist.txt
index 3b309afd624..257001d9ff6 100644
--- a/res/cardsfolder/g/goblin_machinist.txt
+++ b/res/cardsfolder/g/goblin_machinist.txt
@@ -1,13 +1,14 @@
-Name:Goblin Machinist
-ManaCost:4 R
-Types:Creature Goblin
-Text:no text
-PT:0/5
-A:AB$ DigUntil | Cost$ 2 R | Valid$ Card.nonLand | ValidDescription$ nonland | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | FoundDestination$ Library | FoundLibraryPosition$ -1 | RememberFound$ True | SubAbility$ DBPump | Shuffle$ False | SpellDescription$ Reveal cards from the top of your library until you reveal a nonland card. CARDNAME gets +X/+0 until end of turn, where X is that card's converted mana cost. Put the revealed cards on the bottom of your library in any order.
-SVar:DBPump:DB$ Pump | NumAtt$ RCX | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:RCX:Remembered$CardManaCost
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_machinist.jpg
+Name:Goblin Machinist
+ManaCost:4 R
+Types:Creature Goblin
+Text:no text
+PT:0/5
+A:AB$ DigUntil | Cost$ 2 R | Valid$ Card.nonLand | ValidDescription$ nonland | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | FoundDestination$ Library | FoundLibraryPosition$ -1 | RememberFound$ True | SubAbility$ DBPump | Shuffle$ False | SpellDescription$ Reveal cards from the top of your library until you reveal a nonland card. CARDNAME gets +X/+0 until end of turn, where X is that card's converted mana cost. Put the revealed cards on the bottom of your library in any order.
+SVar:DBPump:DB$ Pump | NumAtt$ RCX | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:RCX:Remembered$CardManaCost
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_machinist.jpg
+SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/204.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/g/gustcloak_savior.txt b/res/cardsfolder/g/gustcloak_savior.txt
index 6a8ee92addb..cc87ace5b94 100644
--- a/res/cardsfolder/g/gustcloak_savior.txt
+++ b/res/cardsfolder/g/gustcloak_savior.txt
@@ -1,12 +1,13 @@
-Name:Gustcloak Savior
-ManaCost:4 W
-Types:Creature Bird Soldier
-Text:no text
-PT:3/4
-K:Flying
-T:Mode$ AttackerBlocked | ValidCard$ Creature.YouCtrl | Execute$ TrigUntapRemove | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever a creature you control becomes blocked, you may untap that creature and remove it from combat.
-SVar:TrigUntapRemove:AB$ Untap | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DBRemoveCombat
-SVar:DBRemoveCombat:DB$ RemoveFromCombat | Defined$ TriggeredAttacker
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/gustcloak_savior.jpg
+Name:Gustcloak Savior
+ManaCost:4 W
+Types:Creature Bird Soldier
+Text:no text
+PT:3/4
+K:Flying
+T:Mode$ AttackerBlocked | ValidCard$ Creature.YouCtrl | Execute$ TrigUntapRemove | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever a creature you control becomes blocked, you may untap that creature and remove it from combat.
+SVar:TrigUntapRemove:AB$ Untap | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DBRemoveCombat
+SVar:DBRemoveCombat:DB$ RemoveFromCombat | Defined$ TriggeredAttacker
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gustcloak_savior.jpg
+SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/36.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/g/gustcloak_sentinel.txt b/res/cardsfolder/g/gustcloak_sentinel.txt
index 45293a9a0c3..d879eeb8dea 100644
--- a/res/cardsfolder/g/gustcloak_sentinel.txt
+++ b/res/cardsfolder/g/gustcloak_sentinel.txt
@@ -1,11 +1,12 @@
-Name:Gustcloak Sentinel
-ManaCost:2 W W
-Types:Creature Human Soldier
-Text:no text
-PT:3/3
-T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigUntapRemove | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME becomes blocked, you may untap it and remove it from combat.
-SVar:TrigUntapRemove:AB$ Untap | Cost$ 0 | SubAbility$ DBRemoveCombat
-SVar:DBRemoveCombat:DB$ RemoveFromCombat
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/gustcloak_sentinel.jpg
+Name:Gustcloak Sentinel
+ManaCost:2 W W
+Types:Creature Human Soldier
+Text:no text
+PT:3/3
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigUntapRemove | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME becomes blocked, you may untap it and remove it from combat.
+SVar:TrigUntapRemove:AB$ Untap | Cost$ 0 | SubAbility$ DBRemoveCombat
+SVar:DBRemoveCombat:DB$ RemoveFromCombat
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gustcloak_sentinel.jpg
+SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/37.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/s/stone_idol_trap.txt b/res/cardsfolder/s/stone_idol_trap.txt
index 68f691b07a0..207cdb6151c 100644
--- a/res/cardsfolder/s/stone_idol_trap.txt
+++ b/res/cardsfolder/s/stone_idol_trap.txt
@@ -1,11 +1,12 @@
-Name:Stone Idol Trap
-ManaCost:5 R
-Types:Instant Trap
-Text:CARDNAME costs 1 less to cast for each attacking creature.
-A:SP$ Token | Cost$ 5 R | TokenAmount$ 1 | TokenName$ Construct | TokenTypes$ Artifact,Creature,Construct | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 6 | TokenToughness$ 12 |  RememberTokens$ True | SubAbility$ DelTrig | TokenKeywords$ Trample | SpellDescription$ Put a 6/12 colorless Construct artifact creature token with trample onto the battlefield. Exile it at the beginning of your next end step.
-SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TrigExile | TriggerDescription$ Exile Construct at the beginning of your next end step.
-SVar:TrigExile:AB$ChangeZoneAll | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | ChangeType$ Creature.IsRemembered
-K:CostChange:Player:Less:X:Self:All:All:NoSpecial
-SVar:X:Count$Valid Creature.attacking
-SVar:Rarity:Rare
-End
+Name:Stone Idol Trap
+ManaCost:5 R
+Types:Instant Trap
+Text:CARDNAME costs 1 less to cast for each attacking creature.
+A:SP$ Token | Cost$ 5 R | TokenAmount$ 1 | TokenName$ Construct | TokenTypes$ Artifact,Creature,Construct | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 6 | TokenToughness$ 12 |  RememberTokens$ True | SubAbility$ DelTrig | TokenKeywords$ Trample | SpellDescription$ Put a 6/12 colorless Construct artifact creature token with trample onto the battlefield. Exile it at the beginning of your next end step.
+SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TrigExile | TriggerDescription$ Exile Construct at the beginning of your next end step.
+SVar:TrigExile:AB$ChangeZoneAll | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | ChangeType$ Creature.IsRemembered
+K:CostChange:Player:Less:X:Self:All:All:NoSpecial
+SVar:X:Count$Valid Creature.attacking
+SVar:Rarity:Rare
+SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/93.jpg
+End
\ No newline at end of file