diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 95c5dac..79d69db 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Set up JDK  17
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 832262c..e85a992 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up JDK  17
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
@@ -23,4 +23,4 @@ jobs:
           SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CURSE_TOKEN: ${{ secrets.CURSEFORGE_KEY }}
+          CURSE_TOKEN: ${{ secrets.CURSE_DEPLOY }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c437399..4026d38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
-## [84.0.0]
+## [21.0.0]
 
 ### Changed
 
-- Ported to 1.20.4
+- Ported to 1.21
+- Switched to using the `Neoforge` version scheme meaning we've switched from 86.0.0 to 21.0.0... Sorry for the confusion... I don't like it either.
+
+## [86.0.0]
+
+### Changed
+
+- Ported to 1.20.6
diff --git a/build.gradle b/build.gradle
index 80ba12f..bd0d3ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,8 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
-    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id "me.modmuss50.mod-publish-plugin" version "0.5.1"
+    id 'pro.mikey.plugins.insaniam' version "0.1-SNAPSHOT"
 }
 
 architectury {
@@ -51,7 +52,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {
@@ -59,27 +60,28 @@ allprojects {
     }
 }
 
+def changelogData = insaniamUtils.createChangelog {
+    file = file('CHANGELOG.md')
+    versionPattern = ~/## \[[^]]+]/
+    fallbackValue = "No changelog provided"
+    version = project.mod_version
+}
+
 publishMods {
     dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
-    changelog = file("./CHANGELOG.md").text
+    changelog = changelogData
     version = "${mod_version}"
     type = STABLE
 
     def fabricOptions = publishOptions {
         file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[FABRIC][${rootProject.minecraft_version}] ${project.name} ${mod_version}"
+        displayName = "[FABRIC] ${project.name} ${mod_version}"
         modLoaders.add("fabric")
     }
 
     def neoforgeOptions = publishOptions {
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[NEOFORGE][${rootProject.minecraft_version}] ${project.name} ${mod_version}"
-        modLoaders.add("forge")
-    }
-
-    def forgeOptions = publishOptions {
-        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[FORGE][${rootProject.minecraft_version}] ${project.name} ${mod_version}"
+        displayName = "[NEOFORGE] ${project.name} ${mod_version}"
         modLoaders.add("neoforge")
     }
 
@@ -110,13 +112,6 @@ publishMods {
         }
     }
 
-    curseforge("curseforgeForge") {
-        from(curseForgeOptions, forgeOptions)
-        requires {
-            slug = "architectury-api"
-        }
-    }
-
     modrinth("modrinthFabric") {
         from(modrinthOptions, fabricOptions)
         requires {
@@ -125,24 +120,17 @@ publishMods {
         }
     }
 
-    modrinth("modrinthForge") {
-        from(modrinthOptions, neoforgeOptions)
-        requires {
-            slug = "architectury-api"
-        }
-    }
 
     modrinth("modrinthNeoforge") {
-        from(modrinthOptions, forgeOptions)
+        from(modrinthOptions, neoforgeOptions)
         requires {
             slug = "architectury-api"
         }
     }
 
     github {
-        file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
         additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
-        additionalFiles.from project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+        file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
 
         repository = "${project.github_repo}"
         accessToken = providers.environmentVariable("GITHUB_TOKEN")
diff --git a/common/build.gradle b/common/build.gradle
index 0bfb983..22d0a16 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -9,7 +9,7 @@ loom {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-    modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+    modApi "dev.architectury:architectury:${rootProject.architectury_api_version}"
 }
 
 publishing {
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 2242dd1..567d21c 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
     // Remove the next line if you don't want to depend on the API
-    modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
+    modApi "dev.architectury:architectury-fabric:${rootProject.architectury_api_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index fdb8c7d..9553a74 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -6,8 +6,8 @@
   "description": "Speeds up leaf decay",
   "authors": ["ErrorMikey"],
   "contact": {
-    "homepage": "https://github.com/errormikey/accelerated-decay",
-    "sources": "https://github.com/errormikey/accelerated-decay"
+    "homepage": "https://github.com/Nanite/AcceleratedDecay",
+    "sources": "https://github.com/Nanite/AcceleratedDecay"
   },
   "license": "GPL3",
   "icon": "assets/AcceleratedDecay/icon.png",
@@ -21,7 +21,7 @@
   ],
   "depends": {
     "fabric": "*",
-    "minecraft": ">=1.20.1",
-    "architectury": ">=9.1.12"
+    "minecraft": ">=1.21",
+    "architectury": ">=13.0.0"
   }
 }
diff --git a/forge/build.gradle b/forge/build.gradle
deleted file mode 100644
index 0a28dc9..0000000
--- a/forge/build.gradle
+++ /dev/null
@@ -1,90 +0,0 @@
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
-}
-
-architectury {
-    platformSetupLoomIde()
-    forge()
-}
-
-repositories {
-    maven { url "https://files.minecraftforge.net/" }
-    maven { url "https://maven.creeperhost.net/" }
-}
-
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-
-    forge {
-        convertAccessWideners = true
-        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
-
-        mixinConfig "accelerateddecay-common.mixins.json"
-        mixinConfig "accelerateddecay.mixins.json"
-    }
-}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common
-}
-
-dependencies {
-    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
-    // Remove the next line if you don't want to depend on the API
-    modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    exclude "fabric.mod.json"
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    setArchiveClassifier "dev-shadow"
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-    setArchiveClassifier null
-    setArchivesBaseName("${rootProject.archivesBaseName}-${project.name}") // adds fabric to the maven and curse name
-}
-
-jar {
-    setArchiveClassifier "dev"
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-publishing {
-    publications {
-        mavenForge(MavenPublication) {
-            artifactId = "${rootProject.archivesBaseName}-${project.name}"
-            from components.java
-        }
-    }
-}
diff --git a/forge/gradle.properties b/forge/gradle.properties
deleted file mode 100644
index 32f842a..0000000
--- a/forge/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-loom.platform=forge
\ No newline at end of file
diff --git a/forge/src/main/java/pro/mikey/accelerateddecay/forge/AcceleratedDecayForge.java b/forge/src/main/java/pro/mikey/accelerateddecay/forge/AcceleratedDecayForge.java
deleted file mode 100644
index 3bc58f2..0000000
--- a/forge/src/main/java/pro/mikey/accelerateddecay/forge/AcceleratedDecayForge.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package pro.mikey.accelerateddecay.forge;
-
-import dev.architectury.platform.forge.EventBuses;
-import pro.mikey.accelerateddecay.AcceleratedDecay;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-
-@Mod(AcceleratedDecay.MOD_ID)
-public class AcceleratedDecayForge {
-    public AcceleratedDecayForge() {
-        EventBuses.registerModEventBus(AcceleratedDecay.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus());
-        AcceleratedDecay.init();
-    }
-}
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
deleted file mode 100644
index ec563bf..0000000
--- a/forge/src/main/resources/META-INF/mods.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[47,)"
-#issueTrackerURL = ""
-license = "GPL3"
-
-[[mods]]
-modId = "accelerateddecay"
-version = "${version}"
-displayName = "Accelerated Decay"
-authors = "ErrorMikey"
-description = '''
-Speeds up the decay of leaves
-'''
-#logoFile = ""
-
-[[dependencies.accelerateddecay]]
-modId = "forge"
-mandatory = true
-versionRange = "[47,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.accelerateddecay]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.20.1,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.accelerateddecay]]
-modId = "architectury"
-mandatory = true
-versionRange = "[9.1.12,)"
-ordering = "AFTER"
-side = "BOTH"
diff --git a/forge/src/main/resources/accelerateddecay.mixins.json b/forge/src/main/resources/accelerateddecay.mixins.json
deleted file mode 100644
index df08133..0000000
--- a/forge/src/main/resources/accelerateddecay.mixins.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "required": true,
-  "package": "pro.mikey.accelerateddecay.mixin.neoforge",
-  "compatibilityLevel": "JAVA_17",
-  "minVersion": "0.7",
-  "client": [],
-  "mixins": [],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
deleted file mode 100644
index e53603f..0000000
--- a/forge/src/main/resources/pack.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "pack": {
-    "description": "accelerateddecay Mod",
-    "pack_format": 8
-  }
-}
diff --git a/gradle.properties b/gradle.properties
index 7239913..6ae68bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,18 +1,17 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.20.4
-enabled_platforms=fabric,forge,neoforge
+minecraft_version=1.21
+enabled_platforms=fabric,neoforge
 
 archives_base_name=accelerated-decay
