From 109b0afdea34874fb0ba0d7534799d0a9df83f7f Mon Sep 17 00:00:00 2001
From: HappyPikachu <dbaez4465@yahoo.com>
Date: Tue, 30 Jan 2018 21:11:14 -0500
Subject: [PATCH] (UNSTABLE) Lang corrections, reduce duplicate strings - part
 1

---
 .../me/blackvein/quests/EventFactory.java     |  41 +--
 .../me/blackvein/quests/QuestFactory.java     |  20 +-
 src/main/java/me/blackvein/quests/Quests.java |   2 +-
 .../quests/prompts/CreateStagePrompt.java     |  90 +++---
 .../quests/prompts/ItemStackPrompt.java       |  12 +-
 .../quests/prompts/RequirementsPrompt.java    |  22 +-
 .../quests/prompts/RewardsPrompt.java         |  16 +-
 .../java/me/blackvein/quests/util/Lang.java   |   2 +
 src/main/resources/plugin.yml                 |   2 +-
 src/main/resources/strings.yml                | 287 +++++++++---------
 10 files changed, 247 insertions(+), 247 deletions(-)

diff --git a/src/main/java/me/blackvein/quests/EventFactory.java b/src/main/java/me/blackvein/quests/EventFactory.java
index 84b5adeae..b0857368d 100644
--- a/src/main/java/me/blackvein/quests/EventFactory.java
+++ b/src/main/java/me/blackvein/quests/EventFactory.java
@@ -282,7 +282,7 @@ public class EventFactory implements ConversationAbandonedListener {
 				text += ChatColor.AQUA + evt.name + ChatColor.YELLOW + ", ";
 			}
 			text = text.substring(0, text.length() - 2) + "\n";
-			text += ChatColor.YELLOW + Lang.get("eventEditorEnterEventName");
+			text += ChatColor.YELLOW + Lang.get("eventEditorEnterEventName") + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -314,7 +314,7 @@ public class EventFactory implements ConversationAbandonedListener {
 				text += ChatColor.AQUA + evt.name + ChatColor.YELLOW + ",";
 			}
 			text = text.substring(0, text.length() - 1) + "\n";
-			text += ChatColor.YELLOW + Lang.get("eventEditorEnterEventName");
+			text += ChatColor.YELLOW + Lang.get("eventEditorEnterEventName") + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -904,7 +904,8 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			String text = ChatColor.AQUA + Lang.get("eventEditorCreate") + ChatColor.GOLD + " - " + Lang.get("eventEditorEnterEventName");
+			String text = ChatColor.AQUA + Lang.get("eventEditorCreate") + ChatColor.GOLD + " - " 
+					+ Lang.get("eventEditorEnterEventName") + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -959,7 +960,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorExplosionPrompt");
+			return ChatColor.YELLOW + Lang.get("eventEditorExplosionPrompt") + Lang.orCancelToReturn;
 		}
 
 		@SuppressWarnings("unchecked")
@@ -1001,7 +1002,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorEnterEventName");
+			return ChatColor.YELLOW + Lang.get("eventEditorEnterEventName") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1033,7 +1034,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetMessagePrompt");
+			return ChatColor.YELLOW + Lang.get("eventEditorSetMessagePrompt") + "(" + Lang.orCancelToReturn + ")";
 		}
 
 		@Override
@@ -1193,7 +1194,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorEffectLocationPrompt");
+			return ChatColor.YELLOW + Lang.get("eventEditorEffectLocationPrompt") + Lang.orCancelToReturn;
 		}
 
 		@SuppressWarnings("unchecked")
@@ -1242,7 +1243,7 @@ public class EventFactory implements ConversationAbandonedListener {
 			effects += ChatColor.DARK_PURPLE + "GHAST_SHRIEK " + ChatColor.GRAY + "- " + Lang.get("effGhastShriek") + "\n";
 			effects += ChatColor.DARK_PURPLE + "ZOMBIE_CHEW_IRON_DOOR " + ChatColor.GRAY + "- " + Lang.get("effZombieWood") + "\n";
 			effects += ChatColor.DARK_PURPLE + "ZOMBIE_CHEW_WOODEN_DOOR " + ChatColor.GRAY + "- " + Lang.get("effZombieIron") + "\n";
-			return ChatColor.YELLOW + effects + Lang.get("effEnterName");
+			return ChatColor.YELLOW + effects + Lang.get("effEnterName") + Lang.orCancelToReturn;
 		}
 
 		@SuppressWarnings("unchecked")
@@ -1337,7 +1338,7 @@ public class EventFactory implements ConversationAbandonedListener {
 				effects += w.getName() + ", ";
 			}
 			effects = effects.substring(0, effects.length());
-			return ChatColor.YELLOW + effects + Lang.get("eventEditorEnterStormWorld");
+			return ChatColor.YELLOW + effects + Lang.get("eventEditorEnterStormWorld") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1438,7 +1439,7 @@ public class EventFactory implements ConversationAbandonedListener {
 				effects += w.getName() + ", ";
 			}
 			effects = effects.substring(0, effects.length());
-			return ChatColor.YELLOW + effects + Lang.get("eventEditorEnterThunderWorld");
+			return ChatColor.YELLOW + effects + Lang.get("eventEditorEnterThunderWorld") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1665,7 +1666,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			String text = ChatColor.YELLOW + Lang.get("eventEditorSetMobNamePrompt");
+			String text = ChatColor.YELLOW + Lang.get("eventEditorSetMobNamePrompt") + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -1709,7 +1710,7 @@ public class EventFactory implements ConversationAbandonedListener {
 					mobs += MiscUtil.getProperMobName(mobArr[i]) + "\n";
 				}
 			}
-			return mobs + ChatColor.YELLOW + Lang.get("eventEditorSetMobTypesPrompt");
+			return mobs + ChatColor.YELLOW + Lang.get("eventEditorSetMobTypesPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1739,7 +1740,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetMobAmountsPrompt");
+			return ChatColor.YELLOW + Lang.get("eventEditorSetMobAmountsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1775,7 +1776,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetMobLocationPrompt");
+			return ChatColor.YELLOW + Lang.get("eventEditorSetMobLocationPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1844,7 +1845,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorLightningPrompt");
+			return ChatColor.YELLOW + Lang.get("eventEditorLightningPrompt") + Lang.orCancelToReturn;
 		}
 
 		@SuppressWarnings("unchecked")
@@ -1992,7 +1993,7 @@ public class EventFactory implements ConversationAbandonedListener {
 			for (PotionEffectType pet : PotionEffectType.values()) {
 				effs += (pet != null && pet.getName() != null) ? (ChatColor.DARK_PURPLE + pet.getName() + "\n") : "";
 			}
-			return effs + ChatColor.YELLOW + Lang.get("eventEditorSetPotionEffectsPrompt");
+			return effs + ChatColor.YELLOW + Lang.get("eventEditorSetPotionEffectsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2018,7 +2019,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetPotionDurationsPrompt");
+			return ChatColor.YELLOW + Lang.get("eventEditorSetPotionDurationsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2050,7 +2051,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetPotionMagnitudesPrompt");
+			return ChatColor.YELLOW + Lang.get("eventEditorSetPotionMagnitudesPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2150,7 +2151,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetTeleportPrompt");
+			return ChatColor.YELLOW + Lang.get("eventEditorSetTeleportPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2185,7 +2186,7 @@ public class EventFactory implements ConversationAbandonedListener {
 		@Override
 		public String getPromptText(ConversationContext context) {
 			String text = ChatColor.GOLD + "" + ChatColor.ITALIC + Lang.get("eventEditorCommandsNote");
-			return ChatColor.YELLOW + Lang.get("eventEditorSetCommandsPrompt") + "\n" + text;
+			return ChatColor.YELLOW + Lang.get("eventEditorSetCommandsPrompt") + Lang.orCancelToReturn + "\n" + text;
 		}
 
 		@Override
diff --git a/src/main/java/me/blackvein/quests/QuestFactory.java b/src/main/java/me/blackvein/quests/QuestFactory.java
index 00d93e4a8..66da71eb8 100644
--- a/src/main/java/me/blackvein/quests/QuestFactory.java
+++ b/src/main/java/me/blackvein/quests/QuestFactory.java
@@ -351,7 +351,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 			for (Quest q : quests.getQuests()) {
 				s += ChatColor.GRAY + "- " + ChatColor.YELLOW + q.getName() + "\n";
 			}
-			return s + ChatColor.GOLD + Lang.get("questEditorEditEnterQuestName");
+			return s + ChatColor.GOLD + Lang.get("questEditorEditEnterQuestName") + " (" + Lang.orCancelToReturn + ")";
 		}
 
 		@Override
@@ -387,7 +387,8 @@ public class QuestFactory implements ConversationAbandonedListener {
 		@Override
 		public String getPromptText(ConversationContext context) {
 			String text = ChatColor.GOLD + Lang.get("questCreateTitle") + "\n";
-			text += ChatColor.AQUA + Lang.get("questEditorCreate") + " " + ChatColor.GOLD + "- " + Lang.get("questEditorEnterQuestName");
+			text += ChatColor.AQUA + Lang.get("questEditorCreate") + " " + ChatColor.GOLD + "- " 
+					+ Lang.get("questEditorEnterQuestName") + " (" + Lang.orCancelToReturn + ")";
 			return text;
 		}
 
@@ -453,7 +454,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("questEditorEnterBlockStart");
+			return ChatColor.YELLOW + Lang.get("questEditorEnterBlockStart") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -487,7 +488,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("questEditorEnterQuestName");
+			return ChatColor.YELLOW + Lang.get("questEditorEnterQuestName") + " (" + Lang.orCancelToReturn + ")";
 		}
 
 		@Override
@@ -525,7 +526,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("questEditorEnterAskMessage");
+			return ChatColor.YELLOW + Lang.get("questEditorEnterAskMessage") + " (" + Lang.orCancelToReturn + ")";
 		}
 
 		@Override
