diff --git a/docs/content.md b/docs/content.md
index 2007d734..826360ad 100755
--- a/docs/content.md
+++ b/docs/content.md
@@ -1,11 +1,11 @@
 # Installation [installing]
 ## Installing the Replay Mod [replaymod]
 ### Minecraft 1.14 and above
-The **ReplayMod** for Minecraft 1.14 and above requires **Fabric & Fabric API** to be installed.
+The **ReplayMod** for Minecraft 1.14 and above requires **Fabric** to be installed.
 
-You can find Fabric and the installation instructions [here](https://fabricmc.net/use/). With Fabric, you also need to install the Fabric API by putting it into your mods folder. You can find Fabric API [here](https://www.curseforge.com/minecraft/mc-mods/fabric-api).
+You can find Fabric and the installation instructions [here](https://fabricmc.net/use/).
 
-After installing Fabric & Fabric API, simply put the downloaded ReplayMod .jar file into the `/mods` folder of your Minecraft directory.
+After installing Fabric, simply put the downloaded ReplayMod .jar file into the `/mods` folder of your Minecraft directory.
 
 ### Minecraft 1.12.2 and below
 For Minecraft 1.12.2 and below it requires **Minecraft Forge** to be installed.
diff --git a/jGui b/jGui
index d262f924..79c4ba64 160000
--- a/jGui
+++ b/jGui
@@ -1 +1 @@
-Subproject commit d262f924ed0646f79568878dbbd01df330c5be1e
+Subproject commit 79c4ba640854256ed4be25dc8e0e3e41236a63fb
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 0a41463d..3f30a5c9 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -36,7 +36,9 @@
 
   "depends": {
     "fabricloader": ">=0.7.0",
-    "fabric": ">=0.4.3"
+    "fabric-networking-v0": "*",
+    "fabric-keybindings-v0": "*",
+    "fabric-resource-loader-v0": "*"
   },
 
   "custom": {
diff --git a/versions/common.gradle b/versions/common.gradle
index 4a0e81d2..5682d4c2 100644
--- a/versions/common.gradle
+++ b/versions/common.gradle
@@ -237,11 +237,24 @@ dependencies {
                 11502: '0.7.8+build.189',
                 11601: '0.8.8+build.202',
         ][mcVersion]
-        modCompile 'net.fabricmc.fabric-api:fabric-api:' + [
+        def fabricApiVersion = [
                 11404: '0.4.3+build.247-1.14',
                 11502: '0.5.1+build.294-1.15',
                 11601: '0.14.0+build.371-1.16',
         ][mcVersion]
+        def fabricApiModules = [
+                "api-base",
+                "networking-v0",
+                "keybindings-v0",
+                "resource-loader-v0",
+        ]
+        if (mcVersion >= 11600) {
+            fabricApiModules.add("key-binding-api-v1")
+        }
+        fabricApiModules.each { module ->
+            modCompile fabricApi.module("fabric-$module", fabricApiVersion)
+            include fabricApi.module("fabric-$module", fabricApiVersion)
+        }
     }
 
     if (FG3) {
@@ -289,7 +302,7 @@ dependencies {
 
     if (FABRIC) {
         if (mcVersion >= 11600) {
-            modCompile 'io.github.prospector:modmenu:1.11.8+build.13'
+            modCompile 'io.github.prospector:modmenu:1.14.0+build.24'
         } else {
             modCompile 'io.github.prospector.modmenu:ModMenu:1.6.2-92'
         }
@@ -325,6 +338,7 @@ if (mcVersion <= 10710) {
 
 if (FABRIC) {
     tasks.remapJar {
+        addNestedDependencies.set(true)
         afterEvaluate { // FIXME why does loom overwrite this if we set it immediately?
             archiveClassifier.set('obf')
         }
@@ -387,7 +401,7 @@ task configureRelocation() {
 
 tasks.removeByName('shadowJar') // we want to base our shadowed jar on the reobfJar output, not the sourceSet output
 task shadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
-    from { zipTree((FABRIC ? tasks.remapJar : tasks.jar).archiveFile.get()) }
+    from { (FABRIC ? tasks.remapJar : tasks.jar).archiveFile.get() }
     dependsOn { FABRIC ? tasks.remapJar : (mcVersion >= 10800 ? tasks.reobfJar : tasks.reobf) }
 
     from({ zipTree((FABRIC ? jGui.tasks.remapJar : jGui.tasks.jar).archiveFile.get()) }) {