From 03701fc230816ce8fddb581c16dba9138906fb7e Mon Sep 17 00:00:00 2001
From: HappyPikachu <dbaez4465@yahoo.com>
Date: Wed, 31 Jan 2018 01:47:29 -0500
Subject: [PATCH] (UNSTABLE) Lang corrections, reduce duplicate strings - part
 2

---
 src/main/java/me/blackvein/quests/Event.java  |   6 +-
 .../me/blackvein/quests/EventFactory.java     |  40 ++--
 .../me/blackvein/quests/ObjectiveTimer.java   |   2 +-
 .../me/blackvein/quests/QuestFactory.java     |  16 +-
 .../quests/prompts/CreateStagePrompt.java     |  84 ++++-----
 .../quests/prompts/ItemStackPrompt.java       |  12 +-
 .../quests/prompts/RequirementsPrompt.java    |  18 +-
 .../quests/prompts/RewardsPrompt.java         |  14 +-
 .../java/me/blackvein/quests/util/Lang.java   |  15 +-
 src/main/resources/strings.yml                | 176 +++++++++---------
 10 files changed, 197 insertions(+), 186 deletions(-)

diff --git a/src/main/java/me/blackvein/quests/Event.java b/src/main/java/me/blackvein/quests/Event.java
index fb9e12d07..4274ca317 100644
--- a/src/main/java/me/blackvein/quests/Event.java
+++ b/src/main/java/me/blackvein/quests/Event.java
@@ -50,8 +50,8 @@ public class Event {
 	int stormDuration = 0;
 	World thunderWorld = null;
 	int thunderDuration = 0;
-	Integer timer = 0;
-	Boolean cancelTimer = false;
+	int timer = 0;
+	boolean cancelTimer = false;
 	public LinkedList<QuestMob> mobSpawns = new LinkedList<QuestMob>() {
 
 		private static final long serialVersionUID = -761974607799449780L;
@@ -252,7 +252,7 @@ public class Event {
 			quest.failQuest(quester);
 		}
 		if (timer > 0) {
-			player.sendMessage(Quests.parseString(String.format(Lang.get("timerStart"), timer), quest));
+			player.sendMessage(Lang.get("timerStart").replaceAll("<time>", String.valueOf(timer)));
 			if (timer > 60) {
 				quester.timers.put(new ObjectiveTimer(plugin, quester, quest, 60, false)
 						.runTaskLaterAsynchronously(plugin, (timer-60)*20).getTaskId(), quest);
diff --git a/src/main/java/me/blackvein/quests/EventFactory.java b/src/main/java/me/blackvein/quests/EventFactory.java
index b0857368d..9ee28f45f 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") + Lang.orCancelToReturn;
+			text += ChatColor.YELLOW + Lang.get("eventEditorEnterEventName");
 			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") + Lang.orCancelToReturn;
+			text += ChatColor.YELLOW + Lang.get("eventEditorEnterEventName");
 			return text;
 		}
 
@@ -905,7 +905,7 @@ public class EventFactory implements ConversationAbandonedListener {
 		@Override
 		public String getPromptText(ConversationContext context) {
 			String text = ChatColor.AQUA + Lang.get("eventEditorCreate") + ChatColor.GOLD + " - " 
-					+ Lang.get("eventEditorEnterEventName") + Lang.orCancelToReturn;
+					+ Lang.get("eventEditorEnterEventName");
 			return text;
 		}
 
@@ -960,7 +960,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorExplosionPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("eventEditorExplosionPrompt");
 		}
 
 		@SuppressWarnings("unchecked")
@@ -1002,7 +1002,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorEnterEventName") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("eventEditorEnterEventName");
 		}
 
 		@Override
@@ -1034,7 +1034,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetMessagePrompt") + "(" + Lang.orCancelToReturn + ")";
+			return ChatColor.YELLOW + Lang.get("eventEditorSetMessagePrompt");
 		}
 
 		@Override
@@ -1194,7 +1194,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorEffectLocationPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("eventEditorEffectLocationPrompt");
 		}
 
 		@SuppressWarnings("unchecked")
@@ -1243,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") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + effects + Lang.get("effEnterName");
 		}
 
 		@SuppressWarnings("unchecked")
@@ -1338,7 +1338,7 @@ public class EventFactory implements ConversationAbandonedListener {
 				effects += w.getName() + ", ";
 			}
 			effects = effects.substring(0, effects.length());
-			return ChatColor.YELLOW + effects + Lang.get("eventEditorEnterStormWorld") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + effects + Lang.get("eventEditorEnterStormWorld");
 		}
 
 		@Override
