diff --git a/build.gradle b/build.gradle
index 3aee98e..be3db0b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,11 @@
 plugins {
-    id 'fabric-loom' version '1.10-SNAPSHOT'
+    id 'fabric-loom' version "${loom_version}"
     id 'maven-publish'
 }
 
 version = project.mod_version
 group = project.maven_group
 
-base {
-    archivesName = project.archivesBaseName
-}
-
 loom {
     runs {
         // This adds a new gradle task that runs the datagen API: "gradlew runDatagenClient"
diff --git a/gradle.properties b/gradle.properties
index dc0d569..24e59a0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,18 +2,19 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.16.14
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
+loader_version=0.17.2
+loom_version=1.11-SNAPSHOT
 
 #Fabric api
-fabric_version=0.121.0+1.21.5
+fabric_version=0.128.2+1.21.6
 
 # Mod Properties
-mod_version=2.0.5
+mod_version=2.0.6
 maven_group=com.mosadie
-archives_base_name=servermainmenu-lib
+archivesBaseName=servermainmenu-lib
 
 # Dependency Versions (easy to check on https://linkie.shedaniel.dev/dependencies)
-cloth_config_version=18.0.145
-mod_menu_version=14.0.0-rc.2
\ No newline at end of file
+cloth_config_version=19.0.147
+mod_menu_version=15.0.0
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a79..2e11132 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6..f3b75f3 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/src/main/java/com/mosadie/servermainmenu/api/NormalTheme.java b/src/main/java/com/mosadie/servermainmenu/api/NormalTheme.java
index 0160806..c38ca38 100644
--- a/src/main/java/com/mosadie/servermainmenu/api/NormalTheme.java
+++ b/src/main/java/com/mosadie/servermainmenu/api/NormalTheme.java
@@ -16,7 +16,7 @@ public String getId() {
 
     @Override
     public Identifier getPanorama() {
-        return Identifier.ofVanilla("textures/gui/title/background/panorama");
+        return Identifier.of("minecraft", "textures/gui/title/background/panorama");
     }
 
     @Override
diff --git a/src/main/java/com/mosadie/servermainmenu/api/Util.java b/src/main/java/com/mosadie/servermainmenu/api/Util.java
index 07b39c0..7d4beb5 100644
--- a/src/main/java/com/mosadie/servermainmenu/api/Util.java
+++ b/src/main/java/com/mosadie/servermainmenu/api/Util.java
@@ -132,8 +132,8 @@ private static void leaveIfNeeded() {
         if (MinecraftClient.getInstance().world != null) {
             ServerMainMenuLibClient.LOGGER.info("Disconnecting from world...");
 
-            MinecraftClient.getInstance().world.disconnect();
-            MinecraftClient.getInstance().disconnect();
+            MinecraftClient.getInstance().world.disconnect(Text.translatable("menu.disconnect"));
+            MinecraftClient.getInstance().disconnectWithProgressScreen();
         }
     }
 }
diff --git a/src/main/java/com/mosadie/servermainmenu/mixin/IdentifierMixin.java b/src/main/java/com/mosadie/servermainmenu/mixin/IdentifierMixin.java
index fef1e86..7cf5b51 100644
--- a/src/main/java/com/mosadie/servermainmenu/mixin/IdentifierMixin.java
+++ b/src/main/java/com/mosadie/servermainmenu/mixin/IdentifierMixin.java
@@ -8,6 +8,7 @@
 @Mixin(Identifier.class)
 public class IdentifierMixin {
     // I'm sorry future self for this mixin. It's a complete hack, and will likely break at some point.
+    // Future self here in September 2025. This has so far caused 1 bug report. (#12)
     /**
      * @author MoSadie
      * @reason Trying to get the panorama ID to resolve to a custom one instead, am tied of running into so many rendering issues so time for hacky solutions. Added in v2.0.5 when updating to Minecraft 1.21.5 because I could not get the previous system of overwriting the panorama renderer completely to work.
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index b8195d2..7396312 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -30,11 +30,11 @@
     "servermainmenu-lib.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.16.10",
-    "fabric-api": ">=0.119.5",
+    "fabricloader": ">=0.17.2",
+    "fabric-api": ">=0.128.2",
     "minecraft": "~1.21",
-    "modmenu": ">=13.0.0",
-    "cloth-config": ">=18.0.145"
+    "modmenu": ">=15.0.0",
+    "cloth-config": ">=19.0.147"
   },
   "custom": {
     "modmenu": {