diff --git a/campgns/origplus/map00004.txt b/campgns/origplus/map00004.txt
index fde4839bf4..52c58f36cf 100644
--- a/campgns/origplus/map00004.txt
+++ b/campgns/origplus/map00004.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2015
+REM  Date:     17 Dec 1996 - 11 Jul 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
diff --git a/campgns/origplus/map00006.txt b/campgns/origplus/map00006.txt
index 4a7ffc4b56..81457ca640 100644
--- a/campgns/origplus/map00006.txt
+++ b/campgns/origplus/map00006.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2015
+REM  Date:     17 Dec 1996 - 11 Jul 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
diff --git a/campgns/origplus/map00007.txt b/campgns/origplus/map00007.txt
index f10d9f2114..c78462bd79 100644
--- a/campgns/origplus/map00007.txt
+++ b/campgns/origplus/map00007.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 27 Feb 2018
+REM  Date:     17 Dec 1996 - 14 Aug 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
diff --git a/campgns/origplus/map00008.txt b/campgns/origplus/map00008.txt
index 180a6a0589..c1012c125d 100644
--- a/campgns/origplus/map00008.txt
+++ b/campgns/origplus/map00008.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2015
+REM  Date:     17 Dec 1996 - 11 Jul 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
diff --git a/campgns/origplus/map00009.txt b/campgns/origplus/map00009.txt
index 07770e5516..5249070ff1 100644
--- a/campgns/origplus/map00009.txt
+++ b/campgns/origplus/map00009.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2015
+REM  Date:     17 Dec 1996 - 25 Jul 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
diff --git a/campgns/origplus/map00010.txt b/campgns/origplus/map00010.txt
index 40a53705f1..9ee316716c 100644
--- a/campgns/origplus/map00010.txt
+++ b/campgns/origplus/map00010.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2015
+REM  Date:     17 Dec 1996 - 08 Jul 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ CREATURE_AVAILABLE(ALL_PLAYERS,BILE_DEMON,1,0)
 CREATURE_AVAILABLE(ALL_PLAYERS,HELL_HOUND,1,0)
 CREATURE_AVAILABLE(ALL_PLAYERS,DRAGON,1,0)
 CREATURE_AVAILABLE(ALL_PLAYERS,ORC,1,0)
-	
+
 REM	Room availability
 ROOM_AVAILABLE(ALL_PLAYERS,TREASURE,1,1)
 ROOM_AVAILABLE(ALL_PLAYERS,LAIR,1,1)
diff --git a/campgns/origplus/map00011.txt b/campgns/origplus/map00011.txt
index 5bdf8eb256..e85d20f18b 100644
--- a/campgns/origplus/map00011.txt
+++ b/campgns/origplus/map00011.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2015
+REM  Date:     17 Dec 1996 - 24 Aug 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ CREATURE_AVAILABLE(PLAYER0,BILE_DEMON,1,0)
 CREATURE_AVAILABLE(PLAYER0,HELL_HOUND,1,0)
 CREATURE_AVAILABLE(PLAYER0,DRAGON,1,0)
 CREATURE_AVAILABLE(PLAYER0,ORC,1,0)
-	
+
 REM	Room availability
 ROOM_AVAILABLE(ALL_PLAYERS,TREASURE,1,1)
 ROOM_AVAILABLE(ALL_PLAYERS,LAIR,1,1)
@@ -205,25 +205,32 @@ IF(PLAYER_GOOD,GAME_TURN >= 13000)
 	ENDIF
 ENDIF
 
+REM Extra parties for player when he goes after specials
+IF(PLAYER0,BRIDGE >= 6)
+		ADD_PARTY_TO_LEVEL(PLAYER_GOOD,FIFTH,DRAWFROM(1,2,3),1)
+		ADD_PARTY_TO_LEVEL(PLAYER_GOOD,SIXTH,DRAWFROM(1,2,3),1)
+		ADD_PARTY_TO_LEVEL(PLAYER_GOOD,SEVENTH,DRAWFROM(1,2,3),1)
+ENDIF
+
 REM Start a second wave
 IF(PLAYER0,TIMER1 >= 3000)
 	REM "The enemy are upon us. I'm just telling you in case you were having a doze."
 	DISPLAY_OBJECTIVE(103,ALL_PLAYERS)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,FIFTH,1,1)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,SIXTH,2,1)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,SEVENTH,3,1)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,FIFTH,DRAWFROM(1,2,3,4),1)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,SIXTH,DRAWFROM(1,2,3,4),1)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,SEVENTH,DRAWFROM(1,2,3,4),1)
 ENDIF
 
 IF(PLAYER0,TIMER1 >= 4000)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,EIGHTH,4,1)
