diff --git a/build.gradle b/build.gradle
index a154622..36d39c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,20 @@
 plugins {
-	id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
+	// 26.x is unobfuscated: no remapping and no mappings dependency, so the
+	// plain loom plugin (not -remap) is the right one here.
+	id 'net.fabricmc.fabric-loom' version "${loom_version}"
 	id 'maven-publish'
 }
 
 version = project.mod_version
 group = project.maven_group
 
+// Put the Minecraft version in the jar name so a launcher can tell 26.x builds
+// apart from other-version builds by filename (matches the title-screen mod's
+// `<id>-<mc>-<version>.jar` convention).
+base {
+	archivesName = "sessionlogin-${project.minecraft_version}"
+}
+
 repositories {
 	maven {
 		name = 'Terraformers'
@@ -15,20 +24,15 @@ repositories {
 
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-
-	// Optional ModMenu integration: present at compile, not bundled. If the
-	// player has ModMenu installed the entrypoint hooks; otherwise the class
-	// is simply never loaded.
-	modCompileOnly "com.terraformersmc:modmenu:17.0.0"
+	// 26.x ships unobfuscated → the game already has Mojang names, so Loom
+	// needs no mappings dependency (and rejects one).
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
 	// Bundled inside the mod jar (Jar-in-Jar) so reading Modrinth App's
-	// SQLite account DB works out of the box. Without `include` the
-	// dependency would only be on the dev classpath and the class would
-	// be missing in a real install.
-	include implementation("org.xerial:sqlite-jdbc:3.46.1.3")
+	// SQLite account DB works out of the box.
+	include "org.xerial:sqlite-jdbc:3.46.1.3"
+	implementation "org.xerial:sqlite-jdbc:3.46.1.3"
 }
 
 processResources {
@@ -41,14 +45,14 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
+	it.options.release = 25
 }
 
 java {
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {
@@ -56,7 +60,7 @@ jar {
 	inputs.property "projectName", projectName
 
 	from("LICENSE") {
-		rename { "${it}_$projectName"}
+		rename { "${it}_$projectName" }
 	}
 }
 
diff --git a/gradle.properties b/gradle.properties
index 033dcf0..dade560 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,19 +1,18 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 org.gradle.configuration-cache=false
 
-# Fabric Properties
+# Fabric Properties (26.x — unobfuscated, Mojang mappings; no Yarn)
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.11
-yarn_mappings=1.21.11+build.5
-loader_version=0.19.2
-loom_version=1.16-SNAPSHOT
+minecraft_version=26.1.2
+loader_version=0.19.3
+loom_version=1.17-SNAPSHOT
 
 # Mod Properties
 mod_version=1.3.5
 maven_group=dev.elv1n200
 
 # Dependencies
-fabric_api_version=0.141.3+1.21.11
+fabric_api_version=0.154.2+26.1.2
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c61a118..5dd3c01 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-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/dev/elv1n200/sessionlogin/SessionLogin.java b/src/main/java/dev/elv1n200/sessionlogin/SessionLogin.java
index 0cbb4f8..ebe2232 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/SessionLogin.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/SessionLogin.java
@@ -8,8 +8,7 @@
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.session.Session;
+import net.minecraft.client.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,10 +19,10 @@ public class SessionLogin implements ModInitializer {
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
 	/** The real session Minecraft started with. Never modified. */
-	public static Session originalSession;
+	public static User originalSession;
 
 	/** The session currently exposed to the game (may be swapped). */
-	public static Session currentSession;
+	public static User currentSession;
 
 	/** When false, the mixin returns the vanilla session untouched. */
 	public static boolean overrideSession = false;
diff --git a/src/main/java/dev/elv1n200/sessionlogin/SessionLoginClient.java b/src/main/java/dev/elv1n200/sessionlogin/SessionLoginClient.java
index 7fc5beb..6dba75f 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/SessionLoginClient.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/SessionLoginClient.java
@@ -1,42 +1,38 @@
 package dev.elv1n200.sessionlogin;
 
+import com.mojang.blaze3d.platform.InputConstants;
 import dev.elv1n200.sessionlogin.command.SessionLoginCommand;
 import dev.elv1n200.sessionlogin.screen.AccountManagerScreen;
 import dev.elv1n200.sessionlogin.screen.TamperWarningScreen;
 import dev.elv1n200.sessionlogin.screen.UnlockScreen;
 import dev.elv1n200.sessionlogin.util.IntegrityCheck;
-import dev.elv1n200.sessionlogin.util.SessionUtils;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.util.InputUtil;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.Minecraft;
 import org.lwjgl.glfw.GLFW;
 
 public class SessionLoginClient implements ClientModInitializer {
 
-	private KeyBinding openManagerKey;
+	private KeyMapping openManagerKey;
 
 	@Override
 	public void onInitializeClient() {
 		SessionLoginCommand.register();
 
-		openManagerKey = KeyBindingHelper.registerKeyBinding(new KeyBinding(
+		openManagerKey = KeyMappingHelper.registerKeyMapping(new KeyMapping(
 				"key.sessionlogin.manager",
-				InputUtil.Type.KEYSYM,
+				InputConstants.Type.KEYSYM,
 				GLFW.GLFW_KEY_UNKNOWN,
-				KeyBinding.Category.MISC));
+				KeyMapping.Category.MISC));
 
 		ClientTickEvents.END_CLIENT_TICK.register(new ClientTickEvents.EndTick() {
 			private boolean tamperShown = false;
 
 			@Override
-			public void onEndTick(MinecraftClient client) {
-				while (openManagerKey.wasPressed()) {
+			public void onEndTick(Minecraft client) {
+				while (openManagerKey.consumeClick()) {
 					if (SessionLogin.accountStore.isLocked()) {
 						client.setScreen(new UnlockScreen());
 					} else {
@@ -45,26 +41,15 @@ public void onEndTick(MinecraftClient client) {
 				}
 				if (!tamperShown
 						&& IntegrityCheck.status() == IntegrityCheck.Status.MISMATCH
-						&& client.currentScreen instanceof net.minecraft.client.gui.screen.TitleScreen) {
+						&& client.screen instanceof net.minecraft.client.gui.screens.TitleScreen) {
 					tamperShown = true;
 					client.setScreen(new TamperWarningScreen());
 				}
 			}
 		});
 
-		HudRenderCallback.EVENT.register((context, tickCounter) -> {
-			MinecraftClient mc = MinecraftClient.getInstance();
-			if (mc.world == null || mc.currentScreen != null) {
-				return;
-			}
-			if (SessionUtils.isOriginalActive()) {
-				return;
-			}
-			Text label = Text.literal("⚠ Alt: ")
-					.formatted(Formatting.GOLD)
-					.append(Text.literal(SessionUtils.getUsername())
-							.formatted(Formatting.WHITE));
-			context.drawTextWithShadow(mc.textRenderer, label, 4, 4, 0xFFFFFF);
-		});
+		// NOTE: the in-world "⚠ Alt: <name>" HUD overlay is omitted on 26.x —
+		// Fabric's HUD callback moved to the new render-state pipeline. The
+		// swapped-account indicator on the multiplayer screen still shows it.
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/command/SessionLoginCommand.java b/src/main/java/dev/elv1n200/sessionlogin/command/SessionLoginCommand.java
index c06fcab..a189e2a 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/command/SessionLoginCommand.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/command/SessionLoginCommand.java
@@ -7,11 +7,11 @@
 import dev.elv1n200.sessionlogin.util.Notifier;
 import dev.elv1n200.sessionlogin.util.SessionUtils;
 import dev.elv1n200.sessionlogin.util.TokenUtils;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommands;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
 
 /**
  * Client-side {@code /sl} command for quick session control without opening
@@ -32,28 +32,28 @@ public static void register() {
 						return builder.buildFuture();
 					};
 
-			dispatcher.register(ClientCommandManager.literal("sl")
+			dispatcher.register(ClientCommands.literal("sl")
 					.executes(ctx -> {
 						help(ctx.getSource());
 						return 1;
 					})
-					.then(ClientCommandManager.literal("list").executes(ctx -> {
+					.then(ClientCommands.literal("list").executes(ctx -> {
 						list(ctx.getSource());
 						return 1;
 					}))
-					.then(ClientCommandManager.literal("current").executes(ctx -> {
+					.then(ClientCommands.literal("current").executes(ctx -> {
 						current(ctx.getSource());
 						return 1;
 					}))
-					.then(ClientCommandManager.literal("restore").executes(ctx -> {
+					.then(ClientCommands.literal("restore").executes(ctx -> {
 						SessionUtils.restoreSession();
 						send(ctx.getSource(),
-								Text.literal("Restored original session")
-										.formatted(Formatting.GREEN));
+								Component.literal("Restored original session")
+										.withStyle(ChatFormatting.GREEN));
 						return 1;
 					}))
-					.then(ClientCommandManager.literal("switch").then(
-							ClientCommandManager.argument(
+					.then(ClientCommands.literal("switch").then(
+							ClientCommands.argument(
 									"label", StringArgumentType.greedyString())
 									.suggests(labelSuggestions)
 									.executes(ctx -> {
@@ -65,31 +65,31 @@ public static void register() {
 	}
 
 	private static void help(FabricClientCommandSource src) {
-		send(src, Text.literal("/sl list | current | switch <label> | restore")
-				.formatted(Formatting.GRAY));
+		send(src, Component.literal("/sl list | current | switch <label> | restore")
+				.withStyle(ChatFormatting.GRAY));
 	}
 
 	private static void list(FabricClientCommandSource src) {
 		if (SessionLogin.accountStore.accounts().isEmpty()) {
-			send(src, Text.literal("No saved accounts").formatted(Formatting.GRAY));
+			send(src, Component.literal("No saved accounts").withStyle(ChatFormatting.GRAY));
 			return;
 		}
 		for (Account a : SessionLogin.accountStore.accounts()) {
 			String tag = a.isOffline() ? " [offline]"
 					: " [" + TokenUtils.expiryLabel(a.token()) + "]";
-			send(src, Text.literal("- " + a.label() + " (" + a.username() + ")")
-					.formatted(Formatting.WHITE)
-					.append(Text.literal(tag).formatted(Formatting.DARK_GRAY)));
+			send(src, Component.literal("- " + a.label() + " (" + a.username() + ")")
+					.withStyle(ChatFormatting.WHITE)
+					.append(Component.literal(tag).withStyle(ChatFormatting.DARK_GRAY)));
 		}
 	}
 
 	private static void current(FabricClientCommandSource src) {
 		String name = SessionUtils.getUsername();
 		boolean original = SessionUtils.isOriginalActive();
-		Text t = Text.literal("Active: ").formatted(Formatting.GRAY)
-				.append(Text.literal(name).formatted(Formatting.WHITE))
-				.append(Text.literal(original ? " (original)" : " (swapped)")
-						.formatted(original ? Formatting.GRAY : Formatting.GREEN));
+		Component t = Component.literal("Active: ").withStyle(ChatFormatting.GRAY)
+				.append(Component.literal(name).withStyle(ChatFormatting.WHITE))
+				.append(Component.literal(original ? " (original)" : " (swapped)")
+						.withStyle(original ? ChatFormatting.GRAY : ChatFormatting.GREEN));
 		send(src, t);
 	}
 
@@ -104,24 +104,24 @@ private static void switchTo(FabricClientCommandSource src, String label) {
 					SessionUtils.setSession(SessionUtils.createSession(
 							a.username(), a.uuid(), a.token()));
 				} else {
-					send(src, Text.literal("Vault is locked")
-							.formatted(Formatting.RED));
+					send(src, Component.literal("Vault is locked")
+							.withStyle(ChatFormatting.RED));
 					return;
 				}
 				a.touch();
 				SessionLogin.accountStore.save();
 				Notifier.loggedIn(a.username());
-				send(src, Text.literal("Switched to " + a.username())
-						.formatted(Formatting.GREEN));
+				send(src, Component.literal("Switched to " + a.username())
+						.withStyle(ChatFormatting.GREEN));
 				return;
 			}
 		}
-		send(src, Text.literal("No account named '" + label + "'")
-				.formatted(Formatting.RED));
+		send(src, Component.literal("No account named '" + label + "'")
+				.withStyle(ChatFormatting.RED));
 	}
 
-	private static void send(FabricClientCommandSource src, Text msg) {
-		src.sendFeedback(Text.literal("[SL] ").formatted(Formatting.GOLD)
+	private static void send(FabricClientCommandSource src, Component msg) {
+		src.sendFeedback(Component.literal("[SL] ").withStyle(ChatFormatting.GOLD)
 				.append(msg));
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/mixin/ClientBrandRetrieverMixin.java b/src/main/java/dev/elv1n200/sessionlogin/mixin/ClientBrandRetrieverMixin.java
index a108ae3..fd23724 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/mixin/ClientBrandRetrieverMixin.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/mixin/ClientBrandRetrieverMixin.java
@@ -20,7 +20,7 @@ public class ClientBrandRetrieverMixin {
 	private static void sessionlogin$spoofBrand(CallbackInfoReturnable<String> cir) {
 		if (SessionLogin.settings != null
 				&& SessionLogin.settings.spoofBrandAsVanilla()) {
-			cir.setReturnValue(ClientBrandRetriever.VANILLA);
+			cir.setReturnValue(ClientBrandRetriever.VANILLA_NAME);
 		}
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/mixin/DownloaderMixin.java b/src/main/java/dev/elv1n200/sessionlogin/mixin/DownloaderMixin.java
deleted file mode 100644
index d8b0fec..0000000
--- a/src/main/java/dev/elv1n200/sessionlogin/mixin/DownloaderMixin.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package dev.elv1n200.sessionlogin.mixin;
-
-import dev.elv1n200.sessionlogin.SessionLogin;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.util.Downloader;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import java.nio.file.Path;
-import java.util.UUID;
-
-/**
- * Isolates the server-resource-pack cache per active session UUID, so a
- * server can't fingerprint your machine across alt accounts by correlating
- * cached pack files. Idea inherited from LiquidBounce / OpSec.
- *
- * <p>When {@link dev.elv1n200.sessionlogin.config.Settings#isolatePackCache()}
- * is off, the redirect is a no-op and the vanilla cache layout is used.
- */
-@Mixin(Downloader.class)
-public abstract class DownloaderMixin {
-
-	@Redirect(
-			method = "method_55485",
-			at = @At(value = "INVOKE",
-					target = "Ljava/nio/file/Path;resolve(Ljava/lang/String;)Ljava/nio/file/Path;"),
-			require = 0)
-	private Path sessionlogin$isolatePerAccount(Path original, String name) {
-		if (SessionLogin.settings == null
-				|| !SessionLogin.settings.isolatePackCache()) {
-			return original.resolve(name);
-		}
-		try {
-			UUID accountUuid =
-					MinecraftClient.getInstance().getSession().getUuidOrNull();
-			if (accountUuid == null) {
-				return original.resolve(name);
-			}
-			return original.resolve(accountUuid.toString()).resolve(name);
-		} catch (Throwable t) {
-			return original.resolve(name);
-		}
-	}
-}
diff --git a/src/main/java/dev/elv1n200/sessionlogin/mixin/MinecraftClientMixin.java b/src/main/java/dev/elv1n200/sessionlogin/mixin/MinecraftClientMixin.java
index fe8ac7d..836e7bb 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/mixin/MinecraftClientMixin.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/mixin/MinecraftClientMixin.java
@@ -2,9 +2,9 @@
 
 import com.mojang.authlib.minecraft.UserApiService;
 import dev.elv1n200.sessionlogin.SessionLogin;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.session.ProfileKeys;
-import net.minecraft.client.session.Session;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.User;
+import net.minecraft.client.multiplayer.ProfileKeyPairManager;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -17,12 +17,12 @@
 import java.nio.file.Path;
 import java.util.UUID;
 
-@Mixin(MinecraftClient.class)
+@Mixin(Minecraft.class)
 public abstract class MinecraftClientMixin {
 
 	@Shadow
 	@Final
-	public File runDirectory;
+	public File gameDirectory;
 
 	@Unique
 	private UUID sessionlogin$lastUuid = null;
@@ -31,25 +31,26 @@ public abstract class MinecraftClientMixin {
 	private String sessionlogin$lastToken = null;
 
 	@Unique
-	private ProfileKeys sessionlogin$cachedKeys = null;
+	private ProfileKeyPairManager sessionlogin$cachedKeys = null;
 
-	@Inject(method = "getSession", at = @At("HEAD"), cancellable = true)
-	private void sessionlogin$onGetSession(CallbackInfoReturnable<Session> cir) {
+	@Inject(method = "getUser", at = @At("HEAD"), cancellable = true)
+	private void sessionlogin$onGetUser(CallbackInfoReturnable<User> cir) {
 		if (!SessionLogin.overrideSession) {
 			return;
 		}
 		cir.setReturnValue(SessionLogin.currentSession);
 	}
 
-	@Inject(method = "getProfileKeys", at = @At("HEAD"), cancellable = true)
-	private void sessionlogin$onGetProfileKeys(CallbackInfoReturnable<ProfileKeys> cir) {
+	@Inject(method = "getProfileKeyPairManager", at = @At("HEAD"), cancellable = true)
+	private void sessionlogin$onGetProfileKeys(
+			CallbackInfoReturnable<ProfileKeyPairManager> cir) {
 		if (!SessionLogin.overrideSession) {
 			return;
 		}
 
-		Session session = SessionLogin.currentSession;
-		UUID uuid = session.getUuidOrNull();
-		String token = session.getAccessToken();
+		User user = SessionLogin.currentSession;
+		UUID uuid = user.getProfileId();
+		String token = user.getAccessToken();
 
 		boolean stale = sessionlogin$lastUuid == null
 				|| !sessionlogin$lastUuid.equals(uuid)
@@ -60,9 +61,9 @@ public abstract class MinecraftClientMixin {
 			sessionlogin$lastUuid = uuid;
 			sessionlogin$lastToken = token;
 			try {
-				Path profileKeysPath = runDirectory.toPath().resolve("profilekeys");
-				sessionlogin$cachedKeys = ProfileKeys.create(
-						UserApiService.OFFLINE, session, profileKeysPath);
+				Path profileKeysPath = gameDirectory.toPath().resolve("profilekeys");
+				sessionlogin$cachedKeys = ProfileKeyPairManager.create(
+						UserApiService.OFFLINE, user, profileKeysPath);
 			} catch (Exception e) {
 				sessionlogin$cachedKeys = null;
 			}
diff --git a/src/main/java/dev/elv1n200/sessionlogin/mixin/MultiplayerScreenMixin.java b/src/main/java/dev/elv1n200/sessionlogin/mixin/MultiplayerScreenMixin.java
index 8180c86..34b1d6c 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/mixin/MultiplayerScreenMixin.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/mixin/MultiplayerScreenMixin.java
@@ -5,19 +5,20 @@
 import dev.elv1n200.sessionlogin.screen.LoginScreen;
 import dev.elv1n200.sessionlogin.util.ApiUtils;
 import dev.elv1n200.sessionlogin.util.SessionUtils;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import net.minecraft.network.chat.Component;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(MultiplayerScreen.class)
+@Mixin(JoinMultiplayerScreen.class)
 public abstract class MultiplayerScreenMixin extends Screen {
 
 	@Unique
@@ -26,8 +27,8 @@ public abstract class MultiplayerScreenMixin extends Screen {
 	@Unique
 	private static volatile String sessionlogin$validatedToken = null;
 
-	protected MultiplayerScreenMixin(Text title) {
-		super(title);
+	protected MultiplayerScreenMixin(Minecraft minecraft, Font font, Component title) {
+		super(minecraft, font, title);
 	}
 
 	@Inject(method = "init", at = @At("TAIL"))
@@ -36,44 +37,43 @@ protected MultiplayerScreenMixin(Text title) {
 		int w = 80;
 		int h = 20;
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Login"),
-				b -> MinecraftClient.getInstance().setScreen(new LoginScreen())
-		).dimensions(this.width - 90, y, w, h).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Login"),
+				b -> Minecraft.getInstance().setScreen(new LoginScreen())
+		).bounds(this.width - 90, y, w, h).build());
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Accounts"),
-				b -> MinecraftClient.getInstance().setScreen(new AccountManagerScreen())
-		).dimensions(this.width - 180, y, w, h).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Accounts"),
+				b -> Minecraft.getInstance().setScreen(new AccountManagerScreen())
+		).bounds(this.width - 180, y, w, h).build());
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Edit"),
-				b -> MinecraftClient.getInstance().setScreen(new EditAccountScreen())
-		).dimensions(this.width - 270, y, w, h).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Edit"),
+				b -> Minecraft.getInstance().setScreen(new EditAccountScreen())
+		).bounds(this.width - 270, y, w, h).build());
 
-		// Persistent logged-in indicator, drawn every frame. Uses addDrawable
-		// (reliable) instead of injecting render(), which doesn't remap here.
-		this.addDrawable((context, mouseX, mouseY, delta) -> {
-			String token = MinecraftClient.getInstance()
-					.getSession().getAccessToken();
+		// Persistent logged-in indicator, extracted every frame. Uses
+		// addRenderableOnly (reliable) instead of injecting the render pass.
+		this.addRenderableOnly((extractor, mouseX, mouseY, delta) -> {
+			String token = Minecraft.getInstance().getUser().getAccessToken();
 			sessionlogin$revalidateIfNeeded(token);
 
-			Text statusPart;
+			Component statusPart;
 			if (!token.equals(sessionlogin$validatedToken)
 					|| sessionlogin$valid == null) {
-				statusPart = Text.literal("[checking...]").formatted(Formatting.GRAY);
+				statusPart = Component.literal("[checking...]").withStyle(ChatFormatting.GRAY);
 			} else if (sessionlogin$valid) {
-				statusPart = Text.literal("[✔ valid]").formatted(Formatting.GREEN);
+				statusPart = Component.literal("[✔ valid]").withStyle(ChatFormatting.GREEN);
 			} else {
-				statusPart = Text.literal("[✘ invalid]").formatted(Formatting.RED);
+				statusPart = Component.literal("[✘ invalid]").withStyle(ChatFormatting.RED);
 			}
 
 			boolean swapped = !SessionUtils.isOriginalActive();
-			Text display = Text.literal(swapped ? "Logged in: " : "Account: ")
-					.formatted(swapped ? Formatting.GOLD : Formatting.GRAY)
-					.append(Text.literal(SessionUtils.getUsername())
-							.formatted(Formatting.WHITE))
-					.append(Text.literal(" "))
+			Component display = Component.literal(swapped ? "Logged in: " : "Account: ")
+					.withStyle(swapped ? ChatFormatting.GOLD : ChatFormatting.GRAY)
+					.append(Component.literal(SessionUtils.getUsername())
+							.withStyle(ChatFormatting.WHITE))
+					.append(Component.literal(" "))
 					.append(statusPart);
 
-			context.drawTextWithShadow(this.textRenderer, display, 5, 6, 0xFFFFFF);
+			extractor.text(this.font, display, 5, 6, 0xFFFFFF, true);
 		});
 	}
 
diff --git a/src/main/java/dev/elv1n200/sessionlogin/mixin/TelemetryManagerMixin.java b/src/main/java/dev/elv1n200/sessionlogin/mixin/TelemetryManagerMixin.java
index 64cb1c4..38306b0 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/mixin/TelemetryManagerMixin.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/mixin/TelemetryManagerMixin.java
@@ -1,27 +1,27 @@
 package dev.elv1n200.sessionlogin.mixin;
 
 import dev.elv1n200.sessionlogin.SessionLogin;
-import net.minecraft.client.session.telemetry.TelemetryManager;
-import net.minecraft.client.session.telemetry.TelemetrySender;
+import net.minecraft.client.telemetry.ClientTelemetryManager;
+import net.minecraft.client.telemetry.TelemetryEventSender;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
- * Returns a no-op telemetry sender when the toggle is on, so events Mojang
+ * Returns a disabled telemetry sender when the toggle is on, so events Mojang
  * would normally receive are simply dropped on the client. Same approach as
  * "No Chat Reports".
  */
-@Mixin(TelemetryManager.class)
+@Mixin(ClientTelemetryManager.class)
 public class TelemetryManagerMixin {
 
-	@Inject(method = "getSender", at = @At("HEAD"), cancellable = true)
+	@Inject(method = "getOutsideSessionSender", at = @At("HEAD"), cancellable = true)
 	private void sessionlogin$blockTelemetry(
-			CallbackInfoReturnable<TelemetrySender> cir) {
+			CallbackInfoReturnable<TelemetryEventSender> cir) {
 		if (SessionLogin.settings != null
 				&& SessionLogin.settings.blockTelemetry()) {
-			cir.setReturnValue(TelemetrySender.NOOP);
+			cir.setReturnValue(TelemetryEventSender.DISABLED);
 		}
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/modmenu/ModMenuIntegration.java b/src/main/java/dev/elv1n200/sessionlogin/modmenu/ModMenuIntegration.java
deleted file mode 100644
index 740b7e4..0000000
--- a/src/main/java/dev/elv1n200/sessionlogin/modmenu/ModMenuIntegration.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package dev.elv1n200.sessionlogin.modmenu;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-import dev.elv1n200.sessionlogin.screen.SettingsScreen;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-
-/**
- * Lets ModMenu open the SessionLogin settings screen via its mod list.
- * This class is only loaded when ModMenu is actually installed.
- */
-@Environment(EnvType.CLIENT)
-public class ModMenuIntegration implements ModMenuApi {
-
-	@Override
-	public ConfigScreenFactory<?> getModConfigScreenFactory() {
-		return SettingsScreen::new;
-	}
-}
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/AccountManagerScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/AccountManagerScreen.java
index a13f068..6012474 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/AccountManagerScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/AccountManagerScreen.java
@@ -5,14 +5,14 @@
 import dev.elv1n200.sessionlogin.util.ApiUtils;
 import dev.elv1n200.sessionlogin.util.SessionUtils;
 import dev.elv1n200.sessionlogin.util.TokenUtils;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import net.minecraft.network.chat.Component;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -40,8 +40,8 @@ private enum Sort {RECENT, NAME, EXPIRY}
 	private static Sort sort = Sort.RECENT;
 	private static String query = "";
 
-	private Text status = Text.empty();
-	private TextFieldWidget searchField;
+	private Component status = Component.empty();
+	private EditBox searchField;
 	private int page = 0;
 
 	private int titleY;
@@ -51,7 +51,7 @@ private enum Sort {RECENT, NAME, EXPIRY}
 	private List<Account> visibleAccounts = java.util.Collections.emptyList();
 
 	public AccountManagerScreen() {
-		super(Text.literal(""));
+		super(Component.literal(""));
 	}
 
 	@Override
@@ -63,15 +63,15 @@ protected void init() {
 			this.titleY = ly - 30;
 			this.statusY = -100;
 			this.emptyY = -100;
-			this.addDrawableChild(ButtonWidget.builder(
-					Text.literal("Unlock Vault"), b -> {
-						assert this.client != null;
-						this.client.setScreen(new UnlockScreen());
-					}).dimensions(cx - 100, ly, 200, 20).build());
-			this.addDrawableChild(ButtonWidget.builder(Text.literal("Back"), b -> {
-				assert this.client != null;
-				this.client.setScreen(new MultiplayerScreen(new TitleScreen()));
-			}).dimensions(cx - 100, ly + 25, 200, 20).build());
+			this.addRenderableWidget(Button.builder(
+					Component.literal("Unlock Vault"), b -> {
+						assert this.minecraft != null;
+						this.minecraft.setScreen(new UnlockScreen());
+					}).bounds(cx - 100, ly, 200, 20).build());
+			this.addRenderableWidget(Button.builder(Component.literal("Back"), b -> {
+				assert this.minecraft != null;
+				this.minecraft.setScreen(new JoinMultiplayerScreen(new TitleScreen()));
+			}).bounds(cx - 100, ly + 25, 200, 20).build());
 			return;
 		}
 
@@ -91,22 +91,22 @@ protected void init() {
 		this.statusY = top + 12;
 
 		int searchY = top + 28;
-		searchField = new TextFieldWidget(this.textRenderer,
-				cx - 130, searchY + 1, 180, 18, Text.literal("Search"));
+		searchField = new EditBox(this.font,
+				cx - 130, searchY + 1, 180, 18, Component.literal("Search"));
 		searchField.setMaxLength(48);
-		searchField.setText(query);
-		searchField.setChangedListener(s -> {
+		searchField.setValue(query);
+		searchField.setResponder(s -> {
 			query = s;
 			page = 0;
-			this.clearAndInit();
+			this.rebuildWidgets();
 		});
-		this.addSelectableChild(searchField);
+		this.addRenderableWidget(searchField);
 
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Sort: " + sort.name()), b -> {
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Sort: " + sort.name()), b -> {
 					sort = Sort.values()[(sort.ordinal() + 1) % Sort.values().length];
-					this.clearAndInit();
-				}).dimensions(cx + 55, searchY, 75, 20).build());
+					this.rebuildWidgets();
+				}).bounds(cx + 55, searchY, 75, 20).build());
 
 		this.rowStart = top + 52;
 		this.emptyY = this.rowStart + 6;
@@ -116,118 +116,118 @@ protected void init() {
 			final Account acc = all.get(i);
 			int rowY = this.rowStart + (i - start) * 24;
 
-			this.addDrawableChild(ButtonWidget.builder(rowLabel(acc),
+			this.addRenderableWidget(Button.builder(rowLabel(acc),
 					b -> switchTo(acc)
-			).dimensions(cx - 130, rowY, 190, 20).build());
+			).bounds(cx - 130, rowY, 190, 20).build());
 
-			this.addDrawableChild(ButtonWidget.builder(Text.literal("E"),
+			this.addRenderableWidget(Button.builder(Component.literal("E"),
 					b -> {
-						assert this.client != null;
-						this.client.setScreen(new EditEntryScreen(acc));
-					}).dimensions(cx + 62, rowY, 28, 20).build());
+						assert this.minecraft != null;
+						this.minecraft.setScreen(new EditEntryScreen(acc));
+					}).bounds(cx + 62, rowY, 28, 20).build());
 
-			this.addDrawableChild(ButtonWidget.builder(
-					Text.literal("X").formatted(Formatting.RED),
+			this.addRenderableWidget(Button.builder(
+					Component.literal("X").withStyle(ChatFormatting.RED),
 					b -> {
 						SessionLogin.accountStore.remove(acc);
-						this.clearAndInit();
-					}).dimensions(cx + 92, rowY, 38, 20).build());
+						this.rebuildWidgets();
+					}).bounds(cx + 92, rowY, 38, 20).build());
 		}
 
 		int navY = rowStart + visibleRows * 24 + 6;
 
-		ButtonWidget prev = ButtonWidget.builder(Text.literal("< Prev"), b -> {
+		Button prev = Button.builder(Component.literal("< Prev"), b -> {
 			page--;
-			this.clearAndInit();
-		}).dimensions(cx - 130, navY, 60, 20).build();
+			this.rebuildWidgets();
+		}).bounds(cx - 130, navY, 60, 20).build();
 		prev.active = page > 0;
-		this.addDrawableChild(prev);
+		this.addRenderableWidget(prev);
 
-		ButtonWidget next = ButtonWidget.builder(Text.literal("Next >"), b -> {
+		Button next = Button.builder(Component.literal("Next >"), b -> {
 			page++;
-			this.clearAndInit();
-		}).dimensions(cx - 65, navY, 60, 20).build();
+			this.rebuildWidgets();
+		}).bounds(cx - 65, navY, 60, 20).build();
 		next.active = page < maxPage;
-		this.addDrawableChild(next);
+		this.addRenderableWidget(next);
 
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Add by Token"), b -> {
-					assert this.client != null;
-					this.client.setScreen(new LoginScreen());
-				}).dimensions(cx + 5, navY, 125, 20).build());
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Add by Token"), b -> {
+					assert this.minecraft != null;
+					this.minecraft.setScreen(new LoginScreen());
+				}).bounds(cx + 5, navY, 125, 20).build());
 
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Save Current"), b -> {
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Save Current"), b -> {
 					try {
 						var s = SessionLogin.currentSession;
-						Account a = new Account(s.getUsername(), s.getUsername(),
-								String.valueOf(s.getUuidOrNull()),
+						Account a = new Account(s.getName(), s.getName(),
+								String.valueOf(s.getProfileId()),
 								s.getAccessToken());
 						a.touch();
 						SessionLogin.accountStore.add(a);
-						status = ok("Saved " + s.getUsername());
-						this.clearAndInit();
+						status = ok("Saved " + s.getName());
+						this.rebuildWidgets();
 					} catch (Exception e) {
 						status = bad("Could not save session");
 					}
-				}).dimensions(cx - 130, navY + 24, 85, 20).build());
+				}).bounds(cx - 130, navY + 24, 85, 20).build());
 
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Bulk Import"), b -> {
-					assert this.client != null;
-					this.client.setScreen(new BulkImportScreen());
-				}).dimensions(cx - 43, navY + 24, 85, 20).build());
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Bulk Import"), b -> {
+					assert this.minecraft != null;
+					this.minecraft.setScreen(new BulkImportScreen());
+				}).bounds(cx - 43, navY + 24, 85, 20).build());
 
