diff --git a/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
index d087eaa3f9a4dfe8e4c83c9c42fee7f628be2c8b..ce74965e5e0797471154ff08067178d03a8de2b0 100644
--- a/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
+++ b/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00307_ControlDeviceOfTheGiants;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -131,19 +131,19 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
 			case GORGOLOS:
 			{
 				st.giveItems(CET_1_SHEET, 1);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				break;
 			}
 			case LAST_TITAN_UTENUS:
 			{
 				st.giveItems(CET_2_SHEET, 1);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				break;
 			}
 			case GIANT_MARPANAK:
 			{
 				st.giveItems(CET_3_SHEET, 1);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				break;
 			}
 			case HEKATON_PRIME:
diff --git a/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java b/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
index 4f1e71fbe2118e495959e212d3edc4cc186c1475..10b383e473973adbdc0355120f3bf0316ce79c2c 100644
--- a/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
+++ b/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
@@ -25,7 +25,7 @@ import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness;
 import quests.Q00309_ForAGoodCause.Q00309_ForAGoodCause;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -201,7 +201,7 @@ public class Q00308_ReedFieldMaintenance extends Quest
 			{
 				st.giveItems(item, 1);
 			}
-			st.playSound(QuestSound.ITEMSOUND_QUEST_FINISH);
+			st.playSound(Sound.ITEMSOUND_QUEST_FINISH);
 			htmltext = "32646-14.html";
 		}
 		else
@@ -229,7 +229,7 @@ public class Q00308_ReedFieldMaintenance extends Quest
 				{
 					st.giveItems(MUCROKIAN_HIDE, 1);
 				}
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java b/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
index 092b3e2468bdeb92ae8085a95da670dc7458d4a1..0e83c2fea044160d592754a7b247c46512e78623 100644
--- a/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
+++ b/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
@@ -25,7 +25,7 @@ import quests.Q00239_WontYouJoinUs.Q00239_WontYouJoinUs;
 import quests.Q00308_ReedFieldMaintenance.Q00308_ReedFieldMaintenance;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -203,7 +203,7 @@ public class Q00309_ForAGoodCause extends Quest
 			{
 				st.giveItems(item, 1);
 			}
-			st.playSound(QuestSound.ITEMSOUND_QUEST_FINISH);
+			st.playSound(Sound.ITEMSOUND_QUEST_FINISH);
 			htmltext = "32646-16.htm";
 		}
 		else
@@ -232,7 +232,7 @@ public class Q00309_ForAGoodCause extends Quest
 				{
 					st.giveItems(MUCROKIAN_HIDE, 1);
 				}
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index e1bfbdfcd041732be2aef4cfdce188ee84d72eb3..5c0c8c81aa30bde28945429c5e88c130075abbdf 100644
--- a/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -123,7 +123,7 @@ public class Q00310_OnlyWhatRemains extends Quest
 		if (getRandom(1000) < MOBS.get(npc.getId()))
 		{
 			st.giveItems(DIRTY_BEAD, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return super.onKill(npc, player, isSummon);
 	}
diff --git a/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
index e0ee2c6cf1f8b61fb25b4fa21a9efdde01369994..b933a0af4dc37980b096d5c8e738c8ad4e9d2e18 100644
--- a/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
+++ b/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
@@ -21,7 +21,7 @@ package quests.Q00311_ExpulsionOfEvilSpirits;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -141,7 +141,7 @@ public final class Q00311_ExpulsionOfEvilSpirits extends Quest
 			{
 				qs.setMemoStateEx(1, 0);
 				qs.giveItems(SOUL_CORE_CONTAINING_EVIL_SPIRIT, 1);
-				qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 			else
 			{
diff --git a/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java b/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
index f84572053825f9b96ff4c1c2bd3d191bff5c1b2a..783a0673df0644d8a503cae3bb625e4e87805b03 100644
--- a/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
+++ b/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
@@ -21,7 +21,7 @@ package quests.Q00312_TakeAdvantageOfTheCrisis;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -108,7 +108,7 @@ public class Q00312_TakeAdvantageOfTheCrisis extends Quest
 		{
 			final QuestState st = getQuestState(member, false);
 			st.giveItems(MINERAL_FRAGMENT, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return super.onKill(npc, player, isSummon);
 	}
diff --git a/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index 1d6b12472e03a19023db27690fe8aa80e86b7094..b66a5cca8dc54c5cc77c6a14f556b25ffd2c65d9 100644
--- a/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00319_ScentOfDeath;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -91,7 +91,7 @@ public class Q00319_ScentOfDeath extends Quest
 				st.giveItems(ZOMBIES_SKIN, 1);
 				if (st.getQuestItemsCount(ZOMBIES_SKIN) < REQUIRED_ITEM_COUNT)
 				{
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				else
 				{
diff --git a/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index f93dbe2ae816f1b384d40d5d84862e44cf3d7aa7..885cd08e66b3e4dd9c824bfba9dc66b6c5c546d1 100644
--- a/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -21,7 +21,7 @@ package quests.Q00324_SweetestVenom;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -123,7 +123,7 @@ public class Q00324_SweetestVenom extends Quest
 					st.giveItems(VENOM_SAC, 1);
 					if ((++sacs) < REQUIRED_COUNT)
 					{
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 					else
 					{
diff --git a/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index 6efe4703d518a9eca5a19ab4b6ace5141f97983b..33e00d9354141aab18c8d9832c1c97d8b83e0b3f 100644
--- a/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -21,7 +21,7 @@ package quests.Q00326_VanquishRemnants;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -107,7 +107,7 @@ public final class Q00326_VanquishRemnants extends Quest
 		if ((st != null) && st.isStarted() && (getRandom(100) < MONSTERS.get(npc.getId())[0]))
 		{
 			st.giveItems(MONSTERS.get(npc.getId())[1], 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return super.onKill(npc, killer, isSummon);
 	}
diff --git a/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 0e72f8089a0cbe0d5a213e5cc5261f1789af6778..fab7c1f910244230492e17c208fdcee8ea2ff638 100644
--- a/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -21,7 +21,7 @@ package quests.Q00327_RecoverTheFarmland;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -166,7 +166,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 				{
 					addExpAndSp(player, getQuestItemsCount(player, item.getId()) * item.getCount(), 0);
 					takeItems(player, item.getId(), -1);
-					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 					html = event;
 				}
 				break;
@@ -180,7 +180,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 					{
 						addExpAndSp(player, getQuestItemsCount(player, it.getId()) * it.getCount(), 0);
 						takeItems(player, it.getId(), -1);
-						playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 						rewarded = true;
 					}
 				}
diff --git a/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index ac51b06478309f96fd5cc351deb9acf2ff8f565f..64829ddf959c9580e7928c0319394788092f630c 100644
--- a/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -21,7 +21,7 @@ package quests.Q00328_SenseForBusiness;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -145,12 +145,12 @@ public class Q00328_SenseForBusiness extends Quest
 				if (chance < MONSTER_EYES.get(npc.getId())[0])
 				{
 					st.giveItems(MONSTER_EYE_CARCASS, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				else if (chance < MONSTER_EYES.get(npc.getId())[1])
 				{
 					st.giveItems(MONSTER_EYE_LENS, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 			else if (MONSTER_BASILISKS.containsKey(npc.getId()))
@@ -158,7 +158,7 @@ public class Q00328_SenseForBusiness extends Quest
 				if (chance < MONSTER_BASILISKS.get(npc.getId()))
 				{
 					st.giveItems(BASILISK_GIZZARD, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
diff --git a/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java b/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
index 4101ff8c754eb5f3259460ef9d1cf63f4d80f439..8b219116e28561b2e6dd419824fb9a175c32b485 100644
--- a/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
+++ b/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00330_AdeptOfTaste;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -198,11 +198,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 							giveItems(killer, HOBGOBLIN_AMULET, 1);
 							if (getQuestItemsCount(killer, HOBGOBLIN_AMULET) == 30)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -223,11 +223,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, RED_MANDRAGORA_ROOT, 1);
 									if (getQuestItemsCount(killer, RED_MANDRAGORA_ROOT) == 40)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -238,11 +238,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, WHITE_MANDRAGORA_ROOT, 1);
 									if (getQuestItemsCount(killer, WHITE_MANDRAGORA_ROOT) == 40)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -264,11 +264,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, RED_MANDRAGORA_ROOT, 1);
 									if (getQuestItemsCount(killer, RED_MANDRAGORA_ROOT) == 40)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -279,11 +279,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, WHITE_MANDRAGORA_ROOT, 1);
 									if (getQuestItemsCount(killer, WHITE_MANDRAGORA_ROOT) == 40)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -305,11 +305,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, RED_MANDRAGORA_ROOT, 1);
 									if (getQuestItemsCount(killer, RED_MANDRAGORA_ROOT) == 40)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -320,11 +320,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, WHITE_MANDRAGORA_ROOT, 1);
 									if (getQuestItemsCount(killer, WHITE_MANDRAGORA_ROOT) == 40)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -346,11 +346,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, NECTAR, 1);
 									if (getQuestItemsCount(killer, NECTAR) == 20)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -361,11 +361,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, ROYAL_JELLY, 1);
 									if (getQuestItemsCount(killer, ROYAL_JELLY) == 10)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -387,11 +387,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, GREEN_MARSH_MOSS, 1);
 									if (getQuestItemsCount(killer, GREEN_MARSH_MOSS) == 20)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -402,11 +402,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, BROWN_MARSH_MOSS, 1);
 									if (getQuestItemsCount(killer, BROWN_MARSH_MOSS) == 20)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -428,11 +428,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, GREEN_MARSH_MOSS, 1);
 									if (getQuestItemsCount(killer, GREEN_MARSH_MOSS) == 20)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -443,11 +443,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, BROWN_MARSH_MOSS, 1);
 									if (getQuestItemsCount(killer, BROWN_MARSH_MOSS) == 20)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -469,11 +469,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, NECTAR, 1);
 									if (getQuestItemsCount(killer, NECTAR) == 20)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -484,11 +484,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 									giveItems(killer, ROYAL_JELLY, 1);
 									if (getQuestItemsCount(killer, ROYAL_JELLY) == 10)
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+										playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 									}
 									else
 									{
-										playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+										playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 									}
 								}
 							}
@@ -508,12 +508,12 @@ public final class Q00330_AdeptOfTaste extends Quest
 								if (getQuestItemsCount(killer, BODY_OF_MONSTER_EYE) == 29)
 								{
 									giveItems(killer, BODY_OF_MONSTER_EYE, 1);
-									playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+									playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 								}
 								else
 								{
 									giveItems(killer, BODY_OF_MONSTER_EYE, 2);
-									playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+									playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 								}
 							}
 							else if (i0 < 97)
@@ -521,17 +521,17 @@ public final class Q00330_AdeptOfTaste extends Quest
 								if (getQuestItemsCount(killer, BROWN_MARSH_MOSS) == 28)
 								{
 									giveItems(killer, BODY_OF_MONSTER_EYE, 2);
-									playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+									playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 								}
 								else if (getQuestItemsCount(killer, BROWN_MARSH_MOSS) == 29)
 								{
 									giveItems(killer, BODY_OF_MONSTER_EYE, 1);
-									playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+									playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 								}
 								else
 								{
 									giveItems(killer, BODY_OF_MONSTER_EYE, 3);
-									playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+									playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 								}
 								
 							}
@@ -551,11 +551,11 @@ public final class Q00330_AdeptOfTaste extends Quest
 								giveItems(killer, BODY_OF_MONSTER_EYE, 1);
 								if (getQuestItemsCount(killer, BODY_OF_MONSTER_EYE) == 30)
 								{
-									playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+									playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 								}
 								else
 								{
-									playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+									playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 								}
 							}
 							else
@@ -563,12 +563,12 @@ public final class Q00330_AdeptOfTaste extends Quest
 								if (getQuestItemsCount(killer, BROWN_MARSH_MOSS) == 29)
 								{
 									giveItems(killer, BODY_OF_MONSTER_EYE, 1);
-									playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+									playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 								}
 								else
 								{
 									giveItems(killer, BODY_OF_MONSTER_EYE, 2);
-									playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+									playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 								}
 								
 							}
@@ -724,7 +724,7 @@ public final class Q00330_AdeptOfTaste extends Quest
 									takeItems(player, BROWN_MOSS_BUNDLE, -1);
 									takeItems(player, MONSTER_EYE_MEAT, -1);
 									giveItems(player, JONASS_5TH_STEAK_DISH, 1);
-									playSound(player, QuestSound.ITEMSOUND_QUEST_JACKPOT);
+									playSound(player, Sound.ITEMSOUND_QUEST_JACKPOT);
 									htmltext = "30469-05t5.html";
 								}
 								else
diff --git a/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index b64b3516a855337575f2d773f8d85e1e9229c3b3..c710d9634a33eea57bca35c0ac86fb25f1c53963 100644
--- a/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -21,7 +21,7 @@ package quests.Q00331_ArrowOfVengeance;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -158,7 +158,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 						break;
 					}
 				}
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onKill(npc, player, isPet);
diff --git a/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 2d742dd899426504736e558b7c944e27005c3d5d..14f9552b514c17049cf34f2032e8b4aa49f8d5af 100644
--- a/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -19,7 +19,7 @@
 package quests.Q00333_HuntOfTheBlackLion;
 
 import com.l2jserver.gameserver.enums.CategoryType;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
@@ -984,7 +984,7 @@ public final class Q00333_HuntOfTheBlackLion extends Quest
 					if (hasQuestItems(killer, SOPHYAS_3RD_ORDER))
 					{
 						giveItems(killer, DELU_LIZARDMAN_FANG, 4);
-						playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 					break;
 				}
