diff --git a/gradle.properties b/gradle.properties
index 1280f71..52ff48f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,9 +7,9 @@ maven_version=3.6.0-SNAPSHOT
 maven_group=de.florianmichael
 
 # ViaVersion
-viaversion_version=4.10.0-24w07a-SNAPSHOT
-viabackwards_version=4.10.0-24w07a-SNAPSHOT
-viarewind_version=3.0.6-SNAPSHOT
+viaversion_version=4.10.0-24w09a-SNAPSHOT
+viabackwards_version=4.10.0-24w09a-SNAPSHOT
+viarewind_version=3.0.7-24w09a-SNAPSHOT
 vialegacy_version=2.2.22-SNAPSHOT
 viaaprilfools_version=2.0.11-SNAPSHOT
 vialoader_version=2.2.13-SNAPSHOT
diff --git a/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinGuiOverlayDebug.java b/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinGuiOverlayDebug.java
index b6d1377..3c7d815 100644
--- a/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinGuiOverlayDebug.java
+++ b/viaforge-mc112/src/main/java/de/florianmichael/viaforge/mixin/impl/MixinGuiOverlayDebug.java
@@ -21,7 +21,6 @@ package de.florianmichael.viaforge.mixin.impl;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import net.minecraft.client.gui.GuiOverlayDebug;
-import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -39,15 +38,7 @@ public class MixinGuiOverlayDebug {
 
         if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) {
             cir.getReturnValue().add("");
-
-            int protocolVersion = version.getVersion();
-            if (version.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
-                // Older versions (<= 1.6.4) are using fake ids in ViaLegacy to prevent version duplications / mismatches
-                // So we need to unmap the version to get the real protocol version id
-                protocolVersion = LegacyProtocolVersion.getRealProtocolVersion(protocolVersion);
-            }
-
-            cir.getReturnValue().add("ViaForge: " + version.getName() + " (" + protocolVersion + ")");
+            cir.getReturnValue().add("ViaForge: " + version.toString());
         }
     }
 
diff --git a/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugOverlayGui.java b/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugOverlayGui.java
index 0837c32..db20fcf 100644
--- a/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugOverlayGui.java
+++ b/viaforge-mc116/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugOverlayGui.java
@@ -20,7 +20,6 @@ package de.florianmichael.viaforge.mixin;
 
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import net.minecraft.client.gui.overlay.DebugOverlayGui;
-import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -39,15 +38,7 @@ public class MixinDebugOverlayGui {
 
         if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) {
             cir.getReturnValue().add("");
-
-            int protocolVersion = version.getVersion();
-            if (version.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
-                // Older versions (<= 1.6.4) are using fake ids in ViaLegacy to prevent version duplications / mismatches
-                // So we need to unmap the version to get the real protocol version id
-                protocolVersion = LegacyProtocolVersion.getRealProtocolVersion(protocolVersion);
-            }
-
-            cir.getReturnValue().add("ViaForge: " + version.getName() + " (" + protocolVersion + ")");
+            cir.getReturnValue().add("ViaForge: " + version.toString());
         }
     }
 
diff --git a/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java b/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
index 251ec24..9e9ca9a 100644
--- a/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
+++ b/viaforge-mc117/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
@@ -20,7 +20,6 @@ package de.florianmichael.viaforge.mixin;
 
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
-import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -39,15 +38,7 @@ public class MixinDebugScreenOverlay {
 
         if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) {
             cir.getReturnValue().add("");
-
-            int protocolVersion = version.getVersion();
-            if (version.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
-                // Older versions (<= 1.6.4) are using fake ids in ViaLegacy to prevent version duplications / mismatches
-                // So we need to unmap the version to get the real protocol version id
-                protocolVersion = LegacyProtocolVersion.getRealProtocolVersion(protocolVersion);
-            }
-
-            cir.getReturnValue().add("ViaForge: " + version.getName() + " (" + protocolVersion + ")");
+            cir.getReturnValue().add("ViaForge: " + version.toString());
         }
     }
 
diff --git a/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java b/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
index 251ec24..9e9ca9a 100644
--- a/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
+++ b/viaforge-mc118/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
@@ -20,7 +20,6 @@ package de.florianmichael.viaforge.mixin;
 
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
-import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -39,15 +38,7 @@ public class MixinDebugScreenOverlay {
 
         if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) {
             cir.getReturnValue().add("");
-
-            int protocolVersion = version.getVersion();
-            if (version.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
-                // Older versions (<= 1.6.4) are using fake ids in ViaLegacy to prevent version duplications / mismatches
-                // So we need to unmap the version to get the real protocol version id
-                protocolVersion = LegacyProtocolVersion.getRealProtocolVersion(protocolVersion);
-            }
-
-            cir.getReturnValue().add("ViaForge: " + version.getName() + " (" + protocolVersion + ")");
+            cir.getReturnValue().add("ViaForge: " + version.toString());
         }
     }
 
diff --git a/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java b/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
index 251ec24..9e9ca9a 100644
--- a/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
+++ b/viaforge-mc119/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
@@ -20,7 +20,6 @@ package de.florianmichael.viaforge.mixin;
 
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
-import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -39,15 +38,7 @@ public class MixinDebugScreenOverlay {
 
         if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) {
             cir.getReturnValue().add("");
-
-            int protocolVersion = version.getVersion();
-            if (version.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
-                // Older versions (<= 1.6.4) are using fake ids in ViaLegacy to prevent version duplications / mismatches
-                // So we need to unmap the version to get the real protocol version id
-                protocolVersion = LegacyProtocolVersion.getRealProtocolVersion(protocolVersion);
-            }
-
-            cir.getReturnValue().add("ViaForge: " + version.getName() + " (" + protocolVersion + ")");
+            cir.getReturnValue().add("ViaForge: " + version.toString());
         }
     }
 
diff --git a/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java b/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
index 251ec24..9e9ca9a 100644
--- a/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
+++ b/viaforge-mc120/src/main/java/de/florianmichael/viaforge/mixin/MixinDebugScreenOverlay.java
@@ -20,7 +20,6 @@ package de.florianmichael.viaforge.mixin;
 
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
-import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -39,15 +38,7 @@ public class MixinDebugScreenOverlay {
 
         if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) {
             cir.getReturnValue().add("");
-
-            int protocolVersion = version.getVersion();
-            if (version.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
-                // Older versions (<= 1.6.4) are using fake ids in ViaLegacy to prevent version duplications / mismatches
-                // So we need to unmap the version to get the real protocol version id
-                protocolVersion = LegacyProtocolVersion.getRealProtocolVersion(protocolVersion);
-            }
-
-            cir.getReturnValue().add("ViaForge: " + version.getName() + " (" + protocolVersion + ")");
+            cir.getReturnValue().add("ViaForge: " + version.toString());
         }
     }