diff --git a/.gitattributes b/.gitattributes
index 39c201f62d3..746d18a3566 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1777,7 +1777,7 @@ res/cardsfolder/dirge_of_dread.txt -text svneol=native#text/plain
 res/cardsfolder/dirtcowl_wurm.txt -text svneol=native#text/plain
 res/cardsfolder/dirtwater_wraith.txt -text svneol=native#text/plain
 res/cardsfolder/dirty_wererat.txt -text svneol=native#text/plain
-res/cardsfolder/disappear.txt svneol=native#text/plain
+res/cardsfolder/disappear.txt -text svneol=native#text/plain
 res/cardsfolder/disciple_of_grace.txt -text svneol=native#text/plain
 res/cardsfolder/disciple_of_kangee.txt -text svneol=native#text/plain
 res/cardsfolder/disciple_of_law.txt -text svneol=native#text/plain
@@ -2831,7 +2831,7 @@ res/cardsfolder/goblin_outlander.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_patrol.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_piker.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_piledriver.txt -text svneol=native#text/plain
-res/cardsfolder/goblin_pyromancer.txt svneol=native#text/plain
+res/cardsfolder/goblin_pyromancer.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_raider.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_razerunners.txt -text svneol=native#text/plain
 res/cardsfolder/goblin_replica.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/disappear.txt b/res/cardsfolder/disappear.txt
index 8b45f541a7c..427e8599af3 100644
--- a/res/cardsfolder/disappear.txt
+++ b/res/cardsfolder/disappear.txt
@@ -1,12 +1,12 @@
-Name:Disappear
-ManaCost:2 U U
-Types:Enchantment Aura
-Text:no text
-K:Enchant creature
-K:enPump:0/0
-A:AB$ ChangeZone | Cost$ U | Defined$ Enchanted | Origin$ Battlefield | Destination$ Hand | SubAbility$ SVar=DBBounce | SpellDescription$ Return enchanted creature and CARDNAME to their owners' hands.
-SVar:DBBounce:DB$ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/disappear.jpg
-SetInfo:UDS|Uncommon|http://magiccards.info/scans/en/ud/30.jpg
+Name:Disappear
+ManaCost:2 U U
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+K:enPumpCurse:0/0
+A:AB$ ChangeZone | Cost$ U | Defined$ Enchanted | Origin$ Battlefield | Destination$ Hand | SubAbility$ SVar=DBBounce | SpellDescription$ Return enchanted creature and CARDNAME to their owners' hands.
+SVar:DBBounce:DB$ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/disappear.jpg
+SetInfo:UDS|Uncommon|http://magiccards.info/scans/en/ud/30.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/goblin_pyromancer.txt b/res/cardsfolder/goblin_pyromancer.txt
index d703cd98c76..eee24b2fd5c 100644
--- a/res/cardsfolder/goblin_pyromancer.txt
+++ b/res/cardsfolder/goblin_pyromancer.txt
@@ -1,13 +1,14 @@
-Name:Goblin Pyromancer
-ManaCost:3 R
-Types:Creature Goblin Wizard
-Text:no text
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, Goblin creatures get +3/+0 until end of turn.
-T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ At the beginning of the end step, destroy all Goblins.
-SVar:TrigPump:AB$PumpAll | Cost$ 0 | ValidCards$ Creature.Goblin | NumAtt$ 3
-SVar:TrigDestroy:AB$DestroyAll | Cost$ 0 | ValidCards$ Creature.Goblin
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_pyromancer.jpg
-SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/206.jpg
+Name:Goblin Pyromancer
+ManaCost:3 R
+Types:Creature Goblin Wizard
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, Goblin creatures get +3/+0 until end of turn.
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ At the beginning of the end step, destroy all Goblins.
+SVar:TrigPump:AB$PumpAll | Cost$ 0 | ValidCards$ Creature.Goblin | NumAtt$ 3
+SVar:TrigDestroy:AB$DestroyAll | Cost$ 0 | ValidCards$ Creature.Goblin
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_pyromancer.jpg
+SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/206.jpg
 End
\ No newline at end of file