diff --git a/build.gradle b/build.gradle
index be88b28b25..fec5557897 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,11 +7,11 @@ buildscript {
 		}
 	}
 	dependencies {
-		classpath "cuchaz:enigma:0.16.0+build.175"
-		classpath "net.fabricmc:stitch:0.4.6+build.74"
+		classpath "cuchaz:enigma-cli:${project.enigma_version}"
+		classpath "net.fabricmc:stitch:${project.stitch_version}"
 		classpath "commons-io:commons-io:2.6"
 		classpath 'de.undercouch:gradle-download-task:4.0.4'
-		classpath 'net.fabricmc:tiny-remapper:0.2.2.65'
+		classpath 'net.fabricmc:tiny-remapper:0.3.1.71'
 		classpath 'net.fabricmc:mappingpoet:0.1.0+build.2'
 	}
 }
@@ -50,8 +50,8 @@ configurations {
 }
 
 dependencies {
-	enigmaRuntime "cuchaz:enigma:0.16.0+build.175"
-	enigmaRuntime "net.fabricmc:stitch:0.4.6+build.74"
+	enigmaRuntime "cuchaz:enigma-swing:${project.enigma_version}"
+	enigmaRuntime "net.fabricmc:stitch:${project.stitch_version}"
 	javadocClasspath "net.fabricmc:fabric-loader:0.8.2+build.194"
 	javadocClasspath "com.google.code.findbugs:jsr305:3.0.2"
 }
@@ -360,7 +360,7 @@ task yarn(dependsOn: setupYarn) {
 	doLast {
 		ant.setLifecycleLogLevel "WARN"
 		ant.java(
-				classname: 'cuchaz.enigma.Main',
+				classname: 'cuchaz.enigma.gui.Main',
 				classpath: configurations.enigmaRuntime.asPath,
 				fork: true,
 				spawn: true
diff --git a/gradle.properties b/gradle.properties
index 5cacfe8973..387d31fea2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,5 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
+
+enigma_version=0.17+build.182
+stitch_version=0.5.0+build.76
\ No newline at end of file