diff --git a/projects/mtg/bin/Res/sets/NPH/_cards.dat b/projects/mtg/bin/Res/sets/NPH/_cards.dat
new file mode 100644
index 000000000..92281c4a6
--- /dev/null
+++ b/projects/mtg/bin/Res/sets/NPH/_cards.dat
@@ -0,0 +1,870 @@
+[meta]
+author=Wagic Team
+name=NPH
+year=2011
+[/meta]
+[card]
+primitive=Act of Aggression
+id=9999001
+rarity=U
+[/card]
+[card]
+primitive=Apostle's Blessing
+id=9999002
+rarity=C
+[/card]
+[card]
+primitive=Alloy Myr
+id=
+rarity=U
+[/card]
+[card]
+primitive=Argent Mutation
+id=
+rarity=U
+[/card]
+[card]
+primitive=Arm with Ęther
+id=
+rarity=U
+[/card]
+[card]
+primitive=Artillerize
+id=
+rarity=C
+[/card]
+[card]
+primitive=Auriok Survivors
+id=
+rarity=U
+[/card]
+[card]
+primitive=Batterskull
+id=
+rarity=M
+[/card]
+[card]
+primitive=Beast Within
+id=
+rarity=U
+[/card]
+[card]
+primitive=Birthing Pod
+id=
+rarity=R
+[/card]
+[card]
+primitive=Blinding Souleater
+id=
+rarity=U
+[/card]
+[card]
+primitive=Brutalizer Exarch
+id=
+rarity=U
+[/card]
+[card]
+primitive=Blighted Agent
+id=
+rarity=C
+[/card]
+[card]
+primitive=Blade Splicer
+id=
+rarity=R
+[/card]
+[card]
+primitive=Blind Zealot
+id=
+rarity=C
+[/card]
+[card]
+primitive=Bludgeon Brawl
+id=
+rarity=R
+[/card]
+[card]
+primitive=Caged Sun
+id=
+rarity=R
+[/card]
+[card]
+primitive=Caress of Phyrexia
+id=
+rarity=U
+[/card]
+[card]
+primitive=Cathedral Membrane
+id=
+rarity=U
+[/card]
+[card]
+primitive=Chained Throatseeker
+id=
+rarity=C
+[/card]
+[card]
+primitive=Chancellor of the Annex
+id=
+rarity=R
+[/card]
+[card]
+primitive=Chancellor of the Dross 
+id=
+rarity=R
+[/card]
+[card]
+primitive=Chancellor of the Forge
+id=
+rarity=R
+[/card]
+[card]
+primitive=Chancellor of the Spires
+id=
+rarity=R
+[/card]
+[card]
+primitive=Chancellor of the Tangle
+id=
+rarity=R
+[/card]
+[card]
+primitive=Conversion Chamber
+id=
+rarity=U
+[/card]
+[card]
+primitive=Corrosive Gale
+id=
+rarity=U
+[/card]
+[card]
+primitive=Corrupted Resolve
+id=
+rarity=U
+[/card]
+[card]
+primitive=Darksteel Relic
+id=
+rarity=U
+[/card]
+[card]
+primitive=Death-Hood Cobra
+id=
+rarity=C
+[/card]
+[card]
+primitive=Deceiver Exarch
+id=
+rarity=U
+[/card]
+[card]
+primitive=Defensive Stance
+id=
+rarity=C
+[/card]
+[card]
+primitive=Dementia Bat
+id=
+rarity=C
+[/card]
+[card]
+primitive=Despise
+id=
+rarity=U
+[/card]
+[card]
+primitive=Dismember
+id=
+rarity=U
+[/card]
+[card]
+primitive=Dispatch
+id=
+rarity=U
+[/card]
+[card]
+primitive=Due Respect
+id=
+rarity=U
+[/card]
+[card]
+primitive=Elesh Norn, Grand Cenobite
+id=
+rarity=M
+[/card]
+[card]
+primitive=Enslave
+id=
+rarity=U
+[/card]
+[card]
+primitive=Entomber Exarch
+id=
+rarity=U
+[/card]
+[card]
+primitive=Etched Monstrosity
+id=
+rarity=M
+[/card]
+[card]
+primitive=Evil Presence
+id=
+rarity=C
+[/card]
+[card]
+primitive=Exclusion Ritual
+id=
+rarity=U
+[/card]
+[card]
+primitive=Fallen Ferromancer
+id=
+rarity=U
+[/card]
+[card]
+primitive=Flameborn Viron
+id=
+rarity=C
+[/card]
+[card]
+primitive=Forced Worship
+id=
+rarity=C
+[/card]
+[card]
+primitive=Forest
+id=
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=
+rarity=L
+[/card]
+[card]
+primitive=Fresh Meat
+id=
+rarity=R
+[/card]
+[card]
+primitive=Furnace Scamp
+id=
+rarity=C
+[/card]
+[card]
+primitive=Geosurge
+id=
+rarity=U
+[/card]
+[card]
+primitive=Geth's Verdict
+id=
+rarity=C
+[/card]
+[card]
+primitive=Gitaxian Probe
+id=
+rarity=C
+[/card]
+[card]
+primitive=Glissa's Scorn
+id=
+rarity=C
+[/card]
+[card]
+primitive=Glistener Elf
+id=
+rarity=C
+[/card]
+[card]
+primitive=Glistening Oil
+id=
+rarity=R
+[/card]
+[card]
+primitive=Greenhilt Trainee
+id=
+rarity=U
+[/card]
+[card]
+primitive=Gremlin Mine
+id=
+rarity=C
+[/card]
+[card]
+primitive=Grim Affliction
+id=
+rarity=C
+[/card]
+[card]
+primitive=Gut Shot
+id=
+rarity=U
+[/card]
+[card]
+primitive=Hex Parasite
+id=
+rarity=R
+[/card]
+[card]
+primitive=Hovermyr
+id=
+rarity=C
+[/card]
+[card]
+primitive=Ichor Explosion
+id=
+rarity=U
+[/card]
+[card]
+primitive=Immolating Souleater
+id=
+rarity=C
+[/card]
+[card]
+primitive=Impaler Shrike
+id=
+rarity=C
+[/card]
+[card]
+primitive=Inquisitor Exarch
+id=
+rarity=U
+[/card]
+[card]
+primitive=Insatiable Souleater
+id=
+rarity=C
+[/card]
+[card]
+primitive=Invader Parasite
+id=
+rarity=R
+[/card]
+[card]
+primitive=Island
+id=
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=
+rarity=L
+[/card]
+[card]
+primitive=Isolation Cell
+id=
+rarity=U
+[/card]
+[card]
+primitive=Jin-Gitaxias, Core Augur
+id=
+rarity=M
+[/card]
+[card]
+primitive=Jor Kadeen, the Prevailer
+id=
+rarity=R
+[/card]
+[card]
+primitive=Karn Liberated
+id=
+rarity=M
+[/card]
+[card]
+primitive=Kiln Walker
+id=
+rarity=R
+[/card]
+[card]
+primitive=Lashwrithe
+id=
+rarity=R
+[/card]
+[card]
+primitive=Leeching Bite
+id=
+rarity=C
+[/card]
+[card]
+primitive=Life's Finale
+id=
+rarity=R
+[/card]
+[card]
+primitive=Lost Leonin
+id=
+rarity=C
+[/card]
+[card]
+primitive=Loxodon Convert
+id=
+rarity=C
+[/card]
+[card]
+primitive=Marrow Shards
+id=
+rarity=U
+[/card]
+[card]
+primitive=Marrow Splicer
+id=
+rarity=U
+[/card]
+[card]
+primitive=Maul Splicer
+id=
+rarity=C
+[/card]
+[card]
+primitive=Melira, Sylvok Outcast
+id=
+rarity=R
+[/card]
+[card]
+primitive=Mental Misstep
+id=
+rarity=U
+[/card]
+[card]
+primitive=Mindcrank
+id=
+rarity=U
+[/card]
+[card]
+primitive=Mindculling
+id=
+rarity=U
+[/card]
+[card]
+primitive=Moltensteel Dragon
+id=
+rarity=R
+[/card]
+[card]
+primitive=Mortis Dogs
+id=
+rarity=C
+[/card]
+[card]
+primitive=Mountain
+id=
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=
+rarity=L
+[/card]
+[card]
+primitive=Mutagenic Growth
+id=
+rarity=C
+[/card]
+[card]
+primitive=Mycosynth Fiend
+id=
+rarity=U
+[/card]
+[card]
+primitive=Mycosynth Wellspring
+id=
+rarity=C
+[/card]
+[card]
+primitive=Myr Superion
+id=
+rarity=R
+[/card]
+[card]
+primitive=Necropouncer
+id=
+rarity=
+[/card]
+[card]
+primitive=Norn's Annex
+id=
+rarity=R
+[/card]
+[card]
+primitive=Noxious Revival
+id=
+rarity=U
+[/card]
+[card]
+primitive=Ogre Menial
+id=
+rarity=C
+[/card]
+[card]
+primitive=Omen Machine
+id=
+rarity=R
+[/card]
+[card]
+primitive=Parasitic Implant
+id=
+rarity=C
+[/card]
+[card]
+primitive=Pestilent Souleater
+id=
+rarity=C
+[/card]
+[card]
+primitive=Phyrexian Hulk
+id=
+rarity=C
+[/card]
+[card]
+primitive=Phyrexian Ingester
+id=
+rarity=R
+[/card]
+[card]
+primitive=Phyrexian Metamorph
+id=
+rarity=R
+[/card]
+[card]
+primitive=Phyrexian Obliterator
+id=
+rarity=M
+[/card]
+[card]
+primitive=Phyrexian Swarmlord
+id=
+rarity=R
+[/card]
+[card]
+primitive=Phyrexian Unlife
+id=
+rarity=R
+[/card]
+[card]
+primitive=Phyrexia's Core
+id=
+rarity=U
+[/card]
+[card]
+primitive=Pith Driller
+id=
+rarity=C
+[/card]
+[card]
+primitive=Plains
+id=
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=
+rarity=L
+[/card]
+[card]
+primitive=Porcelain Legionnaire
+id=9999007
+rarity=C
+[/card]
+[card]
+primitive=Postmortem Lunge
+id=
+rarity=U
+[/card]
+[card]
+primitive=Praetor's Grasp
+id=
+rarity=R
+[/card]
+[card]
+primitive=Priest of Urabrask
+id=
+rarity=U
+[/card]
+[card]
+primitive=Pristine Talisman
+id=
+rarity=C
+[/card]
+[card]
+primitive=Psychic Barrier
+id=
+rarity=C
+[/card]
+[card]
+primitive=Psychic Surgery
+id=
+rarity=R
+[/card]
+[card]
+primitive=Puresteel Paladin
+id=
+rarity=R
+[/card]
+[card]
+primitive=Rage Extractor
+id=
+rarity=U
+[/card]
+[card]
+primitive=Razor Swine
+id=
+rarity=C
+[/card]
+[card]
+primitive=Reaper of Sheoldred
+id=
+rarity=C
+[/card]
+[card]
+primitive=Remember the Fallen
+id=
+rarity=C
+[/card]
+[card]
+primitive=Rotted Hystrix
+id=
+rarity=C
+[/card]
+[card]
+primitive=Ruthless Invasion
+id=
+rarity=C
+[/card]
+[card]
+primitive=Scrapyard Salvo
+id=
+rarity=C
+[/card]
+[card]
+primitive=Sensor Splicer
+id=
+rarity=C
+[/card]
+[card]
+primitive=Shattered Angel
+id=
+rarity=U
+[/card]
+[card]
+primitive=Sheoldred, Whispering One
+id=
+rarity=M
+[/card]
+[card]
+primitive=Shriek Raptor
+id=
+rarity=C
+[/card]
+[card]
+primitive=Shrine of Boundless Growth
+id=
+rarity=U
+[/card]
+[card]
+primitive=Shrine of Burning Rage
+id=
+rarity=U
+[/card]
+[card]
+primitive=Shrine of Limitless Power
+id=
+rarity=U
+[/card]
+[card]
+primitive=Shrine of Loyal Legions
+id=
+rarity=U
+[/card]
+[card]
+primitive=Shrine of Piercing Vision
+id=
+rarity=U
+[/card]
+[card]
+primitive=Sickleslicer
+id=
+rarity=U
+[/card]
+[card]
+primitive=Slag Fiend
+id=
+rarity=R
+[/card]
+[card]
+primitive=Slash Panther
+id=
+rarity=C
+[/card]
+[card]
+primitive=Soul Conduit
+id=
+rarity=R
+[/card]
+[card]
+primitive=Spellskite
+id=
+rarity=R
+[/card]
+[card]
+primitive=Spinebiter
+id=
+rarity=U
+[/card]
+[card]
+primitive=Surge Node
+id=
+rarity=U
+[/card]
+[card]
+primitive=Swamp
+id=
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=
+rarity=L
+[/card]
+[card]
+primitive=Sword of War and Peace
+id=
+rarity=M
+[/card]
+[card]
+primitive=Torpor Orb
+id=
+rarity=R
+[/card]
+[card]
+primitive=Trespassing Souleater
+id=
+rarity=C
+[/card]
+[card]
+primitive=Triumph of the Hordes
+id=
+rarity=U
+[/card]
+[card]
+primitive=Tormentor Exarch
+id=
+rarity=U
+[/card]
+[card]
+primitive=Spined Thopter
+id=
+rarity=C
+[/card]
+[card]
+primitive=Spire Monitor
+id=
+rarity=C
+[/card]
+[card]
+primitive=Surgical Extraction
+id=
+rarity=R
+[/card]
+[card]
+primitive=Suture Priest
+id=
+rarity=C
+[/card]
+[card]
+primitive=Tezzeret's Gambit
+id=
+rarity=U
+[/card]
+[card]
+primitive=Toxic Nim
+id=
+rarity=C
+[/card]
+[card]
+primitive=Unwinding Clock
+id=
+rarity=R
+[/card]
+[card]
+primitive=Urabrask, the Hidden
+id=
+rarity=M
+[/card]
+[card]
+primitive=Vapor Snag
+id=
+rarity=C
+[/card]
+[card]
+primitive=Vault Skirge
+id=9999008
+rarity=C
+[/card]
+[card]
+primitive=Victorious Destruction
+id=
+rarity=C
+[/card]
+[card]
+primitive=Viridian Betrayers
+id=
+rarity=C
+[/card]
+[card]
+primitive=Viridian Harvest
+id=
+rarity=C
+[/card]
+[card]
+primitive=Vital Splicer
+id=
+rarity=U
+[/card]
+[card]
+primitive=Volt Charge
+id=
+rarity=U
+[/card]
+[card]
+primitive=Vorinclex, Voice of Hunger
+id=
+rarity=M
+[/card]
+[card]
+primitive=Vulshok Refugee
+id=
+rarity=U
+[/card]
+[card]
+primitive=Whipflare
+id=
+rarity=U
+[/card]
+[card]
+primitive=Whispering Specter
+id=
+rarity=U
+[/card]
+[card]
+primitive=Viral Drake
+id=
+rarity=U
+[/card]
+[card]
+primitive=War Report
+id=
+rarity=C
+[/card]
+[card]
+primitive=Wing Splicer
+id=
+rarity=U
+[/card]
+[card]
+primitive=Xenograft
+id=
+rarity=R
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/primitives/crappy.txt b/projects/mtg/bin/Res/sets/primitives/crappy.txt
index 9aa3fa322..602f090ac 100644
--- a/projects/mtg/bin/Res/sets/primitives/crappy.txt
+++ b/projects/mtg/bin/Res/sets/primitives/crappy.txt
@@ -72,6 +72,15 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Blightning
+target=player
+auto=damage:3
+auto=discard:2
+text=Blightning deals 3 damage to target player. That player discards two cards.
+mana={1}{B}{R}
+type=Sorcery
+[/card]
+[card]
 name=Cabal Inquisitor
 auto=aslongas(*|mygraveyard) {1}{b}{e(*|mygraveyard)}{e(*|mygraveyard)}{t}:target(player) discard:1 asSorcery >6
 text=Threshold - {1}{B}, {T}, Exile two cards from your graveyard: Target player discards a card. Activate this ability only any time you could cast a sorcery, and only if seven or more cards are in your graveyard.
