diff --git a/pom.xml b/pom.xml
index f6969bb..a72be81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.21.5-R0.1-SNAPSHOT</version>
+            <version>1.21.8-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>net.knarcraft</groupId>
             <artifactId>knarlib</artifactId>
-            <version>1.2.14</version>
+            <version>1.2.18</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/net/knarcraft/blacksmith/formatting/ItemType.java b/src/main/java/net/knarcraft/blacksmith/formatting/ItemType.java
index a41a589..15897f9 100644
--- a/src/main/java/net/knarcraft/blacksmith/formatting/ItemType.java
+++ b/src/main/java/net/knarcraft/blacksmith/formatting/ItemType.java
@@ -15,10 +15,10 @@ public enum ItemType {
      *
      * @return <p>The name of this item type</p>
      */
-    public String getItemTypeName() {
+    public FormatBuilder getItemTypeName() {
         return switch (this) {
-            case MATERIAL -> new FormatBuilder(Translatable.ITEM_TYPE_MATERIAL).toString();
-            case ENCHANTMENT -> new FormatBuilder(Translatable.ITEM_TYPE_ENCHANTMENT).toString();
+            case MATERIAL -> new FormatBuilder(Translatable.ITEM_TYPE_MATERIAL);
+            case ENCHANTMENT -> new FormatBuilder(Translatable.ITEM_TYPE_ENCHANTMENT);
         };
     }
 
diff --git a/src/main/java/net/knarcraft/blacksmith/formatting/NPCFormatter.java b/src/main/java/net/knarcraft/blacksmith/formatting/NPCFormatter.java
index dafa806..da0fb3f 100644
--- a/src/main/java/net/knarcraft/blacksmith/formatting/NPCFormatter.java
+++ b/src/main/java/net/knarcraft/blacksmith/formatting/NPCFormatter.java
@@ -22,8 +22,8 @@ public final class NPCFormatter {
      * @param message <p>The message to send</p>
      */
     public static void sendNPCMessage(@NotNull NPC npc, @NotNull Player player, @NotNull String message) {
-        player.sendMessage(new FormatBuilder(Translatable.NPC_TALK_FORMAT).replace("{npc}",
-                npc.getName()).replace("{message}", message).color().toString());
+        new FormatBuilder(Translatable.NPC_TALK_FORMAT).replace("{npc}",
+                npc.getName()).replace("{message}", message).displayColored(player);
     }
 
     /**
diff --git a/src/main/java/net/knarcraft/blacksmith/formatting/Translatable.java b/src/main/java/net/knarcraft/blacksmith/formatting/Translatable.java
index 6e78052..67d83d6 100644
--- a/src/main/java/net/knarcraft/blacksmith/formatting/Translatable.java
+++ b/src/main/java/net/knarcraft/blacksmith/formatting/Translatable.java
@@ -155,7 +155,7 @@ public enum Translatable implements TranslatableMessage {
      */
     @NotNull
     public static FormatBuilder getRawValueMessage(@NotNull String rawValue) {
-        return new FormatBuilder(Translatable.RAW_VALUE).replace("{rawValue}", rawValue);
+        return new FormatBuilder(Translatable.RAW_VALUE).color().replace("{rawValue}", rawValue);
     }
 
     /**
diff --git a/src/main/java/net/knarcraft/blacksmith/trait/BlacksmithTrait.java b/src/main/java/net/knarcraft/blacksmith/trait/BlacksmithTrait.java
index c47ce7b..a60cbb7 100644
--- a/src/main/java/net/knarcraft/blacksmith/trait/BlacksmithTrait.java
+++ b/src/main/java/net/knarcraft/blacksmith/trait/BlacksmithTrait.java
@@ -80,9 +80,8 @@ public class BlacksmithTrait extends CustomTrait<BlacksmithSetting> {
                 (!reforgeAbleItems.isEmpty() && !reforgeAbleItems.contains(hand.getType()));
 
         if (notHoldingAnvil && notHoldingRepairable) {
-            String invalidMessage = new FormatBuilder(config.getInvalidItemMessage()).replace("{title}",
-                    config.getBlacksmithTitle()).toString();
-            NPCFormatter.sendNPCMessage(this.npc, player, invalidMessage);
+            NPCFormatter.sendNPCMessage(this.npc, player, new FormatBuilder(config.getInvalidItemMessage()).
+                    replace("{title}", config.getBlacksmithTitle()));
             return;
         }
 
diff --git a/src/main/java/net/knarcraft/blacksmith/util/ConfigCommandHelper.java b/src/main/java/net/knarcraft/blacksmith/util/ConfigCommandHelper.java
index 1142927..b242301 100644
--- a/src/main/java/net/knarcraft/blacksmith/util/ConfigCommandHelper.java
+++ b/src/main/java/net/knarcraft/blacksmith/util/ConfigCommandHelper.java
@@ -5,7 +5,6 @@ import net.knarcraft.blacksmith.config.SettingValueType;
 import net.knarcraft.blacksmith.config.Settings;
 import net.knarcraft.blacksmith.formatting.Translatable;
 import net.knarcraft.knarlib.formatting.FormatBuilder;
-import net.md_5.bungee.api.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
@@ -77,7 +76,7 @@ public final class ConfigCommandHelper {
 
         // Display the current value of the setting
         getCurrentValueMessage(setting.getCommandName(), currentValue).neutral(sender);
-        if (printRawValue) {
+        if (!currentValue.equals(defaultValue) && printRawValue) {
             displayRaw(sender, currentValue);
         }
     }
@@ -89,7 +88,7 @@ public final class ConfigCommandHelper {
      * @param value  <p>The value to display raw</p>
      */
     public static void displayRaw(@NotNull CommandSender sender, @NotNull String value) {
-        sender.sendMessage(Translatable.getRawValueMessage(value.replace(ChatColor.COLOR_CHAR, '&')).toString());
+        new FormatBuilder(Translatable.RAW_VALUE).color().replace("{rawValue}", value).displayRaw(sender);
     }
 
 }