diff --git a/pom.xml b/pom.xml
index c88d0d6..3078297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.craftaro</groupId>
     <artifactId>UltimateRepairing</artifactId>
-    <version>2.0.1</version>
+    <version>2.3.0</version>
 
     <build>
         <defaultGoal>clean install</defaultGoal>
@@ -48,7 +48,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.5.3</version>
                 <executions>
                     <execution>
                         <id>shaded</id>
@@ -81,10 +81,10 @@
                                     <excludeDefaults>false</excludeDefaults>
                                     <includes>
                                         <include>**/nms/v*/**</include>
+                                        <include>**/third_party/net/kyori/**</include>
                                     </includes>
                                     <excludes>
                                         <exclude>**/third_party/org/apache/**</exclude>
-                                        <exclude>**/third_party/net/kyori/**</exclude>
                                         <exclude>**/third_party/com/zaxxer/**</exclude>
                                         <exclude>**/third_party/org/jooq/**</exclude>
                                         <exclude>**/third_party/org/mariadb/**</exclude>
@@ -131,7 +131,7 @@
         <dependency>
             <groupId>com.craftaro</groupId>
             <artifactId>CraftaroCore</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>3.5.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/com/craftaro/ultimaterepairing/anvil/UAnvil.java b/src/main/java/com/craftaro/ultimaterepairing/anvil/UAnvil.java
index d4e9963..6b96910 100644
--- a/src/main/java/com/craftaro/ultimaterepairing/anvil/UAnvil.java
+++ b/src/main/java/com/craftaro/ultimaterepairing/anvil/UAnvil.java
@@ -39,14 +39,14 @@ public class UAnvil {
                     ArrayList<String> lines = new ArrayList<>();
 
                     if (!Settings.ENABLE_ANVIL_DEFAULT_FUNCTION.getBoolean()) {
-                        lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.oneclick").getMessage());
+                        lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.oneclick").toText());
                     } else if (Settings.SWAP_LEFT_RIGHT.getBoolean()) {
-                        lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.swapclick").getMessage());
+                        lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.swapclick").toText());
                     } else {
-                        lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.click").getMessage());
+                        lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.click").toText());
                     }
 
-                    lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.torepair").getMessage());
+                    lines.add(UltimateRepairing.getInstance().getLocale().getMessage("general.hologram.torepair").toText());
 
                     if (!HologramManager.isHologramLoaded(hologramId)) {
                         HologramManager.createHologram(hologramId, getLocation().add(0, .1, 0), lines);
diff --git a/src/main/java/com/craftaro/ultimaterepairing/gui/RepairGui.java b/src/main/java/com/craftaro/ultimaterepairing/gui/RepairGui.java
index 636636f..d241d74 100644
--- a/src/main/java/com/craftaro/ultimaterepairing/gui/RepairGui.java
+++ b/src/main/java/com/craftaro/ultimaterepairing/gui/RepairGui.java
@@ -61,7 +61,7 @@ public class RepairGui extends Gui {
         if (Arrays.stream(RepairType.values()).filter(p -> p.hasPermission(player)).count() > 1)
             setButton(4, GuiUtils.createButtonItem(type.getMaterial(),
                     type.getTitle(),
-                    plugin.getLocale().getMessage("interface.repair.swap").getMessage()), (event) ->
+                    plugin.getLocale().getMessage("interface.repair.swap").toText()), (event) ->
                     init(type.getNext(player)));
 
 
diff --git a/src/main/java/com/craftaro/ultimaterepairing/handlers/RepairHandler.java b/src/main/java/com/craftaro/ultimaterepairing/handlers/RepairHandler.java
index 6bf6d92..69ae489 100644
--- a/src/main/java/com/craftaro/ultimaterepairing/handlers/RepairHandler.java
+++ b/src/main/java/com/craftaro/ultimaterepairing/handlers/RepairHandler.java
@@ -230,11 +230,11 @@ public class RepairHandler {
 
         if (type == RepairType.ECONOMY) {
             plugin.getLocale().getMessage("event.repair.notenough")
-                    .processPlaceholder("type", plugin.getLocale().getMessage("interface.repair.eco").getMessage())
+                    .processPlaceholder("type", plugin.getLocale().getMessage("interface.repair.eco").toText())
                     .sendPrefixedMessage(player);
         } else if (type == RepairType.EXPERIENCE)
             plugin.getLocale().getMessage("event.repair.notenough")
-                    .processPlaceholder("type", plugin.getLocale().getMessage("interface.repair.xp").getMessage())
+                    .processPlaceholder("type", plugin.getLocale().getMessage("interface.repair.xp").toText())
                     .sendPrefixedMessage(player);
         else
             plugin.getLocale().getMessage("event.repair.notenough")
diff --git a/src/main/java/com/craftaro/ultimaterepairing/repair/RepairType.java b/src/main/java/com/craftaro/ultimaterepairing/repair/RepairType.java
index 0776f1b..3151538 100644
--- a/src/main/java/com/craftaro/ultimaterepairing/repair/RepairType.java
+++ b/src/main/java/com/craftaro/ultimaterepairing/repair/RepairType.java
@@ -24,7 +24,7 @@ public enum RepairType {
     RepairType(XMaterial material, String permission, String titleLang) {
         this.material = material;
         this.permission = permission;
-        this.title = UltimateRepairing.getInstance().getLocale().getMessage(titleLang).getMessage();
+        this.title = UltimateRepairing.getInstance().getLocale().getMessage(titleLang).toText();
     }
 
     public String getTitle() {