diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 033e24c..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..a441313 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index fcb6fca..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/src/main/java/dev/plex/module/nickmm/command/NickMMCommand.java b/src/main/java/dev/plex/module/nickmm/command/NickMMCommand.java
index ca86f90..1685677 100644
--- a/src/main/java/dev/plex/module/nickmm/command/NickMMCommand.java
+++ b/src/main/java/dev/plex/module/nickmm/command/NickMMCommand.java
@@ -8,8 +8,10 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.module.nickmm.NickMiniMessageModule;
 import dev.plex.util.minimessage.SafeMiniMessage;
+
 import java.util.Collections;
 import java.util.List;
+
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
@@ -46,18 +48,18 @@ public class NickMMCommand extends PlexCommand
         if (plain.length() > NickMiniMessageModule.getEssentials().getSettings().getMaxNickLength()
                 && !commandSender.hasPermission("plex.nickmm.ignore_length_limit"))
         {
-            return legacyComponent.deserialize(I18n.tlLiteral("nickTooLong"));
+            return mmString(I18n.tlLiteral("nickTooLong"));
         }
 
         if (!commandSender.hasPermission("plex.nickmm.ignore_matching"))
         {
             for (final User user : NickMiniMessageModule.getEssentials().getOnlineUsers())
             {
-                final String name = user.getNickname() != null ? plainText.serialize(legacyComponent.deserialize(user.getNickname())) : user.getName();
+                final String name = user.getNickname() != null ? plainText.serialize(mmString(user.getNickname())) : user.getName();
 
                 if (name.equalsIgnoreCase(plain) && !user.getUUID().equals(player.getUniqueId()))
                 {
-                    return legacyComponent.deserialize(I18n.tlLiteral("nickInUse"));
+                    return mmString(I18n.tlLiteral("nickInUse"));
                 }
             }
         }
@@ -65,7 +67,7 @@ public class NickMMCommand extends PlexCommand
         final String legacy = legacyComponent.serialize(nick);
         NickMiniMessageModule.getEssentials().getUser(player).setNickname(legacy);
 
-        return legacyComponent.deserialize(I18n.tlLiteral("nickSet", legacy));
+        return mmString(I18n.tlLiteral("nickSet", legacy));
     }
 
     @Override