diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts
index 0222028..8ea4da0 100644
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 }
 
 group = rootProject.group
-val rootDependencyDir = "net.frankheijden.serverutils.dependencies"
-val dependencyDir = "net.frankheijden.serverutils.bukkit.dependencies"
+val rootDependencyDir = "${rootProject.group}.dependencies"
+val dependencyDir = "${group}.bukkit.dependencies"
 version = rootProject.version
 base {
     archivesName.set("${rootProject.name}-bukkit")
diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/commands/BukkitCommandServerUtils.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/commands/BukkitCommandServerUtils.java
index 9f44ca5..ffaa7f4 100644
--- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/commands/BukkitCommandServerUtils.java
+++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/commands/BukkitCommandServerUtils.java
@@ -28,8 +28,7 @@ import net.frankheijden.serverutils.common.utils.KeyValueComponentBuilder;
 import net.frankheijden.serverutils.common.utils.ForwardFilter;
 import net.frankheijden.serverutils.common.utils.ListComponentBuilder;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.Template;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.PluginIdentifiableCommand;
@@ -127,7 +126,7 @@ public class BukkitCommandServerUtils extends CommandServerUtils<BukkitPlugin, P
         if (handler == null) {
             messages.get(BukkitMessageKey.RELOADCONFIG_NOT_EXISTS).sendTo(
                     sender,
-                    TagResolver.resolver("config", Tag.inserting(Component.text(config)))
+                    Template.of("config", config)
             );
             return;
         }
@@ -139,7 +138,7 @@ public class BukkitCommandServerUtils extends CommandServerUtils<BukkitPlugin, P
             if (MinecraftReflectionVersion.MINOR > max) {
                 messages.get(BukkitMessageKey.RELOADCONFIG_NOT_SUPPORTED).sendTo(
                         sender,
-                        TagResolver.resolver("config", Tag.inserting(Component.text(config)))
+                        Template.of("config", config)
                 );
                 return;
             }
@@ -154,8 +153,7 @@ public class BukkitCommandServerUtils extends CommandServerUtils<BukkitPlugin, P
             BukkitMessageKey key = filter.hasWarnings()
                     ? BukkitMessageKey.RELOADCONFIG_WARNINGS
                     : BukkitMessageKey.RELOADCONFIG_SUCCESS;
-            plugin.getMessagesResource().get(key).sendTo(sender, TagResolver.resolver("config",
-                    Tag.inserting(Component.text(config))));
+            plugin.getMessagesResource().get(key).sendTo(sender, Template.of("config", config));
         } catch (Exception ex) {
             filter.stop(Bukkit.getLogger());
 
diff --git a/Bungee/build.gradle.kts b/Bungee/build.gradle.kts
index 3520a11..420993c 100644
--- a/Bungee/build.gradle.kts
+++ b/Bungee/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 }
 
 group = rootProject.group
