diff --git a/build.gradle.kts b/build.gradle.kts
index 4149d4e1..37784525 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -114,20 +114,15 @@ dependencies {
     modApi(libs.modmenu) { exclude(group = "net.fabricmc.fabric-api") }
     modApi(libs.cloth.config) { exclude(group = "net.fabricmc.fabric-api") }
     modApi(libs.rei) { exclude(group = "net.fabricmc.fabric-api") }
+    modApi(libs.night.auto.config) { exclude(group = "net.fabricmc.fabric-api") }
 
     // Included
-    modApi(libs.tags.binder)?.let {
-        include(it)
-    }
-    modApi(libs.brrp)?.let {
-        include(it)
-    }
-    api(libs.exp4j)?.let {
-        include(it)
-    }
-    api(libs.night.auto.config)?.let {
-        include(it)
-    }
+    modApi(libs.tags.binder) { exclude(group = "net.fabricmc.fabric-api") }
+    include(libs.tags.binder)
+    modApi(libs.brrp) { exclude(group = "net.fabricmc.fabric-api") }
+    include(libs.brrp)
+    api(libs.exp4j)
+    include(libs.exp4j)
 
     // Development
     api("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5aacac04..31a0933f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,6 +9,8 @@ quilt-mappings = "1.20.1+build.23"
 fabric-loader = "0.15.11"
 
 fabric-api = "0.92.2+1.20.1"
+architectury-api = "9.2.14"
+night-auto-config = "1.0.3-fabric1.20"
 
 # Implemented Mods
 modmenu = "7.2.2"
@@ -25,7 +27,6 @@ ftb-library = "2001.2.2"
 
 ad-astra = "1.15.18"
 # - Modrinth Maven
-architectury-api = "9.2.14"
 bits-and-chisels = "2.7.3"
 farmers-delight = "1.20.1-2.1.1"
 hephaestus = "1.20.1-3.6.4.274"
@@ -40,7 +41,6 @@ rip = "1.0.0-1.20.x"
 tags-binder = "0.3"
 brrp = "1.0.1-mc1.20.1-fabric"
 exp4j = "0.4.8"
-night-auto-config = "1.0.3-fabric1.20"
 
 [libraries]
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
@@ -69,7 +69,7 @@ farmers-delight = { group = "maven.modrinth", name = "farmers-delight-refabricat
 
 # - Modrinth Maven
 bits-and-chisels = { group = "maven.modrinth", name = "bits-and-chisels", version.ref = "bits-and-chisels" }
-hephaestus = { group = "maven.modrinth", name = "hephaestus", version.ref = "hephaestus" }
+hephaestus = { group = "slimeknights.tconstruct", name = "Hephaestus", version.ref = "hephaestus" }
 let = { group = "maven.modrinth", name = "let", version.ref = "let" }
 industrial-revolution = { group = "maven.modrinth", name = "industrial-revolution", version.ref = "industrial-revolution" }