diff --git a/build.gradle b/build.gradle
index a790fd60..638207ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,13 +5,13 @@ plugins {
 	id 'java'
 	id 'idea'
 	id "com.github.johnrengelman.shadow" version "5.0.0"
-	id "org.javamodularity.moduleplugin" version "1.4.1"
-	id 'org.jetbrains.kotlin.jvm' version '1.3.21'
-	id "org.beryx.jlink" version "2.9.0"
+	id "org.javamodularity.moduleplugin" version "1.5.0"
+	id 'org.jetbrains.kotlin.jvm' version '1.3.30'
+	id "org.beryx.jlink" version "2.10.1"
 }
 
 mainClassName = 'holocore/com.projectswg.holocore.ProjectSWG'
-sourceCompatibility = 11
+sourceCompatibility = 12
 
 sourceSets {
 	main
@@ -35,7 +35,7 @@ idea {
 }
 
 jlink {
-	addOptions '--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages'
+//	addOptions '--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages'
 	imageDir.set(file("$buildDir/holocore"))
 	imageZip.set(file("$buildDir/holocore.zip"))
 	launcher {
@@ -58,7 +58,7 @@ repositories {
 dependencies {
 	compile project(':pswgcommon')
 	
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.3.21'
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.3.30'
 	compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.23.1'
 	compile group: 'org.mongodb', name: 'mongodb-driver-sync', version: '3.9.1'
 	compile group: 'me.joshlarson', name: "fast-json", version: '3.0.0'
diff --git a/client-holocore b/client-holocore
index 5e4defee..c544a28e 160000
--- a/client-holocore
+++ b/client-holocore
@@ -1 +1 @@
-Subproject commit 5e4defeee15c766cd68b72796a16ab5c93a31e7f
+Subproject commit c544a28eb75da2ac764e61da34db7773ea2aa966
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9d39e2bb..f6604889 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Mar 28 09:08:51 CDT 2019
+#Wed Apr 17 17:52:36 CDT 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
+zipStoreBase=GRADLE_USER_HOME