diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index bdced41..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index ccb0c56..27264ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@ classes/
 .metadata
 .vscode
 .settings
-*.launch
\ No newline at end of file
+*.launch
+
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5233952..4026d38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [21.0.0]
+
+### Changed
+
+- 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
diff --git a/build.gradle b/build.gradle
index 273e28d..1e56be1 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.6-SNAPSHOT" apply false
-    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
+    id "me.modmuss50.mod-publish-plugin" version "0.5.1"
+    id 'pro.mikey.plugins.insaniam' version "0.1-SNAPSHOT"
 }
 
 architectury {
@@ -29,9 +30,6 @@ allprojects {
     apply plugin: "architectury-plugin"
     apply plugin: "maven-publish"
 
-    def ENV = System.getenv()
-    ext.ENV = ENV
-
     archivesBaseName = rootProject.archives_base_name
     version = rootProject.mod_version
     group = rootProject.maven_group
@@ -55,12 +53,13 @@ allprojects {
 
     publishing {
         repositories {
-            if (ENV.NANITE_TOKEN) {
+            def naniteToken = providers.environmentVariable("NANITE_TOKEN")
+            if (naniteToken.isPresent()) {
                 maven {
                     url "https://maven.nanite.dev/releases"
                     credentials {
                         username = "nanite"
-                        password = "${ENV.NANITE_TOKEN}"
+                        password = naniteToken.get()
                     }
                 }
             }
@@ -68,27 +67,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][${minecraft_version}] Default Server Properties ${mod_version}"
+        displayName = "[FABRIC] Default Server Properties ${mod_version}"
         modLoaders.add("fabric")
     }
 
-//    def forgeOptions = publishOptions {
-//        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-//        displayName = "[FORGE][${minecraft_version}] Default Server Properties ${mod_version}"
-//        modLoaders.add("forge")
-//    }
-
     def neoForge = publishOptions {
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[NEOFORGE][${minecraft_version}] Default Server Properties ${mod_version}"
+        displayName = "[NEOFORGE] Default Server Properties ${mod_version}"
         modLoaders.add("neoforge")
     }
 
@@ -111,10 +111,6 @@ publishMods {
         }
     }
 
-//    curseforge("curseforgeForge") {
-//        from(curseForgeOptions, forgeOptions)
-//    }
-
     curseforge("curseforgeNeoForge") {
         from(curseForgeOptions, neoForge)
     }
@@ -126,16 +122,11 @@ publishMods {
         }
     }
 
-//    modrinth("modrinthForge") {
-//        from(modrinthOptions, forgeOptions)
-//    }
-
     modrinth("modrinthNeoforge") {
         from(modrinthOptions, neoForge)
     }
 
     github {
-//        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
         additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
 
diff --git a/common/.DS_Store b/common/.DS_Store
deleted file mode 100644
index 75a8645..0000000
Binary files a/common/.DS_Store and /dev/null differ
diff --git a/common/build.gradle b/common/build.gradle
index 249ff04..ff3d872 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -17,16 +17,4 @@ publishing {
             from components.java
         }
     }
-
-    repositories {
-        if (ENV.NANITE_TOKEN) {
-            maven {
-                url "https://maven.nanite.dev/releases"
-                credentials {
-                    username = "nanite"
-                    password = "${ENV.NANITE_TOKEN}"
-                }
-            }
-        }
-    }
 }
diff --git a/common/src/.DS_Store b/common/src/.DS_Store
deleted file mode 100644
index b253e43..0000000
Binary files a/common/src/.DS_Store and /dev/null differ
diff --git a/common/src/main/.DS_Store b/common/src/main/.DS_Store
deleted file mode 100644
index 80ef5df..0000000
Binary files a/common/src/main/.DS_Store and /dev/null differ
diff --git a/common/src/main/java/.DS_Store b/common/src/main/java/.DS_Store
deleted file mode 100644
index 1130da4..0000000
Binary files a/common/src/main/java/.DS_Store and /dev/null differ
diff --git a/common/src/main/java/dev/.DS_Store b/common/src/main/java/dev/.DS_Store
deleted file mode 100644
index 50e4941..0000000
Binary files a/common/src/main/java/dev/.DS_Store and /dev/null differ
diff --git a/fabric/src/main/.DS_Store b/fabric/src/main/.DS_Store
deleted file mode 100644
index 80ef5df..0000000
Binary files a/fabric/src/main/.DS_Store and /dev/null differ
diff --git a/forge/.DS_Store b/forge/.DS_Store
deleted file mode 100644
index 75a8645..0000000
Binary files a/forge/.DS_Store and /dev/null differ
diff --git a/forge/build.gradle b/forge/build.gradle
deleted file mode 100644
index 55cce56..0000000
--- a/forge/build.gradle
+++ /dev/null
@@ -1,90 +0,0 @@
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
-}
-
-architectury {
-    platformSetupLoomIde()
-    forge()
-}
-
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-
-    forge {
-        convertAccessWideners = true
-        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
-
-        mixinConfig "dsp-common.mixins.json"
-        mixinConfig "dsp.mixins.json"
-    }
-}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common
-}
-
-dependencies {
-    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
-}
-
-processResources {
-    def forgeMajor = ((String) rootProject.forge_version).split("-").last().split("\\.").first()
-    inputs.properties([
-            version: project.version,
-            mcversion: rootProject.minecraft_version,
-            forgemajor: forgeMajor
-    ])
-
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version,
-                "mcversion": rootProject.minecraft_version,
-                "forgemajor": forgeMajor
-    }
-}
-
-shadowJar {
-    exclude "fabric.mod.json"
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    setArchiveClassifier("dev-shadow")
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveBaseName.set "${rootProject.archives_base_name}-${project.name}"
-    setArchiveClassifier(null)
-}
-
-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.archives_base_name + "-" + 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/.DS_Store b/forge/src/.DS_Store
deleted file mode 100644
index b253e43..0000000
Binary files a/forge/src/.DS_Store and /dev/null differ
diff --git a/forge/src/main/.DS_Store b/forge/src/main/.DS_Store
deleted file mode 100644
index 80ef5df..0000000
Binary files a/forge/src/main/.DS_Store and /dev/null differ
diff --git a/forge/src/main/java/.DS_Store b/forge/src/main/java/.DS_Store
deleted file mode 100644
index 1130da4..0000000
Binary files a/forge/src/main/java/.DS_Store and /dev/null differ
diff --git a/forge/src/main/java/dev/.DS_Store b/forge/src/main/java/dev/.DS_Store
deleted file mode 100644
index 50e4941..0000000
Binary files a/forge/src/main/java/dev/.DS_Store and /dev/null differ
diff --git a/forge/src/main/java/dev/nanite/.DS_Store b/forge/src/main/java/dev/nanite/.DS_Store
deleted file mode 100644
index 4392f74..0000000
Binary files a/forge/src/main/java/dev/nanite/.DS_Store and /dev/null differ
diff --git a/forge/src/main/java/dev/nanite/dsp/forge/DSPExpectedPlatformImpl.java b/forge/src/main/java/dev/nanite/dsp/forge/DSPExpectedPlatformImpl.java
deleted file mode 100644
index 782ff97..0000000
--- a/forge/src/main/java/dev/nanite/dsp/forge/DSPExpectedPlatformImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package dev.nanite.dsp.forge;
-
-import net.minecraftforge.fml.loading.FMLPaths;
-
-import java.nio.file.Path;
-
-public class DSPExpectedPlatformImpl {
-    public static Path getGameDir() {
-        return FMLPaths.GAMEDIR.get();
-    }
-}
diff --git a/forge/src/main/java/dev/nanite/dsp/forge/DSPModForge.java b/forge/src/main/java/dev/nanite/dsp/forge/DSPModForge.java
deleted file mode 100644
index 5de484c..0000000
--- a/forge/src/main/java/dev/nanite/dsp/forge/DSPModForge.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package dev.nanite.dsp.forge;
-
-import dev.nanite.dsp.DSPMod;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod(DSPMod.MOD_ID)
-public class DSPModForge {
-    public DSPModForge() {
-        DSPMod.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 ac095d5..0000000
--- a/forge/src/main/resources/META-INF/mods.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[${forgemajor},)"
-license = "Mozilla Public License 2.0"
-issueTrackerURL="https://github.com/nanite/Default-Server-Properties/issues"
-
-[[mods]]
-modId = "dsp"
-version = "${version}"
-authors = "ErrorMikey"
-credits = "Nanite Team"
-displayName = "Default Server Properties"
-description = '''
-Simple mod that allows modpack developers to define a default server properties file. This is typically used for settings like the default_level_type.
-'''
-displayTest="IGNORE_ALL_VERSION"
-
-[[dependencies.dsp]]
-modId = "forge"
-mandatory = true
-versionRange = "[${forgemajor},)"
-ordering = "NONE"
-side = "SERVER"
-
-[[dependencies.dsp]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[${mcversion},)"
-ordering = "NONE"
-side = "SERVER"
diff --git a/forge/src/main/resources/dsp.mixins.json b/forge/src/main/resources/dsp.mixins.json
deleted file mode 100644
index edd3fc7..0000000
--- a/forge/src/main/resources/dsp.mixins.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "required": true,
-  "package": "dev.nanite.dsp.mixin.forge",
-  "compatibilityLevel": "JAVA_17",
-  "minVersion": "0.8",
-  "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 13bddd4..0000000
--- a/forge/src/main/resources/pack.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "pack": {
-    "description": "DSP Mod",
-    "pack_format": 8
-  }
-}
diff --git a/gradle.properties b/gradle.properties
index 5ba40c6..237d2f5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,18 +1,16 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.20.6
-#enabled_platforms=fabric,forge,neoforge
+minecraft_version=1.21
 enabled_platforms=fabric,neoforge
 
 archives_base_name=default-server-properties
-mod_version=86.0.0
+mod_version=21.0.0
 maven_group=dev.nanite.mods
 
 fabric_loader_version=0.15.11
-fabric_api_version=0.100.0+1.20.6
+fabric_api_version=0.100.1+1.21
 
-#forge_version=49.0.12
-neo_forge=20.6.113-beta
+neoforge_version=21.0.10-beta
 
 curseforge_id=676811
 modrinth_id=Fnrzx9Jl
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 1f71183..f2c95da 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -29,7 +29,7 @@ configurations {
 }
 
 dependencies {
-    neoForge "net.neoforged:neoforge:${rootProject.neo_forge}"
+    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index 8ee8aef..810fd4f 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -17,14 +17,14 @@ displayTest="IGNORE_ALL_VERSION"
 [[dependencies.dsp]]
 modId = "neoforge"
 required = true
-versionRange = "[20.6,)"
+versionRange = "[21.0,)"
 ordering = "NONE"
 side = "SERVER"
 
 [[dependencies.dsp]]
 modId = "minecraft"
 required = true
-versionRange = "[1.20.6,)"
+versionRange = "[1.21,)"
 ordering = "NONE"
 side = "SERVER"
 
diff --git a/settings.gradle b/settings.gradle
index ab59e32..bb6483d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,6 +4,8 @@ pluginManagement {
         maven { url "https://maven.architectury.dev/" }
         maven { url "https://maven.minecraftforge.net/" }
         maven { url "https://maven.neoforged.net/releases" }
+        maven { url "https://maven.saps.dev/releases" }
+        maven { url "https://maven.saps.dev/snapshots" }
         gradlePluginPortal()
     }
 }