@@ -993,7 +993,7 @@ public final class Q00333_HuntOfTheBlackLion extends Quest
 					if (hasQuestItems(killer, SOPHYAS_4TH_ORDER))
 					{
 						giveItems(killer, STAKATO_TALON, 8);
-						playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 					break;
 				}
diff --git a/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java b/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
index b9d757d1c5d0cbc3df3dfefc46c88f6903e37001..38561cde90d5380296f63307ef38e76dfbd3902a 100644
--- a/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
+++ b/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
@@ -21,7 +21,7 @@ package quests.Q00334_TheWishingPotion;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -132,7 +132,7 @@ public final class Q00334_TheWishingPotion extends Quest
 					{
 						qs.giveAdena(500000, true);
 						qs.takeItems(Q_FOBBIDEN_LOVE_SCROLL, 1);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+						qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 						return "30557-01.html";
 					}
 					break;
@@ -424,7 +424,7 @@ public final class Q00334_TheWishingPotion extends Quest
 				
 				if (event.equals("QUEST_ACCEPTED"))
 				{
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT);
+					qs.playSound(Sound.ITEMSOUND_QUEST_ACCEPT);
 					qs.startQuest();
 					qs.setMemoState(1);
 					qs.setCond(1);
@@ -433,7 +433,7 @@ public final class Q00334_TheWishingPotion extends Quest
 					{
 						qs.giveItems(Q_ALCHEMY_TEXT, 1);
 					}
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 					return "30738-04.htm";
 				}
 				
@@ -478,7 +478,7 @@ public final class Q00334_TheWishingPotion extends Quest
 							qs.takeItems(Q_POTION_RECIPE_1, -1);
 							qs.takeItems(Q_POTION_RECIPE_2, -1);
 							qs.setMemoState(2);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							qs.setCond(5);
 							qs.showQuestionMark(334);
 							return "30738-11.html";
@@ -721,7 +721,7 @@ public final class Q00334_TheWishingPotion extends Quest
 						if (getRandom(10) == 0)
 						{
 							qs.giveItems(Q_WIND_SOULSTONE, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							if (qs.hasQuestItems(Q_AMBER_SCALE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD))
 							{
 								qs.setCond(4, true);
@@ -729,7 +729,7 @@ public final class Q00334_TheWishingPotion extends Quest
 							}
 							else
 							{
-								qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -743,7 +743,7 @@ public final class Q00334_TheWishingPotion extends Quest
 						if (getRandom(10) == 0)
 						{
 							qs.giveItems(Q_ANT_SOLDIER_APHID, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD))
 							{
 								qs.setCond(4, true);
@@ -751,7 +751,7 @@ public final class Q00334_TheWishingPotion extends Quest
 							}
 							else
 							{
-								qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -764,7 +764,7 @@ public final class Q00334_TheWishingPotion extends Quest
 						if (getRandom(10) == 0)
 						{
 							qs.giveItems(Q_SILENOS_HORN, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD))
 							{
 								qs.setCond(4, true);
@@ -772,7 +772,7 @@ public final class Q00334_TheWishingPotion extends Quest
 							}
 							else
 							{
-								qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -786,7 +786,7 @@ public final class Q00334_TheWishingPotion extends Quest
 						if (getRandom(10) == 0)
 						{
 							qs.giveItems(Q_TYRANTS_CHITIN, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD))
 							{
 								qs.setCond(4, true);
@@ -794,7 +794,7 @@ public final class Q00334_TheWishingPotion extends Quest
 							}
 							else
 							{
-								qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -807,7 +807,7 @@ public final class Q00334_TheWishingPotion extends Quest
 						if (getRandom(10) == 0)
 						{
 							qs.giveItems(Q_AMBER_SCALE, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							if (qs.hasQuestItems(Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD))
 							{
 								qs.setCond(4, true);
@@ -815,7 +815,7 @@ public final class Q00334_TheWishingPotion extends Quest
 							}
 							else
 							{
-								qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -828,7 +828,7 @@ public final class Q00334_TheWishingPotion extends Quest
 						if (getRandom(10) == 0)
 						{
 							qs.giveItems(Q_HORROR_ECTOPLASM, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD))
 							{
 								qs.setCond(4, true);
@@ -836,7 +836,7 @@ public final class Q00334_TheWishingPotion extends Quest
 							}
 							else
 							{
-								qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -850,7 +850,7 @@ public final class Q00334_TheWishingPotion extends Quest
 						if (getRandom(10) == 0)
 						{
 							qs.giveItems(Q_BUGBEAR_BLOOD, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD))
 							{
 								qs.setCond(4, true);
@@ -858,7 +858,7 @@ public final class Q00334_TheWishingPotion extends Quest
 							}
 							else
 							{
-								qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -871,7 +871,7 @@ public final class Q00334_TheWishingPotion extends Quest
 						if (getRandom(10) == 0)
 						{
 							qs.giveItems(Q_GLASS_EYE, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD))
 							{
 								qs.setCond(4, true);
@@ -879,7 +879,7 @@ public final class Q00334_TheWishingPotion extends Quest
 							}
 							else
 							{
-								qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -899,7 +899,7 @@ public final class Q00334_TheWishingPotion extends Quest
 							{
 								qs.giveAdena(900_000, true);
 							}
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 							qs.set(FLAG, 0);
 						}
 					}
@@ -910,7 +910,7 @@ public final class Q00334_TheWishingPotion extends Quest
 					if (qs.isMemoState(2) && !qs.hasQuestItems(Q_FOBBIDEN_LOVE_SCROLL) && (qs.getInt(FLAG) == 1) && (getRandom(1000) < 28))
 					{
 						qs.giveItems(Q_FOBBIDEN_LOVE_SCROLL, 1);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 						qs.set(FLAG, 0);
 					}
 					break;
@@ -920,7 +920,7 @@ public final class Q00334_TheWishingPotion extends Quest
 					if (qs.isMemoState(2) && (qs.getInt(FLAG) == 3))
 					{
 						qs.giveAdena(1_406_956, true);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 						qs.set(FLAG, 0);
 					}
 					break;
@@ -932,7 +932,7 @@ public final class Q00334_TheWishingPotion extends Quest
 						qs.giveItems(Q_SECRET_BOOK_OF_POTION, 1);
 						qs.setCond(2, true);
 						qs.showQuestionMark(334);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 					break;
 				}
diff --git a/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
index 361f399b77c8bd60c4577ad640e9a14034b4458d..c866e9447008cc82742c92348ff8e577e78652fe 100644
--- a/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
+++ b/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
@@ -21,7 +21,7 @@ package quests.Q00336_CoinsOfMagic;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -251,7 +251,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 						qs.setMemoState(3);
 						qs.setCond(4);
 						qs.showQuestionMark(336);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+						qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 						return "30232-07.html";
 					}
 					if (qs.hasQuestItems(Q_CC_MEMBERSHIP_3) && (qs.getMemoState() == 3))
@@ -285,7 +285,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 		
 		if (event.equals("QUEST_ACCEPTED"))
 		{
-			qs.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT);
+			qs.playSound(Sound.ITEMSOUND_QUEST_ACCEPT);
 			if (!qs.hasQuestItems(Q_COIN_DIAGRAM))
 			{
 				qs.giveItems(Q_COIN_DIAGRAM, 1);
@@ -293,7 +293,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 			qs.setMemoState(1);
 			qs.startQuest();
 			qs.showQuestionMark(336);
-			qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+			qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 			return "30232-05.htm";
 		}
 		if (event.contains(".htm"))
@@ -796,7 +796,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 						qs.setMemoState(2);
 						qs.setCond(2);
 						qs.showQuestionMark(336);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+						qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 						return "30702-03.html";
 					}
 					case 3:
@@ -804,14 +804,14 @@ public final class Q00336_CoinsOfMagic extends Quest
 						qs.setMemoState(2);
 						qs.setCond(2);
 						qs.showQuestionMark(336);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+						qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 						return "30702-04.html";
 					}
 					case 4:
 					{
 						qs.setCond(7);
 						qs.showQuestionMark(336);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+						qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 						return "30702-06.html";
 					}
 				}
@@ -845,7 +845,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							{
 								qs.setCond(9);
 								qs.showQuestionMark(336);
-								qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 								qs.takeItems(Q_CC_MEMBERSHIP_3, -1);
 								qs.takeItems(Q_BLOOD_DREVANUL, 1);
 								qs.takeItems(Q_BLOOD_WEREWOLF, 1);
@@ -858,7 +858,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							}
 							qs.setCond(8);
 							qs.showQuestionMark(336);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-13.html";
 						}
 						if (qs.hasQuestItems(Q_CC_MEMBERSHIP_2))
@@ -867,7 +867,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							{
 								qs.setCond(11);
 								qs.showQuestionMark(336);
-								qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 								qs.takeItems(Q_CC_MEMBERSHIP_2, -1);
 								qs.takeItems(Q_BLOOD_BASILISK, 1);
 								qs.takeItems(Q_BLOOD_SUCCUBUS, 1);
@@ -880,7 +880,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							}
 							qs.setCond(10);
 							qs.showQuestionMark(336);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-14.html";
 						}
 						if (qs.hasQuestItems(Q_CC_MEMBERSHIP_1))
@@ -909,14 +909,14 @@ public final class Q00336_CoinsOfMagic extends Quest
 					{
 						qs.setCond(6);
 						qs.showQuestionMark(336);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+						qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 						return "30232-22.html";
 					}
 					case 11:
 					{
 						qs.setCond(5);
 						qs.showQuestionMark(336);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+						qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 						return "30232-23.html";
 					}
 					case 20:
@@ -927,7 +927,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							qs.takeItems(Q_SILVER_DRAGON, 1);
 							qs.takeItems(Q_GOLD_WYRM, 13);
 							qs.giveItems(DEMON_STAFF, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24a.html";
 						}
 						return "30232-24.html";
@@ -941,7 +941,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							qs.takeItems(Q_SILVER_DRYAD, 1);
 							qs.takeItems(Q_GOLD_GIANT, 1);
 							qs.giveItems(DARK_SCREAMER, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24b.html";
 						}
 						return "30232-24.html";
@@ -955,7 +955,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							qs.takeItems(Q_BLOOD_SUCCUBUS, 1);
 							qs.takeItems(Q_BLOOD_BASILISK, 2);
 							qs.giveItems(WIDOW_MAKER, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24c.html";
 						}
 						return "30232-24.html";
@@ -969,7 +969,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							qs.takeItems(Q_BLOOD_DRAGON, 1);
 							qs.takeItems(Q_SILVER_UNDINE, 1);
 							qs.giveItems(SWORD_OF_LIMIT, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24d.html";
 						}
 						return "30232-24.html";
@@ -980,7 +980,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 						{
 							qs.takeItems(Q_MANAKS_GOLD_GIANT, 1);
 							qs.giveItems(DEMONS_BOOTS, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24e.html";
 						}
 						return "30232-24.html";
@@ -992,7 +992,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							qs.takeItems(Q_MANAKS_SILVER_DRYAD, 1);
 							qs.takeItems(Q_SILVER_DRYAD, 1);
 							qs.giveItems(DEMONS_HOSE, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24f.html";
 						}
 						return "30232-24.html";
@@ -1003,7 +1003,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 						{
 							qs.takeItems(Q_MANAKS_GOLD_GIANT, 1);
 							qs.giveItems(DEMONS_GLOVES, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24g.html";
 						}
 						return "30232-24.html";
@@ -1016,7 +1016,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							qs.takeItems(Q_GOLD_GIANT, 1);
 							qs.takeItems(Q_GOLD_WYRM, 1);
 							qs.giveItems(FULL_PLATE_HELMET, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24h.html";
 						}
 						return "30232-24.html";
@@ -1030,7 +1030,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							qs.takeItems(Q_BLOOD_DREVANUL, 2);
 							qs.takeItems(Q_GOLD_KNIGHT, 3);
 							qs.giveItems(MOONSTONE_EARING, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24i.html";
 						}
 						return "30232-24.html";
@@ -1044,7 +1044,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							qs.takeItems(Q_BLOOD_DREVANUL, 5);
 							qs.takeItems(Q_SILVER_GOLEM, 5);
 							qs.giveItems(NASSENS_EARING, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24j.html";
 						}
 						return "30232-24.html";
@@ -1058,7 +1058,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							qs.takeItems(Q_GOLD_DRAKE, 4);
 							qs.takeItems(Q_BLOOD_DREVANUL, 4);
 							qs.giveItems(RING_OF_BINDING, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24k.html";
 						}
 						return "30232-24.html";
@@ -1072,7 +1072,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 							qs.takeItems(Q_GOLD_KNIGHT, 3);
 							qs.takeItems(Q_BLOOD_DREVANUL, 3);
 							qs.giveItems(NECKLACE_OF_PROTECTION, 1);
-							qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 							return "30232-24l.html";
 						}
 						return "30232-24.html";
@@ -1082,7 +1082,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 						qs.takeItems(Q_CC_MEMBERSHIP_1, -1);
 						qs.takeItems(Q_CC_MEMBERSHIP_2, -1);
 						qs.takeItems(Q_CC_MEMBERSHIP_3, -1);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_FINISH);
+						qs.playSound(Sound.ITEMSOUND_QUEST_FINISH);
 						qs.exitQuest(true);
 						return "30232-18a.html";
 					}
@@ -1472,7 +1472,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 				{
 					qs.takeItems(ITEM_1, 10 * mul * ITEM_1_MUL);
 					qs.giveItems(REWARD_1, 1 * mul);
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 					return npcId + "-07.html";
 				}
 				break;
@@ -1483,7 +1483,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 				{
 					qs.takeItems(ITEM_2, 5 * mul);
 					qs.giveItems(REWARD_2, 1 * mul);
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 					return npcId + "-07.html";
 				}
 				break;
@@ -1494,7 +1494,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 				{
 					qs.takeItems(ITEM_3, 5 * mul);
 					qs.giveItems(REWARD_3, 1 * mul);
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 					return npcId + "-07.html";
 				}
 				break;
@@ -1505,7 +1505,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 				{
 					qs.takeItems(ITEM_4, 5 * mul);
 					qs.giveItems(REWARD_4, 1 * mul);
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 					return npcId + "-07.html";
 				}
 				break;
@@ -1543,7 +1543,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 					qs.takeItems(ITEM_1_1, 10 * mul);
 					qs.takeItems(ITEM_1_2, 10 * mul);
 					qs.giveItems(REWARD_1, 1 * mul);
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 					return npcId + "-07.html";
 				}
 				break;
@@ -1555,7 +1555,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 					qs.takeItems(ITEM_2_1, 5 * mul);
 					qs.takeItems(ITEM_2_2, 5 * mul);
 					qs.giveItems(REWARD_2, 1 * mul);
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 					return npcId + "-07.html";
 				}
 				break;