@@ -1439,7 +1439,7 @@ public class EventFactory implements ConversationAbandonedListener {
 				effects += w.getName() + ", ";
 			}
 			effects = effects.substring(0, effects.length());
-			return ChatColor.YELLOW + effects + Lang.get("eventEditorEnterThunderWorld") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + effects + Lang.get("eventEditorEnterThunderWorld");
 		}
 
 		@Override
@@ -1666,7 +1666,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			String text = ChatColor.YELLOW + Lang.get("eventEditorSetMobNamePrompt") + Lang.orCancelToReturn;
+			String text = ChatColor.YELLOW + Lang.get("eventEditorSetMobNamePrompt");
 			return text;
 		}
 
@@ -1710,7 +1710,7 @@ public class EventFactory implements ConversationAbandonedListener {
 					mobs += MiscUtil.getProperMobName(mobArr[i]) + "\n";
 				}
 			}
-			return mobs + ChatColor.YELLOW + Lang.get("eventEditorSetMobTypesPrompt") + Lang.orCancelToReturn;
+			return mobs + ChatColor.YELLOW + Lang.get("eventEditorSetMobTypesPrompt");
 		}
 
 		@Override
@@ -1740,7 +1740,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetMobAmountsPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("eventEditorSetMobAmountsPrompt");
 		}
 
 		@Override
@@ -1776,7 +1776,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetMobLocationPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("eventEditorSetMobLocationPrompt");
 		}
 
 		@Override
@@ -1845,7 +1845,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorLightningPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("eventEditorLightningPrompt");
 		}
 
 		@SuppressWarnings("unchecked")
@@ -1993,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") + Lang.orCancelToReturn;
+			return effs + ChatColor.YELLOW + Lang.get("eventEditorSetPotionEffectsPrompt");
 		}
 
 		@Override
@@ -2019,7 +2019,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetPotionDurationsPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("eventEditorSetPotionDurationsPrompt");
 		}
 
 		@Override
@@ -2051,7 +2051,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetPotionMagnitudesPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("eventEditorSetPotionMagnitudesPrompt");
 		}
 
 		@Override
@@ -2151,7 +2151,7 @@ public class EventFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("eventEditorSetTeleportPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("eventEditorSetTeleportPrompt");
 		}
 
 		@Override
@@ -2186,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") + Lang.orCancelToReturn + "\n" + text;
+			return ChatColor.YELLOW + Lang.get("eventEditorSetCommandsPrompt") + "\n" + text;
 		}
 
 		@Override
diff --git a/src/main/java/me/blackvein/quests/ObjectiveTimer.java b/src/main/java/me/blackvein/quests/ObjectiveTimer.java
index d283011d7..2cadc45fc 100644
--- a/src/main/java/me/blackvein/quests/ObjectiveTimer.java
+++ b/src/main/java/me/blackvein/quests/ObjectiveTimer.java
@@ -39,7 +39,7 @@ public class ObjectiveTimer extends BukkitRunnable {
             quest.failQuest(quester);
             quester.updateJournal();
         } else {
-            quester.getPlayer().sendMessage(Quests.parseString(String.format(Lang.get("timerMessage"), time), quest));
+            quester.getPlayer().sendMessage(Lang.get("timerMessage").replaceAll("<time>", String.valueOf(time)));
         }
     }
 }
diff --git a/src/main/java/me/blackvein/quests/QuestFactory.java b/src/main/java/me/blackvein/quests/QuestFactory.java
index 66da71eb8..e6717e260 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") + " (" + Lang.orCancelToReturn + ")";
+			return s + ChatColor.GOLD + Lang.get("questEditorEditEnterQuestName");
 		}
 
 		@Override
@@ -388,7 +388,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 		public String getPromptText(ConversationContext context) {
 			String text = ChatColor.GOLD + Lang.get("questCreateTitle") + "\n";
 			text += ChatColor.AQUA + Lang.get("questEditorCreate") + " " + ChatColor.GOLD + "- " 
-					+ Lang.get("questEditorEnterQuestName") + " (" + Lang.orCancelToReturn + ")";
+					+ Lang.get("questEditorEnterQuestName");
 			return text;
 		}
 
@@ -454,7 +454,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("questEditorEnterBlockStart") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("questEditorEnterBlockStart");
 		}
 
 		@Override
@@ -488,7 +488,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("questEditorEnterQuestName") + " (" + Lang.orCancelToReturn + ")";
+			return ChatColor.YELLOW + Lang.get("questEditorEnterQuestName");
 		}
 
 		@Override