@@ -171,6 +180,22 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Deception
+target=opponent
+auto=discard:2
+text=Target opponent discards two cards.
+mana={2}{B}
+type=Sorcery
+[/card]
+[card]
+name=Delirium Skeins
+auto=discard:3 controller
+auto=discard:3 opponent
+text=Each player discards three cards.
+mana={2}{B}
+type=Sorcery
+[/card]
+[card]
 name=Desecrated Earth
 target=land
 auto=discard:1 targetcontroller
@@ -239,6 +264,23 @@ power=*
 toughness=*
 [/card]
 [card]
+name=Forget
+target=player
+auto=discard:2
+auto=draw:2
+text=Target player discards two cards, then draws as many cards as he or she discarded this way.
+mana={U}{U}
+type=Sorcery
+[/card]
+[card]
+name=Fugue
+target=player
+auto=discard:3
+text=Target player discards three cards.
+mana={3}{B}{B}
+type=Sorcery
+[/card]
+[card]
 name=Fungal Shambler
 abilities=trample
 auto=@damaged(opponent) from(this): draw:1 controller && discard:1 opponent
@@ -612,9 +654,10 @@ type=Sorcery
 [card]
 name=Sword of Feast and Famine
 auto=2/2
-auto=teach(creature) protection from(black)
-auto=teach(creature) protection from(green)
-auto=@combatdamaged(player) from(mytgt): discard:1 opponent
+auto=teach(creature) protection from black
+auto=teach(creature) protection from green
+auto=@combatdamaged(player) from(mytgt):discard:1 opponent
+auto=@combatdamaged(player) from(mytgt):untap all(land|mybattlefield)
 auto={2}:equip
 text=Equipped creature gets +2/+2 and has protection from black and from green. -- Whenever equipped creature deals combat damage to a player, that player discards a card and you untap all lands you control. -- Equip {2}
 mana={3}