-val rootDependencyDir = "net.frankheijden.serverutils.dependencies"
-val dependencyDir = "net.frankheijden.serverutils.bungee.dependencies"
+val rootDependencyDir = "${group}.dependencies"
+val dependencyDir = "${group}.bungee.dependencies"
 version = rootProject.version
 base {
     archivesName.set("${rootProject.name}-bungee")
diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandPlugins.java b/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandPlugins.java
index 91aa49d..2a36699 100644
--- a/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandPlugins.java
+++ b/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandPlugins.java
@@ -14,8 +14,7 @@ import net.frankheijden.serverutils.common.managers.AbstractPluginManager;
 import net.frankheijden.serverutils.common.utils.ListComponentBuilder;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.Template;
 
 @SuppressWarnings("LineLength")
 public abstract class CommandPlugins<U extends ServerUtilsPlugin<P, ?, C, ?, D>, P, C extends ServerUtilsAudience<?>, D extends ServerUtilsPluginDescription>
@@ -50,7 +49,7 @@ public abstract class CommandPlugins<U extends ServerUtilsPlugin<P, ?, C, ?, D>,
         sender.sendMessage(messages.get(MessageKey.PLUGINS_HEADER).toComponent());
         TextComponent.Builder builder = Component.text();
         builder.append(messages.get(MessageKey.PLUGINS_PREFIX).toComponent(
-                TagResolver.resolver("count", Tag.inserting(Component.text(String.valueOf(filteredPlugins.size()))))
+                Template.of("count", String.valueOf(filteredPlugins.size()))
         ));
         builder.append(ListComponentBuilder.create(filteredPlugins)
                 .separator(messages.get(MessageKey.PLUGINS_SEPARATOR).toComponent())
@@ -63,11 +62,11 @@ public abstract class CommandPlugins<U extends ServerUtilsPlugin<P, ?, C, ?, D>,
                             ? MessageKey.PLUGINS_FORMAT
                             : MessageKey.PLUGINS_FORMAT_DISABLED;
                     formatBuilder.append(messages.get(formatKey).toComponent(
-                            TagResolver.resolver("plugin", Tag.inserting(Component.text(description.getName())))
+                            Template.of("plugin", description.getName())
                     ));
                     if (hasVersionFlag) {
                         formatBuilder.append(messages.get(MessageKey.PLUGINS_VERSION).toComponent(
-                                TagResolver.resolver("version", Tag.inserting(Component.text(description.getVersion())))
+                                Template.of("version", description.getVersion())
                         ));
                     }
 
diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandServerUtils.java b/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandServerUtils.java
index 72c581b..524feb7 100644
--- a/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandServerUtils.java
+++ b/Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandServerUtils.java
@@ -36,8 +36,7 @@ import net.frankheijden.serverutils.common.utils.ListComponentBuilder;
 import net.frankheijden.serverutils.common.utils.KeyValueComponentBuilder;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.Template;
 
 public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?, ?>, P, C extends ServerUtilsAudience<?>>
         extends ServerUtilsCommand<U, C> {
@@ -118,9 +117,8 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
 
             if (commandElement.shouldDisplayInHelp()) {
                 sender.sendMessage(helpFormatMessage.toComponent(
-                        TagResolver.resolver("command", Tag.inserting(Component.text(shortestCommandAlias))),
-                        TagResolver.resolver("help",
-                                Tag.inserting(Component.text(commandElement.getDescription().getDescription())))
+                        Template.of("command", shortestCommandAlias),
+                        Template.of("help", commandElement.getDescription().getDescription())
                 ));
             }
 
@@ -134,12 +132,8 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
                     if (subcommandElement.shouldDisplayInHelp()) {
                         String shortestSubcommandAlias = determineShortestAlias(subcommandElement);
                         sender.sendMessage(helpFormatMessage.toComponent(
-                                TagResolver.resolver("command",
-                                        Tag.inserting(Component.text(shortestCommandAlias + ' '
-                                                + shortestSubcommandAlias))),
-                                TagResolver.resolver("help",
-                                        Tag.inserting(Component.text(subcommandElement.getDescription()
-                                                .getDescription())))
+                                Template.of("command", shortestCommandAlias + ' ' + shortestSubcommandAlias),
+                                Template.of("help", subcommandElement.getDescription().getDescription())
                         ));
                     }
                 }
@@ -156,11 +150,8 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
                         String shortestFlagAlias = determineShortestAlias(flagElement);
                         String flagPrefix = "-" + (flagElement.getMain().equals(shortestFlagAlias) ? "_" : "");
                         sender.sendMessage(helpFormatMessage.toComponent(
-                                TagResolver.resolver("command",
-                                        Tag.inserting(Component.text(shortestCommandAlias + ' ' + flagPrefix
-                                                + shortestFlagAlias))),
-                                TagResolver.resolver("help",
-                                        Tag.inserting(Component.text(flagElement.getDescription().getDescription())))
+                                Template.of("command", shortestCommandAlias + ' ' + flagPrefix + shortestFlagAlias),
+                                Template.of("help", flagElement.getDescription().getDescription())
                         ));
                     }
                 }
