diff --git a/build.gradle.kts b/build.gradle.kts
index a1ccceb..c3e6eae 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
     kotlin("jvm") version "1.9.0"
     kotlin("plugin.serialization") version "1.9.0"
-    id("fabric-loom") version "1.3-SNAPSHOT"
-    id("io.github.juuxel.loom-vineflower") version "1.11.0"
+    id("fabric-loom") version "1.4-SNAPSHOT"
 }
 
 version = property("mod_version")!!.toString()
@@ -31,7 +30,6 @@ dependencies {
     modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
     modImplementation("net.fabricmc:fabric-language-kotlin:${property("fabric_kotlin_version")}")
 
-    include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${property("mixin_extras_version")}")!!)!!)
     modImplementation("dev.isxander.yacl:yet-another-config-lib-fabric:${property("yacl_version")}")
     modApi("com.terraformersmc:modmenu:${property("modmenu_version")}")
     implementation("ca.weblite:java-objc-bridge:1.0.0")
diff --git a/gradle.properties b/gradle.properties
index 1a80e96..48e6c44 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,19 +4,18 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.4
-loader_version=0.14.24
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.1
+loader_version=0.15.1
 
 #Fabric api
-fabric_version=0.90.4+1.20.2
+fabric_version=0.91.2+1.20.4
 
 # Mod Properties
-mod_version=2.0.0
+mod_version=2.0.1
 archives_base_name=screenshots
 
 # Dependencies
-fabric_kotlin_version=1.10.10+kotlin.1.9.10
-yacl_version=3.3.0-beta.1+1.20.2
-modmenu_version=8.0.0
-mixin_extras_version=0.2.0
\ No newline at end of file
+fabric_kotlin_version=1.10.16+kotlin.1.9.21
+yacl_version=3.3.1+1.20.4
+modmenu_version=8.0.0
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 033e24c..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 62f495d..1af9e09 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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index fcb6fca..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/src/main/java/com/squagward/screenshots/mixin/KeyboardMixin.java b/src/main/java/com/squagward/screenshots/mixin/KeyboardMixin.java
index 03aaadd..f9a5c92 100644
--- a/src/main/java/com/squagward/screenshots/mixin/KeyboardMixin.java
+++ b/src/main/java/com/squagward/screenshots/mixin/KeyboardMixin.java
@@ -26,31 +26,31 @@ public class KeyboardMixin {
     @Final
     private MinecraftClient client;
 
-    @WrapOperation(
-            method = "onKey",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/client/util/ScreenshotRecorder;saveScreenshot(Ljava/io/File;Lnet/minecraft/client/gl/Framebuffer;Ljava/util/function/Consumer;)V"
-            )
-    )
-    private void screenshots$openhud(File gameDirectory, Framebuffer framebuffer, Consumer<Text> messageReceiver, Operation<Void> original) {
-        ScreenshotsConfig config = ScreenshotsConfig.CONFIG.instance();
-        if (!config.getEnabled() || !config.getCropImage()) {
-            original.call(gameDirectory, framebuffer, messageReceiver);
-            return;
-        }
-
-        ScreenshotHud.INSTANCE.updateBackgroundImage(framebuffer);
-        Screenshots.INSTANCE.setDisplayScreenshotHud(true);
-        ScreenshotHud.INSTANCE.reset();
-
-        if (client.currentScreen == null) {
-            client.send(() -> {
-                client.setScreen(new ScreenshotScreen());
-                Screenshots.INSTANCE.setDisplayScreenshotScreen(true);
-            });
-        }
-    }
+//    @WrapOperation(
+//            method = "onKey",
+//            at = @At(
+//                    value = "INVOKE",
+//                    target = "Lnet/minecraft/client/util/ScreenshotRecorder;saveScreenshot(Ljava/io/File;Lnet/minecraft/client/gl/Framebuffer;Ljava/util/function/Consumer;)V"
+//            )
+//    )
+//    private void screenshots$openhud(File gameDirectory, Framebuffer framebuffer, Consumer<Text> messageReceiver, Operation<Void> original) {
+//        ScreenshotsConfig config = ScreenshotsConfig.CONFIG.instance();
+//        if (!config.getEnabled() || !config.getCropImage()) {
+//            original.call(gameDirectory, framebuffer, messageReceiver);
+//            return;
+//        }
+//
+//        ScreenshotHud.INSTANCE.updateBackgroundImage(framebuffer);
+//        Screenshots.INSTANCE.setDisplayScreenshotHud(true);
+//        ScreenshotHud.INSTANCE.reset();
+//
+//        if (client.currentScreen == null) {
+//            client.send(() -> {
+//                client.setScreen(new ScreenshotScreen());
+//                Screenshots.INSTANCE.setDisplayScreenshotScreen(true);
+//            });
+//        }
+//    }
 
     @Inject(method = "onChar", at = @At("HEAD"), cancellable = true)
     private void screenshots$cancelCharType(long window, int codePoint, int modifiers, CallbackInfo ci) {
diff --git a/src/main/java/com/squagward/screenshots/mixin/ScreenshotRecorderMixin.java b/src/main/java/com/squagward/screenshots/mixin/ScreenshotRecorderMixin.java
index 5330043..f60ab6a 100644
--- a/src/main/java/com/squagward/screenshots/mixin/ScreenshotRecorderMixin.java
+++ b/src/main/java/com/squagward/screenshots/mixin/ScreenshotRecorderMixin.java
@@ -1,6 +1,5 @@
 package com.squagward.screenshots.mixin;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import com.squagward.screenshots.Screenshots;
 import com.squagward.screenshots.config.ScreenshotsConfig;
 import com.squagward.screenshots.hud.ScreenshotHud;