@@ -526,7 +526,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("questEditorEnterAskMessage") + " (" + Lang.orCancelToReturn + ")";
+			return ChatColor.YELLOW + Lang.get("questEditorEnterAskMessage");
 		}
 
 		@Override
@@ -548,7 +548,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("questEditorEnterFinishMessage") + " (" + Lang.orCancelToReturn + ")";
+			return ChatColor.YELLOW + Lang.get("questEditorEnterFinishMessage");
 		}
 
 		@Override
@@ -578,7 +578,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("questEditorEnterInitialEvent" + Lang.orCancelToReturn);
+			return text + ChatColor.YELLOW + Lang.get("questEditorEnterInitialEvent");
 		}
 
 		@Override
@@ -682,7 +682,7 @@ public class QuestFactory implements ConversationAbandonedListener {
 			} else {
 				text += ChatColor.GRAY + "(" + Lang.get("none") + ")\n\n";
 			}
-			return text + ChatColor.YELLOW + Lang.get("questWGPrompt") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("questWGPrompt");
 		}
 
 		@Override
diff --git a/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java b/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java
index cc35801da..98acfcede 100644
--- a/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java
+++ b/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java
@@ -481,7 +481,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			String text = ChatColor.YELLOW + Lang.get("stageEditorPasswordDisplayPrompt") + Lang.orCancelToReturn + "\n";
+			String text = ChatColor.YELLOW + Lang.get("stageEditorPasswordDisplayPrompt") + "\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") + Lang.orCancelToReturn + "\n";
+			String text = ChatColor.YELLOW + Lang.get("stageEditorPasswordPhrasePrompt") + "\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") + Lang.orCancelToReturn + "\n";
+			String text = ChatColor.YELLOW + Lang.get("stageEditorObjectiveOverridePrompt") + "\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") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockNames");
 		}
 
 		@Override
@@ -716,7 +716,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorBreakBlocksPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorBreakBlocksPrompt");
 		}
 
 		@Override
@@ -747,7 +747,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockDurability") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorEnterBlockDurability");
 		}
 
 		@Override
@@ -933,7 +933,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorDamageBlocksPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorDamageBlocksPrompt");
 		}
 
 		@Override
@@ -1150,7 +1150,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorPlaceBlocksPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorPlaceBlocksPrompt");
 		}
 
 		@Override
@@ -1367,7 +1367,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorUseBlocksPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorUseBlocksPrompt");
 		}
 
 		@Override
@@ -1584,7 +1584,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorCutBlocksPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorCutBlocksPrompt");
 		}
 
 		@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") + Lang.orCancelToReturn;
+			return text + "\n" + ChatColor.YELLOW + Lang.get("stageEditorEnchantTypePrompt");
 		}
 
 		@Override
@@ -1848,7 +1848,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorItemNamesPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorItemNamesPrompt");
 		}
 
 		@Override
@@ -1884,7 +1884,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorEnchantAmountsPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorEnchantAmountsPrompt");
 		}
 
 		@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") + Lang.orCancelToReturn + "\n" + ChatColor.GOLD + Lang.get("npcHint");
+			return ChatColor.YELLOW + Lang.get("stageEditorNPCPrompt") + "\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") + Lang.orCancelToReturn + "\n" + note;
+			return ChatColor.YELLOW + Lang.get("stageEditorDeliveryMessagesPrompt") + "\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") + Lang.orCancelToReturn + "\n" + ChatColor.GOLD + Lang.get("npcHint");
+			return ChatColor.YELLOW + Lang.get("stageEditorNPCToTalkToPrompt") + "\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") + Lang.orCancelToReturn + "\n" + ChatColor.GOLD + Lang.get("npcHint");
+			return ChatColor.YELLOW + Lang.get("stageEditorNPCPrompt") + "\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") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorKillNPCsPrompt");
 		}
 
 		@Override
@@ -2479,7 +2479,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					mobs += MiscUtil.getProperMobName(mobArr.get(i)) + "\n";
 				}
 			}
-			return mobs + ChatColor.YELLOW + Lang.get("stageEditorMobsPrompt") + Lang.orCancelToReturn;
+			return mobs + ChatColor.YELLOW + Lang.get("stageEditorMobsPrompt");
 		}
 
 		@Override
@@ -2505,7 +2505,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorMobAmountsPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorMobAmountsPrompt");
 		}
 
 		@Override
@@ -2536,7 +2536,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationPrompt");
 		}
 
 		@SuppressWarnings("unchecked")
@@ -2574,7 +2574,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationRadiiPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationRadiiPrompt");
 		}
 
 		@Override
@@ -2605,7 +2605,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationNamesPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorMobLocationNamesPrompt");
 		}
 
 		@Override