@@ -328,12 +319,11 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
                 if (!recursive) {
                     TextComponent.Builder builder = Component.text();
                     builder.append(messages.get(MessageKey.DEPENDING_PLUGINS_PREFIX).toComponent(
-                            TagResolver.resolver("plugin", Tag.inserting(Component.text(pluginId)))
+                            Template.of("plugin", pluginId)
                     ));
                     builder.append(ListComponentBuilder.create(dependingPlugins)
                             .format(p -> messages.get(MessageKey.DEPENDING_PLUGINS_FORMAT).toComponent(
-                                    TagResolver.resolver("plugin",
-                                            Tag.inserting(Component.text(pluginManager.getPluginId(p))))
+                                    Template.of("plugin", pluginManager.getPluginId(p))
                             ))
                             .separator(messages.get(MessageKey.DEPENDING_PLUGINS_SEPARATOR).toComponent())
                             .lastSeparator(messages.get(MessageKey.DEPENDING_PLUGINS_LAST_SEPARATOR).toComponent())
@@ -359,12 +349,10 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
                     .orElse("-r");
 
             sender.sendMessage(messages.get(MessageKey.DEPENDING_PLUGINS_OVERRIDE).toComponent(
-                    TagResolver.resolver("command", Tag.inserting(Component.text(context.getRawInputJoined() + " "
-                            + forceFlag)))
+                    Template.of("command", context.getRawInputJoined() + " " + forceFlag)
             ));
             sender.sendMessage(messages.get(MessageKey.DEPENDING_PLUGINS_RECURSIVELY).toComponent(
-                    TagResolver.resolver("command", Tag.inserting(Component.text(context.getRawInputJoined() + " "
-                            + rescuriveFlag)))
+                    Template.of("command", context.getRawInputJoined() + " " + rescuriveFlag)
             ));
         }
 
@@ -377,10 +365,8 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
                 String restartCommand = plugin.getCommandsResource().getAllAliases(getRawPath("restart")).stream()
                         .min(Comparator.comparingInt(String::length))
                         .orElse("restart");
-                Component component = plugin.getMessagesResource().get(MessageKey.RELOADPLUGIN_SERVERUTILS)
-                        .toComponent(TagResolver.resolver("command",
-                                Tag.inserting(Component.text(context.getRawInput().peekFirst() + " "
-                                        + restartCommand)))
+                Component component = plugin.getMessagesResource().get(MessageKey.RELOADPLUGIN_SERVERUTILS).toComponent(
+                        Template.of("command", context.getRawInput().peekFirst() + " " + restartCommand)
                 );
                 sender.sendMessage(component);
                 return true;
@@ -398,7 +384,7 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
             String pluginId = pluginManager.getPluginId(plugin);
             if (protectedPlugins.contains(pluginId)) {
                 sender.sendMessage(messagesResource.get(MessageKey.GENERIC_PROTECTED_PLUGIN).toComponent(
-                        TagResolver.resolver("plugin", Tag.inserting(Component.text(pluginId)))
+                        Template.of("plugin", pluginId)
                 ));
                 return true;
             }
@@ -475,8 +461,7 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
                 KeyValueComponentBuilder.create(formatMessage, "key", "value"),
                 listBuilderConsumer -> {
                     ListComponentBuilder<String> listBuilder = ListComponentBuilder.<String>create()
-                            .format(str -> listFormatMessage.toComponent(TagResolver.resolver("value",
-                                    Tag.inserting(Component.text(str)))))
+                            .format(str -> listFormatMessage.toComponent(Template.of("value", str)))
                             .separator(separator)
                             .lastSeparator(lastSeparator)
                             .emptyValue(null);
diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/config/MessagesResource.java b/Common/src/main/java/net/frankheijden/serverutils/common/config/MessagesResource.java
index 1b22d00..652d6ec 100644
--- a/Common/src/main/java/net/frankheijden/serverutils/common/config/MessagesResource.java
+++ b/Common/src/main/java/net/frankheijden/serverutils/common/config/MessagesResource.java
@@ -7,8 +7,7 @@ import net.frankheijden.serverutils.common.entities.ServerUtilsAudience;
 import net.frankheijden.serverutils.common.entities.ServerUtilsPlugin;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.Template;
 
 public class MessagesResource extends ServerUtilsResource {
 
@@ -23,7 +22,7 @@ public class MessagesResource extends ServerUtilsResource {
     public MessagesResource(ServerUtilsPlugin<?, ?, ?, ?, ?> plugin) {
         super(plugin, MESSAGES_RESOURCE);
         this.messageMap = new HashMap<>();
-        this.miniMessage = MiniMessage.miniMessage();
+        this.miniMessage = MiniMessage.get();
     }
 
     public Message get(String path) {
@@ -55,41 +54,31 @@ public class MessagesResource extends ServerUtilsResource {
         public Message(PlaceholderConfigKey key) {
             this.key = key;
             this.messageString = getConfig().getString("messages." + key.getPath());
-            this.component = key.hasPlaceholders() ? null : miniMessage.deserialize(messageString);
+            this.component = key.hasPlaceholders() ? null : miniMessage.parse(messageString);
         }
 
         /**
          * Creates a {@link Component}.
          */
         public Component toComponent() {
-            return this.component == null ? miniMessage.deserialize(messageString) : this.component;
+            return this.component == null ? miniMessage.parse(messageString) : this.component;
         }
 
         /**
          * Creates a {@link Component}.
          */
-        public Component toComponent(TagResolver... templates) {
-            return this.component == null ? miniMessage.deserialize(messageString, templates) : this.component;
+        public Component toComponent(Template... templates) {
+            return this.component == null ? miniMessage.parse(messageString, templates) : this.component;
         }
 
         /**
          * Creates a {@link Component}.
          */
         public Component toComponent(String... placeholders) {
-            TagResolver.Builder builder = TagResolver.builder();
-            String placeholderKey = null;
-            for (int i = 0; i < placeholders.length; i++) {
-                if (i % 2 == 0) {
-                    placeholderKey = placeholders[i];
-                } else {
-                    String placeholderValue = placeholders[i];
-                    builder.tag(placeholderKey, Tag.inserting(Component.text(placeholderValue)));
-                }
-            }
-            return this.component == null ? miniMessage.deserialize(messageString, builder.build()) : this.component;
+            return this.component == null ? miniMessage.parse(messageString, placeholders) : this.component;
         }
 
-        public void sendTo(ServerUtilsAudience<?> serverAudience, TagResolver... placeholders) {
+        public void sendTo(ServerUtilsAudience<?> serverAudience, Template... placeholders) {
             serverAudience.sendMessage(toComponent(placeholders));
         }
     }
diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/WatchResult.java b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/WatchResult.java
index 120eead..9b8b1ad 100644
--- a/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/WatchResult.java
+++ b/Common/src/main/java/net/frankheijden/serverutils/common/entities/results/WatchResult.java
@@ -5,7 +5,7 @@ import net.frankheijden.serverutils.common.config.ConfigKey;
 import net.frankheijden.serverutils.common.config.MessageKey;
 import net.frankheijden.serverutils.common.entities.ServerUtilsAudience;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.Template;
 
 public enum WatchResult implements AbstractResult {
     START(MessageKey.WATCHPLUGIN_START),
@@ -23,7 +23,7 @@ public enum WatchResult implements AbstractResult {
         this.key = key;
     }
 
-    public void sendTo(ServerUtilsAudience<?> sender, TagResolver... templates) {
+    public void sendTo(ServerUtilsAudience<?> sender, Template... templates) {
         Component component = ServerUtilsApp.getPlugin().getMessagesResource().get(key).toComponent(templates);
         sender.sendMessage(component);
     }
diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java b/Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java
index e4177c9..26b084f 100644
--- a/Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java
+++ b/Common/src/main/java/net/frankheijden/serverutils/common/tasks/PluginWatcherTask.java
@@ -28,9 +28,7 @@ import net.frankheijden.serverutils.common.entities.results.PluginResults;
 import net.frankheijden.serverutils.common.entities.results.WatchResult;
 import net.frankheijden.serverutils.common.managers.AbstractPluginManager;
 import net.frankheijden.serverutils.common.utils.FileUtils;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.Template;
 
 public class PluginWatcherTask<P, T> extends AbstractTask {
 
@@ -118,8 +116,7 @@ public class PluginWatcherTask<P, T> extends AbstractTask {
                 ServerUtilsPluginDescription description = descriptionOptional.get();
                 WatchEntry foundEntry = pluginIdToWatchEntryMap.remove(description.getId());
                 if (foundEntry != null) {
-                    send(WatchResult.DELETED_FILE_IS_CREATED, TagResolver.resolver("plugin",
-                            Tag.inserting(Component.text(foundEntry.pluginId))));
+                    send(WatchResult.DELETED_FILE_IS_CREATED, Template.of("plugin", foundEntry.pluginId));
                     fileNameToWatchEntryMap.put(fileName, foundEntry);
 
                     if (pluginIdToWatchEntryMap.isEmpty()) {
@@ -142,8 +139,7 @@ public class PluginWatcherTask<P, T> extends AbstractTask {
         AbstractPluginManager<P, ?> pluginManager = plugin.getPluginManager();
         Optional<File> fileOptional = pluginManager.getPluginFile(entry.pluginId);
         if (!fileOptional.isPresent()) {
-            send(WatchResult.FILE_DELETED, TagResolver.resolver("plugin",
-                    Tag.inserting(Component.text(entry.pluginId))));
+            send(WatchResult.FILE_DELETED, Template.of("plugin", entry.pluginId));
 
             fileNameToWatchEntryMap.remove(fileName);
             pluginIdToWatchEntryMap.put(entry.pluginId, entry);
@@ -187,7 +183,7 @@ public class PluginWatcherTask<P, T> extends AbstractTask {
         }, 10L);
     }
 
-    private void send(WatchResult result, TagResolver... templates) {
+    private void send(WatchResult result, Template... templates) {
         result.sendTo(sender, templates);
         if (sender.isPlayer()) {
             result.sendTo(plugin.getChatProvider().getConsoleServerAudience(), templates);
diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java b/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java
index bf61e42..11bd745 100644
--- a/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java
+++ b/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java
@@ -25,8 +25,7 @@ import net.frankheijden.serverutils.common.utils.GitHubUtils;
 import net.frankheijden.serverutils.common.utils.VersionUtils;
 import net.frankheijden.serverutilsupdater.common.Updater;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.Template;
 
 public class UpdateCheckerTask<U extends ServerUtilsPlugin<P, ?, ?, ?, ?>, P> implements Runnable {
 
@@ -137,9 +136,9 @@ public class UpdateCheckerTask<U extends ServerUtilsPlugin<P, ?, ?, ?, ?>, P> im
         if (!download || pluginAsset == null) {
             if (sender.isPlayer()) {
                 Component component = plugin.getMessagesResource().get(MessageKey.UPDATE_AVAILABLE).toComponent(
-                        TagResolver.resolver("old", Tag.inserting(Component.text(ServerUtilsApp.VERSION))),
-                        TagResolver.resolver("new", Tag.inserting(Component.text(githubVersion))),
-                        TagResolver.resolver("info", Tag.inserting(Component.text(body)))
+                        Template.of("old", ServerUtilsApp.VERSION),
+                        Template.of("new", githubVersion),
+                        Template.of("info", body)
                 );
                 sender.sendMessage(component);
             }
@@ -149,9 +148,9 @@ public class UpdateCheckerTask<U extends ServerUtilsPlugin<P, ?, ?, ?, ?>, P> im
         plugin.getLogger().log(Level.INFO, DOWNLOAD_START, pluginAsset.getDownloadUrl());
         if (sender.isPlayer()) {
             Component component = plugin.getMessagesResource().get(MessageKey.UPDATE_DOWNLOADING).toComponent(
-                    TagResolver.resolver("old", Tag.inserting(Component.text(ServerUtilsApp.VERSION))),
-                    TagResolver.resolver("new", Tag.inserting(Component.text(githubVersion))),
-                    TagResolver.resolver("info", Tag.inserting(Component.text(body)))
+                    Template.of("old", ServerUtilsApp.VERSION),
+                    Template.of("new", githubVersion),
+                    Template.of("info", body)
             );
             sender.sendMessage(component);
         }
@@ -287,8 +286,7 @@ public class UpdateCheckerTask<U extends ServerUtilsPlugin<P, ?, ?, ?, ?>, P> im
 
     private void broadcastDownloadStatus(String githubVersion, boolean isError) {
         ConfigKey key = isError ? MessageKey.UPDATE_DOWNLOAD_FAILED : MessageKey.UPDATE_DOWNLOAD_SUCCESS;
-        Component component = plugin.getMessagesResource().get(key).toComponent(TagResolver.resolver("new",
-                Tag.inserting(Component.text(githubVersion))));
+        Component component = plugin.getMessagesResource().get(key).toComponent(Template.of("new", githubVersion));
         plugin.getChatProvider().broadcast(component, "serverutils.notification.update");
     }
 }
diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/utils/KeyValueComponentBuilder.java b/Common/src/main/java/net/frankheijden/serverutils/common/utils/KeyValueComponentBuilder.java
index 9900c10..b2e0db3 100644
--- a/Common/src/main/java/net/frankheijden/serverutils/common/utils/KeyValueComponentBuilder.java
+++ b/Common/src/main/java/net/frankheijden/serverutils/common/utils/KeyValueComponentBuilder.java
@@ -4,13 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 import net.frankheijden.serverutils.common.config.MessagesResource;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.Template;
 
 public class KeyValueComponentBuilder {
 
     private final MessagesResource.Message format;
-    private final List<TagResolver[]> templatesList;
+    private final List<Template[]> templatesList;
     private final String keyPlaceholder;
     private final String valuePlaceholder;
 
@@ -44,8 +43,8 @@ public class KeyValueComponentBuilder {
         return new KeyValuePair(key);
     }
 
-    private KeyValueComponentBuilder add(TagResolver key, TagResolver value) {
-        this.templatesList.add(new TagResolver[]{ key, value });
+    private KeyValueComponentBuilder add(Template key, Template value) {
+        this.templatesList.add(new Template[]{ key, value });
         return this;
     }
 
@@ -55,7 +54,7 @@ public class KeyValueComponentBuilder {
     public List<Component> build() {
         List<Component> components = new ArrayList<>(templatesList.size());
 
-        for (TagResolver[] templates : templatesList) {
+        for (Template[] templates : templatesList) {
             components.add(format.toComponent(templates));
         }
 
@@ -64,24 +63,24 @@ public class KeyValueComponentBuilder {
 
     public class KeyValuePair {
 
-        private final TagResolver key;
+        private final Template key;
 
         private KeyValuePair(String key) {
-            this.key = TagResolver.resolver(keyPlaceholder, Tag.inserting(Component.text(key)));
+            this.key = Template.of(keyPlaceholder, key);
         }
 
         private KeyValuePair(Component key) {
-            this.key = TagResolver.resolver(keyPlaceholder, Tag.inserting(key));
+            this.key = Template.of(keyPlaceholder, key);
         }
 
         public KeyValueComponentBuilder value(String value) {
             if (value == null) return KeyValueComponentBuilder.this;
-            return add(key, TagResolver.resolver(valuePlaceholder, Tag.inserting(Component.text(value))));
+            return add(key, Template.of(valuePlaceholder, value));
         }
 
         public KeyValueComponentBuilder value(Component value) {
             if (value == null) return KeyValueComponentBuilder.this;
-            return add(key, TagResolver.resolver(valuePlaceholder, Tag.inserting(value)));
+            return add(key, Template.of(valuePlaceholder, value));
         }
     }
 }
diff --git a/Velocity/build.gradle.kts b/Velocity/build.gradle.kts
index 1791410..ae56ff4 100644
--- a/Velocity/build.gradle.kts
+++ b/Velocity/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "${rootProject.group}"
-val dependencyDir = "net.frankheijden.serverutils.velocity.dependencies"
+val dependencyDir = "${group}.velocity.dependencies"
 version = rootProject.version
 base {
     archivesName.set("${rootProject.name}-velocity")
diff --git a/build.gradle.kts b/build.gradle.kts
index 8ad0b0a..f2be164 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,9 +6,9 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
-group = "org.zhdev.bukman"
-val dependencyDir = "net.frankheijden.serverutils.dependencies"
-version = "3.5.6"
+group = "net.frankheijden.serverutils"
+val dependencyDir = "${group}.dependencies"
+version = "3.5.6-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/buildSrc/src/main/kotlin/VersionConstants.kt b/buildSrc/src/main/kotlin/VersionConstants.kt
index a45fe1c..9cb5365 100644
--- a/buildSrc/src/main/kotlin/VersionConstants.kt
+++ b/buildSrc/src/main/kotlin/VersionConstants.kt
@@ -1,7 +1,7 @@
 object VersionConstants {
     const val cloudVersion = "1.8.5-SNAPSHOT"
-    const val adventureVersion = "4.14.0"
-    const val adventurePlatformVersion = "4.4.1"
-    const val adventureMinimessageVersion = "4.14.0"
+    const val adventureVersion = "4.11.0"
+    const val adventurePlatformVersion = "4.1.2"
+    const val adventureMinimessageVersion = "4.2.0-SNAPSHOT"
     const val bstatsVersion = "3.0.0"
 }