@@ -1567,7 +1567,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 					qs.takeItems(ITEM_3_1, 5 * mul);
 					qs.takeItems(ITEM_3_2, 5 * mul);
 					qs.giveItems(REWARD_3, 1 * mul);
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 					return npcId + "-07.html";
 				}
 				break;
@@ -1579,7 +1579,7 @@ public final class Q00336_CoinsOfMagic extends Quest
 					qs.takeItems(ITEM_4_1, 5 * mul);
 					qs.takeItems(ITEM_4_2, 5 * mul);
 					qs.giveItems(REWARD_4, 1 * mul);
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 					return npcId + "-07.html";
 				}
 				break;
diff --git a/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index fead38198dc1c23a8096bec05e25874066c88e7b..2dc5f0041f040f59c23788031d6c761a2223bcc2 100644
--- a/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00337_AudienceWithTheLandDragon;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -190,7 +190,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 						if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.4)) && !hasQuestItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_1ST))
 						{
 							giveItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_1ST, 1);
-							playSound(attacker, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(attacker, Sound.ITEMSOUND_QUEST_ITEMGET);
 							startQuestTimer("DESPAWN_240", 240000, npc, attacker);
 						}
 					}
@@ -218,7 +218,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 						if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.4)) && !hasQuestItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_2ND))
 						{
 							giveItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_2ND, 1);
-							playSound(attacker, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(attacker, Sound.ITEMSOUND_QUEST_ITEMGET);
 							startQuestTimer("DESPAWN_240", 240000, npc, attacker);
 						}
 					}
@@ -245,7 +245,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 						if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.4)) && !hasQuestItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_3RD))
 						{
 							giveItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_3RD, 1);
