diff --git a/build.gradle b/build.gradle
index d74aeb14d..2951aca89 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 0ebee6bdc..d2359847b 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -39,7 +39,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
@@ -49,10 +49,6 @@ dependencies {
 //    modImplementation "maven.modrinth:iris:${rootProject.iris_version}"
 
 
-    // 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 39a366004..f10ef5e0d 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -32,11 +32,12 @@ 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}") {}
+
     forgeDependencies('org.tukaani:xz:1.9')
     forgeDependencies('org.apache.commons:commons-compress:1.21')
     shadowMe 'org.tukaani:xz:1.9'
diff --git a/gradle.properties b/gradle.properties
index 38a8b72c0..6bd43ba28 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ fabric_api_version=0.34.2+1.16
     # Fabric mods
     modmenu_version=1.16.22
     lithium_version=mc1.16.5-0.6.6
-    sodium_version=mc1.16.5-0.2.0
+    sodium_version=3488820
     iris_version=1.16.x-v1.1.4
 
 # Forge loader