-ENDIF	
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,EIGHTH,DRAWFROM(2,4),1)
+ENDIF
 
 IF(PLAYER0,TIMER1 >= 4500)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,LANDLORD,1,1)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,THIRD,1,1)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,FOURTH,1,1)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,LANDLORD,DRAWFROM(2,4),1)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,THIRD,DRAWFROM(2,4),1)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,FOURTH,DRAWFROM(2,4),1)
 	SET_TIMER(PLAYER0,TIMER2)
-ENDIF	
+ENDIF
 
 IF(PLAYER0,TIMER2 >= 200)
 	IF_CONTROLS(PLAYER_GOOD,TOTAL_CREATURES <= 0)
@@ -231,6 +238,6 @@ IF(PLAYER0,TIMER2 >= 200)
 		DISPLAY_OBJECTIVE(104,ALL_PLAYERS)
 		WIN_GAME
 	ENDIF
-ENDIF	
+ENDIF
 
 REM ****************************************************************************
\ No newline at end of file
diff --git a/campgns/origplus/map00012.txt b/campgns/origplus/map00012.txt
index 04e259f6e6..a8112271f4 100644
--- a/campgns/origplus/map00012.txt
+++ b/campgns/origplus/map00012.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2015
+REM  Date:     17 Dec 1996 - 15 Aug 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
@@ -135,20 +135,28 @@ IF(PLAYER1,DUNGEON_DESTROYED == 1)
 	ENDIF
 ENDIF
 
-REM Access to transfer special revoked when a hero is killed before a single keeper is destroyed.
+REM Access to transfer special revoked when a hero is killed before a single keeper is destroyed, or when transfering a unit into this level.
 IF_CONTROLS(PLAYER_GOOD,TOTAL_CREATURES < 27)
 	IF(PLAYER1,DUNGEON_DESTROYED == 0)
 		IF(PLAYER2,DUNGEON_DESTROYED == 0)
 			IF(PLAYER0,FLAG7 <= 0)
-				PLAY_MESSAGE(PLAYER0,SOUND,927)
-				CHANGE_SLAB_TYPE(1,44,HARD)
-				REVEAL_MAP_RECT(PLAYER0,3,132,1,1)
+				SET_FLAG(PLAYER0,FLAG7,1)
 			ENDIF
 		ENDIF
 	ENDIF
 ENDIF
+IF(PLAYER0,GAME_TURN <= 10)
+	IF(PLAYER0,TOTAL_CREATURES >= 1)
+		SET_FLAG(PLAYER0,FLAG7,1)
+	ENDIF
+ENDIF
+IF(PLAYER0,FLAG7 == 1)
+	PLAY_MESSAGE(PLAYER0,SOUND,927)
+	CHANGE_SLAB_TYPE(1,44,HARD)
+	REVEAL_MAP_RECT(PLAYER0,3,132,1,1)
+ENDIF
 IF_SLAB_OWNER(1,44,PLAYER0)
-	SET_FLAG(PLAYER0,FLAG7,1)
+	SET_FLAG(PLAYER0,FLAG7,2)
 ENDIF
 
 REM If one computer takes heart damage, the other one will remove the door.