@@ -690,47 +733,4 @@ type=Creature
 subtype=Human Wizard
 power=1
 toughness=1
-[/card]
-[card]
-name=Blightning
-target=player
-auto=damage:3
-auto=discard:2
-####The card should not cause random discard!
-text=Blightning deals 3 damage to target player. That player discards two cards.
-mana={1}{B}{R}
-type=Sorcery
-[/card]
-[card]
-name=Deception
-target=opponent
-auto=discard:2
-text=Target opponent discards two cards.
-mana={2}{B}
-type=Sorcery
-[/card]
-[card]
-name=Delirium Skeins
-auto=discard:3 controller
-auto=discard:3 opponent
-text=Each player discards three cards.
-mana={2}{B}
-type=Sorcery
-[/card]
-[card]
-name=Fugue
-target=player
-auto=discard:3
-text=Target player discards three cards.
-mana={3}{B}{B}
-type=Sorcery
-[/card]
-[card]
-name=Forget
-target=player
-auto=discard:2
-auto=draw:2
-text=Target player discards two cards, then draws as many cards as he or she discarded this way.
-mana={U}{U}
-type=Sorcery
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index e82900c35..edd14be34 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -18779,7 +18779,6 @@ toughness=1
 [/card]
 [card]
 name=Elvish Berserker
-abilities=haste
 auto=rampage(1/1,0)
 text=Whenever Elvish Berserker becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
 mana={G}
@@ -43913,7 +43912,7 @@ toughness=1
 [/card]
 [card]
 name=Nullmage Shepherd
-auto={T(creature|myBattlefield)}{T(creature|myBattlefield)}{T(creature|myBattlefield)}{T(creature|myBattlefield)}:destroy all(artifact,enchantment)
+auto={T(creature|myBattlefield)}{T(creature|myBattlefield)}{T(creature|myBattlefield)}{T(creature|myBattlefield)}:destroy target(artifact,enchantment)
 text=Tap four untapped creatures you control: Destroy target artifact or enchantment.
 mana={3}{G}
 type=Creature