-		ButtonWidget restore = ButtonWidget.builder(
-				Text.literal("Use Original"), b -> {
+		Button restore = Button.builder(
+				Component.literal("Use Original"), b -> {
 					SessionUtils.restoreSession();
 					status = ok("Restored original session");
-				}).dimensions(cx + 44, navY + 24, 86, 20).build();
+				}).bounds(cx + 44, navY + 24, 86, 20).build();
 		restore.active = !SessionUtils.isOriginalActive();
-		this.addDrawableChild(restore);
+		this.addRenderableWidget(restore);
 
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Edit Account"), b -> {
-					assert this.client != null;
-					this.client.setScreen(new EditAccountScreen());
-				}).dimensions(cx - 130, navY + 48, 85, 20).build());
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Edit Account"), b -> {
+					assert this.minecraft != null;
+					this.minecraft.setScreen(new EditAccountScreen());
+				}).bounds(cx - 130, navY + 48, 85, 20).build());
 
 		String vaultLbl = SessionLogin.vault.isPasswordMode()
 				? "Vault: PW" : "Vault: Local";
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal(vaultLbl), b -> {
-					assert this.client != null;
-					this.client.setScreen(new SetPasswordScreen());
-				}).dimensions(cx - 43, navY + 48, 85, 20).build());
-
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Settings"), b -> {
-					assert this.client != null;
-					this.client.setScreen(new SettingsScreen(this));
-				}).dimensions(cx + 44, navY + 48, 86, 20).build());
-
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Add Offline"), b -> {
-					assert this.client != null;
-					this.client.setScreen(new AddOfflineAccountScreen());
-				}).dimensions(cx - 130, navY + 72, 85, 20).build());
-
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Import"), b -> {
-					assert this.client != null;
-					this.client.setScreen(new ImportExportScreen(true));
-				}).dimensions(cx - 43, navY + 72, 85, 20).build());
-
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Export"), b -> {
-					assert this.client != null;
-					this.client.setScreen(new ImportExportScreen(false));
-				}).dimensions(cx + 44, navY + 72, 86, 20).build());
-
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Back"), b -> {
-			assert this.client != null;
-			this.client.setScreen(new MultiplayerScreen(new TitleScreen()));
-		}).dimensions(cx - 100, navY + 96, 200, 20).build());
+		this.addRenderableWidget(Button.builder(
+				Component.literal(vaultLbl), b -> {
+					assert this.minecraft != null;
+					this.minecraft.setScreen(new SetPasswordScreen());
+				}).bounds(cx - 43, navY + 48, 85, 20).build());
+
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Settings"), b -> {
+					assert this.minecraft != null;
+					this.minecraft.setScreen(new SettingsScreen(this));
+				}).bounds(cx + 44, navY + 48, 86, 20).build());
+
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Add Offline"), b -> {
+					assert this.minecraft != null;
+					this.minecraft.setScreen(new AddOfflineAccountScreen());
+				}).bounds(cx - 130, navY + 72, 85, 20).build());
+
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Import"), b -> {
+					assert this.minecraft != null;
+					this.minecraft.setScreen(new ImportExportScreen(true));
+				}).bounds(cx - 43, navY + 72, 85, 20).build());
+
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Export"), b -> {
+					assert this.minecraft != null;
+					this.minecraft.setScreen(new ImportExportScreen(false));
+				}).bounds(cx + 44, navY + 72, 86, 20).build());
+
+		this.addRenderableWidget(Button.builder(Component.literal("Back"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new JoinMultiplayerScreen(new TitleScreen()));
+		}).bounds(cx - 100, navY + 96, 200, 20).build());
 	}
 
 	private List<Account> filteredSorted() {
@@ -252,24 +252,24 @@ private List<Account> filteredSorted() {
 		return list;
 	}
 
-	private Text rowLabel(Account acc) {
-		// Leading spaces reserve room for the 16x16 head overlay drawn in render().
+	private Component rowLabel(Account acc) {
+		// Leading spaces reserve room for the 16x16 avatar drawn in the extract pass.
 		String pad = "    ";
 		if (acc.isOffline()) {
-			return Text.literal(pad + acc.label() + "  ")
-					.append(Text.literal("[offline]").formatted(Formatting.DARK_GRAY));
+			return Component.literal(pad + acc.label() + "  ")
+					.append(Component.literal("[offline]").withStyle(ChatFormatting.DARK_GRAY));
 		}
 		String exp = acc.hasToken() ? TokenUtils.expiryLabel(acc.token())
 				: "locked";
 		Boolean valid = acc.hasToken() ? VALIDITY.get(acc.token()) : null;
 		String mark = valid == null ? "?" : (valid ? "OK" : "X");
-		Formatting c = valid == null ? Formatting.GRAY
-				: (valid ? Formatting.GREEN : Formatting.RED);
-		return Text.literal(pad + acc.label() + "  ")
-				.append(Text.literal("[" + exp + "]")
-						.formatted(TokenUtils.isExpired(acc.token())
-								? Formatting.RED : Formatting.DARK_GRAY))
-				.append(Text.literal(" " + mark).formatted(c));
+		ChatFormatting c = valid == null ? ChatFormatting.GRAY
+				: (valid ? ChatFormatting.GREEN : ChatFormatting.RED);
+		return Component.literal(pad + acc.label() + "  ")
+				.append(Component.literal("[" + exp + "]")
+						.withStyle(TokenUtils.isExpired(acc.token())
+								? ChatFormatting.RED : ChatFormatting.DARK_GRAY))
+				.append(Component.literal(" " + mark).withStyle(c));
 	}
 
 	private void startValidation(List<Account> list) {
@@ -311,9 +311,9 @@ private void switchTo(Account acc) {
 			acc.touch();
 			SessionLogin.accountStore.save();
 			if (TokenUtils.isExpired(acc.token())) {
-				status = surroundWithObfuscated(Text.literal(
+				status = surroundWithObfuscated(Component.literal(
 						"Switched (token expired!)")
-						.formatted(Formatting.YELLOW), 3);
+						.withStyle(ChatFormatting.YELLOW), 3);
 			} else {
 				status = ok("Switched to " + acc.username());
 			}
@@ -323,73 +323,49 @@ private void switchTo(Account acc) {
 		}
 	}
 
-	private void drawHeads(DrawContext context) {
+	/**
+	 * Row avatars. On 26.x {@link dev.elv1n200.sessionlogin.util.SkinCache}
+	 * doesn't upload head textures (the texture pipeline changed), so every row
+	 * gets the neutral placeholder square that keeps the label alignment.
+	 */
+	private void drawHeads(GuiGraphicsExtractor extractor) {
 		if (visibleAccounts.isEmpty()) {
 			return;
 		}
 		int cx = this.width / 2;
 		int x = cx - 128;
 		for (int i = 0; i < visibleAccounts.size(); i++) {
-			Account a = visibleAccounts.get(i);
 			int y = rowStart + i * 24 + 2;
-			net.minecraft.util.Identifier head =
-					dev.elv1n200.sessionlogin.util.SkinCache.head(a.uuid());
-			if (head != null) {
-				context.drawTexture(
-						net.minecraft.client.gl.RenderPipelines.GUI_TEXTURED,
-						head, x, y, 0f, 0f, 16, 16, 16, 16);
-			} else {
-				// Fallback square so the alignment is obvious before the head loads.
-				context.fill(x, y, x + 16, y + 16, 0x66202020);
-			}
+			extractor.fill(x, y, x + 16, y + 16, 0x66202020);
 		}
 	}
 
-	private static Text ok(String m) {
+	private static Component ok(String m) {
 		return surroundWithObfuscated(
-				Text.literal(m).formatted(Formatting.GREEN), 4);
+				Component.literal(m).withStyle(ChatFormatting.GREEN), 4);
 	}
 
-	private static Text bad(String m) {
+	private static Component bad(String m) {
 		return surroundWithObfuscated(
-				Text.literal(m).formatted(Formatting.RED), 4);
+				Component.literal(m).withStyle(ChatFormatting.RED), 4);
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		super.render(context, mouseX, mouseY, delta);
-		drawHeads(context);
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				surroundWithObfuscated(Text.literal("Account Manager")
-						.formatted(Formatting.AQUA), 4),
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
+		drawHeads(extractor);
+		extractor.centeredText(this.font,
+				surroundWithObfuscated(Component.literal("Account Manager")
+						.withStyle(ChatFormatting.AQUA), 4),
 				this.width / 2, this.titleY, 0xFFFFFF);
-		context.drawCenteredTextWithShadow(this.textRenderer, this.status,
+		extractor.centeredText(this.font, this.status,
 				this.width / 2, this.statusY, 0xFFFFFF);
-		if (!SessionLogin.accountStore.isLocked()) {
-			searchField.render(context, mouseX, mouseY, delta);
-			if (filteredSorted().isEmpty()) {
-				context.drawCenteredTextWithShadow(this.textRenderer,
-						Text.literal(query.isEmpty()
-								? "No saved accounts yet" : "No matches")
-								.formatted(Formatting.GRAY),
-						this.width / 2, this.emptyY, 0xFFFFFF);
-			}
-		}
-	}
-
-	@Override
-	public boolean keyPressed(net.minecraft.client.input.KeyInput input) {
-		if (searchField != null && searchField.keyPressed(input)) {
-			return true;
-		}
-		return super.keyPressed(input);
-	}
-
-	@Override
-	public boolean charTyped(net.minecraft.client.input.CharInput input) {
-		if (searchField != null && searchField.charTyped(input)) {
-			return true;
+		if (!SessionLogin.accountStore.isLocked() && filteredSorted().isEmpty()) {
+			extractor.centeredText(this.font,
+					Component.literal(query.isEmpty()
+							? "No saved accounts yet" : "No matches")
+							.withStyle(ChatFormatting.GRAY),
+					this.width / 2, this.emptyY, 0xFFFFFF);
 		}
-		return super.charTyped(input);
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/AddOfflineAccountScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/AddOfflineAccountScreen.java
index 48d1d5e..2dd0e91 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/AddOfflineAccountScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/AddOfflineAccountScreen.java
@@ -2,12 +2,12 @@
 
 import dev.elv1n200.sessionlogin.SessionLogin;
 import dev.elv1n200.sessionlogin.account.Account;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
 
 import static dev.elv1n200.sessionlogin.util.FormattingUtils.surroundWithObfuscated;
 
@@ -18,12 +18,12 @@
  */
 public class AddOfflineAccountScreen extends Screen {
 
-	private TextFieldWidget nameField;
-	private Text status = Text.literal("Enter a username (3–16 chars, A–Z 0–9 _)")
-			.formatted(Formatting.GRAY);
+	private EditBox nameField;
+	private Component status = Component.literal("Enter a username (3–16 chars, A–Z 0–9 _)")
+			.withStyle(ChatFormatting.GRAY);
 
 	public AddOfflineAccountScreen() {
-		super(Text.literal(""));
+		super(Component.literal(""));
 	}
 
 	@Override
@@ -31,16 +31,16 @@ protected void init() {
 		int cx = this.width / 2;
 		int cy = this.height / 2;
 
-		nameField = new TextFieldWidget(this.textRenderer,
-				cx - 100, cy, 200, 20, Text.literal("Username"));
+		nameField = new EditBox(this.font,
+				cx - 100, cy, 200, 20, Component.literal("Username"));
 		nameField.setMaxLength(16);
-		nameField.setFocused(true);
-		this.addSelectableChild(nameField);
+		this.addRenderableWidget(nameField);
+		this.setInitialFocus(nameField);
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Add"), b -> {
-			String name = nameField.getText().trim();
+		this.addRenderableWidget(Button.builder(Component.literal("Add"), b -> {
+			String name = nameField.getValue().trim();
 			if (!name.matches("^[a-zA-Z0-9_]{3,16}$")) {
-				status = Text.literal("Invalid username").formatted(Formatting.RED);
+				status = Component.literal("Invalid username").withStyle(ChatFormatting.RED);
 				return;
 			}
 			Account acc = new Account(name, name,
@@ -48,38 +48,25 @@ protected void init() {
 					Account.Type.OFFLINE);
 			acc.touch();
 			SessionLogin.accountStore.add(acc);
-			status = Text.literal("Saved offline account: " + name)
-					.formatted(Formatting.GREEN);
-		}).dimensions(cx - 100, cy + 25, 97, 20).build());
+			status = Component.literal("Saved offline account: " + name)
+					.withStyle(ChatFormatting.GREEN);
+		}).bounds(cx - 100, cy + 25, 97, 20).build());
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Back"), b -> {
-			assert this.client != null;
-			this.client.setScreen(new AccountManagerScreen());
-		}).dimensions(cx + 3, cy + 25, 97, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Back"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new AccountManagerScreen());
+		}).bounds(cx + 3, cy + 25, 97, 20).build());
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		super.render(context, mouseX, mouseY, delta);
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
 		int cx = this.width / 2;
 		int cy = this.height / 2;
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				surroundWithObfuscated(Text.literal("Add Offline Account")
-						.formatted(Formatting.AQUA), 4),
+		extractor.centeredText(this.font,
+				surroundWithObfuscated(Component.literal("Add Offline Account")
+						.withStyle(ChatFormatting.AQUA), 4),
 				cx, cy - 40, 0xFFFFFF);
-		context.drawCenteredTextWithShadow(this.textRenderer, status,
-				cx, cy - 22, 0xFFFFFF);
-		nameField.render(context, mouseX, mouseY, delta);
-	}
-
-	@Override
-	public boolean keyPressed(net.minecraft.client.input.KeyInput input) {
-		return nameField.keyPressed(input) || nameField.isActive()
-				|| super.keyPressed(input);
-	}
-
-	@Override
-	public boolean charTyped(net.minecraft.client.input.CharInput input) {
-		return nameField.charTyped(input) || super.charTyped(input);
+		extractor.centeredText(this.font, status, cx, cy - 22, 0xFFFFFF);
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/BulkImportScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/BulkImportScreen.java
index bad6910..a3bd267 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/BulkImportScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/BulkImportScreen.java
@@ -5,11 +5,11 @@
 import dev.elv1n200.sessionlogin.util.ApiUtils;
 import dev.elv1n200.sessionlogin.util.SessionUtils;
 import dev.elv1n200.sessionlogin.util.TokenUtils;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -27,7 +27,7 @@ public class BulkImportScreen extends Screen {
 	private volatile boolean running = false;
 
 	public BulkImportScreen() {
-		super(Text.literal(""));
+		super(Component.literal(""));
 	}
 
 	@Override
@@ -35,18 +35,18 @@ protected void init() {
 		int cx = this.width / 2;
 		int cy = this.height / 2;
 
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Import from clipboard"), b -> startImport()
-		).dimensions(cx - 100, cy, 200, 20).build());
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Import from clipboard"), b -> startImport()
+		).bounds(cx - 100, cy, 200, 20).build());
 
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Import from MC Launcher"), b -> startLauncherImport()
-		).dimensions(cx - 100, cy + 25, 200, 20).build());
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Import from MC Launcher"), b -> startLauncherImport()
+		).bounds(cx - 100, cy + 25, 200, 20).build());
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Back"), b -> {
-			assert this.client != null;
-			this.client.setScreen(new AccountManagerScreen());
-		}).dimensions(cx - 100, cy + 50, 200, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Back"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new AccountManagerScreen());
+		}).bounds(cx - 100, cy + 50, 200, 20).build());
 	}
 
 	private void startLauncherImport() {
@@ -93,8 +93,8 @@ private void startImport() {
 		if (running) {
 			return;
 		}
-		assert this.client != null;
-		String clip = this.client.keyboard.getClipboard();
+		assert this.minecraft != null;
+		String clip = this.minecraft.keyboardHandler.getClipboard();
 		if (clip == null || clip.isBlank()) {
 			status = "Clipboard is empty.";
 			return;
@@ -132,14 +132,14 @@ private void startImport() {
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		super.render(context, mouseX, mouseY, delta);
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				surroundWithObfuscated(Text.literal("Bulk Import")
-						.formatted(Formatting.AQUA), 4),
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
+		extractor.centeredText(this.font,
+				surroundWithObfuscated(Component.literal("Bulk Import")
+						.withStyle(ChatFormatting.AQUA), 4),
 				this.width / 2, this.height / 2 - 40, 0xFFFFFF);
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				Text.literal(status).formatted(Formatting.GRAY),
+		extractor.centeredText(this.font,
+				Component.literal(status).withStyle(ChatFormatting.GRAY),
 				this.width / 2, this.height / 2 - 22, 0xFFFFFF);
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/EditAccountScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/EditAccountScreen.java
index ee24ac0..065db9a 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/EditAccountScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/EditAccountScreen.java
@@ -3,28 +3,28 @@
 import dev.elv1n200.sessionlogin.SessionLogin;
 import dev.elv1n200.sessionlogin.util.ApiUtils;
 import dev.elv1n200.sessionlogin.util.SessionUtils;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import net.minecraft.network.chat.Component;
 
 import static dev.elv1n200.sessionlogin.util.FormattingUtils.surroundWithObfuscated;
 
 public class EditAccountScreen extends Screen {
-	private TextFieldWidget nameField;
-	private TextFieldWidget skinUrlField;
-	private ButtonWidget nameButton;
-	private ButtonWidget skinButton;
-	private Text currentTitle;
+	private EditBox nameField;
+	private EditBox skinUrlField;
+	private Button nameButton;
+	private Button skinButton;
+	private Component currentTitle;
 
 	public EditAccountScreen() {
-		super(Text.literal(""));
+		super(Component.literal(""));
 		this.currentTitle = surroundWithObfuscated(
-				Text.literal("Edit Account").formatted(Formatting.AQUA), 5);
+				Component.literal("Edit Account").withStyle(ChatFormatting.AQUA), 5);
 	}
 
 	@Override
@@ -32,28 +32,28 @@ protected void init() {
 		int cx = this.width / 2;
 		int cy = this.height / 2;
 
-		nameField = new TextFieldWidget(this.textRenderer,
-				cx - 100, cy - 40, 200, 20, Text.literal("New Username"));
+		nameField = new EditBox(this.font,
+				cx - 100, cy - 40, 200, 20, Component.literal("New Username"));
 		nameField.setMaxLength(16);
-		nameField.setFocused(true);
-		this.addSelectableChild(nameField);
+		this.addRenderableWidget(nameField);
+		this.setInitialFocus(nameField);
 
-		skinUrlField = new TextFieldWidget(this.textRenderer,
-				cx - 100, cy, 200, 20, Text.literal("Skin URL"));
+		skinUrlField = new EditBox(this.font,
+				cx - 100, cy, 200, 20, Component.literal("Skin URL"));
 		skinUrlField.setMaxLength(2048);
-		this.addSelectableChild(skinUrlField);
+		this.addRenderableWidget(skinUrlField);
 
-		nameButton = ButtonWidget.builder(Text.literal("Change Name"), b -> {
-			String newName = nameField.getText().trim();
+		nameButton = Button.builder(Component.literal("Change Name"), b -> {
+			String newName = nameField.getValue().trim();
 			if (newName.isEmpty()) {
 				currentTitle = surroundWithObfuscated(
-						Text.literal("Please input a name")
-								.formatted(Formatting.RED), 5);
+						Component.literal("Please input a name")
+								.withStyle(ChatFormatting.RED), 5);
 				return;
 			}
 			if (!newName.matches("^[a-zA-Z0-9_]{3,16}$")) {
 				currentTitle = surroundWithObfuscated(
-						Text.literal("Invalid name").formatted(Formatting.RED), 7);
+						Component.literal("Invalid name").withStyle(ChatFormatting.RED), 7);
 				return;
 			}
 			int code = ApiUtils.changeName(newName,
@@ -62,89 +62,73 @@ protected void init() {
 				case 200 -> {
 					SessionLogin.currentSession = SessionUtils.createSession(
 							newName,
-							SessionLogin.currentSession.getUuidOrNull(),
+							SessionLogin.currentSession.getProfileId(),
 							SessionLogin.currentSession.getAccessToken());
-					yield surroundWithObfuscated(Text.literal(
-							"Successfully changed name").formatted(Formatting.GREEN), 4);
+					yield surroundWithObfuscated(Component.literal(
+							"Successfully changed name").withStyle(ChatFormatting.GREEN), 4);
 				}
-				case 429 -> surroundWithObfuscated(Text.literal(
-						"Too many requests").formatted(Formatting.RED), 5);
-				case 400 -> surroundWithObfuscated(Text.literal(
-						"Invalid name").formatted(Formatting.RED), 7);
-				case 401 -> surroundWithObfuscated(Text.literal(
-						"Invalid token").formatted(Formatting.RED), 7);
-				case 403 -> surroundWithObfuscated(Text.literal(
+				case 429 -> surroundWithObfuscated(Component.literal(
+						"Too many requests").withStyle(ChatFormatting.RED), 5);
+				case 400 -> surroundWithObfuscated(Component.literal(
+						"Invalid name").withStyle(ChatFormatting.RED), 7);
+				case 401 -> surroundWithObfuscated(Component.literal(
+						"Invalid token").withStyle(ChatFormatting.RED), 7);
+				case 403 -> surroundWithObfuscated(Component.literal(
 						"Name unavailable or changed in the last 35 days")
-						.formatted(Formatting.RED), 2);
-				default -> surroundWithObfuscated(Text.literal(
-						"Unknown error").formatted(Formatting.RED), 2);
+						.withStyle(ChatFormatting.RED), 2);
+				default -> surroundWithObfuscated(Component.literal(
+						"Unknown error").withStyle(ChatFormatting.RED), 2);
 			};
-		}).dimensions(cx - 100, cy + 25, 97, 20).build();
-		this.addDrawableChild(nameButton);
+		}).bounds(cx - 100, cy + 25, 97, 20).build();
+		this.addRenderableWidget(nameButton);
 
-		skinButton = ButtonWidget.builder(Text.literal("Change Skin"), b -> {
-			String skinUrl = skinUrlField.getText().trim();
+		skinButton = Button.builder(Component.literal("Change Skin"), b -> {
+			String skinUrl = skinUrlField.getValue().trim();
 			if (skinUrl.isEmpty()) {
 				currentTitle = surroundWithObfuscated(
-						Text.literal("Please input an URL")
-								.formatted(Formatting.RED), 5);
+						Component.literal("Please input an URL")
+								.withStyle(ChatFormatting.RED), 5);
 				return;
 			}
 			int code = ApiUtils.changeSkin(skinUrl,
 					SessionLogin.currentSession.getAccessToken());
 			currentTitle = switch (code) {
-				case 200 -> surroundWithObfuscated(Text.literal(
-						"Successfully changed skin").formatted(Formatting.GREEN), 4);
-				case 429 -> surroundWithObfuscated(Text.literal(
-						"Too many requests").formatted(Formatting.RED), 5);
-				case 401 -> surroundWithObfuscated(Text.literal(
-						"Invalid token").formatted(Formatting.RED), 7);
-				case -1 -> surroundWithObfuscated(Text.literal(
-						"Unknown error").formatted(Formatting.RED), 7);
-				default -> surroundWithObfuscated(Text.literal(
-						"Invalid Skin").formatted(Formatting.RED), 7);
+				case 200 -> surroundWithObfuscated(Component.literal(
+						"Successfully changed skin").withStyle(ChatFormatting.GREEN), 4);
+				case 429 -> surroundWithObfuscated(Component.literal(
+						"Too many requests").withStyle(ChatFormatting.RED), 5);
+				case 401 -> surroundWithObfuscated(Component.literal(
+						"Invalid token").withStyle(ChatFormatting.RED), 7);
+				case -1 -> surroundWithObfuscated(Component.literal(
+						"Unknown error").withStyle(ChatFormatting.RED), 7);
+				default -> surroundWithObfuscated(Component.literal(
+						"Invalid Skin").withStyle(ChatFormatting.RED), 7);
 			};
-		}).dimensions(cx + 3, cy + 25, 97, 20).build();
-		this.addDrawableChild(skinButton);
+		}).bounds(cx + 3, cy + 25, 97, 20).build();
+		this.addRenderableWidget(skinButton);
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Back"), b -> {
-			assert this.client != null;
-			this.client.setScreen(new MultiplayerScreen(new TitleScreen()));
-		}).dimensions(cx - 100, cy + 50, 200, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Back"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new JoinMultiplayerScreen(new TitleScreen()));
+		}).bounds(cx - 100, cy + 50, 200, 20).build());
 
 		if (SessionUtils.isOriginalActive()) {
 			nameButton.active = false;
 			skinButton.active = false;
-			currentTitle = surroundWithObfuscated(Text.literal(
+			currentTitle = surroundWithObfuscated(Component.literal(
 					"Cannot modify original session")
-					.formatted(Formatting.YELLOW), 4);
+					.withStyle(ChatFormatting.YELLOW), 4);
 		}
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		super.render(context, mouseX, mouseY, delta);
-		context.drawTextWithShadow(this.textRenderer, Text.literal("Username:"),
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
+		extractor.text(this.font, Component.literal("Username:"),
 				this.width / 2 - 100, this.height / 2 - 52, 0xA0A0A0);
-		nameField.render(context, mouseX, mouseY, delta);
-		context.drawTextWithShadow(this.textRenderer, Text.literal("Skin URL:"),
+		extractor.text(this.font, Component.literal("Skin URL:"),
 				this.width / 2 - 100, this.height / 2 - 10, 0xA0A0A0);
-		skinUrlField.render(context, mouseX, mouseY, delta);
-		context.drawCenteredTextWithShadow(this.textRenderer, this.currentTitle,
+		extractor.centeredText(this.font, this.currentTitle,
 				this.width / 2, this.height / 2 - 75, 0xFFFFFF);
 	}
-
-	@Override
-	public boolean keyPressed(net.minecraft.client.input.KeyInput input) {
-		return nameField.keyPressed(input)
-				|| skinUrlField.keyPressed(input)
-				|| super.keyPressed(input);
-	}
-
-	@Override
-	public boolean charTyped(net.minecraft.client.input.CharInput input) {
-		return nameField.charTyped(input)
-				|| skinUrlField.charTyped(input)
-				|| super.charTyped(input);
-	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/EditEntryScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/EditEntryScreen.java
index 2e62b7d..261f889 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/EditEntryScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/EditEntryScreen.java
@@ -2,22 +2,22 @@
 
 import dev.elv1n200.sessionlogin.SessionLogin;
 import dev.elv1n200.sessionlogin.account.Account;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
 
 import static dev.elv1n200.sessionlogin.util.FormattingUtils.surroundWithObfuscated;
 
 public class EditEntryScreen extends Screen {
 	private final Account account;
-	private TextFieldWidget labelField;
-	private TextFieldWidget notesField;
+	private EditBox labelField;
+	private EditBox notesField;
 
 	public EditEntryScreen(Account account) {
-		super(Text.literal(""));
+		super(Component.literal(""));
 		this.account = account;
 	}
 
@@ -26,59 +26,44 @@ protected void init() {
 		int cx = this.width / 2;
 		int cy = this.height / 2;
 
-		labelField = new TextFieldWidget(this.textRenderer,
-				cx - 100, cy - 30, 200, 20, Text.literal("Label"));
+		labelField = new EditBox(this.font,
+				cx - 100, cy - 30, 200, 20, Component.literal("Label"));
 		labelField.setMaxLength(48);
-		labelField.setText(account.label());
-		this.addSelectableChild(labelField);
+		labelField.setValue(account.label());
+		this.addRenderableWidget(labelField);
+		this.setInitialFocus(labelField);
 
-		notesField = new TextFieldWidget(this.textRenderer,
-				cx - 100, cy + 10, 200, 20, Text.literal("Notes"));
+		notesField = new EditBox(this.font,
+				cx - 100, cy + 10, 200, 20, Component.literal("Notes"));
 		notesField.setMaxLength(256);
-		notesField.setText(account.notes());
-		this.addSelectableChild(notesField);
+		notesField.setValue(account.notes());
+		this.addRenderableWidget(notesField);
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Save"), b -> {
-			String lbl = labelField.getText().trim();
+		this.addRenderableWidget(Button.builder(Component.literal("Save"), b -> {
+			String lbl = labelField.getValue().trim();
 			account.setLabel(lbl.isEmpty() ? account.username() : lbl);
-			account.setNotes(notesField.getText().trim());
+			account.setNotes(notesField.getValue().trim());
 			SessionLogin.accountStore.save();
-			assert this.client != null;
-			this.client.setScreen(new AccountManagerScreen());
-		}).dimensions(cx - 100, cy + 40, 97, 20).build());
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new AccountManagerScreen());
+		}).bounds(cx - 100, cy + 40, 97, 20).build());
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Cancel"), b -> {
-			assert this.client != null;
-			this.client.setScreen(new AccountManagerScreen());
-		}).dimensions(cx + 3, cy + 40, 97, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Cancel"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new AccountManagerScreen());
+		}).bounds(cx + 3, cy + 40, 97, 20).build());
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		super.render(context, mouseX, mouseY, delta);
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				surroundWithObfuscated(Text.literal(
-						"Edit: " + account.username()).formatted(Formatting.AQUA), 4),
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
+		extractor.centeredText(this.font,
+				surroundWithObfuscated(Component.literal(
+						"Edit: " + account.username()).withStyle(ChatFormatting.AQUA), 4),
 				this.width / 2, this.height / 2 - 60, 0xFFFFFF);
