diff --git a/build.gradle b/build.gradle
index e4e66ea..1c911d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "architectury-plugin" version "3.4.151"
-    id "dev.architectury.loom" version "1.4.373" apply false
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
     id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
@@ -53,7 +53,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {
@@ -67,11 +67,11 @@ publishMods {
     version = "${mod_version}"
     type = STABLE
 
-    def forgeOptions = publishOptions {
-        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
-        modLoaders.add("forge")
-    }
+//    def forgeOptions = publishOptions {
+//        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+//        displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
+//        modLoaders.add("forge")
+//    }
 
     def neoForge = publishOptions {
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
@@ -91,18 +91,18 @@ publishMods {
         minecraftVersions.add("${minecraft_version}")
     }
 
-    curseforge("curseforgeForge") {
-        from(curseForgeOptions, forgeOptions)
-    }
+//    curseforge("curseforgeForge") {
+//        from(curseForgeOptions, forgeOptions)
+//    }
 
     curseforge("curseforgeNeoForge") {
         from(curseForgeOptions, neoForge)
     }
 
     if (providers.environmentVariable("MODRINTH_TOKEN").getOrNull() != null) {
-        modrinth("modrinthForge") {
-            from(modrinthOptions, forgeOptions)
-        }
+//        modrinth("modrinthForge") {
+//            from(modrinthOptions, forgeOptions)
+//        }
 
         modrinth("modrinthNeoforge") {
             from(modrinthOptions, neoForge)
diff --git a/gradle.properties b/gradle.properties
index 17b6e15..42a4509 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,28 +3,28 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 
-enabled_platforms=neoforge,forge
+enabled_platforms=neoforge
 
-mod_version=84.0.1
+mod_version=85.0.0
 
 # Dependencies
-minecraft_version=1.20.4
+minecraft_version=1.20.5
 
 # ForgeGradle
 forge_gradle_version=6.0.18
 # NeoForgeGradle
-neoforge_gradle_version=7.0.80
+neoforge_gradle_version=7.0.83
 # Mod loaders
 # NeoForge
-neoforge_version=20.4.80-beta
+neoforge_version=20.5.21-beta
 # Forge
 forge_version=49.0.14
 
-fabric_loader_version=0.15.3
-fabric_api_version=0.91.2+1.20.4
+fabric_loader_version=0.15.11
+fabric_api_version=0.97.8+1.20.5
 
 # Architectury
-architectury_version=11.0.10
+architectury_version=12.0.28
 
 archives_base_name=mute
 maven_group=com.sunekaer.mods
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 744c64d..20db9ad 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 9242a98..6d914d6 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -40,7 +40,7 @@ processResources {
     duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
     inputs.property "version", project.version
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand "version": project.version
     }
 }
diff --git a/neoforge/src/main/java/mute/Config.java b/neoforge/src/main/java/mute/Config.java
index 53532b6..32ccd5d 100644
--- a/neoforge/src/main/java/mute/Config.java
+++ b/neoforge/src/main/java/mute/Config.java
@@ -1,7 +1,7 @@
 package mute;
 
 import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.event.config.ModConfigEvent;
 import net.neoforged.neoforge.common.ModConfigSpec;
 
@@ -10,7 +10,7 @@
 import java.util.List;
 import java.util.Set;
 
-@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
+@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
 public class Config {
     public static final String CATEGORY_GENERAL = "general";
     public static ModConfigSpec CONFIG;
diff --git a/neoforge/src/main/java/mute/Mute.java b/neoforge/src/main/java/mute/Mute.java
index eff1543..ce72201 100644
--- a/neoforge/src/main/java/mute/Mute.java
+++ b/neoforge/src/main/java/mute/Mute.java
@@ -13,9 +13,9 @@ public class Mute {
     public static final String MODID = "mute";
 
     public Mute() {
-        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.CONFIG);
-
-        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> "", (c, b) -> true));
+        if (FMLEnvironment.dist == Dist.CLIENT) {
+            ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.CONFIG);
+        }
 
     }
 }
\ No newline at end of file
diff --git a/neoforge/src/main/java/mute/PlaySoundEventHandler.java b/neoforge/src/main/java/mute/PlaySoundEventHandler.java
index b84e735..0d9caa6 100644
--- a/neoforge/src/main/java/mute/PlaySoundEventHandler.java
+++ b/neoforge/src/main/java/mute/PlaySoundEventHandler.java
@@ -3,10 +3,11 @@
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.api.distmarker.Dist;
+import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.client.event.sound.PlaySoundEvent;
 
-@Mod.EventBusSubscriber(value = Dist.CLIENT)
+@EventBusSubscriber(value = Dist.CLIENT)
 public class PlaySoundEventHandler {
     @SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = false)
     public static void onPlaySoundEvent(PlaySoundEvent event) {
diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
similarity index 76%
rename from neoforge/src/main/resources/META-INF/mods.toml
rename to neoforge/src/main/resources/META-INF/neoforge.mods.toml
index f29da01..7d8e3a5 100644
--- a/neoforge/src/main/resources/META-INF/mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -1,6 +1,7 @@
 modLoader="javafml" #mandatory
-loaderVersion="[1,)" #mandatory
+loaderVersion="[2,)" #mandatory
 license = "All Rights Reserved"
+displayTest="IGNORE_ALL_VERSION"
 
 [[mods]] #mandatory
 modId="mute" #mandatory
@@ -10,17 +11,18 @@ authors="Sunekaer" #optional
 description='''
 Mutes sounds in the game based on config.
 '''
+side="CLIENT"
 
 [[dependencies.mute]]
 modId = "neoforge"
 required = true
-versionRange = "[20.4,)"
+versionRange = "[20.5,)"
 ordering="NONE"
 side="BOTH"
 
 [[dependencies.mute]]
 modId="minecraft"
 required=true
-versionRange="[1.20.4,)"
+versionRange="[1.20.5,)"
 ordering="NONE"
 side="BOTH"
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index c0b9f48..6ca0ed1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,6 +9,7 @@ pluginManagement {
     }
 }
 
-include "common", "forge", "neoforge",
+//include "common", "forge", "neoforge",
+include "common", "neoforge",
 
 rootProject.name = 'Mute'
\ No newline at end of file