diff --git a/build.gradle b/build.gradle
index c7399f19..f22e6356 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,18 +8,18 @@ plugins {
     alias libs.plugins.modmuss50.publish
 }
 
+def targetJavaVersion = Integer.parseInt(java_version)
 def local = !System.getenv().containsKey("GITHUB_RUN_NUMBER")
 
-version = "${project.mod_version}-${project.minecraft_version}-${local ? 'local' : "build.${System.getenv("GITHUB_RUN_NUMBER")}"}"
+version = "${mod_version}+mc${minecraft_version}"
 group = project.maven_group
 
 base {
-    archivesName = project.archives_base_name
+    archivesName = "${project.mod_id}-${loader_id}"
 }
 
 apply from: "https://raw.githubusercontent.com/constellation-mc/artifacts/main/artifacts.groovy"
 constellationRepo(project, "pulsar")
-constellationRepo(project, "commander")
 
 repositories {
     mavenLocal()
@@ -63,10 +63,10 @@ loom {
 
     runs {
         client {
-            runDir("run_client")
+            runDir("run/client")
         }
         server {
-            runDir("run_server")
+            runDir("run/server")
         }
     }
 
@@ -82,14 +82,15 @@ loom {
     }
 }
 
-loom.mods.register(project.archives_base_name) {
+loom.mods.register(mod_id) {
     sourceSet project.sourceSets.main
 }
 
 processResources {
     def map = [
             "version": project.version,
-            "minecraft_version": project.minecraft_version,
+            "mod_id": mod_id,
+            "minecraft_version": minecraft_version,
             "loader_version": libs.fabric.loader.get().version,
             "fabric_version": libs.fabric.api.get().version,
             "cloth_version": libs.cloth.config.get().version,
@@ -104,7 +105,6 @@ processResources {
     }
 }
 
-def targetJavaVersion = 25
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
     it.options.release = targetJavaVersion
@@ -120,7 +120,7 @@ java {
 
 jar {
     from("LICENSE") {
-        rename { "${it}_${base.archivesName.get()}" }
+        rename { "${it}_${mod_id}" }
     }
 }
 
@@ -134,7 +134,7 @@ sourcesJar {
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifactId = project.archives_base_name
+            artifactId = "${mod_id}-${loader_id}"
             from components.java
         }
     }
@@ -159,14 +159,14 @@ publishMods {
 
     changelog = file("CHANGELOG.md").text
     type = ReleaseType.valueOf(providers.environmentVariable("VERSION_TYPE").getOrElse("BETA"))
-    modLoaders.add("fabric")
+    modLoaders.add(loader_id)
 
-    displayName = "${project.mod_version} (${project.minecraft_version})"
+    displayName = "${mod_version} (${minecraft_version})"
 
     modrinth {
         projectId = "TseYlb0f"
         accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-        minecraftVersions.add("${project.minecraft_version}")
+        minecraftVersions.add("${minecraft_version}")
 
         requires("fabric-api")
         requires("pulsar")
@@ -176,7 +176,7 @@ publishMods {
     curseforge {
         projectId = "639198"
         accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
-        minecraftVersions.add("${project.minecraft_version}")
+        minecraftVersions.add("${minecraft_version}")
 
         requires("fabric-api")
         requires("pulsar")
@@ -186,7 +186,7 @@ publishMods {
     github {
         repository = "constellation-mc/andromeda"
         accessToken = providers.environmentVariable("GITHUB_TOKEN")
-        commitish = providers.environmentVariable("GITHUB_SHA").getOrElse("${project.minecraft_version}-fabric")
+        commitish = providers.environmentVariable("GITHUB_SHA").getOrElse("${minecraft_version}-${loader_id}")
 
         type = STABLE
     }
diff --git a/gradle.properties b/gradle.properties
index e533d5d1..37d5e98c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,10 @@
-# Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
-# Fabric Properties
-# check these on https://modmuss50.me/fabric.html
-minecraft_version=26.1.2
-loader_version=0.16.9
-# Mod Properties
-mod_version=2.2.0
+
 maven_group=dev.zenfyr
-archives_base_name=andromeda
+java_version=25
+
+mod_id=andromeda
+mod_version=2.2.1
+
+loader_id=fabric
+minecraft_version=26.1.2
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 9ac87829..7c8900a7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,4 +7,4 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
-rootProject.name = "${settings['archives_base_name']}-${settings['minecraft_version']}-fabric"
\ No newline at end of file
+rootProject.name = "${settings['mod_id']}-${settings['minecraft_version']}-${settings['loader_id']}"
\ No newline at end of file