diff --git a/campgns/origplus/map00014.txt b/campgns/origplus/map00014.txt
index 14fafacadc..ad591465e9 100644
--- a/campgns/origplus/map00014.txt
+++ b/campgns/origplus/map00014.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2015
+REM  Date:     17 Dec 1996 - 24 Jul 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
diff --git a/campgns/origplus/map00015.txt b/campgns/origplus/map00015.txt
index f01cb80785..c2a6147b23 100644
--- a/campgns/origplus/map00015.txt
+++ b/campgns/origplus/map00015.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2015
+REM  Date:     17 Dec 1996 - 15 Aug 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
diff --git a/campgns/origplus/map00016.txt b/campgns/origplus/map00016.txt
index 9a3474e86f..c9eca6ef74 100644
--- a/campgns/origplus/map00016.txt
+++ b/campgns/origplus/map00016.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 08 Mar 2018
+REM  Date:     17 Dec 1996 - 15 Aug 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
@@ -224,8 +224,11 @@ ENDIF
 IF(PLAYER0,TOTAL_CREATURES >= 16)
 	SET_FLAG(PLAYER0,FLAG7,1)
 ENDIF
-IF(PLAYER1,HEART_HEALTH <= 28000)
-	IF(PLAYER0,FLAG7 <= 0)
+IF(PLAYER0,FLAG7 <= 0)
+	IF(PLAYER1,HEART_HEALTH <= 28000)
+		SET_FLAG(PLAYER0,FLAG7,2)
+	ENDIF
+	IF(PLAYER1,BATTLES_LOST >= 4)
 		SET_FLAG(PLAYER0,FLAG7,2)
 	ENDIF
 ENDIF
@@ -240,6 +243,7 @@ IF(PLAYER0,FLAG7 == 2)
 	IF_SLAB_TYPE(61,58,DRAPE_WALL)
 		CHANGE_SLAB_TYPE(61,58,PRETTY_PATH)
 	ENDIF
+	ALLY_PLAYERS(PLAYER1,PLAYER_GOOD,1)
 ENDIF
 
 IF(PLAYER1,TOTAL_CREATURES >= 17)
diff --git a/campgns/origplus/map00018.txt b/campgns/origplus/map00018.txt
index 881995bc62..e7d906f2d5 100644
--- a/campgns/origplus/map00018.txt
+++ b/campgns/origplus/map00018.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2018
+REM  Date:     17 Dec 1996 - 15 Aug 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@ REM Nothing new for the player
 REM Flags used:
 REM   PLAYER0,FLAG2 - State of party TWO continuous spawning; 0-before; 2-spawning; 3-after.
 REM   PLAYER0,FLAG4 - Disables attack of the gold mining events chain; 0-attack allowed; 1-final attack disabled.
+REM   PLAYER_GOOD,FLAG1 - Allows for the Lord to be spawned
+REM   PLAYER_GOOD,FLAG2 - Starts GOOD Timer 2
 REM Timers used:
 REM   PLAYER0,TIMER2 - Continuous spawning of party TWO after AP1 is activated
 REM   PLAYER0,TIMER4 - Allows delayed spawning of small party when AP3 is activated
@@ -233,6 +235,10 @@ ENDIF
 REM If mined so much gold, the dungeon is quite advanced. Start timer for a large attack.
 IF(PLAYER0,TOTAL_GOLD_MINED >= 35000)
 	ADD_TUNNELLER_PARTY_TO_LEVEL(PLAYER_GOOD,TWO,-2,DUNGEON_HEART,0,5,250)
+	SET_FLAG(PLAYER_GOOD,FLAG2,1)
+ENDIF
+
+IF(PLAYER_GOOD,FLAG2 == 1)
 	SET_TIMER(PLAYER_GOOD,TIMER2)
 ENDIF
 
@@ -286,6 +292,7 @@ IF_ACTION_POINT(1,PLAYER0)
 ENDIF
 IF_ACTION_POINT(12,PLAYER0)
 	SET_FLAG(PLAYER_GOOD,FLAG1,1)
+	SET_FLAG(PLAYER_GOOD,FLAG2,1)
 ENDIF
 IF(PLAYER_GOOD,FLAG1 == 1)
 	REM "The heroes of this realm have prepared for your coming by building an underground stronghold of their own."
