diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCacheItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCacheItem.java
index ba536bc..0a65cc9 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCacheItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/admin/ManageCacheItem.java
@@ -13,11 +13,11 @@ import org.jetbrains.annotations.NotNull;
 public class ManageCacheItem extends AsyncItem {
     public ManageCacheItem() {
         super(new ItemBuilder(Material.PAINTING)
-                        .setDisplayName("§fManage skin cache...")
+                        .setDisplayName("Manage §6skin §fcache...")
                         .addLoreLines("§7Access the skin cache management panel."),
                 () -> {
                     final SkullBuilder builder = new SkullBuilder("Notch");
-                    builder.setDisplayName("§fManage §6skin §fcache...");
+                    builder.setDisplayName("Manage §6skin §fcache...");
                     builder.addLoreLines("§7Access the skin cache management panel.");
                     return builder;
                 });
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheStatisticsItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheStatisticsItem.java
index 3471302..9398e7a 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheStatisticsItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/CacheStatisticsItem.java
@@ -16,7 +16,7 @@ public class CacheStatisticsItem extends SuppliedItem {
             final ItemBuilder builder = new ItemBuilder(Material.BOOK);
             final LoadingCache<String, Optional<MojangSkin>> cache = NickoBukkit.getInstance().getMojangAPI().getSkinCache();
             final CacheStats stats = cache.stats();
-            builder.setDisplayName("§fStatistics");
+            builder.setDisplayName("Statistics");
             builder.addLoreLines(
                     "Request Count: §b" + stats.requestCount(),
                     "Skin Cached: §b" + Math.round(cache.size()),
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateCacheItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateCacheItem.java
index 9cd81df..fdd518d 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateCacheItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateCacheItem.java
@@ -13,7 +13,7 @@ public class InvalidateCacheItem extends SuppliedItem {
     public InvalidateCacheItem() {
         super(() -> {
             final ItemBuilder builder = new ItemBuilder(Material.TNT);
-            builder.setDisplayName("§fInvalidate cache");
+            builder.setDisplayName("Invalidate cache");
             builder.addLoreLines(
                     "§c§oNOT RECOMMENDED",
                     "§7Invalidates every skin entry present in the cache.",
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateEntryItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateEntryItem.java
index c3f0a5d..71627b8 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateEntryItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/admin/cache/InvalidateEntryItem.java
@@ -10,7 +10,7 @@ public class InvalidateEntryItem extends SuppliedItem {
     public InvalidateEntryItem() {
         super(() -> {
             final ItemBuilder builder = new ItemBuilder(Material.PAPER);
-            builder.setDisplayName("§fInvalidate specific entry");
+            builder.setDisplayName("Invalidate specific entry");
             builder.addLoreLines("§7Select a specific skin to invalidate.",
                     "§7Useful if a skin has been updated",
                     "§7recently and the cache no longer up-to-date.");
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeNameItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeNameItem.java
index 2cf925b..985ebe4 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeNameItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeNameItem.java
@@ -10,7 +10,7 @@ public class ChangeNameItem extends SuppliedItem {
     public ChangeNameItem() {
         super(() -> {
             final ItemBuilder builder = new ItemBuilder(Material.NAME_TAG);
-            builder.setDisplayName("§fChange §6name");
+            builder.setDisplayName("Change §6name");
             builder.addLoreLines("§7Will open a GUI to change your name only.");
             return builder;
         }, click -> {
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeSkinItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeSkinItem.java
index 681a980..58b90b1 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeSkinItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/appearance/ChangeSkinItem.java
@@ -10,7 +10,7 @@ public class ChangeSkinItem extends SuppliedItem {
     public ChangeSkinItem(Player player) {
         super(() -> {
             final SkullBuilder builder = new SkullBuilder(player.getName());
-            builder.setDisplayName("§fChange §6skin");
+            builder.setDisplayName("Change §6skin");
             builder.addLoreLines("§7Will open a GUI to change your skin only.");
             return builder;
         }, click -> {
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/common/GoBackItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/common/GoBackItem.java
index 184322d..e7a28ac 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/common/GoBackItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/common/GoBackItem.java
@@ -10,7 +10,7 @@ public class GoBackItem extends SuppliedItem {
     public GoBackItem(Gui gui, String parentTitle) {
         super(() -> {
             final ItemBuilder builder = new ItemBuilder(Material.ARROW);
-            builder.setDisplayName("§fGo back");
+            builder.setDisplayName("Go back");
             builder.addLoreLines("§7Return to the previous window.");
             return builder;
         }, click -> {
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDownItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDownItem.java
index 094ec30..e39dad1 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDownItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollDownItem.java
@@ -15,7 +15,7 @@ public class ScrollDownItem extends ScrollItem {
     @Override
     public ItemProvider getItemProvider(ScrollGui gui) {
         ItemBuilder builder = new ItemBuilder(Material.GREEN_STAINED_GLASS_PANE);
-        builder.setDisplayName("§fScroll down");
+        builder.setDisplayName("Scroll down");
         if (!gui.canScroll(1))
             builder.addLoreLines("§7§o(You can't scroll further down.)");
 
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUpItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUpItem.java
index 268bf96..b02f05b 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUpItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/common/ScrollUpItem.java
@@ -15,7 +15,7 @@ public class ScrollUpItem extends ScrollItem {
     @Override
     public ItemProvider getItemProvider(ScrollGui gui) {
         ItemBuilder builder = new ItemBuilder(Material.RED_STAINED_GLASS_PANE);
-        builder.setDisplayName("§fScroll up");
+        builder.setDisplayName("Scroll up");
         if (!gui.canScroll(-1))
             builder.addLoreLines("§7§o(You've reached the top.)");
 
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/common/UnavailableItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/common/UnavailableItem.java
index 2d50018..1eb4928 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/common/UnavailableItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/common/UnavailableItem.java
@@ -8,7 +8,7 @@ public class UnavailableItem extends SuppliedItem {
     public UnavailableItem() {
         super(() -> {
             final ItemBuilder builder = new ItemBuilder(Material.RED_TERRACOTTA);
-            builder.setDisplayName("§fUnavailable");
+            builder.setDisplayName("Unavailable");
             builder.addLoreLines("§7§oThis button is disabled.");
             return builder;
         }, click -> true);
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/home/ExitItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/home/ExitItem.java
index 2e459e3..f4ca6f4 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/home/ExitItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/home/ExitItem.java
@@ -1,5 +1,6 @@
 package xyz.atnrch.nicko.gui.items.home;
 
+import com.comphenix.protocol.utility.MinecraftVersion;
 import org.bukkit.Material;
 import org.bukkit.event.inventory.ClickType;
 import xyz.xenondevs.invui.item.builder.ItemBuilder;
@@ -7,7 +8,10 @@ import xyz.xenondevs.invui.item.impl.SimpleItem;
 
 public class ExitItem extends SimpleItem {
     public ExitItem() {
-        super(new ItemBuilder(Material.OAK_DOOR).setDisplayName("§fExit"), click -> {
+        super(new ItemBuilder(Material.OAK_DOOR).setDisplayName("Exit"), click -> {
+            if(MinecraftVersion.BEE_UPDATE.atOrAbove()) {
+
+            }
             final ClickType clickType = click.getClickType();
             if (clickType.isLeftClick() || clickType.isRightClick()) {
                 click.getEvent().getView().close();
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/home/ResetItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/home/ResetItem.java
index 824a1ce..4b46e9c 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/home/ResetItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/home/ResetItem.java
@@ -13,7 +13,7 @@ public class ResetItem extends SuppliedItem {
     public ResetItem() {
         super(() -> {
             final ItemBuilder builder = new ItemBuilder(Material.TNT);
-            builder.setDisplayName("§fReset appearance");
+            builder.setDisplayName("Reset appearance");
             builder.addLoreLines("§7Completely remove your disguise.");
             return builder;
         }, (event) -> {
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/home/SettingsAccessItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/home/SettingsAccessItem.java
index 1ebac80..c4a27ce 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/home/SettingsAccessItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/home/SettingsAccessItem.java
@@ -10,7 +10,7 @@ public class SettingsAccessItem extends SuppliedItem {
     public SettingsAccessItem() {
         super(() -> {
             final ItemBuilder builder = new ItemBuilder(Material.COMPARATOR);
-            builder.setDisplayName("§fSettings");
+            builder.setDisplayName("Settings");
             builder.addLoreLines("§7Configure your experience.");
             return builder;
         }, click -> {
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCyclingItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCyclingItem.java
index 2ef37bd..7101cbd 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCyclingItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/settings/BungeeCordCyclingItem.java
@@ -35,7 +35,7 @@ public class BungeeCordCyclingItem {
 
     private ItemProvider getItemProviderForValue(boolean enabled) {
         final ItemBuilder builder = new ItemBuilder(Material.COMPASS);
-        builder.setDisplayName("§fBungeeCord transfer");
+        builder.setDisplayName("BungeeCord transfer");
         if (enabled) {
             builder.addLoreLines("§7> §cDisabled");
             builder.addLoreLines("§6§l> §a§lEnabled");
diff --git a/src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCyclingItem.java b/src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCyclingItem.java
index 2ff073e..7ce31db 100644
--- a/src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCyclingItem.java
+++ b/src/main/java/xyz/atnrch/nicko/gui/items/settings/LanguageCyclingItem.java
@@ -36,7 +36,7 @@ public class LanguageCyclingItem {
 
     private ItemProvider generateItem(Locale locale, List<Locale> locales) {
         final ItemBuilder builder = new ItemBuilder(Material.OAK_SIGN);
-        builder.setDisplayName("§fLanguage");
+        builder.setDisplayName("Language");
         for (Locale value : locales) {
             if (locale != value) {
                 builder.addLoreLines("§7> " + value.getName());