diff --git a/.gitattributes b/.gitattributes
index e9a10135391..9225826a3b8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6906,6 +6906,7 @@ res/quest/themes/Snakes[!!-~]G.thm -text
 res/quest/themes/Snow[!!-~]UBRG.thm -text
 res/quest/themes/Soldiers[!!-~]W.thm -text
 res/quest/themes/Swampwalk[!!-~]BG.thm -text
+res/quest/themes/Tap[!!-~]and[!!-~]Destroy[!!-~]WB.thm -text
 res/quest/themes/The[!!-~]Rack[!!-~]B.thm -text
 res/quest/themes/Treefolk[!!-~]WBG.thm -text
 res/quest/themes/Underworld[!!-~]Dreams[!!-~]BUR.thm -text
diff --git a/res/cardsfolder/ballynock_trapper.txt b/res/cardsfolder/ballynock_trapper.txt
index f8cf125c7a5..4a8918601d2 100644
--- a/res/cardsfolder/ballynock_trapper.txt
+++ b/res/cardsfolder/ballynock_trapper.txt
@@ -4,9 +4,9 @@ Types:Creature Kithkin Soldier
 Text:no text
 PT:2/2
 A:AB$Tap | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
-T:Mode$ SpellCast | ValidCard$ Card.White | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigUntap | TriggerDescription$ Whenever you cast a white spell, you may untap CARDNAME.
+T:Mode$ SpellCast | ValidCard$ Card.White+YouCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigUntap | TriggerDescription$ Whenever you cast a white spell, you may untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ballynock_trapper.jpg
 SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/2.jpg
-End
+End
diff --git a/res/cardsfolder/last_laugh.txt b/res/cardsfolder/last_laugh.txt
index e330a7556b5..017f1a28991 100644
--- a/res/cardsfolder/last_laugh.txt
+++ b/res/cardsfolder/last_laugh.txt
@@ -5,6 +5,7 @@ Text:no text
 K:When there are no creatures on the battlefield, sacrifice CARDNAME.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Permanent.Other | TriggerZones$ Battlefield | Execute$ TrigDamageAll | TriggerDescription$ Whenever a permanent other than CARDNAME is put into a graveyard from the battlefield, CARDNAME deals 1 damage to each creature and each player.
 SVar:TrigDamageAll:AB$DamageAll | Cost$ 0 | ValidCards$ Creature | ValidPlayers$ Each | ValidDescription$ each creature and each player. | NumDmg$ 1
+SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/last_laugh.jpg
 SetInfo:TOR|Rare|http://magiccards.info/scans/en/tr/68.jpg
diff --git a/res/quest/themes/Tap and Destroy WB.thm b/res/quest/themes/Tap and Destroy WB.thm
new file mode 100644
index 00000000000..e105faa22f9
--- /dev/null
+++ b/res/quest/themes/Tap and Destroy WB.thm	
@@ -0,0 +1,51 @@
+BasicLandPercentage=15
+
+[Group MaxCnt=4 Percentage=20]
+Scrubland
+Godless Shrine
+Arcane Sanctum
+Marsh Flats
+[/Group]
+
+[Group MaxCnt=4 Percentage=20]
+King's Assassin
+King's Assassin
+Royal Assassin
+Royal Assassin
+Steam Catapult
+Stone Catapult
+[/Group]
+
+[Group MaxCnt=4 Percentage=20]
+Aysen Bureaucrats
+Benalish Trapper
+Blinding Mage
+Errant Doomsayers
+Goldmeadow Harrier
+Kor Line-Slinger
+Master Decoy
+Rathi Trapper
+Squall Drifter
+Whipcorder
+[/Group]
+
+[Group MaxCnt=4 Percentage=5]
+Minister of Impediments
+Silkbind Faerie
+[/Group]
+
+[Group MaxCnt=4 Percentage=16]
+Abyssal Hunter
+Ballynock Trapper
+Kismet
+Kismet
+Ostiary Thrull
+[/Group]
+
+[Group MaxCnt=1 Percentage=4]
+Harrier Griffin
+Kitsune Dawnblade
+Loxodon Mystic
+[/Group]
+
+End
\ No newline at end of file