diff --git a/campgns/origplus/map00019.txt b/campgns/origplus/map00019.txt
index 024212957a..2a7ac52e07 100644
--- a/campgns/origplus/map00019.txt
+++ b/campgns/origplus/map00019.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 14 Mar 2018
+REM  Date:     17 Dec 1996 - 24 Aug 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
@@ -103,6 +103,11 @@ CREATE_PARTY(WIZZIES)
 	ADD_TO_PARTY(WIZZIES,WIZARD,2,500,ATTACK_ENEMIES,0)
 	ADD_TO_PARTY(WIZZIES,WIZARD,2,500,ATTACK_ENEMIES,0)
 
+CREATE_PARTY(PIXIES)
+	ADD_TO_PARTY(PIXIES,FAIRY,8,700,ATTACK_ENEMIES,0)
+	ADD_TO_PARTY(PIXIES,FAIRY,8,700,ATTACK_ENEMIES,0)
+	ADD_TO_PARTY(PIXIES,FAIRY,8,700,ATTACK_ENEMIES,0)
+
 CREATE_PARTY(DWARVES)
 	ADD_TO_PARTY(DWARVES,DWARFA,4,500,STEAL_GOLD,0)
 	ADD_TO_PARTY(DWARVES,DWARFA,4,500,STEAL_GOLD,0)
@@ -217,6 +222,7 @@ ENDIF
 IF_ACTION_POINT(3,PLAYER0)
 	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,SAMMIES,8,1)
 	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,SAMMIES,9,1)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,PIXIES,-3,1)
 	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,LANDLORD,3,1)
 ENDIF
 
diff --git a/campgns/origplus/map00020.txt b/campgns/origplus/map00020.txt
index ee7e4eb487..f5492480f6 100644
--- a/campgns/origplus/map00020.txt
+++ b/campgns/origplus/map00020.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:     17 Dec 1996 - 29 Nov 2014
+REM  Date:     17 Dec 1996 - 20 Aug 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
@@ -96,7 +96,7 @@ MAGIC_AVAILABLE(ALL_PLAYERS,POWER_CHICKEN,1,0)
 REM	Doors and traps availability
 TRAP_AVAILABLE(ALL_PLAYERS,POISON_GAS,1,0)
 DOOR_AVAILABLE(ALL_PLAYERS,STEEL,1,0)
-TRAP_AVAILABLE(ALL_PLAYERS,BOULDER,1,0)
+TRAP_AVAILABLE(PLAYER1,BOULDER,1,0)
 DOOR_AVAILABLE(ALL_PLAYERS,MAGIC,1,0)
 TRAP_AVAILABLE(ALL_PLAYERS,LIGHTNING,1,0)
 TRAP_AVAILABLE(ALL_PLAYERS,WORD_OF_POWER,1,0)
@@ -150,8 +150,8 @@ IF(PLAYER_GOOD,FLAG1 == 0)
 	ENDIF
 ENDIF
 
-REM If the blue heart is taking serious damage, give him some bridges to put up a fight
-IF(PLAYER1,HEART_HEALTH <= 8000)
+REM If the blue heart is taking significant damage, give him some bridges to put up a fight
+IF(PLAYER1,HEART_HEALTH <= 22000)
 	IF_SLAB_OWNER(33,22,PLAYER1)
 		IF_SLAB_TYPE(33,23,WATER)
 			CHANGE_SLAB_TYPE(33,23,BRIDGE_FRAME)
@@ -161,6 +161,7 @@ IF(PLAYER1,HEART_HEALTH <= 8000)
 			CHANGE_SLAB_TYPE(33,24,BRIDGE_FRAME)
 			CHANGE_SLAB_OWNER(33,24,PLAYER1)
 		ENDIF
+		CHANGE_SLAB_TYPE(33,21,PRETTY_PATH)
 	ENDIF
 	IF_SLAB_OWNER(35,22,PLAYER1)
 		IF_SLAB_TYPE(35,23,WATER)
@@ -171,6 +172,7 @@ IF(PLAYER1,HEART_HEALTH <= 8000)
 			CHANGE_SLAB_TYPE(35,24,BRIDGE_FRAME)
 			CHANGE_SLAB_OWNER(35,24,PLAYER1)
 		ENDIF
+		CHANGE_SLAB_TYPE(35,21,PRETTY_PATH)
 	ENDIF
 	IF_SLAB_OWNER(70,16,PLAYER1)
 		IF_SLAB_TYPE(71,16,LAVA)
