diff --git a/build.gradle b/build.gradle
index e3d29607..2a7a0cb3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1688526754
+//version: 1688969024
 /*
  * DO NOT CHANGE THIS FILE!
  * Also, you may replace this file at any time if there is an update available.
@@ -69,6 +69,7 @@ propertyDefaultIfUnset("forceEnableMixins", false)
 propertyDefaultIfUnset("usesShadowedDependencies", false)
 propertyDefaultIfUnset("minimizeShadowedDependencies", true)
 propertyDefaultIfUnset("relocateShadowedDependencies", true)
+propertyDefaultIfUnset("separateRunDirectories", false)
 propertyDefaultIfUnsetWithEnvVar("modrinthProjectId", "", "MODRINTH_PROJECT_ID")
 propertyDefaultIfUnset("modrinthRelations", "")
 propertyDefaultIfUnsetWithEnvVar("curseForgeProjectId", "", "CURSEFORGE_PROJECT_ID")
@@ -368,10 +369,6 @@ repositories {
         }
     }
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        maven {
-            name 'Sponge Maven'
-            url 'https://repo.spongepowered.org/maven'
-        }
         // need to add this here even if we did not above
         if (!includeWellKnownRepositories.toBoolean()) {
             maven {
@@ -401,8 +398,11 @@ configurations {
 
 dependencies {
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        implementation 'zone.rong:mixinbooter:7.0'
-        String mixin = modUtils.enableMixins('org.spongepowered:mixin:0.8.3', "mixins.${modId}.refmap.json")
+        implementation 'zone.rong:mixinbooter:8.3'
+        String mixin = 'zone.rong:mixinbooter:8.3'
+        if (usesMixins.toBoolean()) {
+            mixin = modUtils.enableMixins(mixin, "mixins.${modId}.refmap.json")
+        }
 
         api (mixin) {
             transitive = false
@@ -593,6 +593,17 @@ jar {
     }
 }
 
+// Configure default run tasks
+if (separateRunDirectories.toBoolean()) {
+    runClient {
+        workingDir = file('run/client')
+    }
+
+    runServer {
+        workingDir = file('run/server')
+    }
+}
+
 // Create API library jar
 tasks.register('apiJar', Jar) {
     archiveClassifier.set 'api'
diff --git a/dependencies.gradle b/dependencies.gradle
index 8e5c03a2..46420e33 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -34,6 +34,5 @@ dependencies {
     // Soft Dependencies
     implementation "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.684"
     implementation rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31
-    //implementation rfg.deobf("curse.maven:groovyscript-687577:4487379") // GRS 0.4.6
-    implementation files("libs/groovyscript-0.4.0.jar")
+    implementation rfg.deobf("curse.maven:groovyscript-687577:4610037") // GRS 0.5.1
 }
diff --git a/gradle.properties b/gradle.properties
index cf814b31..9efdcb22 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -80,6 +80,10 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
+# Separate run directories into "run/client" for runClient task, and "run/server" for runServer task.
+# Useful for debugging a server and client simultaneously. If not enabled, it will be in the standard location "run/"
+separateRunDirectories = false 
+
 
 # Publishing to modrinth requires you to set the MODRINTH_API_KEY environment variable to your current modrinth API token.
 
diff --git a/libs/groovyscript-0.4.0.jar b/libs/groovyscript-0.4.0.jar
deleted file mode 100644
index 2921d27b..00000000
Binary files a/libs/groovyscript-0.4.0.jar and /dev/null differ