diff --git a/build.gradle b/build.gradle
index 3a0b0be..1b794dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
 plugins {
 	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
+	id "me.shedaniel.unified-publishing" version "0.1.+"
 }
 
 version = project.mod_version
@@ -70,3 +71,57 @@ publishing {
 		// mavenLocal()
 	}
 }
+ext {
+	releaseChangelog = {
+		def changes = new StringBuilder()
+		changes << "## TimeChanger v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/TeamMidnightDust/TimeChanger/commits/)"
+		def proc = "git log --max-count=1 --pretty=format:%s".execute()
+		proc.in.eachLine { line ->
+			def processedLine = line.toString()
+			if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) {
+				changes << "\n- ${processedLine.capitalize()}"
+			}
+		}
+		proc.waitFor()
+		return changes.toString()
+	}
+}
+unifiedPublishing {
+	project {
+		displayName = "TimeChanger $project.version - $project.minecraft_version"
+		releaseType = "$project.release_type"
+		changelog = releaseChangelog()
+		gameVersions = []
+		gameLoaders = ["fabric","quilt"]
+		mainPublication remapJar
+		relations {
+			depends {
+				curseforge = "fabric-api"
+				modrinth = "fabric-api"
+			}
+			includes {
+				curseforge = "midnightlib"
+				modrinth = "midnightlib"
+			}
+		}
+
+		var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
+		if (CURSEFORGE_TOKEN != null) {
+			curseforge {
+				token = CURSEFORGE_TOKEN
+				id = rootProject.curseforge_id
+				gameVersions.addAll "Java 21", project.minecraft_version
+			}
+		}
+
+		var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
+		if (MODRINTH_TOKEN != null) {
+			modrinth {
+				token = MODRINTH_TOKEN
+				id = rootProject.modrinth_id
+				version = "$project.version"
+				gameVersions.addAll project.minecraft_version
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 6b2f942..674a6ac 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,15 +3,18 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop/
-	minecraft_version=1.20.4
-	yarn_mappings=1.20.4+build.3
-	loader_version=0.15.10
+	minecraft_version=1.21
+	yarn_mappings=1.21+build.2
+	loader_version=0.15.11
 
 # Mod Properties
-	mod_version = 1.3.1
+	mod_version = 1.3.2
 	maven_group = eu.midnightdust
 	archives_base_name = timechanger
+	release_type=release
+	curseforge_id=436636
+	modrinth_id=1itdse3V
 
 # Dependencies
-	fabric_version=0.97.0+1.20.4
-	midnightlib_version=1.5.3-fabric
\ No newline at end of file
+	fabric_version=0.100.1+1.21
+	midnightlib_version=1.5.7-fabric
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 5b60df3..009dc65 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        jcenter()
+        maven { url "https://maven.architectury.dev/" }
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
diff --git a/src/main/java/eu/midnightdust/timechanger/TimeChangerClient.java b/src/main/java/eu/midnightdust/timechanger/TimeChangerClient.java
index 0b5c264..35b151e 100755
--- a/src/main/java/eu/midnightdust/timechanger/TimeChangerClient.java
+++ b/src/main/java/eu/midnightdust/timechanger/TimeChangerClient.java
@@ -8,7 +8,7 @@ import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallba
 import net.minecraft.client.MinecraftClient;
 
 public class TimeChangerClient implements ClientModInitializer {
-    private static MinecraftClient client = MinecraftClient.getInstance();
+    private static final MinecraftClient client = MinecraftClient.getInstance();
 
     @Override
     public void onInitializeClient() {