@@ -220,6 +222,7 @@ REM ****************************************************************************
 
 IF(PLAYER1,DUNGEON_DESTROYED == 1)
 	ROOM_AVAILABLE(PLAYER0,BRIDGE,1,1)
+	TRAP_AVAILABLE(PLAYER0,BOULDER,1,0)
 	SET_TIMER(PLAYER1,TIMER2)
 	IF(PLAYER_GOOD,FLAG1 == 0)
 		REM "You got rid of that Keeper easily. Now all that stands between you and total world domination is that ponce in shining armour. Let's get him."
@@ -249,16 +252,17 @@ IF(PLAYER_GOOD,FLAG1 == 1)
 		ENDIF
 	ENDIF
 ENDIF
-	
-IF(PLAYER_GOOD,TIMER0 >= 700)
+
+SET_TIMER(PLAYER_GOOD,TIMER0)
+IF(PLAYER_GOOD,TIMER0 >= 70)
 	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,MAGICIANS,-1,1)
 	ADD_TUNNELLER_PARTY_TO_LEVEL(PLAYER_GOOD,BRUTES,-2,DUNGEON,0,10,100)
-	ADD_TUNNELLER_PARTY_TO_LEVEL(PLAYER_GOOD,DWARVES,-3,DUNGEON,0,10,100)
-	ADD_TUNNELLER_PARTY_TO_LEVEL(PLAYER_GOOD,DWARVES,-6,DUNGEON,0,10,100)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,BRUTES,1,1)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,MAGICIANS,2,1)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,BRUTES,4,1)
-	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,DWARVES,3,1)
+	ADD_TUNNELLER_PARTY_TO_LEVEL(PLAYER_GOOD,DWARVES,DRAWFROM(-3,-6),DUNGEON,0,10,100)
+	ADD_TUNNELLER_PARTY_TO_LEVEL(PLAYER_GOOD,DWARVES,DRAWFROM(-3,-6),DUNGEON,0,10,100)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,BRUTES,DRAWFROM(1,2,3,4),1)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,MAGICIANS,DRAWFROM(1,2,3,4),1)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,BRUTES,DRAWFROM(1,2,3,4),1)
+	ADD_PARTY_TO_LEVEL(PLAYER_GOOD,DWARVES,DRAWFROM(1,2,3,4),1)
 ENDIF
 
 IF(PLAYER_GOOD,TIMER0 >= 833)
diff --git a/campgns/origplus/map00101.txt b/campgns/origplus/map00101.txt
index 8e0437d9ee..4f7378b98f 100644
--- a/campgns/origplus/map00101.txt
+++ b/campgns/origplus/map00101.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:   17 Aug 1997 - 14 Nov 2014
+REM  Date:   17 Aug 1997 - 30 Jun 2020
 REM  Copying and copyrights:
 REM This program is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by
diff --git a/campgns/origplus/map00102.txt b/campgns/origplus/map00102.txt
index 14e08665de..4830c53964 100644
--- a/campgns/origplus/map00102.txt
+++ b/campgns/origplus/map00102.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:   17 Aug 1997 - 14 Nov 2014
+REM  Date:   17 Aug 1997 - 24 Aug 2020
 REM  Copying and copyrights:
 REM This program is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ IF(PLAYER0,CAMPAIGN_FLAG3 <= 2)
 	IF(PLAYER0,IMP == 0)
 		REM "It is done. Tiny heaps of charred flesh smoulder where Imps once stood. You certainly had your finger on the pulse this time."
 		DISPLAY_OBJECTIVE(147,PLAYER0)
-		ADD_CREATURE_TO_LEVEL(PLAYER0,IMP,PLAYER0,1,5,10000)
+		ADD_CREATURE_TO_LEVEL(PLAYER0,IMP,PLAYER0,1,1,10000)
 		ROOM_AVAILABLE(ALL_PLAYERS,BRIDGE,1,1)
 		MAGIC_AVAILABLE(PLAYER0,POWER_POSSESS,1,1)
 		REM Using a timer to make sure add creature command will be executed