@@ -547,7 +548,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("questEditorEnterFinishMessage");
+			return ChatColor.YELLOW + Lang.get("questEditorEnterFinishMessage") + " (" + Lang.orCancelToReturn + ")";
 		}
 
 		@Override
@@ -577,7 +578,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("questEditorEnterInitialEvent");
+			return text + ChatColor.YELLOW + Lang.get("questEditorEnterInitialEvent" + Lang.orCancelToReturn);
 		}
 
 		@Override
@@ -681,7 +682,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 			} else {
 				text += ChatColor.GRAY + "(" + Lang.get("none") + ")\n\n";
 			}
-			return text + ChatColor.YELLOW + Lang.get("questWGPrompt");
+			return text + ChatColor.YELLOW + Lang.get("questWGPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -800,7 +801,8 @@ public class QuestFactory implements ConversationAbandonedListener {
 						}
 						quests.updateData();
 					}
-					context.getForWhom().sendRawMessage(ChatColor.BOLD + Lang.get("questEditorSaved"));
+					context.getForWhom().sendRawMessage(ChatColor.GREEN
+							+ Lang.get("questEditorSaved").replaceAll("<command>", "/questadmin " + Lang.get("COMMAND_QUESTADMIN_RELOAD")));
 				} catch (IOException e) {
 					e.printStackTrace();
 				} catch (InvalidConfigurationException e) {
diff --git a/src/main/java/me/blackvein/quests/Quests.java b/src/main/java/me/blackvein/quests/Quests.java
index 20a63c6b2..3b16ed0ef 100644
--- a/src/main/java/me/blackvein/quests/Quests.java
+++ b/src/main/java/me/blackvein/quests/Quests.java
@@ -1956,7 +1956,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
         if ((quests.size() + rows) < ((page * rows)) || quests.size() == 0) {
             player.sendMessage(ChatColor.YELLOW + Lang.get("pageNotExist"));
         } else {
-            player.sendMessage(ChatColor.GOLD + Lang.get("questsTitle"));
+            player.sendMessage(ChatColor.GOLD + Lang.get("questListTitle"));
             int fromOrder = (page - 1) * rows;
  
             List<Quest> subQuests;
diff --git a/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java b/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java
index 6bce1a31c..cc35801da 100644
--- a/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java
+++ b/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java
@@ -289,9 +289,9 @@ public class CreateStagePrompt extends FixedSetPrompt {
 				text += ChatColor.LIGHT_PURPLE + "" + ChatColor.BOLD + "23 " + ChatColor.RESET + ChatColor.DARK_PURPLE + "- " + Lang.get("stageEditorCompleteMessage") + ChatColor.GRAY + "(" + ChatColor.AQUA + "\"" + context.getSessionData(pref + CK.S_COMPLETE_MESSAGE) + "\"" + ChatColor.GRAY + ")\n";
 			}
 			if (context.getSessionData(pref + CK.S_OVERRIDE_DISPLAY) == null) {
-				text += ChatColor.LIGHT_PURPLE + "" + ChatColor.BOLD + "24 " + ChatColor.RESET + ChatColor.DARK_PURPLE + "- " + Lang.get("stageObjectiveOverride") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n";
+				text += ChatColor.LIGHT_PURPLE + "" + ChatColor.BOLD + "24 " + ChatColor.RESET + ChatColor.DARK_PURPLE + "- " + Lang.get("stageEditorObjectiveOverride") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n";
 			} else {
-				text += ChatColor.LIGHT_PURPLE + "" + ChatColor.BOLD + "24 " + ChatColor.RESET + ChatColor.DARK_PURPLE + "- " + Lang.get("stageObjectiveOverride") + ChatColor.GRAY + "(" + ChatColor.DARK_AQUA + "\"" + context.getSessionData(pref + CK.S_OVERRIDE_DISPLAY) + "\"" + ChatColor.GRAY + ")\n";
+				text += ChatColor.LIGHT_PURPLE + "" + ChatColor.BOLD + "24 " + ChatColor.RESET + ChatColor.DARK_PURPLE + "- " + Lang.get("stageEditorObjectiveOverride") + ChatColor.GRAY + "(" + ChatColor.DARK_AQUA + "\"" + context.getSessionData(pref + CK.S_OVERRIDE_DISPLAY) + "\"" + ChatColor.GRAY + ")\n";
 			}
 			text += ChatColor.RED + "" + ChatColor.BOLD + "25 " + ChatColor.RESET + ChatColor.DARK_PURPLE + "- " + Lang.get("stageEditorDelete") + "\n";
 			text += ChatColor.GREEN + "" + ChatColor.BOLD + "26 " + ChatColor.RESET + ChatColor.DARK_PURPLE + "- " + Lang.get("done") + "\n";
@@ -481,7 +481,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			String text = ChatColor.YELLOW + Lang.get("stageEditorPasswordDisplayPrompt") + "\n";
+			String text = ChatColor.YELLOW + Lang.get("stageEditorPasswordDisplayPrompt") + Lang.orCancelToReturn + "\n";
 			text += ChatColor.ITALIC + "" + ChatColor.GOLD + Lang.get("stageEditorPasswordDisplayHint");
 			return text;
 		}
@@ -508,7 +508,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			String text = ChatColor.YELLOW + Lang.get("stageEditorPasswordPhrasePrompt") + "\n";
+			String text = ChatColor.YELLOW + Lang.get("stageEditorPasswordPhrasePrompt") + Lang.orCancelToReturn + "\n";
 			text += ChatColor.ITALIC + "" + ChatColor.GOLD + Lang.get("stageEditorPasswordPhraseHint1") + "\n";
 			text += ChatColor.RESET + "" + ChatColor.YELLOW + Lang.get("stageEditorPasswordPhraseHint2");
 			return text;
@@ -540,7 +540,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			String text = ChatColor.YELLOW + Lang.get("stageEditorObjectiveOverridePrompt") + "\n";
+			String text = ChatColor.YELLOW + Lang.get("stageEditorObjectiveOverridePrompt") + Lang.orCancelToReturn + "\n";
 			text += ChatColor.ITALIC + "" + ChatColor.GOLD + Lang.get("stageEditorObjectiveOverrideHint");
 			return text;
 		}
@@ -680,7 +680,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockNames");
+			return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockNames") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -716,7 +716,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorBreakBlocksPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorBreakBlocksPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -747,7 +747,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockDurability");
+			return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockDurability") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -933,7 +933,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorDamageBlocksPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorDamageBlocksPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1150,7 +1150,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorPlaceBlocksPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorPlaceBlocksPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1367,7 +1367,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorUseBlocksPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorUseBlocksPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1584,7 +1584,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorCutBlocksPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorCutBlocksPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1809,7 +1809,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 				text += ChatColor.GREEN + Quester.prettyEnchantmentString(e) + ", ";
 			}
 			text = text.substring(0, text.length() - 1);
-			return text + "\n" + ChatColor.YELLOW + Lang.get("stageEditorEnchantTypePrompt");
+			return text + "\n" + ChatColor.YELLOW + Lang.get("stageEditorEnchantTypePrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1848,7 +1848,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorItemNamesPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorItemNamesPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -1884,7 +1884,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorEnchantAmountsPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorEnchantAmountsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2042,7 +2042,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 		@Override
 		public String getPromptText(ConversationContext context) {
 			questFactory.selectingNPCs.add((Player) context.getForWhom());
-			return ChatColor.YELLOW + Lang.get("stageEditorNPCPrompt") + "\n" + ChatColor.GOLD + Lang.get("npcHint");
+			return ChatColor.YELLOW + Lang.get("stageEditorNPCPrompt") + Lang.orCancelToReturn + "\n" + ChatColor.GOLD + Lang.get("npcHint");
 		}
 
 		@Override
@@ -2076,7 +2076,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 		@Override
 		public String getPromptText(ConversationContext context) {
 			String note = ChatColor.GOLD + Lang.get("stageEditorNPCNote");
-			return ChatColor.YELLOW + Lang.get("stageEditorDeliveryMessagesPrompt") + "\n" + note;
+			return ChatColor.YELLOW + Lang.get("stageEditorDeliveryMessagesPrompt") + Lang.orCancelToReturn + "\n" + note;
 		}
 
 		@Override
@@ -2096,7 +2096,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 		@Override
 		public String getPromptText(ConversationContext context) {
 			questFactory.selectingNPCs.add((Player) context.getForWhom());
-			return ChatColor.YELLOW + Lang.get("stageEditorNPCToTalkToPrompt") + "\n" + ChatColor.GOLD + Lang.get("npcHint");
+			return ChatColor.YELLOW + Lang.get("stageEditorNPCToTalkToPrompt") + Lang.orCancelToReturn + "\n" + ChatColor.GOLD + Lang.get("npcHint");
 		}
 
 		@Override
@@ -2216,7 +2216,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 		@Override
 		public String getPromptText(ConversationContext context) {
 			questFactory.selectingNPCs.add((Player) context.getForWhom());
-			return ChatColor.YELLOW + Lang.get("stageEditorNPCPrompt") + "\n" + ChatColor.GOLD + Lang.get("npcHint");
+			return ChatColor.YELLOW + Lang.get("stageEditorNPCPrompt") + Lang.orCancelToReturn + "\n" + ChatColor.GOLD + Lang.get("npcHint");
 		}
 
 		@Override
@@ -2249,7 +2249,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorKillNPCsPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorKillNPCsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2479,7 +2479,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					mobs += MiscUtil.getProperMobName(mobArr.get(i)) + "\n";
 				}
 			}
