diff --git a/Fabric/build.gradle.kts b/Fabric/build.gradle.kts
index 270ad0c..da176e6 100644
--- a/Fabric/build.gradle.kts
+++ b/Fabric/build.gradle.kts
@@ -4,7 +4,7 @@ val fabricVersion: String by project
 
 plugins {
 	idea
-	id("fabric-loom") version "0.9-SNAPSHOT"
+	id("fabric-loom") version "0.10-SNAPSHOT"
 }
 
 dependencies {
diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
index 47cb671..565cec2 100644
--- a/Fabric/src/main/resources/fabric.mod.json
+++ b/Fabric/src/main/resources/fabric.mod.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "bettercontrols",
+  "id": "${id}",
   "name": "${name}",
   "description": "${description}",
   "version": "${version}",
@@ -24,7 +24,7 @@
   },
   
   "mixins": [{
-    "config": "bettercontrols.mixins.json",
+    "config": "${id}.mixins.json",
     "environment": "client"
   }],
   
diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml
index b16edc0..836e87b 100644
--- a/Forge/src/main/resources/META-INF/mods.toml
+++ b/Forge/src/main/resources/META-INF/mods.toml
@@ -6,20 +6,20 @@ license = "${license}"
 issueTrackerURL = "${issuesURL}"
 
 [[mods]]
-modId = "bettercontrols"
+modId = "${id}"
 version = "${version}"
 displayName = "${name}"
 description = "${description}"
 logoFile = "icon.png"
 
-[[dependencies.bettercontrols]]
+[[dependencies.${id}]]
 modId = "minecraft"
 mandatory = true
 versionRange = "[1.17.1,)"
 ordering = "NONE"
 side = "BOTH"
 
-[[dependencies.bettercontrols]]
+[[dependencies.${id}]]
 modId = "forge"
 mandatory = true
 versionRange = "[37,)"
diff --git a/build.gradle.kts b/build.gradle.kts
index ef08b89..415a093 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -33,6 +33,7 @@ idea {
 	module {
 		excludeDirs.add(file("gradle"))
 		excludeDirs.add(file("run"))
+		excludeDirs.add(file("Fabric/run"))
 		
 		if (findProject(":Forge") == null) {
 			excludeDirs.add(file("Forge"))
@@ -101,8 +102,7 @@ subprojects {
 	}
 	
 	tasks.processResources {
-		from(rootProject.sourceSets.main.get().resources)
-		
+		inputs.property("id", modId)
 		inputs.property("name", modName)
 		inputs.property("description", modDescription)
 		inputs.property("version", modVersion)
@@ -110,6 +110,10 @@ subprojects {
 		inputs.property("license", modLicense)
 		inputs.property("sourcesURL", modSourcesURL)
 		inputs.property("issuesURL", modIssuesURL)
+		
+		from(rootProject.sourceSets.main.get().resources) {
+			expand(inputs.properties)
+		}
 	}
 	
 	tasks.jar {
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
index 173ddde..1ec87ca 100644
--- a/src/main/resources/pack.mcmeta
+++ b/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
-        "description": "Better Controls",
+        "description": "${name}",
         "pack_format": 7,
         "_comment": ""
     }