diff --git a/src/main/java/com/alttd/afkdectector/command/AFKListCommand.java b/src/main/java/com/alttd/afkdectector/command/AFKListCommand.java
index b2309da..f9f1042 100755
--- a/src/main/java/com/alttd/afkdectector/command/AFKListCommand.java
+++ b/src/main/java/com/alttd/afkdectector/command/AFKListCommand.java
@@ -5,10 +5,9 @@ import com.alttd.afkdectector.afkplayer.AFKPlayer;
 import com.alttd.afkdectector.config.Config;
 import com.alttd.afkdectector.config.Messages;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.template.TemplateResolver;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -35,18 +34,18 @@ public class AFKListCommand implements CommandExecutor, TabCompleter {
     		if(System.currentTimeMillis() - standingTime > Config.TOGGLETIME * 60 * 1000) {
     			afkplayers += 1;
     			message = message.append(Component.newline());
-				List<Template> templates = new ArrayList<>(List.of(
-						Template.template("player", afkplayer.getPlayerName()),
-						Template.template("afktime", (System.currentTimeMillis() - standingTime) / 1000 + "")
-				));
-				Component userinfo = miniMessage.deserialize(Messages.AFK_LIST_ENTRY.getMessage(), TemplateResolver.templates(templates));
+				TagResolver templates = TagResolver.resolver(
+						Placeholder.parsed("player", afkplayer.getPlayerName()),
+						Placeholder.parsed("afktime", (System.currentTimeMillis() - standingTime) / 1000 + "")
+				);
+				Component userinfo = miniMessage.deserialize(Messages.AFK_LIST_ENTRY.getMessage(), templates);
 				message = message.append(userinfo);
     		}
     	}
-		List<Template> templates = new ArrayList<>(List.of(
-				Template.template("afkplayers", Integer.toString(afkplayers))
-		));
-    	Component component = miniMessage.deserialize(Messages.AFK_LIST.getMessage(), TemplateResolver.templates(templates));
+		TagResolver templates = TagResolver.resolver(
+				Placeholder.parsed("afkplayers", Integer.toString(afkplayers))
+		);
+    	Component component = miniMessage.deserialize(Messages.AFK_LIST.getMessage(), templates);
     	sender.sendMessage(component.append(message));
         return true;
     }
diff --git a/src/main/java/com/alttd/afkdectector/command/ReloadCommand.java b/src/main/java/com/alttd/afkdectector/command/ReloadCommand.java
index 338cdcf..d9ca3ce 100755
--- a/src/main/java/com/alttd/afkdectector/command/ReloadCommand.java
+++ b/src/main/java/com/alttd/afkdectector/command/ReloadCommand.java
@@ -1,18 +1,11 @@
 package com.alttd.afkdectector.command;
 
 import com.alttd.afkdectector.AFKDetector;
-import com.alttd.afkdectector.afkplayer.AFKPlayer;
-import com.alttd.afkdectector.config.Config;
-import com.alttd.afkdectector.config.Messages;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.Template;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class ReloadCommand implements CommandExecutor, TabCompleter {