-		context.drawTextWithShadow(this.textRenderer, Text.literal("Label:"),
+		extractor.text(this.font, Component.literal("Label:"),
 				this.width / 2 - 100, this.height / 2 - 42, 0xA0A0A0);
-		labelField.render(context, mouseX, mouseY, delta);
-		context.drawTextWithShadow(this.textRenderer, Text.literal("Notes:"),
+		extractor.text(this.font, Component.literal("Notes:"),
 				this.width / 2 - 100, this.height / 2 - 2, 0xA0A0A0);
-		notesField.render(context, mouseX, mouseY, delta);
-	}
-
-	@Override
-	public boolean keyPressed(net.minecraft.client.input.KeyInput input) {
-		return labelField.keyPressed(input)
-				|| notesField.keyPressed(input)
-				|| super.keyPressed(input);
-	}
-
-	@Override
-	public boolean charTyped(net.minecraft.client.input.CharInput input) {
-		return labelField.charTyped(input)
-				|| notesField.charTyped(input)
-				|| super.charTyped(input);
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/ImportExportScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/ImportExportScreen.java
index c1dcba8..2eae6a2 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/ImportExportScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/ImportExportScreen.java
@@ -4,11 +4,11 @@
 import com.google.gson.JsonParser;
 import dev.elv1n200.sessionlogin.SessionLogin;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -25,15 +25,15 @@ public class ImportExportScreen extends Screen {
 	private static final String FILE_NAME = "sessionlogin-export.json";
 
 	private final boolean importMode;
-	private Text status;
+	private Component status;
 
 	public ImportExportScreen(boolean importMode) {
-		super(Text.literal(""));
+		super(Component.literal(""));
 		this.importMode = importMode;
-		this.status = Text.literal(importMode
+		this.status = Component.literal(importMode
 				? "Place export file as <gameDir>/" + FILE_NAME
 				: "Will write to <gameDir>/" + FILE_NAME)
-				.formatted(Formatting.GRAY);
+				.withStyle(ChatFormatting.GRAY);
 	}
 
 	@Override
@@ -42,18 +42,18 @@ protected void init() {
 		int cy = this.height / 2;
 
 		String action = importMode ? "Import" : "Export";
-		this.addDrawableChild(ButtonWidget.builder(Text.literal(action), b -> {
+		this.addRenderableWidget(Button.builder(Component.literal(action), b -> {
 			if (importMode) {
 				doImport();
 			} else {
 				doExport();
 			}
-		}).dimensions(cx - 100, cy, 200, 20).build());
+		}).bounds(cx - 100, cy, 200, 20).build());
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Back"), b -> {
-			assert this.client != null;
-			this.client.setScreen(new AccountManagerScreen());
-		}).dimensions(cx - 100, cy + 25, 200, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Back"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new AccountManagerScreen());
+		}).bounds(cx - 100, cy + 25, 200, 20).build());
 	}
 
 	private Path file() {
@@ -81,19 +81,19 @@ private void doExport() {
 					? JsonParser.parseString(Files.readString(accountsFile()))
 					: new JsonObject());
 			Files.writeString(file(), out.toString());
-			status = Text.literal("Exported to " + file())
-					.formatted(Formatting.GREEN);
+			status = Component.literal("Exported to " + file())
+					.withStyle(ChatFormatting.GREEN);
 		} catch (Exception e) {
-			status = Text.literal("Export failed: " + e.getMessage())
-					.formatted(Formatting.RED);
+			status = Component.literal("Export failed: " + e.getMessage())
+					.withStyle(ChatFormatting.RED);
 		}
 	}
 
 	private void doImport() {
 		try {
 			if (!Files.exists(file())) {
-				status = Text.literal("No file at " + file())
-						.formatted(Formatting.RED);
+				status = Component.literal("No file at " + file())
+						.withStyle(ChatFormatting.RED);
 				return;
 			}
 			JsonObject in = JsonParser.parseString(Files.readString(file()))
@@ -112,26 +112,25 @@ private void doImport() {
 			SessionLogin.accountStore = new dev.elv1n200.sessionlogin.account.AccountStore(
 					metaFile().getParent(), SessionLogin.vault);
 			SessionLogin.accountStore.load();
-			status = Text.literal("Imported. " + (SessionLogin.vault.isPasswordMode()
+			status = Component.literal("Imported. " + (SessionLogin.vault.isPasswordMode()
 					? "Vault locked — unlock to use." : "Done."))
-					.formatted(Formatting.GREEN);
+					.withStyle(ChatFormatting.GREEN);
 		} catch (Exception e) {
-			status = Text.literal("Import failed: " + e.getMessage())
-					.formatted(Formatting.RED);
+			status = Component.literal("Import failed: " + e.getMessage())
+					.withStyle(ChatFormatting.RED);
 		}
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		super.render(context, mouseX, mouseY, delta);
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
 		int cx = this.width / 2;
 		int cy = this.height / 2;
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				surroundWithObfuscated(Text.literal(
+		extractor.centeredText(this.font,
+				surroundWithObfuscated(Component.literal(
 						importMode ? "Import vault" : "Export vault")
-						.formatted(Formatting.AQUA), 4),
+						.withStyle(ChatFormatting.AQUA), 4),
 				cx, cy - 40, 0xFFFFFF);
-		context.drawCenteredTextWithShadow(this.textRenderer, status,
-				cx, cy - 22, 0xFFFFFF);
+		extractor.centeredText(this.font, status, cx, cy - 22, 0xFFFFFF);
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/LoginScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/LoginScreen.java
index 352cf47..b5a3536 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/LoginScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/LoginScreen.java
@@ -5,36 +5,37 @@
 import dev.elv1n200.sessionlogin.util.ApiUtils;
 import dev.elv1n200.sessionlogin.util.SessionUtils;
 import dev.elv1n200.sessionlogin.util.TokenUtils;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.network.chat.Component;
 
 public class LoginScreen extends Screen {
 
 	private static final int KEY_ENTER = 257;
 	private static final int KEY_KP_ENTER = 335;
 
-	private TextFieldWidget sessionField;
-	private ButtonWidget loginButton;
-	private ButtonWidget restoreButton;
-	private ButtonWidget saveButton;
+	private EditBox sessionField;
+	private Button loginButton;
+	private Button restoreButton;
+	private Button saveButton;
 
-	private volatile Text status = Text.literal("Paste a session ID and press Login")
-			.formatted(Formatting.GRAY);
-	private volatile Text expiryText = Text.empty();
+	private volatile Component status = Component.literal("Paste a session ID and press Login")
+			.withStyle(ChatFormatting.GRAY);
+	private volatile Component expiryText = Component.empty();
 	private volatile boolean busy = false;
 
 	private String[] lastInfo;
 	private String lastToken;
 
 	public LoginScreen() {
-		super(Text.literal("Session Login"));
+		super(Component.literal("Session Login"));
 	}
 
 	@Override
@@ -42,57 +43,57 @@ protected void init() {
 		int cx = this.width / 2;
 		int cy = this.height / 2;
 
-		sessionField = new TextFieldWidget(this.textRenderer,
-				cx - 100, cy, 200, 20, Text.literal("Session Input"));
+		sessionField = new EditBox(this.font,
+				cx - 100, cy, 200, 20, Component.literal("Session Input"));
 		sessionField.setMaxLength(32767);
-		sessionField.setFocused(true);
-		this.addSelectableChild(sessionField);
+		this.addRenderableWidget(sessionField);
+		this.setInitialFocus(sessionField);
 
-		loginButton = ButtonWidget.builder(Text.literal("Login"), b -> doLogin())
-				.dimensions(cx - 100, cy + 25, 64, 20).build();
-		this.addDrawableChild(loginButton);
+		loginButton = Button.builder(Component.literal("Login"), b -> doLogin())
+				.bounds(cx - 100, cy + 25, 64, 20).build();
+		this.addRenderableWidget(loginButton);
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Paste"), b -> {
-			String clip = MinecraftClient.getInstance().keyboard.getClipboard();
-			sessionField.setText(TokenUtils.clean(clip));
-			status = Text.literal("Pasted from clipboard").formatted(Formatting.GRAY);
-		}).dimensions(cx - 33, cy + 25, 64, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Paste"), b -> {
+			String clip = Minecraft.getInstance().keyboardHandler.getClipboard();
+			sessionField.setValue(TokenUtils.clean(clip));
+			status = Component.literal("Pasted from clipboard").withStyle(ChatFormatting.GRAY);
+		}).bounds(cx - 33, cy + 25, 64, 20).build());
 
-		restoreButton = ButtonWidget.builder(Text.literal("Restore"), b -> {
+		restoreButton = Button.builder(Component.literal("Restore"), b -> {
 			SessionUtils.restoreSession();
-			expiryText = Text.empty();
+			expiryText = Component.empty();
 			lastInfo = null;
 			lastToken = null;
-			status = Text.literal("Restored your original session")
-					.formatted(Formatting.GREEN);
+			status = Component.literal("Restored your original session")
+					.withStyle(ChatFormatting.GREEN);
 			saveButton.active = false;
 			restoreButton.active = false;
-		}).dimensions(cx + 34, cy + 25, 66, 20).build();
-		this.addDrawableChild(restoreButton);
+		}).bounds(cx + 34, cy + 25, 66, 20).build();
+		this.addRenderableWidget(restoreButton);
 
-		saveButton = ButtonWidget.builder(Text.literal("Save to accounts"), b -> {
+		saveButton = Button.builder(Component.literal("Save to accounts"), b -> {
 			if (lastInfo == null || lastToken == null) {
-				status = Text.literal("Log in first").formatted(Formatting.RED);
+				status = Component.literal("Log in first").withStyle(ChatFormatting.RED);
 				return;
 			}
 			Account acc = new Account(lastInfo[0], lastInfo[0],
 					SessionUtils.dashUuid(lastInfo[1]), lastToken);
 			acc.touch();
 			SessionLogin.accountStore.add(acc);
-			status = Text.literal("Saved " + lastInfo[0] + " to accounts")
-					.formatted(Formatting.GREEN);
-		}).dimensions(cx - 100, cy + 50, 200, 20).build();
-		this.addDrawableChild(saveButton);
+			status = Component.literal("Saved " + lastInfo[0] + " to accounts")
+					.withStyle(ChatFormatting.GREEN);
+		}).bounds(cx - 100, cy + 50, 200, 20).build();
+		this.addRenderableWidget(saveButton);
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Accounts"), b -> {
-			assert this.client != null;
-			this.client.setScreen(new AccountManagerScreen());
-		}).dimensions(cx - 100, cy + 75, 97, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Accounts"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new AccountManagerScreen());
+		}).bounds(cx - 100, cy + 75, 97, 20).build());
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Back"), b -> {
-			assert this.client != null;
-			this.client.setScreen(new MultiplayerScreen(new TitleScreen()));
-		}).dimensions(cx + 3, cy + 75, 97, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Back"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new JoinMultiplayerScreen(new TitleScreen()));
+		}).bounds(cx + 3, cy + 75, 97, 20).build());
 
 		restoreButton.active = !SessionUtils.isOriginalActive();
 		saveButton.active = false;