@@ -2737,7 +2737,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationPrompt");
 		}
 
 		@SuppressWarnings("unchecked")
@@ -2775,7 +2775,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationRadiiPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationRadiiPrompt");
 		}
 
 		@Override
@@ -2806,7 +2806,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationNamesPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorReachLocationNamesPrompt");
 		}
 
 		@Override
@@ -2947,7 +2947,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorTameAmountsPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorTameAmountsPrompt");
 		}
 
 		@Override
@@ -3071,7 +3071,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					cols += Quests.getDyeString(colArr[i]) + "\n";
 				}
 			}
-			return cols + ChatColor.YELLOW + Lang.get("stageEditorShearColorsPrompt") + Lang.orCancelToReturn;
+			return cols + ChatColor.YELLOW + Lang.get("stageEditorShearColorsPrompt");
 		}
 
 		@Override
@@ -3097,7 +3097,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorShearAmountsPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorShearAmountsPrompt");
 		}
 
 		@Override
@@ -3212,7 +3212,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt");
 		}
 
 		@Override
@@ -3257,7 +3257,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt");
 		}
 
 		@Override
@@ -3302,7 +3302,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt");
 		}
 
 		@Override
@@ -3347,7 +3347,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("stageEditorEventsPrompt");
 		}
 
 		@Override
@@ -3392,7 +3392,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorChatEventsPrompt") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("stageEditorChatEventsPrompt");
 		}
 
 		@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("stageEditorChatEventsTriggerPrompt") + " " + ChatColor.AQUA + tempEvent + " " + ChatColor.YELLOW + Lang.orCancelToReturn;
+			text += Lang.get("stageEditorChatEventsTriggerPrompt").replaceAll("<event>", tempEvent);
 			return text;
 		}
 
@@ -3479,7 +3479,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.GREEN + "- " + e.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorCommandEventsPrompt") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("stageEditorCommandEventsPrompt");
 		}
 
 		@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("stageEditorCommandEventsTriggerPrompt") + " " + ChatColor.AQUA + tempEvent + " " + ChatColor.YELLOW + Lang.orCancelToReturn;
+			text += Lang.get("stageEditorCommandEventsTriggerPrompt").replaceAll("<event>", tempEvent);
 			return text;
 		}
 
@@ -3558,7 +3558,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorDelayPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorDelayPrompt");
 		}
 
 		@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") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("stageEditorScriptPrompt");
 		}
 
 		@Override
@@ -3677,7 +3677,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorStartMessagePrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorStartMessagePrompt");
 		}
 
 		@Override
@@ -3700,7 +3700,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("stageEditorCompleteMessagePrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("stageEditorCompleteMessagePrompt");
 		}
 
 		@Override
@@ -3731,7 +3731,7 @@ public class CreateStagePrompt extends FixedSetPrompt {
 					text += ChatColor.DARK_PURPLE + " - " + co.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("stageEditorCustomPrompt") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("stageEditorCustomPrompt");
 		}
 
 		@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 4cf8ef7f5..bbc592188 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") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("itemCreateEnterName");
 		}
 
 		@Override
@@ -259,7 +259,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext cc) {
-			return ChatColor.YELLOW + Lang.get("itemCreateEnterAmount") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("itemCreateEnterAmount");
 		}
 
 		@Override
@@ -288,7 +288,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext cc) {
-			return ChatColor.YELLOW + Lang.get("itemCreateEnterDurab") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("itemCreateEnterDurab");
 		}
 
 		@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") + Lang.orCancelToReturn;
+			return text + "\n" + ChatColor.YELLOW + Lang.get("itemCreateEnterEnch");
 		}
 
 		@Override
@@ -390,7 +390,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext cc) {
-			return ChatColor.YELLOW + Lang.get("itemCreateEnterDisplay") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("itemCreateEnterDisplay");
 		}
 
 		@Override
@@ -409,7 +409,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext cc) {
-			return ChatColor.YELLOW + Lang.get("itemCreateEnterLore") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("itemCreateEnterLore");
 		}
 
 		@Override
diff --git a/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java b/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java
index 698163fc7..040477bd4 100644
--- a/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java
+++ b/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java
@@ -261,7 +261,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 				text = text.substring(0, (text.length() - 2));
 				text += "\n";
 			}
-			String lang = Lang.get("reqQuestPrompt") + Lang.orCancelToReturn;
+			String lang = Lang.get("reqQuestPrompt");
 			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") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("reqRemoveItemsPrompt");
 		}
 
 		@Override
@@ -440,7 +440,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("reqPermissionsPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("reqPermissionsPrompt");
 		}
 
 		@Override
