diff --git a/.github/README.md b/.github/README.md
index f73f357..2ed30b2 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -1,6 +1,6 @@
 # CivVoxelMap
 
-This is a 'fork' of [VoxelMap](https://modrinth.com/mod/voxelmap-updated) for 1.20.4 that's [CivMC](https://civmc.net)
+This is a 'fork' of [VoxelMap](https://modrinth.com/mod/voxelmap-updated) for 1.20.6 that's [CivMC](https://civmc.net)
 legal.
 
 ## Changes
@@ -33,12 +33,12 @@ legal.
 
 ## Requirements
 
-- Fabric Loader: `0.15.11` (or newer)
-- [Fabric API](https://modrinth.com/mod/fabric-api): `0.96.11+1.20.4` (or newer)
+- Fabric Loader: `0.16.2` (or newer)
+- [Fabric API](https://modrinth.com/mod/fabric-api): `0.100.8+1.20.6` (or newer)
 
 ## Recommended
 
-- [ModMenu](https://modrinth.com/mod/modmenu): `v9.0.0` (or newer)
+- [ModMenu](https://modrinth.com/mod/modmenu): `v10.0.0` (or newer)
 
 ## Having issues?
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 42043b5..ff629c0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,20 +29,21 @@ dependencies {
     modImplementation("net.fabricmc:fabric-loader:${project.extra["fabric_loader_version"]}")
     modImplementation("net.fabricmc.fabric-api:fabric-api:${project.extra["fabric_api_version"]}")
 
-    // https://modrinth.com/mod/voxelmap-updated/version/1.20.4-1.12.17
-    "maven.modrinth:voxelmap-updated:VYowiAJp".also {
+    // https://modrinth.com/mod/voxelmap-updated/version/1.20.6-1.12.19
+    "maven.modrinth:voxelmap-updated:yfOx8RrC".also {
         modImplementation(it)
         include(it)
     }
 
-    // https://modrinth.com/mod/modmenu/version/9.0.0
-    "maven.modrinth:modmenu:sjtVVlsA".also {
+    // https://modrinth.com/mod/modmenu/version/10.0.0
+    "maven.modrinth:modmenu:HLa8flfl".also {
         modCompileOnly(it)
         modLocalRuntime(it)
     }
 
     // This is literally only here to make Minecraft SHUT UP about non-signed messages while testing.
-    modLocalRuntime("maven.modrinth:no-chat-reports:Pjto4zdj")
+    // https://modrinth.com/mod/no-chat-reports/version/Fabric-1.20.6-v2.7.1
+    modLocalRuntime("maven.modrinth:no-chat-reports:MNkuIjea")
 }
 
 repositories {
@@ -59,8 +60,8 @@ repositories {
 
 java {
     withSourcesJar()
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 tasks {
@@ -71,7 +72,7 @@ tasks {
     }
     compileJava {
         options.encoding = "UTF-8"
-        options.release.set(17)
+        options.release.set(21)
     }
     processResources {
         filesMatching("fabric.mod.json") {
diff --git a/gradle.properties b/gradle.properties
index 28b0edb..99ac303 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,9 +10,9 @@ mod_home_url=https://github.com/Protonull/CivVoxelMap
 mod_source_url=https://github.com/Protonull/CivVoxelMap
 mod_issues_url=https://github.com/Protonull/CivVoxelMap/issues
 
-minecraft_version=1.20.4
+minecraft_version=1.20.6
 # https://parchmentmc.org/docs/getting-started
-parchment_version=2024.04.14
+parchment_version=2024.06.16
 # https://fabricmc.net/versions.html
-fabric_loader_version=0.15.11
-fabric_api_version=0.96.11+1.20.4
+fabric_loader_version=0.16.2
+fabric_api_version=0.100.8+1.20.6
diff --git a/src/main/java/uk/protonull/civvoxelmap/mixins/catching/FixEnumErrorMixin.java b/src/main/java/uk/protonull/civvoxelmap/mixins/catching/FixEnumErrorMixin.java
deleted file mode 100644
index da56c70..0000000
--- a/src/main/java/uk/protonull/civvoxelmap/mixins/catching/FixEnumErrorMixin.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package uk.protonull.civvoxelmap.mixins.catching;
-
-import com.mamiyaotaru.voxelmap.util.OpenGL;
-import org.lwjgl.opengl.GL30;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.Constant;
-import org.spongepowered.asm.mixin.injection.ModifyConstant;
-
-@Mixin(OpenGL.Utils.class)
-public abstract class FixEnumErrorMixin {
-    @ModifyConstant(
-        method = "setupFramebuffer",
-        constant = @Constant(intValue = GL30.GL_DRAW_FRAMEBUFFER),
-        remap = false
-    )
-    private static int cvm$setupFramebuffer$useCorrectTarget(
-        final int value
-    ) {
-        // Apparently, the only valid target is GL_RENDERBUFFER
-        // https://docs.gl/gl4/glBindRenderbuffer
-        return GL30.GL_RENDERBUFFER;
-    }
-}
diff --git a/src/main/java/uk/protonull/civvoxelmap/mixins/textures/AlwaysUseHigherResTexturesMixin.java b/src/main/java/uk/protonull/civvoxelmap/mixins/textures/AlwaysUseHigherResTexturesMixin.java
index b67afeb..3b5170e 100644
--- a/src/main/java/uk/protonull/civvoxelmap/mixins/textures/AlwaysUseHigherResTexturesMixin.java
+++ b/src/main/java/uk/protonull/civvoxelmap/mixins/textures/AlwaysUseHigherResTexturesMixin.java
@@ -13,7 +13,8 @@ public abstract class AlwaysUseHigherResTexturesMixin {
         method = "drawWaypoint",
         at = @At("HEAD"),
         ordinal = 2,
-        argsOnly = true
+        argsOnly = true,
+        remap = false
     )
     private int cvm$drawWaypoint$scale$neverUseSmallWaypointIcons(
         final int scScale
diff --git a/src/main/resources/civvoxelmap.mixins.json b/src/main/resources/civvoxelmap.mixins.json
index 69a852a..30aae64 100644
--- a/src/main/resources/civvoxelmap.mixins.json
+++ b/src/main/resources/civvoxelmap.mixins.json
@@ -8,7 +8,6 @@
         "catching.ChatWaypointParseFixMixin",
         "catching.ChatWaypointSafelyClickMixin",
         "catching.ChatWaypointSafelyParseMixin",
-        "catching.FixEnumErrorMixin",
         "catching.FixNullBlockStateIdMixin",
         "commands.DisableVoxelMapCommands",
         "commands.ReplaceVoxelMapCommands",