JavaJava19
diff --git a/‎core/src/main/java/be/isach/ultracosmetics/command/SubCommand.java‎
Lines changed: 7 additions & 2 deletions b/‎core/src/main/java/be/isach/ultracosmetics/command/SubCommand.java‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎core/src/main/java/be/isach/ultracosmetics/command/subcommands/SubCommandToggle.java‎
Lines changed: 3 additions & 3 deletions b/‎core/src/main/java/be/isach/ultracosmetics/command/subcommands/SubCommandToggle.java‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎core/src/main/java/be/isach/ultracosmetics/config/MessageManager.java‎
Lines changed: 1 addition & 1 deletion b/‎core/src/main/java/be/isach/ultracosmetics/config/MessageManager.java‎
Lines changed: 1 addition & 1 deletion
@@ -3,8 +3,10 @@
 import be.isach.ultracosmetics.UltraCosmetics;
 import be.isach.ultracosmetics.config.MessageManager;
 import be.isach.ultracosmetics.cosmetics.Category;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
@@ -20,6 +22,7 @@
  */
 public abstract class SubCommand {
 
+    private final Component prefix = MessageManager.getMessage("Prefix");
     private final String name;
     private final String description;
     private final Permission permission;
@@ -159,6 +162,8 @@ protected void badUsage(CommandSender sender, String usage) {
     }
 
     protected void error(CommandSender sender, String error) {
-        sender.sendMessage(ChatColor.RED.toString() + ChatColor.BOLD + error);
+        MessageManager.getAudiences().sender(sender).sendMessage(
+                Component.empty().append(prefix).appendSpace().append(Component.text(error, NamedTextColor.RED, TextDecoration.BOLD))
+        );
     }
 }
@@ -66,7 +66,7 @@ private void toggle(CommandSender sender, Player targetPlayer, String type, Stri
 
         UltraPlayer target = ultraCosmetics.getPlayerManager().getUltraPlayer(targetPlayer);
         if (target == null) {
-            sender.sendMessage(MessageManager.getMessage("Prefix") + ERROR_PREFIX + "Invalid player.");
+            error(sender, "Invalid player.");
             return;
         }
 
@@ -77,13 +77,13 @@ private void toggle(CommandSender sender, Player targetPlayer, String type, Stri
 
         Optional<Category> categories = Arrays.stream(Category.values()).filter(category -> category.isEnabled() && category.toString().toLowerCase().startsWith(type)).findFirst();
         if (!categories.isPresent()) {
-            sender.sendMessage(MessageManager.getMessage("Prefix") + ERROR_PREFIX + "Invalid category.");
+            error(sender, "Invalid category.");
             return;
         }
         Category category = categories.get();
         CosmeticType<?> matchingType = findCosmetic(category, cosm);
         if (matchingType == null) {
-            sender.sendMessage(MessageManager.getMessage("Prefix") + ERROR_PREFIX + "Invalid cosmetic.");
+            error(sender, "Invalid cosmetic.");
             return;
         }
         if (target.getCosmetic(category) != null && matchingType == target.getCosmetic(category).getType()) {
 
@@ -213,7 +213,7 @@ private void minimessageMigration() {
         log.write(SmartLogger.LogLevel.WARNING, "Your messages file is using legacy color codes, it will be upgraded now");
         ConfigurationSection config = messagesConfig.fileConfiguration;
         LegacyComponentSerializer deserializer = LegacyComponentSerializer.legacyAmpersand();
-        Pattern percentVarPattern = Pattern.compile("%(\\w+)%");
+        Pattern percentVarPattern = Pattern.compile("%([\\w-]+)%");
         for (String key : config.getKeys(true)) {
             if (!config.isString(key)) continue;
             // Doing it line by line prevents weird behavior like this: