4 files changed, 13 insertions, 9 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java
index c85e08e9..13963466 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java
@@ -30,7 +30,7 @@ public class QuestQMenu extends PaginatedQMenu {
         this.categoryName = categoryName;
 
         BackMenuElement backMenuElement = categoryQMenu != null
-                ? new BackMenuElement(config, owner.getPlayerUUID(), plugin.getMenuController(), categoryQMenu)
+                ? new BackMenuElement(plugin, owner.getPlayerUUID(), plugin.getMenuController(), categoryQMenu)
                 : null;
 
         List<MenuElement> filteredQuests = new ArrayList<>();
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/AbortCancelMenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/AbortCancelMenuElement.java
index 2da74eac..e55c42e4 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/AbortCancelMenuElement.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/AbortCancelMenuElement.java
@@ -4,6 +4,7 @@ import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.config.BukkitQuestsConfig;
 import com.leonardobishop.quests.bukkit.menu.ClickResult;
 import com.leonardobishop.quests.bukkit.menu.QMenu;
+import com.leonardobishop.quests.bukkit.util.MenuUtils;
 import com.leonardobishop.quests.common.player.QPlayer;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
@@ -22,7 +23,7 @@ public class AbortCancelMenuElement extends MenuElement {
 
     @Override
     public ItemStack asItemStack() {
-        return ((BukkitQuestsConfig) plugin.getQuestsConfig()).getItem("gui.quest-cancel-no");
+        return MenuUtils.applyPlaceholders(plugin, owner.getPlayerUUID(), ((BukkitQuestsConfig) plugin.getQuestsConfig()).getItem("gui.quest-cancel-no"));
     }
 
     @Override
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/BackMenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/BackMenuElement.java
index 7b9fa959..07964c53 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/BackMenuElement.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/BackMenuElement.java
@@ -1,9 +1,11 @@
 package com.leonardobishop.quests.bukkit.menu.element;
 
+import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.config.BukkitQuestsConfig;
 import com.leonardobishop.quests.bukkit.menu.ClickResult;
 import com.leonardobishop.quests.bukkit.menu.MenuController;
 import com.leonardobishop.quests.bukkit.menu.QMenu;
+import com.leonardobishop.quests.bukkit.util.MenuUtils;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
@@ -14,13 +16,13 @@ import java.util.UUID;
  */
 public class BackMenuElement extends MenuElement {
 
-    private final BukkitQuestsConfig config;
+    private final BukkitQuestsPlugin plugin;
     private final UUID player;
     private final MenuController controller;
     private final QMenu previousMenu;
 
-    public BackMenuElement(BukkitQuestsConfig config, UUID player, MenuController controller, QMenu previousMenu) {
-        this.config = config;
+    public BackMenuElement(BukkitQuestsPlugin plugin, UUID player, MenuController controller, QMenu previousMenu) {
+        this.plugin = plugin;
         this.player = player;
         this.controller = controller;
         this.previousMenu = previousMenu;
@@ -28,7 +30,7 @@ public class BackMenuElement extends MenuElement {
 
     @Override
     public ItemStack asItemStack() {
-        return config.getItem("gui.back-button");
+        return MenuUtils.applyPlaceholders(plugin, player, ((BukkitQuestsConfig) plugin.getQuestsConfig()).getItem("gui.back-button"));
     }
 
     @Override
@@ -38,11 +40,11 @@ public class BackMenuElement extends MenuElement {
     }
     
     public int getSlot() {
-        return config.getInt("gui.back-button.slot", 45);
+        return plugin.getQuestsConfig().getInt("gui.back-button.slot", 45);
     }
     
     @Override
     public boolean isEnabled() {
-        return config.getBoolean("gui.back-button.enabled", true);
+        return plugin.getQuestsConfig().getBoolean("gui.back-button.enabled", true);
     }
 }
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/ConfirmCancelMenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/ConfirmCancelMenuElement.java
index ddc1e9cc..d3cc871b 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/ConfirmCancelMenuElement.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/ConfirmCancelMenuElement.java
@@ -4,6 +4,7 @@ import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.config.BukkitQuestsConfig;
 import com.leonardobishop.quests.bukkit.menu.ClickResult;
 import com.leonardobishop.quests.bukkit.menu.QMenu;
+import com.leonardobishop.quests.bukkit.util.MenuUtils;
 import com.leonardobishop.quests.common.player.QPlayer;
 import com.leonardobishop.quests.common.quest.Quest;
 import org.bukkit.event.inventory.ClickType;
@@ -25,7 +26,7 @@ public class ConfirmCancelMenuElement extends MenuElement {
 
     @Override
     public ItemStack asItemStack() {
-        return ((BukkitQuestsConfig) plugin.getQuestsConfig()).getItem("gui.quest-cancel-yes");
+        return MenuUtils.applyPlaceholders(plugin, owner.getPlayerUUID(), ((BukkitQuestsConfig) plugin.getQuestsConfig()).getItem("gui.quest-cancel-yes"));
     }
 
     @Override