diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle
index 6cf50de6..7a5f1601 100644
--- a/DynmapCore/build.gradle
+++ b/DynmapCore/build.gradle
@@ -13,7 +13,7 @@ sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = co
 dependencies {
     implementation project(':DynmapCoreAPI')
     implementation 'javax.servlet:javax.servlet-api:3.1.0'
-    implementation'org.eclipse.jetty:jetty-server:9.4.58.v20250814'
+    implementation'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
     implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117'
     implementation 'com.googlecode.json-simple:json-simple:1.1.1'
     implementation 'org.yaml:snakeyaml:1.23'	// DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES
diff --git a/README.md b/README.md
index e1bd7b8a..640ac88b 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,5 @@
 # Dynmap®  - dynamic web maps for Minecraft servers
 
-> **About this fork.** This repository tracks [Dynmap](https://github.com/webbukkit/dynmap)
-> with an added **NeoForge 1.21.1** build. The `main` branch mirrors the upstream
-> multi-platform project (Spigot/Paper, Forge, Fabric, and the original README below);
-> the **`neoforge-1.21.1`** branch holds the standalone NeoForge 1.21.1 port and its own
-> build/install instructions. For the canonical project, see
-> [webbukkit/dynmap](https://github.com/webbukkit/dynmap).
-
-
 # Jump around the README
 * [How to build](#how-to-build)
 * [What platforms are supported?](#what-platforms-are-supported)
diff --git a/bukkit-helper-118/build.gradle b/bukkit-helper-118/build.gradle
index 0e5baa45..f7093a23 100644
--- a/bukkit-helper-118/build.gradle
+++ b/bukkit-helper-118/build.gradle
@@ -12,6 +12,6 @@ dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')
   implementation project(path: ':DynmapCore', configuration: 'shadow')
-  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.18-rc3-R0.1-SNAPSHOT'
+  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.18-R0.1-SNAPSHOT'
   compileOnly group: 'org.spigotmc', name: 'spigot', version:'1.18-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper-120-2/build.gradle b/bukkit-helper-120-2/build.gradle
index 5ba3115b..6cca6f43 100644
--- a/bukkit-helper-120-2/build.gradle
+++ b/bukkit-helper-120-2/build.gradle
@@ -12,6 +12,6 @@ dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')
   implementation project(path: ':DynmapCore', configuration: 'shadow')
-  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.2-experimental-SNAPSHOT'
+  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.2-R0.1-SNAPSHOT'
   compileOnly group: 'org.spigotmc', name: 'spigot', version:'1.20.2-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper-120-4/build.gradle b/bukkit-helper-120-4/build.gradle
index 3afd340f..33dc9cf4 100644
--- a/bukkit-helper-120-4/build.gradle
+++ b/bukkit-helper-120-4/build.gradle
@@ -12,6 +12,6 @@ dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')
   implementation project(path: ':DynmapCore', configuration: 'shadow')
-  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.4-experimental-SNAPSHOT'
+  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.4-R0.1-SNAPSHOT'
   compileOnly group: 'org.spigotmc', name: 'spigot', version:'1.20.4-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper-120-5/build.gradle b/bukkit-helper-120-5/build.gradle
index aa461c3f..15448e08 100644
--- a/bukkit-helper-120-5/build.gradle
+++ b/bukkit-helper-120-5/build.gradle
@@ -12,6 +12,6 @@ dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')
   implementation project(path: ':DynmapCore', configuration: 'shadow')
-  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.4-experimental-SNAPSHOT'
+  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.4-R0.1-SNAPSHOT'
   compileOnly group: 'org.spigotmc', name: 'spigot', version:'1.20.5-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper-121-11/build.gradle b/bukkit-helper-121-11/build.gradle
index df6746ce..5a8ccc1f 100644
--- a/bukkit-helper-121-11/build.gradle
+++ b/bukkit-helper-121-11/build.gradle
@@ -12,7 +12,7 @@ dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')
   implementation project(path: ':DynmapCore', configuration: 'shadow')
-  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.21.11-R0.2-SNAPSHOT'
+  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.21.11-R0.1-SNAPSHOT'
   compileOnly ('org.spigotmc:spigot:1.21.11-R0.1-SNAPSHOT') {
     exclude group: "com.mojang", module: "jtracy"
   }
diff --git a/forge-1.12.2/build.gradle b/forge-1.12.2/build.gradle
index b0d66b0a..a4755357 100644
--- a/forge-1.12.2/build.gradle
+++ b/forge-1.12.2/build.gradle
@@ -25,7 +25,7 @@ eclipse {
 
 dependencies {
     implementation 'javax.servlet:javax.servlet-api:3.1.0'
-    implementation'org.eclipse.jetty:jetty-server:9.4.58.v20250814'
+    implementation'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
     implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117'
     implementation 'com.googlecode.json-simple:json-simple:1.1.1'
     implementation 'org.yaml:snakeyaml:1.23'	// DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES
diff --git a/forge-1.14.4/build.gradle b/forge-1.14.4/build.gradle
index 628cd762..420f74cf 100644
--- a/forge-1.14.4/build.gradle
+++ b/forge-1.14.4/build.gradle
@@ -36,7 +36,7 @@ project.archivesBaseName = "${project.archivesBaseName}-forge-1.14.4"
 
 dependencies {
     implementation project(path: ":DynmapCore", configuration: "shadow")
-    minecraft 'net.minecraftforge:forge:1.14.4-28.2.10'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.33'
 }
 
 processResources
diff --git a/forge-1.15.2/build.gradle b/forge-1.15.2/build.gradle
index a5ec88f1..ae14a9d6 100644
--- a/forge-1.15.2/build.gradle
+++ b/forge-1.15.2/build.gradle
@@ -36,7 +36,7 @@ project.archivesBaseName = "${project.archivesBaseName}-forge-1.15.2"
 
 dependencies {
     implementation project(path: ":DynmapCore", configuration: "shadow")
-    minecraft 'net.minecraftforge:forge:1.15.2-31.2.3'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.33'
 }
 
 processResources
diff --git a/forge-1.16.5/build.gradle b/forge-1.16.5/build.gradle
index 86695155..c11f2ddf 100644
--- a/forge-1.16.5/build.gradle
+++ b/forge-1.16.5/build.gradle
@@ -36,7 +36,7 @@ project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.5"
 
 dependencies {
     implementation project(path: ":DynmapCore", configuration: "shadow")
-    minecraft 'net.minecraftforge:forge:1.16.5-36.0.15'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.33'
 }
 
 processResources
diff --git a/forge-1.17.1/build.gradle b/forge-1.17.1/build.gradle
index c17fbc59..5b57fb30 100644
--- a/forge-1.17.1/build.gradle
+++ b/forge-1.17.1/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     implementation project(path: ":DynmapCore", configuration: "shadow")
     implementation project(path: ':DynmapCoreAPI')
     
-    minecraft 'net.minecraftforge:forge:1.17.1-37.0.12'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.33'
 }
 
 processResources
diff --git a/forge-1.18.2/build.gradle b/forge-1.18.2/build.gradle
index 6ef40fd9..f9050ca0 100644
--- a/forge-1.18.2/build.gradle
+++ b/forge-1.18.2/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     implementation project(path: ":DynmapCore", configuration: "shadow")
     implementation project(path: ':DynmapCoreAPI')
     
-    minecraft 'net.minecraftforge:forge:1.18.2-40.0.2'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.33'
 }
 
 processResources
diff --git a/forge-1.19.3/build.gradle b/forge-1.19.3/build.gradle
index fd1a89f1..5505d3e5 100644
--- a/forge-1.19.3/build.gradle
+++ b/forge-1.19.3/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     implementation project(path: ":DynmapCore", configuration: "shadow")
     implementation project(path: ':DynmapCoreAPI')
     
-    minecraft 'net.minecraftforge:forge:1.19.3-44.0.1'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.33'
 }
 
 processResources
diff --git a/forge-1.20.6/build.gradle b/forge-1.20.6/build.gradle
index 58413c93..3d372ec3 100644
--- a/forge-1.20.6/build.gradle
+++ b/forge-1.20.6/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     implementation project(path: ":DynmapCore", configuration: "shadow")
     implementation project(path: ':DynmapCoreAPI')
     
-    minecraft 'net.minecraftforge:forge:1.20.6-50.0.31'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.33'
 }
 
 processResources
diff --git a/forge-1.21.10/build.gradle b/forge-1.21.10/build.gradle
index fca8d02c..df6da339 100644
--- a/forge-1.21.10/build.gradle
+++ b/forge-1.21.10/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation project(path: ':DynmapCoreAPI')
     annotationProcessor 'net.minecraftforge:eventbus-validator:7.0.5'
     
-    minecraft 'net.minecraftforge:forge:1.21.10-60.1.5'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.33'
 }
 
 processResources
diff --git a/forge-1.21.11/build.gradle b/forge-1.21.11/build.gradle
index 897d5441..28cf05db 100644
--- a/forge-1.21.11/build.gradle
+++ b/forge-1.21.11/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation project(path: ':DynmapCoreAPI')
     annotationProcessor 'net.minecraftforge:eventbus-validator:7.0.5'
     
-    minecraft 'net.minecraftforge:forge:1.21.11-61.0.5'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.33'
 }
 
 processResources
diff --git a/forge-1.21.6/build.gradle b/forge-1.21.6/build.gradle
index 0e002414..d1aa8e1d 100644
--- a/forge-1.21.6/build.gradle
+++ b/forge-1.21.6/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     implementation project(path: ":DynmapCore", configuration: "shadow")
     implementation project(path: ':DynmapCoreAPI')
     
-    minecraft 'net.minecraftforge:forge:1.21.6-56.0.9'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.33'
 }
 
 processResources