diff --git a/build.gradle b/build.gradle
index ebd3f2422..18875767d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -195,12 +195,9 @@ subprojects { p ->
         shadowMe "org.tukaani:xz:1.9"
         shadowMe "org.apache.commons:commons-compress:1.21"
 
-        // Toml & Json for config
-        shadowMe "com.electronwill.night-config:toml:${rootProject.toml_version}"
-        shadowMe("com.googlecode.json-simple:json-simple:${rootProject.json_version}") {
-            // Remove Junit test libraries
-            exclude group: "junit", module: "junit"
-        }
+        // NightConfig (includes Toml & Json)
+        shadowMe "com.electronwill.night-config:toml:${rootProject.nightconfig_version}"
+        shadowMe "com.electronwill.night-config:json:${rootProject.nightconfig_version}"
 
         // Theming
         shadowMe "com.formdev:flatlaf:${rootProject.flatlaf_version}"
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 4bed7d1e1..6d90651aa 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -106,13 +106,9 @@ shadowJar {
     relocate 'org.tukaani', 'distanthorizons.libraries.tukaani'
     relocate 'org.apache.commons.compress', 'distanthorizons.libraries.apache.commons.compress'
 
-    // Toml & Json for config
+    // NightConfig (includes Toml & Json)
     relocate 'com.electronwill.nightconfig', 'distanthorizons.libraries.electronwill.nightconfig'
 
-    // FIXME: This is a massive library that is located in lots of different spots
-    relocate 'com.googlecode.json-simple', 'distanthorizons.libraries.googlecode.json-simple'
-    relocate 'org.json.simple', 'distanthorizons.libraries.json.simple'
-
     // Theming
     relocate 'com.formdev.flatlaf', 'distanthorizons.libraries.formdev.flatlaf'
 
diff --git a/forge/build.gradle b/forge/build.gradle
index ef29edc40..0d592b9bc 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -72,13 +72,9 @@ shadowJar {
     relocate 'org.tukaani', 'distanthorizons.libraries.tukaani'
     relocate 'org.apache.commons.compress', 'distanthorizons.libraries.apache.commons.compress'
 
-    // Toml & Json for config
+    // NightConfig (includes Toml & Json)
     relocate 'com.electronwill.nightconfig', 'distanthorizons.libraries.electronwill.nightconfig'
 
-    // FIXME: This is a massive library that is located in lots of different spots
-    relocate 'com.googlecode.json-simple', 'distanthorizons.libraries.googlecode.json-simple'
-    relocate 'org.json.simple', 'distanthorizons.libraries.json.simple'
-
     // Theming
     relocate 'com.formdev.flatlaf', 'distanthorizons.libraries.formdev.flatlaf'
 
diff --git a/gradle.properties b/gradle.properties
index a8d9c23c7..817b50c72 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,8 +16,7 @@ architectury_version=5.7.28
 enabled_platforms=fabric,forge
 
 # Global Plugin Versions
-toml_version=3.6.5
-json_version=1.1.1
+nightconfig_version=3.6.6
 flatlaf_version=2.3
 svgSalamander_version=1.1.3
 manifold_version=2022.1.19