diff --git a/src/main/java/com/replaymod/core/utils/Utils.java b/src/main/java/com/replaymod/core/utils/Utils.java
index 20579b3b..b1ecc414 100644
--- a/src/main/java/com/replaymod/core/utils/Utils.java
+++ b/src/main/java/com/replaymod/core/utils/Utils.java
@@ -1,5 +1,6 @@
 package com.replaymod.core.utils;
 
+import com.google.common.base.Throwables;
 import com.google.common.net.PercentEscaper;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -17,7 +18,6 @@ import de.johni0702.minecraft.gui.layout.HorizontalLayout;
 import de.johni0702.minecraft.gui.layout.VerticalLayout;
 import de.johni0702.minecraft.gui.popup.GuiInfoPopup;
 import de.johni0702.minecraft.gui.utils.Colors;
-import lombok.SneakyThrows;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.network.NetworkPlayerInfo;
 import net.minecraft.client.resources.DefaultPlayerSkin;
@@ -150,13 +150,14 @@ public class Utils {
         return REPLAY_NAME_ENCODER.escape(replayName) + ".mcpr";
     }
 
-    @SneakyThrows(UnsupportedEncodingException.class)
     public static String fileNameToReplayName(String fileName) {
         String baseName = FilenameUtils.getBaseName(fileName);
         try {
             return URLDecoder.decode(baseName, Charsets.UTF_8.name());
         } catch (IllegalArgumentException e) {
             return baseName;
+        } catch (UnsupportedEncodingException e) {
+            throw Throwables.propagate(e);
         }
     }
 
diff --git a/versions/1.10.2/build.gradle b/versions/1.10.2/build.gradle
index 8141647b..d87d515f 100644
--- a/versions/1.10.2/build.gradle
+++ b/versions/1.10.2/build.gradle
@@ -10,7 +10,3 @@ minecraft {
     version = '1.10.2-12.18.2.2099'
     mappings = "snapshot_20160518"
 }
-
-dependencies {
-    shade project(':jGui:versions:1.9.4')
-}
diff --git a/versions/1.11.2/build.gradle b/versions/1.11.2/build.gradle
index 8cc67b66..466a0017 100644
--- a/versions/1.11.2/build.gradle
+++ b/versions/1.11.2/build.gradle
@@ -10,7 +10,3 @@ minecraft {
     version = '1.11.2-13.20.0.2216'
     mappings = "snapshot_20161220"
 }
-
-dependencies {
-    shade project(':jGui:versions:1.9.4')
-}
diff --git a/versions/1.11/build.gradle b/versions/1.11/build.gradle
index 69f0180a..a42c0b4a 100644
--- a/versions/1.11/build.gradle
+++ b/versions/1.11/build.gradle
@@ -10,7 +10,3 @@ minecraft {
     version = '1.11-13.19.1.2188'
     mappings = "snapshot_20161111"
 }
-
-dependencies {
-    shade project(':jGui:versions:1.9.4')
-}
diff --git a/versions/1.12.1/build.gradle b/versions/1.12.1/build.gradle
index 685482aa..726daf3a 100644
--- a/versions/1.12.1/build.gradle
+++ b/versions/1.12.1/build.gradle
@@ -10,7 +10,3 @@ minecraft {
     version = '1.12.1-14.22.0.2444'
     mappings = "snapshot_20170615"
 }
-
-dependencies {
-    shade project(':jGui:versions:1.12')
-}
diff --git a/versions/1.12.2/build.gradle b/versions/1.12.2/build.gradle
index 8cde6f09..c504ee1c 100644
--- a/versions/1.12.2/build.gradle
+++ b/versions/1.12.2/build.gradle
@@ -10,7 +10,3 @@ minecraft {
     version = '1.12.2-14.23.0.2486'
     mappings = "snapshot_20170615"
 }
-
-dependencies {
-    shade project(':jGui:versions:1.12')
-}
diff --git a/versions/1.12/build.gradle b/versions/1.12/build.gradle
index a1c4688f..cff536ee 100644
--- a/versions/1.12/build.gradle
+++ b/versions/1.12/build.gradle
@@ -10,7 +10,3 @@ minecraft {
     version = '1.12-14.21.1.2387'
     mappings = "snapshot_20170615"
 }
-
-dependencies {
-    shade project(':jGui:versions:1.12')
-}
diff --git a/versions/1.8.9/build.gradle b/versions/1.8.9/build.gradle
index 01f12bdf..71cc44c3 100644
--- a/versions/1.8.9/build.gradle
+++ b/versions/1.8.9/build.gradle
@@ -10,7 +10,3 @@ minecraft {
     version = '1.8.9-11.15.1.1722'
     mappings = "stable_22"
 }
-
-dependencies {
-    shade project(':jGui:versions:1.8.9')
-}
diff --git a/versions/1.8/build.gradle b/versions/1.8/build.gradle
index 6ee47b00..9e640b17 100644
--- a/versions/1.8/build.gradle
+++ b/versions/1.8/build.gradle
@@ -10,7 +10,3 @@ minecraft {
     version = '1.8-11.14.4.1563'
     mappings = "snapshot_nodoc_20141130"
 }
-
-dependencies {
-    shade project(':jGui:versions:1.8')
-}
diff --git a/versions/1.9.4/build.gradle b/versions/1.9.4/build.gradle
index e95b9735..ebf35bf3 100644
--- a/versions/1.9.4/build.gradle
+++ b/versions/1.9.4/build.gradle
@@ -10,7 +10,3 @@ minecraft {
     version = '1.9.4-12.17.0.1976'
     mappings = "snapshot_20160518"
 }
-
-dependencies {
-    shade project(':jGui:versions:1.9.4')
-}
diff --git a/versions/common.gradle b/versions/common.gradle
index 2b2e2530..f818aa6e 100644
--- a/versions/common.gradle
+++ b/versions/common.gradle
@@ -83,8 +83,18 @@ dependencies {
     if (studioVersion == '1.8.9') studioVersion = '1.8'
     shade("com.github.ReplayMod.ReplayStudio:$studioVersion:9fd96a7"){
         exclude group: 'com.google.guava', module: 'guava' // provided by MC
+        exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used
     }
 
+    def jGuiVersion = project.name
+    if (['1.10.2', '1.11', '1.11.2'].contains(jGuiVersion)) jGuiVersion = '1.9.4'
+    if (['1.12.1', '1.12.2'].contains(jGuiVersion)) jGuiVersion = '1.12'
+    shade(project(":jGui:versions:$jGuiVersion")){
+        exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used
+    }
+
+    compile 'org.projectlombok:lombok:1.16.6' // runtime only for @SneakyThrows which isn't used
+
     testCompile 'junit:junit:4.11'
 }
 
diff --git a/versions/core/build.gradle b/versions/core/build.gradle
index 22458f55..1176443a 100644
--- a/versions/core/build.gradle
+++ b/versions/core/build.gradle
@@ -67,19 +67,3 @@ minecraft {
     //#endif
     //#endif
 }
-
-dependencies {
-    //#if MC>=11200
-    shade project(':jGui:versions:1.12')
-    //#else
-    //#if MC>=10904
-    //$$ shade project(':jGui:versions:1.9.4')
-    //#else
-    //#if MC>=10809
-    //$$ shade project(':jGui:versions:1.8.9')
-    //#else
-    //$$ shade project(':jGui:versions:1.8')
-    //#endif
-    //#endif
-    //#endif
-}