diff --git a/build.gradle b/build.gradle
index 27a1cbff5..4785592aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,13 +35,13 @@ subprojects { p ->
         // The following line declares the mojmap mappings
         mappings loom.officialMojangMappings()
 
+        // Toml
+        implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
+
         if (p != project(":forge")) {
             // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
             // Do NOT use other classes from fabric loader unless working with fabric
             modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-
-            // Forge already comes with night config so dont implement it there
-            implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
         }
 
 
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 460bc7ef9..d336d5d0a 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.0"
-    id 'fabric-loom' version '0.10-SNAPSHOT'
 }
 
 version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")
diff --git a/forge/build.gradle b/forge/build.gradle
index efebf5a0e..86511a89b 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -36,11 +36,13 @@ dependencies {
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
 
-//    implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")                      // This is already included with forge
-//    forgeDependencies(shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {})      // This is already included with forge
-
 //    forgeDependencies(project(":core")) { transitive false }
 
+
+    // Toml
+    shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
+
+    // Compression
     forgeDependencies('org.tukaani:xz:1.9')
     forgeDependencies('org.apache.commons:commons-compress:1.21')
     shadowMe 'org.tukaani:xz:1.9'
@@ -70,7 +72,7 @@ shadowJar {
     configurations = [project.configurations.shadowMe]
     relocate 'org.tukaani', 'shaded.tukaani'
     relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
-//    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'    // This is already included with forge
+    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'    // This is already included with forge
 
     relocate 'com.seibel.lod.common', 'forge.com.seibel.lod.common'