diff --git a/.gitignore b/.gitignore
index ba968fd..4cadab1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 ### Java template
-target/classes/io/github/archemedes/knockoutplus/corpse/CorpseRegistry.class
 /.idea
+/*.iml
 /libs
 
 # Mobile Tools for Java (J2ME)
diff --git a/pom.xml b/pom.xml
index 9f64c55..37f4892 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,91 +2,98 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<modelVersion>4.0.0</modelVersion>
-<groupId>com.gmail.st3venau.plugins</groupId>
-<artifactId>ArmorStandTools</artifactId>
-<version>4.4.6</version>
-<name>ArmorStandTools</name>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.gmail.st3venau.plugins</groupId>
+    <artifactId>ArmorStandTools</artifactId>
+    <version>4.4.6</version>
+    <name>ArmorStandTools</name>
 
-<repositories>
-    <!-- Spigot -->
-    <repository>
-        <id>spigot-repo</id>
-        <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-    </repository>
-    <!-- WorldEdit / WorldGuard -->
-    <repository>
-        <id>sk89q-repo</id>
-        <url>https://maven.sk89q.com/repo/</url>
-    </repository>
-    <!-- PlotSquared -->
-    <repository>
-        <id>intellectualsites releases</id>
-        <url>https://mvn.intellectualsites.com/content/repositories/releases/</url>
-    </repository>
-    <repository>
-        <id>intellectualsites snapshots</id>
-        <url>https://mvn.intellectualsites.com/content/repositories/snapshots/</url>
-    </repository>
-    <repository> <!-- needed due to missing dependency on PlotSquared for adventure-text-minimessage -->
-        <id>sonatype-oss-snapshots</id>
-        <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-    </repository>
-</repositories>
+    <repositories>
+        <!-- Spigot -->
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <!-- WorldEdit / WorldGuard -->
+        <repository>
+            <id>enginehub-repo</id>
+            <url>https://maven.enginehub.org/repo/</url>
+        </repository>
+        <!-- PlotSquared -->
+        <repository>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
+        <repository> <!-- needed due to missing dependency on PlotSquared for adventure-text-minimessage -->
+            <id>sonatype-oss-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
 
-<dependencies>
-    <!-- Spigot -->
-    <dependency>
-        <groupId>org.spigotmc</groupId>
-        <artifactId>spigot-api</artifactId>
-        <version>1.18-R0.1-SNAPSHOT</version>
-        <scope>provided</scope>
-    </dependency>
-    <!-- WorldGuard -->
-    <dependency>
-        <groupId>com.sk89q.worldguard</groupId>
-        <artifactId>worldguard-bukkit</artifactId>
-        <version>7.0.7-SNAPSHOT</version>
-        <scope>provided</scope>
-    </dependency>
-    <!-- WorldEdit -->
-    <dependency>
-        <groupId>com.sk89q.worldedit</groupId>
-        <artifactId>worldedit-core</artifactId>
-        <version>7.3.0-SNAPSHOT</version>
-        <scope>provided</scope>
-    </dependency>
-    <!-- PlotSquared Core API -->
-    <dependency>
-        <groupId>com.plotsquared</groupId>
-        <artifactId>PlotSquared-Core</artifactId>
-        <version>6.1.3</version>
-    </dependency>
-</dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.intellectualsites.bom</groupId>
+                <artifactId>bom-newest</artifactId>
+                <version>1.47</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-<build>
-    <defaultGoal>clean package install</defaultGoal>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <finalName>${project.name}-${project.version}</finalName>
-    <resources>
-        <resource>
-            <directory>src/main/resources</directory>
-            <filtering>true</filtering>
-            <includes>
-                <include>**/*.yml</include>
-            </includes>
-        </resource>
-    </resources>
-    <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-                <source>16</source>
-                <target>16</target>
-            </configuration>
-        </plugin>
-    </plugins>
-</build>
+    <dependencies>
+        <!-- Spigot -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.21-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- WorldGuard -->
+        <dependency>
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-bukkit</artifactId>
+            <version>7.0.10</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- WorldEdit -->
+        <dependency>
+            <groupId>com.sk89q.worldedit</groupId>
+            <artifactId>worldedit-core</artifactId>
+            <version>7.3.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- PlotSquared Core API -->
+        <dependency>
+            <groupId>com.intellectualsites.plotsquared</groupId>
+            <artifactId>plotsquared-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <finalName>${project.name}-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <release>17</release>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
 
 </project>
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/AST.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/AST.java
similarity index 100%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/AST.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/AST.java
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/ArmorStandCmd.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/ArmorStandCmd.java
similarity index 97%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/ArmorStandCmd.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/ArmorStandCmd.java
index 0744031..b1e69f3 100644
--- a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/ArmorStandCmd.java
+++ b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/ArmorStandCmd.java
@@ -6,7 +6,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandException;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.Serializable;
 
@@ -103,7 +102,7 @@ public record ArmorStandCmd(String command, CommandType type, Integer priority,
     }
 
     @Override
-    public int compareTo(@NotNull ArmorStandCmd o) {
+    public int compareTo(ArmorStandCmd o) {
         return Integer.compare(priority, o.priority);
     }
 }
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/ArmorStandCmdManager.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/ArmorStandCmdManager.java
similarity index 100%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/ArmorStandCmdManager.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/ArmorStandCmdManager.java
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/ArmorStandGUI.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/ArmorStandGUI.java
similarity index 100%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/ArmorStandGUI.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/ArmorStandGUI.java
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/ArmorStandTool.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/ArmorStandTool.java
similarity index 100%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/ArmorStandTool.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/ArmorStandTool.java
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/CommandType.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/CommandType.java
similarity index 100%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/CommandType.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/CommandType.java
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/Commands.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/Commands.java
similarity index 100%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/Commands.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/Commands.java
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/Config.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/Config.java
similarity index 100%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/Config.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/Config.java
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/MainListener.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/MainListener.java
similarity index 100%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/MainListener.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/MainListener.java
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/PlotSquaredHook.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/PlotSquaredHook.java
similarity index 100%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/PlotSquaredHook.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/PlotSquaredHook.java
diff --git a/src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/Utils.java b/src/main/java/com/gmail/st3venau/plugins/armorstandtools/Utils.java
similarity index 100%
rename from src/main/java/com/gmail/St3venAU/plugins/ArmorStandTools/Utils.java
rename to src/main/java/com/gmail/st3venau/plugins/armorstandtools/Utils.java