diff --git a/ChangeLog b/ChangeLog
index 6e0461332..b97542012 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-05 Nicolas Weeger
+        * dungeons/voragray-gauntlet/voragray-end,
+        * dungeons/voragray-gauntlet/00-abandoned-shrine,
+        * dungeons/voragray-gauntlet/01-voragray-gauntlet,
+        * dungeons/voragray-gauntlet/02-voragray-gauntlet: Link second test, add some reward, add booming voice
+
 2021-05-30 Nicolas Weeger
         * start/newbieshouse: Add zone with information on potions of life, slightly change layout
 
diff --git a/dungeons/voragray-gauntlet/00-abandoned-shrine b/dungeons/voragray-gauntlet/00-abandoned-shrine
index 9dc61aa91..96f475e72 100644
--- a/dungeons/voragray-gauntlet/00-abandoned-shrine
+++ b/dungeons/voragray-gauntlet/00-abandoned-shrine
@@ -9,7 +9,7 @@ enter_x 11
 enter_y 1
 msg
 Created:  2017-06-30 Rick Tanner
-Modified: 2017-11-30 Rick Tanner
+Modified: 2021-06-05 Nicolas Weeger
 endmsg
 end
 arch cave_15
@@ -2065,6 +2065,16 @@ arch dungeon_magic
 x 13
 y 9
 end
+arch magic_mouth
+msg
+You hear a booming voice.
+
+"How dare you steal that precious relic? You shall pay for that!"
+endmsg
+x 13
+y 9
+connected 100
+end
 arch cobblestones2
 x 13
 y 9
diff --git a/dungeons/voragray-gauntlet/01-voragray-gauntlet b/dungeons/voragray-gauntlet/01-voragray-gauntlet
index 0f04d09cb..2e76b829a 100644
--- a/dungeons/voragray-gauntlet/01-voragray-gauntlet
+++ b/dungeons/voragray-gauntlet/01-voragray-gauntlet
@@ -9,7 +9,7 @@ enter_x 3
 enter_y 3
 msg
 Created:  2017-06-30 Rick Tanner
-Modified: 2017-06-30 Rick Tanner
+Modified: 2021-06-05 Nicolas Weeger
 endmsg
 end
 arch cobblestones2
@@ -529,12 +529,12 @@ x 3
 y 10
 end
 arch exit
-slaying ../../world/world_119_104
+slaying 02-voragray-gauntlet
 msg
-Well.. I see I need to make this more challenging. How fortunate for you!!
+You managed to survive so far, good luck for the next round!
 endmsg
-hp 34
-sp 19
+hp 3
+sp 3
 x 3
 y 10
 end
diff --git a/dungeons/voragray-gauntlet/02-voragray-gauntlet b/dungeons/voragray-gauntlet/02-voragray-gauntlet
index a8c590f8f..0e61ccac5 100644
--- a/dungeons/voragray-gauntlet/02-voragray-gauntlet
+++ b/dungeons/voragray-gauntlet/02-voragray-gauntlet
@@ -9,7 +9,7 @@ enter_x 3
 enter_y 3
 msg
 Created:  2017-12-30 Rick Tanner
-Modified: 2017-12-31 Rick Tanner
+Modified: 2021-06-05 Nicolas Weeger
 endmsg
 end
 arch flagstone
@@ -492,7 +492,7 @@ y 6
 end
 arch magic_mouth
 msg
-Back again? Find the three keys to continue on .. if you survive!
+Find the three keys to continue on .. if you survive!
 endmsg
 x 3
 y 6
@@ -529,12 +529,14 @@ x 3
 y 10
 end
 arch exit
-slaying ../../world/world_119_104
+slaying voragray-end
 msg
-Another challenge defeated. You live for another day. For now!!
+Very well, you seem strong enough.
+
+If you give back the relics, I shall be magnanimous and let you have some treasure.
 endmsg
-hp 34
-sp 19
+hp 3
+sp 3
 x 3
 y 10
 end
