diff --git a/build.gradle b/build.gradle
index 407cc726a..4b69d9eb0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,9 @@ 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
diff --git a/common/build.gradle b/common/build.gradle
index 3f3751086..c98cf17a3 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -26,8 +26,4 @@ publishing {
     repositories {
         // Add repositories to publish to here.
     }
-}
-
-dependencies {
-    implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
 }
\ No newline at end of file
diff --git a/core b/core
index cbcb7ca6a..40a8f228a 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit cbcb7ca6ac6bce3c237a3ca0283d29228dacd0f0
+Subproject commit 40a8f228ac5531e9e14e78a4a8e1321baae1d5f2
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 4870a3ad7..691b608a0 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     }
 
     // Sodium
-    modImplementation "maven.modrinth:sodium:${rootProject.sodium_version}"
+    modImplementation "curse.maven:sodium-394468:${rootProject.sodium_version}"
     implementation "org.joml:joml:1.10.2"
 
     // Lithium
@@ -64,10 +64,6 @@ dependencies {
      */
 
 
-    // Toml
-    implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
-    shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
-
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowMe(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 
diff --git a/forge/build.gradle b/forge/build.gradle
index 8154d9fcf..ebee9ee80 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -35,11 +35,12 @@ dependencies {
     // Starlight
 //    modImplementation("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}")
 
-//    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}") {}
+
     forgeDependencies('org.tukaani:xz:1.9')
     forgeDependencies('org.apache.commons:commons-compress:1.21')
     shadowMe 'org.tukaani:xz:1.9'
@@ -96,7 +97,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'
 
diff --git a/gradle.properties b/gradle.properties
index 792bc48dd..ef465922e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ fabric_api_version=0.37.1+1.17
     modmenu_version=2.0.14
     starlight_version_fabric=3442770
     lithium_version=mc1.17.1-0.7.5
-    sodium_version=mc1.17.1-0.3.3
+    sodium_version=3605275
     iris_version=1.17.x-v1.1.4
     immersive_portals_version = 0.14-1.17