diff --git a/README.md b/README.md
index 8072030..7380cea 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,4 @@ Ignite Mod Template [![Discord](https://img.shields.io/discord/81952297758634805
 ===================
 
 A template for creating an [Ignite](https://github.com/vectrix-space/ignite) 
-mod for [Paper](https://papermc.io/) 1.20.4.
+mod for [Paper](https://papermc.io/) 1.21.1.
diff --git a/build-logic/src/main/kotlin/mod.base-conventions.gradle.kts b/build-logic/src/main/kotlin/mod.base-conventions.gradle.kts
index e84eb1d..cf1e18e 100644
--- a/build-logic/src/main/kotlin/mod.base-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/mod.base-conventions.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 val libs = extensions.getByType(org.gradle.accessors.dm.LibrariesForLibs::class)
 
 java {
-  javaTarget(17)
+  javaTarget(21)
   withSourcesJar()
 }
 
@@ -27,6 +27,11 @@ repositories {
   maven("https://repo.spongepowered.org/maven/")
 }
 
+// **
+// Paper Only
+paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
+// **
+
 dependencies {
   compileOnlyApi(libs.jetbrains.annotations)
 }
@@ -77,11 +82,25 @@ tasks {
     archiveClassifier.set("dev")
   }
 
-  reobfJar {
-    remapperArgs.add("--mixin")
+  // **
+  // Paper Only
+  shadowJar {
+    archiveClassifier.set("")
   }
 
   build {
-    dependsOn(reobfJar)
+    dependsOn(shadowJar)
   }
+  // **
+
+  // **
+  // Spigot Compatibility
+  //reobfJar {
+  //  remapperArgs.add("--mixin")
+  //}
+  //
+  //build {
+  //  dependsOn(reobfJar)
+  //}
+  // **
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2c7ab49..ce7a7fd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ mixinExtras = "0.4.1"
 paperweight = "1.7.5"
 shadow = "8.1.1"
 spotless = "6.25.0"
-paper = "1.20.4-R0.1-SNAPSHOT"
+paper = "1.21.1-R0.1-SNAPSHOT"
 
 [libraries]
 jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains" }
diff --git a/src/main/java/com/example/mixin/core/MixinCraftServer.java b/src/main/java/com/example/mixin/core/MixinCraftServer.java
index 692ac07..19935a6 100644
--- a/src/main/java/com/example/mixin/core/MixinCraftServer.java
+++ b/src/main/java/com/example/mixin/core/MixinCraftServer.java
@@ -25,7 +25,7 @@
 package com.example.mixin.core;
 
 import java.util.logging.Logger;
-import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.CraftServer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/example/mixin/core/MixinSimpleCommandMap.java b/src/main/java/com/example/mixin/core/MixinSimpleCommandMap.java
index 1e86760..e907071 100644
--- a/src/main/java/com/example/mixin/core/MixinSimpleCommandMap.java
+++ b/src/main/java/com/example/mixin/core/MixinSimpleCommandMap.java
@@ -39,6 +39,6 @@ public abstract class MixinSimpleCommandMap {
 
   @Inject(method = "setDefaultCommands()V", at = @At("TAIL"), remap = false)
   public void registerOwnCommands(CallbackInfo callback) {
-    this.register("example", new HelloCommand("hello"));
+    this.register("bukkit", new HelloCommand("hello"));
   }
 }
diff --git a/src/main/resources/mixins.example.core.json b/src/main/resources/mixins.example.core.json
index 7af2e18..12ddb7e 100644
--- a/src/main/resources/mixins.example.core.json
+++ b/src/main/resources/mixins.example.core.json
@@ -1,10 +1,10 @@
 {
   "required": true,
-  "minVersion": "0.8.5",
+  "minVersion": "0.8.7",
   "package": "com.example.mixin.core",
   "plugin": "com.example.mixin.plugins.CorePlugin",
   "target": "@env(DEFAULT)",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "server": [
     "MixinCraftServer",
     "MixinSimpleCommandMap"