diff --git a/build.gradle b/build.gradle
index dcfdd55..8565ca4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,3 @@
-println """
-*******************************************
- You are building SKCraft Launcher! 
-
- Output files will be in [subproject]/build/libs
-*******************************************
-"""
-
 buildscript {
     repositories {
         mavenCentral()
@@ -13,10 +5,23 @@
     }
 
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.0'
+    	classpath "com.github.jengelman.gradle.plugins:shadow:2.0.1"
     }
 }
 
+plugins {
+    id "com.github.johnrengelman.shadow" version "2.0.1"
+    id 'io.franzbecker.gradle-lombok' version '1.11'
+}
+
+println """
+*******************************************
+ You are building SKCraft Launcher! 
+
+ Output files will be in [subproject]/build/libs
+*******************************************
+"""
+
 subprojects {
     apply plugin: 'java'
     apply plugin: 'maven'
diff --git a/creator-tools/build.gradle b/creator-tools/build.gradle
index e11a201..a99e096 100644
--- a/creator-tools/build.gradle
+++ b/creator-tools/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.github.johnrengelman.shadow'
+plugins {
+    id "com.github.johnrengelman.shadow"
+}
 
 version = "2.0.2-SNAPSHOT"
 sourceCompatibility = 1.8
@@ -25,9 +27,6 @@
 }
 
 shadowJar {
-    dependencies {
-        exclude(dependency('org.projectlombok:lombok'))
-    }
 }
 
 build.dependsOn(shadowJar)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 085a1cd..758de96 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2f24067..2d80b69 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Apr 23 17:17:39 EDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
diff --git a/gradlew b/gradlew
index 91a7e26..cccdd3d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,47 +6,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +20,49 @@
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +89,7 @@
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282..f955316 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/launcher-bootstrap/build.gradle b/launcher-bootstrap/build.gradle
index 57e250a..4777a69 100644
--- a/launcher-bootstrap/build.gradle
+++ b/launcher-bootstrap/build.gradle
@@ -1,4 +1,7 @@
-apply plugin: 'com.github.johnrengelman.shadow'
+plugins {
+    id "com.github.johnrengelman.shadow"
+    id 'io.franzbecker.gradle-lombok'
+}
 
 jar {
     manifest {
@@ -7,8 +10,8 @@
 }
 
 dependencies {
-    compile 'org.projectlombok:lombok:1.12.2'
     compile 'com.googlecode.json-simple:json-simple:1.1.1'
+    compile 'javax.xml.bind:jaxb-api:2.3.0'
 }
 
 processResources {
@@ -20,9 +23,6 @@
 }
 
 shadowJar {
-    dependencies {
-        exclude(dependency('org.projectlombok:lombok'))
-    }
 }
 
 build.dependsOn(shadowJar)
\ No newline at end of file
diff --git a/launcher-builder/build.gradle b/launcher-builder/build.gradle
index 828447c..8c0e604 100644
--- a/launcher-builder/build.gradle
+++ b/launcher-builder/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.github.johnrengelman.shadow'
+plugins {
+    id "com.github.johnrengelman.shadow"
+}
 
 jar {
     manifest {
@@ -13,9 +15,6 @@
 }
 
 shadowJar {
-    dependencies {
-        exclude(dependency('org.projectlombok:lombok'))
-    }
 }
 
 build.dependsOn(shadowJar)
\ No newline at end of file
diff --git a/launcher-fancy/build.gradle b/launcher-fancy/build.gradle
index ef091f8..e20e21a 100644
--- a/launcher-fancy/build.gradle
+++ b/launcher-fancy/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.github.johnrengelman.shadow'
+plugins {
+    id "com.github.johnrengelman.shadow"
+}
 
 jar {
     manifest {
@@ -12,9 +14,6 @@
 }
 
 shadowJar {
-    dependencies {
-        exclude(dependency('org.projectlombok:lombok'))
-    }
 }
 
 build.dependsOn(shadowJar)
\ No newline at end of file
diff --git a/launcher/build.gradle b/launcher/build.gradle
index 8048b27..43dec87 100644
--- a/launcher/build.gradle
+++ b/launcher/build.gradle
@@ -1,4 +1,7 @@
-apply plugin: 'com.github.johnrengelman.shadow'
+plugins {
+    id "com.github.johnrengelman.shadow"
+    id 'io.franzbecker.gradle-lombok'
+}
 
 jar {
     manifest {
@@ -7,7 +10,6 @@
 }
 
 dependencies {
-    compile 'org.projectlombok:lombok:1.12.2'
     compile 'javax.xml.bind:jaxb-api:2.2.4'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.3.0'
     compile 'commons-lang:commons-lang:2.6'
@@ -27,9 +29,6 @@
 }
 
 shadowJar {
-    dependencies {
-        exclude(dependency('org.projectlombok:lombok'))
-    }
 }
 
 build.dependsOn(shadowJar)