diff --git a/campgns/origplus/map00103.txt b/campgns/origplus/map00103.txt
index 3ead66f874..56ccd9191b 100644
--- a/campgns/origplus/map00103.txt
+++ b/campgns/origplus/map00103.txt
@@ -6,7 +6,7 @@ REM  Campaign: New game plus
 REM  Authors:  based on Bullfrog script
 REM            KeeperFX CCP Team
 REM            Loobinex
-REM  Date:   17 Aug 1997 - 02 Nov 2013
+REM  Date:   17 Aug 1997 - 24 Aug 2020
 REM  Copying and copyrights:
 REM This program is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@ IF(PLAYER0,GAME_TURN <= 60)
 		KILL_CREATURE(PLAYER0,IMP,MOST_EXPERIENCED,1)
 	ENDIF
 	IF(PLAYER0,CAMPAIGN_FLAG5 == 1)
-		ADD_CREATURE_TO_LEVEL(PLAYER0,WITCH,PLAYER0,1,9,0)
+		ADD_CREATURE_TO_LEVEL(PLAYER0,WITCH,PLAYER0,1,6,0)
 	ENDIF
 	IF(PLAYER0,CAMPAIGN_FLAG5 == 2)
 		WIN_GAME
diff --git a/campgns/twinkprs/map00208.txt b/campgns/twinkprs/map00208.txt
index 890d8a9496..bd0d8652aa 100644
--- a/campgns/twinkprs/map00208.txt
+++ b/campgns/twinkprs/map00208.txt
@@ -6,7 +6,7 @@ REM  Campaign: Twin Keepers
 REM  Authors:  Original author unknown
 REM            KeeperFX CCP Team
 REM            Switched to translatable objectives by dayokay Nov 2014
-REM  Date:     17 Aug 2005 - 20 Jan 2011
+REM  Date:     17 Aug 2005 - 24 Aug 2020
 REM  Copying and copyrights:
 REM    This program is free software; you can redistribute it and/or modify
 REM    it under the terms of the GNU General Public License as published by
@@ -29,6 +29,9 @@ SET_GENERATE_SPEED(500)
 
 SET_FLAG(PLAYER0,FLAG0,0)
 SET_TIMER(PLAYER0,TIMER0)
+SET_TIMER(PLAYER0,TIMER1)
+SET_TIMER(PLAYER0,TIMER2)
+SET_TIMER(PLAYER0,TIMER3)
 SET_TIMER(PLAYER1,TIMER0)
 
 MAX_CREATURES(PLAYER0,20)
@@ -46,6 +49,7 @@ ADD_CREATURE_TO_POOL(ORC,20)
 ADD_CREATURE_TO_POOL(TENTACLE,15)
 ADD_CREATURE_TO_POOL(SORCEROR,15)
 ADD_CREATURE_TO_POOL(FLY,15)
+ADD_CREATURE_TO_POOL(HELL_HOUND,2)
 
 CREATURE_AVAILABLE(ALL_PLAYERS,TROLL,1,1)
 CREATURE_AVAILABLE(ALL_PLAYERS,DARK_MISTRESS,1,1)
@@ -143,13 +147,8 @@ CREATE_PARTY(PARTY9)
 
 DISPLAY_OBJECTIVE(22,PLAYER0)
 
-IF(PLAYER1,ENTRANCE >= 1)
-    ADD_CREATURE_TO_LEVEL(PLAYER1,VAMPIRE,-1,1,10,1000)
-ENDIF
-
-IF(PLAYER2,ENTRANCE >= 1)
-    ADD_CREATURE_TO_LEVEL(PLAYER2,VAMPIRE,-2,1,10,1000)
-ENDIF
+ADD_CREATURE_TO_LEVEL(PLAYER1,VAMPIRE,-1,1,10,1000)
+ADD_CREATURE_TO_LEVEL(PLAYER2,VAMPIRE,-2,1,10,1000)
 
 IF(PLAYER1,BATTLES_LOST >= 5)
     IF(PLAYER1,HORNY == 0)
@@ -184,14 +183,14 @@ IF(PLAYER0,FLAG0 == 0)
             ENDIF
         ENDIF
     ENDIF
