diff --git a/jGui b/jGui
index 3a741e82..da3361a0 160000
--- a/jGui
+++ b/jGui
@@ -1 +1 @@
-Subproject commit 3a741e8250c67d0e92ff287885f7508e39965768
+Subproject commit da3361a02d16eebae81fca24a129acff16e5a1c9
diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java
index 7802948f..74dbdfd8 100644
--- a/src/main/java/com/replaymod/replay/FullReplaySender.java
+++ b/src/main/java/com/replaymod/replay/FullReplaySender.java
@@ -593,6 +593,9 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
             p = new GameJoinS2CPacket(
                     entId,
                     GameMode.SPECTATOR,
+                    //#if MC>=11600
+                    //$$ GameMode.SPECTATOR,
+                    //#endif
                     //#if MC>=11500
                     packet.getSeed(),
                     //#endif
@@ -666,6 +669,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
                     //#endif
                     //#if MC>=11600
                     //$$ GameMode.SPECTATOR,
+                    //$$ GameMode.SPECTATOR,
                     //$$ respawn.isDebugWorld(),
                     //$$ respawn.isFlatWorld(),
                     //$$ respawn.isWritingErrorSkippable()
diff --git a/src/main/java/com/replaymod/replay/QuickReplaySender.java b/src/main/java/com/replaymod/replay/QuickReplaySender.java
index d67879b6..7ee18cf5 100644
--- a/src/main/java/com/replaymod/replay/QuickReplaySender.java
+++ b/src/main/java/com/replaymod/replay/QuickReplaySender.java
@@ -199,6 +199,7 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
                 //$$ World.OVERWORLD,
                 //$$ 0,
                 //$$ GameMode.SPECTATOR,
+                //$$ GameMode.SPECTATOR,
                 //$$ false,
                 //$$ false,
                 //$$ false
diff --git a/versions/common.gradle b/versions/common.gradle
index 98c98306..10a5599c 100644
--- a/versions/common.gradle
+++ b/versions/common.gradle
@@ -224,12 +224,12 @@ dependencies {
         minecraft 'com.mojang:minecraft:' + [
                 11404: '1.14.4',
                 11502: '1.15.2',
-                11600: '1.16-pre5',
+                11600: '1.16-pre6',
         ][mcVersion]
         mappings 'net.fabricmc:yarn:' + [
                 11404: '1.14.4+build.16',
                 11502: '1.15.2+build.14',
-                11600: '1.16-pre5+build.2:v2',
+                11600: '1.16-pre6+build.1:v2',
         ][mcVersion]
         modCompile 'net.fabricmc:fabric-loader:' + [
                 11404: '0.7.8+build.189',
@@ -239,7 +239,7 @@ dependencies {
         modCompile 'net.fabricmc.fabric-api:fabric-api:' + [
                 11404: '0.4.3+build.247-1.14',
                 11502: '0.5.1+build.294-1.15',
-                11600: '0.12.1+build.361-1.16',
+                11600: '0.12.2+build.362-1.16',
         ][mcVersion]
     }
 
@@ -278,7 +278,7 @@ dependencies {
 
     shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
 
-    shadow "com.github.ReplayMod:ReplayStudio:1f47a42", shadeExclusions
+    shadow "com.github.ReplayMod:ReplayStudio:99a06c7", shadeExclusions
 
     compileOnly(jGui){
         transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those