diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-01.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-01.htm
similarity index 80%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-01.htm
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-01.htm
index 047bdd8af9..61a8635a34 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-01.htm
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-01.htm
@@ -2,5 +2,5 @@
 Oh! Are you the one who Lionel has sent?<br>
 What an honor! I'm Merlot.<br>
 Mermoden is my master. I was entrusted with this by my master, but this is so nerve-wracking.<br>
-<Button ALIGN=LEFT ICON="Normal" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34019-04.htm">"I can imagine."</Button>
+<Button ALIGN=LEFT ICON="Normal" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34018-04.htm">"I can imagine."</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-02.html
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-02.html
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-02.html
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-03.html
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-03.html
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-03.html
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-04.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-04.htm
similarity index 89%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-04.htm
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-04.htm
index 8f29f73bdd..534feb9ac6 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-04.htm
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-04.htm
@@ -3,5 +3,5 @@ I heard that you'll be leading this world.<br>
 Of course I trust your abilities, but since I was entrusted with this test, I must give it my all. Are you ready?<br>
 Right! You know that you can go into another dimension with the help of a Dimensional Researcher, right? Mermoden is my master, and I'm also a Dimensional Researcher.<br>
 Recently, a lot of monsters have been appearing in the other dimension, interrupting our research, so I've been looking for someone to get rid of them.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34019-05.htm">"There are monsters in the other dimension?"</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34018-05.htm">"There are monsters in the other dimension?"</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-05.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-05.htm
similarity index 89%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-05.htm
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-05.htm
index 3577499456..164bbf863a 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-05.htm
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-05.htm
@@ -2,5 +2,5 @@
 Why, yes. I doubted my own eyes when I first saw them. Well, it's not surprising that there are others who can teleport into another dimension just like my master and I.<br>
 However, we have a lot of things to find out still. When we found out that those monsters are eyeing the other dimension, we decided we must stop them.<br>
 That's why I've come here. I've come in search of adventurers who could help us. Fortunately, I met Lionel, and decided to take part in this test.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34019-06.html">"I see."</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34018-06.html">"I see."</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-06.html
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-06.html
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-06.html
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-07.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-07.html
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-07.html
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-07.html
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-08.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-08.html
similarity index 76%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-08.html
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-08.html
index 38596b1948..5090b389be 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-08.html
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-08.html
@@ -1,5 +1,5 @@
 <html><body>Merlot:<br>
 You've compelted it! Great!<br>
 We won't need to worry about the monsters from the other dimension.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34019-09.html">"No doubt about it."</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10824_ConfrontingTheGreatestDanger 34018-09.html">"No doubt about it."</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-09.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-09.html
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-09.html
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-09.html
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-10.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-10.html
similarity index 100%
rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34019-10.html
rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/34018-10.html
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
index d5ed0d54c6..8cde5b9ed8 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
@@ -32,7 +32,7 @@ import quests.Q10823_ExaltedOneWhoShattersTheLimit.Q10823_ExaltedOneWhoShattersT
 public class Q10824_ConfrontingTheGreatestDanger extends Quest
 {
 	// NPC
-	private static final int MERLOT = 34019;
+	private static final int MERLOT = 34018;
 	// Items
 	private static final int MARK_OF_ADVANCE = 46058;
 	private static final int KURTIZ_CERTIFICATE = 46057;
@@ -49,8 +49,8 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 		super(10824);
 		addStartNpc(MERLOT);
 		addTalkId(MERLOT);
-		addCondMinLevel(MIN_LEVEL, "34019-02.html");
-		addCondStartedQuest(Q10823_ExaltedOneWhoShattersTheLimit.class.getSimpleName(), "34019-03.html");
+		addCondMinLevel(MIN_LEVEL, "34018-02.html");
+		addCondStartedQuest(Q10823_ExaltedOneWhoShattersTheLimit.class.getSimpleName(), "34018-03.html");
 		registerQuestItems(MARK_OF_ADVANCE);
 	}
 	
@@ -66,19 +66,19 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 		
 		switch (event)
 		{
-			case "34019-04.htm":
-			case "34019-05.htm":
+			case "34018-04.htm":
+			case "34018-05.htm":
 			{
 				htmltext = event;
 				break;
 			}
-			case "34019-06.html":
+			case "34018-06.html":
 			{
 				qs.startQuest();
 				htmltext = event;
 				break;
 			}
-			case "34019-09.html":
+			case "34018-09.html":
 			{
 				if (qs.isCond(1) && (getQuestItemsCount(player, MARK_OF_ADVANCE) >= 3))
 				{
@@ -86,7 +86,7 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 					{
 						if (hasQuestItems(player, KURTIZ_CERTIFICATE, MAMMON_CERTIFICATE, GUSTAV_CERTIFICATE))
 						{
-							htmltext = "34019-10.html";
+							htmltext = "34018-10.html";
 						}
 						else
 						{
@@ -118,18 +118,18 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = "34019-01.htm";
+				htmltext = "34018-01.htm";
 				break;
 			}
 			case State.STARTED:
 			{
 				if (getQuestItemsCount(player, MARK_OF_ADVANCE) >= 3)
 				{
-					htmltext = "34019-08.html";
+					htmltext = "34018-08.html";
 				}
 				else
 				{
-					htmltext = "34019-07.html";
+					htmltext = "34018-07.html";
 				}
 				break;
 			}