@@ -469,7 +469,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 					text += ChatColor.DARK_PURPLE + " - " + cr.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("reqCustomPrompt") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("reqCustomPrompt");
 		}
 
 		@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") + Lang.orCancelToReturn;
+			return skillList + ChatColor.YELLOW + Lang.get("reqMcMMOPrompt");
 		}
 
 		@Override
@@ -721,7 +721,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("reqMcMMOAmountsPrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("reqMcMMOAmountsPrompt");
 		}
 
 		@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") + Lang.orCancelToReturn;
+			text += ChatColor.YELLOW + Lang.get("reqHeroesPrimaryPrompt");
 			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") + Lang.orCancelToReturn;
+			text += ChatColor.YELLOW + Lang.get("reqHeroesSecondaryPrompt");
 			return text;
 		}
 
@@ -894,7 +894,7 @@ public class RequirementsPrompt extends FixedSetPrompt {
 
 		@Override
 		public String getPromptText(ConversationContext context) {
-			return ChatColor.YELLOW + Lang.get("reqFailMessagePrompt") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("reqFailMessagePrompt");
 		}
 
 		@Override
diff --git a/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java b/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java
index 598b27144..c93c707ea 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") + Lang.orCancelToReturn;
+			String lang1 = Lang.get("rewCommandPrompt");
 			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") + Lang.orCancelToReturn;
+			return ChatColor.YELLOW + Lang.get("rewPermissionsPrompt");
 		}
 
 		@Override
@@ -463,7 +463,7 @@ public class RewardsPrompt extends FixedSetPrompt {
 					skillList += ChatColor.GREEN + skills[i].getName() + "\n\n";
 				}
 			}
-			return skillList + Lang.get("rewMcMMOPrompt") + Lang.orCancelToReturn + "\n" + ChatColor.GOLD + Lang.get("rewMcMMOPromptHint");
+			return skillList + Lang.get("rewMcMMOPrompt") + "\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") + Lang.orCancelToReturn;
+			text += ChatColor.YELLOW + Lang.get("rewHeroesClassesPrompt");
 			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") + Lang.orCancelToReturn;
+			text += ChatColor.YELLOW + Lang.get("rewHeroesExperiencePrompt");
 			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") + Lang.orCancelToReturn;
+			text += ChatColor.YELLOW + Lang.get("rewPhatLootsPrompt");
 			return text;
 		}
 
@@ -733,7 +733,7 @@ public class RewardsPrompt extends FixedSetPrompt {
 					text += ChatColor.DARK_PURPLE + " - " + cr.getName() + "\n";
 				}
 			}
-			return text + ChatColor.YELLOW + Lang.get("rewCustomRewardPrompt") + Lang.orCancelToReturn;
+			return text + ChatColor.YELLOW + Lang.get("rewCustomRewardPrompt");
 		}
 
 		@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 2dca25f3e..b56889ca6 100644
--- a/src/main/java/me/blackvein/quests/util/Lang.java
+++ b/src/main/java/me/blackvein/quests/util/Lang.java
@@ -35,7 +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 static String orCancelToReturn = "or 'cancel' to return";
 
 	public Lang(Quests plugin) {
 		tokens.initTokens();
@@ -108,6 +108,7 @@ public class Lang {
 			config_new.options().copyHeader(true);
 			config_new.save(langFile_new);
 			langMap.putAll(allStrings);
+			finishLang();
 		} else {
 			plugin.getLogger().severe("Failed loading lang files for " + iso + " because they were not found. Using default en-US");
 			iso = "en-US";
@@ -116,11 +117,21 @@ public class Lang {
 				allStrings.put(key, config.getString(key));
 			}
 			langMap.putAll(allStrings);
+			finishLang();
 		}
-		orCancelToReturn = get("strCancel").replaceAll("<cancel>", get("cmdCancel"));
 		plugin.getLogger().info("Loaded language " + iso + ". Translations via Crowdin");
 	}
 	