-ENDIF
 
-IF(PLAYER1,AVATAR > 0)
-    SET_FLAG(PLAYER0,FLAG0,1)
-ENDIF
+    IF(PLAYER1,AVATAR > 0)
+        SET_FLAG(PLAYER0,FLAG0,1)
+    ENDIF
 
-IF(PLAYER2,AVATAR > 0)
-    SET_FLAG(PLAYER0,FLAG0,1)
+    IF(PLAYER2,AVATAR > 0)
+        SET_FLAG(PLAYER0,FLAG0,1)
+    ENDIF
 ENDIF
 
 IF(PLAYER0,FLAG0 == 1)
@@ -217,6 +216,13 @@ IF(PLAYER0,FLAG0 == 1)
     ENDIF
 ENDIF
 
+IF(PLAYER1,DUNGEON_DESTROYED == 1)
+    SET_FLAG(PLAYER0,FLAG0,2)
+ENDIF
+IF(PLAYER2,DUNGEON_DESTROYED == 1)
+    SET_FLAG(PLAYER0,FLAG0,2)
+ENDIF
+
 IF(PLAYER_GOOD,DUNGEON_DESTROYED == 0)
     
     IF_ACTION_POINT(1,PLAYER0)
@@ -231,14 +237,6 @@ IF(PLAYER_GOOD,DUNGEON_DESTROYED == 0)
         ADD_CREATURE_TO_LEVEL(PLAYER_GOOD,VAMPIRE,6,4,4,500)
     ENDIF
     
-    IF_ACTION_POINT(7,PLAYER0)
-        ADD_TUNNELLER_PARTY_TO_LEVEL(PLAYER_GOOD,PARTY9,7,DUNGEON_HEART,0,5,500)
-    ENDIF
-    
-    IF_ACTION_POINT(8,PLAYER0)
-        ADD_TUNNELLER_PARTY_TO_LEVEL(PLAYER_GOOD,PARTY9,8,DUNGEON_HEART,0,5,500)
-    ENDIF
-    
     IF_ACTION_POINT(9,PLAYER0)
         ADD_PARTY_TO_LEVEL(PLAYER_GOOD,PARTY3,9,1)
         ADD_CREATURE_TO_LEVEL(PLAYER_GOOD,ARCHER,10,4,5,1000)
@@ -283,43 +281,61 @@ IF(PLAYER_GOOD,DUNGEON_DESTROYED == 0)
         ADD_TUNNELLER_TO_LEVEL(PLAYER_GOOD,-3,ACTION_POINT,30,9,500)
     ENDIF
     
-    IF(PLAYER0,TIMER0 > 5000)
+    
+ENDIF
+
+IF(PLAYER0,TIMER2 > 2500)
         IF(PLAYER1,DUNGEON_DESTROYED == 0)
             NEXT_COMMAND_REUSABLE
-            ADD_CREATURE_TO_LEVEL(PLAYER_GOOD,THIEF,-5,5,1,10000)
+            ADD_TUNNELLER_TO_LEVEL(PLAYER_GOOD,17,ACTION_POINT,31,1,20000)
         ENDIF
         IF(PLAYER2,DUNGEON_DESTROYED == 0)
             NEXT_COMMAND_REUSABLE
-            ADD_CREATURE_TO_LEVEL(PLAYER_GOOD,THIEF,-6,5,1,10000)
+            ADD_TUNNELLER_TO_LEVEL(PLAYER_GOOD,20,ACTION_POINT,30,1,20000) 
         ENDIF
         NEXT_COMMAND_REUSABLE
-        SET_TIMER(PLAYER0,TIMER0)
-    ENDIF
-    
+        SET_TIMER(PLAYER0,TIMER2)
 ENDIF
 
-IF(PLAYER0,GAME_TURN > 10000)
-    ADD_TUNNELLER_TO_LEVEL(PLAYER_GOOD,17,ACTION_POINT,31,1,500)
-    ADD_TUNNELLER_TO_LEVEL(PLAYER_GOOD,20,ACTION_POINT,30,1,500)
-    SET_TIMER(PLAYER0,TIMER1)
+
+IF(PLAYER2,FLY == 0)
+                  NEXT_COMMAND_REUSABLE
+                  MAGIC_AVAILABLE(PLAYER2,POWER_HAND,1,1)
 ENDIF
 