@@ -102,28 +103,28 @@ private void doLogin() {
 		if (busy) {
 			return;
 		}
-		String input = TokenUtils.clean(sessionField.getText());
+		String input = TokenUtils.clean(sessionField.getValue());
 		if (input.isEmpty()) {
-			status = Text.literal("Session ID cannot be empty")
-					.formatted(Formatting.RED);
+			status = Component.literal("Session ID cannot be empty")
+					.withStyle(ChatFormatting.RED);
 			return;
 		}
 
 		busy = true;
 		loginButton.active = false;
-		status = Text.literal("Checking session ...").formatted(Formatting.YELLOW);
-		expiryText = Text.empty();
+		status = Component.literal("Checking session ...").withStyle(ChatFormatting.YELLOW);
+		expiryText = Component.empty();
 
 		new Thread(() -> {
 			try {
 				String[] info = ApiUtils.getProfileInfo(input);
-				MinecraftClient.getInstance().execute(() -> {
+				Minecraft.getInstance().execute(() -> {
 					lastInfo = info;
 					lastToken = input;
 					SessionUtils.setSession(SessionUtils.createSession(
 							info[0], info[1], input));
-					status = Text.literal("✔ Logged in as " + info[0])
-							.formatted(Formatting.GREEN, Formatting.BOLD);
+					status = Component.literal("✔ Logged in as " + info[0])
+							.withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD);
 					updateExpiry(input);
 					restoreButton.active = true;
 					saveButton.active = true;
@@ -132,10 +133,10 @@ private void doLogin() {
 					dev.elv1n200.sessionlogin.util.Notifier.loggedIn(info[0]);
 				});
 			} catch (Throwable t) {
-				MinecraftClient.getInstance().execute(() -> {
+				Minecraft.getInstance().execute(() -> {
 					lastInfo = null;
-					status = Text.literal("✘ " + reason(t))
-							.formatted(Formatting.RED);
+					status = Component.literal("✘ " + reason(t))
+							.withStyle(ChatFormatting.RED);
 					busy = false;
 					loginButton.active = true;
 				});
@@ -156,65 +157,49 @@ private static String reason(Throwable e) {
 
 	private void updateExpiry(String token) {
 		String label = TokenUtils.expiryLabel(token);
-		Formatting color = switch (label) {
-			case "expired" -> Formatting.RED;
-			case "unknown" -> Formatting.GRAY;
+		ChatFormatting color = switch (label) {
+			case "expired" -> ChatFormatting.RED;
+			case "unknown" -> ChatFormatting.GRAY;
 			default -> TokenUtils.expiryEpochSeconds(token)
 					- System.currentTimeMillis() / 1000L < 3600
-					? Formatting.YELLOW : Formatting.GREEN;
+					? ChatFormatting.YELLOW : ChatFormatting.GREEN;
 		};
-		expiryText = Text.literal("Token expires: " + label).formatted(color);
+		expiryText = Component.literal("Token expires: " + label).withStyle(color);
 	}
 
-	private Text activeLine() {
+	private Component activeLine() {
 		String name = SessionUtils.getUsername();
 		if (SessionUtils.isOriginalActive()) {
-			return Text.literal("Active: ").formatted(Formatting.GRAY)
-					.append(Text.literal(name + " (original)")
-							.formatted(Formatting.WHITE));
+			return Component.literal("Active: ").withStyle(ChatFormatting.GRAY)
+					.append(Component.literal(name + " (original)")
+							.withStyle(ChatFormatting.WHITE));
 		}
-		return Text.literal("Active: ").formatted(Formatting.GRAY)
-				.append(Text.literal(name).formatted(Formatting.GREEN))
-				.append(Text.literal(" ✔").formatted(Formatting.GREEN));
+		return Component.literal("Active: ").withStyle(ChatFormatting.GRAY)
+				.append(Component.literal(name).withStyle(ChatFormatting.GREEN))
+				.append(Component.literal(" ✔").withStyle(ChatFormatting.GREEN));
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		super.render(context, mouseX, mouseY, delta);
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
 		int cx = this.width / 2;
 		int cy = this.height / 2;
 
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				Text.literal("Session Login").formatted(Formatting.GOLD),
+		extractor.centeredText(this.font,
+				Component.literal("Session Login").withStyle(ChatFormatting.GOLD),
 				cx, cy - 60, 0xFFFFFF);
-		context.drawCenteredTextWithShadow(this.textRenderer, activeLine(),
-				cx, cy - 46, 0xFFFFFF);
-		context.drawCenteredTextWithShadow(this.textRenderer, this.status,
-				cx, cy - 28, 0xFFFFFF);
-		context.drawCenteredTextWithShadow(this.textRenderer, this.expiryText,
-				cx, cy - 16, 0xFFFFFF);
-
-		sessionField.render(context, mouseX, mouseY, delta);
+		extractor.centeredText(this.font, activeLine(), cx, cy - 46, 0xFFFFFF);
+		extractor.centeredText(this.font, this.status, cx, cy - 28, 0xFFFFFF);
+		extractor.centeredText(this.font, this.expiryText, cx, cy - 16, 0xFFFFFF);
 	}
 
 	@Override
-	public boolean keyPressed(net.minecraft.client.input.KeyInput input) {
-		int key = input.getKeycode();
+	public boolean keyPressed(KeyEvent input) {
+		int key = input.key();
 		if (key == KEY_ENTER || key == KEY_KP_ENTER) {
 			doLogin();
 			return true;
 		}
-		if (sessionField.keyPressed(input) || sessionField.isActive()) {
-			return true;
-		}
 		return super.keyPressed(input);
 	}
-
-	@Override
-	public boolean charTyped(net.minecraft.client.input.CharInput input) {
-		if (sessionField.charTyped(input)) {
-			return true;
-		}
-		return super.charTyped(input);
-	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/SetPasswordScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/SetPasswordScreen.java
index e0098e2..f5b6c33 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/SetPasswordScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/SetPasswordScreen.java
@@ -1,12 +1,12 @@
 package dev.elv1n200.sessionlogin.screen;
 
 import dev.elv1n200.sessionlogin.SessionLogin;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
 
 import static dev.elv1n200.sessionlogin.util.FormattingUtils.surroundWithObfuscated;
 
@@ -16,12 +16,12 @@
  */
 public class SetPasswordScreen extends Screen {
 
-	private TextFieldWidget pwField;
-	private TextFieldWidget confirmField;
-	private Text status = Text.empty();
+	private EditBox pwField;
+	private EditBox confirmField;
+	private Component status = Component.empty();
 
 	public SetPasswordScreen() {
-		super(Text.literal(""));
+		super(Component.literal(""));
 	}
 
 	@Override
@@ -30,98 +30,82 @@ protected void init() {
 		int cy = this.height / 2;
 
 		pwField = passwordField(cx - 100, cy - 20, "New password");
-		this.addSelectableChild(pwField);
+		this.addRenderableWidget(pwField);
+		this.setInitialFocus(pwField);
 		confirmField = passwordField(cx - 100, cy + 10, "Confirm password");
-		this.addSelectableChild(confirmField);
+		this.addRenderableWidget(confirmField);
 
 		boolean unlocked = SessionLogin.vault.isUnlocked();
 		boolean pwMode = SessionLogin.vault.isPasswordMode();
 
-		ButtonWidget setBtn = ButtonWidget.builder(
-				Text.literal(pwMode ? "Change" : "Enable"), b -> {
-					String p = pwField.getText();
+		Button setBtn = Button.builder(
+				Component.literal(pwMode ? "Change" : "Enable"), b -> {
+					String p = pwField.getValue();
 					if (p.length() < 4) {
 						status = err("Password too short (min 4)");
 						return;
 					}
-					if (!p.equals(confirmField.getText())) {
+					if (!p.equals(confirmField.getValue())) {
 						status = err("Passwords do not match");
 						return;
 					}
 					if (SessionLogin.vault.enablePassword(p.toCharArray())) {
 						SessionLogin.accountStore.reencryptAll();
-						status = surroundWithObfuscated(Text.literal(
+						status = surroundWithObfuscated(Component.literal(
 								"Master password set")
-								.formatted(Formatting.GREEN), 4);
+								.withStyle(ChatFormatting.GREEN), 4);
 					} else {
 						status = err("Unlock the vault first");
 					}
-				}).dimensions(cx - 100, cy + 40, 97, 20).build();
+				}).bounds(cx - 100, cy + 40, 97, 20).build();
 		setBtn.active = unlocked;
-		this.addDrawableChild(setBtn);
+		this.addRenderableWidget(setBtn);
 
-		ButtonWidget removeBtn = ButtonWidget.builder(
-				Text.literal("Remove"), b -> {
+		Button removeBtn = Button.builder(
+				Component.literal("Remove"), b -> {
 					if (SessionLogin.vault.disablePassword()) {
 						SessionLogin.accountStore.reencryptAll();
-						status = surroundWithObfuscated(Text.literal(
+						status = surroundWithObfuscated(Component.literal(
 								"Switched to local mode")
-								.formatted(Formatting.GREEN), 4);
+								.withStyle(ChatFormatting.GREEN), 4);
 					} else {
 						status = err("Unlock the vault first");
 					}
-				}).dimensions(cx + 3, cy + 40, 97, 20).build();
+				}).bounds(cx + 3, cy + 40, 97, 20).build();
 		removeBtn.active = unlocked && pwMode;
-		this.addDrawableChild(removeBtn);
+		this.addRenderableWidget(removeBtn);
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Back"), b -> {
-			assert this.client != null;
-			this.client.setScreen(new AccountManagerScreen());
-		}).dimensions(cx - 100, cy + 64, 200, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Back"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new AccountManagerScreen());
+		}).bounds(cx - 100, cy + 64, 200, 20).build());
 
 		if (!unlocked) {
 			status = err("Vault locked — unlock before changing password");
 		}
 	}
 
-	private TextFieldWidget passwordField(int x, int y, String hint) {
-		TextFieldWidget f = new TextFieldWidget(this.textRenderer,
-				x, y, 200, 20, Text.literal(hint));
+	private EditBox passwordField(int x, int y, String hint) {
+		EditBox f = new EditBox(this.font, x, y, 200, 20, Component.literal(hint));
 		f.setMaxLength(128);
 		f.addFormatter((s, i) ->
-				Text.literal("*".repeat(s.length())).asOrderedText());
+				Component.literal("*".repeat(s.length())).getVisualOrderText());
 		return f;
 	}
 
-	private static Text err(String m) {
+	private static Component err(String m) {
 		return surroundWithObfuscated(
-				Text.literal(m).formatted(Formatting.RED), 4);
+				Component.literal(m).withStyle(ChatFormatting.RED), 4);
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		super.render(context, mouseX, mouseY, delta);
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				surroundWithObfuscated(Text.literal("Master Password")
-						.formatted(Formatting.AQUA), 4),
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
+		extractor.centeredText(this.font,
+				surroundWithObfuscated(Component.literal("Master Password")
+						.withStyle(ChatFormatting.AQUA), 4),
 				this.width / 2, this.height / 2 - 46, 0xFFFFFF);
-		pwField.render(context, mouseX, mouseY, delta);
-		confirmField.render(context, mouseX, mouseY, delta);
-		context.drawCenteredTextWithShadow(this.textRenderer, this.status,
+		extractor.centeredText(this.font, this.status,
 				this.width / 2, this.height / 2 + 90, 0xFFFFFF);
 	}
-
-	@Override
-	public boolean keyPressed(net.minecraft.client.input.KeyInput input) {
-		return pwField.keyPressed(input)
-				|| confirmField.keyPressed(input)
-				|| super.keyPressed(input);
-	}
-
-	@Override
-	public boolean charTyped(net.minecraft.client.input.CharInput input) {
-		return pwField.charTyped(input)
-				|| confirmField.charTyped(input)
-				|| super.charTyped(input);
-	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/SettingsScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/SettingsScreen.java
index 2f67b43..29a40a3 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/SettingsScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/SettingsScreen.java
@@ -1,11 +1,12 @@
 package dev.elv1n200.sessionlogin.screen;
 
 import dev.elv1n200.sessionlogin.SessionLogin;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
 
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
@@ -17,7 +18,7 @@ public class SettingsScreen extends Screen {
 	private final Screen parent;
 
 	public SettingsScreen(Screen parent) {
-		super(Text.literal(""));
+		super(Component.literal(""));
 		this.parent = parent;
 	}
 
@@ -30,61 +31,57 @@ protected void init() {
 		int cx = this.width / 2;
 		int top = this.height / 2 - 80;
 
-		addToggle(top + 0,
-				"Isolate pack cache per account",
-				"Servers can fingerprint your machine across alts via cached resource\n"
-						+ "packs. When ON, each UUID gets its own cache folder.",
-				SessionLogin.settings::isolatePackCache,
-				SessionLogin.settings::setIsolatePackCache);
+		// NOTE: the "isolate pack cache per account" toggle is omitted on 26.x —
+		// its DownloaderMixin has no clean equivalent in the unobfuscated era.
 
-		addToggle(top + 28,
+		addToggle(top + 0,
 				"Spoof brand as Vanilla",
 				"Tell servers you're a vanilla client (instead of 'fabric').",
 				SessionLogin.settings::spoofBrandAsVanilla,
 				SessionLogin.settings::setSpoofBrandAsVanilla);
 
-		addToggle(top + 56,
+		addToggle(top + 28,
 				"Block Mojang telemetry",
 				"Drop telemetry events Mojang would otherwise receive.",
 				SessionLogin.settings::blockTelemetry,
 				SessionLogin.settings::setBlockTelemetry);
 
-		addToggle(top + 84,
+		addToggle(top + 56,
 				"Show toasts on login/switch",
 				"Pop a Minecraft toast in the corner when an account is swapped.",
 				SessionLogin.settings::showToasts,
 				SessionLogin.settings::setShowToasts);
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Back"), b -> {
-			assert this.client != null;
-			this.client.setScreen(parent != null ? parent : new AccountManagerScreen());
-		}).dimensions(cx - 100, top + 140, 200, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Back"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(parent != null ? parent : new AccountManagerScreen());
+		}).bounds(cx - 100, top + 140, 200, 20).build());
 	}
 
 	private void addToggle(int y, String label, String tooltip,
 						   BooleanSupplier get, Consumer<Boolean> set) {
 		int cx = this.width / 2;
 		boolean current = get.getAsBoolean();
-		ButtonWidget btn = ButtonWidget.builder(
-				Text.literal(label + ": ")
-						.append(Text.literal(current ? "ON" : "OFF")
-								.formatted(current ? Formatting.GREEN : Formatting.RED)),
+		Button btn = Button.builder(
+				Component.literal(label + ": ")
+						.append(Component.literal(current ? "ON" : "OFF")
+								.withStyle(current ? ChatFormatting.GREEN : ChatFormatting.RED)),
 				b -> {
 					set.accept(!get.getAsBoolean());
-					this.clearAndInit();
+					this.rebuildWidgets();
 				}
-		).dimensions(cx - 150, y, 300, 20)
-				.tooltip(net.minecraft.client.gui.tooltip.Tooltip.of(Text.literal(tooltip)))
+		).bounds(cx - 150, y, 300, 20)
+				.tooltip(Tooltip.create(Component.literal(tooltip)))
 				.build();
-		this.addDrawableChild(btn);
+		this.addRenderableWidget(btn);
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		super.render(context, mouseX, mouseY, delta);
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				surroundWithObfuscated(Text.literal("Settings")
-						.formatted(Formatting.AQUA), 4),
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
+		extractor.centeredText(this.font,
+				surroundWithObfuscated(Component.literal("Settings")
+						.withStyle(ChatFormatting.AQUA), 4),
 				this.width / 2, this.height / 2 - 100, 0xFFFFFF);
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/TamperWarningScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/TamperWarningScreen.java
index 309726e..9c006f0 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/TamperWarningScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/TamperWarningScreen.java
@@ -1,12 +1,12 @@
 package dev.elv1n200.sessionlogin.screen;
 
 import dev.elv1n200.sessionlogin.util.IntegrityCheck;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.text.Text;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.network.chat.Component;
 
 /**
  * Shown once on game start if the running jar's SHA-256 doesn't match the
@@ -21,7 +21,7 @@ public class TamperWarningScreen extends Screen {
 	private static final int COLOR_GREY  = 0xFFAAAAAA;
 
 	public TamperWarningScreen() {
-		super(Text.literal("SessionLogin tamper warning"));
+		super(Component.literal("SessionLogin tamper warning"));
 	}
 
 	@Override
@@ -29,50 +29,38 @@ protected void init() {
 		int cx = this.width / 2;
 		int cy = this.height / 2;
 
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Trust this build (update recorded hash)"), b -> {
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Trust this build (update recorded hash)"), b -> {
 					IntegrityCheck.acceptCurrent();
-					assert this.client != null;
-					this.client.setScreen(new TitleScreen());
-				}).dimensions(cx - 160, cy + 50, 320, 20).build());
+					assert this.minecraft != null;
+					this.minecraft.setScreen(new TitleScreen());
+				}).bounds(cx - 160, cy + 50, 320, 20).build());
 
-		this.addDrawableChild(ButtonWidget.builder(
-				Text.literal("Quit game"), b -> MinecraftClient.getInstance().scheduleStop()
-		).dimensions(cx - 160, cy + 75, 320, 20).build());
+		this.addRenderableWidget(Button.builder(
+				Component.literal("Quit game"), b -> Minecraft.getInstance().stop()
+		).bounds(cx - 160, cy + 75, 320, 20).build());
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		// Screen.renderWithTooltip already called renderBackground (blur) for
-		// us this frame, so we must NOT call it again here or we trigger the
-		// "Can only blur once per frame" assertion. super.render only draws
-		// the registered widgets (our two buttons); we layer the warning text
-		// on top using plain String overloads with explicit ARGB colors so
-		// no MutableText/formatting weirdness can swallow the draw call.
-		super.render(context, mouseX, mouseY, delta);
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
 
 		int cx = this.width / 2;
 		int cy = this.height / 2;
 
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				"SessionLogin: jar tampering detected",
-				cx, cy - 80, COLOR_RED);
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				"The mod jar's hash changed since the last launch.",
-				cx, cy - 60, COLOR_YELLOW);
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				"If you just updated the mod, choose Trust.",
-				cx, cy - 46, COLOR_WHITE);
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				"If you did NOT, quit and reinstall from the official source.",
-				cx, cy - 32, COLOR_WHITE);
+		extractor.centeredText(this.font,
+				"SessionLogin: jar tampering detected", cx, cy - 80, COLOR_RED);
+		extractor.centeredText(this.font,
+				"The mod jar's hash changed since the last launch.", cx, cy - 60, COLOR_YELLOW);
+		extractor.centeredText(this.font,
+				"If you just updated the mod, choose Trust.", cx, cy - 46, COLOR_WHITE);
+		extractor.centeredText(this.font,
+				"If you did NOT, quit and reinstall from the official source.", cx, cy - 32, COLOR_WHITE);
 
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				"Recorded: " + shortHash(IntegrityCheck.storedHash()),
-				cx, cy - 10, COLOR_GREY);
-		context.drawCenteredTextWithShadow(this.textRenderer,
-				"Current:  " + shortHash(IntegrityCheck.currentHash()),
-				cx, cy + 4, COLOR_GREY);
+		extractor.centeredText(this.font,
+				"Recorded: " + shortHash(IntegrityCheck.storedHash()), cx, cy - 10, COLOR_GREY);
+		extractor.centeredText(this.font,
+				"Current:  " + shortHash(IntegrityCheck.currentHash()), cx, cy + 4, COLOR_GREY);
 	}
 
 	@Override
diff --git a/src/main/java/dev/elv1n200/sessionlogin/screen/UnlockScreen.java b/src/main/java/dev/elv1n200/sessionlogin/screen/UnlockScreen.java
index 5d47a7b..136d026 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/screen/UnlockScreen.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/screen/UnlockScreen.java
@@ -1,26 +1,26 @@
 package dev.elv1n200.sessionlogin.screen;
 
 import dev.elv1n200.sessionlogin.SessionLogin;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import net.minecraft.network.chat.Component;
 
 import static dev.elv1n200.sessionlogin.util.FormattingUtils.surroundWithObfuscated;
 
 /** Prompts for the master password and unlocks the vault. */
 public class UnlockScreen extends Screen {
 
-	private TextFieldWidget pwField;
-	private Text status = Text.literal("Vault is locked")
-			.formatted(Formatting.YELLOW);
+	private EditBox pwField;
+	private Component status = Component.literal("Vault is locked")
+			.withStyle(ChatFormatting.YELLOW);
 
 	public UnlockScreen() {
-		super(Text.literal(""));
+		super(Component.literal(""));
 	}
 
 	@Override
@@ -28,48 +28,36 @@ protected void init() {
 		int cx = this.width / 2;
 		int cy = this.height / 2;
 
-		pwField = new TextFieldWidget(this.textRenderer,
-				cx - 100, cy, 200, 20, Text.literal("Master password"));
+		pwField = new EditBox(this.font,
+				cx - 100, cy, 200, 20, Component.literal("Master password"));
 		pwField.setMaxLength(128);
 		pwField.addFormatter((s, i) ->
-				Text.literal("*".repeat(s.length())).asOrderedText());
-		pwField.setFocused(true);
-		this.addSelectableChild(pwField);
+				Component.literal("*".repeat(s.length())).getVisualOrderText());
+		this.addRenderableWidget(pwField);
+		this.setInitialFocus(pwField);
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Unlock"), b -> {
-			char[] pw = pwField.getText().toCharArray();
+		this.addRenderableWidget(Button.builder(Component.literal("Unlock"), b -> {
+			char[] pw = pwField.getValue().toCharArray();
 			if (SessionLogin.vault.unlock(pw)) {
 				SessionLogin.accountStore.decryptAll();
-				assert this.client != null;
-				this.client.setScreen(new AccountManagerScreen());
+				assert this.minecraft != null;
+				this.minecraft.setScreen(new AccountManagerScreen());
 			} else {
-				status = surroundWithObfuscated(Text.literal("Wrong password")
-						.formatted(Formatting.RED), 4);
+				status = surroundWithObfuscated(Component.literal("Wrong password")
+						.withStyle(ChatFormatting.RED), 4);
 			}
-		}).dimensions(cx - 100, cy + 25, 97, 20).build());
+		}).bounds(cx - 100, cy + 25, 97, 20).build());
 
-		this.addDrawableChild(ButtonWidget.builder(Text.literal("Back"), b -> {
-			assert this.client != null;
-			this.client.setScreen(new MultiplayerScreen(new TitleScreen()));
-		}).dimensions(cx + 3, cy + 25, 97, 20).build());
+		this.addRenderableWidget(Button.builder(Component.literal("Back"), b -> {
+			assert this.minecraft != null;
+			this.minecraft.setScreen(new JoinMultiplayerScreen(new TitleScreen()));
+		}).bounds(cx + 3, cy + 25, 97, 20).build());
 	}
 
 	@Override
-	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		super.render(context, mouseX, mouseY, delta);
-		context.drawCenteredTextWithShadow(this.textRenderer, this.status,
+	public void extractRenderState(GuiGraphicsExtractor extractor, int mouseX, int mouseY, float delta) {
+		super.extractRenderState(extractor, mouseX, mouseY, delta);
+		extractor.centeredText(this.font, this.status,
 				this.width / 2, this.height / 2 - 30, 0xFFFFFF);
-		pwField.render(context, mouseX, mouseY, delta);
-	}
-
-	@Override
-	public boolean keyPressed(net.minecraft.client.input.KeyInput input) {
-		return pwField.keyPressed(input) || pwField.isActive()
-				|| super.keyPressed(input);
-	}
-
-	@Override
-	public boolean charTyped(net.minecraft.client.input.CharInput input) {
-		return pwField.charTyped(input) || super.charTyped(input);
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/util/ApiUtils.java b/src/main/java/dev/elv1n200/sessionlogin/util/ApiUtils.java
index a61bde9..bc84f1c 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/util/ApiUtils.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/util/ApiUtils.java
@@ -2,7 +2,7 @@
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
 
 import java.io.IOException;
 import java.net.URI;
@@ -70,9 +70,9 @@ public static boolean validateSession(String token) {
 			String[] info = getProfileInfo(token);
 			String ign = info[0];
 			UUID uuid = UUID.fromString(SessionUtils.dashUuid(info[1]));
-			var session = MinecraftClient.getInstance().getSession();
-			return ign.equals(session.getUsername())
-					&& uuid.equals(session.getUuidOrNull());
+			var session = Minecraft.getInstance().getUser();
+			return ign.equals(session.getName())
+					&& uuid.equals(session.getProfileId());
 		} catch (Exception e) {
 			return false;
 		}
diff --git a/src/main/java/dev/elv1n200/sessionlogin/util/FormattingUtils.java b/src/main/java/dev/elv1n200/sessionlogin/util/FormattingUtils.java
index e2d0ea6..58c841d 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/util/FormattingUtils.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/util/FormattingUtils.java
@@ -1,7 +1,7 @@
 package dev.elv1n200.sessionlogin.util;
 
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
 
 public final class FormattingUtils {
 
@@ -9,14 +9,14 @@ private FormattingUtils() {
 	}
 
 	/** Wrap text in Minecraft's scrambling "magic text" effect for flair. */
-	public static Text surroundWithObfuscated(Text baseText, int count) {
+	public static Component surroundWithObfuscated(Component baseText, int count) {
 		Style baseStyle = baseText.getStyle().withObfuscated(false);
 		Style obfStyle = baseStyle.withObfuscated(true);
 		String padding = "@".repeat(Math.max(0, count));
 
-		return Text.empty()
-				.append(Text.literal(padding + " ").setStyle(obfStyle))
+		return Component.empty()
+				.append(Component.literal(padding + " ").setStyle(obfStyle))
 				.append(baseText.copy().setStyle(baseStyle))
-				.append(Text.literal(" " + padding).setStyle(obfStyle));
+				.append(Component.literal(" " + padding).setStyle(obfStyle));
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/util/Notifier.java b/src/main/java/dev/elv1n200/sessionlogin/util/Notifier.java
index 3962dd6..a032d75 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/util/Notifier.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/util/Notifier.java
@@ -1,10 +1,10 @@
 package dev.elv1n200.sessionlogin.util;
 
 import dev.elv1n200.sessionlogin.SessionLogin;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.toast.SystemToast;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.toasts.SystemToast;
+import net.minecraft.network.chat.Component;
 
 /**
  * Minecraft-style toasts triggered by login or account switches.
@@ -12,30 +12,31 @@
  */
 public final class Notifier {
 
-	private static final SystemToast.Type SL_TOAST = new SystemToast.Type();
+	private static final SystemToast.SystemToastId SL_TOAST =
+			new SystemToast.SystemToastId();
 
 	private Notifier() {
 	}
 
 	public static void loggedIn(String username) {
-		toast(Text.literal("SessionLogin").formatted(Formatting.GOLD),
-				Text.literal("Logged in as " + username).formatted(Formatting.WHITE));
+		toast(Component.literal("SessionLogin").withStyle(ChatFormatting.GOLD),
+				Component.literal("Logged in as " + username).withStyle(ChatFormatting.WHITE));
 	}
 
 	public static void info(String title, String message) {
-		toast(Text.literal(title).formatted(Formatting.GOLD),
-				Text.literal(message).formatted(Formatting.WHITE));
+		toast(Component.literal(title).withStyle(ChatFormatting.GOLD),
+				Component.literal(message).withStyle(ChatFormatting.WHITE));
 	}
 
-	private static void toast(Text title, Text body) {
+	private static void toast(Component title, Component body) {
 		if (SessionLogin.settings == null || !SessionLogin.settings.showToasts()) {
 			return;
 		}
-		MinecraftClient mc = MinecraftClient.getInstance();
+		Minecraft mc = Minecraft.getInstance();
 		if (mc == null) {
 			return;
 		}
 		mc.execute(() ->
-				SystemToast.show(mc.getToastManager(), SL_TOAST, title, body));
+				SystemToast.add(mc.getToastManager(), SL_TOAST, title, body));
 	}
 }
diff --git a/src/main/java/dev/elv1n200/sessionlogin/util/SessionUtils.java b/src/main/java/dev/elv1n200/sessionlogin/util/SessionUtils.java
index bf71256..2e41959 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/util/SessionUtils.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/util/SessionUtils.java
@@ -1,8 +1,8 @@
 package dev.elv1n200.sessionlogin.util;
 
 import dev.elv1n200.sessionlogin.SessionLogin;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.session.Session;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.User;
 
 import java.util.Optional;
 import java.util.UUID;
@@ -13,11 +13,11 @@ private SessionUtils() {
 	}
 
 	public static String getUsername() {
-		return MinecraftClient.getInstance().getSession().getUsername();
+		return Minecraft.getInstance().getUser().getName();
 	}
 
-	public static Session getSession() {
-		return MinecraftClient.getInstance().getSession();
+	public static User getSession() {
+		return Minecraft.getInstance().getUser();
 	}
 
 	/** Insert dashes into a 32-char Mojang UUID; pass through otherwise. */
@@ -32,8 +32,8 @@ public static String dashUuid(String uuid) {
 		return uuid;
 	}
 
-	public static Session createSession(String username, String uuid, String token) {
-		return new Session(
+	public static User createSession(String username, String uuid, String token) {
+		return new User(
 				username,
 				UUID.fromString(dashUuid(uuid)),
 				token,
@@ -41,8 +41,8 @@ public static Session createSession(String username, String uuid, String token)
 				Optional.empty());
 	}
 
-	public static Session createSession(String username, UUID uuid, String token) {
-		return new Session(
+	public static User createSession(String username, UUID uuid, String token) {
+		return new User(
 				username,
 				uuid,
 				token,
@@ -50,7 +50,7 @@ public static Session createSession(String username, UUID uuid, String token) {
 				Optional.empty());
 	}
 
-	public static void setSession(Session session) {
+	public static void setSession(User session) {
 		SessionLogin.currentSession = session;
 	}
 
diff --git a/src/main/java/dev/elv1n200/sessionlogin/util/SkinCache.java b/src/main/java/dev/elv1n200/sessionlogin/util/SkinCache.java
index c9375b9..9ce20ad 100644
--- a/src/main/java/dev/elv1n200/sessionlogin/util/SkinCache.java
+++ b/src/main/java/dev/elv1n200/sessionlogin/util/SkinCache.java
@@ -1,97 +1,23 @@
 package dev.elv1n200.sessionlogin.util;
 
-import dev.elv1n200.sessionlogin.SessionLogin;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.texture.NativeImage;
-import net.minecraft.client.texture.NativeImageBackedTexture;
-import net.minecraft.util.Identifier;
-
-import java.io.ByteArrayInputStream;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.time.Duration;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
+import net.minecraft.resources.Identifier;
 
 /**
- * Lazy player-head cache. First call for a UUID returns null and kicks off a
- * background fetch; later calls return the registered {@link Identifier} once
- * the image is loaded. Renderers should treat null as "draw fallback".
+ * Player-head cache.
  *
- * <p>Image source is the Crafatar CDN — small, fast, no auth, returns a 16x16
- * head with the hat overlay applied. Failure is silent: a UUID that can't be
- * fetched just keeps returning null forever (until a relaunch).
+ * <p><b>26.x note:</b> the texture-upload pipeline (NativeImage /
+ * NativeImageBackedTexture / TextureManager) changed substantially in the
+ * unobfuscated era. Rendered player heads are a purely cosmetic touch, so for
+ * the 26.x port this returns {@code null} and screens draw their letter/box
+ * fallback instead. The Crafatar-based head fetch can be restored later.
  */
 public final class SkinCache {
 
-	private static final HttpClient CLIENT = HttpClient.newBuilder()
-			.connectTimeout(Duration.ofSeconds(5))
-			.build();
-
-	private static final Map<UUID, Identifier> CACHE = new ConcurrentHashMap<>();
-	private static final Set<UUID> LOADING = ConcurrentHashMap.newKeySet();
-
 	private SkinCache() {
 	}
 
-	/** @return the head texture id, or null while loading / on failure. */
+	/** @return always null on 26.x — callers draw a fallback avatar. */
 	public static Identifier head(String uuidString) {
-		if (uuidString == null || uuidString.isEmpty()) {
-			return null;
-		}
-		UUID uuid;
-		try {
-			uuid = UUID.fromString(SessionUtils.dashUuid(uuidString));
-		} catch (Exception e) {
-			return null;
-		}
-		Identifier hit = CACHE.get(uuid);
-		if (hit != null) {
-			return hit;
-		}
-		if (LOADING.add(uuid)) {
-			new Thread(() -> load(uuid), "SLSkinFetch-" + uuid).start();
-		}
 		return null;
 	}
-
-	private static void load(UUID uuid) {
-		try {
-			HttpRequest req = HttpRequest.newBuilder()
-					.uri(URI.create("https://crafatar.com/avatars/"
-							+ uuid + "?size=16&overlay"))
-					.timeout(Duration.ofSeconds(10))
-					.GET()
-					.build();
-			HttpResponse<byte[]> resp = CLIENT.send(req,
-					HttpResponse.BodyHandlers.ofByteArray());
-			if (resp.statusCode() != 200) {
-				return;
-			}
-			NativeImage img = NativeImage.read(
-					new ByteArrayInputStream(resp.body()));
-			Identifier id = Identifier.of(SessionLogin.MOD_ID,
-					"head/" + uuid.toString().replace('-', '_').toLowerCase());
-
-			MinecraftClient.getInstance().execute(() -> {
-				try {
-					NativeImageBackedTexture tex =
-							new NativeImageBackedTexture(() -> "sl-head", img);
-					MinecraftClient.getInstance().getTextureManager()
-							.registerTexture(id, tex);
-					CACHE.put(uuid, id);
-				} catch (Exception e) {
-					SessionLogin.LOGGER.debug("Could not register head", e);
-				}
-			});
-		} catch (Exception e) {
-			// fall through – stays null, fallback drawn
-		} finally {
-			LOADING.remove(uuid);
-		}
-	}
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index e7953d9..98bd592 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -20,18 +20,15 @@
 		],
 		"client": [
 			"dev.elv1n200.sessionlogin.SessionLoginClient"
-		],
-		"modmenu": [
-			"dev.elv1n200.sessionlogin.modmenu.ModMenuIntegration"
 		]
 	},
 	"mixins": [
 		"sessionlogin.mixins.json"
 	],
 	"depends": {
-		"fabricloader": ">=0.16.10",
-		"minecraft": "~1.21.11",
-		"java": ">=21",
+		"fabricloader": ">=0.19.3",
+		"minecraft": "~26.1.2",
+		"java": ">=25",
 		"fabric-api": "*"
 	}
 }
diff --git a/src/main/resources/sessionlogin.mixins.json b/src/main/resources/sessionlogin.mixins.json
index 28807e0..2270194 100644
--- a/src/main/resources/sessionlogin.mixins.json
+++ b/src/main/resources/sessionlogin.mixins.json
@@ -1,11 +1,10 @@
 {
 	"required": true,
 	"package": "dev.elv1n200.sessionlogin.mixin",
-	"compatibilityLevel": "JAVA_21",
+	"compatibilityLevel": "JAVA_25",
 	"client": [
 		"MultiplayerScreenMixin",
 		"MinecraftClientMixin",
-		"DownloaderMixin",
 		"ClientBrandRetrieverMixin",
 		"TelemetryManagerMixin"
 	],