+	private void finishLang() {
+		// or 'cancel' to return
+		if (get("strCancel") != null) {
+			langMap.put("strCancel", get("strCancel").replaceAll("<command>", get("cmdCancel")));
+		}
+		for (String s : langMap.keySet()) {
+			langMap.put(s, get(s).replaceAll("<cancel>", get("strCancel")));
+		}
+	}
+	
 	/**
 	 * Load YAML file using UTF8 format to allow extended characters
 	 * @param file system file in YAML format
diff --git a/src/main/resources/strings.yml b/src/main/resources/strings.yml
index bc6267d75..e9574dafb 100644
--- a/src/main/resources/strings.yml
+++ b/src/main/resources/strings.yml
@@ -67,18 +67,18 @@ questEditorSetGUI: "Set GUI Item display"
 questEditorReqs: "Edit Requirements"
 questEditorStages: "Edit Stages"
 questEditorRews: "Edit Rewards"
-questEditorEnterQuestName: "Enter Quest name"
-questEditorEditEnterQuestName: "Enter Quest name to edit"
-questEditorEnterAskMessage: "Enter ask message"
-questEditorEnterFinishMessage: "Enter finish message"
+questEditorEnterQuestName: "Enter Quest name (<cancel>)"
+questEditorEditEnterQuestName: "Enter Quest name to edit (<cancel>)"
+questEditorEnterAskMessage: "Enter ask message (<cancel>)"
+questEditorEnterFinishMessage: "Enter finish message (<cancel>)"
 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, "
-questEditorEnterInitialEvent: "Enter an Event name, or enter 'clear' to clear the initial Event, "
+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, <cancel>"
+questEditorEnterInitialEvent: "Enter an Event name, or enter 'clear' to clear the initial Event, <cancel>"
 questRequiredNoneSet: "Required, none set"
 questWGSetRegion: "Set Region"
 questWGNotInstalled: "WorldGuard not installed"
-questWGPrompt: "Enter WorldGuard region, or enter 'clear' to clear the region, "
+questWGPrompt: "Enter WorldGuard region, or enter 'clear' to clear the region, <cancel>"
 questWGInvalidRegion: "<region> is not a valid WorldGuard region!"
 questWGRegionCleared: "Quest region cleared."
 questCitNotInstalled: "Citizens not installed"
@@ -187,53 +187,53 @@ 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, "
+stageEditorCustomPrompt: "Enter the name of a custom objective to add, or enter 'clear' to clear all custom objectives, <cancel>"
 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, "
-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, "
+stageEditorEnterBlockNames: "Enter block names (or IDs), separating each one by a space, <cancel>"
+stageEditorBreakBlocksPrompt: "Enter break amounts (numbers), separating each one by a space, <cancel>"
+stageEditorDamageBlocksPrompt: "Enter damage amounts (numbers), separating each one by a space, <cancel>"
+stageEditorPlaceBlocksPrompt: "Enter place amounts (numbers), separating each one by a space, <cancel>"
+stageEditorUseBlocksPrompt: "Enter use amounts (numbers), separating each one by a space, <cancel>"
+stageEditorCutBlocksPrompt: "Enter cut amounts (numbers), separating each one by a space, <cancel>"
+stageEditorEnterBlockDurability: "Enter block durability (numbers), separating each one by a space, <cancel>"
 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, "
-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, "
+stageEditorEnchantTypePrompt: "Enter enchantment names, separating each one by a comma, <cancel>"
+stageEditorEnchantAmountsPrompt: "Enter enchant amounts (numbers), separating each one by a space, <cancel>"
+stageEditorItemNamesPrompt: "Enter item names, separating each one by a space, <cancel>"
+stageEditorNPCPrompt: "Enter NPC IDs, separating each one by a space, <cancel>"
+stageEditorNPCToTalkToPrompt: "Enter NPC IDs, separating each one by a space, or enter 'clear' to clear the NPC ID list, <cancel>"
+stageEditorDeliveryMessagesPrompt: "Enter delivery messages, separating each one by a semi-colon, <cancel>"
+stageEditorKillNPCsPrompt: "Enter kill amounts (numbers), separating each one by a space, <cancel>"
+stageEditorMobsPrompt: "Enter mob names separating each one by a space, <cancel>"
+stageEditorMobAmountsPrompt: "Enter mob amounts separating each one by a space, <cancel>"
+stageEditorMobLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the kill location list, <cancel>"
+stageEditorMobLocationRadiiPrompt: "Enter kill location radii (number of blocks) separating each one by a space, <cancel>"
+stageEditorMobLocationNamesPrompt: "Enter location names separating each one by a comma, <cancel>"
+stageEditorReachLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the reach location list, <cancel>"
+stageEditorReachLocationRadiiPrompt: "Enter reach location radii (number of blocks) separating each one by a space, <cancel>"
+stageEditorReachLocationNamesPrompt: "Enter location names separating each one by a comma, <cancel>"
+stageEditorTameAmountsPrompt: "Enter tame amounts separating each one by a space, <cancel>"
+stageEditorShearColorsPrompt: "Enter sheep colors separating each one by a space, <cancel>"
+stageEditorShearAmountsPrompt: "Enter shear amounts separating each one by a space, <cancel>"
+stageEditorEventsPrompt: "Enter an event name, or enter 'clear' to clear the event, <cancel>"
+stageEditorChatEventsPrompt: "Enter an event name to add, or enter 'clear' to clear all chat events, <cancel>"
+stageEditorChatEventsTriggerPrompt: "%yellow%Enter a chat trigger for%aqua% <event>%yellow% <cancel>"
+stageEditorCommandEventsPrompt: "Enter an event name to add, or enter 'clear' to clear all command events, <cancel>"
+stageEditorCommandEventsTriggerPrompt: "%yellow%Enter a command trigger for%aqua% <event>%yellow% <cancel>"
+stageEditorDelayPrompt: "Enter time (in seconds), or enter 'clear' to clear the delay, <cancel>"
+stageEditorDelayMessagePrompt: "Enter delay message, or enter 'clear' to clear the message, <cancel>"
+stageEditorScriptPrompt: "Enter script name, or enter 'clear' to clear the script, <cancel>"
+stageEditorStartMessagePrompt: "Enter start message, or enter 'clear' to clear the message, <cancel>"
+stageEditorCompleteMessagePrompt: "Enter complete message, or enter 'clear' to clear the message, <cancel>"
+stageEditorPasswordDisplayPrompt: "Enter a password display, <cancel>"
 stageEditorPasswordDisplayHint: "(This is the text that will be displayed to the player as their objective)"
-stageEditorPasswordPhrasePrompt: "Enter a password phrase, "
+stageEditorPasswordPhrasePrompt: "Enter a password phrase, <cancel>"
 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, "
+stageEditorObjectiveOverridePrompt: "Enter objective display override, or 'clear' to clear the override, <cancel>"
 stageEditorObjectiveOverrideHint: "(This override will display your own text as the objective)"
 stageEditorObjectiveOverrideCleared: "Objective display override cleared."
 stageEditorDeliveryAddItem: "Add item"
@@ -326,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, "
+eventEditorEnterEventName: "Enter an Event name, <cancel>"
 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"
@@ -386,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, "
+eventEditorEnterStormWorld: "Enter a world name for the storm to occur in, <cancel>"
 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, "
+eventEditorEnterThunderWorld: "Enter a world name for the thunder to occur in, <cancel>"
 eventEditorEffects: "Event Effects"
 eventEditorAddEffect: "Add effect"
 eventEditorAddEffectLocation: "Add effect location"
@@ -401,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, "
+eventEditorEffectLocationPrompt: "Right-click on a block to play an effect at, then enter 'add' to add it to the list, <cancel>"
 eventEditorMobSpawns: "Event Mob Spawns"
 eventEditorAddMobTypes: "Add mob"
 eventEditorNoTypesSet: "(No type set)"
@@ -440,26 +440,26 @@ eventEditorPotionsCleared: "Potion effects cleared."
 eventEditorInvalidPotionType: "is not a valid potion effect type!"
 eventEditorEnterNPCId: "Enter NPC ID (or -1 to cancel)"
 eventEditorNoNPCExists: "No NPC exists with that id!"
-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, "
+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, <cancel>"
+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, <cancel>"
 eventEditorSelectBlockFirst: "You must select a block first."
-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, "
+eventEditorSetMessagePrompt: "Enter message, or enter 'none' to delete, (<cancel>)"
+eventEditorSetMobTypesPrompt: "Enter mob name, <cancel>"
+eventEditorSetMobAmountsPrompt: "Enter mob amount, <cancel>"
+eventEditorSetMobNamePrompt: "Enter the name for this mob, <cancel>"
+eventEditorSetMobLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the mob spawn location list, <cancel>"
+eventEditorSetPotionEffectsPrompt: "Enter potion effect types separating each one by a space, <cancel>"
+eventEditorSetPotionDurationsPrompt: "Enter effect durations (in milliseconds) separating each one by a space, <cancel>"
+eventEditorSetPotionMagnitudesPrompt: "Enter potion effect magnitudes separating each one by a space, <cancel>"
 eventEditorSetHungerPrompt: "Enter hunger level, or -1 to clear"
 eventEditorHungerLevelAtLeastZero: "Hunger level must be at least 0!"
 eventEditorSetSaturationPrompt: "Enter saturation level, or -1 to clear"
 eventEditorSaturationLevelAtLeastZero: "Saturation level must be at least 0!"
 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, "
+eventEditorSetTeleportPrompt: "Right-click on a block to teleport the player to, then enter 'done' to finish, or enter 'clear' to clear the teleport location, <cancel>"
 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, "
+eventEditorSetCommandsPrompt: "Enter commands separating each one by a comma, or enter 'clear' to clear the list, <cancel>"
 reqSetMoney: "Set money requirement"
 reqSetQuestPoints: "Set Quest Points requirement"
 reqSetItem: "Set item requirements"
@@ -477,15 +477,15 @@ 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"
 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, "
+reqQuestPrompt: "Enter a list of Quest names separating each one by a <comma>, or enter 'clear' to clear the list, <cancel>"
+reqRemoveItemsPrompt: "Enter a list of true/false values, separating each one by a space, <cancel>"
+reqPermissionsPrompt: "Enter permission requirements separating each one by a space, or enter 'clear' to clear the list, <cancel>"
+reqCustomPrompt: "Enter the name of a custom requirement to add, or enter 'clear' to clear all custom requirements, <cancel>"
+reqMcMMOPrompt: "Enter mcMMO skills, separating each one by a space, or enter 'clear' to clear the list, <cancel>"
+reqMcMMOAmountsPrompt: "Enter mcMMO skill amounts, separating each one by a space, or enter 'clear' to clear the list, <cancel>"
+reqHeroesPrimaryPrompt: "Enter a Heroes Primary Class name, or enter 'clear' to clear the requirement, <cancel>"
+reqHeroesSecondaryPrompt: "Enter a Heroes Secondary Class name, or enter 'clear' to clear the requirement, <cancel>"
+reqFailMessagePrompt: "Enter fail requirements message, <cancel>"
 reqAddItem: "Add item"
 reqSetRemoveItems: "Set remove items"
 reqNoItemsSet: "No items set"
@@ -528,16 +528,16 @@ 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, "
+rewCommandPrompt: "Enter command rewards separating each one by a <comma>, or enter 'clear' to clear the list, <cancel>"
 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, "
+rewPermissionsPrompt: "Enter permission rewards separating each one by a space, or enter 'clear' to clear the list, <cancel>"
 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, "
+rewMcMMOPrompt: "Enter mcMMO skills, separating each one by a space, <cancel>"
 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, "
+rewHeroesClassesPrompt: "Enter Heroes classes separating each one by a space, <cancel>"
+rewHeroesExperiencePrompt: "Enter experience amounts (numbers, decimals are allowed) separating each one by a space, <cancel>"
+rewPhatLootsPrompt: "Enter PhatLoots separating each one by a space, or enter 'clear' to clear the list, <cancel>"
+rewCustomRewardPrompt: "Enter the name of a custom reward to add, or enter 'clear' to clear all custom rewards, <cancel>"
 rewItemsCleared: "Item rewards cleared."
 rewNoMcMMOSkills: "No skills set"
 rewNoHeroesClasses: "No classes set"
@@ -561,13 +561,13 @@ itemCreateSetDurab: "Set durability"
 itemCreateSetEnchs: "Add/clear enchantments"
 itemCreateSetDisplay: "Set display name"
 itemCreateSetLore: "Set lore"
-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, "
+itemCreateEnterName: "Enter an item name, <cancel>"
+itemCreateEnterAmount: "Enter item amount (max. 64), <cancel>"
+itemCreateEnterDurab: "Enter item durability, or 'clear' to clear the data, <cancel>"
+itemCreateEnterEnch: "Enter an enchantment name, or 'clear' to clear the enchantments, <cancel>"
 itemCreateEnterLevel: "Enter a level (number) for <enchantment>"
-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, "
+itemCreateEnterDisplay: "Enter item display name, or 'clear' to clear the display name, <cancel>"
+itemCreateEnterLore: "Enter item lore, separating each line by a semi-colon ; or 'clear' to clear the lore, <cancel>"
 itemCreateLoaded: "Item loaded."
 itemCreateNoItem: "No item in hand!"
 itemCreateNoName: "You must set a name first!"
@@ -635,9 +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, "
+effEnterName: "Enter an effect name to add it to the list, <cancel>"
 cmdCancel: "cancel"
-strCancel: "or '<cancel>' to return"
+strCancel: "or '<command>' to return"
 cmdAdd: "add"
 cmdClear: "clear"
 cmdNone: "none"
@@ -852,8 +852,8 @@ blocksWithin: "within <amount> blocks of"
 valRequired: "Value required"
 enchantedItem: "*Enchanted*"
 experience: "Experience"
-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"
+timerMessage: "%green%Time left to finish the quest/stage:%red% <time> seconds"
+timerStart: "%green%You have%red% <time> seconds%green% to finish this quest/stage"
 questErrorReadingFile: "Error reading Quests file."
 questSaveError: "An error occurred while saving."
 questBlacklisted: "You are blacklisted. Contact an admin if this is in error."