-							playSound(attacker, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(attacker, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					
@@ -374,7 +374,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 							if (!hasQuestItems(killer, HAMRUT_LEG))
 							{
 								giveItems(killer, HAMRUT_LEG, 1);
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 							break;
 						}
@@ -397,7 +397,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 							if (!hasQuestItems(killer, KRANROT_SKIN))
 							{
 								giveItems(killer, KRANROT_SKIN, 1);
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 							break;
 						}
@@ -420,7 +420,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 							if (!hasQuestItems(killer, MARSH_STALKER_HORN))
 							{
 								giveItems(killer, MARSH_STALKER_HORN, 1);
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 							break;
 						}
@@ -443,7 +443,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 							if (!hasQuestItems(killer, MARSH_DRAKE_TALONS))
 							{
 								giveItems(killer, MARSH_DRAKE_TALONS, 1);
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 							break;
 						}
@@ -457,7 +457,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 						if (!hasQuestItems(killer, MARA_FANG))
 						{
 							giveItems(killer, MARA_FANG, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -469,7 +469,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 						if (!hasQuestItems(killer, MUSFEL_FANG))
 						{
 							giveItems(killer, MUSFEL_FANG, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -490,7 +490,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 							if (!hasQuestItems(killer, REMAINS_OF_SACRAFICE))
 							{
 								giveItems(killer, REMAINS_OF_SACRAFICE, 1);
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 							break;
 						}
@@ -513,7 +513,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
 							if (!hasQuestItems(killer, TOTEM_OF_LAND_DRAGON))
 							{
 								giveItems(killer, TOTEM_OF_LAND_DRAGON, 1);
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 							break;
 						}
diff --git a/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java b/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
index ea178c07174be0c8047e9fa34ffa54cb5f9dfbdb..c638eb8e1db24b7909ec444b4ad43af4b38017db 100644
--- a/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
+++ b/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00338_AlligatorHunter;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -104,7 +104,7 @@ public class Q00338_AlligatorHunter extends Quest
 			{
 				st.giveItems(ALLIGATOR_LEATHER, 1);
 			}
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return super.onKill(npc, player, isSummon);
 	}
diff --git a/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java b/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
index 6a0cc99462e11ce9ad385749135b9095223596e9..e4f53104f0eed0295a0f0a54b85b6f5b387ca98f 100644
--- a/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
+++ b/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00340_SubjugationOfLizardmen;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -185,12 +185,12 @@ public final class Q00340_SubjugationOfLizardmen extends Quest
 						if (!hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && (getRandom(100) <= 19))
 						{
 							giveItems(killer, AGNESS_HOLY_SYMBOL, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 						else if (hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && !hasQuestItems(killer, AGNESS_ROSARY) && (getRandom(100) <= 18))
 						{
 							giveItems(killer, AGNESS_ROSARY, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -203,12 +203,12 @@ public final class Q00340_SubjugationOfLizardmen extends Quest
 						if (!hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && (getRandom(100) <= 18))
 						{
 							giveItems(killer, AGNESS_HOLY_SYMBOL, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 						else if (hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && !hasQuestItems(killer, AGNESS_ROSARY) && (getRandom(100) <= 18))
 						{
 							giveItems(killer, AGNESS_ROSARY, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java b/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
index 813a4846afb5dffa4e779bc631b83f58ce621fc2..dd38a4c42547406245ce08326ed52afc87509e6a 100644
--- a/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
+++ b/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
@@ -21,7 +21,7 @@ package quests.Q00341_HuntingForWildBeasts;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -133,7 +133,7 @@ public class Q00341_HuntingForWildBeasts extends Quest
 					st.giveItems(BEAR_SKIN, 1);
 					if ((++skins) < REQUIRED_COUNT)
 					{
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 					else
 					{
diff --git a/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java b/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
index 1b16b188870e14418c3bc14ae42d2db096dd84f7..553ff76ebb2b2bee69920ee59cad2d81e62a41ff 100644
--- a/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
+++ b/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
@@ -19,7 +19,7 @@
 package quests.Q00343_UnderTheShadowOfTheIvoryTower;
 
 import com.l2jserver.gameserver.enums.CategoryType;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -518,7 +518,7 @@ public final class Q00343_UnderTheShadowOfTheIvoryTower extends Quest
 					if (getRandom(100) < 63)
 					{
 						giveItems(killer, NEBULITE_ORB, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 					
 					if (qs.getMemoStateEx(1) > 1)
@@ -535,7 +535,7 @@ public final class Q00343_UnderTheShadowOfTheIvoryTower extends Quest
 					if (getRandom(100) < 65)
 					{
 						giveItems(killer, NEBULITE_ORB, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 					
 					if (qs.getMemoStateEx(1) > 1)
@@ -552,7 +552,7 @@ public final class Q00343_UnderTheShadowOfTheIvoryTower extends Quest
 					if (getRandom(100) < 68)
 					{
 						giveItems(killer, NEBULITE_ORB, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 					
 					if (qs.getMemoStateEx(1) > 1)
diff --git a/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java b/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
index 0c8801a4de560cf77e4b7a03f325996226824762..8731c49a650ca081c58c6ed100a244c4f9bce9c4 100644
--- a/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
+++ b/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00345_MethodToRaiseTheDead;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
@@ -215,7 +215,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest
 				giveItems(qs.getPlayer(), USELESS_BONE_PIECES, 1);
 			}
 			
-			playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if (random <= 11)
 		{
@@ -228,7 +228,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest
 				giveItems(qs.getPlayer(), USELESS_BONE_PIECES, 1);
 			}
 			
-			playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if (random <= 17)
 		{
@@ -241,7 +241,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest
 				giveItems(qs.getPlayer(), USELESS_BONE_PIECES, 1);
 			}
 			
-			playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if (random <= 23)
 		{
@@ -254,7 +254,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest
 				giveItems(qs.getPlayer(), USELESS_BONE_PIECES, 1);
 			}
 			
-			playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if (random <= 29)
 		{
@@ -267,7 +267,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest
 				giveItems(qs.getPlayer(), USELESS_BONE_PIECES, 1);
 			}
 			
-			playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if (random <= 60)
 		{
diff --git a/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index cdc26248e9fd426c37ccbb67dcb294b287b55a7e..2b7f0cf787dce603df875720fa83f7397c784a0b 100644
--- a/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -21,7 +21,7 @@ package quests.Q00360_PlunderTheirSupplies;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -107,7 +107,7 @@ public final class Q00360_PlunderTheirSupplies extends Quest
 		if (getRandom(100) < MONSTER_DROP_CHANCES.get(npc.getId()))
 		{
 			st.giveItems(SUPPLY_ITEMS, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		
 		if (getRandom(100) < 10)
@@ -121,7 +121,7 @@ public final class Q00360_PlunderTheirSupplies extends Quest
 				st.giveItems(RECIPE_OF_SUPPLY, 1);
 				st.takeItems(SUSPICIOUS_DOCUMENT_PIECE, -1);
 			}
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return super.onKill(npc, killer, isPet);
 	}
diff --git a/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java b/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
index 6d06bc9eb5b43d38f0fcfd0fd694203f7e8e70fa..3d4956776732cbb401e04514aa53f64d6e40b02e 100644
--- a/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
+++ b/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00363_SorrowfulSoundOfFlute;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -152,7 +152,7 @@ public final class Q00363_SorrowfulSoundOfFlute extends Quest
 							case 6:
 							{
 								st.exitQuest(true, false);
-								st.playSound(QuestSound.ITEMSOUND_QUEST_GIVEUP);
+								st.playSound(Sound.ITEMSOUND_QUEST_GIVEUP);
 								htmltext = "30956-10.html";
 								break;
 							}
diff --git a/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java b/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
index 44237b69b6264dae6677b9808357fe5490f1b381..c9090c0bcd390fe7b7067f86cd8d9427d982e8da 100644
--- a/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
+++ b/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00364_JovialAccordion;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -249,7 +249,7 @@ public final class Q00364_JovialAccordion extends Quest
 								{
 									if (st.isMemoState(2))
 									{
-										st.playSound(QuestSound.ITEMSOUND_QUEST_GIVEUP);
+										st.playSound(Sound.ITEMSOUND_QUEST_GIVEUP);
 										st.exitQuest(true, true);
 										htmltext = "30957-06.html";
 									}
diff --git a/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java b/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
index 2bbb275f41d39077c3f2c247d5dcf97d582c3068..633d80237be0b854570bd36ea95800de21aedd6b 100644
--- a/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
+++ b/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00367_ElectrifyingRecharge;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
@@ -131,19 +131,19 @@ public final class Q00367_ElectrifyingRecharge extends Quest
 				{
 					giveItems(luckyPlayer, TITAN_LAMP2, 1);
 					takeItems(luckyPlayer, TITAN_LAMP1, -1);
-					playSound(luckyPlayer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					playSound(luckyPlayer, Sound.ITEMSOUND_QUEST_MIDDLE);
 				}
 				else if (hasQuestItems(luckyPlayer, TITAN_LAMP2))
 				{
 					giveItems(luckyPlayer, TITAN_LAMP3, 1);
 					takeItems(luckyPlayer, TITAN_LAMP2, -1);
-					playSound(luckyPlayer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					playSound(luckyPlayer, Sound.ITEMSOUND_QUEST_MIDDLE);
 				}
 				else if (hasQuestItems(luckyPlayer, TITAN_LAMP3))
 				{
 					giveItems(luckyPlayer, TITAN_LAMP4, 1);
 					takeItems(luckyPlayer, TITAN_LAMP3, -1);
-					playSound(luckyPlayer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					playSound(luckyPlayer, Sound.ITEMSOUND_QUEST_MIDDLE);
 				}
 				else if (hasQuestItems(luckyPlayer, TITAN_LAMP4))
 				{
@@ -156,7 +156,7 @@ public final class Q00367_ElectrifyingRecharge extends Quest
 			{
 				giveItems(luckyPlayer, BROKEN_TITAN_LAMP, 1);
 				takeItems(luckyPlayer, -1, TITAN_LAMP1, TITAN_LAMP2, TITAN_LAMP3, TITAN_LAMP4);
-				playSound(luckyPlayer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				playSound(luckyPlayer, Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onAttack(npc, attacker, damage, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java b/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
index c21e7410ef9207d91cdc00c82933f2d3dfd7a3ca..dcc027b4196528c449de97f22733e4a62a3d42c6 100644
--- a/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
+++ b/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
@@ -21,7 +21,7 @@ package quests.Q00372_LegacyOfInsolence;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.QuestItemHolder;
@@ -462,7 +462,7 @@ public final class Q00372_LegacyOfInsolence extends Quest
 				if (qs != null)
 				{
 					giveItems(qs.getPlayer(), item.getId(), item.getCount());
-					playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 			return super.onKill(npc, killer, isSummon);
@@ -500,7 +500,7 @@ public final class Q00372_LegacyOfInsolence extends Quest
 			if ((rewardedPlayer != null) && Util.checkIfInRange(1500, npc, rewardedPlayer, true))
 			{
 				giveItems(rewardedPlayer, item.getId(), item.getCount());
-				playSound(rewardedPlayer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				playSound(rewardedPlayer, Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		
diff --git a/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java b/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
index 796881b73a30ce780841e1acaa3f88306b6957b7..30f2539979d942427ac8f3e12f1a60f2da574f2a 100644
--- a/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
+++ b/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 
 import quests.Q00235_MimirsElixir.Q00235_MimirsElixir;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -230,7 +230,7 @@ public final class Q00373_SupplierOfReagents extends Quest
 					// If the player has the chosen item (ingredient or catalyst), we save it (for the catalyst or the reward)
 					qs.setMemoState(qs.getMemoState() + memoState);
 					htmltext = event;
-					playSound(player, QuestSound.SKILLSOUND_LIQUID_MIX);
+					playSound(player, Sound.SKILLSOUND_LIQUID_MIX);
 				}
 				else
 				{
@@ -303,7 +303,7 @@ public final class Q00373_SupplierOfReagents extends Quest
 					takeItem(player, item1);
 					takeItem(player, item2);
 					htmltext = (reward == null) ? "31149-44.html" : "31149-45.html";
-					playSound(player, QuestSound.SKILLSOUND_LIQUID_FAIL);
+					playSound(player, Sound.SKILLSOUND_LIQUID_FAIL);
 				}
 				else if ((memoState != 1324) || ((memoState == 1324) && (q235 != null) && q235.isStarted() && !hasQuestItems(player, reward.getItem())))
 				{
@@ -315,12 +315,12 @@ public final class Q00373_SupplierOfReagents extends Quest
 						qs.setMemoState(0);
 						qs.setMemoStateEx(1, 0);
 						htmltext = reward.getHtml();
-						playSound(player, QuestSound.SKILLSOUND_LIQUID_SUCCESS);
+						playSound(player, Sound.SKILLSOUND_LIQUID_SUCCESS);
 					}
 					else
 					{
 						htmltext = "31149-44.html";
-						playSound(player, QuestSound.SKILLSOUND_LIQUID_FAIL);
+						playSound(player, Sound.SKILLSOUND_LIQUID_FAIL);
 					}
 				}
 				else
diff --git a/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java b/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
index 827d18f6cac3e6f2660f04affe11092ee0597794..83b819e9725819e3f1562e62fb77af10baf2cdf5 100644
--- a/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
+++ b/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00381_LetsBecomeARoyalMember;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -82,7 +82,7 @@ public final class Q00381_LetsBecomeARoyalMember extends Quest
 				if (qs.isMemoState(1) && !hasQuestItems(player, COIN_ALBUM))
 				{
 					qs.setMemoState(2);
-					playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE);
 					htmltext = event;
 				}
 				break;
@@ -155,7 +155,7 @@ public final class Q00381_LetsBecomeARoyalMember extends Quest
 						{
 							takeItems(talker, FOUR_LEAF_COIN, 1);
 							giveItems(talker, COIN_ALBUM, 1);
-							playSound(talker, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(talker, Sound.ITEMSOUND_QUEST_MIDDLE);
 							htmltext = "30090-04.html";
 						}
 						else
@@ -183,7 +183,7 @@ public final class Q00381_LetsBecomeARoyalMember extends Quest
 			else if (qs.isMemoState(2) && !hasQuestItems(killer, FOUR_LEAF_COIN))
 			{
 				giveItems(killer, FOUR_LEAF_COIN, 1);
-				playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+				playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java b/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
index aa055ce28f7f3de0b3289e1d8d3e999c53afc9f7..4f8c5305d553d8d406f090e1daf3bdd2198e224c 100644
--- a/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
+++ b/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -152,11 +152,11 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
 				{
 					if (event.equals("QUEST_ACCEPTED"))
 					{
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT);
+						qs.playSound(Sound.ITEMSOUND_QUEST_ACCEPT);
 						qs.setMemoState(384);
 						qs.startQuest();
 						qs.showQuestionMark(384);
-						qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+						qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 						return "30182-05.htm";
 					}
 					switch (ask)
diff --git a/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index b9d22365da797e205c92c66f397ac16fe5fb7cb4..ef52b5f3a63aa8ed81a71296110791f00fe62a18 100644
--- a/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -143,11 +143,11 @@ public final class Q00386_StolenDignity extends Quest
 		{
 			if (event.equals("QUEST_ACCEPTED"))
 			{
-				qs.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT);
+				qs.playSound(Sound.ITEMSOUND_QUEST_ACCEPT);
 				qs.setMemoState(386);
 				qs.startQuest();
 				qs.showQuestionMark(386);
-				qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+				qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 				return "30843-05.htm";
 			}
 			if (event.contains(".html"))
diff --git a/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 1c844c45851f4deb0d81a95ba639e6316049b910..28abe423cbe09e1bade629ab08ef9f4adf6bbdac 100644
--- a/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00401_PathOfTheWarrior;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -210,7 +210,7 @@ public final class Q00401_PathOfTheWarrior extends Quest
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -228,7 +228,7 @@ public final class Q00401_PathOfTheWarrior extends Quest
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index dd6bfed3878d386ad92eade5b6199e4647d4e9c5..33c57a073f464d6314b11688f60489c81ea3d2e7 100644
--- a/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00402_PathOfTheHumanKnight;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -260,11 +260,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest
 						giveItems(killer, LIZARDMANS_TOTEM, 1);
 						if (getQuestItemsCount(killer, LIZARDMANS_TOTEM) == 20)
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -278,11 +278,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest
 						giveItems(killer, VENOMOUS_SPIDERS_LEG, 1);
 						if (getQuestItemsCount(killer, VENOMOUS_SPIDERS_LEG) == 20)
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -296,11 +296,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest
 						giveItems(killer, GIANT_SPIDERS_HUSK, 1);
 						if (getQuestItemsCount(killer, GIANT_SPIDERS_HUSK) == 20)
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -312,11 +312,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest
 						giveItems(killer, SKULL_OF_SILENT_HORROR, 1);
 						if (getQuestItemsCount(killer, SKULL_OF_SILENT_HORROR) == 10)
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -328,11 +328,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest
 						giveItems(killer, BUGBEAR_NECKLACE, 1);
 						if (getQuestItemsCount(killer, BUGBEAR_NECKLACE) == 10)
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -344,11 +344,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest
 						giveItems(killer, EINHASAD_CRUCIFIX, 1);
 						if (getQuestItemsCount(killer, EINHASAD_CRUCIFIX) == 12)
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index 65f70ba19d081aee52dfa4157d787afa81d5d1b9..17308d1b2fa0a3ef56fd38d67abda597c10bcb8c 100644
--- a/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -21,7 +21,7 @@ package quests.Q00403_PathOfTheRogue;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -235,7 +235,7 @@ public final class Q00403_PathOfTheRogue extends Quest
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 				}
@@ -252,7 +252,7 @@ public final class Q00403_PathOfTheRogue extends Quest
 					}
 					else
 					{
-						playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 				}
 			}
diff --git a/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 1eef06402ee687856b7f5b5b4f2e22dbd87ac554..509f4042d9687b1f56c72aca6b1db021db7b7161 100644
--- a/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00404_PathOfTheHumanWizard;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -168,7 +168,7 @@ public final class Q00404_PathOfTheHumanWizard extends Quest
 						}
 						else
 						{
-							playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index 636e6456c000450fc3e7ec6c9389c7b5be56e966..c5ab4dc08d4b1d57cb426b667f9cc8b5e98aa880 100644
--- a/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00405_PathOfTheCleric;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -125,7 +125,7 @@ public final class Q00405_PathOfTheCleric extends Quest
 			if (hasQuestItems(killer, NECKLACE_OF_MOTHER) && !hasQuestItems(killer, PENDANT_OF_MOTHER))
 			{
 				giveItems(killer, PENDANT_OF_MOTHER, 1);
-				playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE);
+				playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE);
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 68c127d62581589d8a83d1a07d7bc80195696dbe..516141143a7fef657f08c2e48afac6447416ac3c 100644
--- a/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -21,7 +21,7 @@ package quests.Q00406_PathOfTheElvenKnight;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -159,7 +159,7 @@ public final class Q00406_PathOfTheElvenKnight extends Quest
 				}
 				else
 				{
-					playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
diff --git a/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index 790dff02d620e5b780429a2d9b802757f4dba4f1..e48a1387d1592a39e297eb9ad707fc435b13ad20 100644
--- a/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00407_PathOfTheElvenScout;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -207,7 +207,7 @@ public final class Q00407_PathOfTheElvenScout extends Quest
 		}
 		else
 		{
-			playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 	}
 	
diff --git a/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index 60d7292cf618918cd0c1c6378d5a113ece8db8e5..176c3352693c9e40f9ecbb202293ac81ba1edbf2 100644
--- a/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00408_PathOfTheElvenWizard;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -212,11 +212,11 @@ public final class Q00408_PathOfTheElvenWizard extends Quest
 						giveItems(killer, GOLD_LEAVES, 1);
 						if (getQuestItemsCount(killer, GOLD_LEAVES) == 5)
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -228,11 +228,11 @@ public final class Q00408_PathOfTheElvenWizard extends Quest
 						giveItems(killer, AMETHYST, 1);
 						if (getQuestItemsCount(killer, AMETHYST) == 2)
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -244,11 +244,11 @@ public final class Q00408_PathOfTheElvenWizard extends Quest
 						giveItems(killer, RED_DOWN, 1);
 						if (getQuestItemsCount(killer, RED_DOWN) == 5)
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index 8cbdb29b51e7d9f3fe57923fd705f31a57755a16..16749f3c0033d879b1fab8d373c63987758aeaee 100644
--- a/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00410_PathOfThePalusKnight;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -185,7 +185,7 @@ public final class Q00410_PathOfThePalusKnight extends Quest
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -201,7 +201,7 @@ public final class Q00410_PathOfThePalusKnight extends Quest
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index e80bc0054535399f6e7af2cbef8060327421dca4..ac76db6dea5ec8dbb70619b01403282057bdc8d8 100644
--- a/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00411_PathOfTheAssassin;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -165,7 +165,7 @@ public final class Q00411_PathOfTheAssassin extends Quest
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index 9298f3343113856d84a08ea64cdbee2146ff56f5..2bd038c2abc7df2387fd7c6f42bf1aca6181dc6d 100644
--- a/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00412_PathOfTheDarkWizard;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -188,11 +188,11 @@ public final class Q00412_PathOfTheDarkWizard extends Quest
 							giveItems(killer, FAMILYS_REMAINS, 1);
 							if (getQuestItemsCount(killer, FAMILYS_REMAINS) == 3)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -209,11 +209,11 @@ public final class Q00412_PathOfTheDarkWizard extends Quest
 							giveItems(killer, KNEE_BONE, 1);
 							if (getQuestItemsCount(killer, KNEE_BONE) == 2)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -228,11 +228,11 @@ public final class Q00412_PathOfTheDarkWizard extends Quest
 							giveItems(killer, HEART_OF_LUNACY, 1);
 							if (getQuestItemsCount(killer, HEART_OF_LUNACY) == 3)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
diff --git a/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index acdb35748d85ecb79cd4697f918d8fb3dc3d9c63..2d363574a826ae0614a3b54dc18b073d6b8b30f8 100644
--- a/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00413_PathOfTheShillienOracle;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -173,7 +173,7 @@ public final class Q00413_PathOfTheShillienOracle extends Quest
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -190,7 +190,7 @@ public final class Q00413_PathOfTheShillienOracle extends Quest
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 0642b23098004f705dc5fd2bce98500f4259b369..c4de700461344c0cf9cb8339e1a29e49a15f9b88 100644
--- a/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00414_PathOfTheOrcRaider;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -179,7 +179,7 @@ public final class Q00414_PathOfTheOrcRaider extends Quest
 						else
 						{
 							giveItems(killer, GREEN_BLOOD, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -197,7 +197,7 @@ public final class Q00414_PathOfTheOrcRaider extends Quest
 						else
 						{
 							giveItems(killer, KURUKA_RATMAN_TOOTH, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -221,7 +221,7 @@ public final class Q00414_PathOfTheOrcRaider extends Quest
 						}
 						else
 						{
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index c9a03b5d3852ec1ad81a730a24c755ddd04ea910..f3c84c1c697f19a19f03f1b106ad7d807bd5893d 100644
--- a/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00415_PathOfTheOrcMonk;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -300,7 +300,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
 						else
 						{
 							giveItems(killer, FELIM_LIZARDMAN_TOOTH, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -322,7 +322,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
 						else
 						{
 							giveItems(killer, VUKU_ORK_TUSK, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -344,7 +344,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
 						else
 						{
 							giveItems(killer, LANGK_LIZARDMAN_TOOTH, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -366,7 +366,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
 						else
 						{
 							giveItems(killer, RATMAN_FANG, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -385,7 +385,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
 						else
 						{
 							giveItems(killer, SCARLET_SALAMANDER_SCALE, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -403,7 +403,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -423,7 +423,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
 						else
 						{
 							giveItems(killer, KASHA_BLADE_SPIDER_TALON, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					else if (qs.isMemoState(3) && (getQuestItemsCount(killer, KASHA_SPIDERS_TOOTH) < 6))
@@ -437,7 +437,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -457,7 +457,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
 						else
 						{
 							giveItems(killer, KASHA_BEAR_CLAW, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index a661743ced603684ee2c2182a2c9838dfa7b9a14..9a7bc1ad24072083bc5d3db21bbbc78fdc155e13 100644
--- a/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -21,7 +21,7 @@ package quests.Q00416_PathOfTheOrcShaman;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -357,12 +357,12 @@ public final class Q00416_PathOfTheOrcShaman extends Quest
 					{
 						takeItems(player, DURKA_PARASITE, -1);
 						addSpawn(DURKA_SPIRIT, npc.getX(), npc.getY(), npc.getZ(), 0, true, 0, false);
-						playSound(st.getPlayer(), QuestSound.ITEMSOUND_QUEST_BEFORE_BATTLE);
+						playSound(st.getPlayer(), Sound.ITEMSOUND_QUEST_BEFORE_BATTLE);
 					}
 					else
 					{
 						giveItems(st.getPlayer(), DURKA_PARASITE, 1);
-						playSound(st.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(st.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 				}
 				else
diff --git a/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 644767e72f08bc79aed1b8190a1b45f8d6363d51..59f66869170f876ca517d6b017a31d4e6c99f6dd 100644
--- a/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00418_PathOfTheArtisan;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.ClassId;
@@ -446,7 +446,7 @@ public final class Q00418_PathOfTheArtisan extends Quest
 							if (getQuestItemsCount(killer, BOOGLE_RATMAN_TOOTH) == 9)
 							{
 								giveItems(killer, BOOGLE_RATMAN_TOOTH, 1);
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 								if (getQuestItemsCount(killer, BOOGLE_RATMAN_LEADERS_TOOTH) >= 2)
 								{
 									qs.setCond(2);
@@ -455,7 +455,7 @@ public final class Q00418_PathOfTheArtisan extends Quest
 							else
 							{
 								giveItems(killer, BOOGLE_RATMAN_TOOTH, 1);
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -470,7 +470,7 @@ public final class Q00418_PathOfTheArtisan extends Quest
 							if (getQuestItemsCount(killer, BOOGLE_RATMAN_LEADERS_TOOTH) == 1)
 							{
 								giveItems(killer, BOOGLE_RATMAN_LEADERS_TOOTH, 1);
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 								if (getQuestItemsCount(killer, BOOGLE_RATMAN_TOOTH) >= 10)
 								{
 									qs.setCond(2);
@@ -480,7 +480,7 @@ public final class Q00418_PathOfTheArtisan extends Quest
 						else
 						{
 							giveItems(killer, BOOGLE_RATMAN_LEADERS_TOOTH, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java b/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
index d0a1377bf67dbb44b84bc67f95e9d56ffd46a26c..b56dc341007c47e98534c89ca925c10e5009b329 100644
--- a/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
+++ b/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
@@ -21,7 +21,7 @@ package quests.Q00419_GetAPet;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -385,11 +385,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_NAIL, 1);
 							if (getQuestItemsCount(killer, BLOODY_NAIL) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -404,11 +404,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_NAIL, 1);
 							if (getQuestItemsCount(killer, BLOODY_NAIL) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -423,11 +423,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_FANG, 1);
 							if (getQuestItemsCount(killer, BLOODY_FANG) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -442,11 +442,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_NAIL, 1);
 							if (getQuestItemsCount(killer, BLOODY_NAIL) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -461,11 +461,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_FANG, 1);
 							if (getQuestItemsCount(killer, BLOODY_FANG) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -480,11 +480,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_FANG, 1);
 							if (getQuestItemsCount(killer, BLOODY_FANG) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -499,11 +499,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_CLAW, 1);
 							if (getQuestItemsCount(killer, BLOODY_CLAW) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -518,11 +518,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_TARANTULA_NAIL, 1);
 							if (getQuestItemsCount(killer, BLOODY_TARANTULA_NAIL) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -537,11 +537,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_CLAW, 1);
 							if (getQuestItemsCount(killer, BLOODY_CLAW) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -556,11 +556,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_CLAW, 1);
 							if (getQuestItemsCount(killer, BLOODY_CLAW) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -575,11 +575,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_KASHA_FANG, 1);
 							if (getQuestItemsCount(killer, BLOODY_KASHA_FANG) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -594,11 +594,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_KASHA_FANG, 1);
 							if (getQuestItemsCount(killer, BLOODY_KASHA_FANG) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -613,11 +613,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_KASHA_FANG, 1);
 							if (getQuestItemsCount(killer, BLOODY_KASHA_FANG) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -632,11 +632,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_TARANTULA_NAIL, 1);
 							if (getQuestItemsCount(killer, BLOODY_TARANTULA_NAIL) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
@@ -651,11 +651,11 @@ public final class Q00419_GetAPet extends Quest
 							giveItems(killer, BLOODY_RED_CLAW, 1);
 							if (getQuestItemsCount(killer, BLOODY_RED_CLAW) >= 50)
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 							}
 							else
 							{
-								playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+								playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 							}
 						}
 					}
diff --git a/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index ce76313f04b3ac868149597fe338987e68e1e618..985bda0bed3dd05f18dc8c97fdd3c02382c8b984 100644
--- a/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -423,7 +423,7 @@ public final class Q00420_LittleWing extends Quest
 		if ((qs != null) && (getQuestItemsCount(attacker, DELUXE_FAIRY_STONE) > 0) && (getRandom(100) < 30))
 		{
 			takeItems(attacker, DELUXE_FAIRY_STONE, -1);
-			qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+			qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 			npc.broadcastPacket(new NpcSay(npc, Say2.NPC_ALL, NpcStringId.THE_STONE_THE_ELVEN_STONE_BROKE));
 		}
 		return super.onAttack(npc, attacker, damage, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index e2ba51649406ad34bbd8c0c69be59129a63f3da0..15aa13d0a1c0828438c250cac54b6c2b7f48a277 100644
--- a/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -405,7 +405,7 @@ public final class Q00421_LittleWingsBigAdventure extends Quest
 								takeItems(attacker, FAIRY_LEAF, 1);
 								qs.setMemoState(qs.getMemoState() + data.memoStateValue);
 								qs.unset("hits");
-								playSound(attacker, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+								playSound(attacker, Sound.ITEMSOUND_QUEST_MIDDLE);
 								
 								if (qs.getMemoState() == 15)
 								{
diff --git a/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java b/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
index a6ec43a71e12e05f48d24170d273dc92a6559fb4..33d5566801b9d0111a862aed472b3cbfa0e556e5 100644
--- a/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
+++ b/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00422_RepentYourSins;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -88,7 +88,7 @@ public final class Q00422_RepentYourSins extends Quest
 				qs.startQuest();
 				if ((player.getLevel() > 20) && (player.getLevel() < 31))
 				{
-					playSound(player, QuestSound.ITEMSOUND_QUEST_ACCEPT);
+					playSound(player, Sound.ITEMSOUND_QUEST_ACCEPT);
 					qs.setMemoState(2);
 					qs.setCond(3);
 					htmltext = "30981-04.htm";
@@ -231,12 +231,12 @@ public final class Q00422_RepentYourSins extends Quest
 						if (getQuestItemsCount(killer, RATMAN_SCAVENGERS_SKULL) == 9)
 						{
 							giveItems(killer, RATMAN_SCAVENGERS_SKULL, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
 							giveItems(killer, RATMAN_SCAVENGERS_SKULL, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -246,7 +246,7 @@ public final class Q00422_RepentYourSins extends Quest
 					if (qs.isMemoState(7) && !hasQuestItems(killer, TYRANT_KINGPINS_HEART))
 					{
 						giveItems(killer, TYRANT_KINGPINS_HEART, 1);
-						playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+						playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 					}
 					break;
 				}
@@ -257,12 +257,12 @@ public final class Q00422_RepentYourSins extends Quest
 						if (getQuestItemsCount(killer, TUREK_WAR_HOUNDS_TAIL) == 9)
 						{
 							giveItems(killer, TUREK_WAR_HOUNDS_TAIL, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
 							giveItems(killer, TUREK_WAR_HOUNDS_TAIL, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
@@ -274,12 +274,12 @@ public final class Q00422_RepentYourSins extends Quest
 						if (getQuestItemsCount(killer, TRISALIM_TARANTULAS_VENOM_SAC) == 2)
 						{
 							giveItems(killer, TRISALIM_TARANTULAS_VENOM_SAC, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE);
 						}
 						else
 						{
 							giveItems(killer, TRISALIM_TARANTULAS_VENOM_SAC, 1);
-							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET);
 						}
 					}
 					break;
diff --git a/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java b/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
index d9b4e6547551406048a8c60d4fd9e085e9b2f4d1..1c1daca7195dc40c52898d7310483a8ffd16ccfc 100644
--- a/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
+++ b/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
@@ -21,7 +21,7 @@ package quests.Q00426_QuestForFishingShot;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -395,14 +395,14 @@ public class Q00426_QuestForFishingShot extends Quest
 				{
 					rewardItems(qs.getPlayer(), SWEET_FLUID, MOBS_SPECIAL.get(npc.getId()).reward);
 				}
-				playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 			else
 			{
 				if (Rnd.get(1000) <= MOBS.get(npc.getId()).chance)
 				{
 					rewardItems(qs.getPlayer(), SWEET_FLUID, MOBS.get(npc.getId()).reward);
-					playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
diff --git a/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
index 0feb0fc7264f404b1fd16ea125c62d60964f27f6..09490065bbb3ebf65a5c12c6631c431d8cc97c11 100644
--- a/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
+++ b/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00431_WeddingMarch;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -100,7 +100,7 @@ public class Q00431_WeddingMarch extends Quest
 				}
 				else
 				{
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
diff --git a/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
index 6935e14585b84a08c3559308a7a1aa081fce8f0c..821d298c3b5e7e9da418b3090c1f04e44ae724d1 100644
--- a/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00432_BirthdayPartySong;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -96,7 +96,7 @@ public class Q00432_BirthdayPartySong extends Quest
 			}
 			else
 			{
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onKill(npc, player, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 48acf76a026d8643e76cb2cf605fd47405943ee6..d3b65249cb1b06c19f10adb2b2388b8c5702a2db 100644
--- a/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -19,7 +19,7 @@
 package quests.Q00450_GraveRobberRescue;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -137,7 +137,7 @@ public class Q00450_GraveRobberRescue extends Quest
 			if (getRandom(100) < 66)
 			{
 				st.giveItems(EVIDENCE_OF_MIGRATION, 1);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(npc.getX() + 100, npc.getY() + 100, npc.getZ(), 0));
 				npc.setBusy(true);
 				
diff --git a/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index e86fe2e105a1261079efaa52ef7d3a22194f3891..edeb909b1e38e817874f31f0c93a2b83504f0946 100644
--- a/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00451_LuciensAltar;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -137,7 +137,7 @@ public class Q00451_LuciensAltar extends Quest
 				st.set(String.valueOf(npcId), "1");
 				st.takeItems(REPLENISHED_BEAD, 1);
 				st.giveItems(DISCHARGED_BEAD, 1);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				
 				if (st.getQuestItemsCount(DISCHARGED_BEAD) >= 5)
 				{
diff --git a/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 5e3157281e7118db37eb8577d98efcde5bd932fb..cb50af158867c20b3f4f5a4306a908251d7318b5 100644
--- a/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -20,7 +20,7 @@ package quests.Q00453_NotStrongEnoughAlone;
 
 import quests.Q10282_ToTheSeedOfAnnihilation.Q10282_ToTheSeedOfAnnihilation;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -147,7 +147,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 				if (i < 15)
 				{
 					st.set(Integer.toString(npcId), Integer.toString(i + 1));
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				
 				checkProgress(st, 15, MONSTER1[0], MONSTER1[1], MONSTER1[2], MONSTER1[3]);
@@ -176,7 +176,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 				if (i < 20)
 				{
 					st.set(Integer.toString(npcId), Integer.toString(i + 1));
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				
 				checkProgress(st, 20, MONSTER2[0], MONSTER2[1], MONSTER2[2]);
@@ -204,7 +204,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 				if (i < 20)
 				{
 					st.set(Integer.toString(npcId), Integer.toString(i + 1));
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				
 				checkProgress(st, 20, MONSTER3[0], MONSTER3[1], MONSTER3[2]);
diff --git a/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index 24f4180a4e2bac33c7bb3a01daef8cb03b733a57..894d01fcc65abf2c8265754120819eb950f0ef4f 100644
--- a/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -21,7 +21,7 @@ package quests.Q00455_WingsOfSand;
 import java.util.Arrays;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -79,7 +79,7 @@ public class Q00455_WingsOfSand extends Quest
 		if ((st != null) && Util.checkIfInRange(1500, npc, player, false) && (getRandom(1000) < CHANCE))
 		{
 			st.giveItems(LARGE_BABY_DRAGON, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			if (st.getQuestItemsCount(LARGE_BABY_DRAGON) == 1)
 			{
 				st.setCond(2, true);
diff --git a/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index 562cc36bc06afb9bb18837d179c00dea7f6f0ebd..ce35e19fb97bd55045227a573d7084dbc432b4de 100644
--- a/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -24,7 +24,7 @@ import java.util.Map;
 import java.util.Set;
 
 import com.l2jserver.gameserver.datatables.ItemTable;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.AggroInfo;
 import com.l2jserver.gameserver.model.L2CommandChannel;
@@ -175,7 +175,7 @@ public final class Q00456_DontKnowDontCare extends Quest
 			}
 			else
 			{
-				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		
diff --git a/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
index d3d4832ba6ec941b9c3e9010404a2025a159f026..8a263d5e470b2ce6951e438a9b05865e7ed24c4a 100644
--- a/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00458_PerfectForm;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -266,7 +266,7 @@ public class Q00458_PerfectForm extends Quest
 				}
 				else
 				{
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				
 				final ExQuestNpcLogList log = new ExQuestNpcLogList(getId());
diff --git a/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java b/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
index 6633f5ef826501bb73e48e3365dcc8e338b2b238..5737157ee198dbb02cefcfe3ff8923843bfbcff5 100644
--- a/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
+++ b/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q00252_ItSmellsDelicious.Q00252_ItSmellsDelicious;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -102,7 +102,7 @@ public class Q00461_RumbleInTheBase extends Quest
 			if ((st != null) && st.isCond(1) && (st.getQuestItemsCount(SHINY_SALMON) < 5))
 			{
 				st.giveItems(SHINY_SALMON, 1);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				if ((st.getQuestItemsCount(SHINY_SALMON) >= 5) && (st.getQuestItemsCount(SHOES_STRING_OF_SEL_MAHUM) >= 10))
 				{
 					st.setCond(2, true);
@@ -121,7 +121,7 @@ public class Q00461_RumbleInTheBase extends Quest
 			if (st.getQuestItemsCount(SHOES_STRING_OF_SEL_MAHUM) < 10)
 			{
 				st.giveItems(SHOES_STRING_OF_SEL_MAHUM, 1);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				if ((st.getQuestItemsCount(SHINY_SALMON) >= 5) && (st.getQuestItemsCount(SHOES_STRING_OF_SEL_MAHUM) >= 10))
 				{
 					st.setCond(2, true);
diff --git a/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
index 1a54a2441da85252a56832722d30b6b0c2098ffb..a73a24647b5ac754cdfa35bc021b0af0991ac69c 100644
--- a/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
+++ b/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
@@ -21,7 +21,7 @@ package quests.Q00463_IMustBeaGenius;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -192,7 +192,7 @@ public class Q00463_IMustBeaGenius extends Quest
 				ns.addStringParameter(String.valueOf(number));
 				npc.broadcastPacket(ns);
 				
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				if (st.getQuestItemsCount(CORPSE_LOG) == st.getInt("number"))
 				{
 					st.takeItems(CORPSE_LOG, -1);
diff --git a/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java b/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
index a2d959934dd4a1ad773061ac025d6c1dea6ec892..f1692c426fa993a138ff83deaaaa62cab3215dea 100644
--- a/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
+++ b/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
@@ -22,7 +22,7 @@ import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -94,11 +94,11 @@ public final class Q00504_CompetitionForTheBanditStronghold extends Quest
 			st.giveItems(TARLK_AMULET, 1);
 			if (st.getQuestItemsCount(TARLK_AMULET) < 30)
 			{
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 			else
 			{
-				st.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+				st.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 			}
 		}
 		return null;
diff --git a/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 497e192cf0122aad047556d0dfea7b25b57c8f02..f0017bb742f78bb2bf9edfb7f703bc4eb5744abc 100644
--- a/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -150,7 +150,7 @@ public class Q00508_AClansReputation extends Quest
 				if ((npc.getId() == REWARD_POINTS.get(raid).get(0)) && !st.hasQuestItems(REWARD_POINTS.get(raid).get(1)))
 				{
 					st.rewardItems(REWARD_POINTS.get(raid).get(1), 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
@@ -187,7 +187,7 @@ public class Q00508_AClansReputation extends Quest
 					if (st.hasQuestItems(REWARD_POINTS.get(raid).get(1)))
 					{
 						htmltext = "30868-" + raid + "b.html";
-						st.playSound(QuestSound.ITEMSOUND_QUEST_FANFARE_1);
+						st.playSound(Sound.ITEMSOUND_QUEST_FANFARE_1);
 						st.takeItems(REWARD_POINTS.get(raid).get(1), -1);
 						final int rep = REWARD_POINTS.get(raid).get(2);
 						clan.addReputationScore(rep, true);
diff --git a/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 68a3478df98bd2ea9225742bcb6913fe093f77d9..b33652b5b02ef628f1beac69f786e023d9b7dfab 100644
--- a/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -137,7 +137,7 @@ public class Q00509_AClansFame extends Quest
 				if ((npc.getId() == REWARD_POINTS.get(raid).get(0)) && !st.hasQuestItems(REWARD_POINTS.get(raid).get(1)))
 				{
 					st.rewardItems(REWARD_POINTS.get(raid).get(1), 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
@@ -174,7 +174,7 @@ public class Q00509_AClansFame extends Quest
 					if (st.hasQuestItems(REWARD_POINTS.get(raid).get(1)))
 					{
 						htmltext = "31331-" + raid + "b.html";
-						st.playSound(QuestSound.ITEMSOUND_QUEST_FANFARE_1);
+						st.playSound(Sound.ITEMSOUND_QUEST_FANFARE_1);
 						st.takeItems(REWARD_POINTS.get(raid).get(1), -1);
 						final int rep = REWARD_POINTS.get(raid).get(2);
 						clan.addReputationScore(rep, true);
diff --git a/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index a1782c8cbe3e74c99e8b869e593cbf6f4c5bb79e..6b6f7f50e9cf424472421777a31fd3f4576f868a 100644
--- a/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00510_AClansPrestige;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -101,7 +101,7 @@ public class Q00510_AClansPrestige extends Quest
 		if ((st != null) && st.isStarted())
 		{
 			st.rewardItems(TYRANNOSAURUS_CLAW, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return null;
 	}
@@ -137,7 +137,7 @@ public class Q00510_AClansPrestige extends Quest
 				{
 					int count = (int) st.getQuestItemsCount(TYRANNOSAURUS_CLAW);
 					int reward = (count < 10) ? (30 * count) : (59 + (30 * count));
-					st.playSound(QuestSound.ITEMSOUND_QUEST_FANFARE_1);
+					st.playSound(Sound.ITEMSOUND_QUEST_FANFARE_1);
 					st.takeItems(TYRANNOSAURUS_CLAW, -1);
 					clan.addReputationScore(reward, true);
 					player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addInt(reward));
diff --git a/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index d65290c2311acd4c9107b6061af5d3f8cb9914a8..a881ada7d1c8707ff98a7e37c0967a1eb2a862c3 100644
--- a/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.Location;
@@ -464,7 +464,7 @@ public final class Q00511_AwlUnderFoot extends Quest
 		if (st.isCond(1))
 		{
 			st.giveItems(DL_MARK, 140);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 	}
 	
diff --git a/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java b/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
index 27c110fb2a65c78f3f40a696f4a0b749fbf248a5..845a341b8c66a17095c75efaa984d00f75200eea 100644
--- a/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
+++ b/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
@@ -21,7 +21,7 @@ package quests.Q00601_WatchingEyes;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -133,7 +133,7 @@ public class Q00601_WatchingEyes extends Quest
 			}
 			else
 			{
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onKill(npc, player, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java b/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
index 0072db4ceeef5c800415993e298b2378574ed140..bfeec53a49942734182716ba8ac7df303dfdd9ac 100644
--- a/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
+++ b/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00602_ShadowOfLight;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -140,7 +140,7 @@ public class Q00602_ShadowOfLight extends Quest
 			}
 			else
 			{
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onKill(npc, player, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java b/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
index bb72cfb551381e797601e7060f8fb03dd464249c..b0fab6f1761fcf3f4c44bcebcb151a88c02fd268 100644
--- a/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
+++ b/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
@@ -19,7 +19,7 @@
 package quests.Q00604_DaimonTheWhiteEyedPart2;
 
 import com.l2jserver.gameserver.datatables.SpawnTable;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -82,7 +82,7 @@ public final class Q00604_DaimonTheWhiteEyedPart2 extends Quest
 				}
 				
 				giveItems(player, ESSENCE_OF_DAIMON, 1);
-				qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 	}
diff --git a/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java b/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
index 168833883af4fc5754d25aa2fda340a28055b900..a072f4464da5c4280c668b45e53d6cf0db221b8c 100644
--- a/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
+++ b/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
@@ -21,7 +21,7 @@ package quests.Q00605_AllianceWithKetraOrcs;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -204,7 +204,7 @@ public class Q00605_AllianceWithKetraOrcs extends Quest
 					return "31371-03.htm";
 				}
 				st.setState(State.STARTED);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT);
+				st.playSound(Sound.ITEMSOUND_QUEST_ACCEPT);
 				for (int i = 0; i < KETRA_MARKS.length; i++)
 				{
 					if (st.hasQuestItems(KETRA_MARKS[i]))
diff --git a/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java b/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
index 4676af3fb72456bf804d72b5d98e4388285e063e..76f7db92a0dd97db1a6b5a7639d594e8782668a8 100644
--- a/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
+++ b/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
@@ -21,7 +21,7 @@ package quests.Q00606_BattleAgainstVarkaSilenos;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -115,7 +115,7 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest
 		{
 			final QuestState st = getQuestState(member, false);
 			st.giveItems(MANE, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return super.onKill(npc, killer, isSummon);
 	}
diff --git a/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java b/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
index a7f262b266520e9b39a9b6a8b4953b30959f8aca..416f03a0986b24ca776b343c73000d2a1264e247 100644
--- a/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
+++ b/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
@@ -21,7 +21,7 @@ package quests.Q00611_AllianceWithVarkaSilenos;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -204,7 +204,7 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest
 					return "31378-03.htm";
 				}
 				st.setState(State.STARTED);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT);
+				st.playSound(Sound.ITEMSOUND_QUEST_ACCEPT);
 				for (int i = 0; i < VARKA_MARKS.length; i++)
 				{
 					if (st.hasQuestItems(VARKA_MARKS[i]))
diff --git a/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java b/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
index bd49655065cb7acdcf8ddba33d4def8271d9936e..457564bd3b1ee79c670ad2032c53fdcdb0574b01 100644
--- a/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
+++ b/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
@@ -21,7 +21,7 @@ package quests.Q00612_BattleAgainstKetraOrcs;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -115,7 +115,7 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest
 		{
 			final QuestState st = getQuestState(member, false);
 			st.giveItems(MOLAR, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return super.onKill(npc, killer, isSummon);
 	}
diff --git a/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index a79bc8e324e3305be9e84052c11c28ed713681e6..d1ef8631672ae8e48c91cca1396c9fe84ee3c8d1 100644
--- a/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -21,7 +21,7 @@ package quests.Q00617_GatherTheFlames;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -169,7 +169,7 @@ public class Q00617_GatherTheFlames extends Quest
 		{
 			st.giveItems(TORCH, 1);
 		}
-		st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+		st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		return super.onKill(npc, player, isSummon);
 	}
 	
diff --git a/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 359c41f47135c87ac0656d2aecc39c0f12a94076..e70adc01768abac94233ee0e4500ea74b8b4ac9a 100644
--- a/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -21,7 +21,7 @@ package quests.Q00618_IntoTheFlame;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -133,7 +133,7 @@ public class Q00618_IntoTheFlame extends Quest
 				}
 				else
 				{
-					qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
diff --git a/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java b/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
index 8ddcf82e0d9420004779076e8af06558c18a4102..31bbab3fae229a54440557d75d4fe5cf41901a81 100644
--- a/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
+++ b/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
@@ -21,7 +21,7 @@ package quests.Q00624_TheFinestIngredientsPart1;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -111,7 +111,7 @@ public final class Q00624_TheFinestIngredientsPart1 extends Quest
 				if (count < 50)
 				{
 					giveItems(partyMember, item, 50 - count);
-					playSound(partyMember, QuestSound.ITEMSOUND_QUEST_FANFARE_MIDDLE);
+					playSound(partyMember, Sound.ITEMSOUND_QUEST_FANFARE_MIDDLE);
 				}
 				if (getQuestItemsCount(partyMember, getRegisteredItemIds()) == 150)
 				{
@@ -121,7 +121,7 @@ public final class Q00624_TheFinestIngredientsPart1 extends Quest
 			else
 			{
 				giveItems(partyMember, item, 1);
-				playSound(partyMember, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				playSound(partyMember, Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
index c9213fe21ff770d7aecedfa26b7255a2f77300cc..057c6b225d03d6640dd356ddac007115abaae9cf 100644
--- a/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
+++ b/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -130,7 +130,7 @@ public class Q00626_ADarkTwilight extends Quest
 				st.giveItems(BLOOD_OF_SAINT, 1);
 				if (st.getQuestItemsCount(BLOOD_OF_SAINT) < ITEMS_COUNT_REQUIRED)
 				{
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				else
 				{
diff --git a/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 8d872ccdca620a3510fcb670a72de30cb142c864..f027e7afd478130bb4544914cc09a78074aab893 100644
--- a/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -170,7 +170,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 				st.giveItems(BEAD_OF_OBEDIENCE, 1);
 				if (st.getQuestItemsCount(BEAD_OF_OBEDIENCE) < BEAD_OF_OBEDIENCE_COUNT_REQUIRED)
 				{
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				else
 				{
diff --git a/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java b/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
index fd23d1f699efe2e8882d832bc1d757dec4fc0318..f81b5717775a0e2e6e829e9bf71551cef2977ab6 100644
--- a/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
+++ b/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
@@ -19,7 +19,7 @@
 package quests.Q00637_ThroughOnceMore;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -101,7 +101,7 @@ public final class Q00637_ThroughOnceMore extends Quest
 					}
 					else
 					{
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 					
 					st.giveItems(NECRO_HEART, numItems);
diff --git a/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 354c49289ca6b59ea3aabcf563fa52e002bd7a71..ab377f76446eaf51cb40e76197e971c2c9d27332 100644
--- a/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -20,7 +20,7 @@ package quests.Q00641_AttackSailren;
 
 import quests.Q00126_TheNameOfEvil2.Q00126_TheNameOfEvil2;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -95,7 +95,7 @@ public class Q00641_AttackSailren extends Quest
 				st.giveItems(GAZKH_FRAGMENT, 1);
 				if (st.getQuestItemsCount(GAZKH_FRAGMENT) < 30)
 				{
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				else
 				{
diff --git a/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 8007ebaef39c4ee1360853ddaa4c80f028a78330..7ed114b362b9efaf26d96c6302d768fa1466c917 100644
--- a/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -19,7 +19,7 @@
 package quests.Q00643_RiseAndFallOfTheElrokiTribe;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -172,7 +172,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 				{
 					st.rewardItems(PIECE[getRandom(PIECE.length)], 5);
 					st.takeItems(BONES_OF_A_PLAINS_DINOSAUR, 300);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					st.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 					htmltext = "32117-05.html";
 				}
 				break;
@@ -204,7 +204,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 			{
 				st.rewardItems(BONES_OF_A_PLAINS_DINOSAUR, 1);
 			}
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		
 		if (Util.contains(MOBS2, npcId))
@@ -213,7 +213,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 			if (getRandom(1000) < chance)
 			{
 				st.rewardItems(BONES_OF_A_PLAINS_DINOSAUR, 1);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		
@@ -223,7 +223,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 			if (getRandom(1000) < chance)
 			{
 				st.rewardItems(BONES_OF_A_PLAINS_DINOSAUR, 1);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onKill(npc, player, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index cfadcffb2a90077f17d91cd1323dedf9ec1232ca..bfd7989e3d0452969578f6f2d4cb64a923ad41a6 100644
--- a/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00645_GhostsOfBatur;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -112,7 +112,7 @@ public class Q00645_GhostsOfBatur extends Quest
 				}
 				else
 				{
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
diff --git a/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
index 28dc34fda6214124bff572cecab2bd5a078895e3..37d4d3fddc7e1f613dfe6907072ed75399cc7dc7 100644
--- a/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
+++ b/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
@@ -21,7 +21,7 @@ package quests.Q00647_InfluxOfMachines;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -129,7 +129,7 @@ public class Q00647_InfluxOfMachines extends Quest
 				}
 				else
 				{
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
diff --git a/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 1822d1215f3cfa4f2a377dfe53aa62c6c83d40bd..947981085530b91812467d0765c20fbfeab1eb1e 100644
--- a/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q00115_TheOtherSideOfTruth.Q00115_TheOtherSideOfTruth;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -214,7 +214,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest
 					takeItems(player, SILVER_ICE_CRYSTAL, 1);
 					int val = (st.getInt("ex") + 1);
 					st.set("ex", val);
-					playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY);
+					playSound(player, Sound.ITEMSOUND_BROKEN_KEY);
 					htmltext = event;
 				}
 				break;
@@ -226,7 +226,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest
 					takeItems(player, SILVER_ICE_CRYSTAL, 1);
 					int val = (st.getInt("ex") + 2);
 					st.set("ex", val);
-					playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY);
+					playSound(player, Sound.ITEMSOUND_BROKEN_KEY);
 					htmltext = event;
 				}
 				break;
@@ -242,12 +242,12 @@ public final class Q00648_AnIceMerchantsDream extends Quest
 					{
 						htmltext = "32023-07.html";
 						giveItems(player, BLACK_ICE_CRYSTAL, 1);
-						playSound(player, QuestSound.ITEMSOUND_ENCHANT_SUCCESS);
+						playSound(player, Sound.ITEMSOUND_ENCHANT_SUCCESS);
 					}
 					else
 					{
 						htmltext = "32023-08.html";
-						playSound(player, QuestSound.ITEMSOUND_ENCHANT_FAILED);
+						playSound(player, Sound.ITEMSOUND_ENCHANT_FAILED);
 					}
 					st.set("ex", 0);
 				}
@@ -264,12 +264,12 @@ public final class Q00648_AnIceMerchantsDream extends Quest
 					{
 						htmltext = "32023-07.html";
 						giveItems(player, BLACK_ICE_CRYSTAL, 1);
-						playSound(player, QuestSound.ITEMSOUND_ENCHANT_SUCCESS);
+						playSound(player, Sound.ITEMSOUND_ENCHANT_SUCCESS);
 					}
 					else
 					{
 						htmltext = "32023-08.html";
-						playSound(player, QuestSound.ITEMSOUND_ENCHANT_FAILED);
+						playSound(player, Sound.ITEMSOUND_ENCHANT_FAILED);
 					}
 					st.set("ex", 0);
 				}
diff --git a/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java b/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
index 78b0af11af3e8039a31442f517deb3f039d3dbdc..1879005141809ca39b44ab1db3162dc5f4b59e16 100644
--- a/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
+++ b/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
@@ -21,7 +21,7 @@ package quests.Q00649_ALooterAndARailroadMan;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -138,7 +138,7 @@ public final class Q00649_ALooterAndARailroadMan extends Quest
 			}
 			else
 			{
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
index 38a60d6100684ca83930926462cd4e68c40bdae4..0bcca5ffca23b27fa5d8038968b287e5bafeca32 100644
--- a/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
+++ b/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
@@ -25,7 +25,7 @@ import java.util.Map;
 
 import quests.Q00117_TheOceanOfDistantStars.Q00117_TheOceanOfDistantStars;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -170,7 +170,7 @@ public final class Q00650_ABrokenDream extends Quest
 			if ((getRandom(1000) < monsterChance) && Util.checkIfInRange(1500, npc, player, true))
 			{
 				giveItems(player, REMNANTS_OF_OLD_DWARVES_DREAMS, 1);
-				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
index 15ca3e4baf51a0b6360f5edd7e7d4730e318e4c4..30cbf059a6023271dd355c96d9f4bd1de45eab9c 100644
--- a/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
+++ b/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
@@ -22,7 +22,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
 import com.l2jserver.gameserver.cache.HtmCache;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -249,7 +249,7 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest
 					}
 					else
 					{
-						playSound(clanLeader, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(clanLeader, Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 				}
 			}
diff --git a/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
index 429175575fa61da9e449e6775cf4264eea8ac3b3..d9042d5b66e857df44ae6423c69a9e5ea218660b 100644
--- a/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
+++ b/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
@@ -21,7 +21,7 @@ package quests.Q00660_AidingTheFloranVillage;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemChanceHolder;
@@ -121,7 +121,7 @@ public final class Q00660_AidingTheFloranVillage extends Quest
 					{
 						qs.setState(State.STARTED);
 						qs.setCond(2);
-						playSound(player, QuestSound.ITEMSOUND_QUEST_ACCEPT);
+						playSound(player, Sound.ITEMSOUND_QUEST_ACCEPT);
 					}
 					htmltext = event;
 				}
@@ -286,7 +286,7 @@ public final class Q00660_AidingTheFloranVillage extends Quest
 				{
 					giveItems(player, DELU_LIZARDMANS_SCALE, 1);
 				}
-				playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+				playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE);
 			}
 		}
 		return super.onKill(npc, player, isSummon);
diff --git a/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 852ddda39318b29e2b4b726c2033aab4b14444d8..776a37597843d34c33c6b2385abd3b25e974fe98 100644
--- a/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -23,7 +23,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -769,7 +769,7 @@ public class Q00663_SeductiveWhispers extends Quest
 			else if (rnd < MONSTERS.get(npc.getId()))
 			{
 				giveItems(rewardedPlayer, SPIRIT_BEAD, 1);
-				playSound(rewardedPlayer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				playSound(rewardedPlayer, Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		
diff --git a/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index af53a56397e491b87ea378e8ea73f0df0a688f98..3af9b27c234a5655a4bc5295a09a0502a8433466 100644
--- a/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -19,7 +19,7 @@
 package quests.Q00688_DefeatTheElrokianRaiders;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -135,7 +135,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
 		if (getRandom(1000) < chance)
 		{
 			st.rewardItems(DINOSAUR_FANG_NECKLACE, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return super.onKill(npc, player, isSummon);
 	}
diff --git a/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java b/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
index b576de2c33a6d8af86fcc3e2c2ffc38465cf01ab..1297b0631797f0bfbf27da2cf1a8be3a9fefb2a4 100644
--- a/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
+++ b/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
@@ -19,7 +19,7 @@
 package quests.Q00690_JudesRequest;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -93,7 +93,7 @@ public class Q00690_JudesRequest extends Quest
 			{
 				st.giveItems(REWARDS[0][getRandom(REWARDS[0].length)], 1);
 				st.takeItems(EVIL_WEAPON, 200);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+				st.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 				htmltext = "32356-07.htm";
 			}
 			else
@@ -112,7 +112,7 @@ public class Q00690_JudesRequest extends Quest
 			{
 				st.giveItems(REWARDS[1][getRandom(REWARDS[1].length)], 1);
 				st.takeItems(EVIL_WEAPON, 5);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE);
+				st.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
 				htmltext = "32356-09.htm";
 			}
 			else
@@ -151,7 +151,7 @@ public class Q00690_JudesRequest extends Quest
 		if (getRandom(1000) <= chance)
 		{
 			st.giveItems(EVIL_WEAPON, Math.max(chance / 1000, 1));
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return null;
 	}
diff --git a/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java b/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
index ee494a3cd42d11d2acdccb2cc2fdb618884c8424..fdbcb91707ac798d82d3c45891c65cfaa9c32226 100644
--- a/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
+++ b/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -141,7 +141,7 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest
 		if (getRandom(1000) <= chance)
 		{
 			st.giveItems(RED_GEM, numItems);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return super.onKill(npc, player, isSummon);
 	}
diff --git a/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java b/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
index 939c5ea46393f9463313bf47a70e75423805fbe6..76b9005765282d834bdabc44883e8ff05133adc3 100644
--- a/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
+++ b/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -193,7 +193,7 @@ public final class Q00692_HowtoOpposeEvil extends Quest
 			if (numItems > 0)
 			{
 				st.giveItems(QUEST_MOBS.get(npcId).getId(), numItems);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return null;
diff --git a/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
index e00322ce114755ba2f42d1b4e5e685502ab2e138..8cbe08b018d36e3212fd5dc462c880cd304b1ed9 100644
--- a/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
+++ b/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -123,14 +123,14 @@ public class Q00699_GuardianOfTheSkies extends Quest
 					amount = getRandom(10) + 60;
 				}
 				st.giveItems(VULTURES_GOLDEN_FEATHER, amount);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 			else
 			{
 				if (getRandom(1000) < MONSTERS.get(npc.getId()))
 				{
 					st.giveItems(VULTURES_GOLDEN_FEATHER, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
diff --git a/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
index 1160487f49acdb48058f7b4d4f01a62f30fb5e1e..1cd8f5b7b52e8a54e2a6135e0be067068d7230ea 100644
--- a/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
+++ b/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -242,7 +242,7 @@ public class Q00700_CursedLife extends Quest
 					amount = getRandom(6) + 17;
 				}
 				st.giveItems(SWALLOWED_SKULL, amount);
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 			else
 			{
@@ -251,17 +251,17 @@ public class Q00700_CursedLife extends Quest
 				if (chance < chances[0])
 				{
 					st.giveItems(SWALLOWED_BONES, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				else if (chance < chances[1])
 				{
 					st.giveItems(SWALLOWED_STERNUM, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 				else if (chance < chances[2])
 				{
 					st.giveItems(SWALLOWED_SKULL, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
diff --git a/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
index f53b1a7371ad1c885bccffe9da93a3a76d7cafaa..1a94eb06a9b0456005942946581b7491d5b2e61e 100644
--- a/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
+++ b/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -127,12 +127,12 @@ public class Q00701_ProofOfExistence extends Quest
 				count = getRandom(5) + 14;
 			}
 			st.giveItems(BANSHEE_QUEENS_EYE, count);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if (getRandom(1000) < MOBS.get(npc.getId()))
 		{
 			st.giveItems(DEADMANS_REMAINS, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		return super.onKill(npc, player, isSummon);
 	}
diff --git a/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
index 3ff94a546786f000a639ab7b1ecf91f4183d8501..860d78613f7f6fce2b6b0e7fb94e7fd68ce88419 100644
--- a/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
+++ b/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
@@ -20,7 +20,7 @@ package quests.Q00702_ATrapForRevenge;
 
 import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -357,7 +357,7 @@ public class Q00702_ATrapForRevenge extends Quest
 				st.giveItems(VARIANT_DRAKE_WING_HORNS, count);
 				break;
 		}
-		st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+		st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		return null;
 	}
 	
diff --git a/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index 1ef1937755a5d02ea3848e14ef857055dbf426bb..2b99693661462b52cf4b0a5491dfe21bd91de4ba 100644
--- a/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00901_HowLavasaurusesAreMade;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -184,7 +184,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
 		if (st.getQuestItemsCount(itemId) < 10)
 		{
 			st.giveItems(itemId, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if (gotAllQuestItems(st))
 		{
diff --git a/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index cb64a8a0438a0c9bac7bc7939b5749ec6e8b746c..a99d396be80133f4d6172e9bf66f929ed5108664 100644
--- a/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00903_TheCallOfAntharas;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -66,13 +66,13 @@ public class Q00903_TheCallOfAntharas extends Quest
 				case BEHEMOTH_DRAGON:
 				{
 					st.giveItems(BEHEMOTH_DRAGON_LEATHER, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					break;
 				}
 				case TARASK_DRAGON:
 				{
 					st.giveItems(TARASK_DRAGONS_LEATHER_FRAGMENT, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					break;
 				}
 			}
@@ -161,7 +161,7 @@ public class Q00903_TheCallOfAntharas extends Quest
 					case 2:
 					{
 						st.giveItems(SCROLL_ANTHARAS_CALL, 1);
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 						st.exitQuest(QuestType.DAILY, true);
 						htmltext = "30755-08.html";
 						break;
diff --git a/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java b/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
index db59c7664bff5e8b708a03bd58aa6a2be45b735f..38d22bd1bea00c248bb22d632f39068f4cac5cc9 100644
--- a/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
+++ b/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00904_DragonTrophyAntharas;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -134,7 +134,7 @@ public final class Q00904_DragonTrophyAntharas extends Quest
 					case 2:
 					{
 						st.giveItems(MEDAL_OF_GLORY, 30);
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 						st.exitQuest(QuestType.DAILY, true);
 						htmltext = "30755-09.html";
 						break;
diff --git a/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 77e2c4a0a07c86bfc998632fc4b64cc400a6fb89..295c3b307a8f55570806e63c0c5f0af3b910ad74 100644
--- a/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -21,7 +21,7 @@ package quests.Q00905_RefinedDragonBlood;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -98,7 +98,7 @@ public final class Q00905_RefinedDragonBlood extends Quest
 				}
 				else
 				{
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
 		}
@@ -134,7 +134,7 @@ public final class Q00905_RefinedDragonBlood extends Quest
 				case "32864-11.html":
 				{
 					st.giveItems(REFINED_RED_DRAGON_BLOOD, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					st.exitQuest(QuestType.DAILY, true);
 					htmltext = event;
 					break;
@@ -142,7 +142,7 @@ public final class Q00905_RefinedDragonBlood extends Quest
 				case "32864-12.html":
 				{
 					st.giveItems(REFINED_BLUE_DRAGON_BLOOD, 1);
-					st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					st.exitQuest(QuestType.DAILY, true);
 					htmltext = event;
 					break;
diff --git a/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index d4e7fb191f6f404d0006ff11e4dbb555e5e122ad..4dfc88359f736e758fb3bfb6370f44cd7b806d0b 100644
--- a/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00906_TheCallOfValakas;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -60,7 +60,7 @@ public class Q00906_TheCallOfValakas extends Quest
 		if ((st != null) && Util.checkIfInRange(1500, npc, player, false))
 		{
 			st.giveItems(LAVASAURUS_ALPHA_FRAGMENT, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			st.setCond(2, true);
 		}
 	}
@@ -142,7 +142,7 @@ public class Q00906_TheCallOfValakas extends Quest
 					case 2:
 					{
 						st.giveItems(SCROLL_VALAKAS_CALL, 1);
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 						st.exitQuest(QuestType.DAILY, true);
 						htmltext = "31540-08.html";
 						break;
diff --git a/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
index 9f56d4b39213730ac8b8ab164360cc51e174a8e5..66f489bdbaa0e7f70221562b82840b6dd83ac51f 100644
--- a/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
+++ b/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
@@ -18,7 +18,7 @@
  */
 package quests.Q00907_DragonTrophyValakas;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -139,7 +139,7 @@ public class Q00907_DragonTrophyValakas extends Quest
 					case 2:
 					{
 						st.giveItems(MEDAL_OF_GLORY, 30);
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 						st.exitQuest(QuestType.DAILY, true);
 						htmltext = "31540-09.html";
 						break;
diff --git a/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
index 2ddbf1005f9efdc5873d33c4a6d1b7c1c5d2be48..d8802418e73c5945533336ecb3f10f7ad083a5bc 100644
--- a/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
+++ b/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
@@ -21,7 +21,7 @@ package quests.Q10272_LightFragment;
 import quests.Q10271_TheEnvelopingDarkness.Q10271_TheEnvelopingDarkness;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
@@ -165,7 +165,7 @@ public class Q10272_LightFragment extends Quest
 					if (numItems > 0)
 					{
 						st.giveItems(FRAGMENT_POWDER, numItems);
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 				}
 			}
diff --git a/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 7a74f73150cae0b410a8486692e9e4711cb06652..79e3c8eae0068314c2898952a1ca54590f0559f2 100644
--- a/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -18,7 +18,7 @@
  */
 package quests.Q10273_GoodDayToFly;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
@@ -113,7 +113,7 @@ public class Q10273_GoodDayToFly extends Quest
 			}
 			else
 			{
-				st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 		return null;
diff --git a/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 4f8f4c51ee54e3e73c4ecb124d984f4fcf3c489a..c823b14ae21b3acc2e5f9c251623836268427eb2 100644
--- a/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -20,7 +20,7 @@ package quests.Q10274_CollectingInTheAir;
 
 import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -112,7 +112,7 @@ public class Q10274_CollectingInTheAir extends Quest
 					st.giveItems(GREEN, 1);
 					break;
 			}
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 			npc.doDie(caster);
 		}
 		return super.onSkillSee(npc, caster, skill, targets, isSummon);
diff --git a/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index 000154639598a3f20d0a62622e95e18b29fb9f4d..7c371383e4927f826488a4fa76dd534b0bc2d9dd 100644
--- a/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -18,7 +18,7 @@
  */
 package quests.Q10275_ContainingTheAttributePower;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.Elementals;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -151,7 +151,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
 					}
 					else
 					{
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 				}
 				break;
@@ -165,7 +165,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
 					}
 					else
 					{
-						st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 					}
 				}
 				break;
diff --git a/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java b/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
index 1504a0d1e553eef3e2fd2df4e47f607f301b0488..a9504a93c53f670b1e26d227169635d047a5aab8 100644
--- a/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
+++ b/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
@@ -21,7 +21,7 @@ package quests.Q10276_MutatedKaneusGludio;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -161,12 +161,12 @@ public class Q10276_MutatedKaneusGludio extends Quest
 		if ((npcId == TOMLAN_KAMOS) && !st.hasQuestItems(TISSUE_TK))
 		{
 			st.giveItems(TISSUE_TK, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if ((npcId == OL_ARIOSH) && !st.hasQuestItems(TISSUE_OA))
 		{
 			st.giveItems(TISSUE_OA, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 	}
 }
diff --git a/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
index c6f9b20152fbde078030274188cad0b9d24db03a..4d2a043450137ece578165c8bb873081522dc7a7 100644
--- a/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
+++ b/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
@@ -21,7 +21,7 @@ package quests.Q10277_MutatedKaneusDion;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -161,12 +161,12 @@ public class Q10277_MutatedKaneusDion extends Quest
 		if ((npcId == CRIMSON_HATU) && !st.hasQuestItems(TISSUE_CH))
 		{
 			st.giveItems(TISSUE_CH, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if ((npcId == SEER_FLOUROS) && !st.hasQuestItems(TISSUE_SF))
 		{
 			st.giveItems(TISSUE_SF, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 	}
 }
diff --git a/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java b/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
index 551317a37d9438e7eccc3a706c3bc38be1644c03..b7bb206796b8e82b9e6386a3775389c1e7f62c69 100644
--- a/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
+++ b/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
@@ -21,7 +21,7 @@ package quests.Q10278_MutatedKaneusHeine;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -161,12 +161,12 @@ public class Q10278_MutatedKaneusHeine extends Quest
 		if ((npcId == BLADE_OTIS) && !st.hasQuestItems(TISSUE_BO))
 		{
 			st.giveItems(TISSUE_BO, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if ((npcId == WEIRD_BUNEI) && !st.hasQuestItems(TISSUE_WB))
 		{
 			st.giveItems(TISSUE_WB, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 	}
 }
diff --git a/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
index d0174c8a894e3e6b32207dfd05d0c76f24dd2690..749a94bc77480479b2e8b45a663e8b436e42185c 100644
--- a/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
+++ b/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
@@ -21,7 +21,7 @@ package quests.Q10279_MutatedKaneusOren;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -161,12 +161,12 @@ public class Q10279_MutatedKaneusOren extends Quest
 		if ((npcId == KAIM_ABIGORE) && !st.hasQuestItems(TISSUE_KA))
 		{
 			st.giveItems(TISSUE_KA, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if ((npcId == KNIGHT_MONTAGNAR) && !st.hasQuestItems(TISSUE_KM))
 		{
 			st.giveItems(TISSUE_KM, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 	}
 }
diff --git a/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
index 6e3fe43f21fcde5501baf03479fb1d3530f40e0e..755c69cb1fb12da575b9315a65f9ca39a0779098 100644
--- a/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
+++ b/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
@@ -21,7 +21,7 @@ package quests.Q10280_MutatedKaneusSchuttgart;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -161,12 +161,12 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
 		if ((npcId == VENOMOUS_STORACE) && !st.hasQuestItems(TISSUE_VS))
 		{
 			st.giveItems(TISSUE_VS, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		else if ((npcId == KEL_BILETTE) && !st.hasQuestItems(TISSUE_KB))
 		{
 			st.giveItems(TISSUE_KB, 1);
-			st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 		}
 	}
 }
diff --git a/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index 68eb4697925a1343dfff8070e0bddd62e4574a0c..9a5adf4d53cd074a916e87960d6e71e240f07c62 100644
--- a/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -21,7 +21,7 @@ package quests.Q10281_MutatedKaneusRune;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -157,6 +157,6 @@ public class Q10281_MutatedKaneusRune extends Quest
 	private final void rewardItem(int npcId, QuestState st)
 	{
 		st.giveItems(TISSUE_WA, 1);
-		st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+		st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET);
 	}
 }
diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index 35cde65de0b6163ecc15ef44f9f2f0484795fa98..062e1df392e20f81e1b6a84dafe18d19213d74e4 100644
--- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -21,7 +21,7 @@ package quests.Q10292_SevenSignsGirlOfDoubt;
 import quests.Q00198_SevenSignsEmbryo.Q00198_SevenSignsEmbryo;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -126,7 +126,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
 			{
 				if (st.isCond(4) && hasItem(player, ELCADIAS_MARK))
 				{
-					playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE);
 					htmltext = event;
 				}
 				break;
@@ -280,7 +280,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
 					{
 						if (hasItem(player, ELCADIAS_MARK))
 						{
-							playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+							playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE);
 							htmltext = "32784-05.html";
 						}
 						break;
diff --git a/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index fb60afc292a774c196307243ba5fe2327a5de0c4..999a8ef9d84b1e6df6d50ed2c538f33248008d1f 100644
--- a/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -18,7 +18,7 @@
  */
 package quests.Q10501_ZakenEmbroideredSoulCloak;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -68,7 +68,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 			else
 			{
 				giveItems(player, ZAKENS_SOUL_FRAGMENT, count);
-				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 	}
@@ -118,7 +118,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 						if (getQuestItemsCount(player, ZAKENS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
 						{
 							giveItems(player, SOUL_CLOAK_OF_ZAKEN, 1);
-							playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 							st.exitQuest(false, true);
 							htmltext = "32612-06.html";
 						}
diff --git a/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index 08d5ca4b0597829685a6b31e332c2217d91e979e..5ae96b70414b453faea0d9d6c78b5276ad5e5b55 100644
--- a/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -18,7 +18,7 @@
  */
 package quests.Q10502_FreyaEmbroideredSoulCloak;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -68,7 +68,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 			else
 			{
 				giveItems(player, FREYAS_SOUL_FRAGMENT, count);
-				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 	}
@@ -123,7 +123,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 						if (getQuestItemsCount(player, FREYAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
 						{
 							giveItems(player, SOUL_CLOAK_OF_FREYA, 1);
-							playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 							st.exitQuest(false, true);
 							htmltext = "32612-06.html";
 						}
diff --git a/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 8c4803a11aeda49c3ba3163c241d57a574307dae..a602c20bab862b933027928d5ffcea3f948da30a 100644
--- a/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -18,7 +18,7 @@
  */
 package quests.Q10503_FrintezzaEmbroideredSoulCloak;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -69,7 +69,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 			else
 			{
 				giveItems(player, FRINTEZZAS_SOUL_FRAGMENT, count);
-				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 			}
 		}
 	}
@@ -119,7 +119,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 						if (getQuestItemsCount(player, FRINTEZZAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
 						{
 							giveItems(player, SOUL_CLOAK_OF_FRINTEZZA, 1);
-							playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+							playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 							st.exitQuest(false, true);
 							htmltext = "32612-06.html";
 						}
diff --git a/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
index f07ccef385d0145a7407a544d0202dcaeef4515a..31a4c44c0ac895aa2ab7c81eba522a26c83cbe6b 100644
--- a/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
+++ b/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
@@ -18,7 +18,7 @@
  */
 package quests.Q10504_JewelOfAntharas;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -61,7 +61,7 @@ public final class Q10504_JewelOfAntharas extends Quest
 		{
 			takeItems(player, CLEAR_CRYSTAL, -1);
 			giveItems(player, FILLED_CRYSTAL_ANTHARAS_ENERGY, 1);
-			playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 			st.setCond(2, true);
 		}
 	}
@@ -148,7 +148,7 @@ public final class Q10504_JewelOfAntharas extends Quest
 					case 2:
 					{
 						giveItems(player, JEWEL_OF_ANTHARAS, 1);
-						playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 						st.exitQuest(false, true);
 						htmltext = "30755-10.html";
 						break;
diff --git a/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index 6da357c4e0d162b292771283f81cf1b2bed3b52d..af547b774e83553251fd79f5c1eee2f2559f501b 100644
--- a/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -18,7 +18,7 @@
  */
 package quests.Q10505_JewelOfValakas;
 
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.audio.Sound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -61,7 +61,7 @@ public class Q10505_JewelOfValakas extends Quest
 		{
 			takeItems(player, EMPTY_CRYSTAL, -1);
 			giveItems(player, FILLED_CRYSTAL_VALAKAS_ENERGY, 1);
-			playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 			st.setCond(2, true);
 		}
 	}
@@ -148,7 +148,7 @@ public class Q10505_JewelOfValakas extends Quest
 					case 2:
 					{
 						giveItems(player, JEWEL_OF_VALAKAS, 1);
-						playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
 						st.exitQuest(false, true);
 						htmltext = "31540-10.html";
 						break;