diff --git a/build.gradle.kts b/build.gradle.kts
index 19f21ac6..baf02eec 100755
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ import groovy.json.JsonOutput
 import java.io.ByteArrayOutputStream
 
 plugins {
-    id("fabric-loom") version "0.2.7-SNAPSHOT" apply false
+    id("fabric-loom") version "0.4-SNAPSHOT" apply false
     id("com.replaymod.preprocess") version "3c46acb"
     id("com.github.hierynomus.license") version "0.15.0"
 }
@@ -178,7 +178,7 @@ val doRelease by tasks.registering {
 defaultTasks("shadowJar")
 
 preprocess {
-    "1.16"(11600, "yarn") {
+    "1.16.1"(11601, "yarn") {
         "1.15.2"(11502, "yarn") {
             "1.14.4"(11404, "yarn", file("versions/mapping-fabric-1.15.2-1.14.4.txt")) {
                 "1.14.4-forge"(11404, "srg", file("versions/mapping-1.14.4-fabric-forge.txt")) {
diff --git a/jGui b/jGui
index 7ec30f59..4898b6db 160000
--- a/jGui
+++ b/jGui
@@ -1 +1 @@
-Subproject commit 7ec30f59b56d38e2c2405e19ef6929628f36c8e5
+Subproject commit 4898b6dbc7674177a4a280659b450903a9efac3d
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a78fd488..1f50c264 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,7 +28,7 @@ val jGuiVersions = listOf(
         "1.14.4-forge",
         "1.14.4",
         "1.15.2",
-        "1.16"
+        "1.16.1"
 )
 val replayModVersions = listOf(
         "1.7.10",
@@ -44,7 +44,7 @@ val replayModVersions = listOf(
         "1.14.4-forge",
         "1.14.4",
         "1.15.2",
-        "1.16"
+        "1.16.1"
 )
 
 include(":jGui")
diff --git a/versions/common.gradle b/versions/common.gradle
index 93f9a4ae..a6819cd7 100644
--- a/versions/common.gradle
+++ b/versions/common.gradle
@@ -32,7 +32,7 @@ buildscript {
     dependencies {
         classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
         if (fabric) {
-            classpath 'fabric-loom:fabric-loom.gradle.plugin:0.2.7-SNAPSHOT'
+            classpath 'fabric-loom:fabric-loom.gradle.plugin:0.4-SNAPSHOT'
         } else if (mcVersion >= 11400) {
             classpath('net.minecraftforge.gradle:ForgeGradle:3.+'){
                 exclude group: 'trove', module: 'trove' // preprocessor/idea requires more recent one
@@ -224,22 +224,22 @@ dependencies {
         minecraft 'com.mojang:minecraft:' + [
                 11404: '1.14.4',
                 11502: '1.15.2',
-                11600: '1.16-rc1',
+                11601: '1.16.1',
         ][mcVersion]
         mappings 'net.fabricmc:yarn:' + [
                 11404: '1.14.4+build.16',
                 11502: '1.15.2+build.14',
-                11600: '1.16-rc1+build.8:v2',
+                11601: '1.16.1+build.17:v2',
         ][mcVersion]
         modCompile 'net.fabricmc:fabric-loader:' + [
                 11404: '0.7.8+build.189',
                 11502: '0.7.8+build.189',
-                11600: '0.8.8+build.202',
+                11601: '0.8.8+build.202',
         ][mcVersion]
         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.5+build.367-1.16',
+                11601: '0.14.0+build.371-1.16',
         ][mcVersion]
     }
 
@@ -278,7 +278,7 @@ dependencies {
 
     shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
 
-    shadow "com.github.ReplayMod:ReplayStudio:7cc1d0d", shadeExclusions
+    shadow "com.github.ReplayMod:ReplayStudio:fc8a66d", shadeExclusions
 
     compileOnly(jGui){
         transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those