diff --git a/gradle.properties b/gradle.properties
index aa667e2..4be6672 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx4G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.20.6
-	yarn_mappings=1.20.6+build.1
-	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.6.2+1.20.6
+	mod_version = 1.6.3+1.21
 	maven_group = net.puzzlemc
 	archives_base_name = puzzle
 	release_type=release
@@ -17,9 +17,9 @@ org.gradle.jvmargs=-Xmx4G
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.97.8+1.20.6
+	fabric_version=0.100.1+1.21
 	mod_menu_version = 7.0.1
-	midnightlib_version = 1.5.5-fabric
+	midnightlib_version = 1.5.7-fabric
 	
 	cull_leaves_version = 3.0.2-fabric
 	ldl_version = 2.3.2+1.20.1
diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java
index 394e2f7..5801a6a 100755
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class PuzzleApi {
-    private static Logger LOGGER = LogManager.getLogger("puzzle-gui");
+    private static final Logger LOGGER = LogManager.getLogger("puzzle-gui");
 
     public static List<PuzzleWidget> GRAPHICS_OPTIONS = new ArrayList<>();
     public static List<PuzzleWidget> MISC_OPTIONS = new ArrayList<>();
diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
index c81f308..2440ae2 100755
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
@@ -17,7 +17,7 @@ public class PuzzleClient implements ClientModInitializer {
     public final static String id = "puzzle";
     public static final Text YES = Text.translatable("gui.yes").formatted(Formatting.GREEN);
     public static final Text NO = Text.translatable("gui.no").formatted(Formatting.RED);
-    public static final Identifier PUZZLE_BUTTON = new Identifier(id, "icon/button");
+    public static final Identifier PUZZLE_BUTTON = Identifier.of(id, "icon/button");
 
     @Override
     public void onInitializeClient() {
diff --git a/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java b/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
index 8c9a697..59d01e4 100755
--- a/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
+++ b/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
@@ -1,13 +1,9 @@
 package net.puzzlemc.splashscreen;
 
-import com.mojang.blaze3d.platform.TextureUtil;
-import com.mojang.blaze3d.systems.RenderSystem;
 import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.fabricmc.api.ClientModInitializer;
-import net.minecraft.client.texture.AbstractTexture;
 import net.minecraft.client.texture.NativeImageBackedTexture;
 import net.minecraft.util.Util;
-import net.minecraft.util.math.ColorHelper;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -24,9 +20,10 @@ import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 
-import java.awt.*;
-import java.io.*;
-import java.net.URL;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -35,8 +32,8 @@ import java.util.Objects;
 import java.util.Properties;
 
 public class PuzzleSplashScreen implements ClientModInitializer {
-    public static final Identifier LOGO = new Identifier("textures/gui/title/mojangstudios.png");
-    public static final Identifier BACKGROUND = new Identifier("optifine/splash_background.png");
+    public static final Identifier LOGO = Identifier.of("textures/gui/title/mojangstudios.png");
+    public static final Identifier BACKGROUND = Identifier.of("optifine/splash_background.png");
     public static File CONFIG_PATH = new File(String.valueOf(FabricLoader.getInstance().getConfigDir().resolve(".puzzle_cache")));
     public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png");
     public static Path BACKGROUND_TEXTURE = Paths.get(CONFIG_PATH + "/splash_background.png");
@@ -66,7 +63,7 @@ public class PuzzleSplashScreen implements ClientModInitializer {
         ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
             @Override
             public Identifier getFabricId() {
-                return new Identifier("puzzle", "splash_screen");
+                return Identifier.of("puzzle", "splash_screen");
             }
             @Override
             public void reload(ResourceManager manager) {