diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 6dfe95c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "ZenScript"]
-	path = ZenScript
-	url = https://github.com/GTNewHorizons/ZenScript.git
diff --git a/ZenScript b/ZenScript
deleted file mode 160000
index e714482..0000000
--- a/ZenScript
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e71448251d386c7ab67316f89a9c5c15a6a23176
diff --git a/addon.gradle b/addon.gradle
deleted file mode 100644
index 8582877..0000000
--- a/addon.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-sourceSets.main {
-    java.srcDir("ZenScript/src/main/java")
-}
-
-task initZenScript(type: Exec) {
-    description = "Updates (and inits) git submodules"
-    group = "Build Setup"
-    commandLine("git", "submodule", "update", "--init", "--recursive", "--remote")
-
-    // Checkout a specific commit. Otherwise the build will fail!
-    commandLine("git", "--git-dir=\"ZenScript/.git\"", "checkout", "e7144825")
-}
-
-tasks.setupCIWorkspace.dependsOn initZenScript
-tasks.setupDevWorkspace.dependsOn initZenScript
-tasks.setupDecompWorkspace.dependsOn initZenScript
-tasks.compileJava.dependsOn initZenScript
diff --git a/dependencies.gradle b/dependencies.gradle
index efce6bc..77badcb 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,6 +1,8 @@
 // Add your dependencies here
 
 dependencies {
+    shadowImplementation("com.github.GTNewHorizons:ZenScript:CraftTweaker")
+
     compile("com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev")
 
     compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
diff --git a/gradle.properties b/gradle.properties
index a5487d1..e16f79e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -57,7 +57,7 @@ containsMixinsAndOrCoreModOnly = false
 
 # If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
 # responsibility check the licence and request permission for distribution, if required.
-usesShadowedDependencies = false
+usesShadowedDependencies = yes
 
 # Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
 # projects. New projects should not use this parameter.