diff --git a/dungeons/voragray-gauntlet/voragray-end b/dungeons/voragray-gauntlet/voragray-end
new file mode 100644
index 000000000..4b05fec43
--- /dev/null
+++ b/dungeons/voragray-gauntlet/voragray-end
@@ -0,0 +1,1016 @@
+arch map
+name Voragray's end
+difficulty 15
+region wilderness
+darkness 1
+width 15
+height 10
+enter_x 3
+enter_y 3
+msg
+Created:  2021-06-05 Nicolas Weeger
+Modified: 2021-06-05 Nicolas Weeger
+endmsg
+end
+arch flagstone
+end
+arch cave24
+end
+arch cobblestones2
+y 1
+end
+arch cave3
+y 1
+end
+arch flagstone
+y 2
+end
+arch cave3
+y 2
+end
+arch flagstone
+y 3
+end
+arch cave3
+y 3
+end
+arch flagstone
+y 4
+end
+arch cave3
+y 4
+end
+arch flagstone
+y 5
+end
+arch cave3
+y 5
+end
+arch flagstone
+y 6
+end
+arch cave3
+y 6
+end
+arch flagstone
+y 7
+end
+arch cave3
+y 7
+end
+arch flagstone
+y 8
+end
+arch cave3
+y 8
+end
+arch flagstone
+y 9
+end
+arch cave23
+y 9
+end
+arch flagstone
+x 1
+end
+arch cave4
+x 1
+end
+arch flagstone
+x 1
+y 1
+end
+arch flagstone
+x 1
+y 2
+end
+arch flagstone
+x 1
+y 3
+end
+arch flagstone
+x 1
+y 4
+end
+arch flagstone
+x 1
+y 5
+end
+arch flagstone
+x 1
+y 6
+end
+arch flagstone
+x 1
+y 7
+end
+arch flagstone
+x 1
+y 8
+end
+arch flagstone
+x 1
+y 9
+end
+arch cave2
+x 1
+y 9
+end
+arch flagstone
+x 2
+end
+arch cave4
+x 2
+end
+arch flagstone
+x 2
+y 1
+end
+arch dungeon_floor
+x 2
+y 2
+end
+arch cwall_2_2_2
+x 2
+y 2
+end
+arch dungeon_floor
+x 2
+y 3
+end
+arch cwall_2_1_1
+x 2
+y 3
+end
+arch dungeon_floor
+x 2
+y 4
+end
+arch cwall_2_1_1
+x 2
+y 4
+end
+arch dungeon_floor
+x 2
+y 5
+end
+arch cwall_3_2
+x 2
+y 5
+end
+arch dungeon_floor
+x 2
+y 6
+end
+arch cwall_2_1_1
+x 2
+y 6
+end
+arch dungeon_floor
+x 2
+y 7
+end
+arch cwall_2_2_1
+x 2
+y 7
+end
+arch flagstone
+x 2
+y 8
+end
+arch flagstone
+x 2
+y 9
+end
+arch cave2
+x 2
+y 9
+end
+arch flagstone
+x 3
+end
+arch cave4
+x 3
+end
+arch flagstone
+x 3
+y 1
+end
+arch dungeon_floor
+x 3
+y 2
+end
+arch cwall_2_1_2
+x 3
+y 2
+end
+arch dungeon_floor
+x 3
+y 3
+end
+arch dungeon_floor
+x 3
+y 4
+end
+arch dungeon_floor
+x 3
+y 5
+end
+arch cwall_2_1_2
+x 3
+y 5
+end
+arch dungeon_floor
+x 3
+y 6
+end
+arch exit
+slaying ../../world/world_119_104
+hp 34
+sp 19
+x 3
+y 6
+end
+arch dungeon_floor
+x 3
+y 7
+end
+arch cwall_2_1_2
+x 3
+y 7
+end
+arch flagstone
+x 3
+y 8
+end
+arch flagstone
+x 3
+y 9
+end
+arch cave2
+x 3
+y 9
+end
+arch flagstone
+x 4
+end
+arch cave4
+x 4
+end
+arch flagstone
+x 4
+y 1
+end
+arch dungeon_floor
+x 4
+y 2
+end
+arch cwall_2_1_2
+x 4
+y 2
+end
+arch dungeon_floor
+x 4
+y 3
+end
+arch dungeon_floor
+x 4
+y 4
+end
+arch dungeon_floor
+x 4
+y 5
+end
+arch cwall_2_1_2
+x 4
+y 5
+end
+arch dungeon_floor
+x 4
+y 6
+end
+arch dungeon_floor
+x 4
+y 7
+end
+arch cwall_2_1_2
+x 4
+y 7
+end
+arch flagstone
+x 4
+y 8
+end
+arch flagstone
+x 4
+y 9
+end
+arch cave2
+x 4
+y 9
+end
+arch flagstone
+x 5
+end
+arch cave4
+x 5
+end
+arch flagstone
+x 5
+y 1
+end
+arch dungeon_floor
+x 5
+y 2
+end
+arch cwall_2_1_2
+x 5
+y 2
+end
+arch dungeon_floor
+x 5
+y 3
+end
+arch dungeon_floor
+x 5
+y 4
+end
+arch dungeon_floor
+x 5
+y 5
+end
+arch cwall_2_1_2
+x 5
+y 5
+end
+arch dungeon_floor
+x 5
+y 6
+end
+arch dungeon_floor
+x 5
+y 7
+end
+arch cwall_2_1_2
+x 5
+y 7
+end
+arch light2
+x 5
+y 7
+end
+arch flagstone
+x 5
+y 8
+end
+arch flagstone
+x 5
+y 9
+end
+arch cave2
+x 5
+y 9
+end
+arch flagstone
+x 6
+end
+arch cave4
+x 6
+end
+arch flagstone
+x 6
+y 1
+end
+arch dungeon_floor
+x 6
+y 2
+end
+arch cwall_2_1_2
+x 6
+y 2
+end
+arch dungeon_floor
+x 6
+y 3
+end
+arch altar_trigger
+slaying voragraygauntlet
+exp 30000
+food 1
+x 6
+y 3
+connected 25
+end
+arch dungeon_floor
+x 6
+y 4
+end
+arch dungeon_floor
+x 6
+y 5
+end
+arch cwall_2_1_2
+x 6
+y 5
+end
+arch dungeon_floor
+x 6
+y 6
+end
+arch dungeon_floor
+x 6
+y 7
+end
+arch cwall_2_1_2
+x 6
+y 7
+end
+arch flagstone
+x 6
+y 8
+end
+arch flagstone
+x 6
+y 9
+end
+arch cave2
+x 6
+y 9
+end
+arch flagstone
+x 7
+end
+arch cave4
+x 7
+end
+arch flagstone
+x 7
+y 1
+end
+arch dungeon_floor
+x 7
+y 2
+end
+arch cwall_3_3
+x 7
+y 2
+end
+arch dungeon_floor
+x 7
+y 3
+end
+arch cwall_1_2
+x 7
+y 3
+end
+arch dungeon_floor
+x 7
+y 4
+end
+arch igate_closed_2
+x 7
+y 4
+connected 25
+end
+arch dungeon_floor
+x 7
+y 5
+end
+arch cwall_1_3
+x 7
+y 5
+end
+arch dungeon_floor
+x 7
+y 6
+end
+arch dungeon_floor
+x 7
+y 7
+end
+arch cwall_2_1_2
+x 7
+y 7
+end
+arch flagstone
+x 7
+y 8
+end
+arch flagstone
+x 7
+y 9
+end
+arch cave2
+x 7
+y 9
+end
+arch flagstone
+x 8
+end
+arch cave4
+x 8
+end
+arch flagstone
+x 8
+y 1
+end
+arch dungeon_floor
+x 8
+y 2
+end
+arch cwall_2_1_2
+x 8
+y 2
+end
+arch dungeon_floor
+x 8
+y 3
+end
+arch random_ore
+x 8
+y 3
+end
+arch dungeon_floor
+x 8
+y 4
+end
+arch random_mineral
+x 8
+y 4
+end
+arch dungeon_floor
+x 8
+y 5
+end
+arch random_mineral
+x 8
+y 5
+end
+arch dungeon_floor
+x 8
+y 6
+end
+arch random_ore
+x 8
+y 6
+end
+arch random_wealth
+x 8
+y 6
+end
+arch dungeon_floor
+x 8
+y 7
+end
+arch cwall_2_1_2
+x 8
+y 7
+end
+arch flagstone
+x 8
+y 8
+end
+arch flagstone
+x 8
+y 9
+end
+arch cave2
+x 8
+y 9
+end
+arch flagstone
+x 9
+end
+arch cave4
+x 9
+end
+arch flagstone
+x 9
+y 1
+end
+arch dungeon_floor
+x 9
+y 2
+end
+arch cwall_2_1_2
+x 9
+y 2
+end
+arch dungeon_floor
+x 9
+y 3
+end
+arch random_ore
+x 9
+y 3
+end
+arch random_wealth
+x 9
+y 3
+end
+arch dungeon_floor
+x 9
+y 4
+end
+arch random_ore
+x 9
+y 4
+end
+arch random_gem
+x 9
+y 4
+end
+arch dungeon_floor
+x 9
+y 5
+end
+arch random_ore
+x 9
+y 5
+end
+arch random_gem
+x 9
+y 5
+end
+arch dungeon_floor
+x 9
+y 6
+end
+arch random_mineral
+x 9
+y 6
+end
+arch dungeon_floor
+x 9
+y 7
+end
+arch cwall_2_1_2
+x 9
+y 7
+end
+arch flagstone
+x 9
+y 8
+end
+arch flagstone
+x 9
+y 9
+end
+arch cave2
+x 9
+y 9
+end
+arch flagstone
+x 10
+end
+arch cave4
+x 10
+end
+arch flagstone
+x 10
+y 1
+end
+arch dungeon_floor
+x 10
+y 2
+end
+arch cwall_2_1_2
+x 10
+y 2
+end
+arch dirtfloor
+x 10
+y 3
+end
+arch random_ore
+x 10
+y 3
+end
+arch dungeon_floor
+x 10
+y 4
+end
+arch random_ore
+x 10
+y 4
+end
+arch random_wealth
+x 10
+y 4
+end
+arch dungeon_floor
+x 10
+y 5
+end
+arch random_mineral
+x 10
+y 5
+end
+arch dungeon_floor
+x 10
+y 6
+end
+arch random_ore
+x 10
+y 6
+end
+arch random_gem
+x 10
+y 6
+end
+arch dungeon_floor
+x 10
+y 7
+end
+arch cwall_2_1_2
+x 10
+y 7
+end
+arch flagstone
+x 10
+y 8
+end
+arch flagstone
+x 10
+y 9
+end
+arch cave2
+x 10
+y 9
+end
+arch flagstone
+x 11
+end
+arch cave4
+x 11
+end
+arch flagstone
+x 11
+y 1
+end
+arch dungeon_floor
+x 11
+y 2
+end
+arch cwall_2_1_2
+x 11
+y 2
+end
+arch dungeon_floor
+x 11
+y 3
+end
+arch random_mineral
+x 11
+y 3
+end
+arch random_gem
+x 11
+y 3
+end
+arch dirtfloor
+x 11
+y 4
+end
+arch random_ore
+x 11
+y 4
+end
+arch dungeon_floor
+x 11
+y 5
+end
+arch random_ore
+x 11
+y 5
+end
+arch random_wealth
+x 11
+y 5
+end
+arch dirtfloor
+x 11
+y 6
+end
+arch random_mineral
+x 11
+y 6
+end
+arch dungeon_floor
+x 11
+y 7
+end
+arch cwall_2_1_2
+x 11
+y 7
+end
+arch flagstone
+x 11
+y 8
+end
+arch flagstone
+x 11
+y 9
+end
+arch cave2
+x 11
+y 9
+end
+arch flagstone
+x 12
+end
+arch cave4
+x 12
+end
+arch flagstone
+x 12
+y 1
+end
+arch dungeon_floor
+x 12
+y 2
+end
+arch cwall_3_3
+x 12
+y 2
+end
+arch dirtfloor
+x 12
+y 3
+end
+arch cwall_2_1_1
+x 12
+y 3
+end
+arch dirtfloor
+x 12
+y 4
+end
+arch cwall_2_1_1
+x 12
+y 4
+end
+arch light2
+x 12
+y 4
+end
+arch dungeon_floor
+x 12
+y 5
+end
+arch cwall_2_1_1
+x 12
+y 5
+end
+arch dirtfloor
+x 12
+y 6
+end
+arch cwall_2_1_1
+x 12
+y 6
+end
+arch dungeon_floor
+x 12
+y 7
+end
+arch cwall_2_2_4
+x 12
+y 7
+end
+arch flagstone
+x 12
+y 8
+end
+arch flagstone
+x 12
+y 9
+end
+arch cave2
+x 12
+y 9
+end
+arch flagstone
+x 13
+end
+arch cave4
+x 13
+end
+arch flagstone
+x 13
+y 1
+end
+arch flagstone
+x 13
+y 2
+end
+arch flagstone
+x 13
+y 3
+end
+arch flagstone
+x 13
+y 4
+end
+arch flagstone
+x 13
+y 5
+end
+arch flagstone
+x 13
+y 6
+end
+arch flagstone
+x 13
+y 7
+end
+arch flagstone
+x 13
+y 8
+end
+arch flagstone
+x 13
+y 9
+end
+arch cave2
+x 13
+y 9
+end
+arch flagstone
+x 14
+end
+arch cave25
+x 14
+end
+arch flagstone
+x 14
+y 1
+end
+arch cave1
+x 14
+y 1
+end
+arch flagstone
+x 14
+y 2
+end
+arch cave1
+x 14
+y 2
+end
+arch flagstone
+x 14
+y 3
+end
+arch cave1
+x 14
+y 3
+end
+arch flagstone
+x 14
+y 4
+end
+arch cave1
+x 14
+y 4
+end
+arch flagstone
+x 14
+y 5
+end
+arch cave1
+x 14
+y 5
+end
+arch flagstone
+x 14
+y 6
+end
+arch cave1
+x 14
+y 6
+end
+arch flagstone
+x 14
+y 7
+end
+arch cave1
+x 14
+y 7
+end
+arch flagstone
+x 14
+y 8
+end
+arch cave1
+x 14
+y 8
+end
+arch flagstone
+x 14
+y 9
+end
+arch cave22
+x 14
+y 9
+end