-mod_version=84.0.0
+mod_version=21.0.0
 maven_group=pro.mikey.mods
 
-fabric_loader_version=0.15.3
-fabric_api_version=0.92.0+1.20.4
-forge_version=49.0.12
-neoforge_version=20.4.62-beta
+fabric_loader_version=0.15.11
+fabric_api_version=0.100.1+1.21
+neoforge_version=21.0.10-beta
 
-architectury_version=11.0.9
+architectury_api_version=13.0.1
 
 curseforge_id=699872
 modrinth_id=laX5CckD
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a595206..48c0a02 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index e1303c3..ee81c8f 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -29,7 +29,7 @@ configurations {
 dependencies {
     neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
     // Remove the next line if you don't want to depend on the API
-    modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}"
+    modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_api_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
@@ -38,7 +38,7 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand "version": project.version
     }
 }
diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
similarity index 79%
rename from neoforge/src/main/resources/META-INF/mods.toml
rename to neoforge/src/main/resources/META-INF/neoforge.mods.toml
index 2d8df43..19cae69 100644
--- a/neoforge/src/main/resources/META-INF/mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -1,6 +1,6 @@
 modLoader = "javafml"
-loaderVersion = "[1,)"
-#issueTrackerURL = ""
+loaderVersion = "[3,)"
+issueTrackerURL = "https://github.com/Nanite/AcceleratedDecay/issues"
 license = "GPL3"
 
 [[mods]]
@@ -16,21 +16,21 @@ Speeds up the decay of leaves
 [[dependencies.accelerateddecay]]
 modId = "neoforge"
 required = true
-versionRange = "[20.2,)"
+versionRange = "[21.0,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.accelerateddecay]]
 modId = "minecraft"
 required = true
-versionRange = "[1.20.2,)"
+versionRange = "[1.21,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.accelerateddecay]]
 modId = "architectury"
 required = true
-versionRange = "[9.1.12,)"
+versionRange = "[13.0.0,)"
 ordering = "AFTER"
 side = "BOTH"
 
diff --git a/settings.gradle b/settings.gradle
index f1699d7..c3687f3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,12 +13,26 @@ pluginManagement {
         maven {
             url "https://maven.creeperhost.net/"
         }
+
+        maven {
+            url "https://maven.saps.dev/releases"
+            content {
+                includeGroupByRegex("pro.mikey.*")
+            }
+        }
+
+        maven {
+            url "https://maven.saps.dev/snapshots"
+            content {
+                includeGroupByRegex("pro.mikey.*")
+            }
+        }
     }
 }
 
 include("common")
 include("fabric")
-include("forge")
+//include("forge")
 include("neoforge")
 
 rootProject.name = "accelerated-decay"