-			return mobs + ChatColor.YELLOW + Lang.get("stageEditorMobsPrompt");
+			return mobs + ChatColor.YELLOW + Lang.get("stageEditorMobsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2505,7 +2505,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorMobAmountsPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorMobAmountsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2536,7 +2536,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationPrompt") + Lang.orCancelToReturn;
 		}
 
 		@SuppressWarnings("unchecked")
@@ -2574,7 +2574,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationRadiiPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationRadiiPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2605,7 +2605,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationNamesPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationNamesPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2737,7 +2737,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationPrompt") + Lang.orCancelToReturn;
 		}
 
 		@SuppressWarnings("unchecked")
@@ -2775,7 +2775,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationRadiiPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationRadiiPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2806,7 +2806,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationNamesPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationNamesPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -2947,7 +2947,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorTameAmountsPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorTameAmountsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3071,7 +3071,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					cols += Quests.getDyeString(colArr[i]) + "\n";
 				}
 			}
-			return cols + ChatColor.YELLOW + Lang.get("stageEditorShearColorsPrompt");
+			return cols + ChatColor.YELLOW + Lang.get("stageEditorShearColorsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3097,7 +3097,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorShearAmountsPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorShearAmountsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3212,7 +3212,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt");
+			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3257,7 +3257,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt");
+			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3302,7 +3302,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt");
+			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3347,7 +3347,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt");
+			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3392,7 +3392,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorChatEventsPrompt");
+			return text + ChatColor.YELLOW + Lang.get("stageEditorChatEventsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3432,7 +3432,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 		public String getPromptText(ConversationContext context) {
 			String tempEvent = (String) context.getSessionData(pref + CK.S_CHAT_TEMP_EVENT);
 			String text = ChatColor.GOLD + "- " + Lang.get("stageEditorChatTrigger") + " -\n";
-			text += ChatColor.YELLOW + Lang.get("stageEditorChatEventsTriggerPromptA") + " " + ChatColor.AQUA + tempEvent + " " + ChatColor.YELLOW + Lang.get("stageEditorChatEventsTriggerPromptB");
+			text += ChatColor.YELLOW + Lang.get("stageEditorChatEventsTriggerPrompt") + " " + ChatColor.AQUA + tempEvent + " " + ChatColor.YELLOW + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -3479,7 +3479,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorCommandEventsPrompt");
+			return text + ChatColor.YELLOW + Lang.get("stageEditorCommandEventsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3519,7 +3519,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 		public String getPromptText(ConversationContext context) {
 			String tempEvent = (String) context.getSessionData(pref + CK.S_COMMAND_TEMP_EVENT);
 			String text = ChatColor.GOLD + "- " + Lang.get("stageEditorCommandTrigger") + " -\n";
-			text += ChatColor.YELLOW + Lang.get("stageEditorCommandEventsTriggerPromptA") + " " + ChatColor.AQUA + tempEvent + " " + ChatColor.YELLOW + Lang.get("stageEditorCommandEventsTriggerPromptB");
+			text += ChatColor.YELLOW + Lang.get("stageEditorCommandEventsTriggerPrompt") + " " + ChatColor.AQUA + tempEvent + " " + ChatColor.YELLOW + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -3558,7 +3558,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorDelayPrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorDelayPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3624,7 +3624,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 			for (String s : ScriptRegistry._getScriptNames()) {
 				text += ChatColor.AQUA + "- " + s + "\n";
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorScriptPrompt");
+			return text + ChatColor.YELLOW + Lang.get("stageEditorScriptPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3677,7 +3677,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorStartMessagePrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorStartMessagePrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3700,7 +3700,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorCompleteMessagePrompt");
+			return ChatColor.YELLOW + Lang.get("stageEditorCompleteMessagePrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -3725,13 +3725,13 @@ public class CreateStagePrompt extends FixedSetPrompt {
 		public String getPromptText(ConversationContext context) {
 			String text = ChatColor.LIGHT_PURPLE + "- " + Lang.get("stageEditorCustom") + " -\n";
 			if (questFactory.quests.customObjectives.isEmpty()) {
-				text += ChatColor.BOLD + "" + ChatColor.DARK_PURPLE + "(" + Lang.get("stageEditorNoModules") + ")";
+				text += ChatColor.BOLD + "" + ChatColor.DARK_PURPLE + "(" + Lang.get("stageEditorNoModules") + ") ";
 			} else {
 				for (CustomObjective co : questFactory.quests.customObjectives) {
 					text += ChatColor.DARK_PURPLE + " - " + co.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorCustomPrompt");
+			return text + ChatColor.YELLOW + Lang.get("stageEditorCustomPrompt") + Lang.orCancelToReturn;
 		}
 
 		@SuppressWarnings("unchecked")
diff --git a/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java b/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java
index 57d57f663..4cf8ef7f5 100644
--- a/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java
+++ b/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java
@@ -217,7 +217,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext cc) {
-			return ChatColor.YELLOW + Lang.get("itemCreateEnterName");
+			return ChatColor.YELLOW + Lang.get("itemCreateEnterName") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -259,7 +259,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext cc) {
-			return ChatColor.YELLOW + Lang.get("itemCreateEnterAmount");
+			return ChatColor.YELLOW + Lang.get("itemCreateEnterAmount") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -288,7 +288,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext cc) {
-			return ChatColor.YELLOW + Lang.get("itemCreateEnterDurab");
+			return ChatColor.YELLOW + Lang.get("itemCreateEnterDurab") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -323,7 +323,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
 				text += ChatColor.GREEN + Quester.prettyEnchantmentString(e) + ", ";
 			}
 			text = text.substring(0, text.length() - 2);
-			return text + "\n" + ChatColor.YELLOW + Lang.get("itemCreateEnterEnch");
+			return text + "\n" + ChatColor.YELLOW + Lang.get("itemCreateEnterEnch") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -390,7 +390,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext cc) {
-			return ChatColor.YELLOW + Lang.get("itemCreateEnterName");
+			return ChatColor.YELLOW + Lang.get("itemCreateEnterDisplay") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -409,7 +409,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext cc) {
-			return ChatColor.YELLOW + Lang.get("itemCreateEnterLore");
+			return ChatColor.YELLOW + Lang.get("itemCreateEnterLore") + Lang.orCancelToReturn;
 		}
 
 		@Override
diff --git a/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java b/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java
index e86599baa..698163fc7 100644
--- a/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java
+++ b/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java
@@ -249,7 +249,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			String text = ChatColor.LIGHT_PURPLE + Lang.get("questListTitle") + "\n" + ChatColor.DARK_PURPLE;
+			String text = ChatColor.LIGHT_PURPLE + Lang.get("reqQuestListTitle") + "\n" + ChatColor.DARK_PURPLE;
 			boolean none = true;
 			for (Quest q : quests.getQuests()) {
 				text += q.getName() + ", ";
@@ -261,7 +261,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 				text = text.substring(0, (text.length() - 2));
 				text += "\n";
 			}
-			String lang = Lang.get("reqQuestPrompt");
+			String lang = Lang.get("reqQuestPrompt") + Lang.orCancelToReturn;
 			lang = lang.replaceAll("<comma>", ChatColor.RED + "" + ChatColor.BOLD + Lang.get("comma") + ChatColor.RESET + ChatColor.YELLOW);
 			text += ChatColor.YELLOW + lang;
 			return text;
@@ -410,7 +410,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("reqRemoveItemsPrompt");
+			return ChatColor.YELLOW + Lang.get("reqRemoveItemsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -440,7 +440,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("reqPermissionsPrompt");
+			return ChatColor.YELLOW + Lang.get("reqPermissionsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -463,13 +463,13 @@ public class RequirementsPrompt extends FixedSetPrompt {
 		public String getPromptText(ConversationContext context) {
 			String text = ChatColor.LIGHT_PURPLE + Lang.get("customRequirementsTitle") + "\n";
 			if (quests.customRequirements.isEmpty()) {
-				text += ChatColor.BOLD + "" + ChatColor.DARK_PURPLE + "(" + Lang.get("stageEditorNoModules") + ")";
+				text += ChatColor.BOLD + "" + ChatColor.DARK_PURPLE + "(" + Lang.get("stageEditorNoModules") + ") ";
 			} else {
 				for (CustomRequirement cr : quests.customRequirements) {
 					text += ChatColor.DARK_PURPLE + " - " + cr.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("reqCustomPrompt");
+			return text + ChatColor.YELLOW + Lang.get("reqCustomPrompt") + Lang.orCancelToReturn;
 		}
 
 		@SuppressWarnings("unchecked")
@@ -683,7 +683,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 					skillList += ChatColor.GREEN + skills[i].getName() + "\n\n";
 				}
 			}
-			return skillList + ChatColor.YELLOW + Lang.get("reqMcMMOPrompt");
+			return skillList + ChatColor.YELLOW + Lang.get("reqMcMMOPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -721,7 +721,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("reqMcMMOAmountsPrompt");
+			return ChatColor.YELLOW + Lang.get("reqMcMMOAmountsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -807,7 +807,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 					text += ChatColor.DARK_PURPLE + "- " + ChatColor.LIGHT_PURPLE + s + "\n";
 				}
 			}
-			text += ChatColor.YELLOW + Lang.get("reqHeroesPrimaryPrompt");
+			text += ChatColor.YELLOW + Lang.get("reqHeroesPrimaryPrompt") + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -858,7 +858,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 					text += ChatColor.DARK_PURPLE + "- " + ChatColor.LIGHT_PURPLE + s + "\n";
 				}
 			}
-			text += ChatColor.YELLOW + Lang.get("reqHeroesSecondaryPrompt");
+			text += ChatColor.YELLOW + Lang.get("reqHeroesSecondaryPrompt") + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -894,7 +894,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("reqFailMessagePrompt");
+			return ChatColor.YELLOW + Lang.get("reqFailMessagePrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
diff --git a/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java b/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java
index 8eb65dae8..598b27144 100644
--- a/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java
+++ b/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java
@@ -319,7 +319,7 @@ public class RewardsPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			String lang1 = Lang.get("rewCommandPrompt");
+			String lang1 = Lang.get("rewCommandPrompt") + Lang.orCancelToReturn;
 			lang1 = lang1.replaceAll("<comma>", ChatColor.BOLD + "" + ChatColor.RED + "comma" + ChatColor.RESET + ChatColor.YELLOW);
 			String lang2 = Lang.get("rewCommandPromptHint");
 			return ChatColor.YELLOW + lang1 + "\n" + lang2;
@@ -348,7 +348,7 @@ public class RewardsPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("rewPermissionsPrompt");
+			return ChatColor.YELLOW + Lang.get("rewPermissionsPrompt") + Lang.orCancelToReturn;
 		}
 
 		@Override
@@ -463,7 +463,7 @@ public class RewardsPrompt extends FixedSetPrompt {
 					skillList += ChatColor.GREEN + skills[i].getName() + "\n\n";
 				}
 			}
-			return skillList + Lang.get("rewMcMMOPrompt") + "\n" + ChatColor.GOLD + Lang.get("rewMcMMOPromptHint");
+			return skillList + Lang.get("rewMcMMOPrompt") + Lang.orCancelToReturn + "\n" + ChatColor.GOLD + Lang.get("rewMcMMOPromptHint");
 		}
 
 		@Override
@@ -622,7 +622,7 @@ public class RewardsPrompt extends FixedSetPrompt {
 				}
 				text = text.substring(0, text.length() - 2) + "\n";
 			}
-			text += ChatColor.YELLOW + Lang.get("rewHeroesClassesPrompt");
+			text += ChatColor.YELLOW + Lang.get("rewHeroesClassesPrompt") + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -655,7 +655,7 @@ public class RewardsPrompt extends FixedSetPrompt {
 		@Override
 		public String getPromptText(ConversationContext cc) {
 			String text = Lang.get("heroesExperienceTitle") + "\n";
-			text += ChatColor.YELLOW + Lang.get("rewHeroesExperiencePrompt");
+			text += ChatColor.YELLOW + Lang.get("rewHeroesExperiencePrompt") + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -691,7 +691,7 @@ public class RewardsPrompt extends FixedSetPrompt {
 			for (PhatLoot pl : PhatLootsAPI.getAllPhatLoots()) {
 				text += ChatColor.GRAY + "- " + ChatColor.BLUE + pl.name + "\n";
 			}
-			text += ChatColor.YELLOW + Lang.get("rewPhatLootsPrompt");
+			text += ChatColor.YELLOW + Lang.get("rewPhatLootsPrompt") + Lang.orCancelToReturn;
 			return text;
 		}
 
@@ -727,13 +727,13 @@ public class RewardsPrompt extends FixedSetPrompt {
 		public String getPromptText(ConversationContext context) {
 			String text = ChatColor.LIGHT_PURPLE + Lang.get("customRewardsTitle") + "\n";
 			if (quests.customRewards.isEmpty()) {
-				text += ChatColor.BOLD + "" + ChatColor.DARK_PURPLE + "(" + Lang.get("stageEditorNoModules") + ")";
+				text += ChatColor.BOLD + "" + ChatColor.DARK_PURPLE + "(" + Lang.get("stageEditorNoModules") + ") ";
 			} else {
 				for (CustomReward cr : quests.customRewards) {
 					text += ChatColor.DARK_PURPLE + " - " + cr.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("rewCustomRewardPrompt");
+			return text + ChatColor.YELLOW + Lang.get("rewCustomRewardPrompt") + Lang.orCancelToReturn;
 		}
 
 		@SuppressWarnings("unchecked")
diff --git a/src/main/java/me/blackvein/quests/util/Lang.java b/src/main/java/me/blackvein/quests/util/Lang.java
index 8951fe246..2dca25f3e 100644
--- a/src/main/java/me/blackvein/quests/util/Lang.java
+++ b/src/main/java/me/blackvein/quests/util/Lang.java
@@ -35,6 +35,7 @@ public class Lang {
 	private static final LangToken tokens = new LangToken();
 	public static final LinkedHashMap<String, String> langMap = new LinkedHashMap<String, String>();
 	private final Quests plugin;
+	public static String orCancelToReturn = "or 'cancel' to return";
 
 	public Lang(Quests plugin) {
 		tokens.initTokens();
@@ -116,6 +117,7 @@ public class Lang {
 			}
 			langMap.putAll(allStrings);
 		}
+		orCancelToReturn = get("strCancel").replaceAll("<cancel>", get("cmdCancel"));
 		plugin.getLogger().info("Loaded language " + iso + ". Translations via Crowdin");
 	}
 	
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 623de79d6..a5c81bff4 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: Quests
 main: me.blackvein.quests.Quests
-version: ${project.version}-b${env.BUILD_NUMBER}
+version: ${project.version}-b${env.BUILD_NUMBER}-UNSTABLE
 description: Player questing system
 website: http://dev.bukkit.org/server-mods/quests/
 dev-url: https://github.com/Blackvein/Quests/
diff --git a/src/main/resources/strings.yml b/src/main/resources/strings.yml
index 182f85404..bc6267d75 100644
--- a/src/main/resources/strings.yml
+++ b/src/main/resources/strings.yml
@@ -1,13 +1,3 @@
----
-questFailed: "*QUEST FAILED*"
-questMaxAllowed: "You may only have up to <number> Quests."
-questAlreadyOn: "You are already on that Quest!"
-questTooEarly: "You may not take <quest> again for another <time>."
-questAlreadyCompleted: "You have already completed <quest>."
-questInvalidLocation: "You may not take <quest> at this location."
-questInvalidDeliveryItem: "<item> is not a required item for this quest!"
-questSelectedLocation: "Selected location"
-questDisplayHelp: "- Display this help"
 COMMAND_LIST: "list"
 COMMAND_LIST_HELP: "list [page] - List available Quests"
 COMMAND_TAKE: "take"
@@ -77,23 +67,23 @@ questEditorSetGUI: "Set GUI Item display"
 questEditorReqs: "Edit Requirements"
 questEditorStages: "Edit Stages"
 questEditorRews: "Edit Rewards"
-questEditorEnterQuestName: "Enter Quest name (or 'cancel' to return)"
-questEditorEditEnterQuestName: "Enter Quest name to edit (or 'cancel' to return)"
-questEditorEnterAskMessage: "Enter ask message (or 'cancel' to return)"
-questEditorEnterFinishMessage: "Enter finish message (or 'cancel' to return)"
+questEditorEnterQuestName: "Enter Quest name"
+questEditorEditEnterQuestName: "Enter Quest name to edit"
+questEditorEnterAskMessage: "Enter ask message"
+questEditorEnterFinishMessage: "Enter finish message"
 questEditorEnterRedoDelay: "Enter amount of time (in seconds), 0 to clear the redo delay or -1 to cancel"
 questEditorEnterNPCStart: "Enter NPC ID, -1 to clear the NPC start or -2 to cancel"
-questEditorEnterBlockStart: "Right-click on a block to use as a start point, then enter 'done' to save, or enter 'clear' to clear the block start, or 'cancel' to return"
-questEditorEnterInitialEvent: "Enter an Event name, or enter 'clear' to clear the initial Event, or 'cancel' to return"
+questEditorEnterBlockStart: "Right-click on a block to use as a start point, then enter 'done' to save, or enter 'clear' to clear the block start, "
+questEditorEnterInitialEvent: "Enter an Event name, or enter 'clear' to clear the initial Event, "
 questRequiredNoneSet: "Required, none set"
 questWGSetRegion: "Set Region"
 questWGNotInstalled: "WorldGuard not installed"
-questWGPrompt: "Enter WorldGuard region, or enter 'clear' to clear the region, or 'cancel' to return."
+questWGPrompt: "Enter WorldGuard region, or enter 'clear' to clear the region, "
 questWGInvalidRegion: "<region> is not a valid WorldGuard region!"
 questWGRegionCleared: "Quest region cleared."
 questCitNotInstalled: "Citizens not installed"
 questDenNotInstalled: "Denizen not installed"
-questGUIError: 'Error: That item is already being used as the GUI Display for the Quest <quest>.'
+questGUIError: "Error: That item is already being used as the GUI Display for the Quest <quest>."
 questCurrentItem: "Current item:"
 questSetItem: "Set Item"
 questClearItem: "Clear Item"
@@ -115,7 +105,7 @@ questEditorSave: "Finish and save"
 questEditorNeedAskMessage: "You must set an ask message!"
 questEditorNeedFinishMessage: "You must set a finish message!"
 questEditorNeedStages: "Your Quest has no Stages!"
-questEditorSaved: "Quest saved! (You will need to perform a Quest reload for it to appear)"
+questEditorSaved: "%bold%Quest saved! %reset%(You will need to perform %red%<command> %reset%for it to appear)"
 questEditorExited: "Are you sure you want to exit without saving?"
 questEditorDeleted: "Are you sure you want to delete the Quest"
 questEditorNoPermsCreate: "You do not have permission to create Quests."
@@ -125,24 +115,24 @@ stageEditorEditStage: "Edit Stage"
 stageEditorNewStage: "Add new Stage"
 stageEditorStages: "Stages"
 stageEditorStage: "Stage"
-stageEditorBreakBlocks: "Break Blocks"
-stageEditorDamageBlocks: "Damage Blocks"
-stageEditorPlaceBlocks: "Place Blocks"
-stageEditorUseBlocks: "Use Blocks"
-stageEditorCutBlocks: "Cut Blocks"
-stageEditorCatchFish: "Catch Fish"
+stageEditorBreakBlocks: "Break blocks"
+stageEditorDamageBlocks: "Damage blocks"
+stageEditorPlaceBlocks: "Place blocks"
+stageEditorUseBlocks: "Use blocks"
+stageEditorCutBlocks: "Cut blocks"
+stageEditorCatchFish: "Catch fish"
 stageEditorFish: "fish"
-stageEditorKillPlayers: "Kill Players"
+stageEditorKillPlayers: "Kill players"
 stageEditorPlayers: "players"
-stageEditorEnchantItems: "Enchant Items"
-stageEditorDeliverItems: "Deliver Items"
+stageEditorEnchantItems: "Enchant items"
+stageEditorDeliverItems: "Deliver items"
 stageEditorTalkToNPCs: "Talk to NPCs"
 stageEditorKillNPCs: "Kill NPCs"
-stageEditorKillMobs: "Kill Mobs"
+stageEditorKillMobs: "Kill mobs"
 stageEditorReachLocs: "Reach locations"
 stageEditorReachRadii1: "Reach within"
 stageEditorReachRadii2: "blocks of"
-stageEditorTameMobs: "Tame Mobs"
+stageEditorTameMobs: "Tame mobs"
 stageEditorShearSheep: "Shear Sheep"
 stageEditorEvents: "Events"
 stageEditorStageEvents: "Stage Events"
@@ -161,10 +151,10 @@ stageEditorDeathEvent: "Death Event"
 stageEditorDeathEventCleared: "Death Event cleared."
 stageEditorDisconnectEvent: "Disconnect Event"
 stageEditorDisconnectEventCleared: "Disconnect Event cleared."
-stageEditorDelayMessage: "Delay Message"
-stageEditorDenizenScript: "Denizen Script"
-stageEditorStartMessage: "Start Message"
-stageEditorCompleteMessage: "Complete Message"
+stageEditorDelayMessage: "Delay message"
+stageEditorDenizenScript: "Denizen script"
+stageEditorStartMessage: "Start message"
+stageEditorCompleteMessage: "Complete message"
 stageEditorDelete: "Delete Stage"
 stageEditorSetBlockNames: "Set block names"
 stageEditorSetBlockAmounts: "Set block amounts"
@@ -189,64 +179,62 @@ stageEditorSetLocationNames: "Set location names"
 stageEditorSetTameAmounts: "Set tame amounts"
 stageEditorSetShearColors: "Set sheep colors"
 stageEditorSetShearAmounts: "Set shear amounts"
-stageEditorPassword: "Password Objectives"
+stageEditorPassword: "Password objectives"
 stageEditorAddPasswordDisplay: "Add password display"
 stageEditorAddPasswordPhrases: "Add password phrase(s)"
 stageEditorNoPasswordDisplays: "No password displays set"
-stageObjectiveOverride: "Objective Display Override"
-stageEditorCustom: "Custom Objectives"
+stageEditorObjectiveOverride: "Objective display override"
+stageEditorCustom: "Custom objectives"
 stageEditorNoModules: "No modules loaded"
 stageEditorModuleNotFound: "Custom objective module not found."
-stageEditorCustomPrompt: "Enter the name of a custom objective to add, or enter 'clear' to clear all custom objectives, or 'cancel' to return."
+stageEditorCustomPrompt: "Enter the name of a custom objective to add, or enter 'clear' to clear all custom objectives, "
 stageEditorCustomAlreadyAdded: "That custom objective has already been added!"
 stageEditorCustomCleared: "Custom objectives cleared."
 stageEditorCustomDataPrompt: "Enter value for <data>:"
-stageEditorEnterBlockNames: "Enter block names (or IDs), separating each one by a space, or enter 'cancel' to return."
-stageEditorBreakBlocksPrompt: "Enter break amounts (numbers), separating each one by a space, or enter 'cancel' to return."
-stageEditorDamageBlocksPrompt: "Enter damage amounts (numbers), separating each one by a space, or enter 'cancel' to return."
-stageEditorPlaceBlocksPrompt: "Enter place amounts (numbers), separating each one by a space, or enter 'cancel' to return."
-stageEditorUseBlocksPrompt: "Enter use amounts (numbers), separating each one by a space, or enter 'cancel' to return."
-stageEditorCutBlocksPrompt: "Enter cut amounts (numbers), separating each one by a space, or enter 'cancel' to return."
-stageEditorEnterBlockDurability: "Enter block durability (numbers), separating each one by a space, or enter 'cancel' to return."
+stageEditorEnterBlockNames: "Enter block names (or IDs), separating each one by a space, "
+stageEditorBreakBlocksPrompt: "Enter break amounts (numbers), separating each one by a space, "
+stageEditorDamageBlocksPrompt: "Enter damage amounts (numbers), separating each one by a space, "
+stageEditorPlaceBlocksPrompt: "Enter place amounts (numbers), separating each one by a space, "
+stageEditorUseBlocksPrompt: "Enter use amounts (numbers), separating each one by a space, "
+stageEditorCutBlocksPrompt: "Enter cut amounts (numbers), separating each one by a space, "
+stageEditorEnterBlockDurability: "Enter block durability (numbers), separating each one by a space, "
 stageEditorCatchFishPrompt: "Enter number of fish to catch, or 0 to clear the fish catch objective, or -1 to cancel"
 stageEditorKillPlayerPrompt: "Enter number of players to kill, or 0 to clear the player kill objective, or -1 to cancel"
-stageEditorEnchantTypePrompt: "Enter enchantment names, separating each one by a comma, or enter 'cancel' to return."
-stageEditorEnchantAmountsPrompt: "Enter enchant amounts (numbers), separating each one by a space, or enter 'cancel' to return."
-stageEditorItemNamesPrompt: "Enter item names, separating each one by a space, or enter 'cancel' to return."
-stageEditorNPCPrompt: "Enter NPC ids, separating each one by a space, or enter 'cancel' to return."
-stageEditorNPCToTalkToPrompt: "Enter NPC IDs, separating each one by a space, or enter 'clear' to clear the NPC ID list, or 'cancel' to return."
-stageEditorDeliveryMessagesPrompt: "Enter delivery messages, separating each one by a semi-colon or enter 'cancel' to return."
-stageEditorKillNPCsPrompt: "Enter kill amounts (numbers), separating each one by a space, or enter 'cancel' to return."
-stageEditorMobsPrompt: "Enter mob names separating each one by a space, or enter 'cancel' to return"
-stageEditorMobAmountsPrompt: "Enter mob amounts separating each one by a space, or enter 'cancel' to return"
-stageEditorMobLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the kill location list, or enter 'cancel' to return"
-stageEditorMobLocationRadiiPrompt: "Enter kill location radii (number of blocks) separating each one by a space, or enter 'cancel' to return"
-stageEditorMobLocationNamesPrompt: "Enter location names separating each one by a comma, or enter 'cancel' to return"
-stageEditorReachLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the reach location list, or enter 'cancel' to return"
-stageEditorReachLocationRadiiPrompt: "Enter reach location radii (number of blocks) separating each one by a space, or enter 'cancel' to return"
-stageEditorReachLocationNamesPrompt: "Enter location names separating each one by a comma, or enter 'cancel' to return"
-stageEditorTameAmountsPrompt: "Enter tame amounts separating each one by a space, or enter 'cancel' to return"
-stageEditorShearColorsPrompt: "Enter sheep colors separating each one by a space, or enter 'cancel' to return"
-stageEditorShearAmountsPrompt: "Enter shear amounts separating each one by a space, or enter 'cancel' to return"
-stageEditorEventsPrompt: "Enter an event name, or enter 'clear' to clear the event, or 'cancel' to return"
-stageEditorChatEventsPrompt: "Enter an event name to add, or enter 'clear' to clear all chat events, or 'cancel' to return"
-stageEditorChatEventsTriggerPromptA: "Enter a chat trigger for"
-stageEditorChatEventsTriggerPromptB: "or enter 'cancel' to return."
-stageEditorCommandEventsPrompt: "Enter an event name to add, or enter 'clear' to clear all command events, or 'cancel' to return"
-stageEditorCommandEventsTriggerPromptA: "Enter a command trigger for"
-stageEditorCommandEventsTriggerPromptB: "or enter 'cancel' to return."
-stageEditorDelayPrompt: "Enter time (in seconds), or enter 'clear' to clear the delay, or 'cancel' to return"
-stageEditorDelayMessagePrompt: "Enter delay message, or enter 'clear' to clear the message, or 'cancel' to return"
-stageEditorScriptPrompt: "Enter script name, or enter 'clear' to clear the script, or 'cancel' to return"
-stageEditorStartMessagePrompt: "Enter start message, or enter 'clear' to clear the message, or 'cancel' to return"
-stageEditorCompleteMessagePrompt: "Enter complete message, or enter 'clear' to clear the message, or 'cancel' to return"
-stageEditorPasswordDisplayPrompt: "Enter a password display, or 'cancel' to return"
+stageEditorEnchantTypePrompt: "Enter enchantment names, separating each one by a comma, "
+stageEditorEnchantAmountsPrompt: "Enter enchant amounts (numbers), separating each one by a space, "
+stageEditorItemNamesPrompt: "Enter item names, separating each one by a space, "
+stageEditorNPCPrompt: "Enter NPC ids, separating each one by a space, "
+stageEditorNPCToTalkToPrompt: "Enter NPC IDs, separating each one by a space, or enter 'clear' to clear the NPC ID list, "
+stageEditorDeliveryMessagesPrompt: "Enter delivery messages, separating each one by a semi-colon, "
+stageEditorKillNPCsPrompt: "Enter kill amounts (numbers), separating each one by a space, "
+stageEditorMobsPrompt: "Enter mob names separating each one by a space, "
+stageEditorMobAmountsPrompt: "Enter mob amounts separating each one by a space, "
+stageEditorMobLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the kill location list, "
+stageEditorMobLocationRadiiPrompt: "Enter kill location radii (number of blocks) separating each one by a space, "
+stageEditorMobLocationNamesPrompt: "Enter location names separating each one by a comma, "
+stageEditorReachLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the reach location list, "
+stageEditorReachLocationRadiiPrompt: "Enter reach location radii (number of blocks) separating each one by a space, "
+stageEditorReachLocationNamesPrompt: "Enter location names separating each one by a comma, "
+stageEditorTameAmountsPrompt: "Enter tame amounts separating each one by a space, "
+stageEditorShearColorsPrompt: "Enter sheep colors separating each one by a space, "
+stageEditorShearAmountsPrompt: "Enter shear amounts separating each one by a space, "
+stageEditorEventsPrompt: "Enter an event name, or enter 'clear' to clear the event, "
+stageEditorChatEventsPrompt: "Enter an event name to add, or enter 'clear' to clear all chat events, "
+stageEditorChatEventsTriggerPrompt: "Enter a chat trigger for"
+stageEditorCommandEventsPrompt: "Enter an event name to add, or enter 'clear' to clear all command events, "
+stageEditorCommandEventsTriggerPrompt: "Enter a command trigger for"
+stageEditorDelayPrompt: "Enter time (in seconds), or enter 'clear' to clear the delay, "
+stageEditorDelayMessagePrompt: "Enter delay message, or enter 'clear' to clear the message, "
+stageEditorScriptPrompt: "Enter script name, or enter 'clear' to clear the script, "
+stageEditorStartMessagePrompt: "Enter start message, or enter 'clear' to clear the message, "
+stageEditorCompleteMessagePrompt: "Enter complete message, or enter 'clear' to clear the message, "
+stageEditorPasswordDisplayPrompt: "Enter a password display, "
 stageEditorPasswordDisplayHint: "(This is the text that will be displayed to the player as their objective)"
-stageEditorPasswordPhrasePrompt: "Enter a password phrase, or 'cancel' to return"
+stageEditorPasswordPhrasePrompt: "Enter a password phrase, "
 stageEditorPasswordPhraseHint1: "(This is the text that a player has to say to complete the objective)"
 stageEditorPasswordPhraseHint2: "If you want multiple password phrases, separate them by a | (pipe)"
-stageEditorObjectiveOverridePrompt: "Enter objective display override, or 'clear' to clear the override, or 'cancel' to return."
-stageEditorObjectiveOverrideHint: "(The objective display override will show up as the players current objective)"
+stageEditorObjectiveOverridePrompt: "Enter objective display override, or 'clear' to clear the override, "
+stageEditorObjectiveOverrideHint: "(This override will display your own text as the objective)"
 stageEditorObjectiveOverrideCleared: "Objective display override cleared."
 stageEditorDeliveryAddItem: "Add item"
 stageEditorDeliveryNPCs: "Set NPC IDs"
@@ -338,7 +326,7 @@ eventEditorErrorReadingFile: "Error reading Events file."
 eventEditorErrorSaving: "An error occurred while saving."
 eventEditorDeleted: "Event deleted, Quests and Events reloaded."
 eventEditorSaved: "Event saved, Quests and Events reloaded."
-eventEditorEnterEventName: "Enter an Event name, or 'cancel' to return."
+eventEditorEnterEventName: "Enter an Event name, "
 eventEditorDeletePrompt: "Are you sure you want to delete the Event"
 eventEditorQuitWithoutSaving: "Are you sure you want to quit without saving?"
 eventEditorFinishAndSave: "Are you sure you want to finish and save the Event"
@@ -350,6 +338,16 @@ eventEditorListSizeMismatch: "The lists are not the same size!"
 eventEditorListDuplicates: "List contains duplicates!"
 eventEditorNotANumberList: "Input was not a list of numbers!"
 eventEditorInvalidEntry: "Invalid entry"
+eventEditorGiveItemsTitle: "- Give Items -"
+eventEditorEffectsTitle: "- Effects -"
+eventEditorStormTitle: "- Event Storm -"
+eventEditorThunderTitle: "- Event Thunder -"
+eventEditorMobSpawnsTitle: "- Event Mob Spawns -"
+eventEditorMobsTitle: "- Mobs -"
+eventEditorAddMobTypesTitle: "- Add Mob -"
+eventEditorPotionEffectsTitle: "- Event Potion Effects -"
+eventEditorPotionTypesTitle: "- Event Potion Types -"
+eventEditorWorldsTitle: "- Worlds -"
 eventEditorSetName: "Set name"
 eventEditorSetMessage: "Set message"
 eventEditorClearInv: "Clear player inventory"
@@ -388,14 +386,14 @@ eventEditorSetWorldFirst: "You must set a world first!"
 eventEditorInvalidWorld: "is not a valid world name!"
 eventEditorMustSetStormDuration: "You must set a storm duration!"
 eventEditorStormCleared: "Storm data cleared."
-eventEditorEnterStormWorld: "Enter a world name for the storm to occur in, or enter 'cancel' to return"
+eventEditorEnterStormWorld: "Enter a world name for the storm to occur in, "
 eventEditorEnterDuration: "Enter duration (in seconds)"
 eventEditorAtLeastOneSecond: "Amount must be at least 1 second!"
 eventEditorNotGreaterThanOneSecond: "is not greater than 1 second!"
 eventEditorThunder: "Event Thunder"
 eventEditorMustSetThunderDuration: "You must set a thunder duration!"
 eventEditorThunderCleared: "Thunder data cleared."
-eventEditorEnterThunderWorld: "Enter a world name for the thunder to occur in, or enter 'cancel' to return"
+eventEditorEnterThunderWorld: "Enter a world name for the thunder to occur in, "
 eventEditorEffects: "Event Effects"
 eventEditorAddEffect: "Add effect"
 eventEditorAddEffectLocation: "Add effect location"
@@ -403,7 +401,7 @@ eventEditorNoEffects: "No effects set"
 eventEditorMustAddEffects: "You must add effects first!"
 eventEditorInvalidEffect: "is not a valid effect name!"
 eventEditorEffectsCleared: "Event effects cleared."
-eventEditorEffectLocationPrompt: "Right-click on a block to play an effect at, then enter 'add' to add it to the list, or enter 'cancel' to return"
+eventEditorEffectLocationPrompt: "Right-click on a block to play an effect at, then enter 'add' to add it to the list, "
 eventEditorMobSpawns: "Event Mob Spawns"
 eventEditorAddMobTypes: "Add mob"
 eventEditorNoTypesSet: "(No type set)"
@@ -427,11 +425,9 @@ eventEditorSetMobChestPlate: "Set chest plate"
 eventEditorSetMobChestPlateDrop: "Set drop chance of chest plate"
 eventEditorSetMobHelmet: "Set helmet"
 eventEditorSetMobHelmetDrop: "Set drop chance of helmet"
-eventEditorSetMobSpawnLoc: "Right-click on a block to spawn a mob at, then enter 'add' to the confirm it, or enter 'cancel' to return"
 eventEditorSetMobSpawnAmount: "Set the amount of mobs to spawn"
 eventEditorSetDropChance: "Set the drop chance"
 eventEditorInvalidDropChance: "Drop chance has to be between 0.0 and 1.0"
-eventEditorLightningPrompt: "Right-click on a block to spawn a lightning strike at, then enter 'add' to add it to the list, or enter 'clear' to clear the locations list, or 'cancel' to return"
 eventEditorPotionEffects: "Event Potion Effects"
 eventEditorSetPotionEffectTypes: "Set potion effect types"
 eventEditorMustSetPotionTypesFirst: "You must set potion effect types first!"
@@ -442,29 +438,28 @@ eventEditorNoDurationsSet: "(No durations set)"
 eventEditorSetPotionMagnitudes: "Set potion effect magnitudes"
 eventEditorPotionsCleared: "Potion effects cleared."
 eventEditorInvalidPotionType: "is not a valid potion effect type!"
-eventEditorEnterNPCId: "Enter NPC ID (or -1 to return)"
+eventEditorEnterNPCId: "Enter NPC ID (or -1 to cancel)"
 eventEditorNoNPCExists: "No NPC exists with that id!"
-eventEditorExplosionPrompt: "Right-click on a block to spawn an explosion at, then enter 'add' to add it to the list, or enter 'clear' to clear the explosions list, or 'cancel' to return"
+eventEditorLightningPrompt: "Right-click on a block to spawn a lightning strike at, then enter 'add' to add it to the list, or enter 'clear' to clear the locations list, "
+eventEditorExplosionPrompt: "Right-click on a block to spawn an explosion at, then enter 'add' to add it to the list, or enter 'clear' to clear the explosions list, "
 eventEditorSelectBlockFirst: "You must select a block first."
-eventEditorSetMessagePrompt: "Enter message, or enter 'none' to delete, (or 'cancel' to return)"
-eventEditorSetItemNamesPrompt: "Enter item names separating each one by a space, or enter 'cancel' to return."
-eventEditorSetItemAmountsPrompt: "Enter item amounts (numbers) separating each one by a space, or enter 'cancel' to return."
-eventEditorSetMobTypesPrompt: "Enter mob name, or enter 'cancel' to return"
-eventEditorSetMobAmountsPrompt: "Enter mob amount, or enter 'cancel' to return"
-eventEditorSetMobNamePrompt: "Set the name for this mob, or enter 'cancel' to return"
-eventEditorSetMobLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the mob spawn location list, or enter 'cancel' to return"
-eventEditorSetPotionEffectsPrompt: "Enter potion effect types separating each one by a space, or enter 'cancel' to return"
-eventEditorSetPotionDurationsPrompt: "Enter effect durations (in milliseconds) separating each one by a space, or enter 'cancel' to return"
-eventEditorSetPotionMagnitudesPrompt: "Enter potion effect magnitudes separating each one by a space, or enter 'cancel' to return"
-eventEditorSetHungerPrompt: "Enter hunger level, or -1 to remove it"
+eventEditorSetMessagePrompt: "Enter message, or enter 'none' to delete, "
+eventEditorSetMobTypesPrompt: "Enter mob name, "
+eventEditorSetMobAmountsPrompt: "Enter mob amount, "
+eventEditorSetMobNamePrompt: "Enter the name for this mob, "
+eventEditorSetMobLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the mob spawn location list, "
+eventEditorSetPotionEffectsPrompt: "Enter potion effect types separating each one by a space, "
+eventEditorSetPotionDurationsPrompt: "Enter effect durations (in milliseconds) separating each one by a space, "
+eventEditorSetPotionMagnitudesPrompt: "Enter potion effect magnitudes separating each one by a space, "
+eventEditorSetHungerPrompt: "Enter hunger level, or -1 to clear"
 eventEditorHungerLevelAtLeastZero: "Hunger level must be at least 0!"
-eventEditorSetSaturationPrompt: "Enter saturation level, or -1 to remove it"
+eventEditorSetSaturationPrompt: "Enter saturation level, or -1 to clear"
 eventEditorSaturationLevelAtLeastZero: "Saturation level must be at least 0!"
-eventEditorSetHealthPrompt: "Enter health level, or -1 to remove it"
+eventEditorSetHealthPrompt: "Enter health level, or -1 to clear"
 eventEditorHealthLevelAtLeastZero: "Health level must be at least 0!"
-eventEditorSetTeleportPrompt: "Right-click on a block to teleport the player to, then enter 'done' to finish, or enter 'clear' to clear the teleport location, or 'cancel' to return"
-eventEditorCommandsNote: 'Note: You may use <player> to refer to the player''s name.'
-eventEditorSetCommandsPrompt: "Enter commands separating each one by a comma, or enter 'clear' to clear the list, or enter 'cancel' to return."
+eventEditorSetTeleportPrompt: "Right-click on a block to teleport the player to, then enter 'done' to finish, or enter 'clear' to clear the teleport location, "
+eventEditorCommandsNote: "Note: You may use <player> to refer to the player's name."
+eventEditorSetCommandsPrompt: "Enter commands separating each one by a comma, or enter 'clear' to clear the list, "
 reqSetMoney: "Set money requirement"
 reqSetQuestPoints: "Set Quest Points requirement"
 reqSetItem: "Set item requirements"
@@ -473,7 +468,7 @@ reqSetQuest: "Set Quest requirements"
 reqSetQuestBlocks: "Set Quest blocks"
 reqSetMcMMO: "Set mcMMO requirements"
 reqSetHeroes: "Set Heroes requirements"
-reqSetCustom: "Custom requirements"
+reqSetCustom: "Set custom requirements"
 reqSetFail: "Set fail requirements message"
 reqSetSkills: "Set skills"
 reqSetSkillAmounts: "Set skill amounts"
@@ -481,15 +476,16 @@ reqHeroesSetPrimary: "Set Primary Class"
 reqHeroesSetSecondary: "Set Secondary Class"
 reqMoneyPrompt: "Enter amount of <money>, or 0 to clear the money requirement, or -1 to cancel"
 reqQuestPointsPrompt: "Enter amount of Quest Points, or 0 to clear the Quest Point requirement, or -1 to cancel"
-reqQuestPrompt: "Enter a list of Quest names separating each one by a <comma>, or enter 'clear' to clear the list, or 'cancel' to return."
-reqRemoveItemsPrompt: "Enter a list of true/false values, separating each one by a space, or enter 'cancel' to return."
-reqPermissionsPrompt: "Enter permission requirements separating each one by a space, or enter 'clear' to clear the list, or enter 'cancel' to return."
-reqCustomPrompt: "Enter the name of a custom requirement to add, or enter 'clear' to clear all custom requirements, or 'cancel' to return."
-reqMcMMOPrompt: "Enter mcMMO skills, separating each one by a space, or enter 'clear' to clear the list, or 'cancel' to return."
-reqMcMMOAmountsPrompt: "Enter mcMMO skill amounts, separating each one by a space, or enter 'clear' to clear the list, or 'cancel' to return."
-reqHeroesPrimaryPrompt: "Enter a Heroes Primary Class name, or enter 'clear' to clear the requirement, or 'cancel' to return."
-reqHeroesSecondaryPrompt: "Enter a Heroes Secondary Class name, or enter 'clear' to clear the requirement, or 'cancel' to return."
-reqFailMessagePrompt: "Enter fail requirements message, or enter 'cancel' to return."
+reqQuestListTitle: "- Quests Available -"
+reqQuestPrompt: "Enter a list of Quest names separating each one by a <comma>, or enter 'clear' to clear the list, "
+reqRemoveItemsPrompt: "Enter a list of true/false values, separating each one by a space, "
+reqPermissionsPrompt: "Enter permission requirements separating each one by a space, or enter 'clear' to clear the list, "
+reqCustomPrompt: "Enter the name of a custom requirement to add, or enter 'clear' to clear all custom requirements, "
+reqMcMMOPrompt: "Enter mcMMO skills, separating each one by a space, or enter 'clear' to clear the list, "
+reqMcMMOAmountsPrompt: "Enter mcMMO skill amounts, separating each one by a space, or enter 'clear' to clear the list, "
+reqHeroesPrimaryPrompt: "Enter a Heroes Primary Class name, or enter 'clear' to clear the requirement, "
+reqHeroesSecondaryPrompt: "Enter a Heroes Secondary Class name, or enter 'clear' to clear the requirement, "
+reqFailMessagePrompt: "Enter fail requirements message, "
 reqAddItem: "Add item"
 reqSetRemoveItems: "Set remove items"
 reqNoItemsSet: "No items set"
@@ -527,21 +523,21 @@ rewSetPermission: "Set permission rewards"
 rewSetMcMMO: "Set mcMMO skill rewards"
 rewSetHeroes: "Set Heroes experience rewards"
 rewSetPhat: "Set PhatLoot rewards"
-rewSetCustom: "Set Custom Rewards"
+rewSetCustom: "Set custom rewards"
 rewSetHeroesClasses: "Set classes"
 rewSetHeroesAmounts: "Set experience amounts"
 rewMoneyPrompt: "Enter amount of <money>, or 0 to clear the money reward, or -1 to cancel"
 rewExperiencePrompt: "Enter amount of experience, or 0 to clear the experience reward, or -1 to cancel"
-rewCommandPrompt: "Enter command rewards separating each one by a <comma>, or enter 'clear' to clear the list, or enter 'cancel' to return."
+rewCommandPrompt: "Enter command rewards separating each one by a <comma>, or enter 'clear' to clear the list, "
 rewCommandPromptHint: 'Note: You may put <player> to specify the player who completed the Quest. e.g. smite <player>'
-rewPermissionsPrompt: "Enter permission rewards separating each one by a space, or enter 'clear' to clear the list, or enter 'cancel' to return."
+rewPermissionsPrompt: "Enter permission rewards separating each one by a space, or enter 'clear' to clear the list, "
 rewQuestPointsPrompt: "Enter amount of Quest Points, or 0 to clear the Quest Point reward, or -1 to cancel"
-rewMcMMOPrompt: "Enter mcMMO skills, separating each one by a space, or enter 'cancel' to return."
-rewMcMMOPromptHint: 'Note: Typing ''All'' will give levels to all skills.'
-rewHeroesClassesPrompt: "Enter Heroes classes separating each one by a space, or enter 'cancel' to return."
-rewHeroesExperiencePrompt: "Enter experience amounts (numbers, decimals are allowed) separating each one by a space, or enter 'cancel' to return."
-rewPhatLootsPrompt: "Enter PhatLoots separating each one by a space, or enter 'clear' to clear the list, or 'cancel' to return."
-rewCustomRewardPrompt: "Enter the name of a custom reward to add, or enter 'clear' to clear all custom rewards, or 'cancel' to return."
+rewMcMMOPrompt: "Enter mcMMO skills, separating each one by a space, "
+rewMcMMOPromptHint: "Note: Typing 'All' will give levels to all skills."
+rewHeroesClassesPrompt: "Enter Heroes classes separating each one by a space, "
+rewHeroesExperiencePrompt: "Enter experience amounts (numbers, decimals are allowed) separating each one by a space, "
+rewPhatLootsPrompt: "Enter PhatLoots separating each one by a space, or enter 'clear' to clear the list, "
+rewCustomRewardPrompt: "Enter the name of a custom reward to add, or enter 'clear' to clear all custom rewards, "
 rewItemsCleared: "Item rewards cleared."
 rewNoMcMMOSkills: "No skills set"
 rewNoHeroesClasses: "No classes set"
@@ -565,13 +561,13 @@ itemCreateSetDurab: "Set durability"
 itemCreateSetEnchs: "Add/clear enchantments"
 itemCreateSetDisplay: "Set display name"
 itemCreateSetLore: "Set lore"
-itemCreateEnterName: "Enter an item name, or 'cancel' to return."
-itemCreateEnterAmount: "Enter item amount (max. 64), or 'cancel' to return."
-itemCreateEnterDurab: "Enter item durability, or 'clear' to clear the data, or 'cancel' to return."
-itemCreateEnterEnch: "Enter an enchantment name, or 'clear' to clear the enchantments, or 'cancel' to return."
+itemCreateEnterName: "Enter an item name, "
+itemCreateEnterAmount: "Enter item amount (max. 64), "
+itemCreateEnterDurab: "Enter item durability, or 'clear' to clear the data, "
+itemCreateEnterEnch: "Enter an enchantment name, or 'clear' to clear the enchantments, "
 itemCreateEnterLevel: "Enter a level (number) for <enchantment>"
-itemCreateEnterDisplay: "Enter item display name, or 'clear' to clear the display name, or 'cancel' to return."
-itemCreateEnterLore: "Enter item lore, separating each line by a semi-colon ; or 'clear' to clear the lore, or 'cancel' to return."
+itemCreateEnterDisplay: "Enter item display name, or 'clear' to clear the display name, "
+itemCreateEnterLore: "Enter item lore, separating each line by a semi-colon ; or 'clear' to clear the lore, "
 itemCreateLoaded: "Item loaded."
 itemCreateNoItem: "No item in hand!"
 itemCreateNoName: "You must set a name first!"
@@ -588,10 +584,17 @@ questTitle: "-- <quest> --"
 questObjectivesTitle: "---(<quest>)---"
 questCompleteTitle: '**QUEST COMPLETE: <quest>**'
 questRewardsTitle: "Rewards:"
-journalTitle: "Quest Journal"
-questsTitle: "- Quests -"
-questHelpTitle: "- Quests -"
-questListTitle: "- Quests -"
+questFailed: "*QUEST FAILED*"
+questMaxAllowed: "You may only have up to <number> Quests."
+questAlreadyOn: "You are already on that Quest!"
+questTooEarly: "You may not take <quest> again for another <time>."
+questAlreadyCompleted: "You have already completed <quest>."
+questInvalidLocation: "You may not take <quest> at this location."
+questInvalidDeliveryItem: "<item> is not a required item for this quest!"
+questSelectedLocation: "Selected location"
+questListTitle: "- List of Quests -"
+questHelpTitle: "- Quests Help -"
+questDisplayHelp: "- Display this help"
 questNPCListTitle: "- Quests | <npc> -"
 questAdminHelpTitle: "- Questadmin -"
 questEditorTitle: "- Quest Editor -"
@@ -622,16 +625,6 @@ createItemTitle: "- Create Item -"
 enchantmentsTitle: "- Enchantments -"
 questGUITitle: "- GUI Item Display -"
 questRegionTitle: "- Quest Region -"
-eventEditorGiveItemsTitle: "- Give Items -"
-eventEditorEffectsTitle: "- Effects -"
-eventEditorStormTitle: "- Event Storm -"
-eventEditorThunderTitle: "- Event Thunder -"
-eventEditorMobSpawnsTitle: "- Event Mob Spawns -"
-eventEditorMobsTitle: "- Mobs -"
-eventEditorAddMobTypesTitle: "- Add Mob -"
-eventEditorPotionEffectsTitle: "- Event Potion Effects -"
-eventEditorPotionTypesTitle: "- Event Potion Types -"
-eventEditorWorldsTitle: "- Worlds -"
 effBlazeShoot: "Sound of a Blaze firing"
 effBowFire: "Sound of a bow firing"
 effClick1: "A click sound"
@@ -642,8 +635,9 @@ effGhastShoot: "Sound of a Ghast firing"
 effGhastShriek: "Sound of a Ghast shrieking"
 effZombieWood: "Sound of a Zombie chewing an iron door"
 effZombieIron: "Sound of a Zombie chewing a wooden door"
-effEnterName: "Enter an effect name to add it to the list, or enter 'cancel' to return"
+effEnterName: "Enter an effect name to add it to the list, "
 cmdCancel: "cancel"
+strCancel: "or '<cancel>' to return"
 cmdAdd: "add"
 cmdClear: "clear"
 cmdNone: "none"
@@ -742,10 +736,11 @@ invalidStageNum: "Invalid stage number for Quest <quest>"
 errorNPCID: 'Error: There is no NPC with ID <number>'
 errorReading: "Error reading <file>, skipping.."
 errorReadingSuppress: "Error reading <file>, suppressing further errors."
-errorDataFolder: 'Error: Unable to read Quests data folder!'
+errorDataFolder: "Error: Unable to read Quests data folder!"
 questsPlayerHasQuestAlready: "<player> is already on the Quest <quest>!"
 questsUnknownAdminCommand: "Unknown Questsadmin command. Type /questsadmin for help."
 unknownError: "An unknown error occurred. See console output."
+journalTitle: "Quest Journal"
 journalTaken: "You take out your Quest Journal."
 journalPutAway: "You put away your Quest Journal."
 journalAlreadyHave: "You already have your Quest Journal out."
@@ -836,7 +831,7 @@ worlds: "Worlds"
 mobs: "Mobs"
 points: "points"
 invalidOption: "Invalid option!"
-npcHint: 'Note: You can left or right click on NPC''s to get their ID.'
+npcHint: "Note: You can left or right click on NPC's to get their ID."
 listDuplicate: "List contains duplicates!"
 id: "ID"
 quest: "Quest"
@@ -857,7 +852,7 @@ blocksWithin: "within <amount> blocks of"
 valRequired: "Value required"
 enchantedItem: "*Enchanted*"
 experience: "Experience"
-timerMessage: '<green>Time left to finish the quest/stage: <red>%s seconds'
+timerMessage: "<green>Time left to finish the quest/stage: <red>%s seconds"
 timerStart: "<green>You have <red>%s seconds <green>to finish this quest/stage"
 questErrorReadingFile: "Error reading Quests file."
 questSaveError: "An error occurred while saving."