-IF(PLAYER0,GAME_TURN > 5000)
-    ADD_CREATURE_TO_LEVEL(PLAYER_GOOD,THIEF,-5,5,1,15000)
-    ADD_CREATURE_TO_LEVEL(PLAYER_GOOD,THIEF,-6,5,1,15000)
+IF(PLAYER2,FLY == 1)
+                  NEXT_COMMAND_REUSABLE
+                  MAGIC_AVAILABLE(PLAYER2,POWER_HAND,0,0)
 ENDIF
 
-IF(PLAYER0,TIMER1 > 5000)
-    IF(PLAYER2,DUNGEON_DESTROYED == 0)
-        NEXT_COMMAND_REUSABLE
-        ADD_CREATURE_TO_LEVEL(PLAYER2,FLY,30,1,10,100)
-    ENDIF
-    IF(PLAYER1,DUNGEON_DESTROYED == 0)
-        NEXT_COMMAND_REUSABLE
-        ADD_CREATURE_TO_LEVEL(PLAYER1,FLY,31,1,10,100)
+IF(PLAYER1,FLY == 0)
+                  NEXT_COMMAND_REUSABLE
+                  MAGIC_AVAILABLE(PLAYER1,POWER_HAND,1,1)
+ENDIF
+
+IF(PLAYER1,FLY == 1)
+                  NEXT_COMMAND_REUSABLE
+                  MAGIC_AVAILABLE(PLAYER1,POWER_HAND,0,0)
+ENDIF
+
+IF(PLAYER0,TIMER3 > 5000)
+     IF(PLAYER2,DUNGEON_DESTROYED == 0)
+         NEXT_COMMAND_REUSABLE
+             IF(PLAYER2,FLY == 0)
+                  NEXT_COMMAND_REUSABLE
+                  ADD_CREATURE_TO_LEVEL(PLAYER2,FLY,30,1,9,100)
+             ENDIF
+     ENDIF
+     IF(PLAYER1,DUNGEON_DESTROYED == 0)
+        IF(PLAYER1,FLY == 0)
+             NEXT_COMMAND_REUSABLE
+             ADD_CREATURE_TO_LEVEL(PLAYER1,FLY,31,1,10,100)
+             NEXT_COMMAND_REUSABLE
+             MAGIC_AVAILABLE(PLAYER1,POWER_HAND,0,0)
+        ENDIF
     ENDIF
     NEXT_COMMAND_REUSABLE
-    SET_TIMER(PLAYER0,TIMER1)
+    SET_TIMER(PLAYER0,TIMER3)
 ENDIF
 
 IF(PLAYER_GOOD,DUNGEON_DESTROYED == 1)
@@ -336,10 +352,8 @@ IF(PLAYER0,ALL_DUNGEONS_DESTROYED == 1)
     WIN_GAME
 ENDIF
 
-IF(PLAYER_GOOD,DUNGEON_DESTROYED == 1)
-    IF(PLAYER0,DUNGEON_DESTROYED == 1)
-        DISPLAY_OBJECTIVE(26,PLAYER0)
-        ALLY_PLAYERS(PLAYER1,PLAYER2,0)
-        REVEAL_MAP_RECT(PLAYER0,127,127,254,254)
-    ENDIF
+IF(PLAYER0,DUNGEON_DESTROYED == 1)
+    DISPLAY_OBJECTIVE(26,PLAYER0)
+    ALLY_PLAYERS(PLAYER1,PLAYER2,0)
+    REVEAL_MAP_RECT(PLAYER0,127,127,254,254)
 ENDIF
diff --git a/version.mk b/version.mk
index 9222167554..5b38c72057 100644
--- a/version.mk
+++ b/version.mk
@@ -1,5 +1,5 @@
 VER_MAJOR=0
 VER_MINOR=4
-VER_RELEASE=7
-VER_BUILD=2153
+VER_RELEASE=8
+VER_BUILD=2154
 PACKAGE_SUFFIX=