diff --git a/fabric/build.gradle b/fabric/build.gradle
index ec57bbbaf..ce430a1e3 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -48,7 +48,7 @@ dependencies {
         // Mojmap mappings
         officialMojangMappings()
         // Parchment mappings (it adds parameter mappings & javadoc)
-        parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
+        parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip")
     }
     // Fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
diff --git a/forge/build.gradle b/forge/build.gradle
index 1e402ddd3..13d3fecf0 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -66,11 +66,11 @@ dependencies {
         // Mojmap mappings
         officialMojangMappings()
         // Parchment mappings (it adds parameter mappings & javadoc)
-        parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
+        parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip")
     }
 
     // Forge
-    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${project.forge_version}"
+    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
 
     // Architectury API
 //    if (minecraft_version == "1.16.5") {
diff --git a/settings.gradle b/settings.gradle
index 1e13c16ad..26618768a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -78,15 +78,12 @@ project(":api").projectDir = file('coreSubProjects/api')
 
 // Minecraft dependent sub-projects
 include("common")
-// Enables or disables the subprojects depending on whats in the version.properties
-if (gradle.builds_for.contains("forge"))
-    include("forge")
+// Enables or disables the subprojects depending on whats in the versionProperties/mcVer.properties
+for (loader in ((String) gradle.builds_for).split(",")) {
+    include(loader)
+}
 //if (gradle.builds_for.contains("fabric") || gradle.builds_for.contains("quilt"))
 //    include("fabricLike")
-if (gradle.builds_for.contains("fabric"))
-    include("fabric")
-if (gradle.builds_for.contains("quilt"))
-    include("quilt") // Just put this here for once we need it ;)
 
 
 rootProject.name = "DistantHorizons"
diff --git a/versionProperties/1.16.5.properties b/versionProperties/1.16.5.properties
index 928b76199..0eb2f09f3 100644
--- a/versionProperties/1.16.5.properties
+++ b/versionProperties/1.16.5.properties
@@ -4,7 +4,7 @@ minecraft_version=1.16.5
 parchment_version=2022.03.06
 compatible_minecraft_versions=["1.16.4", "1.16.5"]
 accessWidenerVersion=1_16
-builds_for=["fabric", "forge"]
+builds_for=fabric,forge
 
 # Fabric loader
 fabric_loader_version=0.13.2
diff --git a/versionProperties/1.17.1.properties b/versionProperties/1.17.1.properties
index d545e8066..2dbde0c83 100644
--- a/versionProperties/1.17.1.properties
+++ b/versionProperties/1.17.1.properties
@@ -4,7 +4,7 @@ minecraft_version=1.17.1
 parchment_version=2021.12.12
 compatible_minecraft_versions=["1.17", "1.17.1"]
 accessWidenerVersion=1_17
-builds_for=["fabric", "forge"]
+builds_for=fabric,forge
 
 # Fabric loader
 fabric_loader_version=0.13.2
diff --git a/versionProperties/1.18.1.properties b/versionProperties/1.18.1.properties
index f350e8f99..bf95d72c6 100644
--- a/versionProperties/1.18.1.properties
+++ b/versionProperties/1.18.1.properties
@@ -4,7 +4,7 @@ minecraft_version=1.18.1
 parchment_version=2022.03.06
 compatible_minecraft_versions=["1.18", "1.18.1"]
 accessWidenerVersion=1_18
-builds_for=["fabric", "forge"]
+builds_for=fabric,forge
 
 # Fabric loader
 fabric_loader_version=0.13.3
diff --git a/versionProperties/1.18.2.properties b/versionProperties/1.18.2.properties
index 9aae0818f..75fccf0fe 100644
--- a/versionProperties/1.18.2.properties
+++ b/versionProperties/1.18.2.properties
@@ -1,10 +1,10 @@
 # 1.18.2 version based stuff
 java_version = 17
 minecraft_version=1.18.2
-parchment_version=2022.11.06
+parchment_version=1.18.2:2022.11.06
 compatible_minecraft_versions=["1.18.2"]
 accessWidenerVersion=1_18
-builds_for=["fabric", "forge"]
+builds_for=fabric,forge
 
 # Fabric loader
 fabric_loader_version=0.14.19
diff --git a/versionProperties/1.19.2.properties b/versionProperties/1.19.2.properties
index bc6dbc99a..800af8546 100644
--- a/versionProperties/1.19.2.properties
+++ b/versionProperties/1.19.2.properties
@@ -4,7 +4,7 @@ minecraft_version=1.19.2
 parchment_version=2022.08.10
 compatible_minecraft_versions=["1.19.2"]
 accessWidenerVersion=1_19
-builds_for=["fabric", "forge"]
+builds_for=fabric,forge
 
 # Fabric loader
 fabric_loader_version=0.14.9
diff --git a/versionProperties/1.19.properties b/versionProperties/1.19.properties
index 9a3538802..7dae3dd1c 100644
--- a/versionProperties/1.19.properties
+++ b/versionProperties/1.19.properties
@@ -4,7 +4,7 @@ minecraft_version=1.19
 parchment_version=2022.08.10
 compatible_minecraft_versions=["1.19"]
 accessWidenerVersion=1_19
-builds_for=["fabric", "forge"]
+builds_for=fabric,forge
 
 # Fabric loader
 fabric_loader_version=0.14.7