diff --git a/src/main/java/com/solegendary/reignofnether/ClientModConfigs.java b/src/main/java/com/solegendary/reignofnether/ClientModConfigs.java
index 32de04937..d759c4366 100644
--- a/src/main/java/com/solegendary/reignofnether/ClientModConfigs.java
+++ b/src/main/java/com/solegendary/reignofnether/ClientModConfigs.java
@@ -10,7 +10,7 @@ public class ClientModConfigs {
     public static void registerClientConfigs(FMLJavaModLoadingContext mlctx) {
         mlctx.registerConfig(ModConfig.Type.CLIENT,
                 ReignOfNetherClientConfigs.SPEC,
-                "reignofnether-client-" + ReignOfNether.VERSION_STRING + ".toml");
+                "reignofnether-client.toml");
 
         mlctx.registerExtensionPoint(
                 ConfigScreenHandler.ConfigScreenFactory.class,
diff --git a/src/main/java/com/solegendary/reignofnether/ClientModEvents.java b/src/main/java/com/solegendary/reignofnether/ClientModEvents.java
index 6af4420bc..cbcb058e0 100644
--- a/src/main/java/com/solegendary/reignofnether/ClientModEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/ClientModEvents.java
@@ -1,6 +1,9 @@
 package com.solegendary.reignofnether;
 
+import com.solegendary.reignofnether.blocks.BlockClientEvents;
 import com.solegendary.reignofnether.blocks.InvisibleBlockRenderer;
+import com.solegendary.reignofnether.config.ReignOfNetherClientConfigs;
+import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import com.solegendary.reignofnether.blocks.SkullTypes;
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.building.BuildingUtils;
@@ -181,6 +184,9 @@ public static void registerRenderers(EntityRenderersEvent.RegisterRenderers evt)
     @SubscribeEvent
     @OnlyIn(Dist.CLIENT)
     public static void onClientSetupEvent(FMLClientSetupEvent evt) {
+        // read on hot render paths, so kept in statics; the toggles write them back
+        OrthoviewClientEvents.hideLeavesMethod = ReignOfNetherClientConfigs.HIDE_LEAVES.get();
+        BlockClientEvents.nightCircleMode = ReignOfNetherClientConfigs.NIGHT_CIRCLES.get();
         evt.enqueueWork(() -> {
             MenuScreens.register(ContainerRegistrar.TOPDOWNGUI_CONTAINER.get(), TopdownGui::new);
             ItemBlockRenderTypes.setRenderLayer(
diff --git a/src/main/java/com/solegendary/reignofnether/alliance/AlliancesClient.java b/src/main/java/com/solegendary/reignofnether/alliance/AlliancesClient.java
index 9f727077f..5b12c315e 100644
--- a/src/main/java/com/solegendary/reignofnether/alliance/AlliancesClient.java
+++ b/src/main/java/com/solegendary/reignofnether/alliance/AlliancesClient.java
@@ -3,17 +3,22 @@
 import com.solegendary.reignofnether.gamerules.GameruleClient;
 import com.solegendary.reignofnether.player.PlayerClientEvents;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.entity.LivingEntity;
 
 import java.util.*;
 
 public class AlliancesClient {
+
+    static {
+        WorldState.onClientReset(AlliancesClient::resetAllAlliances);
+    }
     private static final Minecraft MC = Minecraft.getInstance();
 
     private static final Map<String, Set<String>> alliances = new HashMap<>();
-    public static final Set<String> inboundPendingAlliances = new HashSet<>();
-    public static final Set<String> outboundPendingAlliances = new HashSet<>();
+    public static final Set<String> inboundPendingAlliances = WorldState.client(new HashSet<>());
+    public static final Set<String> outboundPendingAlliances = WorldState.client(new HashSet<>());
     public static final HashSet<String> playersWithAlliedControl = new HashSet<>();
 
     public static boolean sharingAllyControl() {
diff --git a/src/main/java/com/solegendary/reignofnether/alliance/AlliancesServerEvents.java b/src/main/java/com/solegendary/reignofnether/alliance/AlliancesServerEvents.java
index 8ea3fc5c5..b639f02a9 100644
--- a/src/main/java/com/solegendary/reignofnether/alliance/AlliancesServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/alliance/AlliancesServerEvents.java
@@ -6,17 +6,17 @@
 import com.solegendary.reignofnether.scenario.ScenarioServerEvents;
 import com.solegendary.reignofnether.scenario.ScenarioUtils;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import java.util.*;
 
 public class AlliancesServerEvents {
-    private static final Map<String, Set<String>> alliances = new HashMap<>();
-    public static final Map<String, Set<String>> pendingAlliances = new HashMap<>();
-    public static final HashSet<String> playersWithAlliedControl = new HashSet<>();
+    private static final Map<String, Set<String>> alliances = WorldState.server(new HashMap<>());
+    public static final Map<String, Set<String>> pendingAlliances = WorldState.server(new HashMap<>());
+    public static final HashSet<String> playersWithAlliedControl = WorldState.server(new HashSet<>());
 
     public static boolean canControlAlly(String player, LivingEntity entity) {
         return entity instanceof Unit unit && canControlAlly(player, unit.getOwnerName());
@@ -144,12 +144,6 @@ public static void syncAlliances() {
     }
 
     // statics outlive the world: clear them so the next world opened in this game starts clean
-    @SubscribeEvent
-    public static void onServerStopped(ServerStoppedEvent evt) {
-        alliances.clear();
-        pendingAlliances.clear();
-        playersWithAlliedControl.clear();
-    }
 
     @SubscribeEvent
     public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent evt) {
diff --git a/src/main/java/com/solegendary/reignofnether/alliance/AllyCommand.java b/src/main/java/com/solegendary/reignofnether/alliance/AllyCommand.java
index d54c8bf67..7c2133868 100644
--- a/src/main/java/com/solegendary/reignofnether/alliance/AllyCommand.java
+++ b/src/main/java/com/solegendary/reignofnether/alliance/AllyCommand.java
@@ -1,5 +1,6 @@
 package com.solegendary.reignofnether.alliance;
 
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.BoolArgumentType;
@@ -63,26 +64,26 @@ private static int ally(CommandContext<CommandSourceStack> context) throws Comma
 
         if (context.getSource().getLevel().getGameRules().getRule(GameRuleRegistrar.LOCK_ALLIANCES).get() &&
             (PlayerServerEvents.isRTSPlayer(playerName) || PlayerServerEvents.isRTSPlayer(allyPlayerName))) {
-            player.sendSystemMessage(Component.translatable("alliance.reignofnether.alliances_lock"));
+            player.sendSystemMessage(SystemMessage.error(Component.translatable("alliance.reignofnether.alliances_lock")));
             return 0;
         }
         if (context.getSource().getLevel().getGameRules().getRule(GameRuleRegistrar.COOP_MODE).get() &&
             (PlayerServerEvents.isRTSPlayer(playerName) || PlayerServerEvents.isRTSPlayer(allyPlayerName))) {
-            player.sendSystemMessage(Component.translatable("alliance.reignofnether.alliances_lock_coop"));
+            player.sendSystemMessage(SystemMessage.error(Component.translatable("alliance.reignofnether.alliances_lock_coop")));
             return 0;
         }
 
         if (player.equals(allyPlayer)) {
-            player.sendSystemMessage(Component.translatable("alliance.reignofnether.ally_self", playerName));
+            player.sendSystemMessage(SystemMessage.error(Component.translatable("alliance.reignofnether.ally_self", playerName)));
             return 0;
         }
         AlliancesServerEvents.pendingAlliances.computeIfAbsent(allyPlayerName, k -> new HashSet<>()).add(playerName);
         AllianceClientboundPacket.addPendingAlliance(allyPlayerName, playerName);
-        context.getSource().sendSuccess(()->Component.translatable("alliance.reignofnether.sent_request", allyPlayerName), false);
+        context.getSource().sendSuccess(()->SystemMessage.info(Component.translatable("alliance.reignofnether.sent_request", allyPlayerName)), false);
         SoundClientboundPacket.playSoundForPlayer(SoundAction.CHAT, allyPlayerName);
-        allyPlayer.sendSystemMessage(Component.translatable("alliance.reignofnether.ally_confirm", playerName, playerName));
+        allyPlayer.sendSystemMessage(SystemMessage.info(Component.translatable("alliance.reignofnether.ally_confirm", playerName, playerName)));
         if (PlayerServerEvents.isRTSPlayer(allyPlayerName))
-            allyPlayer.sendSystemMessage(Component
+            allyPlayer.sendSystemMessage(SystemMessage.info(Component
                 .translatable("alliance.reignofnether.accept") // [CLick to accept]
                 .withStyle(Style.EMPTY
                     .withColor(ChatFormatting.GREEN)
@@ -96,7 +97,7 @@ private static int ally(CommandContext<CommandSourceStack> context) throws Comma
                         .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.translatable("alliance.reignofnether.cancel")))
                     )
                 )
-        );
+        ));
         SoundClientboundPacket.playSoundForPlayer(SoundAction.CHAT, playerName);
 
         return Command.SINGLE_SUCCESS;
@@ -113,9 +114,9 @@ private static int allyCancelRequest(CommandContext<CommandSourceStack> context)
         }
         AlliancesServerEvents.pendingAlliances.getOrDefault(playerName, new HashSet<>()).remove(allyPlayerName);
         AllianceClientboundPacket.cancelPendingAlliance(allyPlayerName, playerName);
-        context.getSource().sendSuccess(()->Component.translatable("alliance.reignofnether.ally_request_cancelled_self", allyPlayerName), false);
+        context.getSource().sendSuccess(()->SystemMessage.info(Component.translatable("alliance.reignofnether.ally_request_cancelled_self", allyPlayerName)), false);
         SoundClientboundPacket.playSoundForPlayer(SoundAction.ENEMY, allyPlayerName);
-        allyPlayer.sendSystemMessage(Component.translatable("alliance.reignofnether.ally_request_cancelled", playerName));
+        allyPlayer.sendSystemMessage(SystemMessage.info(Component.translatable("alliance.reignofnether.ally_request_cancelled", playerName)));
         SoundClientboundPacket.playSoundForPlayer(SoundAction.ENEMY, playerName);
 
         return Command.SINGLE_SUCCESS;
@@ -131,19 +132,19 @@ private static int allyConfirm(CommandContext<CommandSourceStack> context) throw
             AlliancesServerEvents.addAlliance(playerName, requesterPlayerName);
             AlliancesServerEvents.pendingAlliances.getOrDefault(requesterPlayerName, new HashSet<>()).remove(playerName);
 
-            context.getSource().sendSuccess(()->Component.translatable("alliance.reignofnether.now_allied", requesterPlayerName), false);
+            context.getSource().sendSuccess(()->SystemMessage.info(Component.translatable("alliance.reignofnether.now_allied", requesterPlayerName)), false);
             SoundClientboundPacket.playSoundForPlayer(SoundAction.ALLY, requesterPlayerName);
-            requesterPlayer.sendSystemMessage(Component.translatable("alliance.reignofnether.ally_accepted", playerName));
+            requesterPlayer.sendSystemMessage(SystemMessage.info(Component.translatable("alliance.reignofnether.ally_accepted", playerName)));
             SoundClientboundPacket.playSoundForPlayer(SoundAction.ALLY, playerName);
 
             for (ServerPlayer serverPlayer : PlayerServerEvents.players) {
                 if (!serverPlayer.equals(player) && !serverPlayer.equals(requesterPlayer)) {
-                    serverPlayer.sendSystemMessage(Component.translatable("alliance.reignofnether.now_allied_third_party", playerName, requesterPlayerName));
+                    serverPlayer.sendSystemMessage(SystemMessage.info(Component.translatable("alliance.reignofnether.now_allied_third_party", playerName, requesterPlayerName)));
                     SoundClientboundPacket.playSoundForPlayer(SoundAction.CHAT, playerName);
                 }
             }
         } else {
-            context.getSource().sendFailure(Component.translatable("alliance.reignofnether.no_request", requesterPlayerName));
+            context.getSource().sendFailure(SystemMessage.error(Component.translatable("alliance.reignofnether.no_request", requesterPlayerName)));
         }
         return Command.SINGLE_SUCCESS;
     }
@@ -156,29 +157,29 @@ private static int disband(CommandContext<CommandSourceStack> context) throws Co
 
         if (context.getSource().getLevel().getGameRules().getRule(GameRuleRegistrar.LOCK_ALLIANCES).get() &&
             (PlayerServerEvents.isRTSPlayer(playerName) || PlayerServerEvents.isRTSPlayer(allyPlayerName))) {
-            player.sendSystemMessage(Component.translatable("alliance.reignofnether.alliances_lock"));
+            player.sendSystemMessage(SystemMessage.error(Component.translatable("alliance.reignofnether.alliances_lock")));
             return 0;
         }
         if (context.getSource().getLevel().getGameRules().getRule(GameRuleRegistrar.COOP_MODE).get() &&
             (PlayerServerEvents.isRTSPlayer(playerName) || PlayerServerEvents.isRTSPlayer(allyPlayerName))) {
-            player.sendSystemMessage(Component.translatable("alliance.reignofnether.alliances_lock_coop"));
+            player.sendSystemMessage(SystemMessage.error(Component.translatable("alliance.reignofnether.alliances_lock_coop")));
             return 0;
         }
 
         if (player.equals(allyPlayer)) {
-            context.getSource().sendFailure(Component.translatable("alliance.reignofnether.disband_self"));
+            context.getSource().sendFailure(SystemMessage.error(Component.translatable("alliance.reignofnether.disband_self")));
             return 0;
         }
         AlliancesServerEvents.removeAlliance(playerName, allyPlayerName);
 
-        player.sendSystemMessage(Component.translatable("alliance.reignofnether.disbanded", allyPlayerName));
+        player.sendSystemMessage(SystemMessage.info(Component.translatable("alliance.reignofnether.disbanded", allyPlayerName)));
         SoundClientboundPacket.playSoundForPlayer(SoundAction.ENEMY, playerName);
-        allyPlayer.sendSystemMessage(Component.translatable("alliance.reignofnether.disbanded", playerName));
+        allyPlayer.sendSystemMessage(SystemMessage.info(Component.translatable("alliance.reignofnether.disbanded", playerName)));
         SoundClientboundPacket.playSoundForPlayer(SoundAction.ENEMY, allyPlayerName);
 
         for (ServerPlayer serverPlayer : PlayerServerEvents.players) {
             if (!serverPlayer.equals(player) && !serverPlayer.equals(allyPlayer)) {
-                serverPlayer.sendSystemMessage(Component.translatable("alliance.reignofnether.disbanded_third_party", playerName, allyPlayerName));
+                serverPlayer.sendSystemMessage(SystemMessage.info(Component.translatable("alliance.reignofnether.disbanded_third_party", playerName, allyPlayerName)));
                 SoundClientboundPacket.playSoundForPlayer(SoundAction.CHAT, playerName);
             }
         }
@@ -190,7 +191,7 @@ private static int getAlliedControl(CommandContext<CommandSourceStack> context)
         String playerName = player.getName().getString();
         boolean value = AlliancesServerEvents.playersWithAlliedControl.contains(playerName);
         String msgKey = value ? "alliance.reignofnether.ally_control_enabled" : "alliance.reignofnether.ally_control_disabled";
-        context.getSource().sendSuccess(()->Component.translatable(msgKey, playerName), false);
+        context.getSource().sendSuccess(()->SystemMessage.info(Component.translatable(msgKey, playerName)), false);
         return Command.SINGLE_SUCCESS;
     }
 
@@ -206,11 +207,11 @@ private static int setAlliedControl(CommandContext<CommandSourceStack> context)
             AlliancesServerEvents.playersWithAlliedControl.remove(playerName);
 
         AllianceClientboundPacket.setAllyControl(playerName, value);
-        context.getSource().sendSuccess(()->Component.translatable(msgKey, playerName), false);
+        context.getSource().sendSuccess(()->SystemMessage.info(Component.translatable(msgKey, playerName)), false);
         SoundClientboundPacket.playSoundForPlayer(SoundAction.CHAT, playerName);
 
         for (String allyPlayerName : AlliancesServerEvents.getAllAllies(playerName)) {
-            PlayerServerEvents.sendMessageToPlayerNoNewLines(allyPlayerName, msgKey, false, playerName);
+            PlayerServerEvents.sendMessageToPlayer(allyPlayerName, msgKey, false, playerName);
             SoundClientboundPacket.playSoundForPlayer(SoundAction.CHAT, allyPlayerName);
         }
         return Command.SINGLE_SUCCESS;
diff --git a/src/main/java/com/solegendary/reignofnether/building/BuildingClientEvents.java b/src/main/java/com/solegendary/reignofnether/building/BuildingClientEvents.java
index 1600bffc7..d942c3a25 100644
--- a/src/main/java/com/solegendary/reignofnether/building/BuildingClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/building/BuildingClientEvents.java
@@ -1,6 +1,8 @@
 package com.solegendary.reignofnether.building;
 
+import com.solegendary.reignofnether.hud.buttons.HelperButtons;
 import com.mojang.blaze3d.platform.NativeImage;
+import com.solegendary.reignofnether.player.PlayerClientEvents;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.solegendary.reignofnether.ReignOfNether;
@@ -16,6 +18,7 @@
 import com.solegendary.reignofnether.building.custombuilding.CustomBuilding;
 import com.solegendary.reignofnether.building.production.ActiveProduction;
 import com.solegendary.reignofnether.cursor.CursorClientEvents;
+import com.solegendary.reignofnether.faction.Factions;
 import com.solegendary.reignofnether.fogofwar.FogOfWarClientEvents;
 import com.solegendary.reignofnether.gamerules.GameruleClient;
 import com.solegendary.reignofnether.hud.HudClientEvents;
@@ -37,6 +40,7 @@
 import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
 import com.solegendary.reignofnether.util.MiscUtil;
 import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.inventory.BeaconScreen;
 import net.minecraft.client.gui.screens.inventory.ContainerScreen;
@@ -73,10 +77,14 @@
 import static com.solegendary.reignofnether.unit.UnitClientEvents.getSelectedUnits;
 public class BuildingClientEvents {
 
+    static {
+        WorldState.onClientReset(() -> setBuildingToPlace(null));
+    }
+
     static final Minecraft MC = Minecraft.getInstance();
 
     public static int getTotalPopulationSupply(String playerName) {
-        if (ResearchClient.hasCheat("foodforthought")) {
+        if (ResearchClient.hasCheat("foodforthought") || PlayerClientEvents.getPlayerFaction(playerName) == Factions.NONE) {
             return GameruleClient.maxPopulation;
         }
 
@@ -90,7 +98,7 @@ public static int getTotalPopulationSupply(String playerName) {
     }
 
     // clientside buildings used for tracking position (for cursor selection)
-    private static final ArrayList<BuildingPlacement> buildings = new ArrayList<>();
+    private static final ArrayList<BuildingPlacement> buildings = WorldState.client(new ArrayList<>());
     private static final ArrayList<BuildingPlacement> selectedBuildings = new ArrayList<>();
     private static Building buildingToPlace = null;
     private static Building lastBuildingToPlace = null;
@@ -478,7 +486,7 @@ public static boolean isBridgeDiagonal() {
 
     @SubscribeEvent
     public static void onMouseScroll(ScreenEvent.MouseScrolled.Post evt) {
-        if (buildingToPlace != null) {
+        if (buildingToPlace != null && !Keybindings.altMod.isDown()) { // Alt + wheel zooms instead
             if (buildingToPlace instanceof AbstractBridge bridge) {
                 bridgePlaceState += evt.getScrollDelta() > 0 ? 1 : -1;
                 if (bridgePlaceState < 0) {
@@ -741,7 +749,9 @@ public static void onButtonPress(ScreenEvent.KeyPressed.Pre evt) {
             if (building != null && building.getBuilding().capturable && !isSandboxPlayer) {
                 HudClientEvents.showTemporaryMessage(I18n.get("server.reignofnether.cannot_delete_capturable"));
             } else if (building != null &&
-                ((building.isBuilt && getPlayerToBuildingRelationship(building) == Relationship.OWNED) || isSandboxPlayer)) {
+                // unbuilt: cancel construction, under the same rule as the card's Cancel button (B)
+                (((building.isBuilt || !HelperButtons.buildingCancelButton.isHidden.get())
+                        && getPlayerToBuildingRelationship(building) == Relationship.OWNED) || isSandboxPlayer)) {
                 HudClientEvents.hudSelectedPlacement = null;
                 BuildingServerboundPacket.cancelBuilding(building.minCorner, MC.player.getName().getString());
             }
@@ -787,7 +797,12 @@ public static void onClientTick(TickEvent.ClientTickEvent evt) {
 
             // cleanup destroyed buildings
             selectedBuildings.removeIf(BuildingPlacement::shouldBeDestroyed);
-            buildings.removeIf(BuildingPlacement::shouldBeDestroyed);
+            buildings.removeIf(b -> {
+                if (!b.shouldBeDestroyed())
+                    return false;
+                onLost(b);
+                return true;
+            });
         }
     }
 
@@ -965,10 +980,26 @@ public static void syncBeacon(UnitAction action, BlockPos beaconPos, boolean act
     }
 
     public static void removeBuilding(BlockPos bp) {
-        buildings.removeIf(b -> b.originPos.equals(bp));
+        buildings.removeIf(b -> {
+            if (!b.originPos.equals(bp))
+                return false;
+            onLost(b);
+            return true;
+        });
         BuildingClientEvents.clearSelectedBuildings();
     }
 
+    /** Losing your last capital: a tip in chat that surrender is in the pause menu. */
+    private static void onLost(BuildingPlacement b) {
+        if (!b.isCapitol || !b.isBuilt || MC.player == null || !PlayerClientEvents.isRTSPlayer()
+                || !b.ownerName.equals(MC.player.getName().getString()))
+            return;
+        boolean another = buildings.stream().anyMatch(o -> o != b && o.isCapitol && o.ownerName.equals(b.ownerName) && !o.shouldBeDestroyed());
+        if (!another)
+            MC.gui.getChat().addMessage(com.solegendary.reignofnether.chat.SystemMessage.important(
+                    net.minecraft.network.chat.Component.translatable("hud.reignofnether.capital_lost_tip")));
+    }
+
     public static void removeFogQueuedBuilding(BlockPos bp) {
         for (LivingEntity le : UnitClientEvents.getAllUnits()) {
             if (le instanceof WorkerUnit workerUnit) {
diff --git a/src/main/java/com/solegendary/reignofnether/building/BuildingPlaceButton.java b/src/main/java/com/solegendary/reignofnether/building/BuildingPlaceButton.java
index 57996889b..637136ad4 100644
--- a/src/main/java/com/solegendary/reignofnether/building/BuildingPlaceButton.java
+++ b/src/main/java/com/solegendary/reignofnether/building/BuildingPlaceButton.java
@@ -9,11 +9,14 @@
 import java.util.function.Supplier;
 
 public class BuildingPlaceButton extends Button {
+    public final Building building;
+
     public BuildingPlaceButton(String name, ResourceLocation rl, Keybinding hotkey, Supplier<Boolean> isSelected,
                                Supplier<Boolean> isHidden, Supplier<Boolean> isEnabled,
                                List<FormattedCharSequence> tooltipLines, Building building) {
 
         // generate x/y based on given position (starting at 0 which is bottom left 1 row above generic action buttons)
         super(name, Button.itemIconSize, rl, hotkey, isSelected, isHidden, isEnabled, () -> BuildingClientEvents.setBuildingToPlace(building), null, tooltipLines);
+        this.building = building;
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/building/BuildingPlacement.java b/src/main/java/com/solegendary/reignofnether/building/BuildingPlacement.java
index 6b6c2a380..b3baaa234 100644
--- a/src/main/java/com/solegendary/reignofnether/building/BuildingPlacement.java
+++ b/src/main/java/com/solegendary/reignofnether/building/BuildingPlacement.java
@@ -896,6 +896,7 @@ public void onBuilt() {
             if (rtsPlayer != null)
                 rtsPlayer.scores.addToScore(RTSPlayerScoresEnum.TOTAL_BUILDINGS_CONSTRUCTED);
         } else {
+            com.solegendary.reignofnether.chat.SpectatorFeed.built(ownerName, com.solegendary.reignofnether.hud.panels.SelectionPanel.buildingName(this));
             TutorialClientEvents.updateStage();
             if (this.isCapitol && !SandboxClientEvents.isSandboxPlayer() &&
                 getTotalCompletedBuildingsOwned(this.level.isClientSide(), ownerName) == 1)
diff --git a/src/main/java/com/solegendary/reignofnether/building/BuildingServerEvents.java b/src/main/java/com/solegendary/reignofnether/building/BuildingServerEvents.java
index c1d8dcc3e..77e0c054a 100644
--- a/src/main/java/com/solegendary/reignofnether/building/BuildingServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/building/BuildingServerEvents.java
@@ -667,7 +667,7 @@ public static void cancelBuilding(BuildingPlacement building, String playerName)
     }
 
     public static int getTotalPopulationSupply(String ownerName) {
-        if (ResearchServerEvents.playerHasCheat(ownerName, "foodforthought")) {
+        if (ResearchServerEvents.playerHasCheat(ownerName, "foodforthought") || SandboxServer.isSandboxPlayer(ownerName)) {
             return UnitServerEvents.maxPopulation;
         }
 
diff --git a/src/main/java/com/solegendary/reignofnether/building/buildings/placements/BeaconPlacement.java b/src/main/java/com/solegendary/reignofnether/building/buildings/placements/BeaconPlacement.java
index 71681f4f8..e465e31ff 100644
--- a/src/main/java/com/solegendary/reignofnether/building/buildings/placements/BeaconPlacement.java
+++ b/src/main/java/com/solegendary/reignofnether/building/buildings/placements/BeaconPlacement.java
@@ -198,7 +198,6 @@ public void onBuilt() {
 
     public void sendWarning(String msg) {
         if (!level.isClientSide) {
-            PlayerServerEvents.sendMessageToAllPlayersNoNewlines("");
             BeaconPlacement beacon = BuildingUtils.getBeacon(level.isClientSide);
             if (beacon != null && msg.equals("upgraded_warning")) {
                 String upgradeName = "";
@@ -208,17 +207,16 @@ public void sendWarning(String msg) {
                 else if (beacon.getUpgradeLevel() == 4) upgradeName = Component.translatable("buildings.reignofnether.beacon.upgrade.beacon_level4").getString();
                 else if (beacon.getUpgradeLevel() == 5) upgradeName = Component.translatable("buildings.reignofnether.beacon.upgrade.beacon_level5").getString();
 
-                PlayerServerEvents.sendMessageToAllPlayersNoNewlines("buildings.reignofnether.beacon.upgrade_warning",
+                PlayerServerEvents.sendMessageToAllPlayers("buildings.reignofnether.beacon.upgrade_warning",
                         true, ownerName, upgradeName, beacon.getUpgradeLevel(), Beacon.MAX_UPGRADE_LEVEL);
             } else {
-                PlayerServerEvents.sendMessageToAllPlayersNoNewlines("buildings.reignofnether.beacon." + msg,
+                PlayerServerEvents.sendMessageToAllPlayers("buildings.reignofnether.beacon." + msg,
                         true, ownerName);
             }
             if (beacon != null && beacon.getUpgradeLevel() >= Beacon.MAX_UPGRADE_LEVEL && !msg.equals("destroy_warning")) {
-                PlayerServerEvents.sendMessageToAllPlayersNoNewlines("buildings.reignofnether.beacon.time_to_win",
+                PlayerServerEvents.sendMessageToAllPlayers("buildings.reignofnether.beacon.time_to_win",
                         false, ownerName, PlayerServerEvents.getBeaconWinTime(ownerName));
             }
-            PlayerServerEvents.sendMessageToAllPlayersNoNewlines("");
             if (SurvivalServerEvents.isEnabled() && !msg.equals("destroy_warning"))
                 SoundClientboundPacket.playSoundForAllPlayers(SoundAction.ALLY);
             else
diff --git a/src/main/java/com/solegendary/reignofnether/building/custombuilding/CustomBuildingClientEvents.java b/src/main/java/com/solegendary/reignofnether/building/custombuilding/CustomBuildingClientEvents.java
index 861738649..1626f33c2 100644
--- a/src/main/java/com/solegendary/reignofnether/building/custombuilding/CustomBuildingClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/building/custombuilding/CustomBuildingClientEvents.java
@@ -1,13 +1,15 @@
 package com.solegendary.reignofnether.building.custombuilding;
 
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.solegendary.reignofnether.blocks.RTSStructureBlockEntity;
 import com.solegendary.reignofnether.building.Building;
 import com.solegendary.reignofnether.building.BuildingBlock;
 import com.solegendary.reignofnether.building.BuildingBlockData;
 import com.solegendary.reignofnether.guiscreen.TopdownGui;
-import com.solegendary.reignofnether.hud.buttons.Button;
-import com.solegendary.reignofnether.hud.RectZone;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
+import com.solegendary.reignofnether.ui.EditorRows;
 import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Vec3i;
@@ -22,7 +24,6 @@
 import net.minecraftforge.client.event.RenderLevelStageEvent;
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import org.lwjgl.glfw.GLFW;
 
 import java.util.ArrayList;
 
@@ -31,6 +32,10 @@
 
 public class CustomBuildingClientEvents {
 
+    static {
+        WorldState.onClientReset(() -> setCustomBuildingToEdit(null));
+    }
+
     // since every custom building has a different structure, we need to maintain a list of them here
     public static final ArrayList<CustomBuilding> customBuildings = new ArrayList<>();
 
@@ -39,8 +44,7 @@ public class CustomBuildingClientEvents {
     private static final Minecraft MC = Minecraft.getInstance();
 
     private static CustomBuilding customBuildingToEdit = null;
-    private static final ArrayList<Button> renderedButtons = new ArrayList<>();
-    private static final ArrayList<RectZone> hudZones = new ArrayList<>();
+    private static HudFrame frame = null; // the editor drawn last frame, for clicks
 
     public static boolean showCommandsMenu = false;
     public static boolean deregisterConfirm = false;
@@ -72,7 +76,7 @@ public static void registerCustomBuilding(String playerName, String name, Vec3i
 
         for (CustomBuilding customBuilding : customBuildings) {
             if (customBuilding.name.equals(name)) {
-                MC.player.sendSystemMessage(Component.literal("ERROR (client): custom building '" + name + "' already exists"));
+                MC.player.sendSystemMessage(SystemMessage.error(Component.literal("ERROR (client): custom building '" + name + "' already exists")));
                 return;
             }
         }
@@ -114,44 +118,21 @@ public static void onRenderLevel(RenderLevelStageEvent evt) throws NoSuchFieldEx
 
     @SubscribeEvent
     public static void onDrawScreen(ScreenEvent.Render.Post evt) {
-        hudZones.clear();
-        renderedButtons.clear();
+        frame = null;
         if (customBuildingToEdit != null && MC.screen instanceof TopdownGui) {
-            int blitX = 120;
-            int blitY = 20;
-            int width = 315;
-            int height = 260;
-            MyRenderer.renderFrameWithBg(evt.getGuiGraphics(), blitX, blitY, width, height, 0xA0000000);
-
-            renderedButtons.add(CustomBuildingMenu.renderIconButtonNameAndPortrait(evt, customBuildingToEdit, blitX + 18, blitY + 18));
-            renderedButtons.add(CustomBuildingMenu.renderCloseButton(evt, blitX + width - Button.itemIconSize - 12, blitY + 4));
-            renderedButtons.add(CustomBuildingMenu.renderDeregisterButton(evt, blitX + width - Button.itemIconSize - 12, blitY + height - 26));
-            if (!showCommandsMenu) {
-                renderedButtons.addAll(CustomBuildingMenu.renderCustomisationButtons(evt, customBuildingToEdit,blitX + 8, blitY + 38));
-            } else {
-                renderedButtons.addAll(CustomBuildingMenu.renderCommandsButtonsAndInputs(evt, customBuildingToEdit, blitX + 6, blitY + 38));
-            }
-            renderedButtons.addAll(CustomBuildingMenu.renderCommandsMenuButton(evt, blitX + 10, blitY + height - 32));
-            hudZones.add(new RectZone(blitX, blitY, blitX + width, blitY + height));
+            frame = EditorRows.begin(evt.getGuiGraphics(), evt.getMouseX(), evt.getMouseY());
+            CustomBuildingMenu.render(frame, customBuildingToEdit);
+            EditorRows.end(frame);
         }
     }
 
     public static boolean isMouseOverHud(int mouseX, int mouseY) {
-        for (RectZone hudZone : hudZones)
-            if (hudZone.isMouseOver(mouseX, mouseY))
-                return true;
-        return false;
+        return EditorRows.isOver(frame, mouseX, mouseY);
     }
 
     @SubscribeEvent
     public static void onMousePress(ScreenEvent.MouseButtonPressed.Post evt) {
-        for (Button button : renderedButtons) {
-            if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_1) {
-                button.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), true);
-            } else if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_2) {
-                button.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), false);
-            }
-        }
+        EditorRows.click(frame, evt.getMouseX(), evt.getMouseY(), evt.getButton());
     }
 
     @SubscribeEvent
@@ -161,9 +142,3 @@ public static void onMouseScroll(ScreenEvent.MouseScrolled.Post evt) {
         }
     }
 }
-
-
-
-
-
-
diff --git a/src/main/java/com/solegendary/reignofnether/building/custombuilding/CustomBuildingMenu.java b/src/main/java/com/solegendary/reignofnether/building/custombuilding/CustomBuildingMenu.java
index 5e36777f0..1f77837ee 100644
--- a/src/main/java/com/solegendary/reignofnether/building/custombuilding/CustomBuildingMenu.java
+++ b/src/main/java/com/solegendary/reignofnether/building/custombuilding/CustomBuildingMenu.java
@@ -5,22 +5,31 @@
 import com.solegendary.reignofnether.building.BuildingClientEvents;
 import com.solegendary.reignofnether.building.BuildingCommand;
 import com.solegendary.reignofnether.hud.*;
-import com.solegendary.reignofnether.hud.buttons.BooleanButton;
 import com.solegendary.reignofnether.hud.buttons.Button;
 import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
-import com.solegendary.reignofnether.hud.buttons.IntegerButton;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.hud.panels.ButtonCell;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
 import com.solegendary.reignofnether.keybinds.Keybinding;
 import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.ui.EditorRows;
+import com.solegendary.reignofnether.ui.EditorRows.Group;
+import com.solegendary.reignofnether.ui.EditorRows.Row;
+import com.solegendary.reignofnether.ui.EditorRows.Style;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
 import com.solegendary.reignofnether.util.MiscUtil;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.I18n;
-import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.FormattedCharSequence;
-import net.minecraftforge.client.event.ScreenEvent;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.BooleanSupplier;
+import java.util.function.Consumer;
+import java.util.function.IntConsumer;
+import java.util.function.IntSupplier;
+import java.util.function.Supplier;
 
 import static com.solegendary.reignofnether.building.custombuilding.CustomBuildingClientEvents.getCustomBuildingToEdit;
 import static com.solegendary.reignofnether.building.custombuilding.CustomBuildingClientEvents.setCustomBuildingToEdit;
@@ -28,13 +37,49 @@
 import static com.solegendary.reignofnether.util.MiscUtil.fcs;
 import static com.solegendary.reignofnether.util.MiscUtil.fcsIcons;
 
+/**
+ * The custom building editor: a popup in HUD units with the building's settings in grouped rows,
+ * or its list of commands. Every change is sent to the server as it is made.
+ */
 public class CustomBuildingMenu {
-    
-    private static Minecraft MC = Minecraft.getInstance();
-    
-    public static PortraitRendererBuilding portraitRendererBuilding = new PortraitRendererBuilding();
-    
-    public static Button renderIconButtonNameAndPortrait(ScreenEvent.Render.Post evt, CustomBuilding building, int x, int y) {
+
+    private static final String KEY = "sandbox.reignofnether.custom_buildings.";
+    private static final int PAD = 7;
+    private static final int COL_W = 200;
+    private static final int COMMANDS_W = 450;
+    private static final int FOOTER_H = 14;
+    private static final int COMMANDS_FOOTER_H = 21;
+    private static final int PORTRAIT = 44; // the switch button, and the box of the preview next to it
+    private static final int HEADER_H = PORTRAIT + 2;
+
+    /** Draws the whole editor for this building. */
+    public static void render(HudFrame f, CustomBuilding building) {
+        boolean commands = CustomBuildingClientEvents.showCommandsMenu;
+        int top = HudLayout.MARGIN + HudLayout.TOP_CARD_H + HudLayout.GAP;
+        int footerH = commands ? COMMANDS_FOOTER_H : FOOTER_H;
+        int maxBody = f.layout.height() - HudLayout.MARGIN - top - PAD * 2 - HEADER_H - footerH - 6;
+        List<Group> groups = commands ? List.of() : groups(building);
+        int bodyH = commands ? VISIBLE_COMMAND_ROWS * COMMAND_ROW_H : EditorRows.measure(groups, COL_W, maxBody).h();
+        int bodyW = commands ? COMMANDS_W : EditorRows.measure(groups, COL_W, maxBody).w();
+        int w = bodyW + PAD * 2;
+        int h = HEADER_H + bodyH + 6 + footerH + PAD * 2;
+        int x = HudLayout.MARGIN;
+        Theme.popup(f.g, x, top, w, h, Theme.ORANGE);
+        f.zone(x, top, w, h);
+
+        int cx = x + PAD;
+        int y = top + PAD;
+        renderHeader(f, building, cx, y, bodyW);
+        y += HEADER_H;
+        if (commands)
+            renderCommands(f, building, cx, y);
+        else
+            EditorRows.render(f, groups, cx, y, COL_W, maxBody);
+        renderFooter(f, building, cx, top + h - PAD - footerH, bodyW, footerH);
+    }
+
+    /** The change-icon cell, the spinning portrait block, the building's name and the close cross. */
+    private static void renderHeader(HudFrame f, CustomBuilding building, int x, int y, int w) {
         Button iconButton = new Button("Change Building Icon",
             Button.itemIconSize,
             MiscUtil.getTextureForBlock(building.portraitBlock),
@@ -44,50 +89,46 @@ public static Button renderIconButtonNameAndPortrait(ScreenEvent.Render.Post evt
             () -> true,
             () -> building.cycleIconAndPortrait(false),
             () -> building.cycleIconAndPortrait(true),
-            List.of(fcs(I18n.get("sandbox.reignofnether.custom_buildings.change_icon.tooltip1")))
+            List.of(fcs(I18n.get(KEY + "change_icon.tooltip1")))
         );
-        portraitRendererBuilding.drawBlockOnScreen(x + 2, y - 22, building.portraitBlock, 4.0f);
-        evt.getGuiGraphics().drawString(MC.font, fcs(building.name, true), x + 52, y, 0xFFFFFF);
-        renderButton(iconButton, x - 8, y - 8, evt);
-        return iconButton;
+        f.cell(iconButton, x, y, PORTRAIT, null);
+        PortraitRendererBuilding.drawBlock(f.g, building.portraitBlock, x + PORTRAIT * 1.5f + 4, y + PORTRAIT / 2f, 4f);
+        int nameX = PORTRAIT * 2 + 8;
+        EditorRows.header(f, building.name, x + nameX, y, w - nameX, null, () -> setCustomBuildingToEdit(null));
     }
-    
-    public static Button renderCloseButton(ScreenEvent.Render.Post evt, int x, int y) {
-        Button closeButton = new Button("Close Custom Building Menu",
-            Button.itemIconSize,
-            ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/cross_square.png"),
-            (Keybinding) null,
-            () -> false,
-            () -> false,
-            () -> true,
-            () -> setCustomBuildingToEdit(null),
-            null,
-            List.of()
-        );
-        closeButton.frameResource = null;
-        renderButton(closeButton, x, y, evt);
-        return closeButton;
-    }
-    
-    public static Button renderDeregisterButton(ScreenEvent.Render.Post evt, int x, int y) {
-        CustomBuilding building = getCustomBuildingToEdit();
-        
+
+    /** Left to right: the general/commands switch, Add Command on the commands tab and the two-click deregister button. */
+    private static void renderFooter(HudFrame f, CustomBuilding building, int x, int y, int w, int h) {
+        boolean commands = CustomBuildingClientEvents.showCommandsMenu;
+        int buttonW = commands ? 120 : 80;
+        int commandCount = 0;
+        for (BuildingCommand command : building.commands)
+            if (command.condition != BuildingCommand.TriggerCondition.NONE && !command.commandStr.isBlank())
+                commandCount += 1;
+        String countText = I18n.get(KEY + "commands_count", commandCount);
+        String label = commands ? I18n.get(KEY + "general_tab") : I18n.get(KEY + "commands_tab") + " (" + commandCount + ")";
+        EditorRows.textButton(f, "Toggle Commands Menu", label, new Rect(x, y, buttonW, h), Style.SECONDARY,
+            () -> {
+                CustomBuildingClientEvents.showCommandsMenu = !commands;
+                forceRefreshCommandEditBoxes();
+            }, null,
+            EditorRows.tip(I18n.get(KEY + (commands ? "switch_to_general_menu" : "switch_to_commands_menu")), countText));
+
+        if (commands && building.commands.size() < MAX_COMMANDS)
+            EditorRows.textButton(f, "Add Command", "+ " + I18n.get(KEY + "commands.add_label"), new Rect(x + buttonW + 4, y, 75, h), Style.SECONDARY,
+                () -> {
+                    if (building.commands.size() < MAX_COMMANDS)
+                        building.commands.add(new BuildingCommand());
+                    CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.ADD_COMMAND, building.name);
+                    // jump the view down to reveal the newly-added row
+                    commandScrollOffset = maxCommandScrollOffset(building.commands.size());
+                    forceRefreshCommandEditBoxes();
+                }, null,
+                EditorRows.tip(I18n.get(KEY + "commands.add"), null));
+
         boolean confirm = CustomBuildingClientEvents.deregisterConfirm;
-        List<FormattedCharSequence> tooltips = confirm ? List.of(
-            fcs(I18n.get("sandbox.reignofnether.custom_buildings.deregister.tooltip1"), true),
-            fcs(I18n.get("sandbox.reignofnether.custom_buildings.deregister.confirm"))
-        ) : List.of(
-            fcs(I18n.get("sandbox.reignofnether.custom_buildings.deregister.tooltip1"), true),
-            fcs(I18n.get("sandbox.reignofnether.custom_buildings.deregister.tooltip2"))
-        );
-        
-        Button deregisterButton = new Button("Deregister Custom Building",
-            Button.itemIconSize,
-            ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/barrier.png"),
-            (Keybinding) null,
-            () -> false,
-            () -> false,
-            () -> true,
+        String deregister = confirm ? I18n.get(KEY + "deregister.confirm") : I18n.get(KEY + "deregister.label");
+        EditorRows.textButton(f, "Deregister Custom Building", deregister, new Rect(x + buttonW + 4 + (commands ? 79 : 0), y, buttonW, h), Style.DANGER,
             () -> {
                 if (!CustomBuildingClientEvents.deregisterConfirm) {
                     CustomBuildingClientEvents.deregisterConfirm = true;
@@ -100,427 +141,172 @@ public static Button renderDeregisterButton(ScreenEvent.Render.Post evt, int x,
                 }
             },
             () -> CustomBuildingClientEvents.deregisterConfirm = false,
-            tooltips
-        
+            () -> Tooltip.of(I18n.get(KEY + "deregister.tooltip1")).danger()
+                .body(I18n.get(KEY + (confirm ? "deregister.confirm" : "deregister.tooltip2"))));
+    }
+
+    // ---------------------------------------------------------------- general tab
+
+    private static List<Group> groups(CustomBuilding b) {
+        return List.of(
+            new Group(I18n.get(KEY + "group.buildable_by"), List.of(
+                toggle(b, "set_buildable_by_villagers", CustomBuildingAction.SET_BUILDABLE_BY_VILLAGERS, () -> b.buildableByVillagers, v -> b.buildableByVillagers = v),
+                toggle(b, "set_buildable_by_monsters", CustomBuildingAction.SET_BUILDABLE_BY_MONSTERS, () -> b.buildableByMonsters, v -> b.buildableByMonsters = v),
+                toggle(b, "set_buildable_by_piglins", CustomBuildingAction.SET_BUILDABLE_BY_PIGLINS, () -> b.buildableByPiglins, v -> b.buildableByPiglins = v),
+                toggle(b, "set_nether_terrain_only", CustomBuildingAction.SET_NETHER_TERRAIN_ONLY, () -> b.netherTerrainOnly, v -> b.netherTerrainOnly = v)
+            )),
+            new Group(I18n.get(KEY + "group.cost"), List.of(
+                number(b, "set_food_cost", ButtonCell.ICON_FOOD, CustomBuildingAction.SET_FOOD_COST, () -> b.cost.food, v -> b.cost.food = v, 0, 10000, 5, 100,
+                    EditorRows.tip(I18n.get(KEY + "set_food_cost.label"), I18n.get(KEY + "set_food_cost.tooltip1", b.cost.food * NEUTRAL_BUILDING_BOUNTY_PERCENT))),
+                number(b, "set_wood_cost", ButtonCell.ICON_WOOD, CustomBuildingAction.SET_WOOD_COST, () -> b.cost.wood, v -> b.cost.wood = v, 0, 10000, 5, 100,
+                    EditorRows.tip(I18n.get(KEY + "set_wood_cost.label"), I18n.get(KEY + "set_wood_cost.tooltip1", b.cost.wood * NEUTRAL_BUILDING_BOUNTY_PERCENT))),
+                number(b, "set_ore_cost", ButtonCell.ICON_ORE, CustomBuildingAction.SET_ORE_COST, () -> b.cost.ore, v -> b.cost.ore = v, 0, 10000, 5, 100,
+                    EditorRows.tip(I18n.get(KEY + "set_ore_cost.label"), I18n.get(KEY + "set_ore_cost.tooltip1", b.cost.ore * NEUTRAL_BUILDING_BOUNTY_PERCENT))),
+                number(b, "set_pop_supply", modIcon("textures/icons/items/bed.png"), CustomBuildingAction.SET_POPULATION_SUPPLY, () -> b.cost.population, v -> b.cost.population = v, 0, 300, 1, 10, null)
+            )),
+            new Group(I18n.get(KEY + "group.contents"), List.of(
+                (f, x, y, w) -> EditorRows.action(f, vanillaIcon("textures/block/fletching_table_front.png"), I18n.get(KEY + "trainable_units.label"), trainableUnitsTooltip(b),
+                    String.valueOf(b.productions.get().size()), "?", GUIDE_BUTTON_W, null, null, x, y, w),
+                (f, x, y, w) -> EditorRows.action(f, modIcon("textures/item/heart_medallion.png"), I18n.get(KEY + "buyable_items.label"),
+                    () -> guideTooltip("buyable_items"),
+                    String.valueOf(b.stockedItems.size()), "?", GUIDE_BUTTON_W, null, null, x, y, w)
+            )),
+            new Group(I18n.get(KEY + "group.building"), List.of(
+                maxHealth(b),
+                number(b, "set_night_radius", modIcon("textures/hud/moon.png"), CustomBuildingAction.SET_NIGHT_RADIUS, () -> b.nightRadius, v -> b.nightRadius = v, 0, 200, 1, 10, null),
+                number(b, "set_nether_radius", modIcon("textures/icons/blocks/portal.png"), CustomBuildingAction.SET_NETHER_RADIUS, () -> b.netherRadius, v -> b.netherRadius = v, 0, 200, 1, 10, null),
+                number(b, "set_garrison_capacity", vanillaIcon("textures/block/ladder.png"), CustomBuildingAction.SET_GARRISON_CAPACITY, () -> b.garrisonCapacity, v -> b.garrisonCapacity = v, 0, 100, 1, 10,
+                    garrisonTooltip(b, "set_garrison_capacity")),
+                number(b, "set_garrison_range", vanillaIcon("textures/item/bow.png"), CustomBuildingAction.SET_GARRISON_RANGE, () -> b.garrisonRange, v -> b.garrisonRange = v, 0, 100, 1, 10,
+                    garrisonTooltip(b, "set_garrison_range")),
+                toggle(b, "set_capturable", CustomBuildingAction.SET_CAPTURABLE, () -> b.capturable, v -> b.capturable = v),
+                toggle(b, "set_invulnerable", CustomBuildingAction.SET_INVULNERABLE, () -> b.invulnerable, v -> b.invulnerable = v),
+                toggle(b, "set_repairable", CustomBuildingAction.SET_REPAIRABLE, () -> b.repairable, v -> b.repairable = v),
+                toggle(b, "set_draw_aggro", CustomBuildingAction.SET_DRAW_AGGRO, () -> b.drawAggro, v -> b.drawAggro = v),
+                toggle(b, "set_destroy_on_reset", CustomBuildingAction.SET_DESTROY_ON_RESET, () -> b.shouldDestroyOnReset, v -> b.shouldDestroyOnReset = v)
+            ))
         );
-        deregisterButton.frameResource = null;
-        renderButton(deregisterButton, x, y, evt);
-        return deregisterButton;
     }
-    
-    public static List<Button> renderCommandsMenuButton(ScreenEvent.Render.Post evt, int x, int y) {
-        ArrayList<Button> buttons = new ArrayList<>();
-        boolean showCommandsMenu = CustomBuildingClientEvents.showCommandsMenu;
-        
-        List<FormattedCharSequence> tooltips = showCommandsMenu ?
-            List.of(fcs(I18n.get("sandbox.reignofnether.custom_buildings.switch_to_general_menu"))) :
-            List.of(fcs(I18n.get("sandbox.reignofnether.custom_buildings.switch_to_commands_menu")));
-        
-        Button commandsMenuButton = new ButtonBuilder("Toggle Commands Menu")
-            .iconResource(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_back.png"))
-            .onLeftClick(() -> {
-                CustomBuildingClientEvents.showCommandsMenu = !showCommandsMenu;
-                CustomBuildingMenu.forceRefreshCommandEditBoxes();
-            })
-            .tooltipLines(tooltips)
-            .build();
-        renderButton(commandsMenuButton, x, y, evt);
-        buttons.add(commandsMenuButton);
-        
-        CustomBuilding building = getCustomBuildingToEdit();
-        int commandCount = 0;
-        if (building != null)
-            for (BuildingCommand command : building.commands)
-                if (command.condition != BuildingCommand.TriggerCondition.NONE && !command.commandStr.isBlank())
-                    commandCount += 1;
-        
-        evt.getGuiGraphics().drawString(MC.font,
-            I18n.get("sandbox.reignofnether.custom_buildings.commands_count", commandCount),
-            x + (showCommandsMenu ? 50 : 25),
-            y + 7,
-            0xFFFFFF);
-        
-        if (showCommandsMenu && building != null && building.commands.size() < MAX_COMMANDS) {
-            Button addButton = new ButtonBuilder("Add Command")
-                .iconResource(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/corner_plus.png"))
-                .bgIconResource(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/chain_command_block_back.png"))
-                .onLeftClick(() -> {
-                    if (building.commands.size() < MAX_COMMANDS)
-                        building.commands.add(new BuildingCommand());
-                    CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.ADD_COMMAND, building.name);
-                    // jump the view down to reveal the newly-added row
-                    commandScrollOffset = maxCommandScrollOffset(building.commands.size());
-                    forceRefreshCommandEditBoxes();
-                })
-                .tooltipLines(List.of(
-                    fcs(I18n.get("sandbox.reignofnether.custom_buildings.commands.add"))))
-                .build();
-            renderButton(addButton, x + 25, y, evt);
-            buttons.add(addButton);
-        }
-        
-        return buttons;
+
+    private static ResourceLocation modIcon(String path) {
+        return ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, path);
     }
-    
-    
-    private static void renderButton(Button button, int x, int y, ScreenEvent.Render.Post evt) {
-        if (!button.isHidden.get()) {
-            button.render(evt.getGuiGraphics(), x, y, evt.getMouseX(), evt.getMouseY());
-            if (button.isMouseOver(evt.getMouseX(), evt.getMouseY()) && button.tooltipLines != null)
-                button.renderTooltip(evt.getGuiGraphics(), evt.getMouseX(), evt.getMouseY());
-        }
+
+    private static ResourceLocation vanillaIcon(String path) {
+        return ResourceLocation.fromNamespaceAndPath("minecraft", path);
     }
-    
-    public static List<Button> renderCustomisationButtons(ScreenEvent.Render.Post evt, CustomBuilding customBuilding, int x, int y) {
-        int origX = x;
-        int origY = y;
-        ArrayList<Button> buttonsCol1 = new ArrayList<>();
-        ArrayList<Button> buttonsCol2 = new ArrayList<>();
-        
-        buttonsCol1.add(new BooleanButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_buildable_by_villagers.label"), customBuilding.buildableByVillagers,
-            () -> {
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_BUILDABLE_BY_VILLAGERS, customBuilding.name, !customBuilding.buildableByVillagers);
-                customBuilding.buildableByVillagers = !customBuilding.buildableByVillagers;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_buildable_by_villagers.tooltip1")
-        ));
-        buttonsCol1.add(new BooleanButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_buildable_by_monsters.label"), customBuilding.buildableByMonsters,
-            () -> {
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_BUILDABLE_BY_MONSTERS, customBuilding.name, !customBuilding.buildableByMonsters);
-                customBuilding.buildableByMonsters = !customBuilding.buildableByMonsters;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_buildable_by_monsters.tooltip1")
-        ));
-        buttonsCol1.add(new BooleanButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_buildable_by_piglins.label"), customBuilding.buildableByPiglins,
-            () -> {
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_BUILDABLE_BY_PIGLINS, customBuilding.name, !customBuilding.buildableByPiglins);
-                customBuilding.buildableByPiglins = !customBuilding.buildableByPiglins;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_buildable_by_piglins.tooltip1")
-        ));
-        buttonsCol1.add(new BooleanButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_nether_terrain_only.label"), customBuilding.netherTerrainOnly,
-            () -> {
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_NETHER_TERRAIN_ONLY, customBuilding.name, !customBuilding.netherTerrainOnly);
-                customBuilding.netherTerrainOnly = !customBuilding.netherTerrainOnly;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_nether_terrain_only.tooltip1")
-        ));
-        
-        Button setFoodCostButton = new IntegerButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_food_cost.label") + ": " + customBuilding.cost.food,
-            () -> {
-                int value = Math.min(10000, customBuilding.cost.food + (Keybindings.shiftMod.isDown() ? 100 : 5));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_FOOD_COST, customBuilding.name, value);
-                customBuilding.cost.food = value;
-            },
-            () -> {
-                int value = Math.max(0, customBuilding.cost.food - (Keybindings.shiftMod.isDown() ? 100 : 5));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_FOOD_COST, customBuilding.name, value);
-                customBuilding.cost.food = value;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_food_cost.tooltip1", customBuilding.cost.food * NEUTRAL_BUILDING_BOUNTY_PERCENT)
-        );
-        setFoodCostButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/wheat.png");
-        buttonsCol1.add(setFoodCostButton);
-        
-        Button setWoodCostButton = new IntegerButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_wood_cost.label") + ": " + customBuilding.cost.wood,
-            () -> {
-                int value = Math.min(10000, customBuilding.cost.wood + (Keybindings.shiftMod.isDown() ? 100 : 5));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_WOOD_COST, customBuilding.name, value);
-                customBuilding.cost.wood = value;
-            },
-            () -> {
-                int value = Math.max(0, customBuilding.cost.wood - (Keybindings.shiftMod.isDown() ? 100 : 5));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_WOOD_COST, customBuilding.name, value);
-                customBuilding.cost.wood = value;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_wood_cost.tooltip1", customBuilding.cost.wood * NEUTRAL_BUILDING_BOUNTY_PERCENT)
-        );
-        setWoodCostButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/wood.png");
-        buttonsCol1.add(setWoodCostButton);
-        
-        Button setOreCostButton = new IntegerButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_ore_cost.label") + ": " + customBuilding.cost.ore,
-            () -> {
-                int value = Math.min(10000, customBuilding.cost.ore + (Keybindings.shiftMod.isDown() ? 100 : 5));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_ORE_COST, customBuilding.name, value);
-                customBuilding.cost.ore = value;
-            },
-            () -> {
-                int value = Math.max(0, customBuilding.cost.ore - (Keybindings.shiftMod.isDown() ? 100 : 5));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_ORE_COST, customBuilding.name, value);
-                customBuilding.cost.ore = value;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_ore_cost.tooltip1", customBuilding.cost.ore * NEUTRAL_BUILDING_BOUNTY_PERCENT)
-        );
-        setOreCostButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/iron_ore.png");
-        buttonsCol1.add(setOreCostButton);
 
-        Button setMaxHealthButton = new IntegerButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_max_health.label") + ": " + (int) customBuilding.maxHealth,
-            () -> {
-                if (Keybindings.ctrlMod.isDown()) {
-                    customBuilding.setToDefaultMaxHealth();
-                    CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_MAX_HEALTH, customBuilding.name, (int) customBuilding.maxHealth);
-                } else {
-                    int value = Math.min(10000, (int) customBuilding.maxHealth + (Keybindings.shiftMod.isDown() ? 100 : 5));
-                    value = (int) (Math.round((double) value / 5.0d) * 5);
-                    CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_MAX_HEALTH, customBuilding.name, value);
-                    customBuilding.maxHealth = value;
-                }
-            },
-            () -> {
-                if (Keybindings.ctrlMod.isDown()) {
-                    customBuilding.setToDefaultMaxHealth();
-                    CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_MAX_HEALTH, customBuilding.name, (int) customBuilding.maxHealth);
-                } else {
-                    int value = Math.max(5, (int) customBuilding.maxHealth - (Keybindings.shiftMod.isDown() ? 100 : 5));
-                    value = (int) (Math.round((double) value / 5.0d) * 5);
-                    CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_MAX_HEALTH, customBuilding.name, value);
-                    customBuilding.maxHealth = value;
-                }
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_max_health.tooltip1")
-        );
-        setMaxHealthButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/heart.png");
-        buttonsCol1.add(setMaxHealthButton);
+    /** Lists are edited in the world: the [?] button's tooltip explains how. */
+    private static Tooltip guideTooltip(String key) {
+        return Tooltip.of(I18n.get(KEY + key + ".label")).body(I18n.get(KEY + key + ".hint1")).body(I18n.get(KEY + key + ".hint2"));
+    }
 
-        Button trainableUnitsButton = new IntegerButton(
-                I18n.get("sandbox.reignofnether.custom_buildings.trainable_units.label") + ": " + customBuilding.productions.get().size(),
-                () -> {
-                    if (MC.player != null) {
-                        MC.player.sendSystemMessage(Component.literal(""));
-                        MC.player.sendSystemMessage(Component.translatable("sandbox.reignofnether.custom_buildings.trainable_units.hint1"));
-                        MC.player.sendSystemMessage(Component.literal(""));
-                        MC.player.sendSystemMessage(Component.translatable("sandbox.reignofnether.custom_buildings.trainable_units.hint2"));
-                    }
-                },
-                null,
-                getTrainableUnitsTooltips(customBuilding)
-        );
-        trainableUnitsButton.iconResource = ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/fletching_table_front.png");
-        buttonsCol1.add(trainableUnitsButton);
+    private static Row toggle(CustomBuilding b, String key, CustomBuildingAction action, BooleanSupplier get, Consumer<Boolean> set) {
+        String label = I18n.get(KEY + key + ".label");
+        return (f, x, y, w) -> EditorRows.toggle(f, label, EditorRows.tip(label, I18n.get(KEY + key + ".tooltip1")), get.getAsBoolean(), () -> {
+            CustomBuildingServerboundPacket.customiseBuilding(action, b.name, !get.getAsBoolean());
+            set.accept(!get.getAsBoolean());
+        }, x, y, w);
+    }
 
-        Button buyableItemsButton = new IntegerButton(
-                I18n.get("sandbox.reignofnether.custom_buildings.buyable_items.label") + ": " + customBuilding.stockedItems.size(),
-                () -> {
-                    if (MC.player != null) {
-                        MC.player.sendSystemMessage(Component.literal(""));
-                        MC.player.sendSystemMessage(Component.translatable("sandbox.reignofnether.custom_buildings.buyable_items.hint1"));
-                        MC.player.sendSystemMessage(Component.literal(""));
-                        MC.player.sendSystemMessage(Component.translatable("sandbox.reignofnether.custom_buildings.buyable_items.hint2"));
-                    }
-                },
-                null,
-                List.of(
-                    fcs(I18n.get("sandbox.reignofnether.custom_buildings.buyable_items.tooltip1"))
-                )
-        );
-        buyableItemsButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/item/heart_medallion.png");
-        buttonsCol1.add(buyableItemsButton);
+    /** Left click (or ▶) adds small, or big with shift; right click (or ◀) takes it away, within [min, max]. */
+    private static Row number(CustomBuilding b, String key, ResourceLocation icon, CustomBuildingAction action, IntSupplier get, IntConsumer set,
+                              int min, int max, int small, int big, Supplier<Tooltip> tooltip) {
+        String label = I18n.get(KEY + key + ".label");
+        Supplier<Tooltip> tip = tooltip != null ? tooltip : EditorRows.tip(label, I18n.get(KEY + key + ".tooltip1"));
+        return (f, x, y, w) -> EditorRows.stepper(f, icon, label, tip, String.valueOf(get.getAsInt()), null,
+            () -> step(b, action, get, set, max, small, big, 1),
+            () -> step(b, action, get, set, min, small, big, -1), x, y, w);
+    }
 
-        buttonsCol2.add(new BooleanButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_capturable.label"), customBuilding.capturable,
-            () -> {
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_CAPTURABLE, customBuilding.name, !customBuilding.capturable);
-                customBuilding.capturable = !customBuilding.capturable;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_capturable.tooltip1")
-        ));
-        buttonsCol2.add(new BooleanButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_invulnerable.label"), customBuilding.invulnerable,
-            () -> {
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_INVULNERABLE, customBuilding.name, !customBuilding.invulnerable);
-                customBuilding.invulnerable = !customBuilding.invulnerable;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_invulnerable.tooltip1")
-        ));
-        buttonsCol2.add(new BooleanButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_repairable.label"), customBuilding.repairable,
-            () -> {
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_REPAIRABLE, customBuilding.name, !customBuilding.repairable);
-                customBuilding.repairable = !customBuilding.repairable;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_repairable.tooltip1")
-        ));
-        buttonsCol2.add(new BooleanButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_destroy_on_reset.label"), customBuilding.shouldDestroyOnReset,
-            () -> {
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_DESTROY_ON_RESET, customBuilding.name, !customBuilding.shouldDestroyOnReset);
-                customBuilding.shouldDestroyOnReset = !customBuilding.shouldDestroyOnReset;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_destroy_on_reset.tooltip1")
-        ));
-        buttonsCol2.add(new BooleanButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_draw_aggro.label"), customBuilding.drawAggro,
-            () -> {
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_DRAW_AGGRO, customBuilding.name, !customBuilding.drawAggro);
-                customBuilding.drawAggro = !customBuilding.drawAggro;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_draw_aggro.tooltip1")
-        ));
+    private static void step(CustomBuilding b, CustomBuildingAction action, IntSupplier get, IntConsumer set,
+                             int limit, int small, int big, int sign) {
+        int delta = Keybindings.shiftMod.isDown() ? big : small;
+        int value = sign > 0 ? Math.min(limit, get.getAsInt() + delta) : Math.max(limit, get.getAsInt() - delta);
+        CustomBuildingServerboundPacket.customiseBuilding(action, b.name, value);
+        set.accept(value);
+    }
 
-        Button setPopulationButton = new IntegerButton(
-                I18n.get("sandbox.reignofnether.custom_buildings.set_pop_supply.label") + ": " + customBuilding.cost.population,
-                () -> {
-                    int value = Math.min(300, customBuilding.cost.population + (Keybindings.shiftMod.isDown() ? 10 : 1));
-                    CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_POPULATION_SUPPLY, customBuilding.name, value);
-                    customBuilding.cost.population = value;
-                },
-                () -> {
-                    int value = Math.max(0, customBuilding.cost.population - (Keybindings.shiftMod.isDown() ? 10 : 1));
-                    CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_POPULATION_SUPPLY, customBuilding.name, value);
-                    customBuilding.cost.population = value;
-                },
-                I18n.get("sandbox.reignofnether.custom_buildings.set_pop_supply.tooltip1")
-        );
-        setPopulationButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/bed.png");
-        buttonsCol2.add(setPopulationButton);
+    /** Max health steps in fives; ctrl+click resets it to the default for the building's size. */
+    private static Row maxHealth(CustomBuilding b) {
+        String label = I18n.get(KEY + "set_max_health.label");
+        return (f, x, y, w) -> EditorRows.stepper(f, modIcon("textures/icons/items/heart.png"), label, EditorRows.tip(label, I18n.get(KEY + "set_max_health.tooltip1")),
+            String.valueOf((int) b.maxHealth), null, () -> stepMaxHealth(b, 1), () -> stepMaxHealth(b, -1), x, y, w);
+    }
 
-        Button setNightRadiusButton = new IntegerButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_night_radius.label") + ": " + customBuilding.nightRadius,
-            () -> {
-                int value = Math.min(200, customBuilding.nightRadius + (Keybindings.shiftMod.isDown() ? 10 : 1));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_NIGHT_RADIUS, customBuilding.name, value);
-                customBuilding.nightRadius = value;
-            },
-            () -> {
-                int value = Math.max(0, customBuilding.nightRadius - (Keybindings.shiftMod.isDown() ? 10 : 1));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_NIGHT_RADIUS, customBuilding.name, value);
-                customBuilding.nightRadius = value;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_night_radius.tooltip1")
-        );
-        setNightRadiusButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/moon.png");
-        buttonsCol2.add(setNightRadiusButton);
-        
-        Button setNetherRadiusButton = new IntegerButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_nether_radius.label") + ": " + customBuilding.netherRadius,
-            () -> {
-                int value = Math.min(200, customBuilding.netherRadius + (Keybindings.shiftMod.isDown() ? 10 : 1));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_NETHER_RADIUS, customBuilding.name, value);
-                customBuilding.netherRadius = value;
-            },
-            () -> {
-                int value = Math.max(0, customBuilding.netherRadius - (Keybindings.shiftMod.isDown() ? 10 : 1));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_NETHER_RADIUS, customBuilding.name, value);
-                customBuilding.netherRadius = value;
-            },
-            I18n.get("sandbox.reignofnether.custom_buildings.set_nether_radius.tooltip1")
-        );
-        setNetherRadiusButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/portal.png");
-        buttonsCol2.add(setNetherRadiusButton);
-        
-        Button setGarrisonCapacityButton = new IntegerButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_garrison_capacity.label") + ": " + customBuilding.garrisonCapacity,
-            () -> {
-                int value = Math.min(100, customBuilding.garrisonCapacity + (Keybindings.shiftMod.isDown() ? 10 : 1));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_GARRISON_CAPACITY, customBuilding.name, value);
-                customBuilding.garrisonCapacity = value;
-            },
-            () -> {
-                int value = Math.max(0, customBuilding.garrisonCapacity - (Keybindings.shiftMod.isDown() ? 10 : 1));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_GARRISON_CAPACITY, customBuilding.name, value);
-                customBuilding.garrisonCapacity = value;
-            },
-            getGarrisonTooltips(customBuilding, I18n.get("sandbox.reignofnether.custom_buildings.set_garrison_capacity.tooltip1"))
-        );
-        setGarrisonCapacityButton.iconResource = ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/ladder.png");
-        buttonsCol2.add(setGarrisonCapacityButton);
-        
-        Button setGarrisonBonusRangeButton = new IntegerButton(
-            I18n.get("sandbox.reignofnether.custom_buildings.set_garrison_range.label") + ": " + customBuilding.garrisonRange,
-            () -> {
-                int value = Math.min(100, customBuilding.garrisonRange + (Keybindings.shiftMod.isDown() ? 10 : 1));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_GARRISON_RANGE, customBuilding.name, value);
-                customBuilding.garrisonRange = value;
-            },
-            () -> {
-                int value = Math.max(0, customBuilding.garrisonRange - (Keybindings.shiftMod.isDown() ? 10 : 1));
-                CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_GARRISON_RANGE, customBuilding.name, value);
-                customBuilding.garrisonRange = value;
-            },
-            getGarrisonTooltips(customBuilding, I18n.get("sandbox.reignofnether.custom_buildings.set_garrison_range.tooltip1"))
-        );
-        setGarrisonBonusRangeButton.iconResource = ResourceLocation.fromNamespaceAndPath("minecraft", "textures/item/bow.png");
-        buttonsCol2.add(setGarrisonBonusRangeButton);
-        
-        for (Button button : buttonsCol1) {
-            renderButton(button, x, y, evt);
-            y += 18;
-        }
-        x += 148;
-        y = origY;
-        for (Button button : buttonsCol2) {
-            renderButton(button, x, y, evt);
-            y += 18;
+    private static void stepMaxHealth(CustomBuilding b, int sign) {
+        if (Keybindings.ctrlMod.isDown()) {
+            b.setToDefaultMaxHealth();
+            CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_MAX_HEALTH, b.name, (int) b.maxHealth);
+        } else {
+            int delta = Keybindings.shiftMod.isDown() ? 100 : 5;
+            int value = sign > 0 ? Math.min(10000, (int) b.maxHealth + delta) : Math.max(5, (int) b.maxHealth - delta);
+            value = (int) (Math.round((double) value / 5.0d) * 5);
+            CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_MAX_HEALTH, b.name, value);
+            b.maxHealth = value;
         }
-        buttonsCol1.addAll(buttonsCol2);
-        return buttonsCol1;
     }
 
-    private static List<FormattedCharSequence> getGarrisonTooltips(CustomBuilding customBuilding, String originalTooltip) {
-        ArrayList<FormattedCharSequence> tooltips = new ArrayList<>();
-        tooltips.add(fcs(originalTooltip));
-        if (customBuilding.numGarrisonZones <= 0) {
-            tooltips.add(fcsIcons(I18n.get("sandbox.reignofnether.custom_buildings.garrison_warning.no_zones")));
-        } else if (customBuilding.numGarrisonEntries <= 0) {
-            tooltips.add(fcsIcons(I18n.get("sandbox.reignofnether.custom_buildings.garrison_warning.no_entry")));
-        } else if (customBuilding.numGarrisonEntries > 1) {
-            tooltips.add(fcsIcons(I18n.get("sandbox.reignofnether.custom_buildings.garrison_warning.multiple_entries")));
-        }
-        if (customBuilding.numGarrisonExits <= 0) {
-            tooltips.add(fcsIcons(I18n.get("sandbox.reignofnether.custom_buildings.garrison_warning.no_exit")));
-        } else if (customBuilding.numGarrisonExits > 1) {
-            tooltips.add(fcsIcons(I18n.get("sandbox.reignofnether.custom_buildings.garrison_warning.multiple_exits")));
-        }
-        return tooltips;
+    private static Supplier<Tooltip> garrisonTooltip(CustomBuilding customBuilding, String key) {
+        return () -> {
+            Tooltip t = Tooltip.of(I18n.get(KEY + key + ".label")).body(I18n.get(KEY + key + ".tooltip1"));
+            if (customBuilding.numGarrisonZones <= 0) {
+                t.body(fcsIcons(I18n.get(KEY + "garrison_warning.no_zones")));
+            } else if (customBuilding.numGarrisonEntries <= 0) {
+                t.body(fcsIcons(I18n.get(KEY + "garrison_warning.no_entry")));
+            } else if (customBuilding.numGarrisonEntries > 1) {
+                t.body(fcsIcons(I18n.get(KEY + "garrison_warning.multiple_entries")));
+            }
+            if (customBuilding.numGarrisonExits <= 0) {
+                t.body(fcsIcons(I18n.get(KEY + "garrison_warning.no_exit")));
+            } else if (customBuilding.numGarrisonExits > 1) {
+                t.body(fcsIcons(I18n.get(KEY + "garrison_warning.multiple_exits")));
+            }
+            return t;
+        };
     }
 
-    private static List<FormattedCharSequence> getTrainableUnitsTooltips(CustomBuilding customBuilding) {
-        ArrayList<FormattedCharSequence> tooltips = new ArrayList<>();
-        tooltips.add(fcs(I18n.get("sandbox.reignofnether.custom_buildings.trainable_units.tooltip1")));
-        if (customBuilding.numSpawnBlocks <= 0) {
-            tooltips.add(fcsIcons(I18n.get("sandbox.reignofnether.custom_buildings.trainable_units.no_spawn_block")));
-        } else if (customBuilding.numSpawnBlocks > 1) {
-            tooltips.add(fcsIcons(I18n.get("sandbox.reignofnether.custom_buildings.trainable_units.multiple_spawn_blocks")));
-        }
-        return tooltips;
+    private static Supplier<Tooltip> trainableUnitsTooltip(CustomBuilding customBuilding) {
+        return () -> {
+            Tooltip t = guideTooltip("trainable_units");
+            if (customBuilding.numSpawnBlocks <= 0) {
+                t.body(fcsIcons(I18n.get(KEY + "trainable_units.no_spawn_block")));
+            } else if (customBuilding.numSpawnBlocks > 1) {
+                t.body(fcsIcons(I18n.get(KEY + "trainable_units.multiple_spawn_blocks")));
+            }
+            return t;
+        };
     }
-    
+
+    // ---------------------------------------------------------------- commands tab
+
     private static final int MAX_COMMANDS = 50;
-    private static final int COMMAND_ROW_HEIGHT = 16;
-    private static final int EDIT_BOX_HEIGHT = 12;
-    private static final int CONDITION_BUTTON_WIDTH = 32;
-    private static final int TEXT_EDIT_BOX_WIDTH = 180;
-    private static final int COOLDOWN_EDIT_BOX_WIDTH = 40;
-    
+    private static final int EDIT_BOX_HEIGHT = 9;
+    private static final int COOLDOWN_FIELD_W = 60;
+    private static final int COMMAND_ROW_H = 26;
+    private static final int COMMAND_CONTROL = 18; // delete and warning, right of the fields
+    private static final int GUIDE_BUTTON_W = 13;
+
     // how many command rows are visible in the scrollable viewport at once
     private static final int VISIBLE_COMMAND_ROWS = 10;
     private static final int SCROLLBAR_WIDTH = 6;
-    // gap between the delete-command button column and the scrollbar
-    private static final int SCROLLBAR_X_OFFSET = COOLDOWN_EDIT_BOX_WIDTH + TEXT_EDIT_BOX_WIDTH + 80;
-    
+
     // index of the first command row currently visible (i.e. scroll position)
     private static int commandScrollOffset = 0;
-    
+
+    // one per visible row; the cooldown list holds null for rows without a cooldown trigger
     private static final ArrayList<MyEditBox> commandEditBoxes = new ArrayList<>();
     private static final ArrayList<MyEditBox> commandCooldownEditBoxes = new ArrayList<>();
     private static boolean commandEditBoxesDirty = true;
-    
+
     private static int maxCommandScrollOffset(int totalCommands) {
         return Math.max(0, totalCommands - VISIBLE_COMMAND_ROWS);
     }
-    
+
     private static void clampCommandScrollOffset(int totalCommands) {
         commandScrollOffset = Math.min(Math.max(commandScrollOffset, 0), maxCommandScrollOffset(totalCommands));
     }
-    
+
     /** Scroll the commands list by the given number of rows (positive = down, negative = up). Clamped to bounds. */
     public static void scrollCommands(int rows) {
         CustomBuilding building = getCustomBuildingToEdit();
@@ -529,24 +315,23 @@ public static void scrollCommands(int rows) {
         clampCommandScrollOffset(total);
         forceRefreshCommandEditBoxes();
     }
-    
+
     /** Tear down all currently-registered EditBoxes and rebuild them for the currently visible rows only. */
-    private static void registerCommandEditBoxes(CustomBuilding customBuilding, int x, int y) {
+    private static void registerCommandEditBoxes(CustomBuilding customBuilding) {
         forceRefreshCommandEditBoxes();
-        
+
         clampCommandScrollOffset(customBuilding.commands.size());
-        
-        int editBoxX = x + CONDITION_BUTTON_WIDTH;
-        
+
         int firstVisible = commandScrollOffset;
         int lastVisibleExclusive = Math.min(customBuilding.commands.size(), commandScrollOffset + VISIBLE_COMMAND_ROWS);
-        
+
+        // positions are set every frame by EditorRows.field
         for (int i = firstVisible; i < lastVisibleExclusive; i++) {
             final int idx = i;
-            int rowY = y + (i - firstVisible) * (COMMAND_ROW_HEIGHT + 2) + (COMMAND_ROW_HEIGHT - EDIT_BOX_HEIGHT) / 2;
             BuildingCommand cmd = customBuilding.commands.get(idx);
-            
-            MyEditBox textBox = new MyEditBox.Builder(editBoxX, rowY, TEXT_EDIT_BOX_WIDTH, EDIT_BOX_HEIGHT)
+
+            MyEditBox textBox = new MyEditBox.Builder(0, 0, 100, EDIT_BOX_HEIGHT)
+                .bordered(false)
                 .maxLength(256)
                 .value(cmd.commandStr)
                 .onDefocus(value -> {
@@ -559,9 +344,11 @@ private static void registerCommandEditBoxes(CustomBuilding customBuilding, int
                 })
                 .commandSuggestions(true)
                 .build();
-            
+
+            MyEditBox cdBox = null;
             if (cmd.hasCooldownCondition()) {
-                MyEditBox cdBox = new MyEditBox.Builder(editBoxX + TEXT_EDIT_BOX_WIDTH + 5, rowY, COOLDOWN_EDIT_BOX_WIDTH, EDIT_BOX_HEIGHT)
+                cdBox = new MyEditBox.Builder(0, 0, 30, EDIT_BOX_HEIGHT)
+                    .bordered(false)
                     .maxLength(5)
                     .value(String.valueOf(cmd.tickCooldownMax))
                     .isNumber(true)
@@ -574,19 +361,19 @@ private static void registerCommandEditBoxes(CustomBuilding customBuilding, int
                             CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_COMMAND_COOLDOWN, customBuilding.name, idx, "100");
                         }
                     })
-                    .tooltipLines(List.of(fcs(I18n.get("sandbox.reignofnether.custom_buildings.commands.cooldown"))))
+                    .tooltipLines(List.of(fcs(I18n.get(KEY + "commands.cooldown"))))
                     .build();
                 TextInputClientEvents.registerEditBox(cdBox);
-                commandCooldownEditBoxes.add(cdBox);
             }
-            
+            commandCooldownEditBoxes.add(cdBox);
+
             TextInputClientEvents.registerEditBox(textBox);
             commandEditBoxes.add(textBox);
         }
-        
+
         commandEditBoxesDirty = false;
     }
-    
+
     // run this to force a rebuild on the next render frame
     public static void forceRefreshCommandEditBoxes() {
         for (MyEditBox box : commandEditBoxes)
@@ -597,26 +384,28 @@ public static void forceRefreshCommandEditBoxes() {
         commandCooldownEditBoxes.clear();
         commandEditBoxesDirty = true;
     }
-    
-    
-    public static List<Button> renderCommandsButtonsAndInputs(ScreenEvent.Render.Post evt, CustomBuilding customBuilding, int x, int y) {
-        ArrayList<Button> buttons = new ArrayList<>();
-        
+
+    /** Each row: trigger cell (click cycles, right click goes back), command text, cooldown, warning and delete. */
+    private static void renderCommands(HudFrame f, CustomBuilding customBuilding, int x, int y) {
         BuildingCommand.TriggerCondition[] conditions = BuildingCommand.TriggerCondition.values();
-        
+
         clampCommandScrollOffset(customBuilding.commands.size());
-        
+
         if (!customBuilding.commands.isEmpty() && commandEditBoxesDirty)
-            registerCommandEditBoxes(customBuilding, x, y);
-        
+            registerCommandEditBoxes(customBuilding);
+
+        int rowH = COMMAND_ROW_H;
+        int cell = rowH - 2;
         int firstVisible = commandScrollOffset;
         int lastVisibleExclusive = Math.min(customBuilding.commands.size(), commandScrollOffset + VISIBLE_COMMAND_ROWS);
-        
+        int right = x + COMMANDS_W - SCROLLBAR_WIDTH - 4;
+
         for (int i = firstVisible; i < lastVisibleExclusive; i++) {
             final int idx = i;
             BuildingCommand cmd = customBuilding.commands.get(idx);
-            int rowY = y + (i - firstVisible) * (COMMAND_ROW_HEIGHT + 2);
-            
+            int rowY = y + (i - firstVisible) * rowH;
+            f.g.fill(x, rowY + rowH - 1, right, rowY + rowH, Theme.RAISED);
+
             ResourceLocation condRl = switch (cmd.condition) {
                 case ON_BUILD_COMPLETE          -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/item/iron_pickaxe.png");
                 case ON_DESTROY                 -> ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/tnt.png");
@@ -629,19 +418,9 @@ public static List<Button> renderCommandsButtonsAndInputs(ScreenEvent.Render.Pos
                 case NONE                       -> null;
             };
             ResourceLocation bgRl = ResourceLocation.fromNamespaceAndPath("minecraft", "textures/item/nether_star.png");
-            
-            String tooltip = switch (cmd.condition) {
-                case ON_BUILD_COMPLETE          -> I18n.get("sandbox.reignofnether.custom_buildings.commands.trigger.on_build_complete");
-                case ON_DESTROY                 -> I18n.get("sandbox.reignofnether.custom_buildings.commands.trigger.on_destroy");
-                case ON_DAMAGE_TAKEN            -> I18n.get("sandbox.reignofnether.custom_buildings.commands.trigger.on_damage_taken");
-                case ON_CAPTURE                 -> I18n.get("sandbox.reignofnether.custom_buildings.commands.trigger.on_capture");
-                case OFF_COOLDOWN_IF_COMPLETE   -> I18n.get("sandbox.reignofnether.custom_buildings.commands.trigger.off_cooldown_if_complete");
-                case OFF_COOLDOWN_IF_GARRISONED -> I18n.get("sandbox.reignofnether.custom_buildings.commands.trigger.off_cooldown_if_garrisoned");
-                case OFF_COOLDOWN_IF_CAPTURED   -> I18n.get("sandbox.reignofnether.custom_buildings.commands.trigger.off_cooldown_if_captured");
-                case ON_SCENARIO_START          -> I18n.get("sandbox.reignofnether.custom_buildings.commands.trigger.on_scenario_start");
-                case NONE                       -> I18n.get("sandbox.reignofnether.custom_buildings.commands.trigger.none");
-            };
-            
+
+            String tooltip = I18n.get(KEY + "commands.trigger." + cmd.condition.name().toLowerCase(java.util.Locale.ROOT));
+
             Button condButton = new ButtonBuilder("Cycle Trigger Condition " + idx)
                 .iconResource(condRl)
                 .bgIconResource(cmd.condition == BuildingCommand.TriggerCondition.OFF_COOLDOWN_IF_CAPTURED ? bgRl : null)
@@ -657,72 +436,61 @@ public static List<Button> renderCommandsButtonsAndInputs(ScreenEvent.Render.Pos
                     CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.SET_COMMAND_TRIGGER, customBuilding.name, idx, cmd.condition.name());
                     forceRefreshCommandEditBoxes();
                 })
-                .tooltipLines(List.of(
-                    fcs(tooltip)
-                ))
-                .iconSize(10)
+                .tooltipLines(List.of(fcs(tooltip)))
                 .build();
-            renderButton(condButton, x + 6, rowY - 3, evt);
-            buttons.add(condButton);
-            
-            ArrayList<FormattedCharSequence> exceptions = new ArrayList<>();
-            exceptions.add(fcs(I18n.get("sandbox.reignofnether.custom_buildings.commands.invalid"), true));
-            for (CommandSyntaxException exception : cmd.getExceptions().values())
-                exceptions.add(fcs(exception.getMessage()));
-            Button validIndicator = new ButtonBuilder("Validity " + idx)
-                .iconResource(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/warning.png"))
-                .tooltipLines(exceptions)
-                .isHidden(cmd::isValid)
-                .iconSize(10)
-                .build();
-            validIndicator.frameResource = null;
-            renderButton(validIndicator, x + COOLDOWN_EDIT_BOX_WIDTH + TEXT_EDIT_BOX_WIDTH + 40, rowY - 3, evt);
-            buttons.add(validIndicator);
-            
-            Button deleteButton = new ButtonBuilder("Delete Command " + idx)
-                .iconResource(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/cross.png"))
+            f.cell(condButton, x, rowY + 1, cell, null);
+
+            // delete, then the warning, then the cooldown field from the right
+            Rect delete = new Rect(right - COMMAND_CONTROL, rowY + (rowH - COMMAND_CONTROL) / 2, COMMAND_CONTROL, COMMAND_CONTROL);
+            Theme.secondaryButton(f.g, delete.x(), delete.y(), delete.w(), delete.h(), f.hovered(delete));
+            Theme.cross(f.g, delete, f.hovered(delete) ? Theme.ERROR : Theme.BODY);
+            f.register(new ButtonBuilder("Delete Command " + idx)
                 .onLeftClick(() -> {
                     customBuilding.commands.remove(idx);
                     CustomBuildingServerboundPacket.customiseBuilding(CustomBuildingAction.DELETE_COMMAND, customBuilding.name, idx);
                     forceRefreshCommandEditBoxes();
-                })
-                .tooltipLines(List.of(
-                    fcs(I18n.get("sandbox.reignofnether.custom_buildings.commands.delete"))
-                ))
-                .iconSize(10)
-                .build();
-            deleteButton.frameResource = null;
-            renderButton(deleteButton, x + COOLDOWN_EDIT_BOX_WIDTH + TEXT_EDIT_BOX_WIDTH + 60, rowY - 3, evt);
-            buttons.add(deleteButton);
+                }).build(), delete, null, EditorRows.tip(I18n.get(KEY + "commands.delete"), null));
+
+            Rect warning = new Rect(delete.x() - COMMAND_CONTROL - 2, delete.y(), COMMAND_CONTROL, COMMAND_CONTROL);
+            if (!cmd.isValid()) {
+                f.g.blit(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/warning.png"),
+                    warning.x() + 1, warning.y() + 1, 0, 0, COMMAND_CONTROL - 2, COMMAND_CONTROL - 2, COMMAND_CONTROL - 2, COMMAND_CONTROL - 2);
+                f.register(new ButtonBuilder("Validity " + idx).build(), warning, null, () -> {
+                    Tooltip t = Tooltip.of(I18n.get(KEY + "commands.invalid")).danger();
+                    for (CommandSyntaxException exception : cmd.getExceptions().values())
+                        t.body(String.valueOf(exception.getMessage()));
+                    return t;
+                });
+            }
+
+            int fieldH = rowH - 4;
+            int textX = x + cell + 4;
+            int cooldownX = warning.x() - 4 - COOLDOWN_FIELD_W;
+            int visible = i - firstVisible;
+            MyEditBox cdBox = visible < commandCooldownEditBoxes.size() ? commandCooldownEditBoxes.get(visible) : null;
+            int textRight = cdBox != null ? cooldownX - 4 : warning.x() - 4;
+            if (visible < commandEditBoxes.size())
+                EditorRows.field(f, commandEditBoxes.get(visible), new Rect(textX, rowY + 2, textRight - textX, fieldH));
+            if (cdBox != null)
+                EditorRows.field(f, cdBox, new Rect(cooldownX, rowY + 2, COOLDOWN_FIELD_W, fieldH));
         }
-        
-        buttons.addAll(renderCommandsScrollbar(evt, customBuilding, x, y));
-        
-        return buttons;
+
+        renderCommandsScrollbar(f, customBuilding, x + COMMANDS_W - SCROLLBAR_WIDTH, y, rowH);
     }
-    
-    private static List<Button> renderCommandsScrollbar(ScreenEvent.Render.Post evt, CustomBuilding customBuilding, int x, int y) {
-        ArrayList<Button> buttons = new ArrayList<>();
-        
+
+    private static void renderCommandsScrollbar(HudFrame f, CustomBuilding customBuilding, int x, int y, int rowH) {
         int total = customBuilding.commands.size();
-        int viewportHeight = VISIBLE_COMMAND_ROWS * (COMMAND_ROW_HEIGHT + 2);
-        int scrollbarX = x + SCROLLBAR_X_OFFSET;
-        
         // only show scroll controls once there are more commands than fit in the viewport
-        if (total <= VISIBLE_COMMAND_ROWS) {
-            return buttons;
-        }
-        
-        int trackY = y;
-        int trackHeight = viewportHeight;
-        evt.getGuiGraphics().fill(scrollbarX, trackY, scrollbarX + SCROLLBAR_WIDTH, trackY + trackHeight, 0x40000000);
-        
+        if (total <= VISIBLE_COMMAND_ROWS)
+            return;
+
+        int trackHeight = VISIBLE_COMMAND_ROWS * rowH;
+        f.g.fill(x, y, x + SCROLLBAR_WIDTH, y + trackHeight, Theme.INK);
+
         int maxOffset = maxCommandScrollOffset(total);
         int thumbHeight = Math.max(8, trackHeight * VISIBLE_COMMAND_ROWS / total);
         int thumbTravel = trackHeight - thumbHeight;
-        int thumbY = trackY + (maxOffset == 0 ? 0 : thumbTravel * commandScrollOffset / maxOffset);
-        evt.getGuiGraphics().fill(scrollbarX, thumbY, scrollbarX + SCROLLBAR_WIDTH, thumbY + thumbHeight, 0xFFAAAAAA);
-        
-        return buttons;
+        int thumbY = y + (maxOffset == 0 ? 0 : thumbTravel * commandScrollOffset / maxOffset);
+        f.g.fill(x, thumbY, x + SCROLLBAR_WIDTH, thumbY + thumbHeight, Theme.LABEL);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/solegendary/reignofnether/building/production/ProductionItemList.java b/src/main/java/com/solegendary/reignofnether/building/production/ProductionItemList.java
index 9eee98666..65e9d7d96 100644
--- a/src/main/java/com/solegendary/reignofnether/building/production/ProductionItemList.java
+++ b/src/main/java/com/solegendary/reignofnether/building/production/ProductionItemList.java
@@ -27,8 +27,10 @@ public List<Button> getButtons(ProductionPlacement placement) {
         if (FMLEnvironment.dist == Dist.CLIENT) {
             for (Map.Entry<ProductionItem, Keybinding> production : productions.entrySet()) {
                 StartProductionButton button = production.getKey().getStartButton(placement, production.getValue());
-                if (button != null)
+                if (button != null) {
+                    button.cost = () -> production.getKey().getCost(true, placement.ownerName);
                     buttons.add(button);
+                }
             }
         }
         return buttons;
diff --git a/src/main/java/com/solegendary/reignofnether/building/production/StartProductionButton.java b/src/main/java/com/solegendary/reignofnether/building/production/StartProductionButton.java
index 4f039203b..467e16735 100644
--- a/src/main/java/com/solegendary/reignofnether/building/production/StartProductionButton.java
+++ b/src/main/java/com/solegendary/reignofnether/building/production/StartProductionButton.java
@@ -11,12 +11,15 @@
 import java.util.function.Supplier;
 
 public class StartProductionButton extends Button {
+   public final ProductionItem production;
+
    public StartProductionButton(String name, ResourceLocation rl, Keybinding hotkey,
                                 Supplier<Boolean> isHidden, Supplier<Boolean> isEnabled,
                                 List<FormattedCharSequence> tooltipLines, ProductionItem production) {
 
         // generate x/y based on given position (starting at 0 which is bottom left 1 row above generic action buttons)
         super(name, Button.itemIconSize, rl, hotkey, () -> false, isHidden, isEnabled, () -> BuildingProductionServerboundPacket.startProduction(production), () -> {}, tooltipLines);
+        this.production = production;
     }
 
     public StartProductionButton(String name, ResourceLocation iconRl, ResourceLocation frameRl, Keybinding hotkey,
@@ -25,5 +28,6 @@ public StartProductionButton(String name, ResourceLocation iconRl, ResourceLocat
 
         // generate x/y based on given position (starting at 0 which is bottom left 1 row above generic action buttons)
         super(name, Button.itemIconSize, iconRl, frameRl, hotkey, () -> false, isHidden, isEnabled, () -> BuildingProductionServerboundPacket.startProduction(production), () -> {}, tooltipLines);
+        this.production = production;
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/chat/ChatLines.java b/src/main/java/com/solegendary/reignofnether/chat/ChatLines.java
new file mode 100644
index 000000000..07aa9fd13
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/chat/ChatLines.java
@@ -0,0 +1,102 @@
+package com.solegendary.reignofnether.chat;
+
+import com.solegendary.reignofnether.chat.ChatLog.Entry;
+import com.solegendary.reignofnether.ui.Clip;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.util.FormattedCharSequence;
+import net.minecraft.world.entity.player.ChatVisiblity;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+
+/** Chat lines in HUD units, drawn exactly as vanilla chat formats them. */
+public final class ChatLines {
+
+    private ChatLines() { }
+
+    public static final int LINE_H = 11;
+    private static final int STRIP = 0x990B0A0F;
+    private static final long RECENT_MS = 10_000;
+    private static final long FADE_MS = 1_500;
+
+    // wrapping is per entry and width; entries never change once logged
+    private static final Map<Integer, Map<Entry, List<FormattedCharSequence>>> WRAPPED = new HashMap<>();
+
+    /**
+     * Scrollable log: the newest line sits on the bottom of area, older ones above, clipped to area.
+     *
+     * @param scroll lines scrolled up from the newest
+     * @return the total number of wrapped lines, to bound scroll
+     */
+    public static int render(GuiGraphics g, List<Entry> entries, Rect area, int scroll) {
+        List<FormattedCharSequence> lines = new ArrayList<>();
+        for (Entry e : entries)
+            lines.addAll(wrap(e, area.w()));
+        Clip.push(g, area.x(), area.y(), area.w(), area.h());
+        int y = area.bottom() - LINE_H;
+        // only whole lines: a half-cut line at the top reads as broken
+        for (int i = lines.size() - 1 - scroll; i >= 0 && y >= area.y(); i--, y -= LINE_H) {
+            drawLine(g, lines.get(i), area.x(), y, 1f);
+        }
+        Clip.pop(g);
+        return lines.size();
+    }
+
+    /** The last 4 lines of the past 10 s, each on a dark strip, stacked up from bottom and fading out. */
+    public static void renderRecent(GuiGraphics g, int x, int bottom, int maxW) {
+        if (Minecraft.getInstance().options.chatVisibility().get() == ChatVisiblity.HIDDEN)
+            return;
+        List<Entry> recent = ChatLog.recent(4, RECENT_MS);
+        int y = bottom;
+        for (int i = recent.size() - 1; i >= 0; i--) {
+            Entry e = recent.get(i);
+            float alpha = Math.min(1f, (RECENT_MS - e.age()) / (float) FADE_MS);
+            // vanilla text treats an almost-transparent colour as opaque
+            if (alpha < 0.05f)
+                continue;
+            List<FormattedCharSequence> wrapped = wrap(e, maxW - 10);
+            int textW = 0;
+            for (FormattedCharSequence s : wrapped)
+                textW = Math.max(textW, Theme.font().width(s));
+            int h = wrapped.size() * LINE_H + 3;
+            y -= h;
+            g.fill(x, y, x + textW + 10, y + h, Theme.withAlpha(STRIP, alpha));
+            for (int j = 0; j < wrapped.size(); j++)
+                drawLine(g, wrapped.get(j), x + 5, y + 3 + j * LINE_H, alpha);
+            y -= 2;
+        }
+    }
+
+    /** Wrapped lines without the blank lines some server messages pad themselves with ("\nText\n"). */
+    private static List<FormattedCharSequence> wrap(Entry e, int width) {
+        Map<Entry, List<FormattedCharSequence>> cache = WRAPPED.computeIfAbsent(width, w -> new IdentityHashMap<>());
+        if (cache.size() > 2 * ChatLog.MAX)
+            cache.clear(); // drop entries that fell out of the log
+        return cache.computeIfAbsent(e, k -> wrapUncached(e, width));
+    }
+
+    private static List<FormattedCharSequence> wrapUncached(Entry e, int width) {
+        List<FormattedCharSequence> lines = new ArrayList<>(Theme.font().split(e.line(), Math.max(20, width)));
+        while (!lines.isEmpty() && isBlank(lines.get(0)))
+            lines.remove(0);
+        while (!lines.isEmpty() && isBlank(lines.get(lines.size() - 1)))
+            lines.remove(lines.size() - 1);
+        return lines;
+    }
+
+    private static boolean isBlank(FormattedCharSequence s) {
+        return s.accept((i, style, cp) -> Character.isWhitespace(cp));
+    }
+
+    // the line exactly as vanilla chat shows it: only the frame around chat is restyled, not the messages
+    private static void drawLine(GuiGraphics g, FormattedCharSequence text, int x, int y, float alpha) {
+        g.drawString(Theme.font(), text, x, y, Theme.withAlpha(Theme.TEXT, alpha), true);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/chat/ChatLog.java b/src/main/java/com/solegendary/reignofnether/chat/ChatLog.java
new file mode 100644
index 000000000..e0b0f98ef
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/chat/ChatLog.java
@@ -0,0 +1,107 @@
+package com.solegendary.reignofnether.chat;
+
+import com.solegendary.reignofnether.ui.Theme;
+import net.minecraft.Util;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.Component;
+import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
+import net.minecraftforge.eventbus.api.EventPriority;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+
+import javax.annotation.Nullable;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Every line added to the chat this session, with its channel and sender, for the RTS chat panel, the
+ * recent-chat overlay and the match setup screen.
+ *
+ * Lines are captured where vanilla adds them to the chat (ChatComponentMixin), so client-side messages
+ * (tutorial, ready checks) are caught too. Whoever knows who said what (player chat) calls
+ * {@link #expect} just before, and the next line added is tagged with it; anything else is INFO.
+ */
+public final class ChatLog {
+
+    private ChatLog() { }
+
+    public enum Channel {
+        ALL(Theme.MUTED), INFO(Theme.ORANGE);
+
+        public final int colour;
+
+        Channel(int colour) {
+            this.colour = colour;
+        }
+
+        public String label() {
+            return I18n.get("chat.reignofnether.channel." + name().toLowerCase(Locale.ROOT));
+        }
+    }
+
+    /**
+     * @param sender empty for INFO lines
+     * @param text   the message without the sender
+     * @param line   the whole line as vanilla chat shows it
+     */
+    public record Entry(Channel channel, String sender, Component text, Component line, long at) {
+        public long age() {
+            return Util.getMillis() - at;
+        }
+    }
+
+    static final int MAX = 100;
+    private static final Deque<Entry> entries = new ArrayDeque<>();
+    @Nullable
+    private static Entry expected = null;
+
+    public static List<Entry> entries() {
+        return new ArrayList<>(entries);
+    }
+
+    /** The newest {@code max} entries younger than maxAgeMs, oldest first. */
+    public static List<Entry> recent(int max, long maxAgeMs) {
+        List<Entry> out = new ArrayList<>();
+        var it = entries.descendingIterator();
+        while (it.hasNext() && out.size() < max) {
+            Entry e = it.next();
+            if (e.age() >= maxAgeMs)
+                break;
+            out.add(0, e);
+        }
+        return out;
+    }
+
+    /** Tags the next line added to the chat, if it is {@code line}. */
+    public static void expect(Channel channel, String sender, Component text, Component line) {
+        expected = new Entry(channel, sender, text, line, 0);
+    }
+
+    /** Called by ChatComponentMixin for every line added to the vanilla chat. */
+    public static void onAdded(Component line) {
+        Entry e = expected != null && expected.line().equals(line)
+                ? new Entry(expected.channel(), expected.sender(), expected.text(), line, Util.getMillis())
+                : new Entry(Channel.INFO, "", line, line, Util.getMillis());
+        expected = null;
+        if (entries.size() >= MAX)
+            entries.pollFirst();
+        entries.addLast(e);
+    }
+
+    // last handler so the line matches what is finally added
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    public static void onPlayerChat(ClientChatReceivedEvent.Player evt) {
+        if (evt.getMessage() != null)
+            expect(Channel.ALL, evt.getBoundChatType().name().getString(),
+                    evt.getPlayerChatMessage().decoratedContent(), evt.getMessage());
+    }
+
+    @SubscribeEvent
+    public static void onLogout(ClientPlayerNetworkEvent.LoggingOut evt) {
+        entries.clear();
+        expected = null;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/chat/ChatPanel.java b/src/main/java/com/solegendary/reignofnether/chat/ChatPanel.java
new file mode 100644
index 000000000..52bfb4c6e
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/chat/ChatPanel.java
@@ -0,0 +1,281 @@
+package com.solegendary.reignofnether.chat;
+
+import com.solegendary.reignofnether.chat.ChatLog.Channel;
+import com.solegendary.reignofnether.gamerules.GameruleClient;
+import com.solegendary.reignofnether.guiscreen.TopdownGui;
+import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
+import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
+import com.solegendary.reignofnether.ui.EditorRows;
+import com.solegendary.reignofnether.ui.HudScale;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.CommandSuggestions;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.Component;
+import org.lwjgl.glfw.GLFW;
+
+import java.util.List;
+
+/**
+ * Chat in the RTS view, replacing vanilla's ChatScreen: the log, a channel chip, the input and SEND.
+ * Drawn in HUD units like MatchStartScreen, so the EditBox is drawn and fed input by hand.
+ */
+public class ChatPanel extends Screen {
+
+    private static final int W = 300;
+    private static final int HEADER = 20;
+    private static final int LOG_H = 140;
+    private static final int ROW_H = 30;
+    private static final int H = HEADER + LOG_H + 6 + ROW_H;
+    // vanilla ends the command suggestion list this far above the bottom of the screen
+    private static final int SUGGESTIONS_BOTTOM = 15;
+
+    private EditBox input;
+    private CommandSuggestions commandSuggestions;
+    private int suggestionsDy = 0;
+    private HudFrame frame;
+    private Rect logRect = Rect.EMPTY;
+    private Rect fieldRect = Rect.EMPTY;
+    private int scroll = 0;
+    private int maxScroll = 0;
+    private int historyPos = -1;
+
+    // the RTS screen under the chat: closing goes straight back to it instead of waiting for the server to reopen it
+    private final Screen parent;
+
+    public ChatPanel() {
+        super(Component.translatable("chat.reignofnether.panel.title"));
+        Screen current = Minecraft.getInstance().screen;
+        this.parent = current instanceof TopdownGui ? current : null;
+    }
+
+    @Override
+    public void onClose() {
+        Minecraft.getInstance().setScreen(parent);
+    }
+
+    /** The RTS view and spectators outside the RTS view draw their own chat (overlay and this panel), so vanilla's is hidden there. */
+    // in the RTS view the HUD and the match screens show RoN's own chat, so vanilla's never shows, under any menu
+    public static boolean hidesVanillaChat() {
+        return OrthoviewClientEvents.isEnabled() || OrthoviewClientEvents.spectatingOutside();
+    }
+
+    public static final int MAX_LENGTH = 256;
+
+    @Override
+    protected void init() {
+        // init runs again on resize: keep what was typed
+        if (input != null) {
+            commandSuggestions.updateCommandInfo();
+            return;
+        }
+        input = new EditBox(this.font, 0, 0, 100, 16, Component.translatable("chat.reignofnether.panel.placeholder"));
+        input.setBordered(false);
+        input.setMaxLength(MAX_LENGTH);
+        input.setTextColor(Theme.TEXT);
+        input.setFocused(true);
+        input.setResponder(s -> {
+            commandSuggestions.setAllowSuggestions(true);
+            commandSuggestions.updateCommandInfo();
+        });
+        // the input is not a widget of this screen, so Tab only reaches the list while it is showing
+        commandSuggestions = new CommandSuggestions(this.minecraft, this, input, this.font, false, false, 1, 10, true, 0xD0000000);
+        commandSuggestions.updateCommandInfo();
+    }
+
+    @Override
+    public void render(GuiGraphics g, int mouseX, int mouseY, float partialTick) {
+        HudClientEvents.renderUnderChat(g);
+        HudScale scale = HudGeometry.scale();
+        HudLayout layout = HudGeometry.layout();
+        frame = new HudFrame(g, scale, layout, scale.toUnits(mouseX), scale.toUnits(mouseY));
+        int x = HudLayout.MARGIN;
+        int y = OrthoviewClientEvents.spectatingOutside() ? OrthoviewClientEvents.chatBottom(scale.height()) - H
+                : layout.console().y() - HudLayout.GAP * 2 - H;
+
+        g.pose().pushPose();
+        g.pose().scale(scale.poseScale(), scale.poseScale(), 1);
+        Theme.popup(g, x, y, W, H, Theme.ORANGE);
+        renderHeader(x, y);
+
+        logRect = new Rect(x + 8, y + HEADER, W - 16, LOG_H);
+        int total = ChatLines.render(g, ChatLog.entries(), logRect, scroll);
+        maxScroll = Math.max(0, total - LOG_H / ChatLines.LINE_H);
+        scroll = Math.min(scroll, maxScroll);
+
+        int rowY = y + H - ROW_H;
+        renderInputRow(x, rowY);
+
+        // vanilla places the list from the bottom of the screen: moved so it ends on the input row, over the log
+        suggestionsDy = rowY + SUGGESTIONS_BOTTOM - this.height;
+        g.pose().pushPose();
+        g.pose().translate(0, suggestionsDy, 10);
+        commandSuggestions.render(g, frame.mouseX, frame.mouseY - suggestionsDy);
+        g.pose().popPose();
+        EditorRows.end(frame);
+    }
+
+    private void renderHeader(int x, int y) {
+        GuiGraphics g = frame.g;
+        String title = I18n.get("chat.reignofnether.panel.title");
+        Text.small(g, title, x + 8, y + 7, Theme.LABEL);
+        Rect close = new Rect(x + W - 8 - 13, y + 4, 13, 13);
+        int hintX = x + 8 + Text.smallWidth(title) + 6;
+        int right = close.x() - 6;
+        String hints = I18n.get("chat.reignofnether.panel.hints");
+        if (Text.smallWidth(hints) <= right - hintX)
+            Text.small(g, hints, hintX, y + 7, Theme.DIM);
+        boolean hovered = frame.hovered(close);
+        Theme.secondaryButton(g, close.x(), close.y(), close.w(), close.h(), hovered);
+        Theme.cross(g, close, hovered ? Theme.GOLD : Theme.BODY);
+        frame.register(new ButtonBuilder("chat close").onLeftClick(this::onClose).build(), close, null, null);
+    }
+
+    private void renderInputRow(int x, int ry) {
+        GuiGraphics g = frame.g;
+        g.fill(x, ry, x + W, ry + ROW_H, Theme.SUNKEN);
+        g.fill(x, ry, x + W, ry + 1, Theme.INK);
+
+        Channel ch = Channel.ALL;
+        Rect chip = new Rect(x + 5, ry + 5, 32, 20);
+        g.fill(chip.x(), chip.y(), chip.right(), chip.bottom(), Theme.RAISED);
+        Theme.ring(g, chip.x(), chip.y(), chip.w(), chip.h(), 1, ch.colour);
+        Text.smallCentered(g, ch.label(), chip.centerX(), chip.y() + 6, ch.colour);
+
+        String send = I18n.get("chat.reignofnether.panel.send");
+        int sendW = Text.smallWidth(send) + 14;
+        Rect sendRect = new Rect(x + W - 5 - sendW, chip.y(), sendW, chip.h());
+        boolean hovered = frame.hovered(sendRect);
+        Theme.secondaryButton(g, sendRect.x(), sendRect.y(), sendRect.w(), sendRect.h(), hovered);
+        Text.smallCentered(g, send, sendRect.centerX(), sendRect.y() + 6, hovered ? Theme.GOLD : Theme.BODY);
+        frame.register(new ButtonBuilder("chat send").onLeftClick(this::send).build(), sendRect, null, null);
+
+        fieldRect = new Rect(chip.right() + 4, chip.y(), sendRect.x() - 4 - chip.right() - 4, chip.h());
+        g.fill(fieldRect.x(), fieldRect.y(), fieldRect.right(), fieldRect.bottom(), Theme.INK);
+        g.fill(fieldRect.x(), fieldRect.y(), fieldRect.right(), fieldRect.y() + 1, 0x99000000);
+        input.setX(fieldRect.x() + 6);
+        input.setY(fieldRect.y() + 6);
+        input.setWidth(fieldRect.w() - 12);
+        input.render(g, frame.mouseX, frame.mouseY, 0);
+        if (input.getValue().isEmpty())
+            Text.draw(g, I18n.get("chat.reignofnether.panel.placeholder"), fieldRect.x() + 6, fieldRect.y() + 6, Theme.DIM);
+    }
+
+    private void send() {
+        sendMessage(input.getValue());
+        input.setValue("");
+        historyPos = -1;
+        scroll = 0;
+    }
+
+    /** Sends typed chat or a /command. */
+    public static void sendMessage(String typed) {
+        String text = typed.trim();
+        Minecraft mc = Minecraft.getInstance();
+        if (text.isEmpty() || mc.player == null)
+            return;
+        mc.gui.getChat().addRecentChat(text);
+        if (text.startsWith("/"))
+            mc.player.connection.sendCommand(text.substring(1));
+        else
+            mc.player.connection.sendChat(text);
+    }
+
+    // up / down walk through what was sent before, like vanilla chat
+    private void recall(int step) {
+        List<String> history = Minecraft.getInstance().gui.getChat().getRecentChat();
+        if (history.isEmpty())
+            return;
+        historyPos = historyPos < 0 ? (step < 0 ? history.size() - 1 : -1) : historyPos + step;
+        if (historyPos < 0 || historyPos >= history.size()) {
+            historyPos = -1;
+            input.setValue("");
+        } else {
+            input.setValue(history.get(historyPos));
+        }
+        commandSuggestions.setAllowSuggestions(false);
+        commandSuggestions.hide();
+    }
+
+    @Override
+    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+        if (commandSuggestions.keyPressed(keyCode, scanCode, modifiers))
+            return true;
+        switch (keyCode) {
+            case GLFW.GLFW_KEY_ENTER, GLFW.GLFW_KEY_KP_ENTER -> {
+                // closes like vanilla chat so RTS hotkeys work again right away
+                send();
+                onClose();
+                return true;
+            }
+            case GLFW.GLFW_KEY_UP -> {
+                recall(-1);
+                return true;
+            }
+            case GLFW.GLFW_KEY_DOWN -> {
+                recall(1);
+                return true;
+            }
+            case GLFW.GLFW_KEY_PAGE_UP, GLFW.GLFW_KEY_PAGE_DOWN -> {
+                int page = LOG_H / ChatLines.LINE_H - 1;
+                scrollBy(keyCode == GLFW.GLFW_KEY_PAGE_UP ? page : -page);
+                return true;
+            }
+            default -> {
+                return input.keyPressed(keyCode, scanCode, modifiers) || super.keyPressed(keyCode, scanCode, modifiers);
+            }
+        }
+    }
+
+    @Override
+    public boolean charTyped(char codePoint, int modifiers) {
+        return input.charTyped(codePoint, modifiers);
+    }
+
+    @Override
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (frame == null)
+            return false;
+        int ux = frame.scale.toUnits(mouseX);
+        int uy = frame.scale.toUnits(mouseY);
+        if (commandSuggestions.mouseClicked(ux, uy - suggestionsDy, button))
+            return true;
+        if (fieldRect.contains(ux, uy))
+            return input.mouseClicked(ux, uy, button);
+        return frame.click(ux, uy, button == GLFW.GLFW_MOUSE_BUTTON_1);
+    }
+
+    @Override
+    public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
+        // CommandSuggestions.mouseScrolled checks the raw GUI mouse, which misses the moved list: walk it like the arrow keys
+        if (commandSuggestions.keyPressed(delta > 0 ? GLFW.GLFW_KEY_UP : GLFW.GLFW_KEY_DOWN, 0, 0))
+            return true;
+        if (frame != null && logRect.contains(frame.scale.toUnits(mouseX), frame.scale.toUnits(mouseY)))
+            scrollBy((int) Math.signum(delta) * 3);
+        return true;
+    }
+
+    private void scrollBy(int lines) {
+        scroll = Math.max(0, Math.min(maxScroll, scroll + lines));
+    }
+
+    @Override
+    public void tick() {
+        input.tick();
+    }
+
+    @Override
+    public boolean isPauseScreen() {
+        return false;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/chat/SpectatorFeed.java b/src/main/java/com/solegendary/reignofnether/chat/SpectatorFeed.java
new file mode 100644
index 000000000..4ae6608f7
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/chat/SpectatorFeed.java
@@ -0,0 +1,78 @@
+package com.solegendary.reignofnether.chat;
+
+import com.solegendary.reignofnether.hud.panels.SpectatorHud;
+import com.solegendary.reignofnether.player.PlayerColors;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Style;
+import net.minecraft.network.chat.TextColor;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * The spectators' match feed, as system lines in their own chat: units lost, buildings finished and
+ * research done. Losses of the same unit type are grouped over a few seconds ("lost 3× Zombie").
+ */
+public final class SpectatorFeed {
+
+    private SpectatorFeed() { }
+
+    private static final Minecraft MC = Minecraft.getInstance();
+    private static final long GROUP_MS = 3_000;
+    // what is already there when you start watching (buildings counted as built, research synced) is not news
+    private static final long QUIET_AFTER_JOIN_MS = 10_000;
+
+    private record Losses(long first, int[] count) { }
+
+    private static final Map<String, Losses> losses = new LinkedHashMap<>(); // "owner\0unit"
+    private static long activeSince = -1;
+
+    private static boolean live() {
+        return activeSince > 0 && System.currentTimeMillis() - activeSince > QUIET_AFTER_JOIN_MS;
+    }
+
+    public static synchronized void unitLost(String owner, String unitName) {
+        if (live() && !owner.isBlank())
+            losses.computeIfAbsent(owner + "\0" + unitName, k -> new Losses(System.currentTimeMillis(), new int[1])).count()[0]++;
+    }
+
+    public static void built(String owner, String buildingName) {
+        if (live() && !owner.isBlank())
+            post(owner, Component.translatable("hud.reignofnether.spectator.feed.built", buildingName));
+    }
+
+    public static void researched(String owner, String researchName) {
+        if (live() && !owner.isBlank())
+            post(owner, Component.translatable("hud.reignofnether.spectator.feed.researched", researchName));
+    }
+
+    public static synchronized void tick() {
+        if (!SpectatorHud.isActive()) {
+            activeSince = -1;
+            losses.clear();
+            return;
+        }
+        if (activeSince < 0)
+            activeSince = System.currentTimeMillis();
+        long now = System.currentTimeMillis();
+        for (Iterator<Map.Entry<String, Losses>> it = losses.entrySet().iterator(); it.hasNext(); ) {
+            Map.Entry<String, Losses> e = it.next();
+            if (now - e.getValue().first() < GROUP_MS)
+                continue;
+            String[] key = e.getKey().split("\0", 2);
+            int n = e.getValue().count()[0];
+            post(key[0], n == 1 ? Component.translatable("hud.reignofnether.spectator.feed.lost_one", key[1])
+                    : Component.translatable("hud.reignofnether.spectator.feed.lost", n, key[1]));
+            it.remove();
+        }
+    }
+
+    private static void post(String owner, Component what) {
+        MutableComponent name = Component.literal(owner)
+                .withStyle(Style.EMPTY.withColor(TextColor.fromRgb(PlayerColors.getPlayerColorHex(owner))));
+        MC.gui.getChat().addMessage(SystemMessage.info(Component.empty().append(name).append(" ").append(what)));
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/chat/SystemMessage.java b/src/main/java/com/solegendary/reignofnether/chat/SystemMessage.java
new file mode 100644
index 000000000..1e10ef852
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/chat/SystemMessage.java
@@ -0,0 +1,31 @@
+package com.solegendary.reignofnether.chat;
+
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+
+// RoN's system lines in chat, one line each with a marker in front: ◆ info, ▲ important, ✖ error.
+// Dim marker, light body, no blank lines around it.
+public final class SystemMessage {
+
+    private SystemMessage() {}
+
+    public static MutableComponent info(Component msg) {
+        return line("◆", ChatFormatting.DARK_GRAY, ChatFormatting.GRAY, msg);
+    }
+
+    public static MutableComponent important(Component msg) {
+        return line("▲", ChatFormatting.GOLD, ChatFormatting.WHITE, msg);
+    }
+
+    public static MutableComponent error(Component msg) {
+        return line("✖", ChatFormatting.RED, ChatFormatting.GRAY, msg);
+    }
+
+    // the body colour only fills in where msg has none of its own
+    private static MutableComponent line(String marker, ChatFormatting markerCol, ChatFormatting bodyCol, Component msg) {
+        return Component.empty()
+                .append(Component.literal(marker + " ").withStyle(markerCol))
+                .append(Component.empty().withStyle(bodyCol).append(msg));
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/config/ReignOfNetherClientConfigs.java b/src/main/java/com/solegendary/reignofnether/config/ReignOfNetherClientConfigs.java
index 2e170e5df..659301c8b 100644
--- a/src/main/java/com/solegendary/reignofnether/config/ReignOfNetherClientConfigs.java
+++ b/src/main/java/com/solegendary/reignofnether/config/ReignOfNetherClientConfigs.java
@@ -1,5 +1,8 @@
 package com.solegendary.reignofnether.config;
 
+import com.solegendary.reignofnether.blocks.NightCircleMode;
+import com.solegendary.reignofnether.hud.panels.SettingsMenu;
+import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import com.solegendary.reignofnether.player.PlayerColors;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraftforge.client.ConfigScreenHandler;
@@ -16,7 +19,15 @@ public class ReignOfNetherClientConfigs {
 
     public static final ForgeConfigSpec.ConfigValue<Boolean> USE_PLAYER_COLORS;
     public static final ForgeConfigSpec.ConfigValue<Integer> CAMERA_SENSITIVITY;
+    public static final ForgeConfigSpec.ConfigValue<Boolean> SEEN_NETWORK_NOTICE;
     public static final ForgeConfigSpec.ConfigValue<Boolean> SQUARE_MINIMAP;
+    public static final ForgeConfigSpec.ConfigValue<Boolean> LARGER_SMALL_TEXT;
+    public static final ForgeConfigSpec.ConfigValue<Boolean> SOLID_PANELS;
+    public static final ForgeConfigSpec.ConfigValue<Boolean> QUEUE_OWN_ROW;
+    public static final ForgeConfigSpec.ConfigValue<Boolean> HIGHLIGHT_ANIMALS;
+    public static final ForgeConfigSpec.ConfigValue<Boolean> UNDERLINES;
+    public static final ForgeConfigSpec.EnumValue<OrthoviewClientEvents.LeafHideMethod> HIDE_LEAVES;
+    public static final ForgeConfigSpec.EnumValue<NightCircleMode> NIGHT_CIRCLES;
 
     static {
         BUILDER.push("Configuration File");
@@ -31,7 +42,15 @@ public class ReignOfNetherClientConfigs {
         PLAYER_COLOR_ENEMY = BUILDER.define("player_color_enemy", PlayerColors.COLOR_HOSTILE.id);
         USE_PLAYER_COLORS = BUILDER.define("use_player_colors", false);
         CAMERA_SENSITIVITY = BUILDER.define("camera_sensitivity", 10);
+        SEEN_NETWORK_NOTICE = BUILDER.define("seen_network_notice", false);
         SQUARE_MINIMAP = BUILDER.define("square_minimap", false);
+        LARGER_SMALL_TEXT = BUILDER.define("larger_small_text", false);
+        SOLID_PANELS = BUILDER.define("solid_panels", false);
+        QUEUE_OWN_ROW = BUILDER.define("queue_own_row", false);
+        HIGHLIGHT_ANIMALS = BUILDER.define("highlight_animals", false);
+        UNDERLINES = BUILDER.define("underlines", true);
+        HIDE_LEAVES = BUILDER.defineEnum("hide_leaves", OrthoviewClientEvents.LeafHideMethod.NONE);
+        NIGHT_CIRCLES = BUILDER.defineEnum("night_circles", NightCircleMode.NO_OVERLAPS);
         SPEC = BUILDER.build();
     }
 
@@ -39,7 +58,8 @@ public static ConfigScreenHandler.ConfigScreenFactory createConfigScreen() {
         return new ConfigScreenHandler.ConfigScreenFactory(ReignOfNetherClientConfigs::buildConfigScreen);
     }
 
+    // Forge's mod list "Config" button opens the same settings screen as the pause menu
     private static Screen buildConfigScreen(Screen screen) {
-        return new ReignOfNetherConfigScreen(screen);
+        return SettingsMenu.settingsScreen(screen);
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/config/ReignOfNetherConfigScreen.java b/src/main/java/com/solegendary/reignofnether/config/ReignOfNetherConfigScreen.java
deleted file mode 100644
index 465fa28eb..000000000
--- a/src/main/java/com/solegendary/reignofnether/config/ReignOfNetherConfigScreen.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.solegendary.reignofnether.config;
-
-import com.solegendary.reignofnether.config.elements.ConfigCheckbox;
-import com.solegendary.reignofnether.config.elements.ConfigColorButton;
-import com.solegendary.reignofnether.config.elements.Label;
-import com.solegendary.reignofnether.player.PlayerColors;
-import com.solegendary.reignofnether.util.MyRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.Renderable;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraft.client.gui.narration.NarratedElementType;
-import net.minecraft.client.gui.narration.NarrationElementOutput;
-import net.minecraft.client.gui.navigation.ScreenRectangle;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.common.ForgeConfigSpec;
-import org.jetbrains.annotations.NotNull;
-
-public class ReignOfNetherConfigScreen extends Screen {
-
-    protected static final Minecraft MC = Minecraft.getInstance();
-    protected Screen parent;
-
-    public ReignOfNetherConfigScreen(Screen parent) {
-        super(Component.literal("Reign of Nether"));
-        this.parent = parent;
-        //this.init();
-    }
-
-    @Override
-    protected void init() {
-        super.init();
-        this.buildColorSettings(50);
-        this.buildMinimapSettings(150);
-        this.addRenderableWidget(button(this.width / 2 - 75, this.height - 29, 150, 20, CommonComponents.GUI_BACK, button -> this.minecraft.setScreen(this.parent)));
-    }
-
-    public static Button button(int x, int y, int width, int height, Component label, Button.OnPress onPress) {
-        return Button.builder(label, onPress).pos(x, y).size(width, height).build();
-    }
-
-    @Override
-    public void render(GuiGraphics pGuiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
-        this.renderDirtBackground(pGuiGraphics);
-        super.render(pGuiGraphics, pMouseX, pMouseY, pPartialTick);
-    }
-
-
-    private void buildColorSettings(int y) {
-        int totalColors = 4;
-        int widthColors = 200;
-        int labelHeight = 20;
-        int colorHeight = 30;
-        var colorRect = new ScreenRectangle(this.width / 2 - widthColors / 2, y + 20, widthColors, colorHeight);
-
-        // area header
-        addRenderableOnly(new Label("Alliance colors").pos(colorRect.left(), colorRect.top() - 20).size(widthColors, labelHeight));
-
-        // for color cycle buttons, on the same row
-        addRenderableWidget(new ConfigColorButton(ReignOfNetherClientConfigs.PLAYER_COLOR_SELF, "Self")
-                .pos(0 * (colorRect.width() / totalColors) + colorRect.left(), colorRect.top())
-                .size(colorRect.width() / totalColors, colorRect.height()));
-        addRenderableWidget(new ConfigColorButton(ReignOfNetherClientConfigs.PLAYER_COLOR_ALLY, "Ally")
-                .pos(1 * (colorRect.width() / totalColors) + colorRect.left(), colorRect.top())
-                .size(colorRect.width() / totalColors, colorRect.height()));
-        addRenderableWidget(new ConfigColorButton(ReignOfNetherClientConfigs.PLAYER_COLOR_NEUTRAL, "Neutral")
-                .pos(2 * (colorRect.width() / totalColors) + colorRect.left(), colorRect.top())
-                .size(colorRect.width() / totalColors, colorRect.height()));
-        addRenderableWidget(new ConfigColorButton(ReignOfNetherClientConfigs.PLAYER_COLOR_ENEMY, "Enemy")
-                .pos(3 * (colorRect.width() / totalColors) + colorRect.left(), colorRect.top())
-                .size(colorRect.width() / totalColors, colorRect.height()));
-
-        // checkbox to toggle between player color and alliance color
-        addRenderableWidget(new ConfigCheckbox(ReignOfNetherClientConfigs.USE_PLAYER_COLORS, "Using player colors", "Using alliance colors")
-                .pos(colorRect.left(), colorRect.bottom())
-                .size(colorRect.width(), labelHeight));
-    }
-
-    private void buildMinimapSettings(int y) {
-        int width = 200;
-        int labelHeight = 20;
-        int left = this.width / 2 - width / 2;
-
-        addRenderableOnly(new Label("Minimap").pos(left, y).size(width, labelHeight));
-        addRenderableWidget(new ConfigCheckbox(ReignOfNetherClientConfigs.SQUARE_MINIMAP, "Square minimap", "Diamond minimap")
-                .pos(left, y + labelHeight)
-                .size(width, labelHeight));
-    }
-}
diff --git a/src/main/java/com/solegendary/reignofnether/config/elements/ConfigCheckbox.java b/src/main/java/com/solegendary/reignofnether/config/elements/ConfigCheckbox.java
deleted file mode 100644
index 2a6cc4b34..000000000
--- a/src/main/java/com/solegendary/reignofnether/config/elements/ConfigCheckbox.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.solegendary.reignofnether.config.elements;
-
-
-import net.minecraft.client.gui.components.Checkbox;
-import net.minecraft.client.renderer.Rect2i;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.common.ForgeConfigSpec;
-
-public class ConfigCheckbox extends Checkbox {
-
-    private final ForgeConfigSpec.ConfigValue<Boolean> configValue;
-    private final String labelOn;
-    private final String labelOff;
-
-    public ConfigCheckbox(ForgeConfigSpec.ConfigValue<Boolean> configValue, String label) {
-        super(0, 0, 1, 1, Component.literal(label), configValue.get(), true);
-        this.configValue = configValue;
-        this.labelOn = label;
-        this.labelOff = label;
-    }
-
-    public ConfigCheckbox(ForgeConfigSpec.ConfigValue<Boolean> configValue, String labelOn, String labelOff) {
-        super(0, 0, 1, 1, Component.literal(configValue.get() ? labelOn : labelOff), configValue.get(), true);
-        this.configValue = configValue;
-        this.labelOn = labelOn;
-        this.labelOff = labelOff;
-    }
-
-    @Override
-    public void onPress() {
-        super.onPress();
-        configValue.set(this.selected());
-        setMessage(Component.literal(this.selected() ? labelOn : labelOff));
-    }
-
-    public ConfigCheckbox pos(int x, int y) {
-        super.setPosition(x, y);
-        return this;
-    }
-
-    public ConfigCheckbox size(int w, int h) {
-        super.setWidth(w);
-        super.setHeight(h);
-        return this;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/solegendary/reignofnether/config/elements/ConfigColorButton.java b/src/main/java/com/solegendary/reignofnether/config/elements/ConfigColorButton.java
deleted file mode 100644
index 794dc07ce..000000000
--- a/src/main/java/com/solegendary/reignofnether/config/elements/ConfigColorButton.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.solegendary.reignofnether.config.elements;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.solegendary.reignofnether.player.PlayerColors;
-import com.solegendary.reignofnether.util.MyRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.Renderable;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraft.client.gui.narration.NarratedElementType;
-import net.minecraft.client.gui.narration.NarrationElementOutput;
-import net.minecraft.client.gui.navigation.ScreenRectangle;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.common.ForgeConfigSpec;
-import org.jetbrains.annotations.NotNull;
-
-public class ConfigColorButton implements Renderable, GuiEventListener, NarratableEntry {
-
-    protected static final Minecraft MC = Minecraft.getInstance();
-
-    private final ForgeConfigSpec.ConfigValue<Integer> configValue;
-    private final String label;
-    private int x = 0;
-    private int y = 0;
-    private int w = 10;
-    private int h = 10;
-    private boolean focused = false;
-
-    public ConfigColorButton(ForgeConfigSpec.ConfigValue<Integer> configValue, String label) {
-        this.configValue = configValue;
-        this.label = label;
-    }
-
-    @Override
-    public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
-        var hovering = isMouseOver(pMouseX, pMouseY);
-        var texture = PlayerColors.getColorIcon(configValue.get());
-
-        if (!hovering && PlayerColors.isUsingPlayerColors()) {
-            RenderSystem.setShaderColor(0.5f, 0.5f, 0.5f, 0.5f);
-        }
-
-        guiGraphics.blit(texture,
-                x, y + h / 2, 0,
-                0, 0, // where on texture to start drawing from
-                w, h / 2, // dimensions of blit texture
-                w, h / 2 // size of texture itself (if < dimensions, texture is repeated)
-        );
-
-        if (hovering) {
-            MyRenderer.renderFrameWithBg(guiGraphics, x, y + h / 2, w, h / 2, 0x00000000);
-            guiGraphics.drawCenteredString(MC.font, (configValue.get() + 1) + "/" + (PlayerColors.colors.length), this.x + this.w / 2, this.y + 3 * this.h / 4 - MC.font.lineHeight / 2, 0x99FFFFFF);
-        }
-
-        guiGraphics.drawCenteredString(MC.font, this.label, this.x + this.w / 2, this.y + this.h / 4 - MC.font.lineHeight / 2, 0xFFFFFFFF);
-        RenderSystem.setShaderColor(1, 1, 1, 1);
-    }
-
-    @Override
-    public boolean mouseClicked(double pMouseX, double pMouseY, int pButton) {
-        if (pButton == 2 || !isMouseOver(pMouseX, pMouseY)) {
-            return false;
-        }
-
-        if (pButton == 0) {
-            configValue.set((configValue.get() + 1) % PlayerColors.PLAYER_COLOR_TOTAL_COUNT);
-        } else if (pButton == 1) {
-            configValue.set((configValue.get() + PlayerColors.PLAYER_COLOR_TOTAL_COUNT - 1) % PlayerColors.PLAYER_COLOR_TOTAL_COUNT);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean isMouseOver(double pMouseX, double pMouseY) {
-        return !(pMouseX < x || pMouseY < y || pMouseX > x + w || pMouseY > y + h);
-    }
-
-    @Override
-    public void setFocused(boolean focused) {
-        this.focused = focused;
-    }
-
-    @Override
-    public boolean isFocused() {
-        return this.focused;
-    }
-
-    @Override
-    public @NotNull ScreenRectangle getRectangle() {
-        return new ScreenRectangle(x, y, w, h);
-    }
-
-    @Override
-    public @NotNull NarrationPriority narrationPriority() {
-        return NarrationPriority.HOVERED;
-    }
-
-    @Override
-    public void updateNarration(NarrationElementOutput narrationElementOutput) {
-        narrationElementOutput.add(NarratedElementType.HINT, Component.literal(this.label));
-    }
-
-    public ConfigColorButton pos(int x, int y) {
-        this.x = x;
-        this.y = y;
-        return this;
-    }
-
-    public ConfigColorButton size(int w, int h) {
-        this.w = w;
-        this.h = h;
-        return this;
-    }
-}
diff --git a/src/main/java/com/solegendary/reignofnether/config/elements/Label.java b/src/main/java/com/solegendary/reignofnether/config/elements/Label.java
deleted file mode 100644
index 83bbfe683..000000000
--- a/src/main/java/com/solegendary/reignofnether/config/elements/Label.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.solegendary.reignofnether.config.elements;
-
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.Renderable;
-import net.minecraft.client.renderer.Rect2i;
-
-public class Label implements Renderable {
-    protected static final Minecraft MC = Minecraft.getInstance();
-    private final String label;
-    private int x = 0;
-    private int y = 0;
-    private int w = 10;
-    private int h = 10;
-
-    public Label(String label) {
-        this.label = label;
-    }
-
-    @Override
-    public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
-        //guiGraphics.drawCenteredString(MC.font, this.label, this.x + this.w / 2, this.y + this.h / 2 - font.lineHeight / 2, 0xFFFFFFFF);
-        guiGraphics.drawString(MC.font, this.label, this.x, this.y + this.h / 2 - MC.font.lineHeight / 2, 0xFFFFFFFF);
-    }
-
-    public Label pos(int x, int y) {
-        this.x = x;
-        this.y = y;
-        return this;
-    }
-
-    public Label size(int w, int h) {
-        this.w = w;
-        this.h = h;
-        return this;
-    }
-}
diff --git a/src/main/java/com/solegendary/reignofnether/cursor/CursorClientEvents.java b/src/main/java/com/solegendary/reignofnether/cursor/CursorClientEvents.java
index a31d67ae8..980b90532 100644
--- a/src/main/java/com/solegendary/reignofnether/cursor/CursorClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/cursor/CursorClientEvents.java
@@ -1,6 +1,7 @@
 package com.solegendary.reignofnether.cursor;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.solegendary.reignofnether.minimap.StrategicMapClientEvents;
 import com.solegendary.reignofnether.alliance.AlliancesClient;
 import com.solegendary.reignofnether.building.BuildingClientEvents;
 import com.solegendary.reignofnether.building.BuildingPlacement;
@@ -26,7 +27,10 @@
 import com.solegendary.reignofnether.util.MiscUtil;
 import com.solegendary.reignofnether.util.MyMath;
 import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.RenderType;
@@ -63,6 +67,13 @@
  */
 public class CursorClientEvents {
 
+    static {
+        WorldState.onClientReset(() -> {
+            setLeftClickAction(null);
+            setLeftClickSandboxAction(null);
+        });
+    }
+
     private static final Minecraft MC = Minecraft.getInstance();
 
     private static boolean leftClickDown = false;
@@ -292,6 +303,8 @@ else if (ResourceSources.GATHERABLE_PLANTS.contains(MC.level.getBlockState(prese
                 entityaabb = entityaabb.inflate(0.2f, 0, 0.2f);
                 entityaabb.setMaxY(entityaabb.maxY + 0.6f);
             }
+            if (StrategicMapClientEvents.isOpen())
+                entityaabb = entityaabb.inflate(StrategicMapClientEvents.iconReach(), 0, StrategicMapClientEvents.iconReach());
 
             if (MyMath.rayIntersectsAABBCustom(cursorWorldPosNear, MiscUtil.getPlayerLookVector(MC), entityaabb)) {
                 UnitClientEvents.addPreselectedUnit(entity);
@@ -353,17 +366,26 @@ public static boolean isBoxSelecting() {
                 cursorLeftClickDragPos.y >= 0;
     }
 
-    // draw box selection rectangle
+    // draw box selection rectangle, once per frame (the overlay event fires once per overlay, stacking the fill)
     @SubscribeEvent
-    public static void renderOverlay(RenderGuiOverlayEvent.Post evt) {
+    public static void renderOverlay(net.minecraftforge.client.event.RenderGuiEvent.Post evt) {
 
         if (leftClickDown && !Keybindings.altMod.isDown()) {
-            evt.getGuiGraphics().fill( // x1,y1, x2,y2,
-                    Math.round(cursorLeftClickDownPos.x),
-                    Math.round(cursorLeftClickDownPos.y),
-                    Math.round(cursorLeftClickDragPos.x),
-                    Math.round(cursorLeftClickDragPos.y),
-                    0x0341e868); //ARGB(hex); note that alpha ranges between ~0-16, not 0-255
+            // a faint green fill with a thin, half-transparent green border, in HUD units
+            var scale = com.solegendary.reignofnether.hud.layout.HudGeometry.scale();
+            int x0 = scale.toUnits(Math.min(cursorLeftClickDownPos.x, cursorLeftClickDragPos.x));
+            int y0 = scale.toUnits(Math.min(cursorLeftClickDownPos.y, cursorLeftClickDragPos.y));
+            int x1 = scale.toUnits(Math.max(cursorLeftClickDownPos.x, cursorLeftClickDragPos.x));
+            int y1 = scale.toUnits(Math.max(cursorLeftClickDownPos.y, cursorLeftClickDragPos.y));
+            if (x1 - x0 <= 4 && y1 - y0 <= 4)
+                return;
+            GuiGraphics g = evt.getGuiGraphics();
+            float k = scale.poseScale();
+            g.pose().pushPose();
+            g.pose().scale(k, k, 1);
+            g.fill(x0, y0, x1, y1, 0x1A41E868);
+            Theme.ring(g, x0, y0, x1 - x0, y1 - y0, 1, 0x8041E868);
+            g.pose().popPose();
         }
     }
 
diff --git a/src/main/java/com/solegendary/reignofnether/debug/RtsDebugClientEvents.java b/src/main/java/com/solegendary/reignofnether/debug/RtsDebugClientEvents.java
index 7bfacbe93..0ce3d6971 100644
--- a/src/main/java/com/solegendary/reignofnether/debug/RtsDebugClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/debug/RtsDebugClientEvents.java
@@ -1,10 +1,15 @@
 package com.solegendary.reignofnether.debug;
 
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.hud.panels.TopRightPanel;
 import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.ui.Text;
 import com.solegendary.reignofnether.unit.UnitClientEvents;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.client.event.RenderGuiOverlayEvent;
+import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import org.lwjgl.glfw.GLFW;
 
@@ -53,41 +58,40 @@ else if (displayMode == DebugDisplayMode.NAVMESH)
 
     @SubscribeEvent
     public static void onRenderOverlay(RenderGuiOverlayEvent.Pre evt) {
-        if (displayMode == DebugDisplayMode.NONE)
+        // this event fires once per overlay
+        if (displayMode == DebugDisplayMode.NONE || evt.getOverlay() != VanillaGuiOverlay.DEBUG_TEXT.type())
             return;
 
-        int x = evt.getWindow().getGuiScaledWidth() - (displayMode == DebugDisplayMode.NONE ? 85 : 95);
-        int y = 25;
+        GuiGraphics g = evt.getGuiGraphics();
+        int x = HudGeometry.scale().width() - 95;
         int lineH = 10;
+        int y = TopRightPanel.bottom - lineH; // the first line is at y + lineH
 
         double worldTPS = Math.min(1000.0 / tickTime, 99.99);
 
-        int tpsCol = 0x00FF00; // green
-        if (worldTPS < 10) {
-            tpsCol = 0xFF0000; // red
-        } else if (worldTPS < 20) {
-            tpsCol = 0xFFFF00; // yellow
-        }
+        int tpsCol = worldTPS < 10 ? 0xFF0000 : worldTPS < 20 ? 0xFFFF00 : 0x00FF00; // red, yellow, green
         String fps = MC.fpsString.length() >= 6 ? MC.fpsString.substring(0, 6).replace("fps", "") : "?";
 
-        evt.getGuiGraphics().drawString(MC.font, "Tick: " + String.format("%.2f", tickTime), x, y + lineH, tpsCol);
-        evt.getGuiGraphics().drawString(MC.font, "TPS: " + String.format("%.2f", worldTPS),  x, y + lineH * 2, tpsCol);
-        evt.getGuiGraphics().drawString(MC.font, "FPS: " + fps,                              x, y + lineH * 3,  0xFFFFFF);
-        if (displayMode == DebugDisplayMode.PATHFINDING) {
-            evt.getGuiGraphics().drawString(MC.font, "Units: " + UnitClientEvents.getAllUnits().size(),  x, y + lineH * 4, 0xFFFFFF);
-            evt.getGuiGraphics().drawString(MC.font, "Paths: " + RtsDebugPathPreview.displayedPathCount(), x, y + lineH * 5, 0xFFFFFF);
-            evt.getGuiGraphics().drawString(MC.font, "Paths/s: " + pathsAvg,                             x, y + lineH * 6, 0xFFFFFF);
-            evt.getGuiGraphics().drawString(MC.font, "Queue: " + queueAvg,                               x, y + lineH * 7, 0xFFFFFF);
-            evt.getGuiGraphics().drawString(MC.font, "Stuck: " + stuckAvg,                               x, y + lineH * 8, stuckAvg > 0 ? 0xFF6060 : 0xFFFFFF);
-            evt.getGuiGraphics().drawString(MC.font, "Path ms: " + String.format("%.2f", pathComputeMs),  x, y + lineH * 9, 0xFFFFFF);
-            evt.getGuiGraphics().drawString(MC.font, "Path e2e: " + String.format("%.2f", pathE2eMs),     x, y + lineH * 10, 0xFFFFFF);
-        }
-        if (displayMode == DebugDisplayMode.NAVMESH) {
-            evt.getGuiGraphics().drawString(MC.font, "NAVMESH",            x, y + lineH * 4, 0xFFFFFF);
-            evt.getGuiGraphics().drawString(MC.font, "green=open",         x, y + lineH * 5, 0x40FF40);
-            evt.getGuiGraphics().drawString(MC.font, "red=crowded",        x, y + lineH * 6, 0xFF4040);
-            evt.getGuiGraphics().drawString(MC.font, "orange=no fit",      x, y + lineH * 7, 0xFF9020);
-            evt.getGuiGraphics().drawString(MC.font, "tiles: " + RtsDebugNavmesh.scoreTileCount(), x, y + lineH * 8, 0xFFFFFF);
-        }
+        Text.atGui(g, 0, 0, () -> {
+            g.drawString(MC.font, "Tick: " + String.format("%.2f", tickTime), x, y + lineH, tpsCol);
+            g.drawString(MC.font, "TPS: " + String.format("%.2f", worldTPS),  x, y + lineH * 2, tpsCol);
+            g.drawString(MC.font, "FPS: " + fps,                              x, y + lineH * 3,  0xFFFFFF);
+            if (displayMode == DebugDisplayMode.PATHFINDING) {
+                g.drawString(MC.font, "Units: " + UnitClientEvents.getAllUnits().size(),  x, y + lineH * 4, 0xFFFFFF);
+                g.drawString(MC.font, "Paths: " + RtsDebugPathPreview.displayedPathCount(), x, y + lineH * 5, 0xFFFFFF);
+                g.drawString(MC.font, "Paths/s: " + pathsAvg,                             x, y + lineH * 6, 0xFFFFFF);
+                g.drawString(MC.font, "Queue: " + queueAvg,                               x, y + lineH * 7, 0xFFFFFF);
+                g.drawString(MC.font, "Stuck: " + stuckAvg,                               x, y + lineH * 8, stuckAvg > 0 ? 0xFF6060 : 0xFFFFFF);
+                g.drawString(MC.font, "Path ms: " + String.format("%.2f", pathComputeMs),  x, y + lineH * 9, 0xFFFFFF);
+                g.drawString(MC.font, "Path e2e: " + String.format("%.2f", pathE2eMs),     x, y + lineH * 10, 0xFFFFFF);
+            }
+            if (displayMode == DebugDisplayMode.NAVMESH) {
+                g.drawString(MC.font, "NAVMESH",            x, y + lineH * 4, 0xFFFFFF);
+                g.drawString(MC.font, "green=open",         x, y + lineH * 5, 0x40FF40);
+                g.drawString(MC.font, "red=crowded",        x, y + lineH * 6, 0xFF4040);
+                g.drawString(MC.font, "orange=no fit",      x, y + lineH * 7, 0xFF9020);
+                g.drawString(MC.font, "tiles: " + RtsDebugNavmesh.scoreTileCount(), x, y + lineH * 8, 0xFFFFFF);
+            }
+        });
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/faction/Faction.java b/src/main/java/com/solegendary/reignofnether/faction/Faction.java
index e36391c87..29d96b219 100644
--- a/src/main/java/com/solegendary/reignofnether/faction/Faction.java
+++ b/src/main/java/com/solegendary/reignofnether/faction/Faction.java
@@ -102,7 +102,9 @@ public boolean equals(Faction faction) {
 	}
 	
 	public void addBuilding(Building building, Keybinding keybinding) {
-		BuildingPlaceButton buildButton = getBuilding(ReignOfNetherRegistries.BUILDING.getKey(building)).getBuildButton(keybinding);
+		Building registered = getBuilding(ReignOfNetherRegistries.BUILDING.getKey(building));
+		BuildingPlaceButton buildButton = registered.getBuildButton(keybinding);
+		buildButton.cost = () -> registered.cost;
 		buildingButtons.add(buildButton);
 	}
 	
diff --git a/src/main/java/com/solegendary/reignofnether/fogofwar/FogChunkSnapshot.java b/src/main/java/com/solegendary/reignofnether/fogofwar/FogChunkSnapshot.java
index 513cb4c9d..76954e390 100644
--- a/src/main/java/com/solegendary/reignofnether/fogofwar/FogChunkSnapshot.java
+++ b/src/main/java/com/solegendary/reignofnether/fogofwar/FogChunkSnapshot.java
@@ -1,6 +1,8 @@
 package com.solegendary.reignofnether.fogofwar;
 
+import com.solegendary.reignofnether.loading.LoadProgress;
 import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.util.WorldState;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
@@ -48,6 +50,9 @@ protected boolean removeEldestEntry(Map.Entry<ChunkPos, ClientboundLevelChunkWit
             });
 
     private static Path dir = null;
+    static {
+        WorldState.onServerReset(FogChunkSnapshot::forget);
+    }
 
     public static void captureFogChunks(ServerLevel level) {
         shouldRecapture = false;
@@ -69,8 +74,10 @@ public static void captureFogChunks(ServerLevel level) {
         int maxChunkZ = (int) Math.floor(border.getMaxZ() - 1) >> 4;
 
         int captured = 0;
+        LoadProgress.begin(LoadProgress.Step.FOG, (maxChunkX - minChunkX + 1) * (maxChunkZ - minChunkZ + 1));
         for (int cx = minChunkX; cx <= maxChunkX; cx++) {
             for (int cz = minChunkZ; cz <= maxChunkZ; cz++) {
+                LoadProgress.done++;
                 LevelChunk chunk = level.getChunkSource().getChunk(cx, cz, true);
                 if (chunk == null) continue;
                 ChunkPos pos = new ChunkPos(cx, cz);
diff --git a/src/main/java/com/solegendary/reignofnether/fogofwar/FogOfWarClientEvents.java b/src/main/java/com/solegendary/reignofnether/fogofwar/FogOfWarClientEvents.java
index 4a3cc9d0f..f2905da25 100644
--- a/src/main/java/com/solegendary/reignofnether/fogofwar/FogOfWarClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/fogofwar/FogOfWarClientEvents.java
@@ -1,5 +1,6 @@
 package com.solegendary.reignofnether.fogofwar;
 
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.solegendary.reignofnether.alliance.AlliancesClient;
 import com.solegendary.reignofnether.building.BuildingClientEvents;
 import com.solegendary.reignofnether.building.BuildingPlacement;
@@ -11,10 +12,10 @@
 import com.solegendary.reignofnether.unit.UnitClientEvents;
 import com.solegendary.reignofnether.unit.interfaces.RangedAttackerUnit;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.util.WorldState;
 import com.solegendary.reignofnether.worldborder.WorldBorderServerEvents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.Model;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.commands.Commands;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
@@ -42,7 +43,7 @@ public class FogOfWarClientEvents {
     private static final Minecraft MC = Minecraft.getInstance();
 
     // mirror of the server's authoritative sent (bright) set for this player
-    public static final Set<ChunkPos> brightChunks = ConcurrentHashMap.newKeySet();
+    public static final Set<ChunkPos> brightChunks = WorldState.client(ConcurrentHashMap.newKeySet());
 
     // Per-edge-chunk 16x16 column visibility bitmask (long[4] = 256 bits, index = (localX<<4)|localZ),
     // server-authoritative: arrives with the bright set in FogChunksClientboundPacket, so the tint circle
@@ -65,6 +66,9 @@ public static void refreshLocalSeesFog() {
     }
 
     public static boolean movedToCapitol = false;
+    static {
+        WorldState.onClientReset(() -> movedToCapitol = false);
+    }
 
     public static void applyServerFogState(Set<ChunkPos> bright, Map<ChunkPos, long[]> masks) {
         Set<ChunkPos> newlyDark = new HashSet<>(brightChunks);
@@ -215,6 +219,11 @@ public static boolean isEnabled() {
         return enabled && localSeesFog;
     }
 
+    /** Whether the match has fog of war, whatever this client's role (isEnabled is only true for RTS players). */
+    public static boolean isMatchFogOn() {
+        return enabled;
+    }
+
     // client-side mirror of WorldBorderServerEvents.isRtsOptimisedMap using the client's known border
     public static boolean isOnRtsOptimisedMap() {
         return MC.level != null
@@ -232,8 +241,7 @@ public static void onRegisterCommand(RegisterClientCommandsEvent evt) {
                     // Fog only works on RTS-optimised maps; refuse locally so the toggle is effectively
                     // hidden on vanilla-sized maps instead of bouncing off the server.
                     if (!isOnRtsOptimisedMap()) {
-                        MC.player.sendSystemMessage(Component.literal(
-                                I18n.get("server.reignofnether.fog_requires_rts_map")));
+                        MC.player.sendSystemMessage(SystemMessage.error(Component.translatable("server.reignofnether.fog_requires_rts_map")));
                         return -1;
                     }
                     setServerFog(true);
diff --git a/src/main/java/com/solegendary/reignofnether/fogofwar/FogOfWarServerEvents.java b/src/main/java/com/solegendary/reignofnether/fogofwar/FogOfWarServerEvents.java
index 5632b405b..25cc3ec75 100644
--- a/src/main/java/com/solegendary/reignofnether/fogofwar/FogOfWarServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/fogofwar/FogOfWarServerEvents.java
@@ -11,6 +11,7 @@
 import com.solegendary.reignofnether.startpos.StartPosServerEvents;
 import com.solegendary.reignofnether.unit.UnitServerEvents;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.util.WorldState;
 import com.solegendary.reignofnether.worldborder.WorldBorderServerEvents;
 import net.minecraft.commands.Commands;
 import net.minecraft.core.BlockPos;
@@ -33,7 +34,6 @@
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.server.ServerStartedEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.network.PacketDistributor;
@@ -51,6 +51,9 @@
 public class FogOfWarServerEvents {
 
     private static boolean enabled = false; // enforced for all clients
+    static {
+        WorldState.onServerReset(() -> enabled = false);
+    }
     private static ServerLevel serverLevel = null;
 
     // Per-player vision, recomputed every UPDATE_TICKS ticks. Three tiers:
@@ -60,25 +63,25 @@ public class FogOfWarServerEvents {
     //    columns stay frozen so out-of-circle changes don't leak.
     //  - edgeMasks: 16x16 covered-column bitmask (long[4]) per edge chunk. Authoritative for entity gating,
     //    update gating AND the client's fog tint (synced via FogChunksClientboundPacket).
-    private static final Map<UUID, Set<ChunkPos>> playerLiveChunks = new ConcurrentHashMap<>();
-    private static final Map<UUID, Set<ChunkPos>> playerEdgeChunks = new ConcurrentHashMap<>();
-    private static final Map<UUID, Map<ChunkPos, long[]>> playerEdgeMasks = new ConcurrentHashMap<>();
+    private static final Map<UUID, Set<ChunkPos>> playerLiveChunks = WorldState.server(new ConcurrentHashMap<>());
+    private static final Map<UUID, Set<ChunkPos>> playerEdgeChunks = WorldState.server(new ConcurrentHashMap<>());
+    private static final Map<UUID, Map<ChunkPos, long[]>> playerEdgeMasks = WorldState.server(new ConcurrentHashMap<>());
 
     // (player, chunk) pairs needing a full-chunk resend at the next fog tick: a multi-block section update
     // straddled the vision circle in an edge chunk, so the packet was dropped for that player but part of
     // the change IS visible to them. Drained by updatePlayerBrightChunks.
-    private static final Map<UUID, Set<ChunkPos>> pendingResends = new ConcurrentHashMap<>();
+    private static final Map<UUID, Set<ChunkPos>> pendingResends = WorldState.server(new ConcurrentHashMap<>());
 
     // players whose units/buildings ignore fog and are visible to everyone
-    private static final Set<String> revealedPlayerNames = ConcurrentHashMap.newKeySet();
+    private static final Set<String> revealedPlayerNames = WorldState.server(ConcurrentHashMap.newKeySet());
 
     // <entityId <name of attacked player, ticks to expiry>>.
     // A unit that attacks out of the fog is revealed to the player it attacked
     // capped at REVEALED_ATTACKER_SIGHT_BLOCKS
-    private static final Map<Integer, Map<String, Long>> revealedUnitExpiryTick = new ConcurrentHashMap<>();
+    private static final Map<Integer, Map<String, Long>> revealedUnitExpiryTick = WorldState.server(new ConcurrentHashMap<>());
 
     // snapshot of neutral unit starting positions
-    public static final Map<Integer, AABB> neutralFogUnits = new HashMap<>();
+    public static final Map<Integer, AABB> neutralFogUnits = WorldState.server(new HashMap<>());
 
     public static void captureNeutralFogUnits() {
         neutralFogUnits.clear();
@@ -112,7 +115,7 @@ public static void revealRangedUnit(int unitId, String targetOwnerName, int dura
 
     // players being started together (StartPosServerEvents): they're started one by one in the same tick, so
     // without this the first ones to start would leave the rest unfogged until they've been added too
-    private static final Set<String> startingPlayers = ConcurrentHashMap.newKeySet();
+    private static final Set<String> startingPlayers = WorldState.server(ConcurrentHashMap.newKeySet());
 
     public static void setStartingPlayers(Collection<String> names) {
         startingPlayers.clear();
@@ -277,19 +280,6 @@ public static void onServerStarted(ServerStartedEvent evt) {
     }
 
     // statics outlive the world: clear them so the next world opened in this game starts clean
-    @SubscribeEvent
-    public static void onServerStopped(ServerStoppedEvent evt) {
-        FogChunkSnapshot.forget();
-        enabled = false;
-        playerLiveChunks.clear();
-        playerEdgeChunks.clear();
-        playerEdgeMasks.clear();
-        pendingResends.clear();
-        revealedPlayerNames.clear();
-        revealedUnitExpiryTick.clear();
-        neutralFogUnits.clear();
-        startingPlayers.clear();
-    }
 
     public static void setEnabled(boolean value) {
         if (!value && isForceFog()) {
@@ -321,7 +311,7 @@ public static void setEnabled(boolean value) {
 
         syncClientFog();
 
-        // fog means a competitive match: enemy picks hidden (the host can turn it back off)
+        // fog means a competitive match: enemy picks hidden (the host can turn it back)
         if (!wasEnabled && enabled && serverLevel != null) {
             serverLevel.getGameRules().getRule(GameRuleRegistrar.HIDE_ENEMY_PICKS).set(true, serverLevel.getServer());
             GameruleClientboundPacket.setHideEnemyPicks(true);
diff --git a/src/main/java/com/solegendary/reignofnether/gamerules/GameruleAction.java b/src/main/java/com/solegendary/reignofnether/gamerules/GameruleAction.java
index 07995dac0..7b97c6c91 100644
--- a/src/main/java/com/solegendary/reignofnether/gamerules/GameruleAction.java
+++ b/src/main/java/com/solegendary/reignofnether/gamerules/GameruleAction.java
@@ -20,5 +20,6 @@ public enum GameruleAction {
     SET_BUILDINGS_OUTSIDE_BORDER,
     SET_RTS_PATHFINDING,
     SET_ANIMAL_SPAWN_Y_DIFF,
-    SET_RANDOM_ITEM_DROPS
+    SET_RANDOM_ITEM_DROPS,
+    SET_FOG_OF_WAR
 }
diff --git a/src/main/java/com/solegendary/reignofnether/gamerules/GameruleClient.java b/src/main/java/com/solegendary/reignofnether/gamerules/GameruleClient.java
index 8b9a13823..abe6ec38c 100644
--- a/src/main/java/com/solegendary/reignofnether/gamerules/GameruleClient.java
+++ b/src/main/java/com/solegendary/reignofnether/gamerules/GameruleClient.java
@@ -1,23 +1,20 @@
 package com.solegendary.reignofnether.gamerules;
 
-import com.solegendary.reignofnether.ReignOfNether;
-import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.rtsmap.RTSMapInfoClientEvents;
+import com.solegendary.reignofnether.fogofwar.FogOfWarClientEvents;
 import com.solegendary.reignofnether.items.RandomItemDropRule;
-import com.solegendary.reignofnether.keybinds.Keybinding;
 import com.solegendary.reignofnether.keybinds.Keybindings;
 import com.solegendary.reignofnether.resources.ResourceCosts;
 import com.solegendary.reignofnether.startpos.StartPosClientEvents;
-import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.ui.SettingRow;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.resources.language.I18n;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.FormattedCharSequence;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
 
 public class GameruleClient {
 
@@ -46,257 +43,97 @@ public class GameruleClient {
 
     public static boolean gamerulesMenuOpen = false;
 
-    public static final String BOOLEAN_BUTTON_NAME = "Boolean Game Rule";
-    public static final String INTEGER_BUTTON_NAME = "Integer Game Rule";
+    /**
+     * One game rule as the UI shows it. Boolean rules toggle; number rules step with − and + (shift for
+     * bigger steps). Lobby rules can also be changed by the match host, the rest need operator rights.
+     */
+    public record Rule(String id, boolean lobby, Supplier<String> value, Supplier<Boolean> on,
+                       Runnable increase, @Nullable Runnable decrease) {
 
-    public static Button getGamerulesButton() {
-        return new Button(
-                "Game Rules Menu",
-                14,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/repeating_command_block_back.png"),
-                (Keybinding) null,
-                () -> gamerulesMenuOpen,
-                () -> scenarioMode,
-                () -> !StartPosClientEvents.isStarting,
-                () -> gamerulesMenuOpen = !gamerulesMenuOpen,
-                null,
-                MC.player != null && MC.player.hasPermissions(4) ?
-                        List.of(fcs(I18n.get("hud.gamerule.reignofnether.menu"))) :
-                        List.of(
-                                fcs(I18n.get("hud.gamerule.reignofnether.menu")),
-                                fcs(I18n.get("hud.gamerule.reignofnether.warn_not_opped"))
-                        )
-        );
-    }
-
-    private static class GameruleBooleanButton extends Button {
-        private static final Minecraft MC = Minecraft.getInstance();
-        private final String label;
-        public GameruleBooleanButton(String label, boolean enabled, Runnable onLeftClick, String tooltip) {
-            super(
-                    BOOLEAN_BUTTON_NAME,
-                    8,
-                    enabled ? ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/tick.png") :
-                            ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/cross.png"),
-                    (Keybinding) null,
-                    () -> false,
-                    () -> false,
-                    () -> MC.player != null && MC.player.hasPermissions(4) && !StartPosClientEvents.isStarting,
-                    onLeftClick,
-                    null,
-                    List.of(fcs(tooltip))
-            );
-            this.imageSize = 12;
-            this.label = label;
-            this.frameResource = null;
-        }
-        @Override
-        public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
-            super.render(guiGraphics, x, y, mouseX, mouseY);
-            guiGraphics.drawString(MC.font, label,x + 22, y + 6, 0xFFFFFF);
-        }
-        @Override
-        public void renderTooltip(GuiGraphics guiGraphics, int mouseX, int mouseY) {
-            MyRenderer.renderTooltip(guiGraphics, tooltipLines, mouseX, mouseY + tooltipOffsetY - 10);
+        public boolean isToggle() {
+            return decrease == null;
         }
-    }
 
-    private static class GameruleIntegerButton extends Button {
-        private static final Minecraft MC = Minecraft.getInstance();
-        private final String label;
-        public GameruleIntegerButton(String label, Runnable onLeftClick, Runnable onRightClick, List<FormattedCharSequence> tooltipLines) {
-            super(
-                INTEGER_BUTTON_NAME,
-                8,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_back.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> MC.player != null && MC.player.hasPermissions(4) && !StartPosClientEvents.isStarting,
-                onLeftClick,
-                onRightClick,
-                tooltipLines
-            );
-            this.imageSize = 12;
-            this.label = label;
-        }
-        @Override
-        public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
-            super.render(guiGraphics, x, y, mouseX, mouseY);
-            guiGraphics.drawString(MC.font, label,
-                    x + 23, y + 6, 0xFFFFFF);
-        }
-        @Override
-        public void renderTooltip(GuiGraphics guiGraphics, int mouseX, int mouseY) {
-            MyRenderer.renderTooltip(guiGraphics, tooltipLines, mouseX, mouseY + tooltipOffsetY - 10);
+        public String name() {
+            return I18n.get("gamerule.reignofnether.name." + id);
         }
-    }
 
-    // returns list of rendered buttons
-    public static List<Button> renderGamerulesGUI(GuiGraphics guiGraphics, int xTR, int yTR, int mouseX, int mouseY) {
-        ArrayList<Button> buttons = new ArrayList<>();
-        int width = 145;
-        int x = xTR - width - 8;
-        int y = yTR - 36;
+        public String description() {
+            return I18n.get("commands.reignofnether.gamerule." + id);
+        }
 
-        buttons.add(new GameruleBooleanButton("doLogFalling", doLogFalling,
-            () -> GameruleServerboundPacket.setLogFalling(!doLogFalling),
-            I18n.get("commands.reignofnether.gamerule.do_log_falling")
-        ));
-        buttons.add(new GameruleBooleanButton("neutralAggro", neutralAggro,
-            () -> GameruleServerboundPacket.setNeutralAggro(!neutralAggro),
-            I18n.get("commands.reignofnether.gamerule.neutral_aggro")
-        ));
-        buttons.add(new GameruleBooleanButton("doUnitGriefing", doUnitGriefing,
-            () -> GameruleServerboundPacket.setUnitGriefing(!doUnitGriefing),
-            I18n.get("commands.reignofnether.gamerule.unit_griefing")
-        ));
-        buttons.add(new GameruleBooleanButton("doPlayerGriefing", doPlayerGriefing,
-            () -> GameruleServerboundPacket.setPlayerGriefing(!doPlayerGriefing),
-            I18n.get("commands.reignofnether.gamerule.player_griefing")
-        ));
-        buttons.add(new GameruleBooleanButton("allowBeacons", allowBeacons,
-            () -> GameruleServerboundPacket.setAllowBeacons(!allowBeacons),
-            I18n.get("commands.reignofnether.gamerule.allow_beacons")
-        ));
-        buttons.add(new GameruleBooleanButton("pvpModesOnly", pvpModesOnly,
-            () -> GameruleServerboundPacket.setPvpModesOnly(!pvpModesOnly),
-            I18n.get("commands.reignofnether.gamerule.pvp_modes_only")
-        ));
-        buttons.add(new GameruleBooleanButton("slantedBuilding", slantedBuilding,
-                () -> GameruleServerboundPacket.setSlantedBuilding(!slantedBuilding),
-                I18n.get("commands.reignofnether.gamerule.slanted_buildings")
-        ));
-        buttons.add(new GameruleBooleanButton("lockAlliances", lockAlliances,
-                () -> GameruleServerboundPacket.setLockAlliances(!lockAlliances),
-                I18n.get("commands.reignofnether.gamerule.lock_alliances")
-        ));
-        buttons.add(new GameruleBooleanButton("hideEnemyPicks", hideEnemyPicks,
-                () -> GameruleServerboundPacket.setHideEnemyPicks(!hideEnemyPicks),
-                I18n.get("commands.reignofnether.gamerule.hide_enemy_picks")
-        ));
-        buttons.add(new GameruleBooleanButton("coopMode", coopMode,
-                () -> GameruleServerboundPacket.setCoopMode(!coopMode),
-                I18n.get("commands.reignofnether.gamerule.coop_mode")
-        ));
-        buttons.add(new GameruleBooleanButton("rtsPathfinding", rtsPathfinding,
-                () -> GameruleServerboundPacket.setRtsPathfinding(!rtsPathfinding),
-                I18n.get("commands.reignofnether.gamerule.rts_pathfinding")
-        ));
-        buttons.add(new GameruleIntegerButton("allowedHeroes: " + Math.round(allowedHeroes),
-            () -> {
-                int value = Math.min(2, allowedHeroes + 1);
-                GameruleServerboundPacket.setAllowedHeroes(value);
-            },
-            () -> {
-                int value = Math.max(0, allowedHeroes - 1);
-                GameruleServerboundPacket.setAllowedHeroes(value);
-            },
-            List.of(
-                    fcs(I18n.get("commands.reignofnether.gamerule.allowed_heroes")),
-                    fcs(I18n.get("hud.gamerule.reignofnether.click"))
-            )
-        ));
-        buttons.add(new GameruleIntegerButton("maxPopulation: " + Math.round(maxPopulation),
-            () -> {
-                int value = Math.min(10000, maxPopulation + (Keybindings.shiftMod.isDown() ? 10 : 1));
-                GameruleServerboundPacket.setMaxPopulation(value);
-            },
-            () -> {
-                int value = Math.max(0, maxPopulation - (Keybindings.shiftMod.isDown() ? 10 : 1));
-                GameruleServerboundPacket.setMaxPopulation(value);
-            },
-            List.of(
-                fcs(I18n.get("commands.reignofnether.gamerule.max_population")),
-                fcs(I18n.get("hud.gamerule.reignofnether.click")),
-                fcs(I18n.get("hud.gamerule.reignofnether.shift_click"))
-            )
-        ));
-        buttons.add(new GameruleIntegerButton("groundYLevel: " + Math.round(groundYLevel),
-            () -> {
-                int value = (int) Math.min(320, groundYLevel + (Keybindings.shiftMod.isDown() ? 10 : 1));
-                GameruleServerboundPacket.setGroundYLevel(value);
-            },
-            () -> {
-                int value = (int) Math.max(-320, groundYLevel - (Keybindings.shiftMod.isDown() ? 10 : 1));
-                GameruleServerboundPacket.setGroundYLevel(value);
-            },
-            List.of(
-                fcs(I18n.get("commands.reignofnether.gamerule.ground_y_level")),
-                fcs(I18n.get("hud.gamerule.reignofnether.click")),
-                fcs(I18n.get("hud.gamerule.reignofnether.shift_click"))
-            )
-        ));
-        buttons.add(new GameruleIntegerButton("flyingMaxYLevel: " + Math.round(flyingMaxYLevel),
-            () -> {
-                int value = (int) Math.min(320, flyingMaxYLevel + (Keybindings.shiftMod.isDown() ? 10 : 1));
-                GameruleServerboundPacket.setFlyingMaxYLevel(value);
-            },
-            () -> {
-                int value = (int) Math.max(-320, flyingMaxYLevel - (Keybindings.shiftMod.isDown() ? 10 : 1));
-                GameruleServerboundPacket.setFlyingMaxYLevel(value);
-            },
-            List.of(
-                fcs(I18n.get("commands.reignofnether.gamerule.flying_max_y_level")),
-                fcs(I18n.get("hud.gamerule.reignofnether.click")),
-                fcs(I18n.get("hud.gamerule.reignofnether.shift_click"))
-            )
-        ));
-        buttons.add(new GameruleIntegerButton("beaconWinMinutes: " + Math.round(beaconWinMinutes),
-            () -> {
-                int value = (int) Math.min(1000, beaconWinMinutes + (Keybindings.shiftMod.isDown() ? 10 : 1));
-                GameruleServerboundPacket.setBeaconWinMinutes(value);
-            },
-            () -> {
-                int value = (int) Math.max(1, beaconWinMinutes - (Keybindings.shiftMod.isDown() ? 10 : 1));
-                GameruleServerboundPacket.setBeaconWinMinutes(value);
-            },
-            List.of(
-                fcs(I18n.get("commands.reignofnether.gamerule.beacon_win_minutes")),
-                fcs(I18n.get("hud.gamerule.reignofnether.click")),
-                fcs(I18n.get("hud.gamerule.reignofnether.shift_click"))
-            )
-        ));
-        buttons.add(new GameruleIntegerButton("randomItemDrops: " + Math.round(randomItemDrops.getValue()),
-                () -> {
-                    int value = randomItemDrops.getValue() + 1;
-                    if (value > 3) value = 0;
-                    GameruleServerboundPacket.setRandomItemDrops(value);
-                },
-                () -> {
-                    int value = randomItemDrops.getValue() - 1;
-                    if (value < 0) value = 3;
-                    GameruleServerboundPacket.setRandomItemDrops(value);
-                },
-                List.of(
-                        fcs(I18n.get("commands.reignofnether.gamerule.random_item_drops")),
-                        fcs(I18n.get("commands.reignofnether.gamerule.random_item_drops.point1")),
-                        fcs(I18n.get("commands.reignofnether.gamerule.random_item_drops.point2")),
-                        fcs(I18n.get("commands.reignofnether.gamerule.random_item_drops.point3")),
-                        fcs(I18n.get("commands.reignofnether.gamerule.random_item_drops.point4")),
-                        fcs(I18n.get("commands.reignofnether.gamerule.random_item_drops.point5"))
-                )
-        ));
+        public boolean canEdit() {
+            if (MC.player == null || StartPosClientEvents.isStarting || teamLocked())
+                return false;
+            return MC.player.hasPermissions(4) || (lobby && StartPosClientEvents.isHost());
+        }
 
-        int height = (buttons.size() * 18) - 12;
-        MyRenderer.renderFrameWithBg(guiGraphics, x, y, width, height, 0xC8000000);
+        public SettingRow toRow() {
+            return new SettingRow(name(), description(),
+                    I18n.get(lobby ? "hud.gamerule.reignofnether.tag.match" : "hud.gamerule.reignofnether.tag.server"),
+                    value, on, increase, decrease, this::canEdit,
+                    I18n.get(teamLocked() ? "hud.gamerule.reignofnether.team_locked"
+                            : lobby ? "hud.gamerule.reignofnether.host_only" : "hud.gamerule.reignofnether.op_only"));
+        }
 
-        for (Button button : buttons) {
-            button.render(guiGraphics, x + 5, y + 5, mouseX, mouseY);
-            y += 16;
+        private boolean teamLocked() {
+            return id.equals("lock_alliances") && RTSMapInfoClientEvents.teamMode;
         }
-        return buttons;
     }
-}
-
-
-
-
-
 
+    public static List<SettingRow> ruleRows() {
+        return ruleRows(true);
+    }
 
+    public static List<SettingRow> mapmakerRuleRows() {
+        return ruleRows(false);
+    }
 
+    private static List<SettingRow> ruleRows(boolean lobby) {
+        return rules().stream().filter(r -> r.lobby() == lobby).map(Rule::toRow).toList();
+    }
 
+    private static int step(int small, int big) {
+        return Keybindings.shiftMod.isDown() ? big : small;
+    }
 
+    private static Rule toggle(String id, boolean lobby, Supplier<Boolean> value, java.util.function.Consumer<Boolean> set) {
+        return new Rule(id, lobby, () -> I18n.get(value.get() ? "options.on" : "options.off"), value,
+                () -> set.accept(!value.get()), null);
+    }
 
+    private static Rule number(String id, boolean lobby, Supplier<Integer> value, int min, int max, int small, int big,
+                               java.util.function.Consumer<Integer> set) {
+        return new Rule(id, lobby, () -> String.valueOf(value.get()), () -> true,
+                () -> set.accept(Math.min(max, value.get() + step(small, big))),
+                () -> set.accept(Math.max(min, value.get() - step(small, big))));
+    }
 
+    /** All rules in display order; the match setup shows the lobby ones first. */
+    public static List<Rule> rules() {
+        List<Rule> rules = new ArrayList<>();
+        rules.add(toggle("fog_of_war", true, FogOfWarClientEvents::isMatchFogOn, GameruleServerboundPacket::setFogOfWar));
+        rules.add(toggle("hide_enemy_picks", true, () -> hideEnemyPicks, GameruleServerboundPacket::setHideEnemyPicks));
+        rules.add(number("max_population", true, () -> maxPopulation, 0, 10000, 5, 25, GameruleServerboundPacket::setMaxPopulation));
+        rules.add(number("allowed_heroes", true, () -> allowedHeroes, 0, 2, 1, 1, GameruleServerboundPacket::setAllowedHeroes));
+        rules.add(new Rule("random_item_drops", true,
+                () -> I18n.get("gamerule.reignofnether.random_item_drops." + randomItemDrops.getValue()),
+                () -> randomItemDrops != RandomItemDropRule.DISABLED,
+                () -> GameruleServerboundPacket.setRandomItemDrops((randomItemDrops.getValue() + 1) % 4),
+                () -> GameruleServerboundPacket.setRandomItemDrops((randomItemDrops.getValue() + 3) % 4)));
+        rules.add(toggle("neutral_aggro", true, () -> neutralAggro, GameruleServerboundPacket::setNeutralAggro));
+        rules.add(toggle("lock_alliances", true, () -> lockAlliances, GameruleServerboundPacket::setLockAlliances));
+        rules.add(toggle("allow_beacons", true, () -> allowBeacons, GameruleServerboundPacket::setAllowBeacons));
+        rules.add(number("beacon_win_minutes", true, () -> (int) beaconWinMinutes, 1, 1000, 1, 10, GameruleServerboundPacket::setBeaconWinMinutes));
+        rules.add(toggle("coop_mode", false, () -> coopMode, GameruleServerboundPacket::setCoopMode));
+        rules.add(toggle("pvp_modes_only", false, () -> pvpModesOnly, GameruleServerboundPacket::setPvpModesOnly));
+        rules.add(toggle("do_log_falling", false, () -> doLogFalling, GameruleServerboundPacket::setLogFalling));
+        rules.add(toggle("unit_griefing", false, () -> doUnitGriefing, GameruleServerboundPacket::setUnitGriefing));
+        rules.add(toggle("player_griefing", false, () -> doPlayerGriefing, GameruleServerboundPacket::setPlayerGriefing));
+        rules.add(toggle("slanted_buildings", false, () -> slantedBuilding, GameruleServerboundPacket::setSlantedBuilding));
+        rules.add(toggle("rts_pathfinding", false, () -> rtsPathfinding, GameruleServerboundPacket::setRtsPathfinding));
+        rules.add(number("ground_y_level", false, () -> (int) groundYLevel, -320, 320, 1, 10, GameruleServerboundPacket::setGroundYLevel));
+        rules.add(number("flying_max_y_level", false, () -> (int) flyingMaxYLevel, -320, 320, 1, 10, GameruleServerboundPacket::setFlyingMaxYLevel));
+        return rules;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/gamerules/GameruleServerEvents.java b/src/main/java/com/solegendary/reignofnether/gamerules/GameruleServerEvents.java
index dec65ee2e..6d189f88b 100644
--- a/src/main/java/com/solegendary/reignofnether/gamerules/GameruleServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/gamerules/GameruleServerEvents.java
@@ -3,12 +3,10 @@
 import com.solegendary.reignofnether.startpos.StartPosServerEvents;
 import com.mojang.brigadier.context.ParsedArgument;
 import com.mojang.brigadier.context.ParsedCommandNode;
-import com.solegendary.reignofnether.items.RandomItemDropRule;
 import com.solegendary.reignofnether.registrars.GameRuleRegistrar;
 import com.solegendary.reignofnether.unit.UnitServerEvents;
 import com.solegendary.reignofnether.unit.pathfinding.PathfinderWorkerPool;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.Mth;
 import net.minecraftforge.event.CommandEvent;
diff --git a/src/main/java/com/solegendary/reignofnether/gamerules/GameruleServerboundPacket.java b/src/main/java/com/solegendary/reignofnether/gamerules/GameruleServerboundPacket.java
index b83cf3f80..0676813ab 100644
--- a/src/main/java/com/solegendary/reignofnether/gamerules/GameruleServerboundPacket.java
+++ b/src/main/java/com/solegendary/reignofnether/gamerules/GameruleServerboundPacket.java
@@ -1,16 +1,21 @@
 package com.solegendary.reignofnether.gamerules;
 
+import com.solegendary.reignofnether.rtsmap.RTSMapInfoServerEvents;
+import com.solegendary.reignofnether.player.PlayerServerEvents;
 import com.solegendary.reignofnether.startpos.StartPosServerEvents;
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.registrars.GameRuleRegistrar;
 import com.solegendary.reignofnether.registrars.PacketHandler;
 import com.solegendary.reignofnether.unit.UnitServerEvents;
 import net.minecraft.network.FriendlyByteBuf;
+import com.solegendary.reignofnether.fogofwar.FogOfWarServerEvents;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.GameRules;
 import net.minecraftforge.network.NetworkEvent;
 
+import java.util.EnumSet;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
@@ -72,6 +77,10 @@ public static void setLockAlliances(boolean lockAlliances) {
         PacketHandler.INSTANCE.sendToServer(
                 new GameruleServerboundPacket(GameruleAction.SET_LOCK_ALLIANCES, "", lockAlliances ? 1L : 0L));
     }
+    public static void setFogOfWar(boolean fog) {
+        PacketHandler.INSTANCE.sendToServer(
+                new GameruleServerboundPacket(GameruleAction.SET_FOG_OF_WAR, "", fog ? 1L : 0L));
+    }
     public static void setHideEnemyPicks(boolean hideEnemyPicks) {
         PacketHandler.INSTANCE.sendToServer(
                 new GameruleServerboundPacket(GameruleAction.SET_HIDE_ENEMY_PICKS, "", hideEnemyPicks ? 1L : 0L));
@@ -112,6 +121,19 @@ public void encode(FriendlyByteBuf buffer) {
     }
 
 
+    // rules the match host can change from the match setup screen without being a full operator
+    private static final Set<GameruleAction> LOBBY_RULES = EnumSet.of(
+            GameruleAction.SET_HIDE_ENEMY_PICKS,
+            GameruleAction.SET_FOG_OF_WAR,
+            GameruleAction.SET_MAX_POPULATION,
+            GameruleAction.SET_ALLOWED_HEROES,
+            GameruleAction.SET_RANDOM_ITEM_DROPS,
+            GameruleAction.SET_NEUTRAL_AGGRO,
+            GameruleAction.SET_LOCK_ALLIANCES,
+            GameruleAction.SET_ALLOW_BEACONS,
+            GameruleAction.SET_BEACON_WIN_MINUTES
+    );
+
     // server-side packet-consuming functions
     public boolean handle(Supplier<NetworkEvent.Context> ctx) {
         final var success = new AtomicBoolean(false);
@@ -122,7 +144,9 @@ public boolean handle(Supplier<NetworkEvent.Context> ctx) {
                 success.set(false);
                 return;
             }
-            else if (!player.hasPermissions(4)) {
+            // the match setup's rules are also open to the match host (op 2 or the singleplayer/Essential host)
+            else if (!player.hasPermissions(4) && !(LOBBY_RULES.contains(action) && StartPosServerEvents.isHost(player)
+                    && PlayerServerEvents.rtsPlayers.isEmpty() && !StartPosServerEvents.isStartingGame())) {
                 ReignOfNether.LOGGER.warn("GameruleServerboundPacket: Tried to process packet from " + player.getName() + " with insufficient permissions");
                 success.set(false);
                 return;
@@ -184,9 +208,11 @@ else if (!player.hasPermissions(4)) {
                     GameruleClientboundPacket.setAllowedHeroes(value);
                 }
                 case SET_LOCK_ALLIANCES -> {
-                    gameRules.getRule(GameRuleRegistrar.LOCK_ALLIANCES).set(booleanValue, server);
-                    GameruleClientboundPacket.setLockAlliances(booleanValue);
+                    boolean locked = booleanValue || RTSMapInfoServerEvents.isTeamMode();
+                    gameRules.getRule(GameRuleRegistrar.LOCK_ALLIANCES).set(locked, server);
+                    GameruleClientboundPacket.setLockAlliances(locked);
                 }
+                case SET_FOG_OF_WAR -> FogOfWarServerEvents.setEnabled(booleanValue);
                 case SET_HIDE_ENEMY_PICKS -> {
                     gameRules.getRule(GameRuleRegistrar.HIDE_ENEMY_PICKS).set(booleanValue, server);
                     GameruleClientboundPacket.setHideEnemyPicks(booleanValue);
diff --git a/src/main/java/com/solegendary/reignofnether/guiscreen/TopdownGuiClientEvents.java b/src/main/java/com/solegendary/reignofnether/guiscreen/TopdownGuiClientEvents.java
index 5b9fdc39d..92b120dcd 100644
--- a/src/main/java/com/solegendary/reignofnether/guiscreen/TopdownGuiClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/guiscreen/TopdownGuiClientEvents.java
@@ -1,6 +1,7 @@
 package com.solegendary.reignofnether.guiscreen;
 
 import com.solegendary.reignofnether.hud.TextInputClientEvents;
+import com.solegendary.reignofnether.chat.ChatPanel;
 import com.solegendary.reignofnether.keybinds.Keybindings;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import net.minecraft.client.Minecraft;
@@ -55,7 +56,8 @@ public static void onScreenClose(ScreenEvent.Closing evt) {
 
     @SubscribeEvent
     public static void onScreenOpen(ScreenEvent.Opening evt) {
-        if (evt.getScreen() instanceof TopdownGui) {
+        // the chat panel sits on top of the RTS view, so it keeps the same GUI scale
+        if (evt.getScreen() instanceof TopdownGui || evt.getScreen() instanceof ChatPanel) {
             int i = MC.getWindow().calculateScale(Math.min(MAX_GUI_SCALE_MOD, MC.options.guiScale().get()), MC.isEnforceUnicode());
             if (MC.options.guiScale().get() == 0)
                 i = MAX_GUI_SCALE_MOD;
diff --git a/src/main/java/com/solegendary/reignofnether/healthbars/HealthBarClientEvents.java b/src/main/java/com/solegendary/reignofnether/healthbars/HealthBarClientEvents.java
index 2c4af6f1f..0a33568b9 100644
--- a/src/main/java/com/solegendary/reignofnether/healthbars/HealthBarClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/healthbars/HealthBarClientEvents.java
@@ -4,17 +4,15 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
 import com.mojang.math.Axis;
-import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
-import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
+import com.solegendary.reignofnether.ui.Theme;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.util.MiscUtil;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
@@ -33,9 +31,6 @@
 
 public class HealthBarClientEvents {
 
-    private static final ResourceLocation GUI_BARS_TEXTURES = ResourceLocation.fromNamespaceAndPath(
-                ReignOfNether.MOD_ID, "textures/hud/healthbars.png");
-
     private static final List<LivingEntity> renderedEntities = new ArrayList<>();
     private static final Minecraft MC = Minecraft.getInstance();
 
@@ -171,6 +166,19 @@ public static void renderForEntity(PoseStack matrix, LivingEntity entity, double
         float percent2 = Math.min(state.previousAmountDisplay, entity.getMaxHealth()) / entity.getMaxHealth();
 
         render(matrix, percent, percent2, x, y, width, renderMode, BarState.BarStateType.HEALTH);
+        if (renderMode == RenderMode.IN_WORLD_FIRST_PERSON || renderMode == RenderMode.IN_WORLD_ORTHOVIEW)
+            renderSegments(matrix, entity.getMaxHealth(), x, y, width, renderMode);
+    }
+
+    /** MOBA-style dividers every 10 HP so max HP can be read at a glance, coarser (50, 250...) when they get too dense */
+    private static void renderSegments(PoseStack matrix, float maxHealth, double x, double y, float width,
+                                       RenderMode renderMode) {
+        float step = 10;
+        while (width * step / maxHealth < 3)
+            step *= 5;
+        for (float hp = step; hp < maxHealth; hp += step)
+            quad(matrix.last().pose(), x + width * hp / maxHealth, y, width, 1 / width, barHeight(renderMode),
+                    Theme.INK, 4, true);
     }
 
     public static void renderAbsorbForEntity(PoseStack matrix, LivingEntity entity, double x, double y,
@@ -181,26 +189,10 @@ public static void renderAbsorbForEntity(PoseStack matrix, LivingEntity entity,
             float percent = Math.min(1, Math.min(state.amount, MiscUtil.getMaxAbsorptionAmount(entity)) / MiscUtil.getMaxAbsorptionAmount(entity));
             float percent2 = Math.min(state.previousAmountDisplay, MiscUtil.getMaxAbsorptionAmount(entity)) / MiscUtil.getMaxAbsorptionAmount(entity);
 
-            render(matrix, percent, percent2, x, y, width, renderMode, BarState.BarStateType.ABSORB,
-                    0, 1f, 1f,
-                    0, 0.5f, 0.5f
-            );
+            render(matrix, percent, percent2, x, y, width, renderMode, BarState.BarStateType.ABSORB, Theme.BUFF);
         }
     }
 
-    public static void renderManaForEntity(PoseStack matrix, HeroUnit heroUnit, double x, double y,
-                                           float width, RenderMode renderMode) {
-        BarState state = BarStates.getState((LivingEntity) heroUnit, BarState.BarStateType.MANA);
-
-        float percent = Math.min(1, Math.min(state.amount, heroUnit.getMaxMana()) / heroUnit.getMaxMana());
-        float percent2 = Math.min(state.previousAmountDisplay, heroUnit.getMaxMana()) / heroUnit.getMaxMana();
-
-        render(matrix, percent, percent2, x, y, width, renderMode, BarState.BarStateType.MANA,
-                0.3f, 0.3f, 1f,
-                0.15f, 0.15f, 0.5f
-        );
-    }
-
     public static void renderForBuilding(PoseStack matrix, BuildingPlacement building, double x, double y,
                                          float width, RenderMode renderMode) {
         float health = building.getHealth();
@@ -212,70 +204,63 @@ public static void renderForBuilding(PoseStack matrix, BuildingPlacement buildin
 
     private static void render(PoseStack matrix, float percent, float percent2, double x, double y,
                                float width, RenderMode renderMode, BarState.BarStateType barStateType) {
-        // base colour on percentage health remaining (green @ 100%, yellow @ 50%, red @ 0%)
-        float r = Math.max(0, Math.min(1, 2-percent*2));
-        float g = Math.max(0, Math.min(1, percent*2));
-        float b = 0;
-        float r2 = r * 0.5f;
-        float g2 = g * 0.5f;
-        float b2 = b * 0.5f;
-        render(matrix, percent, percent2, x, y, width, renderMode, barStateType, r, g, b, r2, g2, b2);
+        render(matrix, percent, percent2, x, y, width, renderMode, barStateType, Theme.hpColor(percent));
     }
 
+    /**
+     * Flat bar like {@link Theme#bar}: ink track, the recently lost amount in a darker shade of the fill,
+     * the fill, and a light top / dark bottom line. Quads are drawn back to front, each a step closer.
+     */
     private static void render(PoseStack matrix, float percent, float percent2, double x, double y,
-                               float width, RenderMode renderMode, BarState.BarStateType barStateType, float r, float g, float b, float r2, float g2, float b2) {
-        int zOffset = 0;
+                               float width, RenderMode renderMode, BarState.BarStateType barStateType, int colour) {
         Matrix4f m4f = matrix.last().pose();
-        if (!(barStateType == BarState.BarStateType.ABSORB && (renderMode == RenderMode.IN_WORLD_ORTHOVIEW || renderMode == RenderMode.IN_WORLD_FIRST_PERSON)))
-            drawBar(m4f, x, y, width, 1, 0.35f,0.35f,0.35f, zOffset++, renderMode);
-        drawBar(m4f, x, y, width, percent2, r2,g2,b2, zOffset++, renderMode);
-        drawBar(m4f, x, y, width, percent, r,g,b, zOffset, renderMode);
+        boolean inWorld = renderMode == RenderMode.IN_WORLD_FIRST_PERSON || renderMode == RenderMode.IN_WORLD_ORTHOVIEW;
+        double h = barHeight(renderMode);
+        int z = 0;
+        // absorption sits on top of the health bar in the world, so it has no track of its own
+        if (!(barStateType == BarState.BarStateType.ABSORB && inWorld))
+            quad(m4f, x, y, width, 1, h, Theme.INK, z++, inWorld);
+        quad(m4f, x, y, width, percent2, h, (colour & 0xFEFEFE) >> 1 | 0xFF000000, z++, inWorld);
+        quad(m4f, x, y, width, percent, h, colour, z++, inWorld);
+        if (h >= 3) {
+            quad(m4f, x, y, width, percent, 1, 0x59FFFFFF, z, inWorld);
+            quad(m4f, x, y + h - 1, width, percent, 1, 0x40000000, z, inWorld);
+        }
     }
 
-    private static void drawBar(Matrix4f matrix4f, double x, double y, float width, float percent,
-                                float r, float g, float b, int zOffset, RenderMode renderMode) {
-        float c = 0.00390625F;
-        int u = 0;
-        int v = 6 * 5 * 2 + 5;
-        int uw = Mth.ceil(92 * percent);
-        int vh = 5;
-
-        double size = percent * width;
-        double h = 10;
-
-        if (renderMode == RenderMode.GUI_ICON)
-            h = 4;
-        else if (renderMode == RenderMode.GUI_PORTRAIT)
-            h = 12;
-        else if (renderMode == RenderMode.IN_WORLD_FIRST_PERSON)
-            h = 6;
-        else if (renderMode == RenderMode.IN_WORLD_ORTHOVIEW)
-            h = 10;
-
-        RenderSystem.setShaderColor(r, g, b, 1);
-        RenderSystem.setShader(GameRenderer::getPositionTexShader);
-        RenderSystem.setShaderTexture(0, GUI_BARS_TEXTURES);
-        RenderSystem.enableBlend();
+    private static double barHeight(RenderMode renderMode) {
+        return switch (renderMode) {
+            case GUI_ICON -> 4;
+            case GUI_PORTRAIT -> 12;
+            case IN_WORLD_FIRST_PERSON -> 6;
+            case IN_WORLD_ORTHOVIEW -> 10;
+        };
+    }
 
+    /** One flat quad from the bar's left edge, percent of width wide. */
+    private static void quad(Matrix4f matrix4f, double x, double y, float width, float percent, double h,
+                             int argb, int zOffset, boolean inWorld) {
+        if (percent <= 0)
+            return;
         float half = width / 2;
+        float x0 = (float) (-half + x);
+        float x1 = (float) (-half + percent * width + x);
+        float y0 = (float) y;
+        float y1 = (float) (y + h);
+        float z = zOffset * (inWorld ? -0.1F : 0.1F);
+        int a = argb >>> 24, r = argb >> 16 & 0xFF, g = argb >> 8 & 0xFF, b = argb & 0xFF;
 
-        float zOffsetAmount = renderMode == RenderMode.IN_WORLD_FIRST_PERSON || renderMode == RenderMode.IN_WORLD_ORTHOVIEW ? -0.1F : 0.1F;
+        RenderSystem.setShader(GameRenderer::getPositionColorShader);
+        RenderSystem.enableBlend();
+        RenderSystem.defaultBlendFunc();
 
         Tesselator tessellator = Tesselator.getInstance();
         BufferBuilder buffer = tessellator.getBuilder();
-        buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX);
-
-        buffer.vertex(matrix4f, (float) (-half + x), (float) y, zOffset * zOffsetAmount)
-                .uv(u * c, v * c).endVertex();
-        buffer.vertex(matrix4f, (float) (-half + x), (float) (h + y), zOffset * zOffsetAmount)
-                .uv(u * c, (v + vh) * c).endVertex();
-        buffer.vertex(matrix4f, (float) (-half + size + x), (float) (h + y), zOffset * zOffsetAmount)
-                .uv((u + uw) * c, (v + vh) * c).endVertex();
-        buffer.vertex(matrix4f, (float) (-half + size + x), (float) y, zOffset * zOffsetAmount)
-                .uv(((u + uw) * c), v * c).endVertex();
+        buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+        buffer.vertex(matrix4f, x0, y0, z).color(r, g, b, a).endVertex();
+        buffer.vertex(matrix4f, x0, y1, z).color(r, g, b, a).endVertex();
+        buffer.vertex(matrix4f, x1, y1, z).color(r, g, b, a).endVertex();
+        buffer.vertex(matrix4f, x1, y0, z).color(r, g, b, a).endVertex();
         tessellator.end();
-
-        // reset color
-        RenderSystem.setShaderColor(1,1,1,1);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hero/HeroClientEvents.java b/src/main/java/com/solegendary/reignofnether/hero/HeroClientEvents.java
index b65ab8298..c8044a618 100644
--- a/src/main/java/com/solegendary/reignofnether/hero/HeroClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/hero/HeroClientEvents.java
@@ -4,6 +4,7 @@
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.building.buildings.placements.ProductionPlacement;
 import com.solegendary.reignofnether.unit.HeroUnitSave;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.Minecraft;
 
 import java.util.ArrayList;
@@ -12,7 +13,7 @@ public class HeroClientEvents {
 
     private static final Minecraft MC = Minecraft.getInstance();
 
-    public static ArrayList<HeroUnitSave> fallenHeroes = new ArrayList<>();
+    public static ArrayList<HeroUnitSave> fallenHeroes = WorldState.client(new ArrayList<>());
 
     public static void addFallenHero(HeroUnitSave heroUnitSave) {
         if (MC.player != null && heroUnitSave.ownerName.equals(MC.player.getName().getString())) {
diff --git a/src/main/java/com/solegendary/reignofnether/hero/HeroServerEvents.java b/src/main/java/com/solegendary/reignofnether/hero/HeroServerEvents.java
index c52262b0a..a8b13ad0e 100644
--- a/src/main/java/com/solegendary/reignofnether/hero/HeroServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/hero/HeroServerEvents.java
@@ -14,6 +14,7 @@
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.unit.units.monsters.ZombieUnit;
 import com.solegendary.reignofnether.util.MiscUtil;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.core.NonNullList;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -31,7 +32,7 @@
 
 public class HeroServerEvents {
 
-    public static ArrayList<HeroUnitSave> fallenHeroes = new ArrayList<>();
+    public static ArrayList<HeroUnitSave> fallenHeroes = WorldState.server(new ArrayList<>());
 
     @SubscribeEvent
     public static void onLivingDeath(LivingDeathEvent evt) {
diff --git a/src/main/java/com/solegendary/reignofnether/hud/ControlGroup.java b/src/main/java/com/solegendary/reignofnether/hud/ControlGroup.java
index ef02f3dcf..9eaa90293 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/ControlGroup.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/ControlGroup.java
@@ -1,7 +1,8 @@
 package com.solegendary.reignofnether.hud;
 
-import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.alliance.AlliancesClient;
+import javax.annotation.Nullable;
+
 import com.solegendary.reignofnether.building.BuildingClientEvents;
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.hud.buttons.Button;
@@ -20,7 +21,9 @@
 import net.minecraft.world.entity.player.Player;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import static com.solegendary.reignofnether.building.BuildingClientEvents.getPlayerToBuildingRelationship;
 import static com.solegendary.reignofnether.building.BuildingClientEvents.getSelectedBuildings;
@@ -51,6 +54,16 @@ public int getKey() {
         return keybinding != null ? keybinding.getKey() : -1;
     }
 
+    @Nullable
+    public Keybinding getKeybinding() {
+        return keybinding;
+    }
+
+    @Nullable
+    public ResourceLocation getIcon() {
+        return iconRl;
+    }
+
     public void clearAll() {
         this.entityIds.clear();
         this.buildingBps.clear();
@@ -62,18 +75,19 @@ public boolean isEmpty() {
 
     // removes any entities/buildings that are no longer being tracked (likely dead/left world)
     public void clean() {
-        var ids = new ArrayList<>();
-        for (LivingEntity livingEntity : getAllUnits()) {
-            Integer id = livingEntity.getId();
-            ids.add(id);
+        // runs every frame for every group, so sets rather than list lookups, and nothing for an empty half
+        if (!this.entityIds.isEmpty()) {
+            Set<Integer> ids = new HashSet<>();
+            for (LivingEntity livingEntity : getAllUnits())
+                ids.add(livingEntity.getId());
+            this.entityIds.removeIf(e -> !ids.contains(e));
         }
-        this.entityIds.removeIf(e -> !ids.contains(e));
-        var poses = new ArrayList<>();
-        for (BuildingPlacement b2 : BuildingClientEvents.getBuildings()) {
-            BlockPos originPos = b2.originPos;
-            poses.add(originPos);
+        if (!this.buildingBps.isEmpty()) {
+            Set<BlockPos> poses = new HashSet<>();
+            for (BuildingPlacement b2 : BuildingClientEvents.getBuildings())
+                poses.add(b2.originPos);
+            this.buildingBps.removeIf(b -> !poses.contains(b));
         }
-        this.buildingBps.removeIf(b -> !poses.contains(b));
     }
 
     // assigns selected entities/buildings to this control group
@@ -109,8 +123,7 @@ else if (!saveableBuildings.isEmpty() && (!this.buildingBps.isEmpty() || newGrou
         // assign the icon resource (won't update if the front entity/building dies)
         if (newGroup) {
             if (hudSelectedEntity != null) {
-                String unitName = MiscUtil.getEntityIconName(hudSelectedEntity);
-                iconRl = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/mobheads/" + unitName + ".png");
+                iconRl = MiscUtil.mobHeadIcon(hudSelectedEntity);
             } else if (hudSelectedPlacement != null) {
                 iconRl = hudSelectedPlacement.getBuilding().icon;
             }
@@ -179,11 +192,8 @@ public Button getButton() {
                 if (!Keybindings.shiftMod.isDown())
                     loadToSelected();
             },
-            () -> {
-                if (Keybindings.shiftMod.isDown())
-                    clearAll();
-            },
-            List.of(fcs(I18n.get("hud.control_group.reignofnether.control_group", keybinding.buttonLabel)))
+            this::clearAll,
+            List.of(fcs(I18n.get("hud.control_group.reignofnether.control_group", keybinding.getCurrentLabel())))
         );
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/GlobalProductionQueue.java b/src/main/java/com/solegendary/reignofnether/hud/GlobalProductionQueue.java
new file mode 100644
index 000000000..860fd4ea2
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/GlobalProductionQueue.java
@@ -0,0 +1,77 @@
+package com.solegendary.reignofnether.hud;
+
+import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.building.BuildingPlacement;
+import com.solegendary.reignofnether.building.buildings.placements.ProductionPlacement;
+import com.solegendary.reignofnether.building.production.ActiveProduction;
+import com.solegendary.reignofnether.building.production.ProductionItem;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/** Everything a player has queued across all of their production buildings, grouped by item. */
+public final class GlobalProductionQueue {
+
+    private GlobalProductionQueue() { }
+
+    public static final class Group {
+        public final ProductionItem item;
+        public final List<ProductionPlacement> placements = new ArrayList<>();
+        // the queued entry closest to completion, and where it is
+        public ActiveProduction soonest;
+        public ProductionPlacement soonestPlacement;
+        public int count;
+        // true if one of the entries is actually being produced (front of its building's queue)
+        public boolean inProgress;
+
+        Group(ProductionItem item) {
+            this.item = item;
+        }
+
+        void add(ActiveProduction p, int index, ProductionPlacement placement) {
+            count++;
+            if (!placements.contains(placement))
+                placements.add(placement);
+            if (index == 0)
+                inProgress = true;
+            if (soonest == null || p.ticksLeft < soonest.ticksLeft) {
+                soonest = p;
+                soonestPlacement = placement;
+            }
+        }
+
+        /** 0 when just started, 1 when done. */
+        public float progress() {
+            if (soonest == null || !inProgress)
+                return 0f;
+            float total = soonest.item.getCost(true, soonestPlacement.ownerName).ticks;
+            return total <= 0 ? 1f : Math.max(0f, Math.min(1f, 1f - soonest.ticksLeft / total));
+        }
+
+        public int secondsLeft() {
+            return soonest == null ? 0 : (int) Math.ceil(soonest.ticksLeft / 20f);
+        }
+
+        public boolean isPopBlocked() {
+            return soonest != null && !soonest.item.isBelowPopulationSupply(soonestPlacement);
+        }
+    }
+
+    public static List<Group> forPlayer(String playerName) {
+        if (playerName == null)
+            return Collections.emptyList();
+        Map<ProductionItem, Group> grouped = new LinkedHashMap<>();
+        for (BuildingPlacement b : BuildingClientEvents.getBuildings()) {
+            if (b instanceof ProductionPlacement p && playerName.equals(p.ownerName)) {
+                for (int i = 0; i < p.productionQueue.size(); i++) {
+                    ActiveProduction production = p.productionQueue.get(i);
+                    grouped.computeIfAbsent(production.item, Group::new).add(production, i, p);
+                }
+            }
+        }
+        return new ArrayList<>(grouped.values());
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/GlobalProductionQueueRenderer.java b/src/main/java/com/solegendary/reignofnether/hud/GlobalProductionQueueRenderer.java
deleted file mode 100644
index 703366919..000000000
--- a/src/main/java/com/solegendary/reignofnether/hud/GlobalProductionQueueRenderer.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.solegendary.reignofnether.hud;
-
-import com.mojang.datafixers.util.Pair;
-import com.solegendary.reignofnether.building.BuildingClientEvents;
-import com.solegendary.reignofnether.building.BuildingPlacement;
-import com.solegendary.reignofnether.building.buildings.placements.ProductionPlacement;
-import com.solegendary.reignofnether.building.production.ActiveProduction;
-import com.solegendary.reignofnether.building.production.ProductionItem;
-import com.solegendary.reignofnether.hud.buttons.Button;
-import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
-import com.solegendary.reignofnether.unit.UnitClientEvents;
-import com.solegendary.reignofnether.util.MyRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.util.FormattedCharSequence;
-import net.minecraft.util.Mth;
-
-import java.util.*;
-
-import static com.solegendary.reignofnether.hud.HudClientEvents.hudSelectedPlacement;
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
-
-public class GlobalProductionQueueRenderer {
-
-    private static final Minecraft MC = Minecraft.getInstance();
-
-    private static class ProductionQueueGroup {
-        final ProductionItem item;
-        final List<ProductionPlacement> placements = new ArrayList<>();
-        ActiveProduction activeProd;
-        ProductionPlacement placement;
-        int count;
-        boolean includesFront;
-
-        ProductionQueueGroup(ProductionItem item) { this.item = item; }
-
-        void add(ActiveProduction p, int idx, ProductionPlacement plac) {
-            count++;
-            if (!placements.contains(plac)) placements.add(plac);
-            if (idx == 0) includesFront = true;
-            if (activeProd == null || p.ticksLeft < activeProd.ticksLeft) { activeProd = p; placement = plac; }
-        }
-
-        float getProgress() {
-            if (activeProd == null || placement == null) return 0f;
-            float total = activeProd.item.getCost(true, placement.ownerName).ticks;
-            return total <= 0 ? 0f : activeProd.ticksLeft / total;
-        }
-    }
-
-    private static void aggregateQueue(ProductionPlacement placement, Map<ProductionItem, ProductionQueueGroup> grouped, List<ProductionQueueGroup> ordered) {
-        for (int i = 0; i < placement.productionQueue.size(); i++) {
-            ActiveProduction production = placement.productionQueue.get(i);
-            ProductionQueueGroup group = grouped.computeIfAbsent(production.item, k -> {
-                ProductionQueueGroup g = new ProductionQueueGroup(k);
-                ordered.add(g);
-                return g;
-            });
-            group.add(production, i, placement);
-        }
-    }
-
-    private static List<ProductionQueueGroup> groupPlayerProductionQueues(String playerName) {
-        if (playerName == null) return Collections.emptyList();
-        LinkedHashMap<ProductionItem, ProductionQueueGroup> grouped = new LinkedHashMap<>();
-        ArrayList<ProductionQueueGroup> ordered = new ArrayList<>();
-        for (BuildingPlacement b : BuildingClientEvents.getBuildings()) {
-            if (b instanceof ProductionPlacement p && playerName.equals(p.ownerName))
-                aggregateQueue(p, grouped, ordered);
-        }
-        return ordered;
-    }
-
-    private static void renderQueueGroupCount(GuiGraphics guiGraphics, int x, int y, int iconFrameSize, int count) {
-        if (count <= 1) return;
-        String countText = String.valueOf(count);
-        int textWidth = MC.font.width(countText);
-        guiGraphics.drawString(MC.font, countText, x + iconFrameSize - textWidth - 3, y + iconFrameSize - 10, 0xFFFFFF);
-    }
-
-    private static Button createQueueButton(ProductionQueueGroup group) {
-        Button btn = group.item.getCancelButton(group.placement, group.includesFront);
-        btn.onLeftClick = () -> {
-            if (group.placements.isEmpty()) return;
-            ProductionPlacement next = group.placements.get(0);
-            if (hudSelectedPlacement instanceof ProductionPlacement && group.placements.contains(hudSelectedPlacement)) {
-                next = group.placements.get((group.placements.indexOf(hudSelectedPlacement) + 1) % group.placements.size());
-            }
-            BuildingClientEvents.clearSelectedBuildings();
-            UnitClientEvents.clearSelectedUnits();
-            BuildingClientEvents.addSelectedBuilding(next);
-            OrthoviewClientEvents.centreCameraOnPos(next.centrePos);
-        };
-        float frac = Mth.clamp(group.getProgress(), 0f, 1f);
-        btn.greyPercent = 1 - (group.includesFront ? frac : 0.99f);
-
-        List<FormattedCharSequence> tooltip = new ArrayList<>();
-        tooltip.add(fcs(btn.name));
-        int progressPercent = Math.round((1.0f - frac) * 100f);
-        if (progressPercent > 0)
-            tooltip.add(fcs(progressPercent + "%"));
-        btn.tooltipLines = tooltip;
-        return btn;
-    }
-
-    public static Pair<RectZone, List<Button>> renderQueue(GuiGraphics guiGraphics, String playerName, int baseX, int baseY, int mouseX, int mouseY) {
-        List<ProductionQueueGroup> groupedQueue = groupPlayerProductionQueues(playerName);
-
-        RectZone hudZone = RectZone.getZoneByLW(0,0,0,0);
-        List<Button> renderedButtons = new ArrayList<>();
-
-        if (groupedQueue.isEmpty())
-            return new Pair<>(hudZone, renderedButtons);
-
-        int iconFrameSize = Button.DEFAULT_ICON_FRAME_SIZE;
-        int iconsPerRow = 5;
-        int rows = (int) Math.ceil((double) groupedQueue.size() / iconsPerRow);
-
-        hudZone = MyRenderer.renderFrameWithBg(guiGraphics, baseX, baseY,
-                iconFrameSize * Math.min(groupedQueue.size(), iconsPerRow) + 10,
-                iconFrameSize * rows + 10, 0xA0000000);
-
-        int startX = baseX + 5, startY = baseY + 5;
-        for (int i = 0; i < groupedQueue.size(); i++) {
-            ProductionQueueGroup group = groupedQueue.get(i);
-            int iconX = startX + (i % iconsPerRow) * iconFrameSize;
-            int iconY = startY + (i / iconsPerRow) * iconFrameSize;
-
-            Button btn = createQueueButton(group);
-            btn.render(guiGraphics, iconX, iconY, mouseX, mouseY);
-            renderedButtons.add(btn);
-            renderQueueGroupCount(guiGraphics, iconX, iconY, iconFrameSize, group.count);
-
-            if (btn.isMouseOver(mouseX, mouseY)) btn.renderTooltip(guiGraphics, mouseX, mouseY);
-        }
-        return new Pair<>(hudZone, renderedButtons);
-    }
-}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/HudClientEvents.java b/src/main/java/com/solegendary/reignofnether/hud/HudClientEvents.java
index 78a63a4cd..bd1de5b77 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/HudClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/HudClientEvents.java
@@ -1,67 +1,55 @@
 package com.solegendary.reignofnether.hud;
 
 import com.mojang.datafixers.util.Pair;
-import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.ability.Ability;
-import com.solegendary.reignofnether.ability.HeroAbility;
-import com.solegendary.reignofnether.ability.abilities.CallToArmsUnit;
-import com.solegendary.reignofnether.alliance.AlliancesClient;
 import com.solegendary.reignofnether.api.ReignOfNetherRegistries;
-import com.solegendary.reignofnether.attackwarnings.AttackWarningClientEvents;
-import com.solegendary.reignofnether.building.*;
-import com.solegendary.reignofnether.building.addon.GarrisonableBuildingAddon;
-import com.solegendary.reignofnether.building.addon.ItemShopAddon;
-import com.solegendary.reignofnether.building.buildings.placements.BeaconPlacement;
+import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.building.buildings.placements.ItemShopPlacement;
-import com.solegendary.reignofnether.building.buildings.placements.ProductionPlacement;
 import com.solegendary.reignofnether.building.custombuilding.CustomBuilding;
 import com.solegendary.reignofnether.building.custombuilding.CustomBuildingClientEvents;
-import com.solegendary.reignofnether.building.production.ActiveProduction;
-import com.solegendary.reignofnether.config.ConfigClientEvents;
-import com.solegendary.reignofnether.config.ReignOfNetherClientConfigs;
 import com.solegendary.reignofnether.cursor.CursorClientEvents;
-import com.solegendary.reignofnether.gamemode.ClientGameModeHelper;
-import com.solegendary.reignofnether.gamemode.GameMode;
-import com.solegendary.reignofnether.gamerules.GameruleClient;
 import com.solegendary.reignofnether.guiscreen.TopdownGui;
+import org.lwjgl.opengl.GL11;
+import com.mojang.blaze3d.systems.RenderSystem;
 import com.solegendary.reignofnether.hud.buttons.Button;
-import com.solegendary.reignofnether.hud.custombutton.CustomButton;
-import com.solegendary.reignofnether.hud.custombutton.CustomButtonClientEvents;
-import com.solegendary.reignofnether.hud.buttons.*;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.hud.panels.ButtonCell;
+import com.solegendary.reignofnether.hud.panels.CommandCard;
+import com.solegendary.reignofnether.chat.ChatLines;
+import com.solegendary.reignofnether.chat.ChatPanel;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
+import com.solegendary.reignofnether.hud.panels.MinimapTools;
+import com.solegendary.reignofnether.hud.panels.SelectionPanel;
+import com.solegendary.reignofnether.hud.panels.SpectatorHud;
+import com.solegendary.reignofnether.chat.SpectatorFeed;
+import com.solegendary.reignofnether.hud.panels.TopLeftPanel;
+import com.solegendary.reignofnether.hud.panels.TopRightPanel;
 import com.solegendary.reignofnether.hud.playerdisplay.PlayerDisplayClientEvents;
 import com.solegendary.reignofnether.items.ItemClientEvents;
 import com.solegendary.reignofnether.items.ItemShopMenu;
-import com.solegendary.reignofnether.items.RandomItemDropRule;
-import com.solegendary.reignofnether.items.UnitInventory;
 import com.solegendary.reignofnether.keybinds.Keybinding;
 import com.solegendary.reignofnether.keybinds.Keybindings;
 import com.solegendary.reignofnether.minimap.MinimapClientEvents;
+import com.solegendary.reignofnether.minimap.StrategicMapClientEvents;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import com.solegendary.reignofnether.player.PlayerClientEvents;
-import com.solegendary.reignofnether.player.PlayerColors;
-import com.solegendary.reignofnether.player.RTSPlayer;
-import com.solegendary.reignofnether.research.ResearchClient;
-import com.solegendary.reignofnether.resources.ResourceName;
-import com.solegendary.reignofnether.resources.ResourceSources;
-import com.solegendary.reignofnether.resources.Resources;
-import com.solegendary.reignofnether.resources.ResourcesClientEvents;
-import com.solegendary.reignofnether.sandbox.SandboxActionButtons;
 import com.solegendary.reignofnether.sandbox.SandboxClientEvents;
-import com.solegendary.reignofnether.sandbox.SandboxMenuType;
-import com.solegendary.reignofnether.scenario.ScenarioClientEvents;
+import com.solegendary.reignofnether.sandbox.SandboxPanel;
 import com.solegendary.reignofnether.startpos.StartPos;
 import com.solegendary.reignofnether.startpos.StartPosClientEvents;
-import com.solegendary.reignofnether.survival.SurvivalClientEvents;
 import com.solegendary.reignofnether.tutorial.TutorialClientEvents;
-import com.solegendary.reignofnether.tutorial.TutorialStage;
-import com.solegendary.reignofnether.unit.NonUnitClientEvents;
-import com.solegendary.reignofnether.unit.Relationship;
-import com.solegendary.reignofnether.unit.UnitAction;
+import com.solegendary.reignofnether.ui.HudScale;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.hud.buttons.HelperButtons;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Toast;
+import com.solegendary.reignofnether.ui.Tooltip;
 import com.solegendary.reignofnether.unit.UnitClientEvents;
-import com.solegendary.reignofnether.unit.interfaces.AttackerUnit;
 import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
-import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
 import com.solegendary.reignofnether.unit.units.monsters.*;
 import com.solegendary.reignofnether.unit.units.piglins.BabyHoglinUnit;
 import com.solegendary.reignofnether.unit.units.piglins.HeadhunterUnit;
@@ -71,81 +59,65 @@
 import com.solegendary.reignofnether.unit.units.villagers.RavagerUnit;
 import com.solegendary.reignofnether.unit.units.villagers.VillagerUnit;
 import com.solegendary.reignofnether.util.MiscUtil;
-import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.ChatScreen;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.model.Model;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Style;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.world.item.BannerItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.phys.Vec2;
 import net.minecraftforge.client.event.*;
+import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import org.lwjgl.glfw.GLFW;
 
-import java.awt.*;
+import javax.annotation.Nullable;
 import java.util.*;
-import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.solegendary.reignofnether.hud.buttons.HelperButtons.*;
-import static com.solegendary.reignofnether.tutorial.TutorialClientEvents.helpButton;
-import static com.solegendary.reignofnether.unit.UnitClientEvents.*;
-import static com.solegendary.reignofnether.util.MiscUtil.capitaliseAndSpace;
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
-import static com.solegendary.reignofnether.hud.playerdisplay.PlayerDisplayClientEvents.diplomacyButton;
-import static com.solegendary.reignofnether.hud.playerdisplay.PlayerDisplayClientEvents.observerButton;
+import static com.solegendary.reignofnether.unit.UnitClientEvents.getSelectedUnits;
 
+/**
+ * The RTS HUD. Each frame it lays out the screen ({@link HudLayout}), draws the panels in order and
+ * keeps what it drew in a {@link HudFrame}, which then answers clicks, hotkeys and "is the mouse over
+ * the HUD" for the rest of the mod.
+ */
 public class HudClientEvents {
 
     private static final Minecraft MC = Minecraft.getInstance();
 
     public static boolean enabled = true;
 
-    private static String tempMsg = "";
-    private static int tempMsgTicksLeft = 0;
-    private static final int TEMP_MSG_TICKS_FADE = 50; // ticks left when the msg starts to fade
-    private static final int TEMP_MSG_TICKS_MAX = 150; // ticks to show the msg for
-    private static final int MAX_BUTTONS_PER_ROW = 6;
-
     public static final ArrayList<ControlGroup> controlGroups = new ArrayList<>(10);
 
-    private static final ArrayList<Button> buildingButtons = new ArrayList<>();
-    private static final ArrayList<Button> unitButtons = new ArrayList<>();
-    private static final ArrayList<Button> productionButtons = new ArrayList<>();
-    // buttons which are rendered at the moment in RenderEvent
-    private static final ArrayList<Button> renderedButtons = new ArrayList<>();
-
     // unit that is selected in the list of unit icons
     public static LivingEntity hudSelectedEntity = null;
     // building that is selected in the list of unit icons
     public static BuildingPlacement hudSelectedPlacement = null;
-    // classes used to render unit or building portrait (mode, frame, healthbar, stats)
+    static {
+        WorldState.onClientReset(() -> {
+            hudSelectedEntity = null;
+            hudSelectedPlacement = null;
+        });
+    }
+    // 3D model of the selected unit for its portrait
     public static PortraitRendererUnit portraitRendererUnit = new PortraitRendererUnit();
-    public static PortraitRendererBuilding portraitRendererBuilding = new PortraitRendererBuilding();
-
-    private static RectZone unitPortraitZone = null;
-    private static RectZone buildingPortraitZone = null;
 
+    // mouse position in GUI coordinates (other systems use these)
     public static int mouseX = 0;
     public static int mouseY = 0;
-    private static int mouseLeftDownX = 0;
-    private static int mouseLeftDownY = 0;
+    private static int leftDownHudX = 0;
+    private static int leftDownHudY = 0;
 
-    private final static int iconBgColour = 0x64000000;
-    private final static int frameBgColour = 0xA0000000;
-
-    private static final ArrayList<RectZone> hudZones = new ArrayList<>();
+    // what the HUD drew last frame, used to answer input between frames
+    @Nullable
+    private static HudFrame lastFrame = null;
 
     private static boolean showPreselectedBlockInfo = true;
 
@@ -277,21 +249,19 @@ public static String getModifiedEntityName(LivingEntity entity) {
     }
 
     public static void showTempMessageI18n(String msgKey) {
-        showTemporaryMessage(I18n.get(msgKey), TEMP_MSG_TICKS_MAX);
+        Toast.show(I18n.get(msgKey), Toast.DEFAULT_TICKS);
     }
 
     public static void showTempMessageI18n(String msgKey, int ticks) {
-        tempMsgTicksLeft = ticks;
-        tempMsg = I18n.get(msgKey);
+        Toast.show(I18n.get(msgKey), ticks);
     }
 
     public static void showTemporaryMessage(String msg) {
-        showTemporaryMessage(msg, TEMP_MSG_TICKS_MAX);
+        Toast.show(msg, Toast.DEFAULT_TICKS);
     }
 
     public static void showTemporaryMessage(String msg, int ticks) {
-        tempMsgTicksLeft = ticks;
-        tempMsg = msg;
+        Toast.show(msg, ticks);
     }
 
     public static void removeFromControlGroups(int entityId) {
@@ -310,1725 +280,313 @@ public static void onInput(InputEvent.Key evt) {
 
     @SubscribeEvent
     public static void onDrawScreen(ScreenEvent.Render.Post evt) {
-        if (!OrthoviewClientEvents.isEnabled() || !(evt.getScreen() instanceof TopdownGui) || !enabled) {
+        if (!OrthoviewClientEvents.isEnabled() || !(evt.getScreen() instanceof TopdownGui) || MC.level == null) {
+            lastFrame = null;
             return;
         }
-        if (MC.level == null) {
-            return;
-        }
-        
         mouseX = evt.getMouseX();
         mouseY = evt.getMouseY();
-        
-        // where to start drawing the centre hud (from left to right: portrait, stats, unit icon buttons)
-        int hudStartingXPos = Button.DEFAULT_ICON_FRAME_SIZE * 6 + (Button.DEFAULT_ICON_FRAME_SIZE / 2);
-
-        ArrayList<LivingEntity> selUnits = UnitClientEvents.getSortedSelectedUnits();
-        ArrayList<BuildingPlacement> selBuildings = BuildingClientEvents.getSelectedBuildings();
-
-        // create all the unit buttons for this frame
-        int screenWidth = MC.getWindow().getGuiScaledWidth();
-        int screenHeight = MC.getWindow().getGuiScaledHeight();
+        HudFrame f = render(evt.getGuiGraphics(), mouseX, mouseY, true);
+        lastFrame = f;
+    }
 
-        int iconSize = 14;
-        int iconFrameSize = Button.DEFAULT_ICON_FRAME_SIZE;
+    /** Draws the HUD under the chat panel, which replaces the RTS screen while open; not interactive. */
+    public static void renderUnderChat(GuiGraphics g) {
+        renderUnder(g, false);
+    }
 
-        // screenWidth ranges roughly between 440-540
-        int buttonsPerRow = (int) Math.ceil((float) (screenWidth - 340) / iconFrameSize);
-        buttonsPerRow = Math.min(buttonsPerRow, 8);
-        buttonsPerRow = Math.max(buttonsPerRow, 4);
+    /** The HUD under another screen (Esc, the match screens), not interactive; showChat keeps its recent lines. */
+    public static void renderUnder(GuiGraphics g, boolean showChat) {
+        if (OrthoviewClientEvents.isEnabled() && MC.level != null) {
+            render(g, Integer.MIN_VALUE / 2, Integer.MIN_VALUE / 2, showChat);
+            // text is batched to the end of the frame and sits a little in front in depth: draw it now and forget
+            // its depth, so the screen's background (Esc's grey, the match screens' wash) covers all of it
+            g.flush();
+            RenderSystem.clear(GL11.GL_DEPTH_BUFFER_BIT, Minecraft.ON_OSX);
+        }
+    }
 
-        int buildingProdRows = 0;
+    // between closing a menu and the RTS screen opening again there are frames with no screen: the HUD stays
+    @SubscribeEvent
+    public static void onRenderGuiWithoutScreen(RenderGuiEvent.Post evt) {
+        if (MC.screen == null)
+            renderUnder(evt.getGuiGraphics(), true);
+    }
 
-        buildingButtons.clear();
-        unitButtons.clear();
-        productionButtons.clear();
-        renderedButtons.clear();
-        hudZones.clear();
-        unitPortraitZone = null;
-        buildingPortraitZone = null;
+    private static HudFrame render(GuiGraphics g, int mouseX, int mouseY, boolean showChat) {
+        HudScale scale = HudGeometry.scale();
+        HudLayout layout = HudGeometry.layout();
+
+        if (!enabled) {
+            renderHiddenPill(g, scale, layout);
+            return null;
+        }
+        updateSelectedPlacement();
+
+        HudFrame f = new HudFrame(g, scale, layout, scale.toUnits(mouseX), scale.toUnits(mouseY));
+        SelectionPanel.prepare();
+
+        g.pose().pushPose();
+        g.pose().scale(scale.poseScale(), scale.poseScale(), 1);
+        StrategicMapClientEvents.render(f);
+        renderConsole(f, layout);
+        renderMapFrame(f, layout);
+        g.pose().popPose();
+
+        MinimapClientEvents.render(g);
+
+        g.pose().pushPose();
+        g.pose().scale(scale.poseScale(), scale.poseScale(), 1);
+        // the command card goes first so its keys win over anything else bound to the same key
+        if (!SelectionPanel.isEmpty()) // nothing selected, nothing to command
+            CommandCard.render(f);
+        SelectionPanel.render(f);
+        MinimapTools.render(f);
+        if (SpectatorHud.isActive())
+            SpectatorHud.render(f);
+        else
+            TopLeftPanel.render(f);
+        TopRightPanel.render(f);
+        SandboxPanel.render(f);
+        PlayerDisplayClientEvents.render(f);
+        renderItemShop(f);
+        renderOverlays(f);
+        if (showChat) {
+            renderChatButtonAndRecent(f);
+        }
+        g.pose().popPose();
+
+        renderStartPositions(f);
+
+        g.pose().pushPose();
+        g.pose().scale(scale.poseScale(), scale.poseScale(), 1);
+        f.showHoveredTooltip();
+        Tooltip.renderPending(g, layout.width(), layout.height());
+        TutorialClientEvents.checkAndRenderNextAction(g, f.placed());
+        g.pose().popPose();
+        return f;
+    }
 
-        int blitX = hudStartingXPos;
-        int blitY = MC.getWindow().getGuiScaledHeight();
-        int blitXStart = blitX;
+    /** Chat button at the bottom-left, where chat shows; recent messages stack up from above it. */
+    private static void renderChatButtonAndRecent(HudFrame f) {
+        int size = 18;
+        int x = HudLayout.MARGIN;
+        int y = f.layout.console().y() - HudLayout.GAP * 4 - size;
+        Button chat = HelperButtons.chatButton;
+        if (!chat.isHidden.get()) {
+            // the key is only in the tooltip
+            Rect cell = new Rect(x, y, size, size);
+            String key = MC.options.keyChat.getTranslatedKeyMessage().getString();
+            ButtonCell.render(f.g, chat, x, y, size, null, f.hovered(cell));
+            f.register(chat, cell, null, () -> ButtonCell.tooltipFor(chat, key));
+            y -= HudLayout.GAP;
+        }
+        ChatLines.renderRecent(f.g, x, y, 300);
+    }
 
-        // assign hudSelectedBuilding like hudSelectedUnit in onRenderLiving
-        if (selBuildings.size() <= 0) {
+    // assign hudSelectedPlacement like hudSelectedEntity in onRenderLiving
+    private static void updateSelectedPlacement() {
+        List<BuildingPlacement> selBuildings = BuildingClientEvents.getSelectedBuildings();
+        if (selBuildings.isEmpty())
             hudSelectedPlacement = null;
-        } else if (hudSelectedPlacement == null || selBuildings.size() == 1
-            || !selBuildings.contains(hudSelectedPlacement)) {
+        else if (hudSelectedPlacement == null || selBuildings.size() == 1 || !selBuildings.contains(hudSelectedPlacement))
             hudSelectedPlacement = selBuildings.get(0);
-        }
-
-        // --------
-        // ItemShop
-        // --------
-        int x = blitX;
-        int y = blitY - 145;
-
-        boolean isShopOpen = ItemClientEvents.openItemShop != null && !ItemClientEvents.openItemShop.isDestroyedServerside;
-        boolean isShopSelected = isShopOpen && hudSelectedPlacement == ItemClientEvents.openItemShop;
-        if (isShopOpen && ItemClientEvents.ENABLED) {
-            ItemShopAddon itemShop = ItemClientEvents.openItemShop.getBuilding().getActiveAddon(ItemShopAddon.class);
-            if (itemShop != null) {
-                boolean isServedUnitSelected = ItemClientEvents.openItemShop.getServedUnit() == HudClientEvents.hudSelectedEntity && HudClientEvents.hudSelectedEntity != null;
-                if (isShopSelected || isServedUnitSelected) {
-                    hudZones.add(ItemShopMenu.renderFrame(evt.getGuiGraphics(), itemShop, x, y));
-                    renderedButtons.addAll(ItemShopMenu.renderButtons(evt.getGuiGraphics(), itemShop, x, y, mouseX, mouseY));
-                }
-            }
-        }
-
-        if (hudSelectedPlacement != null) {
-            boolean hudSelBuildingOwned =
-                BuildingClientEvents.getPlayerToBuildingRelationship(hudSelectedPlacement) == Relationship.OWNED ||
-                        SandboxClientEvents.isSandboxPlayer();
-                        //AlliancesClient.canControlAlly(hudSelectedPlacement.ownerName) ||
-
-            // -----------------
-            // Building portrait
-            // -----------------
-            blitY -= portraitRendererBuilding.frameHeight;
-
-            buildingPortraitZone = portraitRendererBuilding.render(evt.getGuiGraphics(),
-                blitX,
-                blitY,
-                hudSelectedPlacement
-            );
-            hudZones.add(buildingPortraitZone);
-
-            blitX += portraitRendererBuilding.frameWidth + 10;
-
-            blitXStart = blitX + 20;
-
-            // ---------------------------
-            // Multiple selected buildings
-            // ---------------------------
-            for (BuildingPlacement building : selBuildings) {
-                if (hudSelBuildingOwned && buildingButtons.size() < (buttonsPerRow * 2)) {
-                    String name = "";
-                    if (building.getBuilding() instanceof CustomBuilding customBuilding) {
-                        name = customBuilding.name;
-                    } else {
-                        ResourceLocation rl = ReignOfNetherRegistries.BUILDING.getKey(building.getBuilding());
-                        if (rl != null) {
-                            name = I18n.get("buildings.reignofnether." + rl.getPath());
-                        }
-                    }
-                    buildingButtons.add(new ButtonBuilder(name)
-                        .iconSize(iconSize)
-                        .iconResource(building.getBuilding().icon)
-                        .isSelected(() -> hudSelectedPlacement.getBuilding() == building.getBuilding())
-                        .onLeftClick(() -> {
-                            // click to select this unit type as a group
-                            if (hudSelectedPlacement.getBuilding() == building.getBuilding()) {
-                                BuildingClientEvents.clearSelectedBuildings();
-                                BuildingClientEvents.addSelectedBuilding(building);
-                            } else { // select this one specific unit
-                                hudSelectedPlacement = building;
-                            }
-                        })
-                        .tooltipLines(List.of(fcs(name)))
-                        .build()
-                    );
-                }
-            }
-
-            if (buildingButtons.size() >= 2) {
-                blitX += 20;
-                blitY += 6;
-                // background frame
-                hudZones.add(MyRenderer.renderFrameWithBg(evt.getGuiGraphics(),
-                    blitX - 5,
-                    blitY - 10,
-                    iconFrameSize * buttonsPerRow + 10,
-                    iconFrameSize * 2 + 20,
-                    frameBgColour
-                ));
-
-                int buttonsRendered = 0;
-                for (Button buildingButton : buildingButtons) {
-                    // replace last icon with a +X number of buildings icon and hover tooltip for what those
-                    // buildings are
-                    if (buttonsRendered >= (buttonsPerRow * 2) - 1 && selBuildings.size() > (buttonsPerRow * 2)) {
-                        int numExtraBuildings = selBuildings.size() - (buttonsPerRow * 2) + 1;
-                        RectZone plusBuildingsZone = MyRenderer.renderIconFrameWithBg(evt.getGuiGraphics(),
-                            buildingButton.frameResource,
-                            blitX,
-                            blitY,
-                            iconFrameSize,
-                            iconBgColour
-                        );
-                        evt.getGuiGraphics().drawCenteredString(
-                            MC.font,
-                            "+" + numExtraBuildings,
-                            blitX + iconFrameSize / 2,
-                            blitY + 8,
-                            0xFFFFFF
-                        );
-
-                        if (plusBuildingsZone.isMouseOver(mouseX, mouseY)) {
-                            List<FormattedCharSequence> tooltipLines = new ArrayList<>();
-                            Map<String, Integer> extraBuildingsMap = new HashMap<>();
-
-                            for (int i = selBuildings.size() - numExtraBuildings; i < selBuildings.size(); i++) {
-                                BuildingPlacement placement = selBuildings.get(i);
-                                Building building = placement.getBuilding();
-                                ResourceLocation rl = ReignOfNetherRegistries.BUILDING.getKey(building);
-                                if (rl != null) {
-                                    String buildingName = I18n.get("buildings.reignofnether." + rl.getPath());
-                                    if (extraBuildingsMap.containsKey(buildingName))
-                                        extraBuildingsMap.put(buildingName, extraBuildingsMap.get(buildingName) + 1);
-                                    else
-                                        extraBuildingsMap.put(buildingName, 1);
-                                }
-                            }
-                            for (String buildingName : extraBuildingsMap.keySet()) {
-                                int numBuildings = extraBuildingsMap.get(buildingName);
-                                tooltipLines.add(fcs("x" + numBuildings + " " + buildingName));
-                            }
-                            MyRenderer.renderTooltip(evt.getGuiGraphics(), tooltipLines, mouseX, mouseY);
-                        }
-                        break;
-                    } else {
-                        buildingButton.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                        renderedButtons.add(buildingButton);
-                        buildingButton.renderHealthBar(evt.getGuiGraphics().pose());
-                        blitX += iconFrameSize;
-                        if (buttonsRendered == buttonsPerRow - 1) {
-                            blitX = blitXStart;
-                            blitY += iconFrameSize + 6;
-                        }
-                    }
-                    buttonsRendered += 1;
-                }
-            }
-
-            // ---------------------------------------------------------------
-            // Building production queue (show only if 1 building is selected)
-            // ---------------------------------------------------------------
-            else if ((hudSelBuildingOwned || !PlayerClientEvents.isRTSPlayer()) && hudSelectedPlacement instanceof ProductionPlacement selProdBuilding) {
-                blitY = screenHeight - iconFrameSize * 2 - 5;
-
-                for (int i = 0; i < selProdBuilding.productionQueue.size(); i++) {
-                    Button button = selProdBuilding.productionQueue.get(i)
-                            .item.getCancelButton(selProdBuilding, i == 0);
-                    if (!hudSelBuildingOwned) {
-                        button.onLeftClick = () -> { };
-                        button.onRightClick = () -> { };
-                    }
-                    productionButtons.add(button);
-                }
-
-                if (productionButtons.size() >= 1) {
-                    // background frame
-                    hudZones.add(MyRenderer.renderFrameWithBg(evt.getGuiGraphics(),
-                        blitX - 5,
-                        blitY - 10,
-                        iconFrameSize * buttonsPerRow + 10,
-                        iconFrameSize * 2 + 15,
-                        frameBgColour
-                    ));
-
-                    // name and progress %
-                    ActiveProduction firstProdItem = selProdBuilding.productionQueue.get(0);
-                    float percentageDoneInv = firstProdItem.ticksLeft / firstProdItem.item.getCost(true, selProdBuilding.ownerName).ticks;
-
-                    int colour = 0xFFFFFF;
-                    if (!firstProdItem.item.isBelowPopulationSupply(selProdBuilding)) {
-                        colour = 0xFF0000;
-                        if (percentageDoneInv <= 0) {
-                            percentageDoneInv = 0.01f;
-                        }
-                    }
-                    evt.getGuiGraphics().drawString(
-                        MC.font,
-                        Math.round(100 - (percentageDoneInv * 100f)) + "% " + productionButtons.get(0).name,  // TODO: translatable
-                        blitX + iconFrameSize + 5,
-                        blitY + 2,
-                        colour
-                    );
-
-                    int buttonsRendered = 0;
-                    for (Button prodButton : productionButtons) {
-                        // top row for currently-in-progress item
-                        if (buttonsRendered == 0) {
-                            prodButton.greyPercent = 1 - percentageDoneInv;
-                            prodButton.render(evt.getGuiGraphics(), blitX, blitY - 5, mouseX, mouseY);
-                            renderedButtons.add(prodButton);
-                        }
-                        // replace last icon with a +X number of production items left in queue
-                        else if (buttonsRendered >= buttonsPerRow && productionButtons.size() > (buttonsPerRow + 1)) {
-                            int numExtraItems = productionButtons.size() - buttonsPerRow;
-                            MyRenderer.renderIconFrameWithBg(evt.getGuiGraphics(),
-                                prodButton.frameResource,
-                                blitX,
-                                blitY + iconFrameSize,
-                                iconFrameSize,
-                                iconBgColour
-                            );
-                            evt.getGuiGraphics().drawCenteredString(
-                                MC.font,
-                                "+" + numExtraItems,
-                                blitX + iconFrameSize / 2,
-                                blitY + iconFrameSize + 8,
-                                0xFFFFFF
-                            );
-                            break;
-                        }
-                        // bottom row for all other queued items
-                        else {
-                            prodButton.render(evt.getGuiGraphics(), blitX, blitY + iconFrameSize, mouseX, mouseY);
-                            renderedButtons.add(prodButton);
-                            blitX += iconFrameSize;
-                        }
-                        buttonsRendered += 1;
-                    }
-                }
-            }
-
-
-            // ---------------------------
-            // Building production buttons
-            // ---------------------------
-            blitX = 0;
-            blitY = screenHeight - iconFrameSize;
-
-            if (hudSelectedPlacement != null && (hudSelBuildingOwned || !PlayerClientEvents.isRTSPlayer())) {
-                if (!hudSelectedPlacement.isBuilt) {
-                    if (!buildingCancelButton.isHidden.get()) {
-                        buildingCancelButton.render(evt.getGuiGraphics(), 0, screenHeight - iconFrameSize, mouseX, mouseY);
-                        renderedButtons.add(buildingCancelButton);
-                    }
-                }
-                if (hudSelectedPlacement.isBuilt || hudSelectedPlacement.allowProdWhileBuilding) {
-
-                    List<AbilityButton> buildingAbilities = List.of();
-                    if (hudSelectedPlacement.isBuilt) {
-                        buildingAbilities = hudSelectedPlacement.getAbilityButtons()
-                                .stream()
-                                .filter(b -> b != null && !b.isHidden.get())
-                                .toList();
-                    }
-                    if (buildingAbilities.size() > 0 || !hudSelectedPlacement.isBuilt) {
-                        blitY -= Button.DEFAULT_ICON_FRAME_SIZE;
-                    }
-
-                    int rowButtons = 0;
-                    if (ItemClientEvents.ENABLED && hudSelectedPlacement instanceof ItemShopPlacement itemShopPlacement) {
-                        Button shopMenuButton = new ButtonBuilder("Shop Menu")
-                                .iconResource(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/emerald.png"))
-                                .tooltipLines(List.of(fcs(I18n.get("itemshop.reignofnether.toggle_menu"))))
-                                .isHidden(() -> itemShopPlacement.getStockedItems().isEmpty())
-                                .isSelected(() -> ItemClientEvents.openItemShop == hudSelectedPlacement)
-                                .onLeftClick(() -> {
-                                    if (ItemClientEvents.openItemShop == hudSelectedPlacement)
-                                        ItemClientEvents.openItemShop = null;
-                                    else
-                                        ItemClientEvents.openItemShop = itemShopPlacement;
-                                })
-                                .hotkey(Keybindings.openShop)
-                                .build();
-                        if (!shopMenuButton.isHidden.get()) {
-                            shopMenuButton.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                            productionButtons.add(shopMenuButton);
-                            renderedButtons.add(shopMenuButton);
-                            blitX += iconFrameSize;
-                            buildingProdRows += 1;
-                        }
-                    }
-
-                    if (hudSelectedPlacement instanceof ProductionPlacement selProdPlacement) {
-                        List<Button> visibleProdButtons = selProdPlacement.productionButtons.stream()
-                                .filter(b -> !b.isHidden.get())
-                                .toList();
-                        blitY -= Button.DEFAULT_ICON_FRAME_SIZE * Math.ceil(((float) visibleProdButtons.size() / (float) MAX_BUTTONS_PER_ROW) - 1);
-
-                        for (Button prodButton : visibleProdButtons) {
-                            rowButtons += 1;
-                            prodButton.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                            productionButtons.add(prodButton);
-                            renderedButtons.add(prodButton);
-                            blitX += iconFrameSize;
-                            if (rowButtons >= MAX_BUTTONS_PER_ROW) {
-                                rowButtons = 0;
-                                blitX = 0;
-                                blitY += Button.DEFAULT_ICON_FRAME_SIZE;
-                                buildingProdRows += 1;
-                            }
-                        }
-                        if (rowButtons > 0) {
-                            blitY += Button.DEFAULT_ICON_FRAME_SIZE;
-                            buildingProdRows += 1;
-                        }
-                    } else {
-                        blitY += Button.DEFAULT_ICON_FRAME_SIZE;
-                    }
-                    blitX = 0;
-
-                    for (AbilityButton abilityButton : buildingAbilities) {
-                        abilityButton.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                        renderedButtons.add(abilityButton);
-                        blitX += iconFrameSize;
-                    }
-                }
-            }
-        }
-
-        // --------------------------
-        // Unit head portrait + stats
-        // --------------------------
-        else if (hudSelectedEntity != null && portraitRendererUnit.model != null
-            && portraitRendererUnit.renderer != null) {
-
-            blitY -= portraitRendererUnit.frameHeight;
-
-            // write capitalised unit name
-            String name = getModifiedEntityName(hudSelectedEntity).replace("_", " ");
-            if (hudSelectedEntity.hasCustomName()) {
-                name = hudSelectedEntity.getCustomName().getString();
-            }
-
-            String nameCap = name.substring(0, 1).toUpperCase() + name.substring(1);
-
-            unitPortraitZone = portraitRendererUnit.render(evt.getGuiGraphics(),
-                nameCap,
-                blitX,
-                blitY,
-                mouseX,
-                mouseY,
-                hudSelectedEntity
-            );
-            hudZones.add(unitPortraitZone);
-
-            if (hudSelectedEntity instanceof HeroUnit heroUnit) {
-                RectZone zone = portraitRendererUnit.renderHeroLevelAndExp(evt.getGuiGraphics(), blitX + 1, blitY - 5, mouseX, mouseY, heroUnit);
-                hudZones.add(zone);
-                if (zone.isMouseOver(mouseX, mouseY)) {
-                    MyRenderer.renderTooltip(evt.getGuiGraphics(),
-                        heroUnit.getHeroLevel() >= HeroUnit.MAX_LEVEL ?
-                            List.of(fcs(I18n.get("hud.hero.reignofnether.max_level"))) :
-                            List.of(
-                                    fcs(I18n.get("hud.hero.reignofnether.experience", heroUnit.getExpOnCurrentLevel(), heroUnit.getExpToNextlevel())),
-                                    fcs(I18n.get("hud.hero.reignofnether.experience_warning"))
-                            ),
-                        mouseX, mouseY
-                    );
-                }
-            }
-            blitX += portraitRendererUnit.frameWidth;
-            boolean renderedItemsOrResources = false;
-
-            if (hudSelectedEntity instanceof Unit unit) {
-                hudZones.add(portraitRendererUnit.renderStats(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY, unit));
-
-                blitX += portraitRendererUnit.statsWidth;
-
-                int totalRes = Resources.getTotalResourcesFromItems(unit.getItems()).getTotalValue();
-
-                if (unit instanceof UnitInventory inv && ItemClientEvents.shouldRenderUnitInventory((LivingEntity) unit)) {
-                    hudZones.add(ItemClientEvents.renderUnitInventory(evt.getGuiGraphics(), blitX, blitY - 6, mouseX, mouseY, inv));
-                    renderedItemsOrResources = true;
-                }
-                else if (hudSelectedEntity instanceof Mob mob && mob.canPickUpLoot() && totalRes > 0) {
-                    hudZones.add(portraitRendererUnit.renderResourcesHeld(evt.getGuiGraphics(), blitX, blitY, unit));
-
-                    // return button
-                    if (getPlayerToEntityRelationship(hudSelectedEntity) == Relationship.OWNED ||
-                            AlliancesClient.canControlAlly(hudSelectedEntity)) {
-                        Button returnButton = new Button("Return resources",
-                                Button.itemIconSize,
-                                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/chest.png"),
-                                Keybindings.hotkey5,
-                                () -> unit.getReturnResourcesGoal().getBuildingTarget() != null,
-                                () -> false,
-                                () -> true,
-                                () -> sendUnitCommand(UnitAction.RETURN_RESOURCES_TO_CLOSEST),
-                                null,
-                                List.of(fcs(I18n.get("hud.reignofnether.drop_off_resources"),
-                                        Style.EMPTY
-                                ))
-                        );
-                        returnButton.render(evt.getGuiGraphics(), blitX + 10, blitY + 38, mouseX, mouseY);
-                        renderedButtons.add(returnButton);
-                    }
-                    renderedItemsOrResources = true;
-                }
-            } else if (ResourceSources.isHuntableAnimal(hudSelectedEntity)) {
-                hudZones.add(portraitRendererUnit.renderResourcesHeld(evt.getGuiGraphics(), blitX, blitY, (Animal) hudSelectedEntity));
-                blitX += portraitRendererUnit.statsWidth;
-            }
-
-            if (renderedItemsOrResources) {
-                blitX += portraitRendererUnit.statsWidth + 4;
-            } else {
-                blitX += 14;
-            }
-        }
-
-        // ----------------------------------------------
-        // Unit icons to select types and show healthbars
-        // ----------------------------------------------
-        blitXStart = blitX;
-        blitY = screenHeight - iconFrameSize * 2 - 10;
-
-        for (LivingEntity unit : selUnits) {
-            if ((getPlayerToEntityRelationship(unit) == Relationship.OWNED ||
-                    NonUnitClientEvents.canControlAllMobs() ||
-                    AlliancesClient.canControlAlly(unit)) &&
-                unitButtons.size() < (buttonsPerRow * 2)) {
-                // mob head icon
-                String unitName = MiscUtil.getEntityIconName(unit);
-                String buttonImagePath;
-
-                if (unit.isVehicle()) {
-                    buttonImagePath = "textures/mobheads/" + unitName + "_half.png";
-                } else {
-                    buttonImagePath = "textures/mobheads/" + unitName + ".png";
-                }
-
-                Button button = new ButtonBuilder(unitName)
-                    .iconSize(iconSize)
-                    .iconResource(unit instanceof Unit ? ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, buttonImagePath) : null)
-                    .entity(unit)
-                    .isSelected(() -> hudSelectedEntity == null || getModifiedEntityName(hudSelectedEntity).equals(
-                            getModifiedEntityName(unit)))
-                    .onLeftClick(() -> {
-                        // select this one specific unit
-                        if (Keybindings.shiftMod.isDown()) {
-                            UnitClientEvents.getSelectedUnits().remove(hudSelectedEntity);
-                        } else if (getModifiedEntityName(hudSelectedEntity).equals(getModifiedEntityName(unit))) {
-                            UnitClientEvents.clearSelectedUnits();
-                            UnitClientEvents.addSelectedUnit(unit);
-                        } else { // click to select this unit type as a group
-                            HudClientEvents.setHudSelectedEntity(unit);
-                        }
-                    })
-                    .tooltipLines(List.of(fcs(capitaliseAndSpace(getModifiedEntityName(unit)))))
-                    .build();
-
-                if (unit.isVehicle() && unit instanceof Unit) {
-                    String passengerName = MiscUtil.getEntityIconName(unit.getFirstPassenger());
-                    button.bgIconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID,
-                        "textures/mobheads/" + passengerName + ".png"
-                    );
-                }
-                unitButtons.add(button);
-            }
-        }
-
-        if (unitButtons.size() >= 2) {
-            // background frame
-            hudZones.add(MyRenderer.renderFrameWithBg(evt.getGuiGraphics(),
-                blitX - 5,
-                blitY - 10,
-                iconFrameSize * buttonsPerRow + 10,
-                iconFrameSize * 2 + 20,
-                frameBgColour
-            ));
-
-            int buttonsRendered = 0;
-            for (Button unitButton : unitButtons) {
-                // replace last icon with a +X number of units icon and hover tooltip for what those units are
-                if (buttonsRendered >= (buttonsPerRow * 2) - 1 && selUnits.size() > (buttonsPerRow * 2)) {
-                    int numExtraUnits = selUnits.size() - (buttonsPerRow * 2) + 1;
-                    RectZone plusUnitsZone = MyRenderer.renderIconFrameWithBg(evt.getGuiGraphics(),
-                        unitButton.frameResource,
-                        blitX,
-                        blitY,
-                        iconFrameSize,
-                        iconBgColour
-                    );
-                    evt.getGuiGraphics().drawCenteredString(
-                        MC.font,
-                        "+" + numExtraUnits,
-                        blitX + iconFrameSize / 2,
-                        blitY + 8,
-                        0xFFFFFF
-                    );
-
-                    if (plusUnitsZone.isMouseOver(mouseX, mouseY)) {
-                        List<FormattedCharSequence> tooltipLines = new ArrayList<>();
-                        int numUnits = 0;
-
-                        for (int i = selUnits.size() - numExtraUnits; i < selUnits.size(); i++) {
-
-                            LivingEntity unit = selUnits.get(i);
-                            LivingEntity nextUnit;
-                            String unitName = HudClientEvents.getModifiedEntityName(unit);
-                            String nextUnitName = null;
-                            numUnits += 1;
-
-                            if (i < selUnits.size() - 1) {
-                                nextUnit = selUnits.get(i + 1);
-                                nextUnitName = HudClientEvents.getModifiedEntityName(nextUnit);
-                            }
-                            if (!unitName.equals(nextUnitName)) {
-                                tooltipLines.add(fcs("x" + numUnits + " " + capitaliseAndSpace(unitName),
-                                    Style.EMPTY
-                                ));
-                                numUnits = 0;
-                            }
-                        }
-                        MyRenderer.renderTooltip(evt.getGuiGraphics(), tooltipLines, mouseX, mouseY);
-                    }
-                    break;
-                } else {
-                    unitButton.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                    renderedButtons.add(unitButton);
-                    if (unitButton.iconResource == null) {
-                        String str = unitButton.name.substring(0,1).toUpperCase();
-                        if (unitButton.name.length() > 1) {
-                            str += unitButton.name.substring(1, 2);
-                        }
-                        evt.getGuiGraphics().drawCenteredString(MC.font,
-                                fcs(str, true),
-                                blitX + (unitButton.iconSize / 2) + 4,
-                                blitY + (unitButton.iconSize / 2),
-                                0xFFFFFF
-                        );
-                    }
-                    unitButton.renderHealthBar(evt.getGuiGraphics().pose());
-                    blitX += iconFrameSize;
-                    if (buttonsRendered == buttonsPerRow - 1) {
-                        blitX = blitXStart;
-                        blitY += iconFrameSize + 6;
-                    }
-                }
-                buttonsRendered += 1;
-            }
-        }
-
-
-        // ---------------------------
-        // Unit sandbox buttons
-        // ---------------------------
-        if (SandboxClientEvents.isSandboxPlayer() && (hudSelectedEntity != null || hudSelectedPlacement != null)) {
-            blitX = 0;
-            blitY = screenHeight - iconFrameSize;
-
-            blitY -= iconFrameSize * buildingProdRows;
-            if (hudSelectedEntity != null || !hudSelectedPlacement.getAbilities().isEmpty() || !hudSelectedPlacement.isBuilt) {
-                blitY -= iconFrameSize;
-            }
-            ArrayList<Button> actionButtons = new ArrayList<>();
-
-            actionButtons.add(SandboxActionButtons.getSetRelationshipButton());
-            actionButtons.add(SandboxActionButtons.getCycleScenarioRoleButton());
-            if (hudSelectedPlacement != null) {
-                actionButtons.add(SandboxActionButtons.removeBuildingPlacement);
-            }
-            if (hudSelectedEntity instanceof Unit) {
-                actionButtons.add(SandboxActionButtons.setAnchor);
-                actionButtons.add(SandboxActionButtons.resetToAnchor);
-                actionButtons.add(SandboxActionButtons.removeAnchor);
-            }
-            for (Button actionButton : actionButtons) {
-                if (!actionButton.isHidden.get()) {
-                    actionButton.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                    renderedButtons.add(actionButton);
-                    blitX += iconFrameSize;
-                }
-            }
-        }
-
-        // --------------------------------------------------------
-        // Unit action buttons (attack, stop, move, abilities etc.)
-        // --------------------------------------------------------
-        if (selUnits.size() > 0 &&
-                (getPlayerToEntityRelationship(selUnits.get(0)) == Relationship.OWNED ||
-                        !PlayerClientEvents.isRTSPlayer() ||
-                        NonUnitClientEvents.canControlAllMobs() ||
-                        AlliancesClient.canControlAlly(selUnits.get(0))) &&
-                hudSelectedEntity instanceof Unit unit) {
-            blitX = 0;
-            blitY = screenHeight - iconFrameSize;
-
-            ArrayList<Button> actionButtons = new ArrayList<>();
-
-            if (hudSelectedEntity instanceof AttackerUnit) {
-                actionButtons.add(ActionButtons.attack);
-            }
-            if (hudSelectedEntity instanceof WorkerUnit) {
-                actionButtons.add(ActionButtons.buildRepair);
-                actionButtons.add(ActionButtons.gather);
-            }
-            if (unit.canGarrison() && GarrisonableBuildingAddon.getGarrison(unit) == null) {
-                actionButtons.add(ActionButtons.garrison);
-            } else if (GarrisonableBuildingAddon.getGarrison(unit) != null) {
-                actionButtons.add(ActionButtons.ungarrison);
-            }
-
-            if (!(hudSelectedEntity instanceof WorkerUnit)) {
-                actionButtons.add(ActionButtons.hold);
-            }
-            actionButtons.add(ActionButtons.stop);
-
-            if (hudSelectedEntity instanceof VillagerUnit vUnit)
-                for (Ability ability : vUnit.getAbilities().get())
-                    if (ability instanceof CallToArmsUnit callToArmsUnit)
-                        actionButtons.add(callToArmsUnit.getButton(Keybindings.hotkey1, vUnit));
-
-            for (Button actionButton : actionButtons) {
-                // GATHER button does not have a static icon
-                if (actionButton == ActionButtons.gather && hudSelectedEntity instanceof WorkerUnit workerUnit) {
-                    switch (workerUnit.getGatherResourceGoal().getTargetResourceName()) {
-                        case NONE -> actionButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID,
-                                "textures/icons/items/no_gather.png"
-                        );
-                        case FOOD -> actionButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID,
-                                "textures/icons/items/hoe.png"
-                        );
-                        case WOOD -> actionButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID,
-                                "textures/icons/items/axe.png"
-                        );
-                        case ORE -> actionButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID,
-                                "textures/icons/items/pickaxe.png"
-                        );
-                    }
-                    String resourceName = UnitClientEvents.getSelectedUnitResourceTarget().toString();
-                    String key = String.format("resources.reignofnether.%s", resourceName.toLowerCase(Locale.ENGLISH));
-                    actionButton.tooltipLines = List.of(
-                            fcs(I18n.get("hud.reignofnether" + ".gather_resources",
-                                    I18n.get(key)
-                            ), Style.EMPTY),
-                            fcs(I18n.get("hud.reignofnether.change_target_resource"), Style.EMPTY)
-                    );
-                }
-                actionButton.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                renderedButtons.add(actionButton);
-                blitX += iconFrameSize;
-            }
-            blitX = 0;
-            blitY = screenHeight - (iconFrameSize * 2) - 4;
-
-            // includes worker building buttons
-            if (TutorialClientEvents.isAtOrPastStage(TutorialStage.BUILD_INTRO) &&
-                    (getPlayerToEntityRelationship(selUnits.get(0)) == Relationship.OWNED || !PlayerClientEvents.isRTSPlayer() || ResearchClient.hasCheat("wouldyoukindly")) ||
-                    AlliancesClient.canControlAlly(selUnits.get(0))) {
-                List<Button> abilityButtons = List.of();
-                for (LivingEntity livingEntity : selUnits) {
-                    if (livingEntity == hudSelectedEntity) {
-                        abilityButtons = unit.getAbilityButtons(); // unit == hudSelectedEntity
-                        break;
-                    }
-                }
-                List<Button> unitAbilities = abilityButtons.stream()
-                        .filter(b -> !(b instanceof AbilityButton ab) || !(ab.ability instanceof CallToArmsUnit))
-                        .toList();
-
-                int rowsUp = (int) Math.floor((float) (unitAbilities.size() - 1) / MAX_BUTTONS_PER_ROW);
-                rowsUp = Math.max(0, rowsUp);
-                if (SandboxClientEvents.isSandboxPlayer() && (hudSelectedEntity != null || hudSelectedPlacement != null))
-                    rowsUp += 1;
-
-                blitY -= iconFrameSize * rowsUp;
-
-                int i = 0;
-                for (Button button : unitAbilities) {
-
-                    if (button instanceof AbilityButton abilityButton && abilityButton.ability instanceof HeroAbility heroAbility &&
-                            ((HeroUnit)unit).isRankUpMenuOpen() && !HeroAbility.allSkillsLearnt((HeroUnit) unit)) {
-                        Button rankUpButton = heroAbility.getRankUpButton(abilityButton.hotkey, (HeroUnit)unit);
-                        if (!rankUpButton.isHidden.get()) {
-                            i += 1;
-                            rankUpButton.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                            renderedButtons.add(rankUpButton);
-                            blitX += iconFrameSize;
-                            if (i % MAX_BUTTONS_PER_ROW == 0) {
-                                blitX = 0;
-                                blitY += iconFrameSize;
-                            }
-                        }
-                    } else if (!button.isHidden.get()) {
-                        i += 1;
-                        button.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                        renderedButtons.add(button);
-                        blitX += iconFrameSize;
-                        if (i % MAX_BUTTONS_PER_ROW == 0) {
-                            blitX = 0;
-                            blitY += iconFrameSize;
-                        }
-                    }
-                }
-                if (hudSelectedEntity instanceof HeroUnit hero) {
-                    Button rankUpMenuButton = HeroAbility.getRankUpMenuButton(hero);
-                    if (!rankUpMenuButton.isHidden.get()) {
-                        rankUpMenuButton.render(evt.getGuiGraphics(), 0, blitY - iconFrameSize, mouseX, mouseY);
-                        renderedButtons.add(rankUpMenuButton);
-                    }
-                }
-            }
-        }
-        else if (MC.player != null && SandboxClientEvents.isSandboxPlayer(MC.player.getName().getString()) && selUnits.isEmpty() && selBuildings.isEmpty()) {
-            blitX = 0;
-            blitY = screenHeight - iconFrameSize;
-
-            ArrayList<Button> actionButtons = new ArrayList<>();
-            actionButtons.add(SandboxClientEvents.getCycleBuildingOrUnitsButton());
-            actionButtons.add(SandboxClientEvents.getToggleFactionButton());
-            actionButtons.add(SandboxClientEvents.getToggleRelationshipButton());
-
-            if (SandboxClientEvents.sandboxMenuType == SandboxMenuType.UNITS) {
-                actionButtons.add(SandboxClientEvents.getToggleUnitCheatsButton());
-            } else {
-                actionButtons.add(SandboxClientEvents.getToggleBuildingCheatsButton());
-            }
-            actionButtons.add(SandboxClientEvents.getToggleNonUnitControlButton());
-            actionButtons.add(SandboxClientEvents.getSortCustomBuildingsButton());
-
-            for (Button actionButton : actionButtons) {
-                if (!actionButton.isHidden.get()) {
-                    actionButton.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                    renderedButtons.add(actionButton);
-                    blitX += iconFrameSize;
-                }
-            }
-            blitX = 0;
-            blitY = screenHeight - (iconFrameSize * 2) - 4;
-
-            List<Button> abilityButtons = switch(SandboxClientEvents.sandboxMenuType) {
-                case UNITS -> List.copyOf(SandboxClientEvents.getUnitButtons());
-                case BUILDINGS -> List.copyOf(SandboxClientEvents.getBuildingButtons());
-                case CUSTOM_BUILDINGS -> List.copyOf(SandboxClientEvents.getCustomBuildingButtons());
-            };
-
-            List<Button> shownAbilities = abilityButtons.stream()
-                    .filter(b -> !b.isHidden.get() && !(b instanceof AbilityButton ab && ab.ability instanceof CallToArmsUnit))
-                    .toList();
-
-            int rowsUp = (int) Math.floor((float) (shownAbilities.size() - 1) / MAX_BUTTONS_PER_ROW);
-            rowsUp = Math.max(0, rowsUp);
-            if (SandboxClientEvents.isSandboxPlayer() && (hudSelectedEntity != null || hudSelectedPlacement != null))
-                rowsUp += 1;
-
-            blitY -= iconFrameSize * rowsUp;
-
-            int i = 0;
-            for (Button button : shownAbilities) {
-                if (!button.isHidden.get()) {
-                    i += 1;
-                    button.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                    renderedButtons.add(button);
-                    blitX += iconFrameSize;
-                    if (i % MAX_BUTTONS_PER_ROW == 0) {
-                        blitX = 0;
-                        blitY += iconFrameSize;
-                    }
-                }
-            }
-        }
-        // -----------------
-        // Non-unit controls
-        // -----------------
-        else if (!(hudSelectedEntity instanceof Unit) && !getSelectedUnits().isEmpty() &&
-                NonUnitClientEvents.canControlAllMobs()) {
-            blitX = 0;
-            blitY = screenHeight - iconFrameSize;
-            ArrayList<Button> actionButtons = new ArrayList<>();
-
-            if (NonUnitClientEvents.canAttack(getSelectedUnits().get(0)))
-                actionButtons.add(ActionButtons.attack);
-
-            actionButtons.add(ActionButtons.stop);
-
-            for (Button actionButton : actionButtons) {
-                actionButton.render(evt.getGuiGraphics(), blitX, blitY, mouseX, mouseY);
-                renderedButtons.add(actionButton);
-                blitX += iconFrameSize;
-            }
-        }
-
-        // ---------------------------
-        // Resources icons and amounts
-        // ---------------------------
-        Resources resources = null;
-        String selPlayerName = null;
-
-        if (!UnitClientEvents.getSelectedUnits().isEmpty()) {
-            if (UnitClientEvents.getSelectedUnits().get(0) instanceof Unit unit) {
-                selPlayerName = unit.getOwnerName();
-            }
-        }
-        if (!BuildingClientEvents.getSelectedBuildings().isEmpty()) {
-            selPlayerName = BuildingClientEvents.getSelectedBuildings().get(0).ownerName;
-        }
-
-        boolean alliedWithSelPlayer = MC.player != null && AlliancesClient.isAllied(MC.player.getName().getString(), selPlayerName);
-        boolean isSelPlayer = MC.player != null && MC.player.getName().getString().equals(selPlayerName);
-
-        // during a match if nothing is selected, then show your own resources by default
-        if (MC.player != null && !isSelPlayer && PlayerClientEvents.isRTSPlayer() && selPlayerName == null) {
-            selPlayerName = MC.player.getName().getString();
-            isSelPlayer = true;
-        }
-
-        if (selPlayerName != null && (isSelPlayer || alliedWithSelPlayer || !PlayerClientEvents.isRTSPlayer() || SandboxClientEvents.isSandboxPlayer())) {
-            resources = ResourcesClientEvents.getResources(selPlayerName);
-        }
-
-        blitX = 0;
-        blitY = 0;
-
-        if ((!PlayerClientEvents.isRTSPlayer() || alliedWithSelPlayer || SandboxClientEvents.isSandboxPlayer()) && !isSelPlayer) {
-            if (resources != null) {
-                evt.getGuiGraphics().drawString(
-                    MC.font,
-                    I18n.get("hud.reignofnether.players_resources", selPlayerName),
-                    blitX + 5,
-                    blitY + 5,
-                    0xFFFFFF
-                );
-            } else if (!PlayerClientEvents.isRTSPlayer() && !TutorialClientEvents.isEnabled()) {
-                evt.getGuiGraphics().drawString(
-                    MC.font,
-                    I18n.get("hud.reignofnether.you_are_spectator"),
-                    blitX + 5,
-                    blitY + 5,
-                    0xFFFFFF
-                );
-                blitY += 10;
-            }
-            blitY += 20;
-        }
-
-        int resourceBlitYStart = blitY;
-        int resourcePanelBottomY = blitY;
-
-        String[] resourceNames;
-        if (ItemClientEvents.ENABLED) {
-            resourceNames = new String[] { "food", "wood", "ore", "emerald", "pop" };
-        } else {
-            resourceNames = new String[] { "food", "wood", "ore", "pop" };
-        }
-
-        if (resources != null && MC.player != null) {
-            for (String resourceName : resourceNames) {
-                ResourceLocation rl;
-                String resValueStr = "";
-                ResourceName resName;
-
-                switch (resourceName) {
-                    case "food" -> {
-                        rl = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/wheat.png");
-                        resValueStr = String.valueOf(resources.food);
-                        resName = ResourceName.FOOD;
-                    }
-                    case "wood" -> {
-                        rl = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/wood.png");
-                        resValueStr = String.valueOf(resources.wood);
-                        resName = ResourceName.WOOD;
-                    }
-                    case "ore" -> {
-                        rl = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/iron_ore.png");
-                        resValueStr = String.valueOf(resources.ore);
-                        resName = ResourceName.ORE;
-                    }
-                    case "emerald" -> {
-                        rl = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/emerald.png");
-                        resValueStr = String.valueOf(resources.emerald);
-                        resName = ResourceName.EMERALD;
-                    }
-                    default -> {
-                        rl = PlayerColors.getPlayerColorBedIcon(selPlayerName);
-                        resValueStr = UnitClientEvents.getCurrentPopulation(selPlayerName) + "/"
-                            + BuildingClientEvents.getTotalPopulationSupply(selPlayerName);
-                        resName = ResourceName.NONE;
-                    }
-                }
-                hudZones.add(MyRenderer.renderFrameWithBg(evt.getGuiGraphics(),
-                    blitX + iconFrameSize - 1,
-                    blitY,
-                    49,
-                    iconFrameSize,
-                    frameBgColour
-                ));
-
-                hudZones.add(MyRenderer.renderIconFrameWithBg(evt.getGuiGraphics(),
-                    ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
-                    blitX,
-                    blitY,
-                    iconFrameSize,
-                    iconBgColour
-                ));
-
-                MyRenderer.renderIcon(evt.getGuiGraphics(),
-                    rl,
-                    blitX + 4,
-                    blitY + 4,
-                    iconSize
-                );
-                evt.getGuiGraphics().drawCenteredString(
-                    MC.font,
-                    resValueStr,
-                    blitX + (iconFrameSize) + 24,
-                    blitY + (iconSize / 2) + 1,
-                    0xFFFFFF
-                );
-
-                // worker count assigned to each resource
-                String finalSelPlayerName = selPlayerName;
-                RTSPlayer rtsPlayer = PlayerClientEvents.getPlayer(finalSelPlayerName);
-
-                int numWorkersHunting = UnitClientEvents.getAllUnits()
-                    .stream()
-                    .filter(le -> le instanceof WorkerUnit wu && le instanceof Unit u && u.getOwnerName()
-                        .equals(finalSelPlayerName) && ResourceSources.isHuntableAnimal(u.getTargetGoal().getTarget()))
-                    .toList()
-                    .size();
-
-                int numberInSquare = 0;
-                // we can only see ReturnResourcesGoal data on server, so we can't use that here
-                if (resName == ResourceName.NONE) {
-                    numberInSquare = UnitClientEvents.getAllUnits()
-                            .stream()
-                            .filter(u -> u instanceof WorkerUnit
-                                    && ((Unit) u).getOwnerName().equals(finalSelPlayerName))
-                            .toList()
-                            .size();
-                } else if (resName == ResourceName.EMERALD && rtsPlayer != null) {
-                    numberInSquare = rtsPlayer.itemsDropped;
-                } else {
-                    for (LivingEntity le : UnitClientEvents.getAllUnits()) {
-                        if (le instanceof Unit u && le instanceof WorkerUnit wu && u.getOwnerName()
-                            .equals(finalSelPlayerName) && !UnitClientEvents.idleWorkerIds.contains(le.getId())) {
-
-                            boolean alreadyAssigned = false;
-
-                            if (u.getReturnResourcesGoal() != null) {
-                                Resources res = Resources.getTotalResourcesFromItems(u.getItems());
-                                if (resName == ResourceName.FOOD && res.food > 0
-                                    || resName == ResourceName.WOOD && res.wood > 0
-                                    || resName == ResourceName.ORE && res.ore > 0) {
-                                    numberInSquare += 1;
-                                    alreadyAssigned = true;
-                                }
-                            }
-                            if (!alreadyAssigned && wu.getGatherResourceGoal()
-                                .getTargetResourceName()
-                                .equals(resName)) {
-                                numberInSquare += 1;
-                            }
-                        }
-                    }
-                }
-                if (resName == ResourceName.FOOD) {
-                    numberInSquare += numWorkersHunting;
-                }
-
-                hudZones.add(MyRenderer.renderIconFrameWithBg(evt.getGuiGraphics(),
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
-                        blitX + 69,
-                        blitY,
-                        iconFrameSize,
-                        iconBgColour
-                ));
-
-                evt.getGuiGraphics().drawCenteredString(
-                        MC.font,
-                        String.valueOf(numberInSquare),
-                        blitX + 69 + (iconFrameSize / 2),
-                        blitY + (iconSize / 2) + 1,
-                        0xFFFFFF
-                );
-
-                blitY += iconFrameSize - 1;
-            }
-            resourcePanelBottomY = blitY;
-
-            blitY = resourceBlitYStart;
-            final String finalSelPlayerName = selPlayerName;
-            RTSPlayer rtsPlayer = PlayerClientEvents.getPlayer(finalSelPlayerName);
-            String[] resourceNames2;
-            if (ItemClientEvents.ENABLED) {
-                resourceNames2 = new String[] { "food", "wood", "ore", "emerald", "population" };
-            } else {
-                resourceNames2 = new String[] { "food", "wood", "ore", "population" };
-            }
-            for (String resourceName : resourceNames2) {
-                List<FormattedCharSequence> tooltip;
-                String key = String.format("resources.reignofnether.%s", resourceName);
-                if (resourceName.equals("population")) {
-                    tooltip = List.of(fcs(I18n.get("hud.reignofnether.max_resources",
-                        I18n.get(key),
-                        GameruleClient.maxPopulation
-                    )));
-                } else {
-                    tooltip = List.of(fcs(I18n.get(key)));
-                }
-                if (mouseX >= blitX && mouseY >= blitY && mouseX < blitX + iconFrameSize
-                    && mouseY < blitY + iconFrameSize) {
-                    MyRenderer.renderTooltip(evt.getGuiGraphics(), tooltip, mouseX + 5, mouseY);
-                }
-                if (mouseX >= blitX + 69 && mouseY >= blitY && mouseX < blitX + 69 + iconFrameSize
-                    && mouseY < blitY + iconFrameSize) {
-                    List<FormattedCharSequence> tooltipInSquare;
-                    if (resourceName.equals("population")) {
-                        int numWorkers = UnitClientEvents.getAllUnits()
-                            .stream()
-                            .filter(u -> u instanceof WorkerUnit
-                                && ((Unit) u).getOwnerName().equals(finalSelPlayerName))
-                            .toList()
-                            .size();
-                        tooltipInSquare = List.of(fcs(I18n.get("hud.reignofnether.total_workers", numWorkers)));
-                    } else if (resourceName.equals("emerald")) {
-                        if (GameruleClient.randomItemDrops != RandomItemDropRule.DISABLED && rtsPlayer != null) {
-                            tooltipInSquare = List.of(
-                                    fcs(I18n.get("hud.reignofnether.items_found", rtsPlayer.itemsDropped)),
-                                    fcs(I18n.get("hud.reignofnether.items_hint"))
-                            );
-                        } else {
-                            tooltipInSquare = List.of(fcs("-"));
-                        }
-                    } else {
-                        tooltipInSquare = List.of(fcs(I18n.get("hud.reignofnether.workers_on_" + resourceName)));
-                    }
-                    MyRenderer.renderTooltip(evt.getGuiGraphics(), tooltipInSquare, mouseX + 5, mouseY);
-                }
-                blitY += iconFrameSize - 1;
-            }
-        }
-
-        // global production queue - visible to yourself, observers, sandbox players and allies
-        int queuePanelStartX = 0;
-        int queuePanelStartY = resourcePanelBottomY + 6;
-        if (isSelPlayer ||
-            !PlayerClientEvents.isRTSPlayer() ||
-            SandboxClientEvents.isSandboxPlayer() ||
-            AlliancesClient.isAllied(MC.player.getName().getString(), selPlayerName)) {
-            Pair<RectZone, List<Button>> renderedElements = GlobalProductionQueueRenderer.renderQueue(evt.getGuiGraphics(),
-                    selPlayerName,
-                    queuePanelStartX,
-                    queuePanelStartY,
-                    mouseX,
-                    mouseY
-            );
-            hudZones.add(renderedElements.getFirst());
-            renderedButtons.addAll(renderedElements.getSecond());
-        }
-
-        // --------------------------
-        // Temporary warning messages
-        // --------------------------
-        if (tempMsgTicksLeft > 0 && tempMsg.length() > 0) {
-            int ticksUnderFade = Math.min(tempMsgTicksLeft, TEMP_MSG_TICKS_FADE);
-            int alpha = (int) (0xFF * ((float) ticksUnderFade / (float) TEMP_MSG_TICKS_FADE));
-
-            evt.getGuiGraphics().drawCenteredString(
-                MC.font,
-                tempMsg,
-                screenWidth / 2,
-                screenHeight - iconFrameSize * 2 - 50,
-                0xFFFFFF + (alpha << 24)
-            );
-        }
-        if (tempMsgTicksLeft > 0) {
-            tempMsgTicksLeft -= 1;
-        }
-
-        // ---------------------
-        // Control group buttons
-        // ---------------------
-        blitX = 100;
-        // clean up untracked entities/buildings from control groups
-        for (ControlGroup controlGroup : controlGroups) {
-            controlGroup.clean();
-
-            if (!controlGroup.isEmpty()) {
-                Button ctrlGroupButton = controlGroup.getButton();
-                ctrlGroupButton.render(evt.getGuiGraphics(), blitX, 0, mouseX, mouseY);
-                renderedButtons.add(ctrlGroupButton);
-                blitX += iconFrameSize;
-            }
-        }
-
-        // -------------------------
-        // Minimap buttons + warning
-        // -------------------------
-        boolean squareMinimap = ReignOfNetherClientConfigs.SQUARE_MINIMAP.get();
-
-        Button attackWarningButton = AttackWarningClientEvents.getWarningButton();
-        Button toggleMapSizeButton = MinimapClientEvents.getToggleSizeButton();
-        Button markerModeButton = MinimapClientEvents.getMarkerModeButton();
-        Button camSensitivityButton = MinimapClientEvents.getCamSensitivityButton();
-        Button mapLockButton = MinimapClientEvents.getMapLockButton();
-        Button toggleUnderlinesButton = MinimapClientEvents.getToggleUnderlinesButton();
-        Button highlightAnimalsButton = MinimapClientEvents.getHighlightAnimalsButton();
-        Button nightCirclesButton = MinimapClientEvents.getNightCirclesModeButton();
-        Button leavesHidingButton = OrthoviewClientEvents.getLeavesHidingButton();
-        Button toggleTeamColorsButton = PlayerColors.getToggleTeamColorsButton();
-        Button rotateCW = MinimapClientEvents.getCameraRotateCWButton();
-        Button rotateCCW = MinimapClientEvents.getCameraRotateCCWButton();
-
-        if (squareMinimap) {
-            int radius = MinimapClientEvents.getMapGuiRadius();
-            int co = MinimapClientEvents.CORNER_OFFSET;
-            float baseHalf = (float) (radius / Math.sqrt(2));
-            float half = baseHalf * MinimapClientEvents.SQUARE_SCALE;
-            // bottom-right corner of the minimap is fixed at the screen's bottom-right (with co padding)
-            float brX = screenWidth - co;
-            float brY = screenHeight - co;
-            int mmLeft = (int) (brX - 2 * half);
-            int mmBottom = (int) brY;
-
-            int frameSize = toggleMapSizeButton.iconFrameSize; // 22 — actual rendered frame
-            int stride = toggleMapSizeButton.iconSize * 2;     // 28, matches original spacing
-            int gridRight = mmLeft - 12;                       // shifted further left
-            int gridBottom = mmBottom + 4;                     // shifted a touch lower than the map bottom
-
-            int r0y = gridBottom - frameSize;            // bottom row: frame bottom = map bottom
-            int r1y = r0y - stride;                       // 2nd-top row
-            int r2y = r1y - stride;                       // top row
-            int c0x = gridRight - frameSize;             // rightmost column: frame right = map left - 4
-            int c1x = c0x - stride;
-            int c2x = c1x - stride;
-            int c3x = c2x - stride;
-            int c4x = c3x - stride;
-
-            // bottom row: map controls (most-used)
-            if (!toggleMapSizeButton.isHidden.get()) {
-                toggleMapSizeButton.render(evt.getGuiGraphics(), c0x, r0y, mouseX, mouseY);
-                renderedButtons.add(toggleMapSizeButton);
-            }
-            if (!markerModeButton.isHidden.get()) {
-                markerModeButton.render(evt.getGuiGraphics(), c1x, r0y, mouseX, mouseY);
-                renderedButtons.add(markerModeButton);
-            }
-            if (!mapLockButton.isHidden.get()) {
-                mapLockButton.render(evt.getGuiGraphics(), c2x, r0y, mouseX, mouseY);
-                renderedButtons.add(mapLockButton);
-            }
-            if (!rotateCCW.isHidden.get()) {
-                rotateCCW.render(evt.getGuiGraphics(), c3x, r0y, mouseX, mouseY);
-                renderedButtons.add(rotateCCW);
-            }
-            if (!rotateCW.isHidden.get()) {
-                rotateCW.render(evt.getGuiGraphics(), c4x, r0y, mouseX, mouseY);
-                renderedButtons.add(rotateCW);
-            }
-
-            // top row: view toggles
-            if (!toggleUnderlinesButton.isHidden.get()) {
-                toggleUnderlinesButton.render(evt.getGuiGraphics(), c1x, r2y, mouseX, mouseY);
-                renderedButtons.add(toggleUnderlinesButton);
-            }
-            if (!camSensitivityButton.isHidden.get()) {
-                camSensitivityButton.render(evt.getGuiGraphics(), c0x, r1y, mouseX, mouseY);
-                renderedButtons.add(camSensitivityButton);
-            }
-            if (!nightCirclesButton.isHidden.get()) {
-                nightCirclesButton.render(evt.getGuiGraphics(), c1x, r1y, mouseX, mouseY);
-                renderedButtons.add(nightCirclesButton);
-            }
-            if (!highlightAnimalsButton.isHidden.get()) {
-                highlightAnimalsButton.render(evt.getGuiGraphics(), c2x, r1y, mouseX, mouseY);
-                renderedButtons.add(highlightAnimalsButton);
-            }
-            if (!leavesHidingButton.isHidden.get()) {
-                leavesHidingButton.render(evt.getGuiGraphics(), c3x, r1y, mouseX, mouseY);
-                renderedButtons.add(leavesHidingButton);
-            }
-            if (!toggleTeamColorsButton.isHidden.get()) {
-                toggleTeamColorsButton.render(evt.getGuiGraphics(), c4x, r1y, mouseX, mouseY);
-                renderedButtons.add(toggleTeamColorsButton);
-            }
+    }
 
-            // attack warning: above the grid, aligned right
-            if (!attackWarningButton.isHidden.get()) {
-                attackWarningButton.render(evt.getGuiGraphics(), c0x, r1y - stride - 4, mouseX, mouseY);
-                renderedButtons.add(attackWarningButton);
-            }
+    /** The bar: one piece, or on wide screens a left piece sized to the selection and a right piece for the map. */
+    private static void renderConsole(HudFrame f, HudLayout l) {
+        Rect c = l.console();
+        int pad = HudLayout.CONSOLE_PAD;
+        int mapX = l.tools().x() - pad;
+        int leftEnd = SelectionPanel.isEmpty() ? l.commandCard().right() : l.selection().x() + SelectionPanel.width(f);
+        Rect left = l.split() ? new Rect(0, c.y(), leftEnd + pad, c.h()) : c;
+        // split, the left piece only holds the selection and its commands, so it goes with them
+        if (!l.split() || !SelectionPanel.isEmpty()) {
+            Theme.panel(f.g, left.x(), left.y(), left.w(), left.h(), Theme.floating());
+            f.zone(left);
+        }
+        if (l.split() || l.bigMap()) {
+            int top = l.bigMap() ? l.minimap().y() - pad : c.y();
+            Rect right = new Rect(mapX, top, l.width() - mapX, l.height() - top);
+            Theme.panel(f.g, right.x(), right.y(), right.w(), right.h(), Theme.floating());
+            f.zone(right);
         } else {
-            // ---------------------
-            // Attack warning button (diamond layout)
-            // ---------------------
-            if (!attackWarningButton.isHidden.get()) {
-                attackWarningButton.render(evt.getGuiGraphics(),
-                    screenWidth - (MinimapClientEvents.getMapGuiRadius() * 2) - (MinimapClientEvents.CORNER_OFFSET * 2)
-                        - 14,
-                    screenHeight - MinimapClientEvents.getMapGuiRadius() - (MinimapClientEvents.CORNER_OFFSET * 2) - 2,
-                    mouseX,
-                    mouseY
-                );
-                renderedButtons.add(attackWarningButton);
-            }
-
-            if (!toggleMapSizeButton.isHidden.get()) {
-                toggleMapSizeButton.render(evt.getGuiGraphics(),
-                        screenWidth - (toggleMapSizeButton.iconSize * 2),
-                        screenHeight - (toggleMapSizeButton.iconSize * 2),
-                        mouseX, mouseY);
-                renderedButtons.add(toggleMapSizeButton);
-            }
-            if (!markerModeButton.isHidden.get()) {
-                markerModeButton.render(evt.getGuiGraphics(),
-                    screenWidth - (markerModeButton.iconSize * (MinimapClientEvents.isLargeMap() ? 12 : 8)),
-                    screenHeight - (markerModeButton.iconSize * 2),
-                    mouseX, mouseY);
-                renderedButtons.add(markerModeButton);
-            }
-            if (!camSensitivityButton.isHidden.get()) {
-                camSensitivityButton.render(evt.getGuiGraphics(),
-                        screenWidth - (camSensitivityButton.iconSize * 4),
-                        screenHeight - (camSensitivityButton.iconSize * 2),
-                        mouseX, mouseY);
-                renderedButtons.add(camSensitivityButton);
-            }
-            if (!mapLockButton.isHidden.get()) {
-                mapLockButton.render(evt.getGuiGraphics(),
-                        screenWidth - (mapLockButton.iconSize * 2),
-                        screenHeight - (mapLockButton.iconSize * 4),
-                        mouseX, mouseY);
-                renderedButtons.add(mapLockButton);
-            }
-            if (!toggleUnderlinesButton.isHidden.get()) {
-                toggleUnderlinesButton.render(evt.getGuiGraphics(),
-                        screenWidth - (toggleUnderlinesButton.iconSize * 4),
-                        screenHeight - (toggleUnderlinesButton.iconSize * 6),
-                        mouseX, mouseY);
-                renderedButtons.add(toggleUnderlinesButton);
-            }
-            if (!highlightAnimalsButton.isHidden.get()) {
-                highlightAnimalsButton.render(evt.getGuiGraphics(),
-                        screenWidth - (highlightAnimalsButton.iconSize * 2),
-                        screenHeight - (highlightAnimalsButton.iconSize * 6),
-                        mouseX, mouseY);
-                renderedButtons.add(highlightAnimalsButton);
-            }
-            if (!nightCirclesButton.isHidden.get()) {
-                nightCirclesButton.render(evt.getGuiGraphics(),
-                        screenWidth - (nightCirclesButton.iconSize * 4),
-                        screenHeight - (nightCirclesButton.iconSize * 4),
-                        mouseX, mouseY);
-                renderedButtons.add(nightCirclesButton);
-            }
-            if (!leavesHidingButton.isHidden.get()) {
-                leavesHidingButton.render(evt.getGuiGraphics(),
-                        screenWidth - (leavesHidingButton.iconSize * 6),
-                        screenHeight - (leavesHidingButton.iconSize * 2),
-                        mouseX, mouseY);
-                renderedButtons.add(leavesHidingButton);
-            }
-            if (!toggleTeamColorsButton.isHidden.get()) {
-                toggleTeamColorsButton.render(evt.getGuiGraphics(),
-                        screenWidth - (toggleTeamColorsButton.iconSize * 6),
-                        screenHeight - (toggleTeamColorsButton.iconSize * 4),
-                        mouseX, mouseY);
-                renderedButtons.add(toggleTeamColorsButton);
-            }
-            if (!rotateCW.isHidden.get()) {
-                rotateCW.render(evt.getGuiGraphics(),
-                        screenWidth - (rotateCW.iconSize * (MinimapClientEvents.isLargeMap() ? 8 : 4)),
-                        screenHeight - (rotateCW.iconSize * 2),
-                        mouseX, mouseY);
-                renderedButtons.add(rotateCW);
-            }
-            if (!rotateCCW.isHidden.get()) {
-                rotateCCW.render(evt.getGuiGraphics(),
-                        screenWidth - (rotateCCW.iconSize * (MinimapClientEvents.isLargeMap() ? 10 : 6)),
-                        screenHeight - (rotateCCW.iconSize * 2),
-                        mouseX, mouseY);
-                renderedButtons.add(rotateCCW);
-            }
+            Theme.divider(f.g, mapX, c.y() + pad, 1, c.h() - pad * 2);
         }
+        if (!SelectionPanel.isEmpty())
+            Theme.divider(f.g, l.commandCard().right() + pad, c.y() + pad, 1, c.h() - pad * 2);
+    }
 
-        // ------------------------------
-        // Start buttons (spectator only)
-        // ------------------------------
-        if (!PlayerClientEvents.isRTSPlayer() && !PlayerClientEvents.rtsLocked) {
-
-            // scenario
-            if (GameruleClient.scenarioMode) {
-                Button scenarioStartButton = ScenarioClientEvents.getScenarioStartButton();
-                scenarioStartButton.render(evt.getGuiGraphics(),
-                        screenWidth - (StartButtons.ICON_SIZE * 2),
-                        StartButtons.ICON_SIZE / 2,
-                        mouseX,
-                        mouseY
-                );
-                renderedButtons.add(scenarioStartButton);
-
-                Button cycleRoleToPlayButton = ScenarioClientEvents.getCycleRoleToPlayButton();
-                if (cycleRoleToPlayButton != null) {
-                    cycleRoleToPlayButton.render(evt.getGuiGraphics(),
-                            screenWidth - (StartButtons.ICON_SIZE * 4),
-                            StartButtons.ICON_SIZE / 2,
-                            mouseX,
-                            mouseY
-                    );
-                    renderedButtons.add(cycleRoleToPlayButton);
-                }
-            } else { // normal gamemodes
-                Button diffsButton = ConfigClientEvents.getDiffsButton();
-                if (!diffsButton.isHidden.get()) {
-                    diffsButton.render(evt.getGuiGraphics(),
-                            screenWidth - (StartButtons.ICON_SIZE * 10),
-                            StartButtons.ICON_SIZE / 2,
-                            mouseX,
-                            mouseY
-                    );
-                    renderedButtons.add(diffsButton);
-                }
-
-                Button gamemodeButton = ClientGameModeHelper.getButton();
-                if (gamemodeButton != null && !gamemodeButton.isHidden.get() && !TutorialClientEvents.isEnabled()) {
-                    gamemodeButton.render(evt.getGuiGraphics(),
-                            screenWidth - (StartButtons.ICON_SIZE * 2),
-                            StartButtons.ICON_SIZE / 2,
-                            mouseX,
-                            mouseY
-                    );
-                    renderedButtons.add(gamemodeButton);
-                }
-
-                if (ClientGameModeHelper.gameMode != GameMode.SANDBOX) {
-
-                    if (!StartPosClientEvents.isEnabled()) {
-                        if (!StartButtons.villagerStartButton.isHidden.get()) {
-                            StartButtons.villagerStartButton.render(evt.getGuiGraphics(),
-                                    screenWidth - (StartButtons.ICON_SIZE * 8),
-                                    StartButtons.ICON_SIZE / 2,
-                                    mouseX,
-                                    mouseY
-                            );
-                            renderedButtons.add(StartButtons.villagerStartButton);
-                        }
-                        if (!StartButtons.monsterStartButton.isHidden.get()) {
-                            StartButtons.monsterStartButton.render(evt.getGuiGraphics(),
-                                    (screenWidth - (StartButtons.ICON_SIZE * 6)),
-                                    StartButtons.ICON_SIZE / 2,
-                                    mouseX,
-                                    mouseY
-                            );
-                            renderedButtons.add(StartButtons.monsterStartButton);
-                        }
-                        if (!StartButtons.piglinStartButton.isHidden.get()) {
-                            StartButtons.piglinStartButton.render(evt.getGuiGraphics(),
-                                    screenWidth - (StartButtons.ICON_SIZE * 4),
-                                    StartButtons.ICON_SIZE / 2,
-                                    mouseX,
-                                    mouseY
-                            );
-                            renderedButtons.add(StartButtons.piglinStartButton);
-                        }
-                    }
-                } else if (!StartButtons.sandboxStartButton.isHidden.get()) {
-                    StartButtons.sandboxStartButton.render(evt.getGuiGraphics(),
-                            (int) (screenWidth - (StartButtons.ICON_SIZE * 4f)),
-                            StartButtons.ICON_SIZE / 2,
-                            mouseX,
-                            mouseY
-                    );
-                    renderedButtons.add(StartButtons.sandboxStartButton);
-                }
-            }
-        }
-        else if (SurvivalClientEvents.isEnabled) {
-            Button nextWaveButton = SurvivalClientEvents.getNextWaveButton();
-            if (!nextWaveButton.isHidden.get()) {
-                nextWaveButton.tooltipOffsetY = 15;
-                nextWaveButton.render(evt.getGuiGraphics(),
-                        screenWidth - (StartButtons.ICON_SIZE * 2),
-                        StartButtons.ICON_SIZE / 2,
-                        mouseX,
-                        mouseY
-                );
-                renderedButtons.add(nextWaveButton);
-            }
-        }
-        else if (SandboxClientEvents.isSandboxPlayer(MC.player.getName().getString())) {
-            Button exitButton = SandboxClientEvents.getExitSandboxButton();
-            if (!exitButton.isHidden.get()) {
-                exitButton.render(evt.getGuiGraphics(),
-                        (int) (screenWidth - (StartButtons.ICON_SIZE * 2f)),
-                        StartButtons.ICON_SIZE / 2,
-                        mouseX,
-                        mouseY
-                );
-                renderedButtons.add(exitButton);
-            }
-            Button publishScenarioButton = SandboxClientEvents.getPublishScenarioButton();
-            if (!publishScenarioButton.isHidden.get()) {
-                publishScenarioButton.render(evt.getGuiGraphics(),
-                        (int) (screenWidth - (StartButtons.ICON_SIZE * 4f)),
-                        StartButtons.ICON_SIZE / 2,
-                        mouseX,
-                        mouseY
-                );
-                renderedButtons.add(publishScenarioButton);
-            }
-            Button configureScenarioButton = SandboxClientEvents.getConfigureScenarioButton();
-            if (!configureScenarioButton.isHidden.get()) {
-                configureScenarioButton.render(evt.getGuiGraphics(),
-                        (int) (screenWidth - (StartButtons.ICON_SIZE * 6f)),
-                        StartButtons.ICON_SIZE / 2,
-                        mouseX,
-                        mouseY
-                );
-                renderedButtons.add(configureScenarioButton);
-            }
+    /** Diamond frame: the whole map turned 45 degrees like the camera, so no corner is cut off. */
+    private static void renderMapFrame(HudFrame f, HudLayout l) {
+        Rect map = l.minimap();
+        if (MinimapClientEvents.isSquare()) {
+            Theme.outline(f.g, map.x() - 2, map.y() - 2, map.w() + 4, map.h() + 4, 1, Theme.INK);
+            Theme.outline(f.g, map.x(), map.y(), map.w(), map.h(), 2, Theme.CONSOLE_RIM);
+            f.g.fill(map.x(), map.y(), map.right(), map.bottom(), Theme.INK);
+            return;
         }
+        int side = Math.round(map.w() / (float) Math.sqrt(2));
+        f.g.pose().pushPose();
+        f.g.pose().translate(map.x() + map.w() / 2f, map.y() + map.h() / 2f, 0);
+        f.g.pose().mulPose(com.mojang.math.Axis.ZP.rotationDegrees(45));
+        Theme.outline(f.g, -side / 2 - 2, -side / 2 - 2, side + 4, side + 4, 1, Theme.INK);
+        Theme.outline(f.g, -side / 2, -side / 2, side, side, 2, Theme.CONSOLE_RIM);
+        f.g.fill(-side / 2, -side / 2, side / 2, side / 2, Theme.INK);
+        f.g.pose().popPose();
+    }
 
-        BeaconPlacement beacon = BuildingUtils.getBeacon(true);
-        if (beacon != null) {
-            Button beaconButton = HelperButtons.getBeaconButton(beacon.ownerName);
-            int xi = screenWidth - (StartButtons.ICON_SIZE * 2);
-            if (!observerButton.isHidden.get() || !diplomacyButton.isHidden.get()) {
-                xi = screenWidth - (StartButtons.ICON_SIZE * 4);
-            }
-            if (SandboxClientEvents.isSandboxPlayer()) {
-                xi -= StartButtons.ICON_SIZE * 2;
-            }
-            if (!beaconButton.isHidden.get()) {
-                beaconButton.tooltipOffsetY = 15;
-                beaconButton.render(evt.getGuiGraphics(),
-                    xi,
-                    40,
-                    mouseX,
-                    mouseY
-                );
-                renderedButtons.add(beaconButton);
-            }
-        }
 
-        // -------------------------------------------
-        // Game rules menu (spectator or sandbox only)
-        // -------------------------------------------
-        if (SandboxClientEvents.isSandboxPlayer() || !PlayerClientEvents.isRTSPlayer()) {
-            Button gamerulesButton = GameruleClient.getGamerulesButton();
-            if (MC.player != null && !gamerulesButton.isHidden.get() && !TutorialClientEvents.isEnabled()) {
-                int xr = screenWidth - (StartButtons.ICON_SIZE * 2);
-                if (!diplomacyButton.isHidden.get() || !observerButton.isHidden.get())
-                    xr = screenWidth - (StartButtons.ICON_SIZE * 4);
-                int yr = 40;
-                gamerulesButton.render(evt.getGuiGraphics(), xr, yr, mouseX, mouseY);
-                renderedButtons.add(gamerulesButton);
-                if (GameruleClient.gamerulesMenuOpen) {
-                    List<Button> gameruleButtons = GameruleClient.renderGamerulesGUI(evt.getGuiGraphics(), xr, 40, mouseX, mouseY);
-                    renderedButtons.addAll(gameruleButtons);
-                }
-            }
-        }
+    private static void renderItemShop(HudFrame f) {
+        // a selected shop sells from the command card; the last one selected pops up over the hero it serves
+        if (hudSelectedPlacement instanceof ItemShopPlacement selected && selected.isBuilt && !SpectatorHud.isActive())
+            ItemClientEvents.openItemShop = selected;
+        ItemShopPlacement shop = ItemClientEvents.openItemShop;
+        boolean open = ItemClientEvents.ENABLED && shop != null && !shop.isDestroyedServerside && !SpectatorHud.isActive()
+                && hudSelectedPlacement == null && hudSelectedEntity != null && shop.getServedUnit() == hudSelectedEntity;
+        if (open)
+            ItemShopMenu.render(f, shop, f.layout.selection().x(), SelectionPanel.floatingTop() - HudLayout.GAP);
+    }
 
-        // --------------------
-        // Tutorial Help button
-        // --------------------
-        if (!helpButton.isHidden.get()) {
-            int xi = screenWidth - (chatButton.iconSize * 2);
-            int yi = 40;
-            helpButton.render(evt.getGuiGraphics(), xi, yi, mouseX, mouseY);
-            renderedButtons.add(helpButton);
-        }
-        // ---------------------------------
-        // Observer/Diplomacy Players Toggle
-        // ---------------------------------
-        else if (!observerButton.isHidden.get()) {
-            int xi = screenWidth - (observerButton.iconSize * 2);
-            int yi = 40;
-            observerButton.render(evt.getGuiGraphics(), xi, yi, mouseX, mouseY);
-            renderedButtons.add(observerButton);
-        }
-        else if (!diplomacyButton.isHidden.get()) {
-            int xi = screenWidth - (diplomacyButton.iconSize * 2);
-            int yi = 40;
-            diplomacyButton.render(evt.getGuiGraphics(), xi, yi, mouseX, mouseY);
-            renderedButtons.add(diplomacyButton);
-        }
-        else {
-            PlayerDisplayClientEvents.resetDisplay();
-        }
-        // -----------
-        // Chat button
-        // -----------
-        if (!chatButton.isHidden.get()) {
-            int xi = screenWidth - (chatButton.iconSize * 2);
-            int yi = 70;
-            chatButton.render(evt.getGuiGraphics(), xi, yi, mouseX, mouseY);
-            renderedButtons.add(chatButton);
-        }
-        // -------------------------
-        // Select all military units
-        // -------------------------
-        if (!armyButton.isHidden.get()) {
-            int xi = screenWidth - (armyButton.iconSize * 2);
-            int yi = 100;
-            armyButton.render(evt.getGuiGraphics(), xi, yi, mouseX, mouseY);
-            renderedButtons.add(armyButton);
-        }
-        // -------------------
-        // Idle workers button
-        // -------------------
-        if (!idleWorkerButton.isHidden.get()) {
-            int xi = screenWidth - (idleWorkerButton.iconSize * 2);
-            int yi = 130;
-            idleWorkerButton.render(evt.getGuiGraphics(), xi, yi, mouseX, mouseY);
-            evt.getGuiGraphics().drawString(
-                MC.font,
-                String.valueOf(idleWorkerIds.size()),
-                xi + 2,
-                yi + idleWorkerButton.iconSize - 1,
-                0xFFFFFF
-            );
-            renderedButtons.add(idleWorkerButton);
-        }
+    /** Toast, centred above the console. */
+    private static void renderOverlays(HudFrame f) {
+        Toast.render(f.g, f.layout.width() / 2, f.layout.toastBottom());
+    }
 
-        // -------------------------
-        // Minimap start pos buttons
-        // -------------------------
-        if (MC.player != null && StartPosClientEvents.isEnabled() &&
-                !StartPosClientEvents.isStarting &&
-                !PlayerClientEvents.rtsLocked &&
-                PlayerClientEvents.rtsPlayers.isEmpty()) {
-
-            for (StartPos startPos : StartPosClientEvents.startPoses) {
-                int xc = startPos.pos.getX();
-                int zc = startPos.pos.getZ();
-
-                // Render the Button overlaid at the map screen position:
-                if (MinimapClientEvents.isWorldXZinsideMap(xc, zc)) {
-                    Button button = startPos.getButton(MC.player.getName().getString(), MC.player.hasPermissions(4));
-                    Vec2 worldPos = new Vec2(xc, zc);
-                    Vec2 screenPos = MinimapClientEvents.worldPosToMinimapScreen((int) worldPos.x, (int) worldPos.y);
-                    int btnX = (int) screenPos.x - Button.DEFAULT_ICON_FRAME_SIZE / 2;
-                    int btnY = (int) screenPos.y - Button.DEFAULT_ICON_FRAME_SIZE / 2;
-                    button.render(evt.getGuiGraphics(), btnX, btnY, HudClientEvents.mouseX, HudClientEvents.mouseY);
-                    renderedButtons.add(button);
-                }
-            }
-        }
-        
-        if (hudSelectedEntity != null) {
-            ArrayList<ResourceLocation> buttons = CustomButtonClientEvents.entityMappings.get(hudSelectedEntity.getType());
-            if (buttons != null)
-                for (ResourceLocation rl : buttons) {
-                    CustomButton button = CustomButtonClientEvents.getButton(rl);
-                        button.render(evt.getGuiGraphics(), screenWidth - (button.iconSize * 2) - button.OffsetX, button.OffsetY, mouseX, mouseY);
-                        renderedButtons.add(button);
-                }
-        }
+    private static void renderHiddenPill(GuiGraphics g, HudScale scale, HudLayout layout) {
+        g.pose().pushPose();
+        g.pose().scale(scale.poseScale(), scale.poseScale(), 1);
+        String s = I18n.get("hud.reignofnether.hud_hidden", Keybindings.getFnum(1).getCurrentLabel());
+        int w = Text.smallWidth(s) + 12;
+        int x = (layout.width() - w) / 2;
+        Theme.panel(g, x, HudLayout.MARGIN, w, 14);
+        Text.small(g, s, x + 6, HudLayout.MARGIN + 2, Theme.LABEL);
+        g.pose().popPose();
+    }
 
-        if (hudSelectedPlacement != null) {
-            ArrayList<ResourceLocation> buttons = CustomButtonClientEvents.buildingMappings.get(hudSelectedPlacement.getBuilding());
-            if (buttons != null) 
-                for (ResourceLocation rl : buttons) {
-                    CustomButton button = CustomButtonClientEvents.getButton(rl);
-                    if (!button.isHidden.get()) {
-                        button.render(evt.getGuiGraphics(), screenWidth - (button.iconSize * 2) - button.OffsetX, button.OffsetY, mouseX, mouseY);
-                        renderedButtons.add(button);
-                    }
-                }
-        }
+    /** Pre-match seat markers on the minimap, as small HUD cells; your own pick gets the active ring. */
+    private static void renderStartPositions(HudFrame f) {
+        if (MC.player == null || !StartPosClientEvents.isEnabled() || StartPosClientEvents.isStarting
+                || PlayerClientEvents.rtsLocked || !PlayerClientEvents.rtsPlayers.isEmpty())
+            return;
+        // only seats inside the map square, clipped to it; the scissor is set in GUI coordinates
+        float[] map = HudGeometry.toGui(f.layout.minimap());
+        f.g.enableScissor(Math.round(map[0]), Math.round(map[1]), Math.round(map[0] + map[2]), Math.round(map[1] + map[3]));
+        f.g.pose().pushPose();
+        f.g.pose().scale(f.scale.poseScale(), f.scale.poseScale(), 1);
+        int size = HudLayout.TILE_SMALL;
+        for (StartPos startPos : StartPosClientEvents.startPoses) {
+            int xc = startPos.pos.getX();
+            int zc = startPos.pos.getZ();
+            if (!MinimapClientEvents.isWorldXZinsideMap(xc, zc))
+                continue;
+            Vec2 screenPos = MinimapClientEvents.worldPosToMinimapScreen(xc, zc);
+            if (!MinimapClientEvents.isPointInsideMinimap(screenPos.x, screenPos.y))
+                continue;
+            Button button = startPos.getButton(MC.player.getName().getString(), MC.player.hasPermissions(4));
+            // the minimap works in GUI coordinates; centre the cell on the seat in HUD units
+            Rect r = new Rect(f.scale.toUnits(screenPos.x) - size / 2, f.scale.toUnits(screenPos.y) - size / 2, size, size);
+            ButtonCell.render(f.g, button, r.x(), r.y(), size, null, f.hovered(r));
+            f.register(button, r, null, () -> Tooltip.fromLines(button.tooltipLines));
+        }
+        f.g.pose().popPose();
+        f.g.disableScissor();
+    }
 
-        for (ResourceLocation rl : CustomButtonClientEvents.alwaysRenderButtons) {
-            CustomButton button = CustomButtonClientEvents.getButton(rl);
-            if (!button.isHidden.get()) {
-                button.render(evt.getGuiGraphics(), screenWidth - (button.iconSize * 2) - button.OffsetX, button.OffsetY, mouseX, mouseY);
-                renderedButtons.add(button);
-            }
-        }
+    // ------------------------------------------------------------------ queries from the rest of the mod
 
-        // ------------------------------------------------------
-        // Button tooltips (has to be rendered last to be on top)
-        // ------------------------------------------------------
-        for (Button button : renderedButtons)
-            if (button.isMouseOver(mouseX, mouseY))
-                button.renderTooltip(evt.getGuiGraphics(), mouseX, mouseY);
+    private static int hudMouseX() {
+        return HudGeometry.scale().toUnits(mouseX);
+    }
 
-        TutorialClientEvents.checkAndRenderNextAction(evt.getGuiGraphics(), renderedButtons);
+    private static int hudMouseY() {
+        return HudGeometry.scale().toUnits(mouseY);
     }
 
     public static boolean isMouseOverAnyButton() {
-        for (Button button : renderedButtons)
-            if (button.isMouseOver(mouseX, mouseY)) {
-                return true;
-            }
-        return false;
+        return getMousedOverButton() != null;
     }
 
+    @Nullable
     public static Button getMousedOverStartPosButton() {
-        for (Button button : renderedButtons)
-            if (button.name.equals(StartPos.BUTTON_NAME) && button.isMouseOver(mouseX, mouseY)) {
-                return button;
-            }
-        return null;
+        Button b = getMousedOverButton();
+        return b != null && b.name.equals(StartPos.BUTTON_NAME) ? b : null;
+    }
+
+    @Nullable
+    public static Button getMousedOverButton() {
+        if (lastFrame == null)
+            return null;
+        HudFrame.Placed p = lastFrame.buttonAt(hudMouseX(), hudMouseY());
+        return p != null ? p.button() : null;
     }
 
     public static boolean isMouseOverAnyButtonOrHud() {
-        for (RectZone hudZone : hudZones)
-            if (hudZone.isMouseOver(mouseX, mouseY))
-                return true;
-        if (MinimapClientEvents.isPointInsideMinimap(mouseX, mouseY))
-            return true;
-        if (PlayerDisplayClientEvents.isMouseOverHud(mouseX, mouseY))
+        if (lastFrame != null && lastFrame.isOverHud(hudMouseX(), hudMouseY()))
             return true;
-        if (CustomBuildingClientEvents.isMouseOverHud(mouseX, mouseY))
-            return true;
-        if (ScenarioClientEvents.isMouseOverHud(mouseX, mouseY))
+        if (MinimapClientEvents.isPointInsideMinimap(mouseX, mouseY))
             return true;
-        return isMouseOverAnyButton();
+        return CustomBuildingClientEvents.isMouseOverHud(mouseX, mouseY);
     }
 
-    public static Button getMousedOverButton() {
-        for (Button button : renderedButtons)
-            if (button.isMouseOver(mouseX, mouseY)) {
-                return button;
-            }
-        return null;
+    /** Left button released: lets the button under the mouse finish its action (item slots use this). */
+    public static void releaseMouse() {
+        if (lastFrame != null)
+            lastFrame.release(hudMouseX(), hudMouseY());
     }
 
+    // ------------------------------------------------------------------ input
+
     @SubscribeEvent
     public static void onMousePress(ScreenEvent.MouseButtonPressed.Post evt) {
-        if (!(MC.screen instanceof TopdownGui))
+        if (!(MC.screen instanceof TopdownGui) || lastFrame == null)
             return;
-        for (Button button : renderedButtons) {
-            if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_1) {
-                button.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), true);
-            } else if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_2) {
-                button.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), false);
-            }
-        }
+        // the building editor popup is drawn over the HUD and handles its own clicks
+        if (CustomBuildingClientEvents.isMouseOverHud(mouseX, mouseY))
+            return;
+        HudScale s = HudGeometry.scale();
+        int ux = s.toUnits(evt.getMouseX());
+        int uy = s.toUnits(evt.getMouseY());
         if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_1) {
-            mouseLeftDownX = (int) evt.getMouseX();
-            mouseLeftDownY = (int) evt.getMouseY();
+            lastFrame.click(ux, uy, true);
+            leftDownHudX = ux;
+            leftDownHudY = uy;
+        } else if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_2) {
+            lastFrame.click(ux, uy, false);
         }
     }
 
-
-
-    // for some reason some bound vanilla keys like Q and E don't trigger KeyPressed but still trigger keyReleased
+    // some vanilla-bound keys like Q and E never fire KeyPressed in this screen but do fire KeyReleased
     @SubscribeEvent
-    public static void onKeyRelease(ScreenEvent.KeyReleased.KeyReleased.Post evt) {
+    public static void onKeyRelease(ScreenEvent.KeyReleased.Post evt) {
         if (TextInputClientEvents.isAnyInputFocused())
             return;
-        if (MC.screen == null || !MC.screen.getTitle().getString().contains("topdowngui_container"))
+        if (!(MC.screen instanceof TopdownGui))
             return;
         if (evt.getKeyCode() == GLFW.GLFW_KEY_F3)
             showPreselectedBlockInfo = !showPreselectedBlockInfo;
-        for (Button button : renderedButtons)
-            button.checkPressed(evt.getKeyCode());
+        if (lastFrame != null)
+            lastFrame.press(evt.getKeyCode(), Keybindings.altMod.isDown(), Keybindings.ctrlMod.isDown());
     }
 
     @SubscribeEvent
     public static void onClientTick(TickEvent.ClientTickEvent evt) {
-        if (evt.phase != TickEvent.Phase.END) {
+        if (evt.phase != TickEvent.Phase.END)
             return;
-        }
-        if (OrthoviewClientEvents.isEnabled()) {
+        Toast.tick();
+        SpectatorHud.tick();
+        SpectatorFeed.tick();
+        if (OrthoviewClientEvents.isEnabled())
             portraitRendererUnit.tickAnimation();
-        }
-
-        // move camera to unit or building when its portrait is clicked/held on
-        if (MiscUtil.isLeftClickDown(MC)) {
-            if (buildingPortraitZone != null && buildingPortraitZone.isMouseOver(mouseX, mouseY)
-                && buildingPortraitZone.isMouseOver(mouseLeftDownX, mouseLeftDownY) && MC.player != null
-                && hudSelectedPlacement != null) {
-                BlockPos pos = hudSelectedPlacement.centrePos;
-                OrthoviewClientEvents.centreCameraOnPos(pos);
 
-            } else if (unitPortraitZone != null && unitPortraitZone.isMouseOver(mouseX, mouseY)
-                && unitPortraitZone.isMouseOver(mouseLeftDownX, mouseLeftDownY) && MC.player != null) {
+        // holding the mouse on the portrait keeps the camera on the selected unit or building
+        Rect portrait = SelectionPanel.portraitRect();
+        if (MiscUtil.isLeftClickDown(MC) && MC.player != null && portrait.contains(hudMouseX(), hudMouseY())
+                && portrait.contains(leftDownHudX, leftDownHudY)) {
+            if (hudSelectedPlacement != null)
+                OrthoviewClientEvents.centreCameraOnPos(hudSelectedPlacement.centrePos);
+            else if (hudSelectedEntity != null)
                 OrthoviewClientEvents.centreCameraOnPos(hudSelectedEntity.position());
-            }
         }
     }
 
@@ -2040,7 +598,7 @@ public static void onRenderLivingEntity(RenderLivingEvent.Post<? extends LivingE
 
         ArrayList<LivingEntity> units = UnitClientEvents.getSortedSelectedUnits();
 
-        if (units.size() <= 0) {
+        if (units.isEmpty()) {
             HudClientEvents.setHudSelectedEntity(null);
         } else if (hudSelectedEntity == null || units.size() == 1 || !units.contains(hudSelectedEntity)) {
             HudClientEvents.setHudSelectedEntity(units.get(0));
@@ -2055,15 +613,9 @@ public static void onRenderLivingEntity(RenderLivingEvent.Post<? extends LivingE
         }
     }
 
+    // control groups, deselect, chat and Tab
     @SubscribeEvent
-    public static void onRenderNamePlate(RenderNameTagEvent evt) {
-        //if (OrthoviewClientEvents.isEnabled())
-        //    evt.setResult(Event.Result.DENY);
-    }
-
-    // MANAGE CONTROL GROUPS
-    @SubscribeEvent
-    public static void onKeyPress(ScreenEvent.KeyPressed.KeyPressed.Pre evt) {
+    public static void onKeyPress(ScreenEvent.KeyPressed.Pre evt) {
         if (TextInputClientEvents.isAnyInputFocused())
             return;
         if (!(MC.screen instanceof TopdownGui))
@@ -2072,52 +624,44 @@ public static void onKeyPress(ScreenEvent.KeyPressed.KeyPressed.Pre evt) {
         // Prevent spectator mode options from showing up
         if (OrthoviewClientEvents.isEnabled()) {
             for (Keybinding numKey : Keybindings.nums)
-                if (numKey.getKey() == evt.getKeyCode()) {
+                if (numKey.getKey() == evt.getKeyCode())
                     evt.setCanceled(true);
-                }
         }
 
-        // Deselect everything
         if (evt.getKeyCode() == Keybindings.deselect.getKey()) {
             UnitClientEvents.clearSelectedUnits();
             BuildingClientEvents.clearSelectedBuildings();
             BuildingClientEvents.setBuildingToPlace(null);
         }
 
-        // Initialize controlGroups with empty arrays if not already initialized
         if (controlGroups.size() < Keybindings.nums.length) {
-            controlGroups.clear(); // Clear in case of a previous partial initialization
-            for (Keybinding keybinding : Keybindings.nums) {
+            controlGroups.clear();
+            for (Keybinding ignored : Keybindings.nums)
                 controlGroups.add(new ControlGroup());
-            }
         }
 
-        // Access and save to controlGroups if index is within bounds
         for (Keybinding keybinding : Keybindings.nums) {
             int index = Integer.parseInt(keybinding.buttonLabel);
-            if (index >= 0 && index < controlGroups.size() && evt.getKeyCode() == keybinding.getKey()) {  // Bounds check
-                if (Keybindings.ctrlMod.isDown()) {
-                    controlGroups.get(index).saveFromSelected(keybinding, true);
-                } else if (Keybindings.shiftMod.isDown()) {
-                    controlGroups.get(index).saveFromSelected(keybinding, false);
-                } else if (Keybindings.altMod.isDown()) {
-                    for (ControlGroup controlGroup : controlGroups) {
-                        for (LivingEntity le : getSelectedUnits())
-                            controlGroup.entityIds.removeIf(id -> id == le.getId());
-                        for (BuildingPlacement bpl : BuildingClientEvents.getSelectedBuildings())
-                            controlGroup.buildingBps.removeIf(bp -> bp.equals(bpl.originPos));
-                    }
-                    controlGroups.get(index).saveFromSelected(keybinding, true);
+            if (index < 0 || index >= controlGroups.size() || evt.getKeyCode() != keybinding.getKey())
+                continue;
+            if (Keybindings.ctrlMod.isDown()) {
+                controlGroups.get(index).saveFromSelected(keybinding, true);
+            } else if (Keybindings.shiftMod.isDown()) {
+                controlGroups.get(index).saveFromSelected(keybinding, false);
+            } else if (Keybindings.altMod.isDown()) {
+                for (ControlGroup controlGroup : controlGroups) {
+                    for (LivingEntity le : getSelectedUnits())
+                        controlGroup.entityIds.removeIf(id -> id == le.getId());
+                    for (BuildingPlacement bpl : BuildingClientEvents.getSelectedBuildings())
+                        controlGroup.buildingBps.removeIf(bp -> bp.equals(bpl.originPos));
                 }
+                controlGroups.get(index).saveFromSelected(keybinding, true);
             }
         }
 
-        // Open chat while orthoview is enabled
-        if (OrthoviewClientEvents.isEnabled() && evt.getKeyCode() == Keybindings.chat.getKey()) {
-            MC.setScreen(new ChatScreen(""));
-        }
+        if (OrthoviewClientEvents.isEnabled() && evt.getKeyCode() == Keybindings.chat.getKey())
+            MC.setScreen(new ChatPanel());
 
-        // Cycle through selected units
         if (evt.getKeyCode() == Keybindings.tab.getKey()) {
             cycleUnitSubgroups();
             cycleBuildingSubgroups();
@@ -2235,29 +779,29 @@ public static void convertControlGroups(int[] oldUnitIds, int[] newUnitIds) {
                     }
                 }
             }
-            for (int i = 0; i < oldUnitIds.length; i++) {
-                for (int j = 0; j < oldUnitIds.length; j++) {
-                    final int k = j;
-                    group.entityIds.removeIf(id -> id == oldUnitIds[k]);
-                }
-            }
+            for (int old : oldUnitIds)
+                group.entityIds.removeIf(id -> id == old);
         }
     }
 
+
     @SubscribeEvent
     public static void onRenderOverLay(RenderGuiOverlayEvent.Pre evt) {
+        // this event fires once per overlay
+        if (evt.getOverlay() != VanillaGuiOverlay.PLAYER_LIST.type())
+            return;
+        // no vanilla player list in the RTS view: Tab cycles unit types there, and diplomacy lists the players
+        if (OrthoviewClientEvents.isEnabled())
+            evt.setCanceled(true);
         if (MC.screen != null && MC.level != null && SandboxClientEvents.isSandboxPlayer() && showPreselectedBlockInfo) {
-            int y = 5;
-            for (ControlGroup controlGroup : controlGroups) {
-                if (!controlGroup.buildingBps.isEmpty() || !controlGroup.entityIds.isEmpty()) {
-                    y += 20;
-                    break;
-                }
-            }
+            GuiGraphics g = evt.getGuiGraphics();
+            int y = HudGeometry.scale().height() / 3;
             BlockPos bp = CursorClientEvents.getPreselectedBlockPos();
-            evt.getGuiGraphics().drawString(MC.font, I18n.get("hud.reignofnether.block_pos", bp.toShortString()), 100, y, 0xFFFFFF);
-            evt.getGuiGraphics().drawString(MC.font, MC.level.getBlockState(bp).getBlock().toString().replaceFirst("Block", ""), 100, y + 10, 0xFFFFFF);
-            evt.getGuiGraphics().drawString(MC.font, "Chunk: " + MC.level.getChunkAt(bp).getPos(), 100, y + 20, 0xFFFFFF);
+            Text.atGui(g, 0, 0, () -> {
+                g.drawString(MC.font, I18n.get("hud.reignofnether.block_pos", bp.toShortString()), 5, y, 0xFFFFFF);
+                g.drawString(MC.font, MC.level.getBlockState(bp).getBlock().toString().replaceFirst("Block", ""), 5, y + 10, 0xFFFFFF);
+                g.drawString(MC.font, "Chunk: " + MC.level.getChunkAt(bp).getPos(), 5, y + 20, 0xFFFFFF);
+            });
         }
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/MyEditBox.java b/src/main/java/com/solegendary/reignofnether/hud/MyEditBox.java
index c2cab4817..7dcac603e 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/MyEditBox.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/MyEditBox.java
@@ -15,6 +15,8 @@ public class MyEditBox extends EditBox {
     public List<FormattedCharSequence> tooltipLines;
     public boolean isPositiveNumber;
     public CommandSuggestions commandSuggestions;
+    public boolean hudUnits = false; // x/y/size in HUD units: drawn and clicked under the HUD scale, so its text matches the HUD
+    public boolean placed = false; // laid out by the HUD this frame; a HUD box that wasn't belongs to a panel that isn't showing
 
     private MyEditBox(Builder builder) {
         super(Minecraft.getInstance().font, builder.x, builder.y, builder.width, builder.height, Component.literal(""));
diff --git a/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererBuilding.java b/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererBuilding.java
index bb9f65506..116b7123e 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererBuilding.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererBuilding.java
@@ -4,130 +4,47 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
-import com.solegendary.reignofnether.api.ReignOfNetherRegistries;
-import com.solegendary.reignofnether.building.BuildingClientEvents;
-import com.solegendary.reignofnether.building.BuildingPlacement;
-import com.solegendary.reignofnether.building.addon.NightSourceAddon;
-import com.solegendary.reignofnether.building.buildings.monsters.SculkCatalyst;
-import com.solegendary.reignofnether.building.buildings.placements.SculkCatalystPlacement;
-import com.solegendary.reignofnether.building.custombuilding.CustomBuilding;
-import com.solegendary.reignofnether.healthbars.HealthBarClientEvents;
-import com.solegendary.reignofnether.player.PlayerColors;
-import com.solegendary.reignofnether.unit.Relationship;
-import com.solegendary.reignofnether.util.LanguageUtil;
-import com.solegendary.reignofnether.util.MyRenderer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.client.resources.language.I18n;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
+import org.joml.Matrix4f;
 import org.joml.Quaternionf;
 
-// Renders a Building's portrait including an animated block, name, healthbar, list of stats and UI frames
-
+// Renders a building's spinning portrait block
 public class PortraitRendererBuilding {
-    public int frameWidth = 60;
-    public int frameHeight = 60;
-    public int xBlock = 31;
-    public int yBlock = 25;
-
-    public PortraitRendererBuilding() {
-    }
-
-    // Render the portrait including:
-    // - background frame
-    // - block model representing the building
-    // - healthbar
-    // - building name
-    // Must be called from DrawScreenEvent
-    public RectZone render(GuiGraphics guiGraphics, int x, int y, BuildingPlacement building) {
-        Relationship rs = BuildingClientEvents.getPlayerToBuildingRelationship(building);
-
-        String name = "";
-        if (building.getBuilding() instanceof CustomBuilding customBuilding) {
-            name = customBuilding.name;
-        } else {
-            ResourceLocation key = ReignOfNetherRegistries.BUILDING.getKey(building.getBuilding());
-            if (key != null) {
-                name = LanguageUtil.getTranslation("buildings." + key.getNamespace() + "." + key.getPath());
-            }
-        }
-
-        if (building.getUpgradeLevel() > 0)
-            name = building.getUpgradedName();
-
-        if (!building.isBuilt)
-            name += " (" + (int) (building.getBlocksPlacedPercent() * 100) + "%)";
-
-        if (rs != Relationship.OWNED && !building.ownerName.isBlank())
-            name += " (" + building.ownerName + ")";
-
-        if (building instanceof SculkCatalystPlacement sc && building.getBuilding().hasActiveAddon(NightSourceAddon.class) && building.isBuilt)
-            name += " (" + I18n.get("hud.buildings.reignofnether.sculk_catalyst.range", building.getBuilding().getActiveAddon(NightSourceAddon.class).getNightRange(building), SculkCatalyst.MAX_NIGHT_RANGE) + ")";
 
-        // draw name
-        guiGraphics.drawString(
-                Minecraft.getInstance().font,
-                name,
-                x+4,y-9,
-                0xFFFFFFFF
-        );
-        int bgCol = PlayerColors.getPlayerPortraitDisplayColorHex(building.ownerName);
-        MyRenderer.renderFrameWithBg(guiGraphics, x, y,
-                frameWidth,
-                frameHeight,
-                bgCol);
-
-        drawBlockOnScreen(x, y, building.getBuilding().portraitBlock, 5.5f);
-
-        // draw health bar and write min/max hp
-        HealthBarClientEvents.renderForBuilding(guiGraphics.pose(), building,
-                x+(frameWidth/2f), y+frameHeight-15,
-                frameWidth-9, HealthBarClientEvents.RenderMode.GUI_PORTRAIT);
-
-        guiGraphics.drawCenteredString(
-                Minecraft.getInstance().font,
-                building.getHealth() + "/" + building.getMaxHealth(),
-                x+(frameWidth/2), y+frameHeight-13,
-                0xFFFFFFFF
-        );
-
-        return RectZone.getZoneByLW(x, y, frameWidth, frameHeight);
-    }
-
-    public void drawBlockOnScreen(int x, int y, Block block, float blockScale) {
+    /**
+     * Draws a slowly spinning block (the building's portrait block) centred on (cx, cy). Positions go
+     * on the GUI pose so the block follows the HUD scale; blockScale 11 fills a 75 unit wide box.
+     */
+    public static void drawBlock(GuiGraphics g, Block block, float cx, float cy, float blockScale) {
         ItemStack item = new ItemStack(block);
 
         RenderSystem.enableBlend();
         RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-        PoseStack poseStack = RenderSystem.getModelViewStack();
-        poseStack.pushPose();
-        poseStack.translate(x+xBlock, y+yBlock, 100.0F);
-        poseStack.scale(blockScale, -blockScale, blockScale);
-        RenderSystem.applyModelViewMatrix();
 
+        PoseStack pose = g.pose();
+        pose.pushPose();
+        pose.translate(cx, cy, 100.0F);
+        // the flip goes on the pose matrix alone: in the normal matrix it would flicker the lighting as the block spins
+        pose.mulPoseMatrix(new Matrix4f().scaling(1.0F, -1.0F, 1.0F));
+        pose.scale(blockScale * 8, blockScale * 8, blockScale * 8);
         float angle = (System.currentTimeMillis() / 100) % 360;
-        Quaternionf quaternion = Axis.XP.rotationDegrees(25);
-        Quaternionf quaternion2 = Axis.YP.rotationDegrees(angle);
-        quaternion.mul(quaternion2);
-        PoseStack blockPoseStack = new PoseStack();
-        blockPoseStack.pushPose();
-        blockPoseStack.mulPose(quaternion);
-        blockPoseStack.scale(8, 8, 8);
-        MultiBufferSource.BufferSource bufferSource = Minecraft.getInstance().renderBuffers().bufferSource();
+        Quaternionf rotation = Axis.XP.rotationDegrees(25);
+        rotation.mul(Axis.YP.rotationDegrees(angle));
+        pose.mulPose(rotation);
 
+        MultiBufferSource.BufferSource bufferSource = Minecraft.getInstance().renderBuffers().bufferSource();
         Minecraft.getInstance().getItemRenderer().renderStatic(
                 item, ItemDisplayContext.FIXED,
                 15728880, OverlayTexture.NO_OVERLAY,
-                blockPoseStack, bufferSource, null, 0);
+                pose, bufferSource, null, 0);
         bufferSource.endBatch();
-
-        poseStack.popPose();
-        RenderSystem.applyModelViewMatrix();
+        pose.popPose();
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererModifiers.java b/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererModifiers.java
deleted file mode 100644
index 663786bdc..000000000
--- a/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererModifiers.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.solegendary.reignofnether.hud;
-
-import com.mojang.datafixers.util.Pair;
-import com.solegendary.reignofnether.entities.TotemOfCasting;
-import com.solegendary.reignofnether.entities.TotemOfProtection;
-import com.solegendary.reignofnether.entities.TotemOfRegeneration;
-import com.solegendary.reignofnether.entities.TotemOfShielding;
-import com.solegendary.reignofnether.unit.UnitClientEvents;
-import com.solegendary.reignofnether.unit.units.monsters.BatUnit;
-import com.solegendary.reignofnether.unit.units.monsters.NecromancerUnit;
-import com.solegendary.reignofnether.unit.units.monsters.WretchedWraithUnit;
-import com.solegendary.reignofnether.unit.units.neutral.PolarBearUnit;
-import com.solegendary.reignofnether.unit.units.piglins.*;
-import com.solegendary.reignofnether.unit.units.villagers.EnchanterUnit;
-import com.solegendary.reignofnether.unit.units.villagers.RoyalGuardUnit;
-import com.solegendary.reignofnether.unit.units.villagers.ScoutCatProd;
-import com.solegendary.reignofnether.unit.units.villagers.ScoutCatUnit;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.ambient.Bat;
-import net.minecraft.world.entity.animal.*;
-import net.minecraft.world.entity.animal.horse.*;
-import net.minecraft.world.entity.monster.*;
-import net.minecraft.world.entity.monster.hoglin.Hoglin;
-import net.minecraft.world.entity.monster.warden.Warden;
-
-public class PortraitRendererModifiers {
-
-    public static Pair<Integer, Integer> getPortraitRendererModifiers(LivingEntity entity) {
-        int yOffset = 0;
-        int scale = 0;
-
-        if (entity instanceof Warden) {
-            yOffset = -60;
-            scale = -21;
-        } else if (entity instanceof Horse || entity instanceof SkeletonHorse || entity instanceof ZombieHorse) {
-            yOffset = -6;
-            scale = -10;
-        } else if (entity instanceof Panda) {
-            yOffset = -15;
-            scale = -15;
-        } else if (entity instanceof PolarBear) {
-            yOffset = -15;
-            scale = -15;
-        } else if (entity instanceof Pig) {
-            yOffset = 10;
-        } else if (entity instanceof IronGolem) {
-            yOffset = -54;
-            scale = -17;
-        } else if (entity instanceof AbstractFish) {
-            yOffset = 20;
-        } else if (entity instanceof Squid) {
-            yOffset = 10;
-            scale = -20;
-        } else if (entity instanceof Turtle) {
-            yOffset = 14;
-            scale = -14;
-        } else if (entity instanceof CaveSpider) {
-            yOffset = 9;
-            scale = -11;
-        } else if (entity instanceof Spider) {
-            scale = -18;
-        } else if (entity instanceof Rabbit) {
-            yOffset = 18;
-            scale = 15;
-        } else if (entity instanceof Chicken) {
-            yOffset = 14;
-        } else if (entity instanceof Blaze && !(entity instanceof WildfireUnit)) {
-            yOffset = -10;
-            scale = -5;
-        } else if (entity instanceof MushroomCow) {
-            scale = -5;
-        } else if (entity instanceof Donkey || entity instanceof Mule) {
-            scale = -5;
-        }  else if (entity instanceof ScoutCatUnit) {
-            yOffset = 22;
-            scale = -2;
-        } else if (entity instanceof Ocelot || entity instanceof Cat) {
-            yOffset = 7;
-        } else if (entity instanceof Fox) {
-            yOffset = 20;
-        } else if (entity instanceof Vex) {
-            yOffset = 5;
-        }  else if (entity instanceof Phantom) {
-            yOffset = 20;
-        } else if (entity instanceof BabyHoglinUnit) {
-            yOffset = 11;
-            scale = -11;
-        } else if (entity instanceof Hoglin || entity instanceof Zoglin) {
-            yOffset = -18;
-            scale = -18;
-        } else if (entity instanceof Slime slime) { // largest size only
-            yOffset = 33 - (17 * slime.getSize());
-            scale = -32;
-        } else if (entity instanceof Wolf) {
-            yOffset = 12;
-        } else if (entity instanceof Silverfish) {
-            yOffset = 26;
-        } else if (entity instanceof EnderMan) {
-            yOffset = -15;
-        } else if (entity instanceof Ravager) {
-            yOffset = -54;
-            scale = -25;
-        } else if (entity instanceof Dolphin) {
-            yOffset = 20;
-            scale = -10;
-        } else if (entity instanceof Bee) {
-            yOffset = 20;
-            scale = -5;
-        } else if (entity instanceof WitherSkeleton) {
-            yOffset = -15;
-            scale = -4;
-        } else if (entity instanceof Ghast) {
-            yOffset = -118;
-            scale = -37;
-        } else if (entity instanceof NecromancerUnit) {
-            yOffset = -11;
-            scale = -9;
-        } else if (entity instanceof PiglinMerchantUnit) {
-            yOffset = -35;
-            scale = -27;
-        } else if (entity instanceof RoyalGuardUnit royalGuardUnit) {
-            yOffset = -14;
-            scale = -16;
-            float avatarPercent = (float) royalGuardUnit.getAvatarScaleTicks() / royalGuardUnit.AVATAR_SCALE_TICKS_MAX;
-            yOffset -= (26 * avatarPercent);
-        } else if (entity instanceof GruntUnit ||
-                entity instanceof BruteUnit ||
-                entity instanceof HeadhunterUnit) {
-            yOffset = -6;
-        } else if (entity instanceof WretchedWraithUnit) {
-            yOffset = -6;
-            scale = -24;
-        } else if (entity instanceof WildfireUnit) {
-            yOffset = -30;
-            scale = -32;
-        } else if (entity instanceof EnchanterUnit) {
-            yOffset = -12;
-            scale = -16;
-        } else if (entity instanceof MarauderUnit) {
-            yOffset = -34;
-            scale = -22;
-        } else if (entity instanceof Strider) {
-            yOffset = -24;
-            scale = -16;
-        } else if (entity instanceof BatUnit) {
-            yOffset = -2;
-            scale = -10;
-        } else if (entity instanceof TotemOfRegeneration) {
-            yOffset = -7;
-            scale = -7;
-        } else if (entity instanceof TotemOfShielding) {
-            yOffset = -8;
-            scale =-7;
-        } else if (entity instanceof TotemOfProtection) {
-            yOffset = -14;
-            scale = -7;
-        } else if (entity instanceof TotemOfCasting) {
-            yOffset = -6;
-            scale = -7;
-        }
-
-        return new Pair<>(yOffset, scale);
-    }
-}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererUnit.java b/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererUnit.java
index fe021ab02..fa50d9b6d 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererUnit.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/PortraitRendererUnit.java
@@ -1,63 +1,53 @@
 package com.solegendary.reignofnether.hud;
 
+import com.solegendary.reignofnether.unit.units.monsters.WretchedWraithUnit;
+import com.mojang.blaze3d.platform.GlConst;
 import com.mojang.blaze3d.platform.Lighting;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.datafixers.util.Pair;
 import com.mojang.math.Axis;
 import com.solegendary.reignofnether.ReignOfNether;
-import com.solegendary.reignofnether.ability.abilities.ToggleShield;
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.building.addon.GarrisonableBuildingAddon;
-import com.solegendary.reignofnether.healthbars.HealthBarClientEvents;
-import com.solegendary.reignofnether.hud.buttons.Button;
-import com.solegendary.reignofnether.hud.effecticons.EnchantmentIcon;
-import com.solegendary.reignofnether.player.PlayerColors;
 import com.solegendary.reignofnether.registrars.MobEffectRegistrar;
 import com.solegendary.reignofnether.resources.ResourceSource;
 import com.solegendary.reignofnether.resources.ResourceSources;
 import com.solegendary.reignofnether.resources.Resources;
-import com.solegendary.reignofnether.unit.Relationship;
-import com.solegendary.reignofnether.unit.UnitClientEvents;
 import com.solegendary.reignofnether.unit.UnitStatType;
 import com.solegendary.reignofnether.unit.controls.SlimeJumpMoveControl;
+import com.solegendary.reignofnether.unit.modelling.renderers.EnchanterRenderer;
+import com.solegendary.reignofnether.unit.modelling.renderers.RoyalGuardRenderer;
 import com.solegendary.reignofnether.unit.interfaces.AttackerUnit;
 import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
 import com.solegendary.reignofnether.unit.units.monsters.CreeperUnit;
 import com.solegendary.reignofnether.unit.units.monsters.SlimeUnit;
-import com.solegendary.reignofnether.unit.units.piglins.BruteUnit;
+import com.solegendary.reignofnether.unit.units.piglins.WildfireUnit;
 import com.solegendary.reignofnether.unit.units.villagers.EnchanterUnit;
 import com.solegendary.reignofnether.unit.units.villagers.RavagerUnit;
-import com.solegendary.reignofnether.util.MiscUtil;
+import com.solegendary.reignofnether.unit.units.villagers.RoyalGuardUnit;
 import com.solegendary.reignofnether.util.MyMath;
-import com.solegendary.reignofnether.util.MyRenderer;
 import net.minecraft.ReportedException;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.Model;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackResources;
-import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.util.Mth;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.world.entity.monster.AbstractIllager;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.BannerItem;
 import net.minecraft.world.item.ItemStack;
-import org.apache.commons.lang3.text.WordUtils;
 import org.joml.Quaternionf;
 
 import java.text.DecimalFormat;
@@ -65,7 +55,6 @@
 import java.util.List;
 
 import static com.solegendary.reignofnether.hud.TooltipColours.*;
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
 
 // Renders a Unit's portrait including its animated head, name, healthbar, list of stats and UI frames for these
 
@@ -75,16 +64,6 @@ public class PortraitRendererUnit<T extends LivingEntity, M extends EntityModel<
     public R renderer;
     public Model model;
 
-    public final int frameWidth = 60;
-    public final int frameHeight = 60;
-
-    public final int statsWidth = 44;
-    public final int statsHeight = 60;
-
-    private final int size = 46;
-    private final int offsetX = 31;
-    private final int offsetY = 105;
-    private final float standardEyeHeight = 1.74f; // height for most humanoid mobs
 
     // change these randomly every few seconds to make the head look around
     private int lookX = 0;
@@ -99,8 +78,6 @@ public class PortraitRendererUnit<T extends LivingEntity, M extends EntityModel<
     private final int lookRangeX = 100;
     private final int lookRangeY = 40;
 
-    public final int HERO_Y_OFFSET = 10;
-
     public PortraitRendererUnit() {
     }
 
@@ -171,582 +148,221 @@ public void tickAnimation() {
         }
     }
 
-    // Render the portrait including:
-    // - background frame
-    // - moving head
-    // - healthbar
-    // - unit name
-    // Must be called from DrawScreenEvent
-    public RectZone render(GuiGraphics guiGraphics, String name, int x, int y, int mouseX, int mouseY, LivingEntity entity) {
-        if (entity instanceof HeroUnit)
-            y -= HERO_Y_OFFSET;
-
-        Relationship rs = UnitClientEvents.getPlayerToEntityRelationship(entity);
-        int bgCol = PlayerColors.getPlayerPortraitDisplayColorHex(entity instanceof Unit u ? u.getOwnerName() : null);
-        if (entity instanceof Player player) {
-            bgCol = 0xA0000000 | PlayerColors.getPlayerAllianceColorHex(player.getName().getString());
-        }
-        int frameHeightPlus = 0;
-        if (entity instanceof HeroUnit) {
-            frameHeightPlus = HERO_Y_OFFSET;
-        }
-        MyRenderer.renderFrameWithBg(guiGraphics, x, y, frameWidth, frameHeight + frameHeightPlus, bgCol);
-
-        // remember 0,0 is top left
-        int drawX = x + offsetX;
-        int drawY = y + (int) (entity.getEyeHeight() / standardEyeHeight * offsetY);
-
-        //if (entity instanceof HeroUnit)
-        //    drawY += HERO_Y_OFFSET;
-
-        int sizeFinal = size;
-
-        Pair<Integer, Integer> yAndScaleOffsets = PortraitRendererModifiers.getPortraitRendererModifiers(entity);
-
-        drawY += yAndScaleOffsets.getFirst();// + UnitClientEvents.yOffset;
-        sizeFinal += yAndScaleOffsets.getSecond();// + UnitClientEvents.scale;
-
-        // counteract siege mode sinking
-        if (entity instanceof RavagerUnit ravagerUnit)
-            drawY -= Math.round(ravagerUnit.getSiegeSinkOffset(1f) * sizeFinal);
-
-        boolean hasBanner = false;
-        ItemStack bannerStack = entity.getItemBySlot(EquipmentSlot.HEAD);
-        if (bannerStack.getItem() instanceof BannerItem) {
-            hasBanner = true;
-            entity.setItemSlot(EquipmentSlot.HEAD, ItemStack.EMPTY);
-        }
-        drawEntityOnScreen(guiGraphics.pose(), entity, drawX, drawY, sizeFinal);
-        guiGraphics.pose().pushPose();
-        guiGraphics.pose().translate(0,0,2000);
-        name = WordUtils.capitalize(name);
-
-        if (rs != Relationship.OWNED && entity instanceof Unit unit && unit.getOwnerName().length() > 0) {
-            name += " (" + unit.getOwnerName() + ")";
-        }
-
-        // draw name (unless a player, since their nametag will be rendered anyway)
-        if (entity instanceof HeroUnit) {
-            y -= 6;
-        }
-        int xOrig = x;
-        if (entity instanceof Unit unit) {
-            for (Button passiveIcon : unit.getPassiveIcons()) {
-                int yr = unit instanceof HeroUnit ? y - 18 : y - 16;
-                if (!passiveIcon.isHidden.get()) {
-                    passiveIcon.render(guiGraphics, x - 2, yr, mouseX, mouseY);
-                    if (passiveIcon.isMouseOver(mouseX, mouseY))
-                        passiveIcon.renderTooltip(guiGraphics, mouseX, mouseY);
-                    x += EnchantmentIcon.ICON_SIZE * 2;
-                }
-            }
-            if (!unit.getPassiveIcons().isEmpty())
-                x += EnchantmentIcon.ICON_SIZE / 2;
-        }
-        if (!(entity instanceof Player)) {
-            guiGraphics.drawString(Minecraft.getInstance().font, name, x + 4, y - 9, WHITE);
-        }
-        x = xOrig;
-        if (entity instanceof HeroUnit) {
-            y += 14;
-        }
-
-        RectZone rectZone = RectZone.getZoneByLW(x, y, frameWidth, frameHeight);
-
-        if (entity instanceof HeroUnit heroUnit) {
-            // draw health bar and write min/max hp
-            HealthBarClientEvents.renderForEntity(guiGraphics.pose(),
-                    entity,
-                    x + (frameWidth / 2f),
-                    y + frameHeight - 22,
-                    frameWidth - 9,
-                    HealthBarClientEvents.RenderMode.GUI_PORTRAIT
-            );
-            HealthBarClientEvents.renderAbsorbForEntity(guiGraphics.pose(),
-                    entity,
-                    x + (frameWidth / 2f),
-                    y + frameHeight - 22,
-                    frameWidth - 9,
-                    HealthBarClientEvents.RenderMode.GUI_PORTRAIT
-            );
-            HealthBarClientEvents.renderManaForEntity(guiGraphics.pose(),
-                    heroUnit,
-                    x + (frameWidth / 2f),
-                    y + frameHeight - 12,
-                    frameWidth - 9,
-                    HealthBarClientEvents.RenderMode.GUI_PORTRAIT
-            );
-        } else {
-            HealthBarClientEvents.renderForEntity(guiGraphics.pose(),
-                    entity,
-                    x + (frameWidth / 2f),
-                    y + frameHeight - 14,
-                    frameWidth - 9,
-                    HealthBarClientEvents.RenderMode.GUI_PORTRAIT
-            );
-            HealthBarClientEvents.renderAbsorbForEntity(guiGraphics.pose(),
-                    entity,
-                    x + (frameWidth / 2f),
-                    y + frameHeight - 14,
-                    frameWidth - 9,
-                    HealthBarClientEvents.RenderMode.GUI_PORTRAIT
-            );
-        }
-
-        ArrayList<String> texts = new ArrayList<>();
-        String healthText = "";
-        float health = entity.getHealth();
-        health += entity.getAbsorptionAmount();
-        if (health >= 1) {
-            healthText = String.valueOf((int) health);
-        } else {
-            healthText = String.valueOf(health).substring(0, 3);
-        }
-        float maxHealth = entity.getMaxHealth();
-        if (entity.getAbsorptionAmount() > 0)
-            maxHealth += MiscUtil.getMaxAbsorptionAmount(entity);
-
-        healthText += "/" + ((int) maxHealth);
-        texts.add(healthText);
-
-        if (entity instanceof HeroUnit heroUnit) {
-            String manaText = "";
-            float mana = heroUnit.getMana();
-            if (mana >= 1) {
-                manaText = String.valueOf((int) mana);
-            } else {
-                manaText = String.valueOf(mana).substring(0, 3);
-            }
-            manaText += "/" + (int) heroUnit.getMaxMana();
-            texts.add(manaText);
-        }
-
-        renderStatText(texts, entity, x, (entity instanceof HeroUnit ? y - HERO_Y_OFFSET + 2 : y), guiGraphics);
-
-        if (hasBanner)
-            entity.setItemSlot(EquipmentSlot.HEAD, bannerStack);
-
-        return rectZone;
+    /**
+     * Draws the selected entity's animated 3D model inside a box (HUD units), framed on its face like a portrait:
+     * the head and shoulders, with the eyes a little above the middle. Anything else is cut off by the box.
+     */
+    public void drawEntity(GuiGraphics g, LivingEntity entity, int x, int y, int w, int h) {
+        Entity root = entity.getRootVehicle();
+        List<Entity> stack = root.getSelfAndPassengers().toList();
+
+        float rs = rendererScale(entity);
+        float body = entity.getBbHeight() * rs;
+        float eyes = (float) (entity.getY() - root.getY()) + entity.getEyeHeight() * rs;
+        float visible = Math.max(Math.min(1f, body * 1.25f), body * 0.55f); // small mobs are shown whole
+        if (entity instanceof WildfireUnit) { // its model is about twice its blaze-sized hitbox
+            eyes = 3.3f;
+            visible = 1.9f;
+        }
+        float scale = h / visible;
+        drawEntityOnScreen(g.pose(), root, stack, x + w / 2f, y + h * 0.4f + eyes * scale, scale);
     }
 
-    private void renderStatText(List<String> texts, LivingEntity entity, int x, int y, GuiGraphics guiGraphics) {
-        // need to render like this instead of GuiComponent.drawCenteredString, so it's layered above the portrait entity
-        Minecraft MC = Minecraft.getInstance();
-        MultiBufferSource.BufferSource multibuffersource$buffersource =
-                MultiBufferSource.immediate(Tesselator.getInstance()
-                        .getBuilder());
-
-        for (int i = 0; i < texts.size(); i++) {
-            FormattedCharSequence pTooltips = fcs(texts.get(i));
-            ClientTooltipComponent clientTooltip = ClientTooltipComponent.create(pTooltips);
-            guiGraphics.pose().translate(0.0, 0.0, 400.0);
-            int x0 = x + (frameWidth / 2);
-            int xC = (x0 - MC.font.width(texts.get(i)) / 2);
-            clientTooltip.renderText(MC.font,
-                    xC,
-                    y + frameHeight - 2 + ((i-1) * 10),
-                    guiGraphics.pose().last().pose(),
-                    multibuffersource$buffersource
-            );
-        }
-        multibuffersource$buffersource.endBatch();
-        guiGraphics.pose().popPose();
-    }
-
-    private class RenderedStat {
-        public ResourceLocation icon;
-        public String text;
-        public UnitStatType type;
-        public int colour = WHITE;
-        public int textXOffset = 0;
-
-        public RenderedStat(ResourceLocation icon, String text, UnitStatType type) {
-            this.icon = icon;
-            this.text = text;
-            this.type = type;
-        }
-        public RenderedStat(ResourceLocation icon, String text, UnitStatType type, int colour, int xOffset) {
-            this.icon = icon;
-            this.text = text;
-            this.type = type;
-            this.colour = colour;
-            this.textXOffset = xOffset;
-        }
+    // how far the renderer scales the model past the hitbox. Hitboxes already include the scale for nearly every mob
+    // (wither skeletons, slimes by size, the necromancer's registration); these two are registered at vindicator size
+    // and their hitbox only grows with getScale(), not with SCALE_MULT; the wretched wraith's model is about twice
+    // its zombie-sized hitbox
+    private static float rendererScale(Entity e) {
+        if (e instanceof WretchedWraithUnit)
+            return 2f;
+        if (e instanceof RoyalGuardUnit)
+            return RoyalGuardRenderer.SCALE_MULT;
+        return e instanceof EnchanterUnit ? EnchanterRenderer.SCALE_MULT : 1f;
     }
 
-    public RectZone renderStats(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY, Unit unit) {
-        int statsHeightPlus = 0;
-        if (unit instanceof HeroUnit) {
-            y -= HERO_Y_OFFSET;
-            statsHeightPlus = HERO_Y_OFFSET;
-        }
-        MyRenderer.renderFrameWithBg(guiGraphics, x, y, statsWidth, statsHeight + statsHeightPlus, 0xA0000000);
-
-        int blitXIcon = x + 6;
-        int blitYIcon = y + 7;
+    /** One line of the unit's stats, as shown on the selection panel's stat cards. */
+    public record Stat(ResourceLocation icon, UnitStatType type, String value, int colour) { }
 
-        ArrayList<RenderedStat> renderedStats = new ArrayList<>();
+    public static List<Stat> computeStats(Unit unit) {
+        List<Stat> stats = new ArrayList<>();
 
         if (unit instanceof AttackerUnit attackerUnit) {
             double atkDmg = attackerUnit.getUnitAttackDamage() + AttackerUnit.getWeaponDamageModifier(attackerUnit);
-            if (unit instanceof CreeperUnit cUnit && cUnit.isPowered()) {
+            if (unit instanceof CreeperUnit cUnit && cUnit.isPowered())
                 atkDmg *= CreeperUnit.CHARGED_DAMAGE_MULT;
-            }
-            if (unit instanceof WorkerUnit) {
+            if (unit instanceof WorkerUnit)
                 atkDmg = (int) attackerUnit.getUnitAttackDamage();
-            }
             double atkDmgRounded = Math.round(atkDmg);
-            String atkStr;
-            if (Math.abs(atkDmgRounded - atkDmg) < 0.1d) {
-                atkStr = String.valueOf((int) atkDmgRounded); // attacks per second
-            } else {
-                DecimalFormat df1 = new DecimalFormat("###.#");
-                atkStr = String.valueOf(df1.format(atkDmg)); // attacks per second
-            }
-            if (unit instanceof Mob mob && mob.isVehicle() && mob.getFirstPassenger() instanceof AttackerUnit passenger) {
+            String atkStr = Math.abs(atkDmgRounded - atkDmg) < 0.1d
+                    ? String.valueOf((int) atkDmgRounded)
+                    : new DecimalFormat("###.#").format(atkDmg);
+            if (unit instanceof Mob mob && mob.isVehicle() && mob.getFirstPassenger() instanceof AttackerUnit passenger)
                 atkStr += "+" + (int) passenger.getUnitAttackDamage();
-            }
-
-            int damageTooltipColour = attackerUnit.getDamageTooltipColour();
-            float attackDmg = attackerUnit.getUnitAttackDamage();
-            float baseAttackDmg = attackerUnit.getBaseUnitAttackDamage();
-            if (attackDmg < baseAttackDmg)
-                damageTooltipColour = RED;
-            else if (attackDmg > baseAttackDmg)
-                damageTooltipColour = GREEN;
-
-            if (damageTooltipColour == WHITE && attackerUnit.getBuildingDamageBonus() > 0)
-                damageTooltipColour = GREEN;
-
-            if (damageTooltipColour == WHITE && attackerUnit.getWorkerDamageBonus() > 0)
-                damageTooltipColour = GREEN;
-
-            renderedStats.add(new RenderedStat(
-                    ResourceLocation.fromNamespaceAndPath("reignofnether", "textures/icons/items/sword.png"),
-                    atkStr,
-                    UnitStatType.ATTACK_DAMAGE,
-                    damageTooltipColour,
-                    0
-            ));
-            DecimalFormat df2 = new DecimalFormat("###.##");
-
-            int atkSpdColour = LIGHT_BLUE;
-
-            float attacksPerSecond = Math.round(attackerUnit.getNonBaseAttacksPerSecond() * 100f) / 100f;
-            float baseAttacksPerSecond = Math.round(attackerUnit.getBaseAttacksPerSecond() * 100f) / 100f;
-
-            if (attacksPerSecond > baseAttacksPerSecond) {
-                atkSpdColour = GREEN;
-            } else if (attacksPerSecond < baseAttacksPerSecond) {
-                atkSpdColour = RED;
-            }
-            renderedStats.add(new RenderedStat(
-                    ResourceLocation.fromNamespaceAndPath("reignofnether","textures/icons/items/sparkler.png"),
-                    String.valueOf(df2.format(attackerUnit.getAttacksPerSecond())),
-                    UnitStatType.ATTACK_SPEED,
-                    atkSpdColour,
-                    0
-            ));
-            String rangeStr;
-
-            if (((LivingEntity) attackerUnit).getFirstPassenger() instanceof AttackerUnit passengerUnit) {
-                rangeStr = String.valueOf((int) (passengerUnit.getAttackRange()));
-            } else {
-                BuildingPlacement garrPlacement = GarrisonableBuildingAddon.getGarrison(unit);
-                GarrisonableBuildingAddon garr = garrPlacement != null ? garrPlacement.getBuilding().getActiveAddon(GarrisonableBuildingAddon.class) : null;
-                if (garr != null) {
-                    rangeStr = String.valueOf(garr.getAttackRange());
-                } else {
-                    rangeStr = String.valueOf((int) (attackerUnit.getAttackRange()));
-                }
-            }
 
-            renderedStats.add(new RenderedStat(
-                    ResourceLocation.fromNamespaceAndPath("reignofnether","textures/icons/items/bow.png"),
-                    rangeStr,
-                    UnitStatType.RANGE,
-                    attackerUnit.hasBonusRange() ? GREEN : WHITE,
-                    0
-            ));
-        }
-
-        int armourColor = WHITE;
-        double physicalArmour = unit.getUnitPhysicalArmorPercentage();
-        double rangedArmour = unit.getUnitRangedArmorPercentage();
-        double magicArmour = unit.getUnitMagicArmorPercentage();
-        double resistArmour = unit.getUnitResistPercentage();
-        double highestArmour = 0;
-
-        String armourStr = "0%";
-        int nonZeroArmourTypes = 0;
-
-        if (physicalArmour != 0) {
-            armourStr = (int) (physicalArmour * 100) + "%";
-            armourColor = GREEN;
-            if (physicalArmour > highestArmour) highestArmour = physicalArmour;
-            nonZeroArmourTypes += 1;
-        }
-        if (rangedArmour != 0) {
-            armourStr = (int) (rangedArmour * 100) + "%";
-            armourColor = YELLOW;
-            if (rangedArmour > highestArmour) highestArmour = rangedArmour;
-            nonZeroArmourTypes += 1;
-        }
-        if (resistArmour != 0) {
-            armourStr = (int) (resistArmour * 100) + "%";
-            armourColor = LIGHT_BLUE;
-            if (resistArmour > highestArmour) highestArmour = resistArmour;
-            nonZeroArmourTypes += 1;
-        }
-        if (magicArmour != 0 && resistArmour <= 0) { // resistArmour includes magicArmour
-            armourStr = (int) (magicArmour * 100) + "%";
-            armourColor = DARK_BLUE;
-            if (magicArmour > highestArmour) highestArmour = magicArmour;
-            nonZeroArmourTypes += 1;
-        }
-        if (nonZeroArmourTypes > 1 && highestArmour > 0) {
-            armourStr = (int) (highestArmour * 100) + "%+";
-            armourColor = LIGHT_BLUE;
-        }
-        if (((Mob) unit).hasEffect(MobEffectRegistrar.ENCHANTED_TETHER.get())) {
-            armourColor = GREEN;
-            if (nonZeroArmourTypes > 0 && highestArmour > 0) {
-                armourStr = (int) (Mth.lerp(0.5, highestArmour, 1.0) * 100) + "%+";
-            } else {
-                armourStr = "50%";
-            }
-        }
-        if (armourStr.contains("-")) {
-            armourColor = RED;
-        }
-
-        int xOffset = 0;
-        if (armourStr.endsWith("+")) xOffset = -3;
-        if (armourStr.startsWith("-")) xOffset = -4;
-
-        renderedStats.add(new RenderedStat(
-                ResourceLocation.fromNamespaceAndPath("reignofnether", "textures/icons/items/chestplate.png"),
-                armourStr,
-                UnitStatType.ARMOUR,
-                armourColor,
-                xOffset
-        ));
+            int dmgColour = attackerUnit.getDamageTooltipColour();
+            if (attackerUnit.getUnitAttackDamage() < attackerUnit.getBaseUnitAttackDamage())
+                dmgColour = RED;
+            else if (attackerUnit.getUnitAttackDamage() > attackerUnit.getBaseUnitAttackDamage())
+                dmgColour = GREEN;
+            if (dmgColour == WHITE && attackerUnit.getBuildingDamageBonus() > 0)
+                dmgColour = GREEN;
+            if (dmgColour == WHITE && attackerUnit.getWorkerDamageBonus() > 0)
+                dmgColour = GREEN;
+            stats.add(new Stat(icon("sword"), UnitStatType.ATTACK_DAMAGE, atkStr, dmgColour));
+
+            float aps = Math.round(attackerUnit.getNonBaseAttacksPerSecond() * 100f) / 100f;
+            float baseAps = Math.round(attackerUnit.getBaseAttacksPerSecond() * 100f) / 100f;
+            int apsColour = aps > baseAps ? GREEN : aps < baseAps ? RED : WHITE;
+            stats.add(new Stat(icon("sparkler"), UnitStatType.ATTACK_SPEED,
+                    new DecimalFormat("###.##").format(attackerUnit.getAttacksPerSecond()), apsColour));
+
+            BuildingPlacement garrPlacement = GarrisonableBuildingAddon.getGarrison(unit);
+            GarrisonableBuildingAddon garr = garrPlacement != null ? garrPlacement.getBuilding().getActiveAddon(GarrisonableBuildingAddon.class) : null;
+            String range;
+            if (((LivingEntity) attackerUnit).getFirstPassenger() instanceof AttackerUnit passengerUnit)
+                range = String.valueOf((int) passengerUnit.getAttackRange());
+            else
+                range = garr != null ? String.valueOf(garr.getAttackRange()) : String.valueOf((int) attackerUnit.getAttackRange());
+            stats.add(new Stat(icon("bow"), UnitStatType.RANGE, range, attackerUnit.hasBonusRange() ? GREEN : WHITE));
+        }
+
+        stats.add(armourStat(unit));
 
         if (((LivingEntity) unit).getAttribute(Attributes.MOVEMENT_SPEED) != null) {
             float ms = unit.getMovementSpeed() * unit.getSpeedModifier();
             int msInt = (int) (ms * 101);
-            if (unit instanceof SlimeUnit slimeUnit && slimeUnit.isUsingJumpingMovement()) {
+            if (unit instanceof SlimeUnit slimeUnit && slimeUnit.isUsingJumpingMovement())
                 msInt /= SlimeJumpMoveControl.MOVESPEED_MULTIPLIER;
-            }
-            int msColour = WHITE;
             double msBase = ((LivingEntity) unit).getAttributeBaseValue(Attributes.MOVEMENT_SPEED);
-            if (msBase < ms) {
-                msColour = GREEN;
-            } else if (msBase > ms) {
-                msColour = RED;
-            }
-            renderedStats.add(new RenderedStat(
-                    ResourceLocation.fromNamespaceAndPath("reignofnether","textures/icons/items/boots.png"),
-                    String.valueOf(msInt),
-                    UnitStatType.MOVEMENT_SPEED,
-                    msColour,
-                    0
-            ));
+            int msColour = msBase < ms ? GREEN : msBase > ms ? RED : WHITE;
+            stats.add(new Stat(icon("boots"), UnitStatType.MOVEMENT_SPEED, String.valueOf(msInt), msColour));
         }
+        return stats;
+    }
 
-        if (unit instanceof HeroUnit heroUnit) {
-            int heroLvl = heroUnit.getHeroLevel();
-            String heroLvlString = I18n.get("hud.hero.reignofnether.level", heroLvl);
-            String heroLvString = I18n.get("hud.hero.reignofnether.level.short", heroLvl);
-            guiGraphics.drawString(
-                    Minecraft.getInstance().font,
-                    fcs((heroLvl >= 10 ? heroLvString : heroLvlString), true),
-                    blitXIcon + 1,
-                    blitYIcon - 1,
-                    WHITE
-            );
-            blitYIcon += HERO_Y_OFFSET + 1;
+    /** The armour stat; its colour tells the armour type. */
+    private static Stat armourStat(Unit unit) {
+        double physical = unit.getUnitPhysicalArmorPercentage();
+        double ranged = unit.getUnitRangedArmorPercentage();
+        double magic = unit.getUnitMagicArmorPercentage();
+        double resist = unit.getUnitResistPercentage();
+        double highest = 0;
+        String str = "0%";
+        int colour = WHITE;
+        int types = 0;
+
+        if (physical != 0) { str = (int) (physical * 100) + "%"; colour = GREEN; highest = Math.max(highest, physical); types++; }
+        if (ranged != 0) { str = (int) (ranged * 100) + "%"; colour = YELLOW; highest = Math.max(highest, ranged); types++; }
+        if (resist != 0) { str = (int) (resist * 100) + "%"; colour = LIGHT_BLUE; highest = Math.max(highest, resist); types++; }
+        if (magic != 0 && resist <= 0) { // resist includes magic
+            str = (int) (magic * 100) + "%"; colour = DARK_BLUE; highest = Math.max(highest, magic); types++;
+        }
+        if (types > 1 && highest > 0) {
+            str = (int) (highest * 100) + "%+";
+            colour = LIGHT_BLUE;
         }
-
-        // render based on prepped strings/icons
-        for (RenderedStat renderedStat : renderedStats) {
-            MyRenderer.renderIcon(guiGraphics, renderedStat.icon, blitXIcon, blitYIcon, 8);
-
-            boolean isMouseOver =
-                    mouseX >= blitXIcon - 1 &&
-                    mouseY >= blitYIcon - 1 &&
-                    mouseX < blitXIcon + statsWidth - 11 &&
-                    mouseY < blitYIcon + 9;
-
-            // highlight on hover
-            if (isMouseOver) {
-                guiGraphics.fill( // x1,y1, x2,y2,
-                    blitXIcon - 1,
-                    blitYIcon - 1,
-                    blitXIcon + statsWidth - 11,
-                    blitYIcon + 9,
-                    0x32FFFFFF);
-                MyRenderer.renderTooltip(guiGraphics, unit.getStatTooltip(renderedStat.type), mouseX, mouseY);
-            }
-
-            guiGraphics.drawString(
-                Minecraft.getInstance().font,
-                renderedStat.text,
-                blitXIcon + 13 + renderedStat.textXOffset,
-                blitYIcon,
-                renderedStat.colour
-            );
-            blitYIcon += 10;
+        if (((Mob) unit).hasEffect(MobEffectRegistrar.ENCHANTED_TETHER.get())) {
+            colour = GREEN;
+            str = types > 0 && highest > 0 ? (int) (Mth.lerp(0.5, highest, 1.0) * 100) + "%+" : "50%";
         }
-        return RectZone.getZoneByLW(x, y, statsWidth, statsHeight);
-    }
-
-    public RectZone renderHeroLevelAndExp(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY, HeroUnit heroUnit) {
-        int width = 101;
-        int height = 5;
-
-        y -= HERO_Y_OFFSET;
-
-        ResourceLocation expBarEmptyRl = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/experience_bar_empty.png");
-        RenderSystem.setShaderTexture(0, expBarEmptyRl);
-        guiGraphics.blit(expBarEmptyRl,
-                x, y, 0,
-                0,0, // where on texture to start drawing from
-                width, height, // dimensions of blit texture
-                width, height // size of texture itself (if < dimensions, texture is repeated)
-        );
-        ResourceLocation expBarFullRl = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/experience_bar_full.png");
-        RenderSystem.setShaderTexture(0, expBarFullRl);
-        float expPercent = (float) heroUnit.getExpOnCurrentLevel() / heroUnit.getExpToNextlevel();
-        if (heroUnit.getHeroLevel() >= HeroUnit.MAX_LEVEL)
-            expPercent = 1.0f;
-        guiGraphics.blit(expBarFullRl,
-                x, y, 0,
-                0,0, // where on texture to start drawing from
-                Math.round((float) width * expPercent), height, // dimensions of blit texture
-                width, height // size of texture itself (if < dimensions, texture is repeated)
-        );
-        return RectZone.getZoneByLW(x, y-2, width, height+4);
+        if (str.contains("-"))
+            colour = RED;
+        return new Stat(icon("chestplate"), UnitStatType.ARMOUR, str, colour);
     }
 
-
-    public RectZone renderResourcesHeld(GuiGraphics guiGraphics, int x, int y, Unit unit) {
-        Resources resources = Resources.getTotalResourcesFromItems(unit.getItems());
-        return renderResourcesHeld(guiGraphics, x, y, resources, Unit.atMaxResources(unit));
+    private static ResourceLocation icon(String name) {
+        return ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/" + name + ".png");
     }
 
-    public RectZone renderResourcesHeld(GuiGraphics guiGraphics, int x, int y, Animal animal) {
-        Resources resources = new Resources("",0,0,0,0);
+    public static Resources resourcesHeld(Animal animal) {
+        Resources resources = new Resources("", 0, 0, 0, 0);
         for (ItemStack itemStack : ResourceSources.getFoodItemsFromAnimal(animal)) {
             ResourceSource res = ResourceSources.getFromItem(itemStack.getItem());
             if (res != null)
                 resources.food += res.resourceValue * itemStack.getCount();
         }
-        return renderResourcesHeld(guiGraphics, x, y, resources, false);
-    }
-
-    public RectZone renderResourcesHeld(GuiGraphics guiGraphics, int x, int y, Resources resources, boolean redText) {
-        MyRenderer.renderFrameWithBg(guiGraphics, x, y, statsWidth, statsHeight, 0xA0000000);
-
-        int blitXIcon = x + 6;
-        int blitYIcon = y + 7;
-
-        // prep strings/icons to render
-        List<ResourceLocation> textureStatIcons = List.of(
-            ResourceLocation.fromNamespaceAndPath("reignofnether","textures/icons/items/wheat.png"),
-            ResourceLocation.fromNamespaceAndPath("reignofnether", "textures/icons/items/wood.png"),
-            ResourceLocation.fromNamespaceAndPath("reignofnether", "textures/icons/items/iron_ore.png"),
-            ResourceLocation.fromNamespaceAndPath("reignofnether", "textures/icons/items/emerald.png")
-        );
-
-        List<String> statStrings = List.of(
-            String.valueOf(resources.food),
-            String.valueOf(resources.wood),
-            String.valueOf(resources.ore),
-            String.valueOf(resources.emerald)
-        );
-
-        // render based on prepped strings/icons
-        for (int i = 0; i < statStrings.size(); i++) {
-
-            if (!statStrings.get(i).equals("0")) {
-                MyRenderer.renderIcon(guiGraphics, textureStatIcons.get(i), blitXIcon, blitYIcon, 8);
-                guiGraphics.drawString(
-                    Minecraft.getInstance().font,
-                    statStrings.get(i),
-                    blitXIcon + 12,
-                    blitYIcon,
-                    redText ? RED : WHITE
-                );
-                blitYIcon += 10;
-            }
-        }
-        return RectZone.getZoneByLW(x, y, statsWidth, statsHeight);
+        return resources;
     }
 
-    private void drawEntityOnScreen(PoseStack poseStack, LivingEntity entity, int x, int y, int size) {
+    private void drawEntityOnScreen(PoseStack poseStack, Entity root, List<Entity> stack, float x, float y, float size) {
         float f = (float) Math.atan(-lookX / 40F);
         float g = (float) Math.atan(-lookY / 40F);
         PoseStack poseStackModel = RenderSystem.getModelViewStack();
         poseStackModel.pushPose();
-        poseStackModel.translate(x, y, 1050.0D);
+        poseStackModel.translate(0, 0, 1050.0D);
         poseStackModel.scale(1.0F, 1.0F, -1.0F);
         RenderSystem.applyModelViewMatrix();
         poseStack.pushPose();
-        poseStack.translate(0.0D, 0.0D, 10.0D);
-        poseStack.scale((float) size, (float) size, (float) size);
-        float h = entity.yBodyRot; // bodyYaw;
-        float i = entity.getYRot(); // getYaw();
-        float j = entity.getXRot(); // getPitch();
-        float k = entity.yHeadRotO; // prevHeadYaw;
-        float l = entity.yHeadRot; // headYaw;
+        // x/y go on the GUI pose (not the model-view stack) so the model follows the HUD scale
+        poseStack.translate(x, y, 10.0D);
+        poseStack.scale(size, size, size);
         Quaternionf quaternion = Axis.ZP.rotationDegrees(180.0F);
         Quaternionf quaternion2 = Axis.XP.rotationDegrees(g * 20.0F);
         quaternion.mul(quaternion2);
         poseStack.mulPose(quaternion);
-        if (shouldAnimate()) {
-            entity.yBodyRot = 180.0F + f * 20.0F;
-            entity.setYRot(180.0F + f * 40.0F);
-            entity.setXRot(-g * 20.0F);
-            entity.yHeadRot = entity.getYRot();
-            entity.yHeadRotO = entity.getYRot();
-        }
         Lighting.setupForEntityInInventory();
         EntityRenderDispatcher entityrenderdispatcher = Minecraft.getInstance().getEntityRenderDispatcher();
         entityrenderdispatcher.setRenderShadow(false);
         quaternion2.conjugate();
         entityrenderdispatcher.overrideCameraOrientation(quaternion2);
 
-        // for some reason this snippet causes drawLineBox to draw lines in completely wrong locations while in
-        // spectator mode
-        RenderSystem.runAsFancy(() -> {
-            try {
-                MultiBufferSource.BufferSource immediate = Minecraft.getInstance().renderBuffers().bufferSource();
-                if (entity instanceof EnchanterUnit enchanterUnit) {
-                    enchanterUnit.renderTether = false;
-                    entityrenderdispatcher.render(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, poseStack, immediate, 15728880);
-                    immediate.endBatch();
-                    enchanterUnit.renderTether = true;
-                } else {
-                    entityrenderdispatcher.render(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, poseStack, immediate, 15728880);
+        boolean animate = shouldAnimate();
+        // counteract siege mode sinking
+        double siegeLift = root instanceof RavagerUnit ravagerUnit ? ravagerUnit.getSiegeSinkOffset(1f) : 0;
+        for (Entity entity : stack) {
+            // riders sit straight on top of their mount; horizontal seat offsets are dropped since we rotate the model
+            double dy = entity.getY() - root.getY() + siegeLift;
+            float h = 0, i = entity.getYRot(), j = entity.getXRot(), k = 0, l = 0;
+            LivingEntity living = entity instanceof LivingEntity le ? le : null;
+            if (animate) {
+                if (living != null) {
+                    h = living.yBodyRot; k = living.yHeadRotO; l = living.yHeadRot;
+                    living.yBodyRot = 180.0F + f * 20.0F;
+                    living.yHeadRot = 180.0F + f * 40.0F;
+                    living.yHeadRotO = living.yHeadRot;
+                }
+                entity.setYRot(180.0F + f * 40.0F);
+                entity.setXRot(-g * 20.0F);
+            }
+            ItemStack bannerStack = living != null ? living.getItemBySlot(EquipmentSlot.HEAD) : ItemStack.EMPTY;
+            boolean hasBanner = bannerStack.getItem() instanceof BannerItem;
+            if (hasBanner)
+                living.setItemSlot(EquipmentSlot.HEAD, ItemStack.EMPTY);
+
+            // for some reason this snippet causes drawLineBox to draw lines in completely wrong locations while in
+            // spectator mode
+            RenderSystem.runAsFancy(() -> {
+                try {
+                    MultiBufferSource.BufferSource immediate = Minecraft.getInstance().renderBuffers().bufferSource();
+                    if (entity instanceof EnchanterUnit enchanterUnit)
+                        enchanterUnit.renderTether = false;
+                    entityrenderdispatcher.render(entity, 0.0D, dy, 0.0D, 0.0F, 1.0F, poseStack, immediate, 15728880);
                     immediate.endBatch();
+                    if (entity instanceof EnchanterUnit enchanterUnit)
+                        enchanterUnit.renderTether = true;
+                } catch (ReportedException e) {
+                    //System.out.println("Caught reportedException: " + e);
+                }
+            });
+
+            if (hasBanner)
+                living.setItemSlot(EquipmentSlot.HEAD, bannerStack);
+            if (animate) {
+                if (living != null) {
+                    living.yBodyRot = h; living.yHeadRotO = k; living.yHeadRot = l;
                 }
-            } catch (ReportedException e) {
-                //System.out.println("Caught reportedException: " + e);
+                entity.setYRot(i);
+                entity.setXRot(j);
             }
-        });
+        }
         entityrenderdispatcher.setRenderShadow(true);
 
-        if (shouldAnimate()) {
-            entity.yBodyRot = h;
-            entity.setYRot(i);
-            entity.setXRot(j);
-            entity.yHeadRotO = k;
-            entity.yHeadRot = l;
-        }
         poseStackModel.popPose();
         poseStack.popPose();
         RenderSystem.applyModelViewMatrix();
         Lighting.setupFor3DItems();
+        // the model leaves its depth at GUI z ~1040, in front of everything drawn after it (level badge, tooltips);
+        // the caller's Clip scissor keeps this clear to the portrait box
+        RenderSystem.clear(GlConst.GL_DEPTH_BUFFER_BIT, Minecraft.ON_OSX);
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/RectZone.java b/src/main/java/com/solegendary/reignofnether/hud/RectZone.java
deleted file mode 100644
index bdac12bd9..000000000
--- a/src/main/java/com/solegendary/reignofnether/hud/RectZone.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.solegendary.reignofnether.hud;
-
-// coordinate pairs that indicate HUD areas so we can disallow world interactions when the mouse is over them
-// ie. players can't click behind the HUD
-public class RectZone {
-
-    int x1, y1, x2, y2; // TL -> BR
-
-    public RectZone(int x1, int y1, int x2, int y2) {
-        this.x1 = x1;
-        this.y1 = y1;
-        this.x2 = x2;
-        this.y2 = y2;
-    }
-    public static RectZone getZoneByLW(int x1, int y1, int width, int height) {
-        return new RectZone(x1, y1, x1 + width, y1 + height);
-    }
-    public boolean isMouseOver(int mouseX, int mouseY) {
-        return (mouseX >= x1 &&
-                mouseY >= y1 &&
-                mouseX < x2 &&
-                mouseY < y2);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/solegendary/reignofnether/hud/RegenInfo.java b/src/main/java/com/solegendary/reignofnether/hud/RegenInfo.java
new file mode 100644
index 000000000..f713175e3
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/RegenInfo.java
@@ -0,0 +1,108 @@
+package com.solegendary.reignofnether.hud;
+
+import com.solegendary.reignofnether.ability.heroAbilities.enchanter.MarchOfProgress;
+import com.solegendary.reignofnether.ability.heroAbilities.royalguard.BattleRagePassive;
+import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.building.BuildingPlacement;
+import com.solegendary.reignofnether.building.buildings.placements.HealingFountainPlacement;
+import com.solegendary.reignofnether.faction.Factions;
+import com.solegendary.reignofnether.registrars.AttributeRegistrar;
+import com.solegendary.reignofnether.registrars.MobEffectRegistrar;
+import com.solegendary.reignofnether.resources.ResourceCost;
+import com.solegendary.reignofnether.time.NightUtils;
+import com.solegendary.reignofnether.blocks.BlockUtils;
+import com.solegendary.reignofnether.time.TimeClientEvents;
+import com.solegendary.reignofnether.time.TimeUtils;
+import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
+import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.unit.units.piglins.GhastUnit;
+import com.solegendary.reignofnether.unit.units.monsters.WretchedWraithUnit;
+import com.solegendary.reignofnether.unit.units.villagers.EnchanterUnit;
+import com.solegendary.reignofnether.unit.units.villagers.RoyalGuardUnit;
+import com.solegendary.reignofnether.util.MiscUtil;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.attributes.AttributeInstance;
+import net.minecraft.world.phys.Vec3;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * What heals a unit or restores a hero's mana over time, for the HUD. The server applies these in Unit.tick,
+ * HeroUnit.tick and the units' and buildings' own ticks: keep this in step with them.
+ */
+public final class RegenInfo {
+
+    private RegenInfo() { }
+
+    /** One source of regen; key is the end of its lang key. */
+    public record Source(String key, float perSecond) { }
+
+    private static final float MONSTER_REGEN = (float) ResourceCost.TICKS_PER_SECOND / Unit.MONSTER_HEALING_TICKS;
+    private static final float PIGLIN_REGEN = (float) ResourceCost.TICKS_PER_SECOND / Unit.PIGLIN_HEALING_TICKS;
+    private static final int FOUNTAIN_EFFECT_TICKS = 20; // its regeneration effect is too short to ever heal
+
+    public static float total(List<Source> sources) {
+        float sum = 0;
+        for (Source s : sources)
+            sum += s.perSecond();
+        return sum;
+    }
+
+    public static List<Source> health(LivingEntity le) {
+        List<Source> sources = new ArrayList<>();
+        if (le instanceof Unit unit) {
+            if (Factions.getFaction(unit).equals(Factions.MONSTERS)) {
+                if (!TimeUtils.isDay(TimeClientEvents.serverNormDayTime))
+                    sources.add(new Source("night", MONSTER_REGEN));
+                if (NightUtils.isInRangeOfNightSource(le.position(), true))
+                    sources.add(new Source("night_source", MONSTER_REGEN));
+            } else if (Factions.getFaction(unit).equals(Factions.PIGLINS)
+                    && (MiscUtil.isOnNetherTerrain(le) || unit instanceof GhastUnit)) {
+                sources.add(new Source("nether", PIGLIN_REGEN));
+                if (unit.hasEffectWithDuration(MobEffectRegistrar.PIGLIN_FERVOR.get()))
+                    sources.add(new Source("fervor", PIGLIN_REGEN));
+            }
+        }
+        boolean nearFountain = false;
+        for (BuildingPlacement b : BuildingClientEvents.getBuildings())
+            if (b instanceof HealingFountainPlacement && b.isBuilt
+                    && le.position().closerThan(Vec3.atCenterOf(b.centrePos), HealingFountainPlacement.RANGE)) {
+                sources.add(new Source("fountain", Math.min(1, le.getMaxHealth() / 100)));
+                nearFountain = true;
+            }
+        // only the fountain's own effect is skipped: a totem's runs low between refreshes too, which made the line flicker
+        MobEffectInstance regen = le.getEffect(MobEffects.REGENERATION);
+        if (regen != null && (!nearFountain || regen.getDuration() > FOUNTAIN_EFFECT_TICKS)) {
+            int interval = 50 >> regen.getAmplifier();
+            sources.add(new Source("effect", interval > 0 ? (float) ResourceCost.TICKS_PER_SECOND / interval : ResourceCost.TICKS_PER_SECOND));
+        }
+        if (le instanceof WretchedWraithUnit && le.onGround()) {
+            int layers = BlockUtils.getWraithSnowLayers(le.level().getBlockState(le.getOnPos().above()));
+            if (layers > 0)
+                sources.add(new Source("wraith_snow", 0.25f + layers * 0.25f));
+        }
+        if (le instanceof RoyalGuardUnit guard) {
+            BattleRagePassive rage = guard.getBattleRage();
+            if (rage != null && rage.getRank(guard) > 0)
+                sources.add(new Source("battle_rage", (float) rage.getHpRegen(guard)));
+        }
+        return sources;
+    }
+
+    public static List<Source> mana(HeroUnit hero) {
+        List<Source> sources = new ArrayList<>();
+        AttributeInstance attr = ((LivingEntity) hero).getAttribute(AttributeRegistrar.MANA_REGEN_PER_SECOND.get());
+        float base = attr != null ? (float) attr.getBaseValue() : 0;
+        float bonus = hero.getManaRegenPerSecond() - base;
+        if (base != 0)
+            sources.add(new Source("base", base));
+        if (bonus != 0) // effects, wraith snow
+            sources.add(new Source("bonus", bonus));
+        if (hero instanceof EnchanterUnit enchanter && enchanter.isAuraEnabled())
+            sources.add(new Source("march", -MarchOfProgress.MANA_COST_PER_SECOND));
+        return sources;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/TextInputClientEvents.java b/src/main/java/com/solegendary/reignofnether/hud/TextInputClientEvents.java
index b2809df8a..28d5f5726 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/TextInputClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/TextInputClientEvents.java
@@ -1,5 +1,7 @@
 package com.solegendary.reignofnether.hud;
 
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.hud.playerdisplay.DiplomacyPlayerDisplay;
 import com.solegendary.reignofnether.util.MyRenderer;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.client.event.ScreenEvent;
@@ -28,6 +30,8 @@ public static void deregisterEditBox(MyEditBox input) {
     }
 
     public static boolean isAnyInputFocused() {
+        if (DiplomacyPlayerDisplay.isTyping())
+            return true;
         for (MyEditBox input : registeredInputs)
             if (input.isFocused())
                 return true;
@@ -39,18 +43,32 @@ public static void onDrawScreen(ScreenEvent.Render.Post evt) {
         if (Minecraft.getInstance().isPaused())
             return;
         for (MyEditBox input : registeredInputs) {
-            input.render(evt.getGuiGraphics(), evt.getMouseX(), evt.getMouseY(), 0f);
-            if (input.isHovered()) {
-                evt.getGuiGraphics().fill(
-                        input.getX() - 1, input.getY() - 1,
-                        input.getX() + input.getWidth() + 1, input.getY() + input.getHeight() + 1,
-                        0x30FFFFFF
-                );
-                MyRenderer.renderTooltip(evt.getGuiGraphics(), input.tooltipLines, evt.getMouseX(), evt.getMouseY());
+            if (input.hudUnits) {
+                input.setVisible(input.placed);
+                if (!input.placed && input.isFocused()) {
+                    input.setFocused(false);
+                    handleDefocus(input);
+                }
+                input.placed = false;
             }
+            float k = scale(input);
+            var g = evt.getGuiGraphics();
+            g.pose().pushPose();
+            g.pose().scale(k, k, 1);
+            input.render(g, (int) (evt.getMouseX() / k), (int) (evt.getMouseY() / k), 0f);
+            if (input.isHovered())
+                g.fill(input.getX() - 1, input.getY() - 1,
+                        input.getX() + input.getWidth() + 1, input.getY() + input.getHeight() + 1,
+                        com.solegendary.reignofnether.ui.Theme.HOVER);
+            g.pose().popPose();
+            if (input.isHovered())
+                MyRenderer.renderTooltip(g, input.tooltipLines, evt.getMouseX(), evt.getMouseY());
             if (input.isFocused() && input.commandSuggestions != null) {
                 input.commandSuggestions.updateCommandInfo();
-                input.commandSuggestions.render(evt.getGuiGraphics(), evt.getMouseX(), evt.getMouseY());
+                g.pose().pushPose();
+                g.pose().scale(k, k, 1); // placed from the box, so in the box's units too
+                input.commandSuggestions.render(g, (int) (evt.getMouseX() / k), (int) (evt.getMouseY() / k));
+                g.pose().popPose();
             }
         }
     }
@@ -78,8 +96,9 @@ public static void onCharTyped(ScreenEvent.CharacterTyped.Post evt) {
     @SubscribeEvent
     public static void onMouseClick(ScreenEvent.MouseButtonPressed.Post evt) {
         for (MyEditBox input : registeredInputs) {
-            input.mouseClicked(evt.getMouseX(), evt.getMouseY(), evt.getButton());
-            boolean isMouseOver = input.isMouseOver(evt.getMouseX(), evt.getMouseY());
+            float k = scale(input);
+            input.mouseClicked(evt.getMouseX() / k, evt.getMouseY() / k, evt.getButton());
+            boolean isMouseOver = input.isMouseOver(evt.getMouseX() / k, evt.getMouseY() / k);
             boolean wasFocused = input.isFocused();
             input.setFocused(isMouseOver);
             if (wasFocused && !input.isFocused())
@@ -87,6 +106,11 @@ public static void onMouseClick(ScreenEvent.MouseButtonPressed.Post evt) {
         }
     }
 
+    // GUI pixels per box unit: 1 for plain boxes, the HUD scale for boxes laid out in HUD units
+    private static float scale(MyEditBox input) {
+        return input.hudUnits ? HudGeometry.scale().poseScale() : 1f;
+    }
+
     private static void handleDefocus(MyEditBox input) {
         if (input.onDefocus != null) {
             if (input.isPositiveNumber) {
diff --git a/src/main/java/com/solegendary/reignofnether/hud/TitleClientEvents.java b/src/main/java/com/solegendary/reignofnether/hud/TitleClientEvents.java
index 0a1abfef8..3e0df01d9 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/TitleClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/TitleClientEvents.java
@@ -16,18 +16,25 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 public class TitleClientEvents {
 
     private static final Minecraft MC = Minecraft.getInstance();
-    private static final Random random = new Random();
     private static Faction titleBackgroundFaction = getRandomFaction();
     private static PanoramaRenderer panorama = new PanoramaRenderer(getCubeMap());
     public static String splash = getRandomSplash();
 
     public static PanoramaRenderer getPanorama() { return panorama; }
 
+    // how far the panorama has turned, in degrees: PanoramaRenderer keeps its own to itself, so this counts the same
+    // way (0.1 a frame-time unit) for things drawn to turn with it
+    private static float panoramaSpin = 0;
+
+    public static float turnPanorama(float partialTick) {
+        panoramaSpin = (panoramaSpin + partialTick * 0.1f) % 360f;
+        return panoramaSpin;
+    }
+
     private static CubeMap getCubeMap() {
         return new CubeMap(
             ResourceLocation.fromNamespaceAndPath(titleBackgroundFaction.key.getNamespace(), 
diff --git a/src/main/java/com/solegendary/reignofnether/hud/TooltipColours.java b/src/main/java/com/solegendary/reignofnether/hud/TooltipColours.java
index 141da39af..5cacf3f3e 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/TooltipColours.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/TooltipColours.java
@@ -1,10 +1,12 @@
 package com.solegendary.reignofnether.hud;
 
+import com.solegendary.reignofnether.ui.Theme;
+
 public class TooltipColours {
-    public static int GREEN = 0xFF2BFF2B; // for buffed stats
-    public static int WHITE = 0xFFFFFFFF; // default
-    public static int YELLOW = 0xFFFCFC2B;
-    public static int RED = 0xFFFC3838;
-    public static int LIGHT_BLUE = 0xFF42DDDD;
-    public static int DARK_BLUE = 0xFF5B5BFC;
+    public static int GREEN = Theme.OK; // for buffed stats
+    public static int WHITE = Theme.TEXT; // default
+    public static int YELLOW = Theme.GOLD;
+    public static int RED = Theme.ERROR;
+    public static int LIGHT_BLUE = Theme.BUFF;
+    public static int DARK_BLUE = Theme.MANA_TEXT;
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/TradeAbilityButton.java b/src/main/java/com/solegendary/reignofnether/hud/TradeAbilityButton.java
index de44cf0f7..8d9b6f88d 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/TradeAbilityButton.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/TradeAbilityButton.java
@@ -4,8 +4,6 @@
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.hud.buttons.AbilityButton;
 import com.solegendary.reignofnether.keybinds.Keybinding;
-import com.solegendary.reignofnether.util.MyRenderer;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.FormattedCharSequence;
 import org.jetbrains.annotations.Nullable;
@@ -15,37 +13,12 @@
 
 public class TradeAbilityButton extends AbilityButton {
 
-    private final int rate;
-
     public TradeAbilityButton(String name, ResourceLocation rl, Keybinding hotkey, Supplier<Boolean> isSelected, Supplier<Boolean> isHidden,
                               Supplier<Boolean> isEnabled, Runnable onLeftClick, Runnable onRightClick, List<FormattedCharSequence> tooltipLines,
                               @Nullable Ability ability, BuildingPlacement placement, int rate) {
         super(name, rl, hotkey, isSelected, isHidden, isEnabled, onLeftClick, onRightClick, tooltipLines, ability, placement);
-        this.rate = rate;
-    }
-
-    @Override
-    protected void renderHotkey(GuiGraphics guiGraphics, int x, int y) {
-        // hotkey letter
-        if (this.hotkey != null) {
-            String hotkeyStr = hotkey.getCurrentLabel();
-            hotkeyStr = hotkeyStr.substring(0,Math.min(3, hotkeyStr.length()));
-            guiGraphics.pose().translate(0,0,1);
-            MyRenderer.drawScaledCenteredString(guiGraphics,
-                    MC.font,
-                    hotkeyStr,
-                    x + iconSize + 9 - (hotkeyStr.length() * 4),
-                    y + iconSize + 1,
-                    0xFFFFFF,
-                    0.75f);
-        }
-
-        MyRenderer.drawScaledString(guiGraphics,
-                MC.font,
-                String.valueOf(rate),
-                x + 1,
-                y + 2,
-                0xFFFFFF,
-                0.75f);
+        // what you get for 100 paid, shown as the cell's bottom-left count
+        String rateStr = "+" + rate;
+        this.bottomLeftText = () -> rateStr;
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/buttons/AbilityButton.java b/src/main/java/com/solegendary/reignofnether/hud/buttons/AbilityButton.java
index 83e3670cd..558564122 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/buttons/AbilityButton.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/buttons/AbilityButton.java
@@ -8,7 +8,6 @@
 import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.FormattedCharSequence;
@@ -24,6 +23,7 @@ public class AbilityButton extends Button {
     public Ability ability;
     @Nullable private Unit unit;
     @Nullable private BuildingPlacement placement;
+    public final boolean isPassive; // nothing happens on left click
 
     public AbilityButton(String name, ResourceLocation rl, Keybinding hotkey, Supplier<Boolean> isSelected,
                          Supplier<Boolean> isHidden, Supplier<Boolean> isEnabled, Runnable onLeftClick, Runnable onRightClick,
@@ -33,6 +33,7 @@ public AbilityButton(String name, ResourceLocation rl, Keybinding hotkey, Suppli
         super(name, Button.itemIconSize, rl, hotkey, isSelected, isHidden, isEnabled, onLeftClick, onRightClick, tooltipLines);
 
         this.ability = ability;
+        this.isPassive = onLeftClick == null;
 
         Runnable originalOnLeftClick = this.onLeftClick;
         this.onLeftClick = () -> {
@@ -54,10 +55,11 @@ public AbilityButton(String name, ResourceLocation rl, Keybinding hotkey, Suppli
         super(name, Button.itemIconSize, rl, hotkey, isSelected, isHidden, isEnabled, onLeftClick, onRightClick, tooltipLines);
 
         this.ability = ability;
+        this.isPassive = onLeftClick == null;
 
         Runnable originalOnLeftClick = this.onLeftClick;
         this.onLeftClick = () -> {
-            if (this.ability != null && (this.ability.getCooldown(placement) > 0 && !this.ability.canBypassCooldown(building)))
+            if (this.ability != null && (this.ability.getCooldown(placement) > 0 && !this.ability.canBypassCooldown(placement)))
                 HudClientEvents.showTemporaryMessage(I18n.get("hud.buttons.reignofnether.on_cooldown", getCooldown()));
             else if (originalOnLeftClick != null)
                 originalOnLeftClick.run();
@@ -66,6 +68,30 @@ else if (originalOnLeftClick != null)
         this.placement = placement;
     }
 
+    @Nullable
+    public Unit getUnit() {
+        return unit;
+    }
+
+    public boolean isAutocasting() {
+        return unit != null ? ability.isAutocasting(unit) : placement != null && ability.isAutocasting(placement);
+    }
+
+    /** Remaining cooldown and its maximum in ticks, or 0 when the button has no cooldown. */
+    public float getCooldownTicks() {
+        if (ability == null || ability.cooldownMax <= 0)
+            return 0;
+        if (unit != null)
+            return ability.getCooldown(unit);
+        return placement != null ? ability.getCooldown(placement) : 0;
+    }
+
+    public int getCharges() {
+        if (ability == null || !ability.usesCharges())
+            return -1;
+        return unit != null ? unit.getAbilityCharges(ability) : placement != null ? placement.getCharges(ability) : -1;
+    }
+
     private int getCooldown() {
         if (unit != null) {
             float timeMult = 1 / (1 + unit.getFasterCooldownsPercent());
@@ -76,46 +102,4 @@ else if (placement != null)
         return 0;
     }
 
-    @Override
-    protected void renderHotkey(GuiGraphics guiGraphics, int x, int y) {
-        if (this.ability == null || !this.ability.usesCharges())
-            super.renderHotkey(guiGraphics, x, y);
-    }
-
-    @Override
-    public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
-        float cooldown = 0f;
-
-        if (this.ability != null && ability.cooldownMax > 0) {
-            if (unit != null) {
-                cooldown = ability.getCooldown(unit);
-            } else if (placement != null) {
-                cooldown = ability.getCooldown(placement);
-            }
-            this.greyPercent = 1.0f - (cooldown / ability.cooldownMax);
-        }
-        super.render(guiGraphics, x, y, mouseX, mouseY);
-
-        // charges remaining number
-        if (this.ability != null && this.ability.usesCharges()) {
-            String chargeStr = String.valueOf(unit != null ? unit.getAbilityCharges(ability) : building.getCharges(ability));
-            guiGraphics.pose().translate(0,0,2);
-
-            int colour = 0xFFFFFF;
-            if ((unit != null ? unit.getAbilityCharges(ability) : building.getCharges(ability)) >= this.ability.maxCharges)
-                colour = 0x00FF00;
-            else if ((unit != null ? unit.getAbilityCharges(ability) : building.getCharges(ability)) <= 0)
-                colour = 0xFF0000;
-            else if ((unit != null ? unit.getAbilityCharges(ability) : building.getCharges(ability)) == 1)
-                colour = 0xFFFF00;
-
-            guiGraphics.drawCenteredString(MC.font,
-                    chargeStr,
-                    x + iconSize - 5 - (chargeStr.length() * 4),
-                    y + iconSize - 1,
-                    colour);
-
-            super.renderHotkey(guiGraphics, x, y);
-        }
-    }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/buttons/AbstractUnitItemButton.java b/src/main/java/com/solegendary/reignofnether/hud/buttons/AbstractUnitItemButton.java
index a0f67fc30..f32553334 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/buttons/AbstractUnitItemButton.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/buttons/AbstractUnitItemButton.java
@@ -6,23 +6,19 @@
 import com.solegendary.reignofnether.items.UnitInventory;
 import com.solegendary.reignofnether.items.UnitItem;
 import com.solegendary.reignofnether.keybinds.Keybinding;
-import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
-import com.solegendary.reignofnether.registrars.AttributeRegistrar;
-import com.solegendary.reignofnether.unit.UnitClientEvents;
 import com.solegendary.reignofnether.util.MiscUtil;
 import com.solegendary.reignofnether.util.MyRenderer;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.Style;
 import net.minecraft.network.chat.TextColor;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
-import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
@@ -51,7 +47,6 @@ public abstract class AbstractUnitItemButton extends Button {
     public static final Style TYPE_STYLE = Style.EMPTY.withColor(TextColor.fromRgb(0xFAC775));
     public static final Style DESC_STYLE = Style.EMPTY.withColor(TextColor.fromRgb(0xD3D1C7));
     public static final Style POINTS_STYLE = Style.EMPTY
-            .withFont(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "resource_icons"))
             .withColor(TextColor.fromRgb(0x97C459));
     public static final Style SELL_STYLE = Style.EMPTY.withColor(TextColor.fromRgb(0x5DCAA5));
     public static final Style MANA_STYLE = Style.EMPTY.withColor(TextColor.fromRgb(0x6EA8D9));
@@ -104,16 +99,11 @@ protected AbstractUnitItemButton(
         }
     }
 
+    // the hotkey uses the item straight away; the press part of a click would start dragging it
     @Override
-    public void checkPressed(int key) {
-        if (!OrthoviewClientEvents.isEnabled() || !isEnabled.get())
-            return;
-
-        if (hotkey != null && hotkey.getKey() == key) {
-            if (MC.player != null)
-                MC.player.playSound(SoundEvents.UI_BUTTON_CLICK.get(), 0.2f, 1.0f);
+    public void pressHotkey() {
+        if (this.onLeftClickRelease != null)
             this.onLeftClickRelease.run();
-        }
     }
 
     public boolean hasUseAction() {
@@ -124,30 +114,38 @@ public boolean hasUseAction() {
                 this.unitItem.onUseGround != null);
     }
 
-    // scale down and recentre
     @Override
-    protected void renderHotkey(GuiGraphics guiGraphics, int x, int y) {
-        if (this.hotkey != null) {
-            String hotkeyStr = hotkey.getCurrentLabel();
-            hotkeyStr = hotkeyStr.substring(0, Math.min(3, hotkeyStr.length()));
-
-            int drawX = x + iconSize + 8 - (hotkeyStr.length() * 4);
-            int drawY = y + iconSize;
-
-            guiGraphics.pose().pushPose();
-
-            guiGraphics.pose().translate(drawX, drawY, 0);
-            guiGraphics.pose().scale(SMALL_SCALE, SMALL_SCALE, 1.0f);
-            guiGraphics.pose().translate(-drawX, -drawY, 5);
-
-            guiGraphics.drawCenteredString(MC.font,
-                    hotkeyStr,
-                    drawX,
-                    drawY,
-                    0xFFFFFF);
-
-            guiGraphics.pose().popPose();
-        }
+    public com.solegendary.reignofnether.ui.Tooltip hudTooltip() {
+        if (!unitItem.enableTooltip)
+            return null;
+        String nameKey = "item.reignofnether." + unitItem.descId;
+        String name = I18n.get(nameKey);
+        if (name.equals(nameKey))
+            name = itemStack.getDisplayName().getString();
+        if (itemStack.getCount() > 1)
+            name += " (" + itemStack.getCount() + ")";
+        TextColor rarity = unitItem.rarity.getStyleModifier().apply(NAME_STYLE).getColor();
+        var t = com.solegendary.reignofnether.ui.Tooltip.of(name)
+                .titleColour(rarity != null ? 0xFF000000 | rarity.getValue() : com.solegendary.reignofnether.ui.Theme.TEXT)
+                .tag(unitItem.type.getLabel(), com.solegendary.reignofnether.ui.Theme.ORANGE);
+        String desc = unitItem.getDescription();
+        if (!desc.isBlank())
+            t.body(desc);
+        List<String> points = new ArrayList<>(unitItem.getPointDescriptions());
+        points.addAll(getEnchantmentDescs(itemStack));
+        points.addAll(getAttributeDescs(unitItem));
+        for (String point : points)
+            t.body(MyRenderer.styledWithIcons(point, POINTS_STYLE).getVisualOrderText());
+        if (unitItem.manaCost > 0)
+            t.cost(com.solegendary.reignofnether.hud.panels.ButtonCell.ICON_MANA, String.valueOf(unitItem.manaCost), 0xFF6EA8D9);
+        if (unitItem.cooldownTicksMax > 0)
+            t.cost(com.solegendary.reignofnether.hud.panels.ButtonCell.ICON_CLOCK, (unitItem.cooldownTicksMax / 20) + "s", 0xFFD9C46E);
+        if (unitItem.range > 0)
+            t.cost(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/bow.png"),
+                    String.valueOf((int) unitItem.range), com.solegendary.reignofnether.ui.Theme.TEXT);
+        if (emeraldValue > 0)
+            t.cost(com.solegendary.reignofnether.hud.panels.ButtonCell.ICON_EMERALD, String.valueOf(emeraldValue), 0xFF5DCAA5);
+        return t;
     }
 
     @Override
diff --git a/src/main/java/com/solegendary/reignofnether/hud/buttons/ActionButtons.java b/src/main/java/com/solegendary/reignofnether/hud/buttons/ActionButtons.java
index a9e6ae1ec..20feebee8 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/buttons/ActionButtons.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/buttons/ActionButtons.java
@@ -12,6 +12,7 @@
 import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
 import com.solegendary.reignofnether.util.LanguageUtil;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.entity.LivingEntity;
 
 import java.util.List;
@@ -57,6 +58,7 @@ public static void updateButtons() {
                 },
                 List.of(
                         fcs(LanguageUtil.getTranslation("hud.actionbuttons.reignofnether.build_repair")),
+                        fcs(LanguageUtil.getTranslation("hud.actionbuttons.reignofnether.build_repair.tooltip1")),
                         fcs(LanguageUtil.getTranslation("hud.actionbuttons.reignofnether.build_repair_autocast"))
                 )
         );
@@ -82,7 +84,7 @@ public static void updateButtons() {
                 () -> true,
                 () -> CursorClientEvents.setLeftClickAction(UnitAction.ATTACK),
                 null,
-                List.of(fcs(LanguageUtil.getTranslation("hud.actionbuttons.reignofnether.attack")))
+                tooltip("hud.actionbuttons.reignofnether.attack")
         );
         stop = new Button(
                 "Stop",
@@ -94,7 +96,7 @@ public static void updateButtons() {
                 () -> true,
                 () -> sendUnitCommand(UnitAction.STOP),
                 null,
-                List.of(fcs(LanguageUtil.getTranslation("hud.actionbuttons.reignofnether.stop")))
+                tooltip("hud.actionbuttons.reignofnether.stop")
         );
         hold = new Button(
                 "Hold Position",
@@ -109,7 +111,7 @@ public static void updateButtons() {
                 () -> true,
                 () -> sendUnitCommand(UnitAction.HOLD),
                 null,
-                List.of(fcs(LanguageUtil.getTranslation("hud.actionbuttons.reignofnether.hold_position")))
+                tooltip("hud.actionbuttons.reignofnether.hold_position")
         );
         garrison = new Button(
                 "Garrison",
@@ -121,7 +123,7 @@ public static void updateButtons() {
                 () -> true,
                 () -> CursorClientEvents.setLeftClickAction(UnitAction.GARRISON),
                 null,
-                List.of(fcs(LanguageUtil.getTranslation("hud.actionbuttons.reignofnether.garrison")))
+                tooltip("hud.actionbuttons.reignofnether.garrison")
         );
         ungarrison = new Button(
                 "Ungarrison",
@@ -133,7 +135,15 @@ public static void updateButtons() {
                 () -> true,
                 () -> sendUnitCommand(UnitAction.UNGARRISON),
                 null,
-                List.of(fcs(LanguageUtil.getTranslation("hud.actionbuttons.reignofnether.ungarrison")))
+                tooltip("hud.actionbuttons.reignofnether.ungarrison")
+        );
+    }
+
+    // title, then a one-line description under <key>.tooltip1
+    private static List<FormattedCharSequence> tooltip(String key) {
+        return List.of(
+                fcs(LanguageUtil.getTranslation(key)),
+                fcs(LanguageUtil.getTranslation(key + ".tooltip1"))
         );
     }
 
diff --git a/src/main/java/com/solegendary/reignofnether/hud/buttons/BooleanButton.java b/src/main/java/com/solegendary/reignofnether/hud/buttons/BooleanButton.java
deleted file mode 100644
index 06db3a262..000000000
--- a/src/main/java/com/solegendary/reignofnether/hud/buttons/BooleanButton.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.solegendary.reignofnether.hud.buttons;
-
-import com.solegendary.reignofnether.ReignOfNether;
-import com.solegendary.reignofnether.keybinds.Keybinding;
-import com.solegendary.reignofnether.util.MyRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.resources.ResourceLocation;
-
-import java.util.List;
-
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
-
-public class BooleanButton extends Button {
-    private final String label;
-    private static Minecraft MC = Minecraft.getInstance();
-
-    public BooleanButton(String label, boolean enabled, Runnable onLeftClick, String tooltip) {
-        super(
-                "Boolean Button",
-                10,
-                enabled ? ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/tick.png") :
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/cross.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                onLeftClick,
-                null,
-                tooltip != null ? List.of(fcs(tooltip)) : null
-        );
-        this.label = label;
-        this.frameResource = null;
-    }
-    @Override
-    public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
-        super.render(guiGraphics, x, y, mouseX, mouseY);
-        if (!label.isBlank())
-            guiGraphics.drawString(MC.font, label,x + 23, y + 7, 0xFFFFFF);
-    }
-    @Override
-    public void renderTooltip(GuiGraphics guiGraphics, int mouseX, int mouseY) {
-        if (tooltipLines != null)
-            MyRenderer.renderTooltip(guiGraphics, tooltipLines, mouseX, mouseY + tooltipOffsetY - 10);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/solegendary/reignofnether/hud/buttons/Button.java b/src/main/java/com/solegendary/reignofnether/hud/buttons/Button.java
index b90170004..022d7dae8 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/buttons/Button.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/buttons/Button.java
@@ -1,18 +1,13 @@
 package com.solegendary.reignofnether.hud.buttons;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.building.BuildingPlacement;
-import com.solegendary.reignofnether.healthbars.HealthBarClientEvents;
 import com.solegendary.reignofnether.keybinds.Keybinding;
-import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
-import com.solegendary.reignofnether.unit.UnitClientEvents;
-import com.solegendary.reignofnether.util.MiscUtil;
+import com.solegendary.reignofnether.resources.ResourceCost;
 import com.solegendary.reignofnether.util.MyRenderer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
@@ -37,6 +32,8 @@ public class Button {
     public static int DEFAULT_ICON_SIZE = 14;
     public static int DEFAULT_ICON_FRAME_SIZE = 22;
     public int tooltipOffsetY = 0;
+    // size the HUD last drew this button at (for tutorial highlights)
+    public int drawnSize = DEFAULT_ICON_FRAME_SIZE;
     public int imageSize = DEFAULT_ICON_SIZE;
     public static final int itemIconSize = DEFAULT_ICON_SIZE;
     public int innerIconSizeModifier = 0;
@@ -73,11 +70,17 @@ public class Button {
 
     public Supplier<Boolean> isFlashing = () -> false;
 
+    // what this button costs to use (production, buildings), shown on the command card
+    @Nullable
+    public Supplier<ResourceCost> cost = null;
+    public boolean heroAbilityIcon = false; // a locked hero ability keeps its size, though it's no AbilityButton
+
     // used for cooldown indication, productionItem progress, etc.
     // @ 0.0, appears clear and normal
     // @ 0.5, bottom half is greyed out
     // @ 1.0, whole button is greyed out
     public float greyPercent = 0.0f;
+    public long pressedMs = 0; // last click or hotkey, so the HUD cell can show it pressed in
 
     public Supplier<Float> getGreyPercent = null;
     public boolean greyWhenDisabled = true;
@@ -123,218 +126,24 @@ public Button(String name, int iconSize, ResourceLocation iconRl, ResourceLocati
         this.tooltipLines = tooltipLines;
     }
 
-    public void renderHealthBar(PoseStack poseStack) {
-        if (entity != null)
-            HealthBarClientEvents.renderForEntity(poseStack, entity,
-                    x + ((float) iconFrameSize / 2), y - 5,
-                    iconFrameSize - 1,
-                    HealthBarClientEvents.RenderMode.GUI_ICON);
-        else if (building != null)
-            HealthBarClientEvents.renderForBuilding(poseStack, building,
-                    x + ((float) iconFrameSize / 2), y - 5,
-                    iconFrameSize - 1,
-                    HealthBarClientEvents.RenderMode.GUI_ICON);
-    }
-
-    protected void renderHotkey(GuiGraphics guiGraphics, int x, int y) {
-        // hotkey letter
-        if (this.hotkey != null) {
-            String hotkeyStr = hotkey.getCurrentLabel();
-            hotkeyStr = hotkeyStr.substring(0,Math.min(3, hotkeyStr.length()));
-
-            guiGraphics.pose().pushPose();
-            guiGraphics.drawCenteredString(MC.font,
-                    hotkeyStr,
-                    x + iconSize + 8 - (hotkeyStr.length() * 4),
-                    y + iconSize - 1,
-                    0xFFFFFF);
-            guiGraphics.pose().popPose();
-        }
-    }
-
-    public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
-        this.x = x;
-        this.y = y;
-
-        int xyDiff = (DEFAULT_ICON_SIZE - iconSize) / 2;
-
-        if (this.frameResource != null) {
-            guiGraphics.pose().translate(0,0,1);
-            MyRenderer.renderIconFrameWithBg(guiGraphics, this.frameResource, x + xyDiff, y + xyDiff, iconFrameSize, bgColour);
-        }
-
-        if (!playerNameForHeadIcon.isBlank()) {
-            guiGraphics.pose().translate(0,0,1);
-            MyRenderer.renderPlayerHead(guiGraphics, playerNameForHeadIcon, x + 5, y + 5, 12, bgIconResource);
-        } else if (bgIconResource != null) {
-            guiGraphics.pose().translate(0,0,1);
-            int iconX = x+4 + (7 - xyDiff - iconSize/2);
-            int iconY = y+4 + (7 - xyDiff - iconSize/2);
-            iconX += ((DEFAULT_ICON_SIZE - imageSize) / 2) - innerIconSizeModifier;
-            iconY += ((DEFAULT_ICON_SIZE - imageSize) / 2) - innerIconSizeModifier;
-            MyRenderer.renderIcon(
-                    guiGraphics,
-                    bgIconResource,
-                    iconX,
-                    iconY,
-                    imageSize + (innerIconSizeModifier * 2)
-            );
-        }
-
-        // item/unit icon
-        if (iconResource != null) {
-            int iconX = x+4 + (7 - xyDiff - iconSize/2);
-            int iconY = y+4 + (7 - xyDiff - iconSize/2);
-            iconX += ((DEFAULT_ICON_SIZE - imageSize) / 2) - innerIconSizeModifier;
-            iconY += ((DEFAULT_ICON_SIZE - imageSize) / 2) - innerIconSizeModifier;
-            guiGraphics.pose().translate(0,0,1);
-            MyRenderer.renderIcon(
-                    guiGraphics,
-                    iconResource,
-                    iconX, iconY,
-                    imageSize + (innerIconSizeModifier * 2)
-            );
-        }
-        if (iconItem != null) {
-            guiGraphics.pose().translate(0,0,1);
-            int offset = 2 + Math.round((1.0f - iconItemScale) * 8f);
-            MyRenderer.renderItem(guiGraphics, iconItem, x+offset + (7 - xyDiff - iconSize/2), y+offset + (7 - xyDiff - iconSize/2), iconItemScale);
-        }
-
-        // user is holding click or hotkey down over the button and render frame if so
-        if ((isEnabled.get() || showSelectedFrameWhenDisabled) &&
-            (isSelected.get() || (hotkey != null && hotkey.isDown()) || (isMouseOver(mouseX, mouseY) &&
-                    ((MiscUtil.isLeftClickDown(MC) && onLeftClick != null) ||
-                    (MiscUtil.isRightClickDown(MC) && onRightClick != null))
-            ))) {
-
-            if (frameResource != null) {
-                ResourceLocation iconFrameSelectedResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame_selected.png");
-                guiGraphics.pose().translate(0,0,1);
-                MyRenderer.renderIcon(
-                        guiGraphics,
-                        iconFrameSelectedResource,
-                        x-1 + xyDiff,y-1 + xyDiff,
-                        iconSelectedFrameSize
-                );
-            }
-        }
-        renderHotkey(guiGraphics, x, y);
-
-        // light up on hover
-        if (isEnabled.get() && isMouseOver(mouseX, mouseY) && lightUpOnHover) {
-            guiGraphics.pose().translate(0,0,1);
-            guiGraphics.fill( // x1,y1, x2,y2,
-                    x + xyDiff, y + xyDiff,
-                    x + xyDiff + iconFrameSize,
-                    y + xyDiff + iconFrameSize,
-                    0x32FFFFFF); //ARGB(hex); note that alpha ranges between ~0-16, not 0-255
-        }
-
-        if (getGreyPercent != null) {
-            greyPercent = getGreyPercent.get();
-        }
-
-        if (greyPercent > 0 || (!isEnabled.get() && greyWhenDisabled)) {
-            int greyHeightPx = Math.round(greyPercent * iconFrameSize);
-            if (!isEnabled.get())
-                greyHeightPx = 0;
-
-            guiGraphics.pose().translate(0,0,1);
-            guiGraphics.fill( // x1,y1, x2,y2,
-                    x + xyDiff,
-                    y + xyDiff + (greyInverted ? 0 : greyHeightPx),
-                    x + xyDiff + iconFrameSize,
-                    y + xyDiff + (greyInverted ? greyHeightPx : iconFrameSize),
-                    0x99000000); //ARGB(hex); note that alpha ranges between ~0-16, not 0-255
-        }
+    /** Updates state that changes every frame (cooldown fill, counts). Called before drawing. */
+    public void refresh() { }
 
-
-        if (isFlashing.get()) {
-            guiGraphics.fill(x, y,
-                x + iconFrameSize,
-                y + iconFrameSize,
-                (0xFFFFFF | ((int) (0x80 * MiscUtil.getOscillatingFloat(0,1)) << 24))
-            ); //ARGB(hex); note that alpha ranges between ~0-16, not 0-255
-        }
-
-        if (bottomLeftText != null) {
-            String blText = bottomLeftText.get();
-            int drawX = x + 4 + ((blText.length() - 1) * 2);
-            int drawY = y + iconSize;
-
-            drawX += (DEFAULT_ICON_SIZE - iconSize) / 2;
-            drawY += (DEFAULT_ICON_SIZE - iconSize) / 2;
-
-            guiGraphics.pose().pushPose();
-
-            guiGraphics.pose().translate(drawX, drawY, 0);
-            guiGraphics.pose().scale(0.75f, 0.75f, 1.0f);
-            guiGraphics.pose().translate(-drawX, -drawY, 5);
-
-            guiGraphics.drawCenteredString(MC.font,
-                    blText,
-                    drawX,
-                    drawY,
-                    bottomLeftTextColor);
-
-            guiGraphics.pose().popPose();
-        }
+    /** The HUD's tooltip for this button: its legacy lines restyled, or null when it has none. */
+    @Nullable
+    public com.solegendary.reignofnether.ui.Tooltip hudTooltip() {
+        return tooltipLines == null || tooltipLines.isEmpty() ? null : com.solegendary.reignofnether.ui.Tooltip.fromLines(tooltipLines);
     }
 
     public void renderTooltip(GuiGraphics guiGraphics, int mouseX, int mouseY) {
         MyRenderer.renderTooltip(guiGraphics, tooltipLines, mouseX, mouseY + tooltipOffsetY);
     }
 
-    public boolean isMouseOver(int mouseX, int mouseY) {
-        int xyDiff = (DEFAULT_ICON_SIZE - iconSize) / 2;
-        return (mouseX >= x + xyDiff &&
-                mouseY >= y + xyDiff &&
-                mouseX < x + xyDiff + iconFrameSize &&
-                mouseY < y + xyDiff + iconFrameSize);
-    }
-
-    // must be done from mouse press event
-    public void checkClicked(int mouseX, int mouseY, boolean leftClick) {
-        if (!OrthoviewClientEvents.isEnabled() || !isEnabled.get())
-            return;
-
-        if (isMouseOver(mouseX, mouseY) && MC.player != null) {
-            if (leftClick && this.onLeftClick != null) {
-                MC.player.playSound(SoundEvents.UI_BUTTON_CLICK.get(), 0.2f, 1.0f);
-                this.onLeftClick.run();
-            }
-            else if (!leftClick && this.onRightClick != null) {
-                MC.player.playSound(SoundEvents.UI_BUTTON_CLICK.get(), 0.2f, 1.0f);
-                this.onRightClick.run();
-            }
-        }
-    }
-
-    // must be done from mouse press event
-    public void checkClickedReleased(int mouseX, int mouseY, boolean leftClick) {
-        if (!OrthoviewClientEvents.isEnabled() || !isEnabled.get())
-            return;
-
-        if (isMouseOver(mouseX, mouseY) && MC.player != null) {
-            if (leftClick && this.onLeftClickRelease != null) {
-                this.onLeftClickRelease.run();
-            }
-        }
-    }
-
-    // must be done from key press event
-    public void checkPressed(int key) {
-        if (!OrthoviewClientEvents.isEnabled() || !isEnabled.get())
-            return;
-
-        if (hotkey != null && hotkey.getKey() == key) {
-            if (MC.player != null)
-                MC.player.playSound(SoundEvents.UI_BUTTON_CLICK.get(), 0.2f, 1.0f);
-            if (this.onLeftClick != null)
-                this.onLeftClick.run();
-            if (this.onLeftClickRelease != null)
-                this.onLeftClickRelease.run();
-        }
+    /** What pressing this button's hotkey does: a full click (press then release). */
+    public void pressHotkey() {
+        if (this.onLeftClick != null)
+            this.onLeftClick.run();
+        if (this.onLeftClickRelease != null)
+            this.onLeftClickRelease.run();
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/buttons/HelperButtons.java b/src/main/java/com/solegendary/reignofnether/hud/buttons/HelperButtons.java
index a67b95cef..bab073c35 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/buttons/HelperButtons.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/buttons/HelperButtons.java
@@ -1,10 +1,12 @@
 package com.solegendary.reignofnether.hud.buttons;
 
+import com.solegendary.reignofnether.ui.Icon;
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.building.*;
 import com.solegendary.reignofnether.building.addon.GarrisonableBuildingAddon;
 import com.solegendary.reignofnether.building.buildings.neutral.Beacon;
 import com.solegendary.reignofnether.building.buildings.placements.BeaconPlacement;
+import com.solegendary.reignofnether.chat.ChatPanel;
 import com.solegendary.reignofnether.hud.HudClientEvents;
 import com.solegendary.reignofnether.keybinds.Keybinding;
 import com.solegendary.reignofnether.keybinds.Keybindings;
@@ -18,7 +20,6 @@
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.ChatScreen;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Style;
@@ -51,12 +52,12 @@ public static void updateButtons() {
         chatButton = new Button(
                 "Chat",
                 ICON_SIZE,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/speech_bubble.png"),
+                Icon.MESSAGE.texture,
                 (Keybinding) null,
                 () -> false,
                 () -> false,
                 () -> true,
-                () -> MC.setScreen(new ChatScreen("")),
+                () -> MC.setScreen(new ChatPanel()),
                 null,
                 List.of(fcs(I18n.get("hud.helperbuttons.reignofnether.chat")))
         );
diff --git a/src/main/java/com/solegendary/reignofnether/hud/buttons/IntegerButton.java b/src/main/java/com/solegendary/reignofnether/hud/buttons/IntegerButton.java
deleted file mode 100644
index e42368e56..000000000
--- a/src/main/java/com/solegendary/reignofnether/hud/buttons/IntegerButton.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.solegendary.reignofnether.hud.buttons;
-
-import com.solegendary.reignofnether.ReignOfNether;
-import com.solegendary.reignofnether.keybinds.Keybinding;
-import com.solegendary.reignofnether.util.MyRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.FormattedCharSequence;
-
-import java.util.List;
-
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
-
-public class IntegerButton extends Button {
-    private final String label;
-    private static Minecraft MC = Minecraft.getInstance();
-
-    public IntegerButton(String label, Runnable onLeftClick, Runnable onRightClick, List<FormattedCharSequence> tooltips) {
-        super(
-                "Integer Button",
-                10,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_back.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                onLeftClick,
-                onRightClick,
-                tooltips
-        );
-        this.label = label;
-    }
-
-    public IntegerButton(String label, Runnable onLeftClick, Runnable onRightClick, String tooltip) {
-        this(label, onLeftClick, onRightClick, tooltip != null ? List.of(fcs(tooltip)) : null);
-    }
-    public IntegerButton(String label, Runnable onLeftClick, Runnable onRightClick) {
-        this(label, onLeftClick, onRightClick, List.of());
-    }
-    @Override
-    public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
-        super.render(guiGraphics, x, y, mouseX, mouseY);
-        if (!label.isBlank())
-            guiGraphics.drawString(MC.font, label, x + 23, y + 7, 0xFFFFFF);
-    }
-    @Override
-    public void renderTooltip(GuiGraphics guiGraphics, int mouseX, int mouseY) {
-        if (tooltipLines != null)
-            MyRenderer.renderTooltip(guiGraphics, tooltipLines, mouseX, mouseY + tooltipOffsetY - 10);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/solegendary/reignofnether/hud/buttons/UnitItemInventoryButton.java b/src/main/java/com/solegendary/reignofnether/hud/buttons/UnitItemInventoryButton.java
index 2fc63b511..c20c4bf88 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/buttons/UnitItemInventoryButton.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/buttons/UnitItemInventoryButton.java
@@ -1,25 +1,19 @@
 package com.solegendary.reignofnether.hud.buttons;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import com.solegendary.reignofnether.alliance.AlliancesClient;
+import com.mojang.blaze3d.systems.RenderSystem;
 import com.solegendary.reignofnether.items.*;
 import com.solegendary.reignofnether.keybinds.Keybinding;
-import com.solegendary.reignofnether.mixin.UnitInventoryMobMixin;
 import com.solegendary.reignofnether.sandbox.SandboxClientEvents;
-import com.solegendary.reignofnether.sandbox.SandboxServer;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
-import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.hud.panels.ButtonCell;
+import com.solegendary.reignofnether.ui.Theme;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
 
 import java.util.List;
 
@@ -87,7 +81,7 @@ else if (unitItem.onUseEntity != null ||
     }
 
     @Override
-    public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
+    public void refresh() {
         if (MC.level != null && unitItem.cooldownTicksMax > 0) {
             Long cooldownTicksLeft = ItemUtil.getCooldownTicksLeft(itemStack, ((Entity) unit).level());
             this.greyPercent = 1 - Math.min(1f, (float) cooldownTicksLeft / unitItem.cooldownTicksMax);
@@ -99,75 +93,30 @@ public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY
                 return String.valueOf(this.itemStack.getCount());
             return "";
         };
-        super.render(guiGraphics, x, y, mouseX, mouseY);
     }
 
-    // render a translucent version of this button
+    // render a translucent version of this button, the size of an inventory slot, under the cursor
     public void renderGhost(GuiGraphics guiGraphics, int mouseX, int mouseY) {
-        int x = mouseX - (DEFAULT_ICON_SIZE / 2);
-        int y = mouseY - (DEFAULT_ICON_SIZE / 2);
-        int xyDiff = (DEFAULT_ICON_SIZE - iconSize) / 2;
-        float alpha = Mth.clamp(GHOST_ALPHA, 0.0f, 1.0f);
-
-        guiGraphics.pose().pushPose(); // contain the z-translates below
-
+        var scale = com.solegendary.reignofnether.hud.layout.HudGeometry.scale();
+        float k = scale.poseScale();
+        int size = 26;
+        int x = scale.toUnits(mouseX) - size / 2;
+        int y = scale.toUnits(mouseY) - size / 2;
+
+        guiGraphics.pose().pushPose();
+        guiGraphics.pose().translate(0, 0, 400);
+        guiGraphics.pose().scale(k, k, 1);
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, alpha);
-
-        // frame + bg: shader colour fades the texture, but the bg is a solid
-        // fill inside renderIconFrameWithBg, so fade its alpha channel manually
-        if (this.frameResource != null) {
-            int a = Math.round(((bgColour >>> 24) & 0xFF) * alpha);
-            int bgCol = (a << 24) | (bgColour & 0x00FFFFFF);
-            guiGraphics.pose().translate(0, 0, 1);
-            MyRenderer.renderIconFrameWithBg(guiGraphics, this.frameResource,
-                    x + xyDiff, y + xyDiff, iconFrameSize, bgCol);
-        }
-        if (bgIconResource != null) {
-            guiGraphics.pose().translate(0, 0, 1);
-            MyRenderer.renderIcon(guiGraphics, bgIconResource,
-                    ghostIconX(x, xyDiff), ghostIconY(y, xyDiff),
-                    imageSize + (innerIconSizeModifier * 2));
-        }
-        if (iconResource != null) {
-            guiGraphics.pose().translate(0, 0, 1);
-            MyRenderer.renderIcon(guiGraphics, iconResource,
-                    ghostIconX(x, xyDiff), ghostIconY(y, xyDiff),
-                    imageSize + (innerIconSizeModifier * 2));
-        }
-
+        // fills are batched, so flush while the faded shader colour is still set
+        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, GHOST_ALPHA);
+        Theme.cell(guiGraphics, x, y, size, size, Theme.CellState.READY, false);
+        int icon = Math.round(size * 0.56f);
+        ButtonCell.drawIcon(guiGraphics, this, x + (size - icon) / 2, y + (size - icon) / 2, icon);
+        guiGraphics.flush();
         RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-        // item models ignore shader colour, so draw normally then wash out on top
-        if (iconItem != null) {
-            int offset = 2 + Math.round((1.0f - iconItemScale) * 8f);
-            int itemX = x + offset + (7 - xyDiff - iconSize / 2);
-            int itemY = y + offset + (7 - xyDiff - iconSize / 2);
-            int itemPx = Math.round(16 * iconItemScale);
-
-            guiGraphics.pose().translate(0, 0, 1);
-            MyRenderer.renderItem(guiGraphics, iconItem, itemX, itemY, iconItemScale);
-
-            guiGraphics.pose().translate(0, 0, 1);
-            int washAlpha = Math.round((1.0f - alpha) * 0xC0);
-            guiGraphics.fill(RenderType.guiGhostRecipeOverlay(),
-                    itemX, itemY, itemX + itemPx, itemY + itemPx,
-                    (washAlpha << 24) | 0xFFFFFF);
-        }
+        Theme.ring(guiGraphics, x, y, size, size, 1, Theme.ORANGE);
         RenderSystem.disableBlend();
         guiGraphics.pose().popPose();
     }
-
-    private int ghostIconX(int x, int xyDiff) {
-        int iconX = x + 4 + (7 - xyDiff - iconSize / 2);
-        iconX -= innerIconSizeModifier;
-        return iconX + (DEFAULT_ICON_SIZE - imageSize) / 2;
-    }
-
-    private int ghostIconY(int y, int xyDiff) {
-        int iconY = y + 4 + (7 - xyDiff - iconSize / 2);
-        iconY -= innerIconSizeModifier;
-        return iconY + (DEFAULT_ICON_SIZE - imageSize) / 2;
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/solegendary/reignofnether/hud/buttons/UnitItemShopButton.java b/src/main/java/com/solegendary/reignofnether/hud/buttons/UnitItemShopButton.java
index 6f212344e..ce5d39389 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/buttons/UnitItemShopButton.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/buttons/UnitItemShopButton.java
@@ -3,11 +3,8 @@
 import com.solegendary.reignofnether.building.addon.ItemShopAddon;
 import com.solegendary.reignofnether.building.buildings.placements.ItemShopPlacement;
 import com.solegendary.reignofnether.hud.HudClientEvents;
-import com.solegendary.reignofnether.items.ItemClientEvents;
 import com.solegendary.reignofnether.items.ItemServerboundPacket;
 import com.solegendary.reignofnether.items.StockedShopItem;
-import com.solegendary.reignofnether.util.MyRenderer;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.world.entity.LivingEntity;
 
 import java.util.List;
@@ -17,7 +14,7 @@ public class UnitItemShopButton extends AbstractUnitItemButton {
 
     private StockedShopItem stockedShopItem;
 
-    public UnitItemShopButton(StockedShopItem stockedShopItem) {
+    public UnitItemShopButton(StockedShopItem stockedShopItem, ItemShopPlacement bpl) {
         super(
                 "button_" + stockedShopItem.item.getItem().getDescriptionId(),
                 Button.DEFAULT_ICON_SIZE,
@@ -27,8 +24,7 @@ public UnitItemShopButton(StockedShopItem stockedShopItem) {
                 () -> false,
                 () -> true,
                 () -> {
-                    if (ItemClientEvents.openItemShop != null && !ItemClientEvents.openItemShop.isDestroyedServerside) {
-                        ItemShopPlacement bpl = ItemClientEvents.openItemShop;
+                    if (!bpl.isDestroyedServerside) {
                         ItemShopAddon itemShop = bpl.getBuilding().getActiveAddon(ItemShopAddon.class);
                         if (itemShop != null && bpl.getServedUnit() instanceof LivingEntity le) {
                             ItemServerboundPacket.buy(le.getId(), stockedShopItem.item.descId, bpl.originPos);
@@ -47,24 +43,18 @@ public UnitItemShopButton(StockedShopItem stockedShopItem) {
         this.emeraldValue = stockedShopItem.buyCost;
     }
 
+    // buying is a plain click, not the inventory's press-then-release, so the hotkey runs the click
     @Override
-    public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
-        if (stockedShopItem.stock == 0) {
+    public void pressHotkey() {
+        onLeftClick.run();
+    }
+
+    @Override
+    public void refresh() {
+        if (stockedShopItem.stock == 0)
             this.greyPercent = 1 - ((float) stockedShopItem.getTicksToNextRestock() / stockedShopItem.maxRestockTicks);
-        } else {
+        else
             this.greyPercent = 0;
-        }
-        super.render(guiGraphics, x, y, mouseX, mouseY);
-
-        if (stockedShopItem.maxStock >= 0) {
-            guiGraphics.pose().translate(0,0,1);
-            MyRenderer.drawScaledString(guiGraphics,
-                    MC.font,
-                    String.valueOf(stockedShopItem.stock),
-                    x + 3,
-                    y + 3,
-                    0xFFFFFF,
-                    0.75f);
-        }
+        this.bottomLeftText = () -> stockedShopItem.maxStock >= 0 ? String.valueOf(stockedShopItem.stock) : "";
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/solegendary/reignofnether/hud/custombutton/CustomButton.java b/src/main/java/com/solegendary/reignofnether/hud/custombutton/CustomButton.java
index 71b59fa48..9ce41a627 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/custombutton/CustomButton.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/custombutton/CustomButton.java
@@ -5,11 +5,8 @@
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.hud.buttons.Button;
 import com.solegendary.reignofnether.keybinds.Keybinding;
-import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.ExtraCodecs;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.entity.LivingEntity;
@@ -41,7 +38,6 @@ public class CustomButton extends Button {
 	public List<CustomButtonActions.CustomButtonAction> leftClickActions = new ArrayList<>();
 	public List<CustomButtonActions.CustomButtonAction> rightClickActions = new ArrayList<>();
 	public boolean isEnabled;
-	Minecraft MC = Minecraft.getInstance();
 	public CustomButton(
 		String name,
 		int iconSize,
@@ -123,10 +119,8 @@ public CustomButton(ResourceLocation id, String name, ResourceLocation icon, int
 			() -> false,
 			() -> false,
 			() -> isEnabled,
-			() -> {
-			},
-			() -> {
-			},
+			leftClickActions.isEmpty() ? null : () -> CustomButtonActionServerboundPacket.runLeftClickCommand(id),
+			rightClickActions.isEmpty() ? null : () -> CustomButtonActionServerboundPacket.runRightClickCommand(id),
 			null
 		);
 		this.id = id;
@@ -183,19 +177,4 @@ public int iconSize() {
 		return iconSize;
 	}
 	
-	@Override
-	public void checkClicked(int mouseX, int mouseY, boolean leftClick) {
-		if (!OrthoviewClientEvents.isEnabled() || !isEnabled)
-			return;
-		
-		if (isMouseOver(mouseX, mouseY) && MC.player != null) {
-			if (leftClick && this.onLeftClick != null && !this.leftClickActions.isEmpty()) {
-				MC.player.playSound(SoundEvents.UI_BUTTON_CLICK.get(), 0.2f, 1.0f);
-				CustomButtonActionServerboundPacket.runLeftClickCommand(id);
-			} else if (!leftClick && this.onRightClick != null && !rightClickActions.isEmpty()) {
-				MC.player.playSound(SoundEvents.UI_BUTTON_CLICK.get(), 0.2f, 1.0f);
-				CustomButtonActionServerboundPacket.runRightClickCommand(id);
-			}
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/solegendary/reignofnether/hud/effecticons/MobEffectIcon.java b/src/main/java/com/solegendary/reignofnether/hud/effecticons/MobEffectIcon.java
index 9fc8c98bd..54102052e 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/effecticons/MobEffectIcon.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/effecticons/MobEffectIcon.java
@@ -22,7 +22,8 @@ public class MobEffectIcon extends Button {
     private final String descId;
     private final Long startTime = TimeClientEvents.getClientTime();
     public int duration = 0;
-    private static final int MIN_DURATION_SHOWN = 40; // don't show really short effects as most of them are just auras
+    public final long createdMs = System.currentTimeMillis(); // for the HUD's timer border, needs no clock sync
+    public static final int MIN_DURATION_SHOWN = 40; // don't show really short effects as most of them are just auras
 
     public MobEffectIcon(MobEffect effect, ResourceLocation iconRl, String descId) {
         super("Passive Icon", ICON_SIZE, iconRl, null, () -> false, () -> true, () -> true, null, null, List.of());
@@ -75,6 +76,14 @@ private int getSecondsRemaining() {
         return (int) Math.ceil(remainingTicks / 20d);
     }
 
+    @Override
+    public com.solegendary.reignofnether.ui.Tooltip hudTooltip() {
+        String name = I18n.get("effect.reignofnether." + descId);
+        if (duration >= MIN_DURATION_SHOWN)
+            name += " " + I18n.get("effect.reignofnether.duration", getSecondsRemaining());
+        return com.solegendary.reignofnether.ui.Tooltip.of(name).body(I18n.get("effect.reignofnether." + descId + ".desc"));
+    }
+
     @Override
     public void renderTooltip(GuiGraphics guiGraphics, int mouseX, int mouseY) {
         String name = I18n.get("effect.reignofnether." + descId);
diff --git a/src/main/java/com/solegendary/reignofnether/hud/layout/CommandGrid.java b/src/main/java/com/solegendary/reignofnether/hud/layout/CommandGrid.java
new file mode 100644
index 000000000..41d69841a
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/layout/CommandGrid.java
@@ -0,0 +1,96 @@
+package com.solegendary.reignofnether.hud.layout;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Places commands and abilities in the fixed 5x3 command card. The slot decides the hotkey:
+ * <pre>
+ *   Q W E R T    0  1  2  3  4   abilities, production, buildings
+ *   A S D F G    5  6  7  8  9   commands (attack, stop, hold, garrison, gather...)
+ *   Z X C V B   10 11 12 13 14   more abilities
+ * </pre>
+ * Commands go to their preferred slot when it is free, otherwise to the next free command slot.
+ * Abilities fill the top row, then the bottom row, then any command slot left free. When there are
+ * more abilities than free slots, B (or the last free slot) becomes a page button.
+ */
+public final class CommandGrid {
+
+    public static final int COLS = 5;
+    public static final int ROWS = 3;
+    public static final int SLOTS = COLS * ROWS;
+
+    public static final int SLOT_Q = 0, SLOT_Z = 10, SLOT_A = 5, SLOT_S = 6, SLOT_D = 7, SLOT_F = 8, SLOT_G = 9, SLOT_B = 14;
+    public static final int NO_PREFERENCE = -1;
+
+    private static final int[] ABILITY_ORDER = { 0, 1, 2, 3, 4, 10, 11, 12, 13, 14, 5, 6, 7, 8, 9 };
+
+    public record Command<T>(T item, int preferredSlot) { }
+
+    /**
+     * @param slots     what sits in each of the 15 slots (null = empty)
+     * @param pageSlot  slot of the page button, or -1 when everything fits
+     * @param pageCount number of pages (1 when everything fits)
+     */
+    public record Layout<T>(List<T> slots, int pageSlot, int pageCount) { }
+
+    public static <T> Layout<T> assign(List<Command<T>> commands, List<T> abilities, int page) {
+        Object[] grid = new Object[SLOTS];
+        List<T> spill = new ArrayList<>();
+
+        List<Command<T>> later = new ArrayList<>();
+        for (Command<T> c : commands) {
+            int pref = c.preferredSlot();
+            if (pref >= 0 && pref < SLOTS && grid[pref] == null)
+                grid[pref] = c.item();
+            else
+                later.add(c);
+        }
+        for (Command<T> c : later) {
+            int free = firstFree(grid, SLOT_A, SLOT_G);
+            if (free >= 0)
+                grid[free] = c.item();
+            else
+                spill.add(c.item());
+        }
+
+        List<T> all = new ArrayList<>(spill);
+        all.addAll(abilities);
+
+        List<Integer> free = new ArrayList<>();
+        for (int slot : ABILITY_ORDER)
+            if (grid[slot] == null)
+                free.add(slot);
+
+        int pageSlot = -1;
+        int pageCount = 1;
+        int perPage = free.size();
+        if (all.size() > free.size() && !free.isEmpty()) {
+            // the page button sits on B when it can, so it is always in the same place
+            pageSlot = free.contains(SLOT_B) ? SLOT_B : free.get(free.size() - 1);
+            free.remove(Integer.valueOf(pageSlot));
+            perPage = free.size();
+            pageCount = perPage == 0 ? 1 : (all.size() + perPage - 1) / perPage;
+        }
+        int clampedPage = Math.floorMod(page, pageCount);
+        int start = clampedPage * perPage;
+        for (int i = 0; i < perPage && start + i < all.size(); i++)
+            grid[free.get(i)] = all.get(start + i);
+
+        @SuppressWarnings("unchecked")
+        List<T> slots = (List<T>) Arrays.asList(grid);
+        return new Layout<>(slots, pageSlot, pageCount);
+    }
+
+    private static int firstFree(Object[] grid, int from, int to) {
+        for (int i = from; i <= to; i++)
+            if (grid[i] == null)
+                return i;
+        return -1;
+    }
+
+    public static int row(int slot) { return slot / COLS; }
+
+    public static int col(int slot) { return slot % COLS; }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/layout/HudGeometry.java b/src/main/java/com/solegendary/reignofnether/hud/layout/HudGeometry.java
new file mode 100644
index 000000000..5e0142681
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/layout/HudGeometry.java
@@ -0,0 +1,60 @@
+package com.solegendary.reignofnether.hud.layout;
+
+import com.mojang.blaze3d.platform.Window;
+import com.solegendary.reignofnether.ui.HudScale;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.util.WorldState;
+import net.minecraft.client.Minecraft;
+
+/** The HUD scale and layout for the current window, recomputed only when the window or GUI Scale changes. */
+public final class HudGeometry {
+
+    private HudGeometry() { }
+
+    private static int width, height, chosenScale;
+    private static double guiScale;
+    private static HudScale scale;
+    private static HudLayout layout, bigLayout;
+    private static boolean bigMap = false;
+    static {
+        WorldState.onClientReset(() -> bigMap = false);
+    }
+
+    // called many times a frame (every text draw), so compares fields instead of allocating a key
+    public static HudScale scale() {
+        Minecraft mc = Minecraft.getInstance();
+        Window w = mc.getWindow();
+        // Auto picks the biggest scale the window allows, which blows the HUD up on large screens: read it as 4
+        int setting = mc.options.guiScale().get();
+        int chosen = w.calculateScale(setting == 0 ? 4 : setting, mc.isEnforceUnicode());
+        if (scale == null || w.getWidth() != width || w.getHeight() != height || w.getGuiScale() != guiScale || chosen != chosenScale) {
+            width = w.getWidth();
+            height = w.getHeight();
+            guiScale = w.getGuiScale();
+            chosenScale = chosen;
+            scale = HudScale.of(width, height, guiScale, chosenScale);
+            layout = HudLayout.compute(scale.width(), scale.height());
+            bigLayout = HudLayout.compute(scale.width(), scale.height(), true);
+        }
+        return scale;
+    }
+
+    public static HudLayout layout() {
+        scale();
+        return bigMap ? bigLayout : layout;
+    }
+
+    public static boolean isBigMap() {
+        return bigMap;
+    }
+
+    public static void setBigMap(boolean big) {
+        bigMap = big;
+    }
+
+    /** A rectangle in HUD units converted to GUI coordinates: {x, y, w, h}. */
+    public static float[] toGui(Rect r) {
+        HudScale s = scale();
+        return new float[] { (float) s.toGui(r.x()), (float) s.toGui(r.y()), (float) s.toGui(r.w()), (float) s.toGui(r.h()) };
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/layout/HudLayout.java b/src/main/java/com/solegendary/reignofnether/hud/layout/HudLayout.java
new file mode 100644
index 000000000..235cb1936
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/layout/HudLayout.java
@@ -0,0 +1,138 @@
+package com.solegendary.reignofnether.hud.layout;
+
+import com.solegendary.reignofnether.ui.Rect;
+
+/**
+ * Where every region of the RTS HUD goes, in HUD units. This is the only place screen positions are
+ * decided; the panels, the minimap and the tutorial arrows all read from here.
+ *
+ * <pre>
+ *  [resources........]                              [clock][utility bar]
+ *  [groups]                                                  [alert]
+ *  [queue]                                                 [sandbox dock]
+ *
+ *                          [targeting hint]
+ *                              [toast]
+ *  [command card | portrait | stats | slots | selection]      [tools] <map>
+ * </pre>
+ * The bottom row is one bar that is always there. Up to {@link #MAX_BAR} units wide it fills the screen; on wider
+ * screens it splits: commands and selection stay on the left, only as wide as what is selected, the map stays on
+ * the right, and the world shows between them.
+ */
+public record HudLayout(
+        int width,
+        int height,
+        Rect console,
+        Rect commandCard,
+        Rect selection,
+        Rect tools,
+        Rect minimap,
+        int toastBottom,
+        boolean compact,
+        boolean split,
+        boolean bigMap
+) {
+    public static final int MARGIN = 8;
+    public static final int GAP = 6;
+    public static final int CONSOLE_HEIGHT = 118;
+    public static final int CONSOLE_PAD = 7;
+
+    // the HUD's three button sizes: every clickable tile is one of these
+    public static final int CELL = 29;       // command card, groups, queue, utility bar, item shop, inventory
+    public static final int TILE_SMALL = 21; // selection unit tiles, start-position markers, minimap tools
+    public static final int ZOOM = TILE_SMALL; // map zoom + and -, as big as the map toggles beside them
+
+    public static final int TOP_CARD_H = CELL + 6; // resource bar, clock, alert and utility bar (a CELL row, padded)
+
+    public static final int CELL_GAP_X = 4;
+    public static final int CELL_GAP_Y = 4;
+    public static final int CARD_CELL = 32; // command card: three rows fill the console's height
+
+    public static final int TOOL = TILE_SMALL;
+    public static final int TOOL_GAP = 2;
+    public static final int TOOL_COLS = 2;
+    public static final int TOOL_ROWS = 5;
+
+    public static final int MAP = 116;
+    public static final int MAP_PAD = 1;
+
+    public static final int DOCK_SHEET_W = 227;
+    public static final int DOCK_RAIL_W = TILE_SMALL + 6;
+    public static final int DOCK_GAP = 3;
+
+    /** Below this width, the selection panel drops the stats column. */
+    public static final int COMPACT_WIDTH = 750;
+    /** Above this width, the bar splits into its left and right parts. */
+    public static final int MAX_BAR = 880;
+
+    public static int cardWidth() {
+        return CommandGrid.COLS * CARD_CELL + (CommandGrid.COLS - 1) * CELL_GAP_X;
+    }
+
+    public static int cardHeight() {
+        return CommandGrid.ROWS * CARD_CELL + (CommandGrid.ROWS - 1) * CELL_GAP_Y;
+    }
+
+    public static HudLayout compute(int width, int height) {
+        return compute(width, height, false);
+    }
+
+    /** With bigMap the map moves up and grows, and its tools go in one row below it. */
+    public static HudLayout compute(int width, int height, boolean bigMap) {
+        Rect console = new Rect(0, height - CONSOLE_HEIGHT, width, CONSOLE_HEIGHT);
+        int innerTop = console.y() + CONSOLE_PAD;
+        int innerH = CONSOLE_HEIGHT - CONSOLE_PAD * 2;
+
+        // the console starts at the screen's edge, so its padding alone sets the gap, the same as above the card
+        Rect card = new Rect(CONSOLE_PAD, innerTop, cardWidth(), innerH);
+
+        Rect map;
+        Rect tools;
+        if (bigMap) {
+            int toolsW = TOOL_COLS * TOOL_ROWS * (TOOL + TOOL_GAP) - TOOL_GAP;
+            tools = new Rect(width - MARGIN - toolsW, height - MARGIN / 2 - TOOL, toolsW, TOOL);
+            int side = Math.min(toolsW, height - CONSOLE_HEIGHT);
+            map = new Rect(width - MARGIN - side, tools.y() - GAP - side, side, side);
+        } else {
+            map = new Rect(width - MARGIN - MAP, height - MAP_PAD - MAP, MAP, MAP);
+            int toolsW = TOOL;
+            int toolsH = TOOL_ROWS * TOOL + (TOOL_ROWS - 1) * TOOL_GAP;
+            // beside the diamond's left corner, centred on it
+            tools = new Rect(map.x() - GAP - toolsW, map.centerY() - toolsH / 2, toolsW, toolsH);
+        }
+
+        // the most room the selection card can take between the command card and the tools, panel padding included
+        int selX = card.right() + CONSOLE_PAD * 2;
+        int selRight = tools.x() - GAP * 2 - CONSOLE_PAD;
+        Rect selection = new Rect(selX, innerTop, Math.max(0, selRight - selX), innerH);
+
+        return new HudLayout(width, height, console, card, selection, tools, map,
+                console.y() - GAP * 2, width < COMPACT_WIDTH, width > MAX_BAR, bigMap);
+    }
+
+    /** Sandbox sheet and tab rail: right-aligned, from the given top down to the console. */
+    public Rect sandboxDock(int top) {
+        int w = DOCK_SHEET_W + DOCK_GAP + DOCK_RAIL_W;
+        return new Rect(width - MARGIN - w, top, w, (bigMap ? minimap.y() : console.y()) - GAP - top);
+    }
+
+    /** Top-left corner of the given command card slot. */
+    public int slotX(int slot) {
+        return commandCard.x() + CommandGrid.col(slot) * (CARD_CELL + CELL_GAP_X);
+    }
+
+    public int slotY(int slot) {
+        return commandCard.y() + CommandGrid.row(slot) * (CARD_CELL + CELL_GAP_Y);
+    }
+
+    /** Top-left corner of a minimap tool tile: a row under the big map, else one column by the map. */
+    public int toolX(int tool) {
+        if (bigMap)
+            return tools.x() + tool * (TOOL + TOOL_GAP);
+        return tools.x();
+    }
+
+    public int toolY(int tool) {
+        return bigMap ? tools.y() : tools.y() + tool % TOOL_ROWS * (TOOL + TOOL_GAP);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/ButtonCell.java b/src/main/java/com/solegendary/reignofnether/hud/panels/ButtonCell.java
new file mode 100644
index 000000000..d3b20fc96
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/ButtonCell.java
@@ -0,0 +1,317 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.hud.playerdisplay.PlayerDisplayClientEvents;
+import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.ability.HeroAbility;
+import com.solegendary.reignofnether.building.production.StartProductionButton;
+import com.solegendary.reignofnether.hud.buttons.AbilityButton;
+import com.solegendary.reignofnether.hud.buttons.AbstractUnitItemButton;
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.resources.ResourceCost;
+import com.solegendary.reignofnether.resources.Resources;
+import com.solegendary.reignofnether.resources.ResourcesClientEvents;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Icon;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Theme.CellState;
+import com.solegendary.reignofnether.ui.Tooltip;
+import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
+import com.solegendary.reignofnether.util.MiscUtil;
+import com.solegendary.reignofnether.util.MyRenderer;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.resources.ResourceLocation;
+
+import javax.annotation.Nullable;
+
+/**
+ * Draws a legacy {@link Button} as a cell of the new HUD: state colours, cost chip, cooldown, hotkey chip
+ * and rank pips. The Button stays the data model (action, hotkey, tooltip); only the drawing lives here.
+ */
+public final class ButtonCell {
+
+    private ButtonCell() { }
+
+    public static final ResourceLocation ICON_FOOD = rl("textures/icons/items/wheat.png");
+    public static final ResourceLocation ICON_WOOD = rl("textures/icons/items/wood.png");
+    public static final ResourceLocation ICON_ORE = rl("textures/icons/items/iron_ore.png");
+    public static final ResourceLocation ICON_EMERALD = rl("textures/icons/items/emerald.png");
+    public static final ResourceLocation ICON_MANA = rl("textures/icons/items/lapis.png");
+    public static final ResourceLocation ICON_CLOCK = rl("textures/icons/items/clock.png");
+
+    private static ResourceLocation rl(String path) {
+        return ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, path);
+    }
+
+    /** What the player is missing to afford something: resource icon, amount and full cost, or null if affordable. */
+    public record Shortfall(ResourceLocation icon, int amount, int cost) { }
+
+    @Nullable
+    public static Shortfall shortfall(@Nullable ResourceCost cost) {
+        Resources own = ResourcesClientEvents.getOwnResources();
+        if (cost == null || own == null)
+            return null;
+        if (own.food < cost.food) return new Shortfall(ICON_FOOD, cost.food - own.food, cost.food);
+        if (own.wood < cost.wood) return new Shortfall(ICON_WOOD, cost.wood - own.wood, cost.wood);
+        if (own.ore < cost.ore) return new Shortfall(ICON_ORE, cost.ore - own.ore, cost.ore);
+        if (own.emerald < cost.emerald) return new Shortfall(ICON_EMERALD, cost.emerald - own.emerald, cost.emerald);
+        return null;
+    }
+
+    public static CellState stateOf(Button b) {
+        if (!b.isEnabled.get())
+            return CellState.LOCKED;
+        if (b instanceof AbilityButton ab && ab.getCooldownTicks() > 0)
+            return CellState.COOLDOWN;
+        if (b.cost != null && shortfall(b.cost.get()) != null)
+            return CellState.POOR;
+        if (b instanceof AbilityButton ab && ab.ability instanceof HeroAbility ha && ha.manaCost > 0
+                && ab.getUnit() instanceof HeroUnit hero && hero.getMana() < ha.manaCost)
+            return CellState.POOR;
+        if (b.isSelected.get())
+            return CellState.ACTIVE;
+        return CellState.READY;
+    }
+
+    public static void render(GuiGraphics g, Button b, int x, int y, int size, @Nullable String key, boolean hovered) {
+        b.refresh();
+        CellState state = stateOf(b);
+        Theme.cell(g, x, y, size, size, state, hovered);
+        // pressed in for a moment after a click or its hotkey: light from below, a darker face, the icon 1 lower
+        boolean pressed = System.currentTimeMillis() - b.pressedMs < 120;
+        if (pressed) {
+            g.fill(x, y, x + size, y + size, 0x26000000);
+            g.fill(x, y, x + size, y + 1, 0x80000000);
+            g.fill(x, y, x + 1, y + size, 0x80000000);
+            g.fill(x, y + size - 1, x + size, y + size, 0x26FFFFFF);
+            g.fill(x + size - 1, y, x + size, y + size, 0x26FFFFFF);
+        }
+
+        // the map art is wide with empty rows above and below, so it needs more room to match the others
+        boolean map = b == PlayerDisplayClientEvents.diplomacyButton || b == PlayerDisplayClientEvents.observerButton;
+        int icon = Math.max(8, Math.round(size * (map ? 0.7f : isHeroAbility(b) ? 0.86f : b instanceof AbstractUnitItemButton ? 0.64f
+                : b instanceof AbilityButton ? 0.72f : 0.56f)));
+        int ix = x + (size - icon) / 2;
+        int iy = y + (size - icon) / 2 + (pressed ? 1 : 0);
+        drawIcon(g, b, ix, iy, icon);
+
+        if (state == CellState.LOCKED) {
+            g.fill(x, y, x + size, y + size, 0x99000000);
+            Theme.lock(g, x + (size - 9) / 2, y + (size - 9) / 2, 9, Theme.DESC);
+        } else if (state == CellState.POOR) {
+            g.fill(x, y, x + size, y + size, 0x55251619);
+        }
+
+        if (state == CellState.COOLDOWN && b instanceof AbilityButton ab) {
+            float max = ab.ability.cooldownMax;
+            float left = ab.getCooldownTicks();
+            int shade = Math.round(size * Math.min(1f, left / Math.max(1f, max)));
+            g.fill(x, y, x + size, y + shade, 0xD1080710);
+            g.fill(x, y + shade, x + size, y + size, 0x1F080710);
+            String secs = String.valueOf((int) Math.ceil(left / 20f));
+            Text.bigCentered(g, secs, x + size / 2, y + (size - 9) / 2, Theme.GOLD, Text.px(20));
+        } else if (b.greyPercent > 0 && !(b instanceof AbilityButton)) {
+            // production progress and similar: the cleared part grows from the top
+            int clear = Math.round(b.greyPercent * size);
+            g.fill(x, y + clear, x + size, y + size, 0x99000000);
+        }
+
+        if (b.isFlashing.get())
+            g.fill(x, y, x + size, y + size, (int) (0x60 * MiscUtil.getOscillatingFloat(0, 1)) << 24 | 0xFFFFFF);
+
+        boolean passive = b instanceof AbilityButton ab && ab.isPassive;
+        if (key != null && size >= 18 && !passive)
+            Theme.keyCap(g, key, x + 1, y + 1, state == CellState.ACTIVE ? Theme.GOLD
+                    : state == CellState.EMPTY ? Theme.FAINT : Theme.MUTED);
+        drawKind(g, b, x, y, size, passive, state);
+
+        drawManaChip(g, b, x, y, size, state);
+        if (b.cost != null && Keybindings.altMod.isDown())
+            drawCostChips(g, b.cost.get(), x, y, size);
+        drawCharges(g, b, x, y, size);
+        drawRankPips(g, b, x, y, size);
+
+        if (b.bottomLeftText != null) {
+            String t = b.bottomLeftText.get();
+            if (t != null && !t.isEmpty())
+                Text.smallShadowed(g, t, x + 2, y + size - 9, b.bottomLeftTextColor | 0xFF000000);
+        }
+    }
+
+    // hero spell art was drawn to fill the whole button
+    private static boolean isHeroAbility(Button b) {
+        return b.heroAbilityIcon || b instanceof AbilityButton ab && ab.ability instanceof HeroAbility;
+    }
+
+    public static void renderEmpty(GuiGraphics g, int x, int y, int size, @Nullable String key) {
+        Theme.cell(g, x, y, size, size, CellState.EMPTY, false);
+        if (key != null && size >= 18)
+            Theme.keyCap(g, key, x + 1, y + 1, Theme.FAINT);
+    }
+
+    public static void drawIcon(GuiGraphics g, Button b, int x, int y, int size) {
+        if (!b.playerNameForHeadIcon.isBlank()) {
+            MyRenderer.renderPlayerHead(g, b.playerNameForHeadIcon, x, y, size, b.bgIconResource);
+            return;
+        }
+        if (b.bgIconResource != null)
+            MyRenderer.renderIcon(g, b.bgIconResource, x, y, size);
+        if (b.iconResource != null && b.iconResource.getPath().startsWith("textures/gui/icons/")) {
+            // pixelarticons: a pixel-exact size, tinted like the rest of the HUD's text
+            int s = Math.max(6, Math.round(size / 6f) * 6);
+            Icon.drawTexture(g, b.iconResource, x + (size - s) / 2, y + (size - s) / 2, s, Theme.BODY);
+        } else if (b.iconResource != null)
+            MyRenderer.renderIcon(g, b.iconResource, x, y, size);
+        if (b.iconItem != null)
+            MyRenderer.renderItem(g, b.iconItem, x - 1, y - 1, size / 16f);
+    }
+
+    /** Always shown, unlike a resource cost: that can have several types, so it needs Alt held or the tooltip. */
+    private static void drawManaChip(GuiGraphics g, Button b, int x, int y, int size, CellState state) {
+        if (state == CellState.COOLDOWN || size < 24 || !(b instanceof AbilityButton ab) || !(ab.ability instanceof HeroAbility ha) || ha.manaCost <= 0)
+            return;
+        int colour = state == CellState.POOR ? Theme.ERROR : Theme.MANA_TEXT;
+        drawChip(g, ICON_MANA, ha.manaCost, colour, x + size - 1, y + size - 8);
+    }
+
+    /** Every resource of a cost, stacked up from the bottom right corner; red where the player is short. */
+    private static void drawCostChips(GuiGraphics g, @Nullable ResourceCost cost, int x, int y, int size) {
+        if (cost == null)
+            return;
+        Resources own = ResourcesClientEvents.getOwnResources();
+        int[] values = { cost.emerald, cost.ore, cost.wood, cost.food };
+        int[] held = own == null ? new int[4] : new int[] { own.emerald, own.ore, own.wood, own.food };
+        ResourceLocation[] icons = { ICON_EMERALD, ICON_ORE, ICON_WOOD, ICON_FOOD };
+        int cy = y + size - 8;
+        for (int i = 0; i < values.length; i++) {
+            if (values[i] <= 0)
+                continue;
+            drawChip(g, icons[i], values[i], own != null && held[i] < values[i] ? Theme.ERROR : Theme.BODY, x + size - 1, cy);
+            cy -= 7;
+        }
+    }
+
+    private static void drawChip(GuiGraphics g, ResourceLocation icon, int amount, int colour, int right, int cy) {
+        String text = compact(amount);
+        int cx = right - Text.smallWidth(text) - 8;
+        g.fill(cx, cy, right, cy + 7, 0xCC0B0A0F);
+        MyRenderer.renderIcon(g, icon, cx + 1, cy + 1, 5);
+        Text.small(g, text, cx + 7, cy - 1, colour);
+    }
+
+    /**
+     * Active abilities: a 1-unit orange frame, solid in the top-left corner and fading out towards the bottom
+     * right, in 2-unit steps so it stays sharp. While armed (picked and waiting for a target, or toggled on)
+     * the whole frame blinks gold.
+     */
+    private static void abilityFrame(GuiGraphics g, int x, int y, int size, boolean armed) {
+        if (armed) {
+            boolean on = (System.currentTimeMillis() / 400) % 2 == 0;
+            Theme.ring(g, x, y, size, size, 1, on ? Theme.GOLD : Theme.withAlpha(Theme.ORANGE, 0.35f));
+            return;
+        }
+        float span = size * 2 * 0.8f; // fully faded 80% of the way to the opposite corner
+        for (int i = 0; i < size; i += 2) {
+            int len = Math.min(2, size - i);
+            int top = Theme.withAlpha(Theme.ORANGE, Math.max(0, 1 - i / span));
+            int side = Theme.withAlpha(Theme.ORANGE, Math.max(0, 1 - (i + size) / span));
+            g.fill(x + i, y, x + i + len, y + 1, top);                   // top edge
+            g.fill(x, y + i, x + 1, y + i + len, top);                   // left edge
+            g.fill(x + i, y + size - 1, x + i + len, y + size, side);    // bottom edge
+            g.fill(x + size - 1, y + i, x + size, y + i + len, side);    // right edge
+        }
+    }
+
+    public static boolean canAutocast(Button b) {
+        return b instanceof AbilityButton ab && ab.ability != null && ab.ability.autocastEnableAction != null && b.onRightClick != null;
+    }
+
+    /**
+     * What kind of button it is, at a glance: corner ticks for autocast (gold and pulsing while on),
+     * a dim flat ring for passives (no key: there is nothing to press), an up arrow for research.
+     */
+    private static void drawKind(GuiGraphics g, Button b, int x, int y, int size, boolean passive, CellState state) {
+        if (b instanceof AbilityButton ab && ab.ability != null && !passive && state != CellState.LOCKED)
+            abilityFrame(g, x, y, size, state == CellState.ACTIVE);
+        if (b instanceof AbilityButton ab && ab.ability != null && ab.ability.autocastEnableAction != null) {
+            boolean on = ab.isAutocasting();
+            int c = on ? Theme.GOLD : Theme.MUTED;
+            if (on)
+                Theme.ring(g, x, y, size, size, 1, (int) (0x80 + 0x7F * MiscUtil.getOscillatingFloat(0, 1)) << 24 | (Theme.GOLD & 0xFFFFFF));
+            int t = 4, r = x + size - 1, btm = y + size - 1;
+            g.fill(x, y, x + t, y + 1, c); g.fill(x, y, x + 1, y + t, c);
+            g.fill(r - t + 1, y, r + 1, y + 1, c); g.fill(r, y, r + 1, y + t, c);
+            g.fill(x, btm, x + t, btm + 1, c); g.fill(x, btm - t + 1, x + 1, btm + 1, c);
+            g.fill(r - t + 1, btm, r + 1, btm + 1, c); g.fill(r, btm - t + 1, r + 1, btm + 1, c);
+        } else if (passive) {
+            Theme.ring(g, x + 1, y + 1, size - 2, size - 2, 1, Theme.FAINT);
+        }
+        if (b instanceof StartProductionButton sp && sp.production.getClass().getPackageName().contains(".research")) {
+            // a small up arrow in the top right corner
+            int ax = x + size - 7, ay = y + 2;
+            g.fill(ax + 2, ay, ax + 3, ay + 1, Theme.BUFF);
+            g.fill(ax + 1, ay + 1, ax + 4, ay + 2, Theme.BUFF);
+            g.fill(ax, ay + 2, ax + 5, ay + 3, Theme.BUFF);
+            g.fill(ax + 2, ay + 3, ax + 3, ay + 5, Theme.BUFF);
+        }
+    }
+
+    private static void drawCharges(GuiGraphics g, Button b, int x, int y, int size) {
+        if (!(b instanceof AbilityButton ab))
+            return;
+        int charges = ab.getCharges();
+        if (charges < 0)
+            return;
+        int colour = charges >= ab.ability.maxCharges ? Theme.OK : charges <= 0 ? Theme.ERROR : charges == 1 ? Theme.YELLOW : Theme.TEXT;
+        String s = String.valueOf(charges);
+        Text.smallShadowed(g, s, x + size - Text.smallWidth(s) - 2, y, colour);
+    }
+
+    private static void drawRankPips(GuiGraphics g, Button b, int x, int y, int size) {
+        if (!(b instanceof AbilityButton ab) || !(ab.ability instanceof HeroAbility ha) || !(ab.getUnit() instanceof HeroUnit hero))
+            return;
+        int rank = ha.getRank(hero);
+        for (int i = 0; i < ha.maxRank; i++) {
+            int px = x + 2 + i * 4;
+            g.fill(px, y + size - 4, px + 3, y + size - 1, i < rank ? Theme.ORANGE : Theme.FAINT);
+        }
+    }
+
+    public static String compact(int amount) {
+        return amount >= 1000 ? (amount / 100) / 10f + "k" : String.valueOf(amount);
+    }
+
+    /** Tooltip for a command card cell: the button's own lines plus a state line and the hotkey. */
+    public static Tooltip tooltipFor(Button b, @Nullable String key) {
+        Tooltip t = Tooltip.fromLines(b.tooltipLines);
+        if (t == null)
+            t = Tooltip.of(b.name);
+        switch (stateOf(b)) {
+            case LOCKED -> t.status(I18n.get("hud.reignofnether.cell.locked"), Theme.ERROR);
+            case COOLDOWN -> {
+                if (b instanceof AbilityButton ab)
+                    t.status(I18n.get("hud.reignofnether.cell.ready_in", (int) Math.ceil(ab.getCooldownTicks() / 20f)), Theme.MUTED);
+            }
+            case POOR -> {
+                Shortfall s = b.cost != null ? shortfall(b.cost.get()) : null;
+                if (s != null)
+                    t.status(I18n.get("hud.reignofnether.cell.need_more", s.amount(), resourceName(s.icon())), Theme.ERROR);
+                else
+                    t.status(I18n.get("hud.buttons.reignofnether.not_enough_mana"), Theme.ERROR);
+            }
+            default -> { }
+        }
+        if (key != null && !key.isEmpty()) {
+            if (canAutocast(b))
+                t.status(I18n.get("hud.reignofnether.autocast_hint", key), Theme.MUTED);
+            t.key(key);
+        }
+        return t;
+    }
+
+    private static String resourceName(ResourceLocation icon) {
+        String key = icon == ICON_FOOD ? "food" : icon == ICON_WOOD ? "wood" : icon == ICON_ORE ? "ore" : "emerald";
+        return I18n.get("resources.reignofnether." + key).toLowerCase();
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/CommandCard.java b/src/main/java/com/solegendary/reignofnether/hud/panels/CommandCard.java
new file mode 100644
index 000000000..52c739540
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/CommandCard.java
@@ -0,0 +1,509 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.alliance.AlliancesClient;
+import com.solegendary.reignofnether.ability.abilities.TradeResources;
+import com.solegendary.reignofnether.building.buildings.shared.AbstractMarket;
+import com.solegendary.reignofnether.building.buildings.monsters.Laboratory;
+import com.solegendary.reignofnether.building.production.ProductionItem;
+import com.solegendary.reignofnether.building.production.ProductionItems;
+import com.solegendary.reignofnether.building.production.StartProductionButton;
+import java.util.Map;
+import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.ability.Ability;
+import com.solegendary.reignofnether.ability.HeroAbility;
+import com.solegendary.reignofnether.ability.abilities.CallToArmsUnit;
+import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.building.BuildingPlacement;
+import com.solegendary.reignofnether.building.BuildingPlaceButton;
+import com.solegendary.reignofnether.building.Building;
+import com.solegendary.reignofnether.building.Buildings;
+import com.solegendary.reignofnether.building.addon.GarrisonableBuildingAddon;
+import com.solegendary.reignofnether.building.buildings.placements.ItemShopPlacement;
+import com.solegendary.reignofnether.building.buildings.placements.ProductionPlacement;
+import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.hud.buttons.AbilityButton;
+import com.solegendary.reignofnether.hud.buttons.ActionButtons;
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.buttons.HelperButtons;
+import com.solegendary.reignofnether.hud.layout.CommandGrid;
+import com.solegendary.reignofnether.hud.layout.CommandGrid.Command;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.items.ItemClientEvents;
+import com.solegendary.reignofnether.items.StockedShopItem;
+import com.solegendary.reignofnether.hud.buttons.UnitItemShopButton;
+import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.player.PlayerClientEvents;
+import com.solegendary.reignofnether.research.ResearchClient;
+import com.solegendary.reignofnether.resources.Resources;
+import com.solegendary.reignofnether.sandbox.SandboxClientEvents;
+import com.solegendary.reignofnether.tutorial.TutorialClientEvents;
+import com.solegendary.reignofnether.tutorial.TutorialStage;
+import com.solegendary.reignofnether.ui.Icon;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import com.solegendary.reignofnether.unit.NonUnitClientEvents;
+import com.solegendary.reignofnether.unit.Relationship;
+import com.solegendary.reignofnether.unit.UnitAction;
+import com.solegendary.reignofnether.unit.UnitClientEvents;
+import com.solegendary.reignofnether.unit.interfaces.AttackerUnit;
+import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
+import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
+import com.solegendary.reignofnether.unit.units.villagers.VillagerUnit;
+import com.solegendary.reignofnether.util.MiscUtil;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import static com.solegendary.reignofnether.hud.layout.CommandGrid.*;
+
+/**
+ * The 5x3 command card at the bottom-left. Keys come from the slot (QWERT / ASDFG / ZXCVB), so the
+ * same position always has the same key whatever is selected.
+ */
+public final class CommandCard {
+
+    private CommandCard() { }
+
+    private static int page = 0;
+    private static Object pageOwner = null;
+
+    // buildings a worker's advanced tab shows; the rest are on the basic tab
+    private static final java.util.Set<Building> ADVANCED_BUILDINGS = java.util.Set.of(
+            Buildings.DUNGEON, Buildings.SPIDER_LAIR, Buildings.SLIME_PIT, Buildings.LABORATORY, Buildings.STRONGHOLD,
+            Buildings.BASTION, Buildings.HOGLIN_STABLES, Buildings.FLAME_SANCTUARY, Buildings.WITHER_SHRINE,
+            Buildings.BASALT_SPRINGS, Buildings.FORTRESS,
+            Buildings.BLACKSMITH, Buildings.WITCH_HUT, Buildings.ARCANE_TOWER, Buildings.LIBRARY, Buildings.CASTLE,
+            Buildings.IRON_GOLEM_BUILDING, Buildings.BEACON);
+
+    // a worker's open build tab: 0 = its commands, 1 = basic buildings, 2 = advanced buildings
+    private static int tab = 0;
+
+    private record Contents(List<Command<Button>> commands, List<Button> abilities) {
+        boolean isEmpty() {
+            return commands.isEmpty() && abilities.isEmpty();
+        }
+
+        static final Contents EMPTY = new Contents(List.of(), List.of());
+    }
+
+    public static void reset() {
+        page = 0;
+        tab = 0;
+        pageOwner = null;
+        gatherKey = null;
+        cached = null;
+        cachedOwner = null;
+    }
+
+    // contents() builds every button anew: rebuild once a tick, or sooner when the selection or tab changes
+    private static Contents cached;
+    private static long cachedTick = -1;
+    private static Object cachedOwner;
+    private static int cachedTab = -1, cachedSelection = -1;
+
+    private static Contents cachedContents() {
+        long tick = System.currentTimeMillis() / 50;
+        Object owner = HudClientEvents.hudSelectedPlacement != null ? HudClientEvents.hudSelectedPlacement : HudClientEvents.hudSelectedEntity;
+        int selection = UnitClientEvents.getSelectedUnits().size() + BuildingClientEvents.getSelectedBuildings().size();
+        if (cached == null || tick != cachedTick || owner != cachedOwner || tab != cachedTab || selection != cachedSelection) {
+            cached = contents();
+            cachedTick = tick;
+            cachedOwner = owner;
+            cachedTab = tab;
+            cachedSelection = selection;
+        }
+        return cached;
+    }
+
+    public static void render(HudFrame f) {
+        Rect card = f.layout.commandCard();
+        if (SpectatorHud.isActive()) {
+            renderSpectatorCard(f); // spectators can't command anything
+            return;
+        }
+        Contents c = cachedContents();
+
+        Object owner = HudClientEvents.hudSelectedPlacement != null ? HudClientEvents.hudSelectedPlacement : HudClientEvents.hudSelectedEntity;
+        if (owner != pageOwner) {
+            pageOwner = owner;
+            page = 0;
+            tab = 0;
+        }
+        CommandGrid.Layout<Button> layout = CommandGrid.assign(c.commands(), c.abilities(), page);
+
+        // no title row: the cells take its room, so the badge sits on the console's top edge
+        SelectionPanel.renderSkillPoints(f, card.right(), card.y() - HudLayout.CONSOLE_PAD - 7);
+
+        for (int slot = 0; slot < CommandGrid.SLOTS; slot++) {
+            int x = f.layout.slotX(slot);
+            int y = f.layout.slotY(slot);
+            Button b = layout.slots().get(slot);
+            if (slot == layout.pageSlot())
+                renderPageCell(f, x, y, slot, layout.pageCount());
+            else if (b == null)
+                ButtonCell.renderEmpty(f.g, x, y, HudLayout.CARD_CELL, Keybindings.grid[slot].getCurrentLabel());
+            else
+                renderCell(f, b, x, y, slot);
+        }
+    }
+
+    /** The unit's abilities, active and passive, with their cooldowns; registered for the tooltip only, so not clickable. */
+    private static void renderSpectatorCard(HudFrame f) {
+        List<Button> abilities = new ArrayList<>();
+        if (ItemClientEvents.ENABLED && HudClientEvents.hudSelectedPlacement instanceof ItemShopPlacement shop && shop.isBuilt)
+            abilities.addAll(shopItemButtons(shop));
+        else if (HudClientEvents.hudSelectedEntity instanceof Unit unit)
+            for (Button b : unit.getAbilityButtons())
+                if (b instanceof AbilityButton && (!b.isHidden.get() || isUnlearnt(b)))
+                    abilities.add(isUnlearnt(b) ? locked(b) : b);
+        for (int slot = 0; slot < CommandGrid.SLOTS; slot++) {
+            int x = f.layout.slotX(slot);
+            int y = f.layout.slotY(slot);
+            if (slot >= abilities.size()) {
+                ButtonCell.renderEmpty(f.g, x, y, HudLayout.CARD_CELL, null);
+                continue;
+            }
+            Button b = abilities.get(slot);
+            Rect cell = new Rect(x, y, HudLayout.CARD_CELL, HudLayout.CARD_CELL);
+            ButtonCell.render(f.g, b, x, y, HudLayout.CARD_CELL, null, f.hovered(cell));
+            f.register(new ButtonBuilder("ability").build(), cell, null,
+                    () -> b instanceof UnitItemShopButton ? b.hudTooltip() : ButtonCell.tooltipFor(b, null));
+        }
+    }
+
+    private static void renderCell(HudFrame f, Button b, int x, int y, int slot) {
+        Runnable rankUp = rankUpAction(b);
+        f.cell(isUnlearnt(b) ? locked(b) : b, x, y, HudLayout.CARD_CELL, Keybindings.grid[slot], rankUp);
+        if (rankUp == null)
+            return;
+        // pulsing "+" in the corner, clickable on its own
+        int s = 9;
+        int px = x + HudLayout.CARD_CELL - s;
+        boolean on = (System.currentTimeMillis() / 500) % 2 == 0;
+        Theme.outline(f.g, px, y, s, s, 1, Theme.ON_ORANGE);
+        f.g.fill(px, y, px + s, y + s, on ? Theme.ORANGE : Theme.ORANGE_DARK);
+        Icon.PLUS.drawIn(f.g, px - 1, y - 1, s + 2, s + 2, Theme.ON_ORANGE);
+        Button plus = new ButtonBuilder("rank up").onLeftClick(rankUp).build();
+        f.register(plus, new Rect(px, y, s, s), null, () -> Tooltip.of(I18n.get("hud.reignofnether.rank_up"))
+                .status(I18n.get("hud.reignofnether.rank_up_hint", Keybindings.grid[slot].getCurrentLabel()), Theme.GOLD));
+    }
+
+    // unlearnt hero abilities stay on the grid, locked, so their "+" can be clicked and their key never moves
+    private static boolean isUnlearnt(Button b) {
+        return b instanceof AbilityButton ab && ab.ability instanceof HeroAbility ha && ab.getUnit() instanceof HeroUnit hero
+                && ha.getRank(hero) == 0;
+    }
+
+    private static Button locked(Button b) {
+        Button locked = new ButtonBuilder(b.name).iconResource(b.iconResource).innerIconSizeModifier(b.innerIconSizeModifier)
+                .isEnabled(() -> false).tooltipLines(b.tooltipLines).build();
+        locked.heroAbilityIcon = true;
+        return locked;
+    }
+
+    private static Runnable rankUpAction(Button b) {
+        if (!(b instanceof AbilityButton ab) || !(ab.ability instanceof HeroAbility ha) || !(ab.getUnit() instanceof HeroUnit hero))
+            return null;
+        if (ha.getRank(hero) >= ha.maxRank)
+            return null;
+        Button rankUp = ha.getRankUpButton(ab.hotkey, hero);
+        if (rankUp == null || !rankUp.isEnabled.get())
+            return null;
+        return rankUp.onLeftClick;
+    }
+
+    private static void renderPageCell(HudFrame f, int x, int y, int slot, int pageCount) {
+        Button next = new ButtonBuilder("next page").onLeftClick(() -> page = (page + 1) % pageCount).build();
+        Rect r = new Rect(x, y, HudLayout.CARD_CELL, HudLayout.CARD_CELL);
+        Theme.cell(f.g, x, y, r.w(), r.h(), Theme.CellState.READY, f.hovered(r));
+        String label = (Math.floorMod(page, pageCount) + 1) + "/" + pageCount;
+        Text.bigCentered(f.g, label, r.centerX(), r.centerY() - 3, Theme.GOLD, Text.px(16));
+        Theme.keyCap(f.g, Keybindings.grid[slot].getCurrentLabel(), x + 1, y + 1, Theme.MUTED);
+        f.register(next, r, Keybindings.grid[slot], () -> Tooltip.of(I18n.get("hud.reignofnether.next_page"))
+                .status(I18n.get("hud.reignofnether.page", Math.floorMod(page, pageCount) + 1, pageCount), Theme.MUTED)
+                .key(Keybindings.grid[slot].getCurrentLabel()));
+    }
+
+    // ------------------------------------------------------------------ what goes on the card
+
+    private static Contents contents() {
+        BuildingPlacement building = HudClientEvents.hudSelectedPlacement;
+        LivingEntity entity = HudClientEvents.hudSelectedEntity;
+        List<LivingEntity> selUnits = UnitClientEvents.getSortedSelectedUnits();
+
+        if (building != null)
+            return buildingContents(building);
+        if (!selUnits.isEmpty() && entity instanceof Unit unit && canCommand(selUnits.get(0)))
+            return unitContents(entity, unit, selUnits.get(0));
+        if (!(entity instanceof Unit) && !UnitClientEvents.getSelectedUnits().isEmpty() && NonUnitClientEvents.canControlAllMobs())
+            return mobContents();
+        return Contents.EMPTY;
+    }
+
+    private static boolean canCommand(LivingEntity first) {
+        return UnitClientEvents.getPlayerToEntityRelationship(first) == Relationship.OWNED
+                || !PlayerClientEvents.isRTSPlayer()
+                || NonUnitClientEvents.canControlAllMobs()
+                || AlliancesClient.canControlAlly(first);
+    }
+
+    private static Contents unitContents(LivingEntity entity, Unit unit, LivingEntity first) {
+        List<Command<Button>> commands = new ArrayList<>();
+        boolean worker = entity instanceof WorkerUnit;
+
+        if (entity instanceof AttackerUnit)
+            commands.add(new Command<>(ActionButtons.attack, SLOT_A));
+        commands.add(new Command<>(ActionButtons.stop, SLOT_S));
+        if (!worker)
+            commands.add(new Command<>(ActionButtons.hold, SLOT_D));
+        else if (canReturnResources(entity, unit))
+            commands.add(new Command<>(returnResourcesButton(unit), SLOT_D)); // disabled while carrying nothing
+        if (worker) {
+            commands.add(new Command<>(ActionButtons.buildRepair, SLOT_F));
+            updateGatherButton((WorkerUnit) entity);
+            commands.add(new Command<>(ActionButtons.gather, SLOT_G));
+        }
+        Button garrison = null;
+        if (unit.canGarrison() && GarrisonableBuildingAddon.getGarrison(unit) == null)
+            garrison = ActionButtons.garrison;
+        else if (GarrisonableBuildingAddon.getGarrison(unit) != null)
+            garrison = ActionButtons.ungarrison;
+        if (!worker && garrison != null)
+            commands.add(new Command<>(garrison, SLOT_F));
+
+        // workers: Q-T abilities, A-G commands, Z/X open the basic/advanced building tabs, which fill Q-G
+        // in a fixed order, so no building changes key when garrison or return resources appears
+        List<Button> abilities = new ArrayList<>();
+        List<Button> basic = new ArrayList<>();
+        List<Button> advanced = new ArrayList<>();
+        if (worker) {
+            abilities.add(garrison); // null keeps Q, so the rest stay put
+            if (entity instanceof VillagerUnit vUnit)
+                for (Ability ability : vUnit.getAbilities().get())
+                    if (ability instanceof CallToArmsUnit callToArms)
+                        abilities.add(callToArms.getButton(Keybindings.hotkey1, vUnit));
+        }
+        boolean showAbilities = TutorialClientEvents.isAtOrPastStage(TutorialStage.BUILD_INTRO) &&
+                (UnitClientEvents.getPlayerToEntityRelationship(first) == Relationship.OWNED
+                        || !PlayerClientEvents.isRTSPlayer() || ResearchClient.hasCheat("wouldyoukindly"))
+                || AlliancesClient.canControlAlly(first);
+        if (showAbilities)
+            for (Button b : unit.getAbilityButtons())
+                if ((!b.isHidden.get() || isUnlearnt(b)) && !(b instanceof AbilityButton ab && ab.ability instanceof CallToArmsUnit)) {
+                    if (b instanceof BuildingPlaceButton bp)
+                        (ADVANCED_BUILDINGS.contains(bp.building) ? advanced : basic).add(b);
+                    else
+                        abilities.add(b);
+                }
+
+        if (basic.isEmpty() && advanced.isEmpty())
+            return new Contents(commands, abilities);
+
+        List<Command<Button>> tabs = new ArrayList<>();
+        tabs.add(new Command<>(tabButton(1, "hud.reignofnether.card.basic", basic), SLOT_Z));
+        if (!advanced.isEmpty())
+            tabs.add(new Command<>(tabButton(2, "hud.reignofnether.card.advanced", advanced), SLOT_Z + 1));
+        if (tab == 0) {
+            commands.addAll(tabs);
+            return new Contents(commands, abilities);
+        }
+        List<Button> buildings = tab == 1 ? basic : advanced;
+        List<Button> overflow = new ArrayList<>();
+        for (int i = 0; i < buildings.size(); i++) {
+            if (i < SLOT_Z)
+                tabs.add(new Command<>(buildings.get(i), i)); // Q-T then A-G, row by row
+            else
+                overflow.add(buildings.get(i));
+        }
+        return new Contents(tabs, overflow);
+    }
+
+    // opens its tab, or goes back to the worker's commands when it's already open
+    private static Button tabButton(int n, String key, List<Button> buildings) {
+        return new ButtonBuilder(I18n.get(key))
+                .iconResource(buildings.isEmpty() ? null : buildings.get(0).iconResource)
+                .isSelected(() -> tab == n)
+                .onLeftClick(() -> {
+                    tab = tab == n ? 0 : n;
+                    page = 0;
+                })
+                .tooltipLines(List.of(MiscUtil.fcs(I18n.get(key)), MiscUtil.fcs(I18n.get(key + ".tooltip1"))))
+                .build();
+    }
+
+    private static boolean canReturnResources(LivingEntity entity, Unit unit) {
+        return entity instanceof Mob mob && mob.canPickUpLoot()
+                && Resources.getTotalResourcesFromItems(unit.getItems()).getTotalValue() > 0
+                && (UnitClientEvents.getPlayerToEntityRelationship(entity) == Relationship.OWNED || AlliancesClient.canControlAlly(entity));
+    }
+
+    private static Button returnResourcesButton(Unit unit) {
+        boolean carrying = Resources.getTotalResourcesFromItems(unit.getItems()).getTotalValue() > 0;
+        return new ButtonBuilder(I18n.get("hud.reignofnether.drop_off_resources"))
+                .isEnabled(() -> carrying)
+                .iconResource(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/chest.png"))
+                .isSelected(() -> unit.getReturnResourcesGoal().getBuildingTarget() != null)
+                .onLeftClick(() -> UnitClientEvents.sendUnitCommand(UnitAction.RETURN_RESOURCES_TO_CLOSEST))
+                .tooltipLines(carrying ? List.of(MiscUtil.fcs(I18n.get("hud.reignofnether.drop_off_resources")))
+                        : List.of(MiscUtil.fcs(I18n.get("hud.reignofnether.drop_off_resources")), MiscUtil.fcs(I18n.get("hud.reignofnether.drop_off_nothing"))))
+                .build();
+    }
+
+    private static String gatherKey = null; // icon + resource last applied, so render doesn't rebuild them every frame
+
+    private static void updateGatherButton(WorkerUnit worker) {
+        String icon = switch (worker.getGatherResourceGoal().getTargetResourceName()) {
+            case FOOD -> "hoe";
+            case WOOD -> "axe";
+            case ORE -> "pickaxe";
+            default -> "no_gather";
+        };
+        String resource = UnitClientEvents.getSelectedUnitResourceTarget().toString().toLowerCase(Locale.ENGLISH);
+        if ((icon + resource).equals(gatherKey))
+            return;
+        gatherKey = icon + resource;
+        ActionButtons.gather.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/" + icon + ".png");
+        ActionButtons.gather.tooltipLines = List.of(
+                MiscUtil.fcs(I18n.get("hud.reignofnether.gather_resources", I18n.get("resources.reignofnether." + resource))),
+                MiscUtil.fcs(I18n.get("hud.actionbuttons.reignofnether.gather.tooltip1")),
+                MiscUtil.fcs(I18n.get("hud.reignofnether.change_target_resource")));
+    }
+
+    private static Contents mobContents() {
+        List<Command<Button>> commands = new ArrayList<>();
+        if (NonUnitClientEvents.canAttack(UnitClientEvents.getSelectedUnits().get(0)))
+            commands.add(new Command<>(ActionButtons.attack, SLOT_A));
+        commands.add(new Command<>(ActionButtons.stop, SLOT_S));
+        return new Contents(commands, List.of());
+    }
+
+    private static Contents buildingContents(BuildingPlacement placement) {
+        boolean owned = BuildingClientEvents.getPlayerToBuildingRelationship(placement) == Relationship.OWNED
+                || SandboxClientEvents.isSandboxPlayer();
+        if (!owned && PlayerClientEvents.isRTSPlayer())
+            return Contents.EMPTY;
+
+        List<Command<Button>> commands = new ArrayList<>();
+        List<Button> abilities = new ArrayList<>();
+
+        if (!placement.isBuilt && !HelperButtons.buildingCancelButton.isHidden.get())
+            commands.add(new Command<>(HelperButtons.buildingCancelButton, SLOT_B));
+
+        if (placement.isBuilt || placement.allowProdWhileBuilding) {
+            // the stock is a tab like a worker's building lists: Z opens it and the items fill Q-G row by row,
+            // X picks the hero it sells to
+            if (ItemClientEvents.ENABLED && placement instanceof ItemShopPlacement shop && !shop.getStockedItems().isEmpty()) {
+                List<Command<Button>> tabs = new ArrayList<>();
+                tabs.add(new Command<>(shopTabButton(), SLOT_Z));
+                Button serving = servingButton(shop);
+                if (serving != null)
+                    tabs.add(new Command<>(serving, SLOT_Z + 1));
+                if (tab == SHOP_TAB) {
+                    List<Button> items = shopItemButtons(shop);
+                    List<Button> overflow = new ArrayList<>();
+                    for (int i = 0; i < items.size(); i++) {
+                        if (i < SLOT_Z)
+                            tabs.add(new Command<>(items.get(i), i));
+                        else
+                            overflow.add(items.get(i));
+                    }
+                    return new Contents(tabs, overflow);
+                }
+                commands.addAll(tabs);
+            }
+            boolean lab = placement.getBuilding() instanceof Laboratory;
+            if (placement instanceof ProductionPlacement prod)
+                for (Button b : prod.productionButtons)
+                    if (!b.isHidden.get()) {
+                        Integer slot = lab && b instanceof StartProductionButton sp ? LAB_SLOTS.get(sp.production) : null;
+                        if (slot != null)
+                            commands.add(new Command<>(b, slot));
+                        else
+                            abilities.add(b);
+                    }
+            if (placement.isBuilt)
+                for (AbilityButton b : placement.getAbilityButtons())
+                    if (b != null && !b.isHidden.get()) {
+                        Integer slot = b.ability instanceof TradeResources ? MARKET_SLOTS.get(b.ability.action) : null;
+                        commands.add(new Command<>(b, slot != null ? slot : lab ? LAB_LIGHTNING_SLOT : NO_PREFERENCE));
+                    }
+        }
+        return new Contents(commands, abilities);
+    }
+
+    private static final int SHOP_TAB = 3;
+
+    private static Button shopTabButton() {
+        return new ButtonBuilder(I18n.get("hud.reignofnether.card.shop"))
+                .iconResource(ButtonCell.ICON_EMERALD)
+                .isSelected(() -> tab == SHOP_TAB)
+                .onLeftClick(() -> {
+                    tab = tab == SHOP_TAB ? 0 : SHOP_TAB;
+                    page = 0;
+                })
+                .tooltipLines(List.of(MiscUtil.fcs(I18n.get("hud.reignofnether.card.shop")),
+                        MiscUtil.fcs(I18n.get("hud.reignofnether.card.shop.tooltip1"))))
+                .build();
+    }
+
+    /** The shop's stock, each one bought for the hero it serves. */
+    private static List<Button> shopItemButtons(ItemShopPlacement shop) {
+        List<Button> items = new ArrayList<>();
+        for (StockedShopItem stocked : shop.getStockedItems()) {
+            Button b = new UnitItemShopButton(stocked, shop);
+            if (!b.isHidden.get())
+                items.add(b);
+        }
+        return items;
+    }
+
+    /** The hero the shop sells to; clicking cycles through the heroes in range. */
+    private static Button servingButton(ItemShopPlacement shop) {
+        if (!(shop.getServedUnit() instanceof LivingEntity served))
+            return null;
+        String name = MiscUtil.capitaliseAndSpace(HudClientEvents.getModifiedEntityName(served));
+        String icon = MiscUtil.getEntityIconName(served) + (served.isVehicle() ? "_half.png" : ".png");
+        return new ButtonBuilder("Serving Unit")
+                .iconResource(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/mobheads/" + icon))
+                .tooltipLines(List.of(MiscUtil.fcs(I18n.get("itemshop.reignofnether.serving", name)),
+                        MiscUtil.fcs(I18n.get("itemshop.reignofnether.serving_hint"))))
+                .onLeftClick(shop::cycleServedUnit)
+                .build();
+    }
+
+    // market trades: selling each resource on the top row, buying it back right below it; buy trades stay
+    // hidden until the upgrade, leaving their slots empty so nothing moves
+    private static final Map<UnitAction, Integer> MARKET_SLOTS = Map.of(
+            UnitAction.SELL_FOOD, 0, UnitAction.SELL_WOOD, 1, UnitAction.SELL_ORE, 2,
+            UnitAction.BUY_FOOD, 5, UnitAction.BUY_WOOD, 6, UnitAction.BUY_ORE, 7);
+
+    /**
+     * Laboratory researches in fixed slots, grouped by what unlocks them, so a finished research leaves a gap
+     * instead of moving the rest: Graveyard on the top row, Spider Lair and the free ones in the middle, Stronghold
+     * at the bottom. Lightning Rod and the Call Lightning it unlocks share T.
+     */
+    private static final int LAB_LIGHTNING_SLOT = 4;
+    private static final Map<ProductionItem, Integer> LAB_SLOTS = Map.ofEntries(
+            Map.entry(ProductionItems.RESEARCH_HUSKS, 0),
+            Map.entry(ProductionItems.RESEARCH_DROWNED, 1),
+            Map.entry(ProductionItems.RESEARCH_STRAYS, 2),
+            Map.entry(ProductionItems.RESEARCH_BOGGED, 3),
+            Map.entry(ProductionItems.RESEARCH_LAB_LIGHTNING_ROD, LAB_LIGHTNING_SLOT),
+            Map.entry(ProductionItems.RESEARCH_SPIDER_JOCKEYS, 5),
+            Map.entry(ProductionItems.RESEARCH_POISON_SPIDERS, 6),
+            Map.entry(ProductionItems.RESEARCH_SPIDER_WEBS, 7),
+            Map.entry(ProductionItems.RESEARCH_SLIME_CONVERSION, 8),
+            Map.entry(ProductionItems.RESEARCH_POSSESSION, 9),
+            Map.entry(ProductionItems.RESEARCH_SILVERFISH, 10),
+            Map.entry(ProductionItems.RESEARCH_SCULK_AMPLIFIERS, 11),
+            Map.entry(ProductionItems.RESEARCH_MASS_BURIAL, 12));
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/HudFrame.java b/src/main/java/com/solegendary/reignofnether/hud/panels/HudFrame.java
new file mode 100644
index 000000000..980392314
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/HudFrame.java
@@ -0,0 +1,214 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.hud.buttons.AbstractUnitItemButton;
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.keybinds.Keybinding;
+import com.solegendary.reignofnether.ui.HudScale;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Tooltip;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.sounds.SoundEvents;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+import java.util.function.Supplier;
+
+/**
+ * Everything the HUD drew in one frame, in HUD units: the areas that block world clicks and every
+ * clickable element with its rectangle, hotkey and tooltip. Clicks, hotkeys and tooltips are all
+ * resolved here, so exactly one element reacts to a click or key press.
+ */
+public final class HudFrame {
+
+    public final GuiGraphics g;
+    public final HudScale scale;
+    public final HudLayout layout;
+    public final int mouseX;
+    public final int mouseY;
+
+    private final List<Zone> zones = new ArrayList<>();
+    private final List<Placed> placed = new ArrayList<>();
+    private final Map<Integer, Button> altKeys = new HashMap<>();
+
+    /**
+     * @param key     hotkey that triggers it (null: none)
+     * @param tooltip tooltip shown on hover (null: the button's own legacy tooltip)
+     */
+    public record Placed(Button button, Rect rect, @Nullable Keybinding key, @Nullable Supplier<Tooltip> tooltip,
+                         @Nullable Runnable altAction) { }
+
+    /** @param placedBefore how many elements were registered before it: those are drawn underneath */
+    private record Zone(Rect rect, int placedBefore) { }
+
+    public HudFrame(GuiGraphics g, HudScale scale, HudLayout layout, int mouseX, int mouseY) {
+        this.g = g;
+        this.scale = scale;
+        this.layout = layout;
+        this.mouseX = mouseX;
+        this.mouseY = mouseY;
+    }
+
+    public boolean hovered(Rect r) {
+        return r.contains(mouseX, mouseY);
+    }
+
+    public boolean hovered(int x, int y, int w, int h) {
+        return mouseX >= x && mouseY >= y && mouseX < x + w && mouseY < y + h;
+    }
+
+    /**
+     * Marks an area as HUD so clicks there don't reach the world or anything registered before it.
+     * Call it before registering the panel's own elements.
+     */
+    public void zone(Rect r) {
+        zones.add(new Zone(r, placed.size()));
+    }
+
+    public void zone(int x, int y, int w, int h) {
+        zone(new Rect(x, y, w, h));
+    }
+
+    /** Registers a clickable area drawn by the caller. */
+    public void register(Button b, Rect r, @Nullable Keybinding key, @Nullable Supplier<Tooltip> tooltip) {
+        b.x = r.x();
+        b.y = r.y();
+        b.drawnSize = r.w();
+        placed.add(new Placed(b, r, key, tooltip, null));
+    }
+
+    /** Registers a clickable area whose hotkey runs altAction instead when Alt is held (hero rank-up). */
+    public void register(Button b, Rect r, @Nullable Keybinding key, @Nullable Supplier<Tooltip> tooltip, @Nullable Runnable altAction) {
+        b.x = r.x();
+        b.y = r.y();
+        b.drawnSize = r.w();
+        placed.add(new Placed(b, r, key, tooltip, altAction));
+    }
+
+    /** Binds Alt + key to a button, ahead of whatever else uses the key this frame. */
+    public void altKey(Keybinding key, Button b) {
+        altKeys.put(key.getKey(), b);
+    }
+
+    /** Draws a button as a HUD cell and registers it. The key decides both the label and the trigger. */
+    public void cell(Button b, int x, int y, int size, @Nullable Keybinding key) {
+        cell(b, x, y, size, key, null);
+    }
+
+    public void cell(Button b, int x, int y, int size, @Nullable Keybinding key, @Nullable Runnable altAction) {
+        String label = key != null ? key.getCurrentLabel() : null;
+        Rect r = new Rect(x, y, size, size);
+        ButtonCell.render(g, b, x, y, size, label, hovered(r));
+        register(b, r, key, () -> ButtonCell.tooltipFor(b, label), altAction);
+    }
+
+    /** Same as {@link #cell} using the button's own hotkey. */
+    public void cell(Button b, int x, int y, int size) {
+        cell(b, x, y, size, b.hotkey);
+    }
+
+    public List<Placed> placed() {
+        return placed;
+    }
+
+    public boolean isOverHud(int ux, int uy) {
+        for (Zone z : zones)
+            if (z.rect().contains(ux, uy))
+                return true;
+        return buttonAt(ux, uy) != null;
+    }
+
+    @Nullable
+    public Placed buttonAt(int ux, int uy) {
+        // last registered is drawn on top
+        for (int i = placed.size() - 1; i >= 0; i--)
+            if (placed.get(i).rect().contains(ux, uy))
+                return isCovered(i, ux, uy) ? null : placed.get(i);
+        return null;
+    }
+
+    private boolean isCovered(int index, int ux, int uy) {
+        for (Zone z : zones)
+            if (z.placedBefore() > index && z.rect().contains(ux, uy))
+                return true;
+        return false;
+    }
+
+    /** Queues the tooltip of the hovered element; drawn at the end of the frame. */
+    public void showHoveredTooltip() {
+        Placed p = buttonAt(mouseX, mouseY);
+        if (p == null)
+            return;
+        Button b = p.button();
+        // items, effects and buttons without their own HUD tooltip restyle their legacy one
+        Tooltip t = b instanceof AbstractUnitItemButton || p.tooltip() == null ? b.hudTooltip() : p.tooltip().get();
+        if (t != null)
+            t.show(p.rect().x(), p.rect().y(), p.rect().w(), p.rect().h());
+    }
+
+    /** @return true if a button took the click */
+    public boolean click(int ux, int uy, boolean left) {
+        Placed p = buttonAt(ux, uy);
+        if (p == null || !p.button().isEnabled.get())
+            return false;
+        Runnable action = left ? p.button().onLeftClick : p.button().onRightClick;
+        if (action == null)
+            return false;
+        playClick();
+        p.button().pressedMs = System.currentTimeMillis();
+        action.run();
+        return true;
+    }
+
+    public boolean release(int ux, int uy) {
+        Placed p = buttonAt(ux, uy);
+        if (p == null || p.button().onLeftClickRelease == null || !p.button().isEnabled.get())
+            return false;
+        p.button().onLeftClickRelease.run();
+        return true;
+    }
+
+    /**
+     * Fires the first element bound to this key; with Ctrl held on an autocast ability, toggles its autocast
+     * instead (what a right-click does). @return true if one fired
+     */
+    public boolean press(int keyCode, boolean altDown, boolean ctrlDown) {
+        Button alt = altDown ? altKeys.get(keyCode) : null;
+        if (alt != null) {
+            playClick();
+            alt.pressedMs = System.currentTimeMillis();
+            alt.pressHotkey();
+            return true;
+        }
+        for (Placed p : placed) {
+            if (p.key() == null || p.key().getKey() != keyCode)
+                continue;
+            if (altDown && p.altAction() != null) {
+                playClick();
+                p.altAction().run();
+                return true;
+            }
+            Button b = p.button();
+            if (!b.isEnabled.get())
+                return true; // the key belongs to this button even if it can't be used right now
+            playClick();
+            b.pressedMs = System.currentTimeMillis();
+            if (ctrlDown && ButtonCell.canAutocast(b))
+                b.onRightClick.run(); // other buttons keep whatever Ctrl + key did before (queueing several...)
+            else
+                b.pressHotkey();
+            return true;
+        }
+        return false;
+    }
+
+    private static void playClick() {
+        var player = Minecraft.getInstance().player;
+        if (player != null)
+            player.playSound(SoundEvents.UI_BUTTON_CLICK.get(), 0.2f, 1.0f);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/MapZoom.java b/src/main/java/com/solegendary/reignofnether/hud/panels/MapZoom.java
new file mode 100644
index 000000000..d4b80514b
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/MapZoom.java
@@ -0,0 +1,65 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.ui.Icon;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import net.minecraft.client.resources.language.I18n;
+
+import java.util.function.IntConsumer;
+
+/** Zoom level of a map view (1 = the whole map) with its + and − buttons. */
+public final class MapZoom {
+
+    private static final float[] STEPS = { 1f, 1.5f, 2f, 3f, 4f };
+
+    private int index;
+    private IntConsumer wideStep = null; // steps past the whole map: the map itself covers more world
+    private int wideSteps = 0;
+    private int wide = 0;
+
+    public MapZoom(float start) {
+        for (int i = 0; i < STEPS.length; i++)
+            if (STEPS[i] == start)
+                index = i;
+    }
+
+    /** Adds zoom outs past the last step, handled by the owner of the map. */
+    public MapZoom withWideSteps(int steps, IntConsumer wideStep) {
+        this.wideSteps = steps;
+        this.wideStep = wideStep;
+        return this;
+    }
+
+    private void setWide(int value) {
+        wide = value;
+        wideStep.accept(value);
+    }
+
+    public float value() {
+        return STEPS[index];
+    }
+
+    public void renderIn(HudFrame f, int x, int y, int size) {
+        if (wide > 0)
+            button(f, true, x, y, size, true, () -> setWide(wide - 1));
+        else
+            button(f, true, x, y, size, index < STEPS.length - 1, () -> index++);
+    }
+
+    public void renderOut(HudFrame f, int x, int y, int size) {
+        if (wideStep != null && index == 0)
+            button(f, false, x, y, size, wide < wideSteps, () -> setWide(wide + 1));
+        else
+            button(f, false, x, y, size, index > 0, () -> index--);
+    }
+
+    private static void button(HudFrame f, boolean in, int x, int y, int size, boolean enabled, Runnable action) {
+        Rect r = new Rect(x, y, size, size);
+        Theme.secondaryButton(f.g, x, y, size, size, enabled && f.hovered(r));
+        (in ? Icon.ZOOM_IN : Icon.ZOOM_OUT).drawIn(f.g, x + 3, y + 3, size - 6, size - 6, enabled ? Theme.BODY : Theme.FAINT);
+        f.register(new ButtonBuilder(in ? "map zoom in" : "map zoom out").isEnabled(() -> enabled).onLeftClick(action).build(), r, null,
+                () -> Tooltip.of(I18n.get(in ? "hud.reignofnether.map.zoom_in" : "hud.reignofnether.map.zoom_out")));
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/MinimapTools.java b/src/main/java/com/solegendary/reignofnether/hud/panels/MinimapTools.java
new file mode 100644
index 000000000..c7266ab8b
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/MinimapTools.java
@@ -0,0 +1,61 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.keybinds.Keybinding;
+import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.minimap.MinimapClientEvents;
+import com.solegendary.reignofnether.minimap.StrategicMapClientEvents;
+import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
+import com.solegendary.reignofnether.ui.Icon;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import net.minecraft.client.resources.language.I18n;
+
+/**
+ * The map controls: lock, zoom in, zoom out and the two turn buttons in a column left of the minimap, with its expand
+ * button on the corner. The big map adds the display toggles that matter mid-match, all in a row below it; the rest
+ * are in the settings menu.
+ */
+public final class MinimapTools {
+
+    private MinimapTools() { }
+
+    public static void render(HudFrame f) {
+        HudLayout l = f.layout;
+        int size = HudLayout.TOOL;
+        boolean big = HudGeometry.isBigMap();
+        f.zone(l.tools());
+        // Alt + arrow is handled in OrthoviewClientEvents (it needs Alt held), so the tiles carry no key
+        f.cell(MinimapClientEvents.getMapLockButton(), l.toolX(0), l.toolY(0), size, null);
+        MinimapClientEvents.ZOOM.renderIn(f, l.toolX(1), l.toolY(1), size);
+        MinimapClientEvents.ZOOM.renderOut(f, l.toolX(2), l.toolY(2), size);
+        f.cell(MinimapClientEvents.getCameraRotateCCWButton(), l.toolX(3), l.toolY(3), size, null);
+        f.cell(MinimapClientEvents.getCameraRotateCWButton(), l.toolX(4), l.toolY(4), size, null);
+
+        if (big) {
+            f.cell(MinimapClientEvents.getHighlightAnimalsButton(), l.toolX(5), l.toolY(5), size, null);
+            f.cell(OrthoviewClientEvents.getLeavesHidingButton(), l.toolX(6), l.toolY(6), size, null);
+            f.cell(MinimapClientEvents.getCamSensitivityButton(), l.toolX(7), l.toolY(7), size, null);
+            toggle(f, l.toolX(8), l.toolY(8), Icon.SATELLITE, StrategicMapClientEvents.isOpen(), "key.reignofnether.satellite", Keybindings.satellite,
+                    StrategicMapClientEvents::toggle);
+        }
+        int x = big ? l.toolX(9) : l.minimap().right() - size;
+        int y = big ? l.toolY(9) : l.minimap().bottom() - size;
+        f.zone(new Rect(x, y, size, size));
+        toggle(f, x, y, big ? Icon.SHRINK : Icon.EXPAND, big, "key.reignofnether.big_map", Keybindings.bigMap,
+                () -> HudGeometry.setBigMap(!big));
+    }
+
+    /** Its key is handled in PlayerDisplayClientEvents, so it works while the HUD is hidden too. */
+    private static void toggle(HudFrame f, int x, int y, Icon icon, boolean on, String name, Keybinding key, Runnable action) {
+        int size = HudLayout.TOOL;
+        Rect r = new Rect(x, y, size, size);
+        Theme.secondaryButton(f.g, x, y, size, size, f.hovered(r));
+        icon.drawIn(f.g, x + 3, y + 3, size - 6, size - 6, on ? Theme.GOLD : Theme.BODY);
+        f.register(new ButtonBuilder(name).onLeftClick(action).build(), r, null,
+                () -> Tooltip.of(I18n.get(name)).key(key.getCurrentLabel()));
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/SelectionPanel.java b/src/main/java/com/solegendary/reignofnether/hud/panels/SelectionPanel.java
new file mode 100644
index 000000000..e5961ecb4
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/SelectionPanel.java
@@ -0,0 +1,1105 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.alliance.AlliancesClient;
+import com.solegendary.reignofnether.api.ReignOfNetherRegistries;
+import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.building.BuildingPlacement;
+import com.solegendary.reignofnether.building.addon.NightSourceAddon;
+import com.solegendary.reignofnether.building.buildings.monsters.SculkCatalyst;
+import com.solegendary.reignofnether.building.buildings.placements.ProductionPlacement;
+import com.solegendary.reignofnether.building.buildings.placements.SculkCatalystPlacement;
+import com.solegendary.reignofnether.building.custombuilding.CustomBuilding;
+import com.solegendary.reignofnether.building.production.ActiveProduction;
+import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.hud.PortraitRendererBuilding;
+import com.solegendary.reignofnether.hud.PortraitRendererUnit;
+import com.solegendary.reignofnether.hud.PortraitRendererUnit.Stat;
+import com.solegendary.reignofnether.hud.RegenInfo;
+import com.solegendary.reignofnether.ability.HeroAbility;
+import com.solegendary.reignofnether.hud.buttons.AbilityButton;
+import com.solegendary.reignofnether.hud.buttons.AbstractUnitItemButton;
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.buttons.UnitItemInventoryButton;
+import com.solegendary.reignofnether.hud.effecticons.MobEffectIcon;
+import com.solegendary.reignofnether.hud.effecticons.ProfessionIcon;
+import com.solegendary.reignofnether.hud.effecticons.ProfessionIcons;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.items.ItemClientEvents;
+import com.solegendary.reignofnether.items.UnitInventory;
+import com.solegendary.reignofnether.items.unititems.EmptyUnitItem;
+import com.solegendary.reignofnether.keybinds.Keybinding;
+import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.player.PlayerClientEvents;
+import com.solegendary.reignofnether.player.PlayerColors;
+import com.solegendary.reignofnether.resources.ResourceSources;
+import com.solegendary.reignofnether.resources.Resources;
+import com.solegendary.reignofnether.ui.Clip;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.time.TimeUtils;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import com.solegendary.reignofnether.unit.NonUnitClientEvents;
+import com.solegendary.reignofnether.unit.Relationship;
+import com.solegendary.reignofnether.unit.UnitClientEvents;
+import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
+import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
+import com.solegendary.reignofnether.unit.units.villagers.VillagerUnit;
+import com.solegendary.reignofnether.unit.units.villagers.VillagerUnitProfession;
+import com.solegendary.reignofnether.util.LanguageUtil;
+import com.solegendary.reignofnether.util.MiscUtil;
+import com.solegendary.reignofnether.util.MyRenderer;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.animal.Animal;
+import net.minecraft.world.entity.player.Player;
+
+import javax.annotation.Nullable;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * The middle of the HUD bar: what is selected, in fixed columns. The portrait with health below it, stats, item
+ * slots, then what depends on the selection: an army (type stacks with counts plus the units of the active type),
+ * a production queue, or several buildings, and the carried resources last. The name sits in a tab above the bar.
+ */
+public final class SelectionPanel {
+
+    private SelectionPanel() { }
+
+    // sizes are the design's at half scale
+    private static final int PORTRAIT_W = 85;
+    private static final int STATS_W = 44;
+    private static final int MAX_STATS = 5; // rows are this size for every unit, however few stats it has
+    private static final int BUILDING_INFO_W = 75;
+    private static final int SLOT = 32; // three rows fill the bar's height
+    private static final int SLOT_GAP = 4;
+    private static final int SLOTS_W = 2 * SLOT + SLOT_GAP;
+    private static final int GATHER_W = 40;
+    private static final int MIN_SEGMENT_H = 10; // fits a resource's number
+    private static final int SEP = 13; // between columns: a gap, the divider and a gap
+    private static final int MID_MIN = 160;
+    private static final int MID_MAX = 385;
+    private static final int TRAINING_W = 260;
+    private static final int STACK_W = 58;
+    private static final int STACK_H = 31;
+    private static final int PIPS_W = 22; // four ability marks: the bars of a unit stack match them
+    private static final int ARMY_STACK_W = 24 + PIPS_W + 4;
+    private static final int MORE_W = 24;
+    private static final int TILE = HudLayout.TILE_SMALL;
+    private static final int GAP = 5;
+    private static final int HP_H = 12;
+    private static final int MANA_H = 10;
+    private static final int XP_H = 4;
+    private static final int STAT_GAP = 3;
+    private static final int EFFECT = 25;
+    private static final float NAME = Text.px(20); // medium: the body size
+    private static final DecimalFormat REGEN_FORMAT = new DecimalFormat("+0.##;-0.##", DecimalFormatSymbols.getInstance(Locale.US));
+
+    // where the portrait was drawn, so holding the mouse on it can follow the unit
+    private static Rect portraitRect = Rect.EMPTY;
+    // where what floats above the bar ends, so the item shop stays clear of it
+    private static int floatingTop = 0;
+
+    public static int floatingTop() {
+        return floatingTop;
+    }
+
+    public static Rect portraitRect() {
+        return portraitRect;
+    }
+
+    /** What is selected this frame, grouped once: the names cost several translation lookups each. */
+    private record Selection(@Nullable BuildingPlacement building, @Nullable LivingEntity entity,
+                             List<BuildingPlacement> buildings, boolean buildingStacks, List<LivingEntity> army,
+                             Map<String, List<BuildingPlacement>> buildingTypes, Map<String, List<LivingEntity>> armyTypes,
+                             boolean carrying) { }
+
+    private static Selection selection;
+
+    /** Call once a frame before {@link #width} and {@link #render}. */
+    public static void prepare() {
+        BuildingPlacement building = HudClientEvents.hudSelectedPlacement;
+        LivingEntity entity = HudClientEvents.hudSelectedEntity;
+        List<BuildingPlacement> buildings = BuildingClientEvents.getSelectedBuildings();
+        boolean buildingStacks = building != null && buildings.size() >= 2
+                && BuildingClientEvents.getPlayerToBuildingRelationship(building) == Relationship.OWNED;
+        List<LivingEntity> army = building == null ? controllableSelection() : List.of();
+        Map<String, List<BuildingPlacement>> buildingTypes = buildingStacks ? groupBy(buildings, SelectionPanel::buildingName) : Map.of();
+        Map<String, List<LivingEntity>> armyTypes = building == null && army.size() >= 2
+                ? groupBy(army, HudClientEvents::getModifiedEntityName) : Map.of();
+        boolean carrying = building == null && entity != null
+                && (army.size() >= 2 ? army : List.of(entity)).stream().anyMatch(e -> e instanceof WorkerUnit || carried(e) != null);
+        selection = new Selection(building, entity, buildings, buildingStacks, army, buildingTypes, armyTypes, carrying);
+    }
+
+    private static boolean showsSlots(Selection s) {
+        return s.building() == null && ItemClientEvents.shouldRenderUnitInventory(s.entity());
+    }
+
+    private static boolean showsInfo(HudFrame f, Selection s) {
+        if (f.layout.compact())
+            return false;
+        return s.building() != null ? showsRange(s.building()) : s.entity() instanceof Unit;
+    }
+
+    /** Small screens need the room for the group, so there it only shows for one unit. */
+    private static boolean canShowGathering(HudFrame f, Selection s) {
+        return (s.entity() instanceof Unit || ResourceSources.isHuntableAnimal(s.entity()))
+                && (!f.layout.compact() || s.army().size() < 2);
+    }
+
+    private static boolean showsGathering(HudFrame f, Selection s) {
+        return s.carrying() && canShowGathering(f, s);
+    }
+
+    private static int infoWidth(Selection s) {
+        return s.building() != null ? BUILDING_INFO_W : STATS_W;
+    }
+
+    private static int columnsWidth(HudFrame f, Selection s) {
+        return PORTRAIT_W + (showsInfo(f, s) ? SEP + infoWidth(s) : 0) + (showsSlots(s) ? SEP + SLOTS_W : 0)
+                + (showsGathering(f, s) ? SEP + GATHER_W : 0);
+    }
+
+    private static boolean showsTraining(Selection s) {
+        return s.building() instanceof ProductionPlacement prod && hasProduction(prod) && !s.buildingStacks()
+                && (s.building().isBuilt || s.building().allowProdWhileBuilding)
+                && (BuildingClientEvents.getPlayerToBuildingRelationship(s.building()) == Relationship.OWNED || !PlayerClientEvents.isRTSPlayer());
+    }
+
+    /** False once a building has nothing left to produce, like a stockpile with all its research done. */
+    private static boolean hasProduction(ProductionPlacement prod) {
+        return !prod.productionQueue.isEmpty() || prod.productionButtons.stream().anyMatch(b -> !b.isHidden.get());
+    }
+
+    /** How wide the part right of the columns wants to be; 0 when it has nothing to show. */
+    private static int midWidth(HudFrame f, Selection s) {
+        // its room is kept for the resources even before there are any, so they never change its width
+        int room = f.layout.selection().w() - columnsWidth(f, s) - SEP
+                - (canShowGathering(f, s) && !showsGathering(f, s) ? SEP + GATHER_W : 0);
+        int want = 0;
+        if (s.buildingStacks())
+            want = Math.max(MID_MIN, s.buildingTypes().size() * (STACK_W + GAP) - GAP);
+        else if (showsTraining(s))
+            want = TRAINING_W;
+        else if (s.army().size() >= 2 && s.entity() != null) {
+            int active = s.armyTypes().getOrDefault(HudClientEvents.getModifiedEntityName(s.entity()), List.of()).size();
+            want = Math.max(MID_MIN, Math.max(s.armyTypes().size() * (ARMY_STACK_W + GAP) - GAP, active * (TILE + 4) - 4));
+        }
+        return Math.max(0, Math.min(Math.min(want, MID_MAX), room));
+    }
+
+    /** With nothing selected the bar only holds the command card. */
+    public static boolean isEmpty() {
+        return selection.building() == null && selection.entity() == null;
+    }
+
+    /** Width of everything drawn, so the bar can end right after it on wide screens. */
+    public static int width(HudFrame f) {
+        int mid = midWidth(f, selection);
+        return columnsWidth(f, selection) + (mid > 0 ? SEP + mid : 0);
+    }
+
+    /** One column after another, each with a divider before it; the portrait column is always there. */
+    public static void render(HudFrame f) {
+        portraitRect = Rect.EMPTY;
+        floatingTop = f.layout.console().y();
+        Selection s = selection;
+        Rect room = f.layout.selection();
+        if (room.w() <= 0)
+            return;
+        if (isEmpty())
+            return;
+        int x = room.x();
+        if (s.building() != null)
+            renderBuildingPortrait(f, s.building(), x, room.y(), room.h());
+        else
+            renderUnitPortrait(f, s.entity(), x, room.y(), room.h());
+        x += PORTRAIT_W;
+
+        if (showsInfo(f, s)) {
+            x = column(f, x, room);
+            if (s.building() != null)
+                renderBuildingInfo(f, s.building(), x, room.y(), BUILDING_INFO_W);
+            else
+                renderUnitInfo(f, s.entity(), x, room.y(), STATS_W, room.h());
+            x += infoWidth(s);
+        }
+        if (showsSlots(s)) {
+            x = column(f, x, room);
+            renderSlots(f, s.entity(), x, room.y());
+            x += SLOTS_W;
+        }
+        int mid = midWidth(f, s);
+        if (mid > 0) {
+            x = column(f, x, room);
+            Rect r = new Rect(x, room.y(), mid, room.h());
+            if (s.buildingStacks())
+                renderBuildingStacks(f, r, s.buildings(), s.buildingTypes());
+            else if (s.building() != null)
+                renderTraining(f, (ProductionPlacement) s.building(), BuildingClientEvents.getPlayerToBuildingRelationship(s.building()) == Relationship.OWNED, r.x(), r.y(), r.w(), r.h());
+            else
+                renderArmy(f, r, s.army(), s.armyTypes());
+            x += mid;
+        }
+        // last, so picking up resources never moves the group
+        if (showsGathering(f, s)) {
+            x = column(f, x, room);
+            renderGathering(f, s.entity(), s.army().size() >= 2 ? s.army() : List.of(s.entity()), x, room.y(), room.h());
+        }
+        int barTop = f.layout.console().y();
+        int tabH = s.building() != null
+                ? renderNameTab(f, buildingName(s.building()), s.building().ownerName, 0, room.x(), barTop)
+                : renderNameTab(f, displayName(s.entity()), owner(s.entity()), s.entity() instanceof HeroUnit hero ? hero.getHeroLevel() : 0, room.x(), barTop);
+        floatingTop = barTop - tabH;
+        if (s.building() == null && s.army().size() < 2 && s.entity() instanceof Unit u)
+            floatingTop = renderEffects(f, u, room.x(), barTop - tabH);
+    }
+
+    /** Draws the divider after the column ending at x and returns where the next one starts. */
+    private static int column(HudFrame f, int x, Rect room) {
+        Theme.divider(f.g, x + SEP / 2, room.y(), 1, room.h());
+        return x + SEP;
+    }
+
+    /** Level, name and owner on the bar's top edge, from the portrait's left. The tab grows with the text, so long names are never cut off. */
+    private static int renderNameTab(HudFrame f, String name, @Nullable String owner, int level, int x, int barTop) {
+        String who = owner == null || owner.isBlank() ? "" : isMe(owner) ? I18n.get("hud.reignofnether.you") : owner;
+        String lv = level > 0 ? I18n.get("hud.reignofnether.level_short", level) : "";
+        int lvW = lv.isEmpty() ? 0 : Text.bigWidth(lv, NAME) + 5;
+        int nameW = lvW + Text.bigWidth(name, NAME);
+        int whoW = who.isEmpty() ? 0 : Text.smallWidth(who);
+        int room = f.layout.width() - x - 4;
+        int inline = nameW + (whoW > 0 ? 5 + whoW : 0);
+        boolean oneLine = inline + 10 <= room;
+        int nameH = Text.bigHeight(NAME);
+        int h = nameH + 6 + (oneLine || whoW == 0 ? 0 : 10);
+        int w = Math.min(room, 10 + (oneLine ? inline : Math.max(nameW, whoW)));
+        int y = barTop - h;
+        Theme.panel(f.g, x, y, w, h, Theme.floating());
+        f.zone(new Rect(x, y, w, h));
+        Text.big(f.g, lv, x + 5, y + 3, Theme.MUTED, NAME);
+        Text.big(f.g, name, x + 5 + lvW, y + 3, Theme.TEXT, NAME);
+        if (whoW > 0)
+            Text.small(f.g, who, oneLine ? x + 10 + nameW : x + 5, oneLine ? y + nameH - 6 : y + nameH + 4, Theme.GOLD);
+        return h;
+    }
+
+    /** Effects float in a row above the name tab, so gaining or losing one never resizes it. Returns the top of what was drawn. */
+    private static int renderEffects(HudFrame f, Unit u, int left, int barTop) {
+        int ix = left;
+        int iy = barTop - EFFECT - 3;
+        // a villager still learning has no profession icon yet: its progress gets a tile all the same
+        if (u instanceof VillagerUnit v && !v.hasUnitProfession() && professionShown(v) != VillagerUnitProfession.NONE) {
+            Button learning = ProfessionIcons.getProfessionIcon(professionShown(v), false);
+            effectTile(f, (LivingEntity) u, learning, ix, iy);
+            f.register(new ButtonBuilder("profession").build(), new Rect(ix, iy, EFFECT, EFFECT), null, () -> professionTooltip(v));
+            ix += EFFECT + 3;
+        }
+        for (Button icon : passiveIcons(u)) {
+            effectTile(f, (LivingEntity) u, icon, ix, iy);
+            ix += EFFECT + 3;
+        }
+        return ix > left ? iy : barTop;
+    }
+
+    private static List<LivingEntity> controllableSelection() {
+        List<LivingEntity> list = new ArrayList<>();
+        for (LivingEntity e : UnitClientEvents.getSortedSelectedUnits())
+            if (UnitClientEvents.getPlayerToEntityRelationship(e) == Relationship.OWNED
+                    || NonUnitClientEvents.canControlAllMobs() || AlliancesClient.canControlAlly(e))
+                list.add(e);
+        return list;
+    }
+
+    // ------------------------------------------------------------------ names
+
+    /** Capitalised display name of an entity, as used across the HUD. */
+    public static String displayName(LivingEntity e) {
+        if (e.hasCustomName() && e.getCustomName() != null)
+            return e.getCustomName().getString();
+        return MiscUtil.capitaliseAndSpace(HudClientEvents.getModifiedEntityName(e).replace("_", " "));
+    }
+
+    public static String buildingName(BuildingPlacement b) {
+        if (b.getUpgradeLevel() > 0)
+            return b.getUpgradedName();
+        if (b.getBuilding() instanceof CustomBuilding cb)
+            return cb.name;
+        ResourceLocation key = ReignOfNetherRegistries.BUILDING.getKey(b.getBuilding());
+        return key != null ? LanguageUtil.getTranslation("buildings." + key.getNamespace() + "." + key.getPath()) : "";
+    }
+
+    private static ResourceLocation headIcon(LivingEntity e) {
+        String name = MiscUtil.getEntityIconName(e);
+        // these professions change the head (hat, eyepatch); the others only the body
+        if (e instanceof VillagerUnit v && switch (v.getUnitProfession()) { case FARMER, LUMBERJACK, HUNTER -> true; default -> false; })
+            name += "_" + v.getUnitProfession().name().toLowerCase(Locale.ROOT);
+        return MiscUtil.mobHeadIcon(e.isVehicle() && e instanceof Unit ? name + "_half" : name);
+    }
+
+    private static final Map<ResourceLocation, Boolean> HEAD_EXISTS = new HashMap<>();
+
+    /** Mobs from other mods have no head icon, so they get the first two letters of their name. */
+    private static void renderHead(HudFrame f, LivingEntity e, int x, int y, int size) {
+        ResourceLocation icon = headIcon(e);
+        if (HEAD_EXISTS.computeIfAbsent(icon, i -> Minecraft.getInstance().getResourceManager().getResource(i).isPresent())) {
+            MyRenderer.renderIcon(f.g, icon, x, y, size);
+            return;
+        }
+        String name = displayName(e);
+        Text.drawCentered(f.g, name.substring(0, Math.min(2, name.length())), x + size / 2, y + (size - 8) / 2, Theme.TEXT);
+    }
+
+    // ------------------------------------------------------------------ portrait
+
+    // ownerless portraits (neutral mobs, resources) get a plain blue backdrop
+    private static final int NEUTRAL_TOP = 0x2A5F8C;
+    private static final int NEUTRAL_BOTTOM = 0x132A40;
+
+    /** See-through, unless panels are solid. */
+    private static int backdropAlpha() {
+        return Theme.floating() == Theme.FLOATING ? 0x80000000 : 0xFF000000;
+    }
+
+    private static void portraitFrame(HudFrame f, int x, int y, int w, int h, @Nullable String owner) {
+        int colour = owner != null ? PlayerColors.getPlayerPortraitDisplayColorHex(owner) & 0xFFFFFF : 0;
+        int alpha = backdropAlpha();
+        int top = alpha | (colour == 0 ? NEUTRAL_TOP : colour);
+        int bottom = alpha | (colour == 0 ? NEUTRAL_BOTTOM : MiscUtil.shadeHexRGB(colour, 0.45f) & 0xFFFFFF);
+        Theme.outline(f.g, x, y, w, h, 1, Theme.INK);
+        f.g.fillGradient(x, y, x + w, y + h, top, bottom);
+        f.g.fill(x, y, x + w, y + 1, 0x24FFFFFF);
+    }
+
+    private static void drawEntityPortrait(HudFrame f, LivingEntity e, int x, int y, int w, int h) {
+        portraitFrame(f, x, y, w, h, owner(e));
+        var renderer = HudClientEvents.portraitRendererUnit;
+        Clip.push(f.g, x, y, w, h);
+        if (renderer.model != null && renderer.renderer != null)
+            renderer.drawEntity(f.g, e, x, y, w, h);
+        else
+            renderHead(f, e, x + (w - 32) / 2, y + (h - 32) / 2, 32);
+        Clip.pop(f.g);
+        portraitRect = new Rect(x, y, w, h);
+        f.zone(portraitRect);
+    }
+
+    @Nullable
+    private static String owner(LivingEntity e) {
+        return e instanceof Unit u ? u.getOwnerName() : e instanceof Player p ? p.getName().getString() : null;
+    }
+
+    // ------------------------------------------------------------------ one unit
+
+    /** Portrait with the health below it, then mana for heroes; experience runs along the portrait's bottom edge. */
+    private static void renderUnitPortrait(HudFrame f, LivingEntity e, int x, int y, int h) {
+        HeroUnit hero = e instanceof HeroUnit he ? he : null;
+        int portraitH = h - HP_H - 3 - (hero != null ? MANA_H + 2 : 0);
+        drawEntityPortrait(f, e, x, y, PORTRAIT_W, portraitH);
+        int by = y + portraitH + 3;
+        healthBar(f, x, by, PORTRAIT_W, HP_H, e.getHealth() + e.getAbsorptionAmount(),
+                e.getMaxHealth() + (e.getAbsorptionAmount() > 0 ? MiscUtil.getMaxAbsorptionAmount(e) : 0));
+        regenTooltip(f, new Rect(x, by, PORTRAIT_W, HP_H), "hud.reignofnether.bar.health", (int) e.getHealth() + " / " + (int) e.getMaxHealth(), RegenInfo.health(e));
+        if (hero == null)
+            return;
+        renderExperience(f, hero, x, y + portraitH - XP_H, PORTRAIT_W);
+        float manaFrac = hero.getMana() / Math.max(1f, hero.getMaxMana());
+        Theme.bar(f.g, x, by + HP_H + 2, PORTRAIT_W, MANA_H, manaFrac, Theme.MANA);
+        String mana = (int) hero.getMana() + " / " + (int) hero.getMaxMana();
+        barText(f, mana, x, by + HP_H + 2, PORTRAIT_W, MANA_H, manaFrac);
+        regenTooltip(f, new Rect(x, by + HP_H + 2, PORTRAIT_W, MANA_H), "hud.reignofnether.bar.mana", mana, RegenInfo.mana(hero));
+    }
+
+    private static String perSecond(float amount) {
+        return I18n.get("hud.reignofnether.per_second", REGEN_FORMAT.format(amount));
+    }
+
+    /** The bar's name and numbers, then what its regen is made of. */
+    private static void regenTooltip(HudFrame f, Rect r, String nameKey, String value, List<RegenInfo.Source> sources) {
+        f.register(new ButtonBuilder(nameKey).build(), r, null, () -> {
+            Tooltip t = Tooltip.of(I18n.get(nameKey)).tag(value, Theme.TEXT);
+            if (sources.isEmpty())
+                t.status(I18n.get("hud.reignofnether.regen.none"), Theme.MUTED);
+            else if (sources.size() > 1) // one source is its own total
+                t.status(perSecond(RegenInfo.total(sources)), Theme.TEXT);
+            for (RegenInfo.Source source : sources)
+                t.status(perSecond(source.perSecond()) + " " + I18n.get("hud.reignofnether.regen." + source.key()), source.perSecond() > 0 ? Theme.OK : Theme.ERROR);
+            return t;
+        });
+    }
+
+    private static void renderUnitInfo(HudFrame f, LivingEntity e, int x, int y, int w, int h) {
+        if (e instanceof Unit unit)
+            renderStatRows(f, unit, x, y, w, h);
+    }
+
+    private static boolean isMe(String owner) {
+        var me = net.minecraft.client.Minecraft.getInstance().player;
+        return me != null && owner.equals(me.getName().getString());
+    }
+
+    /** The selected hero's unspent skill points, ending at the right edge given. Returns the width used. */
+    public static int renderSkillPoints(HudFrame f, int right, int y) {
+        LivingEntity e = HudClientEvents.hudSelectedEntity;
+        if (HudClientEvents.hudSelectedPlacement != null || !(e instanceof HeroUnit hero) || hero.getSkillPoints() <= 0
+                || UnitClientEvents.getPlayerToEntityRelationship(e) != Relationship.OWNED)
+            return 0;
+        int points = hero.getSkillPoints();
+        String s = "+" + points;
+        float scale = Text.px(15);
+        int w = Text.bigWidth(s, scale) + 8;
+        badge(f, s, right - w, y);
+        f.register(new ButtonBuilder("skill points").build(), new Rect(right - w, y, w, Text.bigHeight(scale) + 3), null,
+                () -> Tooltip.of(I18n.get("hud.reignofnether.skill_points", points)));
+        return w;
+    }
+
+    private static int badge(HudFrame f, String s, int x, int y) {
+        float scale = Text.px(15);
+        int w = Text.bigWidth(s, scale) + 8;
+        int h = Text.bigHeight(scale) + 3;
+        Theme.orangeChip(f.g, x, y, w, h);
+        f.g.fill(x, y + h - 1, x + w, y + h, Theme.ORANGE_DARK);
+        Text.draw(f.g, s, x + 4, y + 2, Theme.ON_ORANGE);
+        return w;
+    }
+
+    private static void healthBar(HudFrame f, int x, int y, int w, int h, float hp, float max) {
+        float frac = hp / Math.max(1f, max);
+        Theme.bar(f.g, x, y, w, h, frac, Theme.hpColor(frac));
+        String text = (hp >= 1 ? String.valueOf((int) hp) : String.format("%.1f", hp)) + " / " + (int) max;
+        barText(f, text, x, y, w, h, frac);
+    }
+
+    /** Bar label, centred: dark over the filled part, light over the empty part, split at the fill edge. */
+    private static void barText(HudFrame f, String text, int x, int y, int w, int h, float frac) {
+        String shown = Text.fitSmall(text, w - 4);
+        int tx = x + (w - Text.smallWidth(shown)) / 2;
+        int ty = y + Math.floorDiv(h - 9, 2);
+        int filled = Math.round(w * Math.max(0, Math.min(1, frac)));
+        if (filled > 0) {
+            Clip.push(f.g, x, y - 4, filled, h + 8);
+            Text.small(f.g, shown, tx, ty, Theme.ON_ORANGE);
+            Clip.pop(f.g);
+        }
+        if (filled < w) {
+            Clip.push(f.g, x + filled, y - 4, w - filled, h + 8);
+            Text.small(f.g, shown, tx, ty, Theme.TEXT);
+            Clip.pop(f.g);
+        }
+    }
+
+    /**
+     * A villager's way to a profession, then to veteran, 0 to 1: the profession it is learning (the one with the
+     * most progress) until it has one, then its experience towards veteran.
+     */
+    private static float professionProgress(VillagerUnit v) {
+        VillagerUnitProfession p = professionShown(v);
+        if (p == VillagerUnitProfession.NONE)
+            return 0;
+        if (v.isVeteran())
+            return 1;
+        int need = v.getUnitProfession() == VillagerUnitProfession.NONE ? VillagerUnit.getExpReq(p) / 2 : VillagerUnit.getExpReq(p);
+        return Math.min(v.getExp(p), need) / (float) need;
+    }
+
+    /** Its profession, or the one it is closest to learning; NONE before any work. */
+    public static VillagerUnitProfession professionShown(VillagerUnit v) {
+        if (v.getUnitProfession() != VillagerUnitProfession.NONE)
+            return v.getUnitProfession();
+        VillagerUnitProfession best = VillagerUnitProfession.NONE;
+        float bestFrac = 0;
+        for (VillagerUnitProfession p : VillagerUnitProfession.values()) {
+            float frac = v.getExp(p) / (float) VillagerUnit.getExpReq(p);
+            if (p != VillagerUnitProfession.NONE && frac > bestFrac) {
+                best = p;
+                bestFrac = frac;
+            }
+        }
+        return best;
+    }
+
+    private static String professionName(VillagerUnitProfession p) {
+        return I18n.get("units.reignofnether." + p.name().toLowerCase(Locale.ROOT));
+    }
+
+    /** What the profession does, what veteran adds and how it is earned; shared with the effects row icon. */
+    public static Tooltip professionTooltip(VillagerUnit v) {
+        VillagerUnitProfession p = professionShown(v);
+        if (p == VillagerUnitProfession.NONE)
+            return Tooltip.of(I18n.get("hud.reignofnether.profession.none_title"))
+                    .body(I18n.get("hud.reignofnether.profession.none_desc"));
+        String key = "hud.reignofnether.profession." + p.name().toLowerCase(Locale.ROOT);
+        boolean has = v.getUnitProfession() == p;
+        int req = VillagerUnit.getExpReq(p);
+        String status = v.isVeteran() ? I18n.get("hud.reignofnether.profession.is_veteran")
+                : has ? I18n.get("hud.reignofnether.profession.veteran_at", req)
+                : I18n.get("hud.reignofnether.profession.learn_at", professionName(p), req / 2);
+        Tooltip t = Tooltip.of(professionName(p))
+                .tag(I18n.get("hud.reignofnether.tag.passive"), Theme.XP)
+                .body(I18n.get(key + ".bonus"))
+                .body(I18n.get(key + ".veteran"))
+                .status(I18n.get(key + ".xp"), Theme.MUTED)
+                .status(status, v.isVeteran() ? Theme.GOLD : Theme.LABEL);
+        // still learning: the bar only shows the closest profession, so list the progress in each one
+        if (!has)
+            for (VillagerUnitProfession other : VillagerUnitProfession.values())
+                if (other != VillagerUnitProfession.NONE && v.getExp(other) > 0)
+                    t.status(I18n.get("hud.reignofnether.profession.progress", professionName(other),
+                            Math.min(v.getExp(other), VillagerUnit.getExpReq(other) / 2), VillagerUnit.getExpReq(other) / 2), Theme.MUTED);
+        return t;
+    }
+
+    private static void renderExperience(HudFrame f, HeroUnit hero, int x, int y, int w) {
+        boolean max = hero.getHeroLevel() >= HeroUnit.MAX_LEVEL;
+        float frac = max ? 1f : hero.getExpOnCurrentLevel() / (float) Math.max(1, hero.getExpToNextlevel());
+        Theme.bar(f.g, x, y, w, XP_H, frac, Theme.XP);
+        f.register(new ButtonBuilder("xp").build(), new Rect(x, y, w, XP_H), null, () -> max
+                ? Tooltip.of(I18n.get("hud.hero.reignofnether.max_level"))
+                : Tooltip.of(I18n.get("hud.hero.reignofnether.experience", hero.getExpOnCurrentLevel(), hero.getExpToNextlevel()))
+                        .body(I18n.get("hud.hero.reignofnether.experience_warning")));
+    }
+
+    /** One row per stat, icon and value; the name and unit are in the tooltip, so nothing gets cut off. */
+    private static void renderStatRows(HudFrame f, Unit unit, int x, int y, int w, int h) {
+        List<Stat> stats = PortraitRendererUnit.computeStats(unit);
+        int rowH = (h - (MAX_STATS - 1) * STAT_GAP) / MAX_STATS;
+        for (int i = 0; i < stats.size(); i++) {
+            Stat s = stats.get(i);
+            int ry = y + i * (h - rowH) / (MAX_STATS - 1); // a full column ends at the bottom
+            Rect row = new Rect(x, ry, w, rowH);
+            Theme.card(f.g, x, ry, w, rowH);
+            if (f.hovered(row))
+                f.g.fill(x, ry, x + w, ry + rowH, Theme.HOVER);
+            MyRenderer.renderIcon(f.g, s.icon(), x + 3, ry + (rowH - 10) / 2, 10);
+            Text.draw(f.g, Text.fit(s.value(), w - 18), x + 16, ry + (rowH - 8) / 2 + 1, s.colour());
+            String name = I18n.get("hud.reignofnether.stat." + s.type().name().toLowerCase());
+            String statUnit = statUnit(s);
+            f.register(new ButtonBuilder("stat").build(), row, null, () -> {
+                Tooltip t = Tooltip.fromLines(unit.getStatTooltip(s.type()));
+                t = t != null ? t : Tooltip.of(name);
+                return statUnit.isEmpty() ? t : t.status(statUnit, Theme.MUTED);
+            });
+        }
+    }
+
+    /** The stat's unit, where its tooltip title doesn't already say it. */
+    private static String statUnit(Stat s) {
+        return switch (s.type()) {
+            case ATTACK_DAMAGE -> I18n.get("hud.reignofnether.stat.sub.per_hit");
+            case RANGE -> I18n.get("hud.reignofnether.stat.sub.blocks");
+            default -> "";
+        };
+    }
+
+    // slots column: only for units with an inventory, then one column for what the units carry
+
+    private static final String[] RESOURCE_NAMES = { "food", "wood", "ore", "emerald" };
+    private static final int[] RESOURCE_COLOURS = { Theme.FOOD, Theme.WOOD, Theme.ORE, Theme.EMERALD };
+
+    private static void renderSlots(HudFrame f, LivingEntity e, int x, int y) {
+        if (e instanceof UnitInventory inv)
+            renderInventory(f, inv, x, y);
+    }
+
+    private static List<Button> passiveIcons(Unit u) {
+        List<Button> list = new ArrayList<>();
+        for (Button b : u.getPassiveIcons())
+            if (!b.isHidden.get())
+                list.add(b);
+        return list;
+    }
+
+    @Nullable
+    private static Resources carried(LivingEntity e) {
+        if (e instanceof Unit u && e instanceof Mob mob && mob.canPickUpLoot()) {
+            Resources res = Resources.getTotalResourcesFromItems(u.getItems());
+            return res.getTotalValue() > 0 ? res : null;
+        }
+        if (e instanceof Animal animal && ResourceSources.isHuntableAnimal(e))
+            return PortraitRendererUnit.resourcesHeld(animal);
+        return null;
+    }
+
+    private static void effectTile(HudFrame f, LivingEntity e, Button icon, int x, int y) {
+        icon.refresh();
+        int size = EFFECT;
+        Theme.outline(f.g, x, y, size, size, 1, Theme.INK);
+        f.g.fill(x, y, x + size, y + size, Theme.RAISED);
+        String frame = icon.frameResource != null ? icon.frameResource.getPath() : "";
+        int ring = frame.contains("diamond") ? Theme.BUFF : frame.contains("red") ? Theme.ERROR : Theme.FAINT;
+        Theme.ring(f.g, x, y, size, size, 1, ring);
+        ButtonCell.drawIcon(f.g, icon, x + 3, y + 3, size - 6);
+        // a villager's speciality does the opposite of a timed effect: its ring fills up as it levels
+        if (e instanceof VillagerUnit v && icon instanceof ProfessionIcon)
+            clockRing(f.g, x, y, size, professionProgress(v), Theme.GOLD);
+        // timed effects: the ring goes dark clockwise from the top as the effect runs out
+        if (icon instanceof MobEffectIcon mei && mei.duration >= MobEffectIcon.MIN_DURATION_SHOWN) {
+            // whichever moved further: the client's copy of the effect, or real time since the icon appeared
+            var live = e.getEffect(mei.effect);
+            if (live == null || !live.isInfiniteDuration()) {
+                float byLive = live != null ? 1f - live.getDuration() / (float) Math.max(mei.duration, live.getDuration()) : 0f;
+                float byTime = (System.currentTimeMillis() - mei.createdMs) / (mei.duration * 50f);
+                clockRing(f.g, x, y, size, Math.max(byLive, byTime), Theme.INK); // Theme.ring draws on the tile's outer edge
+            }
+        }
+        f.register(icon, new Rect(x, y, size, size), null, null);
+    }
+
+    /** Paints the first `elapsed` fraction of a 1-wide square ring of side s, clockwise from its top middle. */
+    private static void clockRing(GuiGraphics g, int x, int y, int s, float elapsed, int colour) {
+        int side = s - 1;
+        int n = 4 * side;
+        int dark = Math.round(Math.max(0, Math.min(1, elapsed)) * n);
+        for (int i = 0; i < dark; i++) {
+            int p = (i + s / 2) % n;
+            int px, py;
+            if (p < side) { px = p; py = 0; }
+            else if (p < 2 * side) { px = side; py = p - side; }
+            else if (p < 3 * side) { px = side - (p - 2 * side); py = side; }
+            else { px = 0; py = side - (p - 3 * side); }
+            g.fill(x + px, y + py, x + px + 1, y + py + 1, colour);
+        }
+    }
+
+    private static void renderInventory(HudFrame f, UnitInventory inv, int x, int y) {
+        List<Button> slots = ItemClientEvents.inventoryButtons(inv);
+        for (int i = 0; i < slots.size(); i++) {
+            Button b = slots.get(i);
+            int sx = x + (i % 2) * (SLOT + SLOT_GAP);
+            int sy = y + (i / 2) * (SLOT + SLOT_GAP);
+            Keybinding key = i < ItemClientEvents.hotkeys.size() ? ItemClientEvents.hotkeys.get(i) : null;
+            if (b instanceof AbstractUnitItemButton item && item.unitItem instanceof EmptyUnitItem) {
+                ButtonCell.renderEmpty(f.g, sx, sy, SLOT, null);
+                f.register(b, new Rect(sx, sy, SLOT, SLOT), null, null);
+            } else {
+                f.cell(b, sx, sy, SLOT, b.hotkey != null ? key : null);
+            }
+        }
+        Button hovered = null;
+        HudFrame.Placed p = f.buttonAt(f.mouseX, f.mouseY);
+        if (p != null && p.button() instanceof UnitItemInventoryButton)
+            hovered = p.button();
+        ItemClientEvents.setHoveredButton(hovered);
+    }
+
+    // in the order of Resources' food, wood, ore, emerald
+    private static final ResourceLocation[] RESOURCE_ICONS = { ButtonCell.ICON_FOOD, ButtonCell.ICON_WOOD, ButtonCell.ICON_ORE, ButtonCell.ICON_EMERALD };
+
+    /** One line of carried resources under the inventory: icon and amount for each kind held. */
+    private static void renderCarriedRow(HudFrame f, @Nullable LivingEntity e, Resources res, int x, int y, int w) {
+        int colour = e instanceof Unit u && Unit.atMaxResources(u) ? Theme.ERROR : Theme.TEXT;
+        int[] values = { res.food, res.wood, res.ore, res.emerald };
+        int cx = x;
+        for (int i = 0; i < values.length; i++) {
+            String text = String.valueOf(values[i]);
+            if (values[i] <= 0 || cx + 12 + Text.width(text) > x + w)
+                continue;
+            MyRenderer.renderIcon(f.g, RESOURCE_ICONS[i], cx, y, 10);
+            Text.draw(f.g, text, cx + 12, y + 1, colour);
+            cx += 12 + Text.width(text) + 6;
+        }
+    }
+
+    /** A vertical bar of the limit the units share: each resource fills its share from the bottom, with its numbers inside. */
+    private static void renderGathering(HudFrame f, LivingEntity e, List<LivingEntity> units, int x, int by, int bh) {
+        boolean animal = !(e instanceof Unit);
+        int[] values = new int[4];
+        int max = 0;
+        for (LivingEntity unit : units) {
+            Resources res = carried(unit);
+            if (res != null) {
+                values[0] += res.food;
+                values[1] += res.wood;
+                values[2] += res.ore;
+                values[3] += res.emerald;
+            }
+            if (unit instanceof Unit u && unit instanceof Mob mob && mob.canPickUpLoot())
+                max += u.getMaxResources();
+        }
+        int total = values[0] + values[1] + values[2] + values[3];
+        if (max == 0)
+            max = e instanceof Unit u ? Math.max(1, u.getMaxResources()) : Math.max(1, total);
+        boolean full = !animal && total >= max;
+        String hint = full ? I18n.get("hud.reignofnether.carry_full") : "";
+        int bottom = by + bh;
+        f.g.fill(x, by, x + GATHER_W, bottom, backdropAlpha() | Theme.INK & 0xFFFFFF);
+        // not to scale: each resource gets room for its number, what that takes comes off the biggest
+        int[] heights = new int[values.length];
+        int biggest = 0;
+        int sum = 0;
+        for (int i = 0; i < values.length; i++) {
+            if (values[i] > 0)
+                heights[i] = Math.max(MIN_SEGMENT_H, bh * Math.min(values[i], max) / max);
+            if (heights[i] > heights[biggest])
+                biggest = i;
+            sum += heights[i];
+        }
+        if (sum > bh || total >= max)
+            heights[biggest] = Math.max(MIN_SEGMENT_H, heights[biggest] + bh - sum);
+        for (int i = 0; i < values.length; i++) {
+            int top = Math.max(by, bottom - heights[i]);
+            if (top < bottom)
+                renderResourceSegment(f, i, values[i], 100 * values[i] / max, hint, new Rect(x, top, GATHER_W, bottom - top));
+            bottom = top;
+        }
+    }
+
+    /** Lit like the other bars; its icon and amount only show when they fit, the tooltip always has them. */
+    private static void renderResourceSegment(HudFrame f, int resource, int value, int percent, String hint, Rect r) {
+        f.g.fill(r.x(), r.y(), r.right(), r.bottom(), backdropAlpha() | RESOURCE_COLOURS[resource] & 0xFFFFFF);
+        f.g.fill(r.x(), r.y(), r.right(), r.y() + 1, 0x59FFFFFF);
+        f.g.fill(r.x(), r.y(), r.x() + 1, r.bottom(), 0x33FFFFFF);
+        f.g.fill(r.right() - 1, r.y(), r.right(), r.bottom(), 0x4D000000);
+        f.g.fill(r.x(), r.bottom() - 1, r.right(), r.bottom(), 0x40000000);
+        if (f.hovered(r))
+            f.g.fill(r.x(), r.y(), r.right(), r.bottom(), Theme.HOVER);
+        if (r.h() >= 10) {
+            String text = String.valueOf(value);
+            int ix = r.x() + (r.w() - 10 - Text.smallWidth(text)) / 2;
+            MyRenderer.renderIcon(f.g, RESOURCE_ICONS[resource], ix, r.y() + (r.h() - 8) / 2, 8);
+            Text.smallShadowed(f.g, text, ix + 10, r.y() + Math.floorDiv(r.h() - 9, 2), Theme.TEXT);
+        }
+        String name = I18n.get("resources.reignofnether." + RESOURCE_NAMES[resource]);
+        String status = value + " · " + percent + "%" + (hint.isEmpty() ? "" : " · " + hint);
+        f.register(new ButtonBuilder(name).build(), r, null, () -> Tooltip.of(name).status(status, Theme.LABEL));
+    }
+
+    // ------------------------------------------------------------------ army
+
+    private static <T> Map<String, List<T>> groupBy(List<T> items, java.util.function.Function<T, String> name) {
+        Map<String, List<T>> types = new LinkedHashMap<>();
+        for (T t : items)
+            types.computeIfAbsent(name.apply(t), k -> new ArrayList<>()).add(t);
+        return types;
+    }
+
+    private static void renderArmy(HudFrame f, Rect r, List<LivingEntity> army, Map<String, List<LivingEntity>> types) {
+        int pop = 0;
+        for (LivingEntity e : army)
+            if (e instanceof Unit u && u.getCost() != null)
+                pop += u.getCost().population;
+        String active = HudClientEvents.getModifiedEntityName(HudClientEvents.hudSelectedEntity);
+
+        String header = I18n.get("hud.reignofnether.units_count", army.size());
+        float hs = Text.px(24);
+        Text.big(f.g, header, r.x(), r.y(), Theme.TEXT, hs);
+        int hh = Text.bigHeight(hs);
+        String popText = I18n.get("hud.reignofnether.pop_count", pop);
+        int px = r.x() + Text.bigWidth(header, hs) + 6;
+        Text.small(f.g, popText, px, r.y() + hh - 9, Theme.ORANGE);
+        // small screens drop the gathering column for groups: what the whole selection carries goes here instead
+        Resources held = new Resources("", 0, 0, 0, 0);
+        if (f.layout.compact())
+            for (LivingEntity e : army) {
+                Resources c = e instanceof Unit ? carried(e) : null;
+                if (c != null)
+                    held.changeInstantly(c.food, c.wood, c.ore, c.emerald);
+            }
+        int hx = px + Text.smallWidth(popText) + 10;
+        String help = "[?]";
+        int helpW = Text.smallWidth(help);
+        Rect helpRect = new Rect(r.right() - helpW, r.y(), helpW, hh);
+        if (held.getTotalValue() > 0)
+            renderCarriedRow(f, null, held, hx, r.y() + hh - 11, helpRect.x() - 4 - hx);
+        Text.smallRight(f.g, help, r.right(), r.y() + hh - 9, f.hovered(helpRect) ? Theme.TEXT : Theme.DESC);
+        f.register(new ButtonBuilder("army hint").build(), helpRect, null, () ->
+                Tooltip.of(I18n.get("hud.reignofnether.hotkeys")).body(I18n.get("hud.reignofnether.army_hint")));
+
+        int perRow = Math.max(1, (r.w() + GAP) / (ARMY_STACK_W + GAP));
+        int sy = r.y() + hh + 6;
+        // keep room for at least one row of unit tiles under the stacks
+        int stackRows = Math.max(1, (r.bottom() - sy - TILE - 6 + 5) / (STACK_H + 5));
+        int maxStacks = perRow * stackRows;
+        int i = 0;
+        for (Map.Entry<String, List<LivingEntity>> type : types.entrySet()) {
+            int sx = r.x() + (i % perRow) * (ARMY_STACK_W + GAP);
+            int stackY = sy + (i / perRow) * (STACK_H + 5);
+            if (i == maxStacks - 1 && types.size() > maxStacks) {
+                renderMoreStack(f, new ArrayList<>(types.values()).subList(i, types.size()), sx, stackY);
+                break;
+            }
+            renderStack(f, type.getValue(), type.getKey().equals(active), sx, stackY);
+            i++;
+        }
+        int usedRows = (Math.min(types.size(), maxStacks) + perRow - 1) / perRow;
+        int ty = sy + usedRows * (STACK_H + 5) + 1;
+        List<LivingEntity> activeUnits = types.getOrDefault(active, List.of());
+        // the portrait already shows the hero
+        if (r.bottom() - ty >= TILE && !(HudClientEvents.hudSelectedEntity instanceof HeroUnit))
+            renderUnitTiles(f, activeUnits, r.x(), ty, r.w(), r.bottom() - ty);
+    }
+
+    /** Takes the last stack's place when there are more types than fit. */
+    private static void renderMoreStack(HudFrame f, List<List<LivingEntity>> groups, int x, int y) {
+        int hidden = groups.stream().mapToInt(List::size).sum();
+        Rect r = new Rect(x, y, MORE_W, STACK_H);
+        Theme.cell(f.g, x, y, MORE_W, STACK_H, Theme.CellState.READY, f.hovered(r));
+        Text.drawCentered(f.g, "+" + hidden, r.centerX(), y + (STACK_H - 8) / 2, Theme.TEXT);
+        f.register(new ButtonBuilder("more units").build(), r, null, () -> {
+            Tooltip t = Tooltip.of(I18n.get("hud.reignofnether.more_units", hidden));
+            for (List<LivingEntity> group : groups)
+                t.status(displayName(group.get(0)) + " ×" + group.size(), Theme.LABEL);
+            return t;
+        });
+    }
+
+    private static void renderStack(HudFrame f, List<LivingEntity> units, boolean active, int x, int y) {
+        LivingEntity first = units.get(0);
+        Rect r = new Rect(x, y, ARMY_STACK_W, STACK_H);
+        Theme.cell(f.g, x, y, ARMY_STACK_W, STACK_H, active ? Theme.CellState.ACTIVE : Theme.CellState.READY, f.hovered(r));
+        renderHead(f, first, x + 4, y + 4, 17);
+        String count = "×" + units.size();
+        Text.draw(f.g, count, x + ARMY_STACK_W - 4 - Text.width(count), y + 5, active ? Theme.GOLD : Theme.TEXT);
+        float hp = 0;
+        for (LivingEntity e : units)
+            hp += e.getHealth() / Math.max(1, e.getMaxHealth());
+        hp /= units.size();
+        Theme.bar(f.g, x + 24, y + 15, PIPS_W, 3, hp, Theme.hpColor(hp));
+        if (first instanceof HeroUnit hero)
+            renderHeroStatus(f, hero, x + 24, y + 19, PIPS_W);
+
+        Button b = new ButtonBuilder(displayName(first))
+                .entity(first)
+                .onLeftClick(() -> {
+                    if (Keybindings.ctrlMod.isDown())
+                        keepOnly(units);
+                    else if (Keybindings.shiftMod.isDown())
+                        removeAll(units);
+                    else
+                        HudClientEvents.setHudSelectedEntity(first);
+                })
+                // on macOS Minecraft turns Ctrl+click into a right-click
+                .onRightClick(() -> {
+                    if (Keybindings.ctrlMod.isDown())
+                        keepOnly(units);
+                    else
+                        removeAll(units);
+                })
+                .build();
+        f.register(b, r, null, () -> Tooltip.of(displayName(first) + " ×" + units.size())
+                .status(I18n.get("hud.reignofnether.stack_hint"), Theme.LABEL));
+    }
+
+    /** What matters about a hero while the army has the command card: its mana, and a mark per spell. */
+    private static void renderHeroStatus(HudFrame f, HeroUnit hero, int x, int y, int w) {
+        Theme.bar(f.g, x, y, w, 2, hero.getMana() / Math.max(1f, hero.getMaxMana()), Theme.MANA);
+        int px = x;
+        for (Button b : hero.getAbilityButtons()) {
+            if (!(b instanceof AbilityButton ab && ab.ability instanceof HeroAbility ha))
+                continue;
+            boolean learnt = ha.getRank(hero) > 0;
+            int colour = !learnt ? Theme.FAINT : ab.getCooldownTicks() > 0 ? Theme.DIM : hero.getMana() < ha.manaCost ? Theme.ERROR : Theme.GOLD;
+            f.g.fill(px, y + 4, px + 4, y + 6, colour);
+            px += 6;
+        }
+    }
+
+    private static void keepOnly(List<LivingEntity> units) {
+        UnitClientEvents.clearSelectedUnits();
+        for (LivingEntity e : units)
+            UnitClientEvents.addSelectedUnit(e);
+        HudClientEvents.setHudSelectedEntity(units.get(0));
+    }
+
+    private static void removeAll(List<LivingEntity> units) {
+        UnitClientEvents.removeSelectedUnits(units);
+    }
+
+    private static void renderUnitTiles(HudFrame f, List<LivingEntity> units, int x, int y, int w, int h) {
+        int perRow = Math.max(1, (w + 4) / (TILE + 4));
+        int rows = Math.max(1, (h + 4) / (TILE + 4));
+        int capacity = perRow * rows;
+        int shown = Math.min(units.size(), capacity);
+        for (int i = 0; i < shown; i++) {
+            LivingEntity e = units.get(i);
+            int tx = x + (i % perRow) * (TILE + 4);
+            int ty = y + (i / perRow) * (TILE + 4);
+            Rect r = new Rect(tx, ty, TILE, TILE);
+            boolean more = i == capacity - 1 && units.size() > capacity;
+            Theme.cell(f.g, tx, ty, TILE, TILE, Theme.CellState.READY, f.hovered(r));
+            if (more) {
+                String n = "+" + (units.size() - capacity + 1);
+                Text.drawCentered(f.g, n, r.centerX(), ty + 7, Theme.TEXT);
+                break;
+            }
+            if (f.hovered(r))
+                Theme.ring(f.g, tx, ty, TILE, TILE, 1, Theme.ORANGE);
+            renderHead(f, e, tx + 4, ty + 2, 12);
+            float hp = e.getHealth() / Math.max(1, e.getMaxHealth());
+            Theme.bar(f.g, tx + 2, ty + TILE - 5, TILE - 4, 3, hp, Theme.hpColor(hp));
+
+            Button b = new ButtonBuilder(displayName(e))
+                    .entity(e)
+                    .onLeftClick(() -> {
+                        if (Keybindings.shiftMod.isDown()) {
+                            UnitClientEvents.removeSelectedUnits(List.of(e));
+                        } else {
+                            UnitClientEvents.clearSelectedUnits();
+                            UnitClientEvents.addSelectedUnit(e);
+                        }
+                    })
+                    .onRightClick(() -> {
+                        if (Keybindings.ctrlMod.isDown())
+                            keepOnly(List.of(e));
+                        else
+                            UnitClientEvents.removeSelectedUnits(List.of(e));
+                    })
+                    .build();
+            f.register(b, r, null, () -> Tooltip.of(displayName(e))
+                    .tag((int) e.getHealth() + " / " + (int) e.getMaxHealth(), Theme.hpColor(e.getHealth() / Math.max(1, e.getMaxHealth())))
+                    .status(I18n.get("hud.reignofnether.tile_hint"), Theme.LABEL));
+        }
+    }
+
+    // ------------------------------------------------------------------ buildings
+
+    /** Health below the portrait. */
+    private static void renderBuildingPortrait(HudFrame f, BuildingPlacement b, int x, int y, int h) {
+        int portraitH = h - HP_H - 3;
+        portraitFrame(f, x, y, PORTRAIT_W, portraitH, b.ownerName);
+        Clip.push(f.g, x, y, PORTRAIT_W, portraitH);
+        PortraitRendererBuilding.drawBlock(f.g, b.getBuilding().portraitBlock, x + PORTRAIT_W / 2f, y + portraitH / 2f - 2, 11f);
+        Clip.pop(f.g);
+        portraitRect = new Rect(x, y, PORTRAIT_W, portraitH);
+        f.zone(portraitRect);
+        int by = y + portraitH + 3;
+        healthBar(f, x, by, PORTRAIT_W, HP_H, b.getHealth(), b.getMaxHealth());
+    }
+
+    private static boolean showsRange(BuildingPlacement b) {
+        return b instanceof SculkCatalystPlacement && b.isBuilt && b.getBuilding().hasActiveAddon(NightSourceAddon.class);
+    }
+
+    private static void renderBuildingInfo(HudFrame f, BuildingPlacement b, int x, int y, int w) {
+        if (showsRange(b))
+            Text.small(f.g, Text.fitSmall(I18n.get("hud.buildings.reignofnether.sculk_catalyst.range",
+                    b.getBuilding().getActiveAddon(NightSourceAddon.class).getNightRange(b), SculkCatalyst.MAX_NIGHT_RANGE), w), x, y, Theme.ORANGE);
+    }
+
+    private static void renderTraining(HudFrame f, ProductionPlacement prod, boolean owned, int x, int y, int w, int h) {
+        int px = x;
+        int pw = w;
+        List<ActiveProduction> queue = prod.productionQueue;
+        if (queue.isEmpty()) {
+            Text.draw(f.g, Text.fit(I18n.get("hud.reignofnether.nothing_in_production"), pw), px, y, Theme.LABEL);
+            return;
+        }
+
+        // top: the unit in production, its name, time left and a bar across the whole card
+        ActiveProduction current = queue.get(0);
+        int cs = 24;
+        int cy = y + 1;
+        Button cancelFirst = current.item.getCancelButton(prod, true);
+        queueCell(f, cancelFirst, px, cy, cs, owned, true, 0);
+
+        float total = current.item.getCost(true, prod.ownerName).ticks;
+        float done = total <= 0 ? 1f : 1f - current.ticksLeft / total;
+        boolean blocked = !current.item.isBelowPopulationSupply(prod);
+        int tx = px + cs + 6;
+        int tw = px + pw - tx;
+        String left = blocked ? I18n.get("hud.reignofnether.paused_population")
+                : I18n.get("hud.reignofnether.time_left", TimeUtils.formatSeconds((int) Math.ceil(current.ticksLeft / 20f)));
+        int leftW = Text.smallWidth(left);
+        Text.draw(f.g, Text.fit(cancelFirst.name, tw - leftW - 6), tx, cy - 1, Theme.TEXT);
+        Text.smallRight(f.g, left, tx + tw, cy, blocked ? Theme.ERROR : Theme.GOLD);
+        Theme.bar(f.g, tx, cy + cs - 5, tw, 5, done, blocked ? Theme.ERROR : Theme.ORANGE);
+
+        // bottom: the rest of the queue in cells as big as the height allows (two rows if both stay clickable),
+        // as many columns as fit
+        final int gap = 3;
+        int gy = cy + cs + 5;
+        int avail = y + h - gy;
+        int rows = avail >= 2 * 18 + gap ? 2 : 1;
+        int qs = Math.max(8, Math.min(27, (avail - (rows - 1) * gap) / rows));
+        int cols = Math.max(1, (pw + gap) / (qs + gap));
+        int queued = queue.size() - 1;
+        for (int slot = 0; slot < Math.min(queued, cols * rows); slot++) {
+            int cx = px + (slot % cols) * (qs + gap);
+            int ry = gy + (slot / cols) * (qs + gap);
+            if (slot == cols * rows - 1 && queued > cols * rows) {
+                Theme.outline(f.g, cx, ry, qs, qs, 1, Theme.INK);
+                f.g.fill(cx, ry, cx + qs, ry + qs, Theme.RAISED);
+                String more = "+" + (queued - slot);
+                Text.small(f.g, more, cx + (qs - Text.smallWidth(more)) / 2, ry + (qs - 8) / 2, Theme.FAINT);
+                break;
+            }
+            queueCell(f, queue.get(slot + 1).item.getCancelButton(prod, false), cx, ry, qs, owned, false, qs >= 18 ? slot + 2 : 0);
+        }
+    }
+
+    /** A queued item; clicking cancels it (refunding the cost). */
+    private static void queueCell(HudFrame f, Button cancel, int x, int y, int size, boolean owned, boolean current, int number) {
+        Rect r = new Rect(x, y, size, size);
+        boolean hover = owned && f.hovered(r);
+        Theme.outline(f.g, x, y, size, size, 1, Theme.INK);
+        f.g.fill(x, y, x + size, y + size, hover ? Theme.CANCEL_HOVER : Theme.RAISED);
+        if (current || hover)
+            Theme.ring(f.g, x, y, size, size, 1, hover ? Theme.ERROR : Theme.ORANGE);
+        ButtonCell.drawIcon(f.g, cancel, x + size / 5, y + size / 5, size - 2 * (size / 5));
+        if (owned)
+            Theme.cross(f.g, x + size - 6, y + 2, 4, Theme.DANGER_TEXT);
+        if (number > 0)
+            Text.small(f.g, String.valueOf(number), x + 2, y + size - 8, Theme.FAINT);
+        if (!owned) {
+            cancel.onLeftClick = null;
+            cancel.onRightClick = null;
+        }
+        f.register(cancel, r, null, () -> Tooltip.of(I18n.get("hud.reignofnether.cancel_item", cancel.name))
+                .status(I18n.get(current ? "hud.reignofnether.in_production" : "hud.reignofnether.queued"), Theme.MUTED));
+    }
+
+    private static void renderBuildingStacks(HudFrame f, Rect r, List<BuildingPlacement> selected, Map<String, List<BuildingPlacement>> types) {
+        String active = buildingName(HudClientEvents.hudSelectedPlacement);
+        float hs = Text.px(24);
+        Text.big(f.g, I18n.get("hud.reignofnether.buildings_count", selected.size()), r.x(), r.y(), Theme.TEXT, hs);
+        int sy = r.y() + Text.bigHeight(hs) + 6;
+
+        int perRow = Math.max(1, (r.w() + GAP) / (STACK_W + GAP));
+        int i = 0;
+        for (Map.Entry<String, List<BuildingPlacement>> type : types.entrySet()) {
+            int y = sy + (i / perRow) * (STACK_H + 5);
+            if (y + STACK_H > r.bottom())
+                break;
+            List<BuildingPlacement> group = type.getValue();
+            int x = r.x() + (i % perRow) * (STACK_W + GAP);
+            Rect sr = new Rect(x, y, STACK_W, STACK_H);
+            boolean on = type.getKey().equals(active);
+            Theme.cell(f.g, x, y, STACK_W, STACK_H, on ? Theme.CellState.ACTIVE : Theme.CellState.READY, f.hovered(sr));
+            MyRenderer.renderIcon(f.g, group.get(0).getBuilding().icon, x + 5, y + 5, 20);
+            String count = "×" + group.size();
+            Text.bigRight(f.g, count, x + STACK_W - 5, y + 5, on ? Theme.GOLD : Theme.TEXT, Text.px(20));
+            float hp = 0;
+            for (BuildingPlacement b : group)
+                hp += b.getHealth() / (float) Math.max(1, b.getMaxHealth());
+            hp /= group.size();
+            Theme.bar(f.g, x + 5, y + STACK_H - 6, STACK_W - 10, 3, hp, Theme.hpColor(hp));
+            Button b = new ButtonBuilder(type.getKey())
+                    .onLeftClick(() -> {
+                        if (on) {
+                            BuildingClientEvents.clearSelectedBuildings();
+                            group.forEach(BuildingClientEvents::addSelectedBuilding);
+                        } else {
+                            HudClientEvents.hudSelectedPlacement = group.get(0);
+                        }
+                    })
+                    .build();
+            f.register(b, sr, null, () -> Tooltip.of(type.getKey() + " ×" + group.size()));
+            i++;
+        }
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/SettingRows.java b/src/main/java/com/solegendary/reignofnether/hud/panels/SettingRows.java
new file mode 100644
index 000000000..93f7e4e5c
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/SettingRows.java
@@ -0,0 +1,133 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.ui.Icon;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.SettingRow;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import net.minecraft.client.resources.language.I18n;
+
+import java.util.List;
+
+/**
+ * Rows of "name ... [-] value [+]" (or an ON/OFF toggle): the game rules (HUD popover and match setup
+ * window) and the settings menu. Rows flow into a second column when they don't fit the height.
+ */
+public final class SettingRows {
+
+    private SettingRows() { }
+
+    public static final int ROW_H = 17;
+    private static final int VALUE_W = 85; // "BRIGHT YELLOW" beside a swatch
+    private static final int MIN_VALUE_W = 40;
+    private static final int STEP = 13;
+
+    /** Size the panel needs for these rules given a maximum height. */
+    public static Rect measure(List<SettingRow> rules, int colW, int maxH) {
+        int rowsPerCol = Math.max(1, maxH / ROW_H);
+        int cols = (rules.size() + rowsPerCol - 1) / rowsPerCol;
+        int rows = Math.min(rules.size(), rowsPerCol);
+        return new Rect(0, 0, cols * colW + (cols - 1) * 10, rows * ROW_H);
+    }
+
+    public static void render(HudFrame f, List<SettingRow> rules, int x, int y, int colW, int maxH) {
+        int rowsPerCol = Math.max(1, maxH / ROW_H);
+        for (int i = 0; i < rules.size(); i++) {
+            int col = i / rowsPerCol;
+            int row = i % rowsPerCol;
+            renderRow(f, rules.get(i), x + col * (colW + 10), y + row * ROW_H, colW);
+        }
+    }
+
+    public static void renderRow(HudFrame f, SettingRow rule, int x, int y, int w) {
+        boolean editable = rule.editable().get();
+        f.g.fill(x, y + ROW_H - 1, x + w, y + ROW_H, Theme.RAISED);
+        int vy = y + 2;
+        int vh = ROW_H - 4;
+        boolean checkbox = rule.isToggle() && isOnOff(rule.value().get());
+        // a long name takes room from the value box, which only depends on the name so it never jumps around
+        int valueW = checkbox ? vh : Math.max(MIN_VALUE_W, Math.min(VALUE_W, w - 2 * STEP - 10 - Text.width(rule.name())));
+        int controlW = checkbox ? vh : valueW + (rule.isToggle() ? 0 : 2 * STEP + 4);
+        Rect label = new Rect(x, y, w - controlW - 6, ROW_H);
+        Text.draw(f.g, Text.fit(rule.name(), label.w()), x, y + 4, editable ? Theme.TEXT : Theme.MUTED);
+        f.register(new ButtonBuilder(rule.name()).build(), label, null, () -> {
+            Tooltip t = Tooltip.of(rule.name()).body(rule.description());
+            if (rule.tag() != null)
+                t.tag(rule.tag(), Theme.ORANGE);
+            return t.status(editable ? "" : rule.lockedHint(), Theme.LABEL);
+        });
+
+        int vx = x + w - valueW - (rule.isToggle() ? 0 : STEP + 2);
+        Rect value = new Rect(vx, vy, valueW, vh);
+        if (checkbox) {
+            // plain on/off: a checkbox at the right end of the row
+            boolean on = rule.on().get();
+            int bx = x + w - vh;
+            Rect box = new Rect(bx, vy, vh, vh);
+            Theme.bevel(f.g, bx, vy, vh, vh, on ? Theme.TOGGLE_ON : Theme.INK, 0, 0, 1, Theme.INK);
+            Theme.ring(f.g, bx, vy, vh, vh, 1, on ? Theme.OK : editable && f.hovered(box) ? Theme.LABEL : Theme.FAINT);
+            if (on)
+                Icon.CHECK.drawIn(f.g, bx, vy, vh, vh, Theme.OK_TEXT);
+            f.register(action(rule.name(), editable, rule.increase()), box, null, null);
+            return;
+        }
+        if (rule.isToggle()) {
+            boolean on = rule.on().get();
+            Theme.outline(f.g, vx, vy, valueW, vh, 1, Theme.INK);
+            f.g.fill(vx, vy, vx + valueW, vy + vh, on ? Theme.TOGGLE_ON : Theme.SECONDARY);
+            if (on)
+                Theme.ring(f.g, vx, vy, valueW, vh, 1, Theme.OK);
+            if (editable && f.hovered(value))
+                f.g.fill(vx, vy, vx + valueW, vy + vh, Theme.HOVER);
+            Text.drawCentered(f.g, Text.fit(rule.value().get(), valueW - 4), value.centerX(), vy + 3, on ? Theme.OK_TEXT : Theme.LABEL);
+            f.register(action(rule.name(), editable, rule.increase()), value, null, null);
+            return;
+        }
+        Theme.outline(f.g, vx, vy, valueW, vh, 1, Theme.INK);
+        f.g.fill(vx, vy, vx + valueW, vy + vh, Theme.INK);
+        if (rule.swatch() != null) {
+            // the colour itself, so nobody has to guess what a name like "lime" looks like
+            f.g.fill(vx + 2, vy + 2, vx + vh - 2, vy + vh - 2, 0xFF000000 | rule.swatch().get());
+            Text.drawCentered(f.g, Text.fit(rule.value().get(), valueW - vh - 2), value.centerX() + vh / 2, vy + 3, Theme.GOLD);
+        } else
+            Text.drawCentered(f.g, Text.fit(rule.value().get(), valueW - 4), value.centerX(), vy + 3, Theme.GOLD);
+        stepper(f, "−", rule.name() + "-", editable, rule.decrease(), vx - STEP - 2, vy, vh);
+        stepper(f, "+", rule.name() + "+", editable, rule.increase(), vx + valueW + 2, vy, vh);
+    }
+
+    private static boolean isOnOff(String value) {
+        return value.equals(I18n.get("options.on")) || value.equals(I18n.get("options.off"));
+    }
+
+    private static void stepper(HudFrame f, String glyph, String id, boolean editable, Runnable run, int x, int y, int h) {
+        Rect r = new Rect(x, y, STEP, h);
+        Theme.secondaryButton(f.g, x, y, STEP, h, editable && f.hovered(r));
+        (glyph.equals("+") ? Icon.PLUS : Icon.MINUS).drawIn(f.g, x, y, STEP, h, editable ? Theme.BODY : Theme.FAINT);
+        f.register(action(id, editable, run), r, null, null);
+    }
+
+    private static Button action(String id, boolean enabled, Runnable run) {
+        return new ButtonBuilder(id)
+                .isEnabled(() -> enabled)
+                .onLeftClick(run)
+                .build();
+    }
+
+    /** A titled popup with these rows, anchored with its top-right corner at (right, top). */
+    public static Rect renderPopover(HudFrame f, String title, List<SettingRow> rows, int right, int top, int maxBottom, int colW) {
+        int pad = 7;
+        int maxH = maxBottom - top - pad * 2 - 16;
+        Rect size = measure(rows, colW, maxH);
+        int w = size.w() + pad * 2;
+        int h = size.h() + pad * 2 + 16;
+        int x = right - w;
+        Theme.popup(f.g, x, top, w, h, Theme.ORANGE);
+        f.zone(x, top, w, h);
+        Text.heading(f.g, title, x + pad, top + pad, Theme.GOLD, Text.px(18));
+        render(f, rows, x + pad, top + pad + 16, colW, maxH);
+        return new Rect(x, top, w, h);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/SettingsMenu.java b/src/main/java/com/solegendary/reignofnether/hud/panels/SettingsMenu.java
new file mode 100644
index 000000000..c321798be
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/SettingsMenu.java
@@ -0,0 +1,375 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.blocks.BlockClientEvents;
+import com.solegendary.reignofnether.config.ReignOfNetherClientConfigs;
+import com.solegendary.reignofnether.gamerules.GameruleClient;
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.minimap.MinimapClientEvents;
+import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
+import com.solegendary.reignofnether.player.PlayerClientEvents;
+import com.solegendary.reignofnether.player.PlayerColors;
+import com.solegendary.reignofnether.sandbox.SandboxClientEvents;
+import com.solegendary.reignofnether.startpos.StartPosClientEvents;
+import com.solegendary.reignofnether.tutorial.TutorialClientEvents;
+import com.solegendary.reignofnether.ui.HudScale;
+import com.solegendary.reignofnether.ui.Icon;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.SettingRow;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.AbstractButton;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.client.gui.screens.PauseScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraftforge.client.event.ScreenEvent;
+import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import org.lwjgl.glfw.GLFW;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.function.Supplier;
+
+/**
+ * RTS settings (camera and map display options) and the game rules, opened from icon buttons beside
+ * the pause menu. Each opens its own screen; Esc goes back to the pause menu.
+ */
+public final class SettingsMenu {
+
+    private SettingsMenu() { }
+
+
+    /** Same rule as the old HUD button: sandbox players and spectators, outside the tutorial and scenarios. Sandbox players get game rules in the dock; mapmaker rules stay here. */
+    public static boolean canOpenGamerules() {
+        return (SandboxClientEvents.isSandboxPlayer() || !PlayerClientEvents.isRTSPlayer())
+                && !TutorialClientEvents.isEnabled() && !GameruleClient.scenarioMode && !StartPosClientEvents.isStarting;
+    }
+
+    private static boolean inPauseMenu = false;
+
+    /** True from opening the pause menu until back in the game, so the menus opened from it share its background. */
+    public static boolean isInPauseMenu() {
+        Minecraft mc = Minecraft.getInstance();
+        if (mc.screen == null || mc.level == null)
+            inPauseMenu = false;
+        return inPauseMenu;
+    }
+
+    @SubscribeEvent
+    public static void onScreenOpening(ScreenEvent.Opening evt) {
+        if (evt.getNewScreen() instanceof PauseScreen)
+            inPauseMenu = true;
+    }
+
+    /** Two square icon buttons left of the pause menu's second row, like mods add on the right. */
+    @SubscribeEvent
+    public static void onPauseInit(ScreenEvent.Init.Post evt) {
+        if (!(evt.getScreen() instanceof PauseScreen pause) || !OrthoviewClientEvents.isEnabled())
+            return;
+        AbstractWidget back = null;
+        for (var l : evt.getListenersList())
+            if (l instanceof AbstractWidget w && w.getMessage().getContents() instanceof net.minecraft.network.chat.contents.TranslatableContents t
+                    && t.getKey().equals("menu.returnToGame"))
+                back = w;
+        if (back == null)
+            return;
+        tidyPauseMenu(evt, back);
+        int x = back.getX() - 24;
+        int y = back.getY() + 24;
+        evt.addListener(new IconButton(x, y, Icon.SETTINGS, Component.translatable("hud.reignofnether.settings"),
+                () -> Minecraft.getInstance().setScreen(settingsScreen(pause))));
+        boolean rulesInDock = SandboxClientEvents.isSandboxPlayer();
+        if (canOpenGamerules() && !rulesInDock)
+            evt.addListener(new IconButton(x, y + 24, Icon.LIST, Component.translatable("hud.gamerule.reignofnether.title"),
+                    () -> Minecraft.getInstance().setScreen(new Panel(pause, "hud.gamerule.reignofnether.title", GameruleClient::ruleRows))));
+        if (canOpenGamerules())
+            evt.addListener(new IconButton(x, y + (rulesInDock ? 24 : 48), Icon.LIST, Component.translatable("hud.gamerule.reignofnether.mapmaker_title"),
+                    () -> Minecraft.getInstance().setScreen(new Panel(pause, "hud.gamerule.reignofnether.mapmaker_title", GameruleClient::mapmakerRuleRows))));
+        // surrender, red, under the last pause button; a second click within 3 s confirms
+        if (PlayerClientEvents.isRTSPlayer() && !SandboxClientEvents.isSandboxPlayer()) {
+            int bottom = back.getY();
+            for (var l : evt.getListenersList())
+                if (l instanceof AbstractWidget w && w.getX() <= back.getX() + back.getWidth() && w.getX() + w.getWidth() >= back.getX())
+                    bottom = Math.max(bottom, w.getY() + w.getHeight());
+            evt.addListener(new SurrenderButton(back.getX(), bottom + 4, back.getWidth()));
+        }
+    }
+
+    private static String key(AbstractWidget w) {
+        return w.getMessage().getContents() instanceof net.minecraft.network.chat.contents.TranslatableContents t ? t.getKey() : "";
+    }
+
+    /**
+     * Drops Advancements, Give Feedback and Report Bugs. Statistics takes Advancements' half of its row and Mods
+     * the other half, then the rows of the menu's column close up, 24 apart from Back to Game down.
+     */
+    private static void tidyPauseMenu(ScreenEvent.Init.Post evt, AbstractWidget back) {
+        AbstractWidget advancements = null, stats = null, mods = null;
+        for (var l : List.copyOf(evt.getListenersList())) {
+            if (!(l instanceof AbstractWidget w))
+                continue;
+            switch (key(w)) {
+                case "gui.advancements" -> advancements = w;
+                case "menu.sendFeedback", "menu.reportBugs" -> evt.removeListener(w);
+                case "gui.stats" -> stats = w;
+                case "fml.menu.mods" -> mods = w;
+                default -> { }
+            }
+        }
+        if (advancements != null && stats != null) {
+            int ax = advancements.getX(), ay = advancements.getY(), aw = advancements.getWidth();
+            evt.removeListener(advancements);
+            if (mods != null) {
+                mods.setX(stats.getX());
+                mods.setY(stats.getY());
+                mods.setWidth(stats.getWidth());
+            }
+            stats.setX(ax);
+            stats.setY(ay);
+            stats.setWidth(aw);
+        }
+        // close the gaps: each remaining row of the column goes right under the one above
+        int left = back.getX(), right = back.getX() + back.getWidth();
+        java.util.TreeSet<Integer> rows = new java.util.TreeSet<>();
+        List<AbstractWidget> column = new ArrayList<>();
+        for (var l : evt.getListenersList())
+            if (l instanceof AbstractWidget w && w.getX() >= left && w.getX() + w.getWidth() <= right && w.getY() >= back.getY()) {
+                column.add(w);
+                rows.add(w.getY());
+            }
+        List<Integer> order = new ArrayList<>(rows);
+        for (AbstractWidget w : column)
+            w.setY(back.getY() + order.indexOf(w.getY()) * 24);
+    }
+
+    private static class SurrenderButton extends AbstractButton {
+        private long armedAt = 0;
+
+        SurrenderButton(int x, int y, int w) {
+            super(x, y, w, 20, Component.translatable("hud.reignofnether.surrender"));
+        }
+
+        private boolean armed() {
+            return System.currentTimeMillis() - armedAt < 3000;
+        }
+
+        @Override
+        public void onPress() {
+            if (armed()) {
+                com.solegendary.reignofnether.player.PlayerServerboundPacket.surrender();
+                Minecraft.getInstance().setScreen(null);
+            } else {
+                armedAt = System.currentTimeMillis();
+            }
+        }
+
+        @Override
+        protected void renderWidget(GuiGraphics g, int mouseX, int mouseY, float partialTick) {
+            Theme.dangerButton(g, getX(), getY(), width, height, isHoveredOrFocused());
+            String label = I18n.get(armed() ? "hud.reignofnether.surrender_confirm" : "hud.reignofnether.surrender");
+            Text.mediumCentered(g, label, getX() + width / 2, getY() + (height - 8) / 2, Theme.DANGER_TEXT);
+        }
+
+        @Override
+        protected void updateWidgetNarration(NarrationElementOutput out) {
+            defaultButtonNarrationText(out);
+        }
+    }
+
+    public static Screen settingsScreen(Screen parent) {
+        return new Panel(parent, "hud.reignofnether.settings", SettingsMenu::rows);
+    }
+
+    private static class IconButton extends AbstractButton {
+        private final Icon icon;
+        private final Runnable action;
+
+        IconButton(int x, int y, Icon icon, Component name, Runnable action) {
+            super(x, y, 20, 20, name);
+            this.icon = icon;
+            this.action = action;
+        }
+
+        @Override
+        public void onPress() {
+            action.run();
+        }
+
+        @Override
+        protected void renderWidget(GuiGraphics g, int mouseX, int mouseY, float partialTick) {
+            Theme.secondaryButton(g, getX(), getY(), width, height, isHoveredOrFocused());
+            icon.drawIn(g, getX(), getY(), width, height, isHoveredOrFocused() ? Theme.GOLD : Theme.BODY);
+            if (isHovered()) {
+                // the RTS tooltip, in HUD units over the rest of the pause menu
+                HudScale s = HudGeometry.scale();
+                g.pose().pushPose();
+                g.pose().translate(0, 0, 400);
+                g.pose().scale(s.poseScale(), s.poseScale(), 1);
+                Tooltip.of(getMessage().getString()).show(s.toUnits(getX()), s.toUnits(getY()), s.toUnits(width), s.toUnits(height));
+                Tooltip.renderPending(g, HudGeometry.layout().width(), HudGeometry.layout().height());
+                g.pose().popPose();
+            }
+        }
+
+        @Override
+        protected void updateWidgetNarration(NarrationElementOutput out) {
+            defaultButtonNarrationText(out);
+        }
+    }
+
+    /** One list of setting rows laid out like vanilla's options: two columns of buttons, a title and Done. */
+    private static class Panel extends Screen {
+        private final Screen parent;
+        private final Supplier<List<SettingRow>> rows;
+
+        Panel(Screen parent, String titleKey, Supplier<List<SettingRow>> rows) {
+            super(Component.translatable(titleKey));
+            this.parent = parent;
+            this.rows = rows;
+        }
+
+        @Override
+        protected void init() {
+            List<SettingRow> list = rows.get(); // every value is a supplier, so the rows themselves never change
+            int perColumn = (list.size() + 1) / 2;
+            int top = Math.max(32, (height - perColumn * 24 - 32) / 2);
+            for (int i = 0; i < list.size(); i++)
+                addRenderableWidget(new RowButton(width / 2 - 155 + (i / perColumn) * 160, top + (i % perColumn) * 24, list.get(i)));
+            addRenderableWidget(net.minecraft.client.gui.components.Button.builder(CommonComponents.GUI_DONE, b -> onClose())
+                    .bounds(width / 2 - 100, Math.min(height - 27, top + perColumn * 24 + 8), 200, 20).build());
+        }
+
+        @Override
+        public void render(GuiGraphics g, int mouseX, int mouseY, float partialTick) {
+            renderBackground(g);
+            g.drawCenteredString(font, title, width / 2, 15, 0xFFFFFF);
+            super.render(g, mouseX, mouseY, partialTick);
+        }
+
+        @Override
+        public void onClose() {
+            Minecraft.getInstance().setScreen(parent);
+        }
+    }
+
+    /** A vanilla button reading "Name: value": left click raises or toggles it, right click lowers it. */
+    private static class RowButton extends AbstractButton {
+        private final SettingRow row;
+        private String shownTip = null;
+
+        RowButton(int x, int y, SettingRow row) {
+            super(x, y, 150, 20, Component.empty());
+            this.row = row;
+            refresh();
+        }
+
+        private void refresh() {
+            MutableComponent value = Component.literal(row.value().get());
+            if (row.swatch() != null)
+                value = value.withStyle(s -> s.withColor(row.swatch().get()));
+            setMessage(Component.literal(row.name() + ": ").append(value));
+            active = row.editable().get();
+            String tip = active || row.lockedHint().isEmpty() ? row.description() : row.lockedHint();
+            if (!tip.equals(shownTip)) {
+                shownTip = tip;
+                setTooltip(net.minecraft.client.gui.components.Tooltip.create(Component.literal(tip)));
+            }
+        }
+
+        @Override
+        public void onPress() {
+            row.increase().run();
+        }
+
+        @Override
+        public boolean mouseClicked(double mouseX, double mouseY, int button) {
+            if (button == GLFW.GLFW_MOUSE_BUTTON_2 && row.decrease() != null && active && isMouseOver(mouseX, mouseY)) {
+                playDownSound(Minecraft.getInstance().getSoundManager());
+                row.decrease().run();
+                return true;
+            }
+            return super.mouseClicked(mouseX, mouseY, button);
+        }
+
+        @Override
+        protected void renderWidget(GuiGraphics g, int mouseX, int mouseY, float partialTick) {
+            refresh(); // values change from clicks, the server and other players
+            super.renderWidget(g, mouseX, mouseY, partialTick);
+        }
+
+        @Override
+        protected void updateWidgetNarration(NarrationElementOutput out) {
+            defaultButtonNarrationText(out);
+        }
+    }
+
+    private static List<SettingRow> rows() {
+        Button sensitivity = MinimapClientEvents.getCamSensitivityButton();
+        Button nightCircles = MinimapClientEvents.getNightCirclesModeButton();
+        Button animals = MinimapClientEvents.getHighlightAnimalsButton();
+        Button underlines = MinimapClientEvents.getToggleUnderlinesButton();
+        Button leaves = OrthoviewClientEvents.getLeavesHidingButton();
+        List<SettingRow> rows = new ArrayList<>(List.of(
+                new SettingRow(I18n.get("hud.reignofnether.settings.pan_speed"), I18n.get("hud.reignofnether.settings.pan_speed.desc"), null,
+                        () -> String.valueOf(Math.round(OrthoviewClientEvents.getPanSensitivityMult() * 10)), () -> true,
+                        sensitivity.onLeftClick, sensitivity.onRightClick, () -> true, ""),
+                new SettingRow(I18n.get("hud.reignofnether.settings.night_circles"), I18n.get("hud.reignofnether.settings.night_circles.desc"), null,
+                        () -> I18n.get("hud.reignofnether.settings.night_circles." + BlockClientEvents.nightCircleMode.name().toLowerCase(Locale.ROOT)),
+                        () -> true, nightCircles.onLeftClick, null, () -> true, ""),
+                new SettingRow(I18n.get("hud.reignofnether.settings.underlines"), I18n.get("hud.reignofnether.settings.underlines.desc"), null,
+                        () -> onOff(MinimapClientEvents.shouldUnderline()), MinimapClientEvents::shouldUnderline,
+                        underlines.onLeftClick, null, () -> true, ""),
+                new SettingRow(I18n.get("hud.reignofnether.settings.animals"), I18n.get("hud.reignofnether.settings.animals.desc"), null,
+                        () -> onOff(MinimapClientEvents.shouldHighlightAnimals()), MinimapClientEvents::shouldHighlightAnimals,
+                        animals.onLeftClick, null, () -> true, ""),
+                new SettingRow(I18n.get("hud.reignofnether.settings.leaves"), I18n.get("hud.reignofnether.settings.leaves.desc"), null,
+                        () -> I18n.get("hud.reignofnether.settings.leaves." + OrthoviewClientEvents.hideLeavesMethod.name().toLowerCase(Locale.ROOT)),
+                        () -> true, leaves.onLeftClick, null, () -> true, ""),
+                new SettingRow(I18n.get("hud.reignofnether.settings.square_map"), I18n.get("hud.reignofnether.settings.square_map.desc"), null,
+                        () -> onOff(ReignOfNetherClientConfigs.SQUARE_MINIMAP.get()), ReignOfNetherClientConfigs.SQUARE_MINIMAP::get,
+                        () -> ReignOfNetherClientConfigs.SQUARE_MINIMAP.set(!ReignOfNetherClientConfigs.SQUARE_MINIMAP.get()), null, () -> true, ""),
+                new SettingRow(I18n.get("hud.reignofnether.settings.larger_small_text"), I18n.get("hud.reignofnether.settings.larger_small_text.desc"), null,
+                        () -> onOff(ReignOfNetherClientConfigs.LARGER_SMALL_TEXT.get()), ReignOfNetherClientConfigs.LARGER_SMALL_TEXT::get,
+                        () -> ReignOfNetherClientConfigs.LARGER_SMALL_TEXT.set(!ReignOfNetherClientConfigs.LARGER_SMALL_TEXT.get()), null, () -> true, ""),
+                new SettingRow(I18n.get("hud.reignofnether.settings.solid_panels"), I18n.get("hud.reignofnether.settings.solid_panels.desc"), null,
+                        () -> onOff(ReignOfNetherClientConfigs.SOLID_PANELS.get()), ReignOfNetherClientConfigs.SOLID_PANELS::get,
+                        () -> ReignOfNetherClientConfigs.SOLID_PANELS.set(!ReignOfNetherClientConfigs.SOLID_PANELS.get()), null, () -> true, ""),
+                new SettingRow(I18n.get("hud.reignofnether.settings.queue_own_row"), I18n.get("hud.reignofnether.settings.queue_own_row.desc"), null,
+                        () -> onOff(ReignOfNetherClientConfigs.QUEUE_OWN_ROW.get()), ReignOfNetherClientConfigs.QUEUE_OWN_ROW::get,
+                        () -> ReignOfNetherClientConfigs.QUEUE_OWN_ROW.set(!ReignOfNetherClientConfigs.QUEUE_OWN_ROW.get()), null, () -> true, ""),
+                new SettingRow(I18n.get("hud.reignofnether.settings.colours"), I18n.get("hud.reignofnether.settings.colours.desc"), null,
+                        () -> I18n.get(ReignOfNetherClientConfigs.USE_PLAYER_COLORS.get() ? "hud.reignofnether.settings.colours.players" : "hud.reignofnether.settings.colours.relations"),
+                        () -> true, PlayerColors::toggleColorMode, null, () -> true, "")
+        ));
+        // the colour used for each relation when colouring by relation
+        rows.add(relationColour("self", ReignOfNetherClientConfigs.PLAYER_COLOR_SELF));
+        rows.add(relationColour("ally", ReignOfNetherClientConfigs.PLAYER_COLOR_ALLY));
+        rows.add(relationColour("neutral", ReignOfNetherClientConfigs.PLAYER_COLOR_NEUTRAL));
+        rows.add(relationColour("enemy", ReignOfNetherClientConfigs.PLAYER_COLOR_ENEMY));
+        return rows;
+    }
+
+    private static SettingRow relationColour(String key, ForgeConfigSpec.ConfigValue<Integer> value) {
+        int n = PlayerColors.PLAYER_COLOR_TOTAL_COUNT;
+        return new SettingRow(I18n.get("hud.reignofnether.settings.colour_" + key), I18n.get("hud.reignofnether.settings.colour_" + key + ".desc"), null,
+                () -> I18n.get("hud.reignofnether.settings.colour_name." + PlayerColors.colors[value.get() % n].name).toUpperCase(Locale.ROOT), () -> true,
+                () -> value.set((value.get() + 1) % n), () -> value.set((value.get() + n - 1) % n), () -> true, "",
+                () -> PlayerColors.colors[value.get() % n].hexCode);
+    }
+
+    private static String onOff(boolean on) {
+        return I18n.get(on ? "options.on" : "options.off");
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/SpectatorHud.java b/src/main/java/com/solegendary/reignofnether/hud/panels/SpectatorHud.java
new file mode 100644
index 000000000..ab1d64002
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/SpectatorHud.java
@@ -0,0 +1,466 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.alliance.AlliancesClient;
+import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.keybinds.Keybinding;
+import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
+import com.solegendary.reignofnether.player.PlayerClientEvents;
+import com.solegendary.reignofnether.player.PlayerColors;
+import com.solegendary.reignofnether.player.RTSPlayer;
+import com.solegendary.reignofnether.resources.IncomeTracker;
+import com.solegendary.reignofnether.resources.ResourceName;
+import com.solegendary.reignofnether.resources.Resources;
+import com.solegendary.reignofnether.resources.ResourcesClientEvents;
+import com.solegendary.reignofnether.sandbox.SandboxClientEvents;
+import com.solegendary.reignofnether.time.TimeClientEvents;
+import com.solegendary.reignofnether.time.TimeUtils;
+import com.solegendary.reignofnether.tutorial.TutorialClientEvents;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import com.solegendary.reignofnether.unit.UnitClientEvents;
+import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
+import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
+import com.solegendary.reignofnether.util.MiscUtil;
+import com.solegendary.reignofnether.util.MyRenderer;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.LivingEntity;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Caster view for spectators: a scoreboard at the top and a small tab bar at the bottom that opens one
+ * panel at a time (army, economy, camera). The rest of the screen is the battlefield. Client-side only:
+ * it shows what the server already sends to spectators.
+ */
+public final class SpectatorHud {
+
+    private SpectatorHud() { }
+
+    private static final Minecraft MC = Minecraft.getInstance();
+
+    private static boolean armyOpen = false;
+    @Nullable private static String follow = null;
+    private static double followX, followZ;
+
+    private static final int ROW_H = HudLayout.TOP_CARD_H; // a row is the player's own resource bar
+    private static final int NAME_W = 62;
+    private static int SIDE_W = 310; // set each frame from the resource columns
+    private static final float VALUE = Text.px(20); // medium values: the scoreboard is a summary
+    private static int[] cols; // resource cell widths shared by every row, so the columns line up
+    private static final int MID_W = 104;
+    private static final int TAB_H = 18;
+    private static final int CARD_W = 112;
+
+    public static void reset() {
+        armyOpen = false;
+        follow = null;
+    }
+
+    private static int bottom = 0;
+
+    /** Bottom edge of the scoreboard as last drawn, so panels below it can clear it. */
+    public static int bottom() {
+        return bottom;
+    }
+
+    public static boolean isActive() {
+        return !PlayerClientEvents.isRTSPlayer() && !PlayerClientEvents.rtsPlayers.isEmpty()
+                && !TutorialClientEvents.isEnabled() && !SandboxClientEvents.isSandboxPlayer();
+    }
+
+    public static void render(HudFrame f) {
+        List<RTSPlayer> players = orderedPlayers();
+        if (players.isEmpty())
+            return;
+        renderScoreboard(f, players);
+        renderArmy(f, players);
+    }
+
+    /** Allies next to each other, so the first half of the list is one side of the scoreboard. */
+    private static List<RTSPlayer> orderedPlayers() {
+        List<RTSPlayer> left;
+        synchronized (PlayerClientEvents.rtsPlayers) {
+            left = new ArrayList<>(PlayerClientEvents.rtsPlayers);
+        }
+        List<RTSPlayer> out = new ArrayList<>();
+        while (!left.isEmpty()) {
+            RTSPlayer first = left.remove(0);
+            out.add(first);
+            left.removeIf(p -> {
+                if (AlliancesClient.isAllied(first.name, p.name)) {
+                    out.add(p);
+                    return true;
+                }
+                return false;
+            });
+        }
+        return out;
+    }
+
+    /** With two teams, the first one fills the left, so a 1v2's allies share a side; otherwise half each. */
+    private static int leftCount(List<RTSPlayer> players) {
+        int first = 1;
+        while (first < players.size() && AlliancesClient.isAllied(players.get(0).name, players.get(first).name))
+            first++;
+        boolean twoTeams = true;
+        for (int i = first + 1; i < players.size(); i++)
+            twoTeams &= AlliancesClient.isAllied(players.get(first).name, players.get(i).name);
+        return twoTeams && first < players.size() ? first : (players.size() + 1) / 2;
+    }
+
+    // ------------------------------------------------------------------ scoreboard
+
+    private static void renderScoreboard(HudFrame f, List<RTSPlayer> players) {
+        cols = null;
+        for (RTSPlayer p : players) {
+            Resources res = ResourcesClientEvents.getResources(p.name);
+            if (res == null)
+                continue;
+            int[] w = TopLeftPanel.resourceWidths(p.name, res, VALUE);
+            if (cols == null || cols.length != w.length)
+                cols = w;
+            else
+                for (int i = 0; i < w.length; i++)
+                    cols[i] = Math.max(cols[i], w[i]);
+        }
+        int widest = 0;
+        if (cols != null)
+            for (int w : cols)
+                widest += w;
+        SIDE_W = 7 + 14 + 5 + NAME_W + 6 + widest;
+        int leftCount = leftCount(players);
+        int rows = Math.max(1, Math.max(leftCount, players.size() - leftCount));
+        int w = SIDE_W * 2 + MID_W;
+        int h = Math.max(rows * ROW_H, 38); // room for the clock, day/night and mode lines
+        int rowsTop = (h - rows * ROW_H) / 2;
+        int x = (f.layout.width() - w) / 2;
+        int y = HudLayout.MARGIN;
+        Rect r = new Rect(x, y, w, h);
+        Theme.panel(f.g, x, y, w, h, Theme.floating());
+        f.zone(r);
+        bottom = r.bottom();
+
+        for (int i = 0; i < players.size(); i++) {
+            boolean leftSide = i < leftCount;
+            int row = leftSide ? i : i - leftCount;
+            int px = leftSide ? x : x + SIDE_W + MID_W;
+            playerRow(f, players.get(i), px, y + rowsTop + row * ROW_H, leftSide);
+        }
+
+        // the clock in the middle
+        int mx = x + SIDE_W;
+        Theme.divider(f.g, mx, y + 3, 1, h - 6);
+        Theme.divider(f.g, mx + MID_W - 1, y + 3, 1, h - 6);
+        int cx = mx + MID_W / 2;
+        float big = Text.px(30);
+        String time = TimeUtils.getTimeStrFromTicks(PlayerClientEvents.rtsGameTicks);
+        long dayTime = TimeClientEvents.serverNormDayTime;
+        boolean day = TimeUtils.isDay(dayTime);
+        boolean bloodMoon = TimeClientEvents.isBloodMoonActive();
+        // the clock icon beside the game time, like the player's clock
+        int tw = 12 + 4 + Text.bigWidth(time, big);
+        int tx = cx - tw / 2;
+        int iy = y + 3 + (Text.bigHeight(big) - 12) / 2;
+        if (bloodMoon)
+            MyRenderer.renderIcon(f.g, TopRightPanel.BLOOD_MOON, tx, iy, 12);
+        else if (day)
+            MyRenderer.renderItem(f.g, TopRightPanel.CLOCK, tx - 1, iy - 1, 14 / 16f);
+        else
+            MyRenderer.renderIcon(f.g, TopRightPanel.MOON, tx, iy, 12);
+        Text.big(f.g, time, tx + 16, y + 3, Theme.TEXT, big);
+        String phase = bloodMoon ? I18n.get("hud.reignofnether.clock.blood_moon")
+                : I18n.get(day ? "hud.reignofnether.clock.day" : "hud.reignofnether.clock.night");
+        String until = bloodMoon ? "" : TimeUtils.getTimeUntilStr(dayTime, day ? TimeUtils.DUSK : TimeUtils.DAWN);
+        Text.mediumCentered(f.g, phase + (until.isEmpty() ? "" : " · " + until), cx, y + Text.bigHeight(big) + 5,
+                bloodMoon ? Theme.ERROR : day ? Theme.GOLD : Theme.MANA_TEXT);
+        Text.mediumCentered(f.g, modeLabel(players), cx, y + h - 11, Theme.LABEL);
+    }
+
+    /** 1V1, 2V2, 3V3, 2V1 or FFA, from the alliances (orderedPlayers puts allies next to each other). */
+    private static String modeLabel(List<RTSPlayer> players) {
+        List<Integer> teams = new ArrayList<>();
+        for (int i = 0; i < players.size(); i++) {
+            if (i > 0 && AlliancesClient.isAllied(players.get(i - 1).name, players.get(i).name))
+                teams.set(teams.size() - 1, teams.get(teams.size() - 1) + 1);
+            else
+                teams.add(1);
+        }
+        if (teams.size() > 2 && teams.stream().allMatch(n -> n == 1))
+            return I18n.get("hud.reignofnether.spectator.ffa", players.size());
+        StringBuilder sb = new StringBuilder();
+        for (int n : teams)
+            sb.append(sb.isEmpty() ? "" : "V").append(n);
+        return sb.toString();
+    }
+
+    /** Colour strip, head, name and faction, then food, wood, ore and population; mirrored on the right. */
+    private static void playerRow(HudFrame f, RTSPlayer p, int x, int y, boolean leftSide) {
+        int colour = 0xFF000000 | PlayerColors.getPlayerColorHex(p.name);
+        int stripX = leftSide ? x : x + SIDE_W - 3;
+        f.g.fill(stripX, y + 2, stripX + 3, y + ROW_H - 2, colour);
+
+        int headX = leftSide ? x + 7 : x + SIDE_W - 7 - 14;
+        head(f, p, headX, y + (ROW_H - 14) / 2, 14);
+
+        int nameW = NAME_W;
+        int nameX = leftSide ? headX + 14 + 5 : headX - 5 - nameW;
+        String name = Text.fit(p.name, nameW);
+        String faction = p.faction != null && !p.faction.getName().isEmpty() ? MiscUtil.getFactionName(p.faction) : "";
+        if (leftSide) {
+            Text.draw(f.g, name, nameX, y + 3, Theme.TEXT);
+            Text.small(f.g, faction, nameX, y + 13, Theme.MUTED);
+        } else {
+            Text.draw(f.g, name, nameX + nameW - Text.width(name), y + 3, Theme.TEXT);
+            Text.smallRight(f.g, faction, nameX + nameW, y + 13, Theme.MUTED);
+        }
+
+        // the same cells as the player's own bar: value, income per minute and workers, divided
+        Resources res = ResourcesClientEvents.getResources(p.name);
+        Rect bar = null;
+        if (res != null) {
+            int barW = 0;
+            for (int w : cols)
+                barW += w;
+            int bx = leftSide ? nameX + nameW + 6 : nameX - 6 - barW;
+            Theme.divider(f.g, leftSide ? bx - 1 : bx + barW, y + 3, 1, ROW_H - 6);
+            bar = TopLeftPanel.renderResources(f, bx, y, p.name, res, false, VALUE, cols);
+        }
+
+        Rect row = new Rect(x, y, SIDE_W, ROW_H);
+        Button b = new ButtonBuilder(p.name).onLeftClick(() -> startFollowing(p.name)).build();
+        Rect cells = bar;
+        // over the resource cells their own tooltip (income, spending, workers) shows instead
+        f.register(b, row, null, () -> cells != null && f.hovered(cells) ? null : Tooltip.of(p.name).status(I18n.get("hud.reignofnether.spectator.click_follow"), Theme.MUTED));
+        if (p.name.equals(follow))
+            Theme.ring(f.g, x, y, SIDE_W, ROW_H, 1, Theme.GOLD);
+    }
+
+    private static void head(HudFrame f, RTSPlayer p, int x, int y, int size) {
+        Theme.outline(f.g, x, y, size, size, 1, Theme.INK);
+        AbstractClientPlayer player = playerEntity(p.name);
+        if (player != null && player.isSkinLoaded()) {
+            ResourceLocation skin = player.getSkinTextureLocation();
+            f.g.blit(skin, x, y, size, size, 8f, 8f, 8, 8, 64, 64);
+            f.g.blit(skin, x, y, size, size, 40f, 8f, 8, 8, 64, 64);
+        } else if (p.faction != null && p.faction.icon != null) {
+            MyRenderer.renderIcon(f.g, p.faction.icon, x, y, size);
+        }
+    }
+
+    @Nullable
+    private static AbstractClientPlayer playerEntity(String name) {
+        if (MC.level == null)
+            return null;
+        for (AbstractClientPlayer pl : MC.level.players())
+            if (pl.getName().getString().equals(name))
+                return pl;
+        return null;
+    }
+
+    // ------------------------------------------------------------------ army
+
+    private static final ResourceLocation ARMY_ICON = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/sword_and_bow.png");
+
+    private record Army(int value, @Nullable HeroUnit hero, Map<String, int[]> units, Map<String, ResourceLocation> icons) { }
+
+    /** Units this client has loaded; the server only sends far units' owner and population, never their type. */
+    private static Army army(String owner) {
+        long tick = System.currentTimeMillis() / 50; // scanned once a tick, not every frame
+        if (tick != armyTick) {
+            armyCache.clear();
+            armyTick = tick;
+        }
+        return armyCache.computeIfAbsent(owner, SpectatorHud::scanArmy);
+    }
+
+    private static final Map<String, Army> armyCache = new HashMap<>();
+    private static long armyTick = -1;
+
+    private static Army scanArmy(String owner) {
+        int value = 0;
+        HeroUnit hero = null;
+        Map<String, int[]> units = new LinkedHashMap<>();
+        Map<String, ResourceLocation> icons = new LinkedHashMap<>();
+        for (LivingEntity e : UnitClientEvents.getAllUnits()) {
+            if (!(e instanceof Unit u) || e instanceof WorkerUnit || !owner.equals(u.getOwnerName()))
+                continue;
+            if (e instanceof HeroUnit h && hero == null)
+                hero = h;
+            var cost = u.getCost();
+            if (cost != null)
+                value += cost.food + cost.wood + cost.ore;
+            if (e instanceof HeroUnit)
+                continue; // the hero has its own line
+            String name = SelectionPanel.displayName(e);
+            units.computeIfAbsent(name, k -> new int[1])[0]++;
+            icons.putIfAbsent(name, MiscUtil.mobHeadIcon(e));
+        }
+        return new Army(value, hero, units, icons);
+    }
+
+    private static final int UNIT = 16;
+    private static final int UNITS_PER_ROW = 6;
+
+    /**
+     * Bottom centre: a small ARMY handle (key 1) that opens one card per player, left team on the left like
+     * the scoreboard, under a bar of army value split by player colour.
+     */
+    private static void renderArmy(HudFrame f, List<RTSPlayer> players) {
+        boolean selection = HudClientEvents.hudSelectedEntity != null || HudClientEvents.hudSelectedPlacement != null;
+        int bottom = selection ? f.layout.console().y() - HudLayout.GAP : f.layout.height() - HudLayout.MARGIN;
+        int pad = 4;
+        int gap = 3;
+
+        String label = I18n.get("hud.reignofnether.spectator.army");
+        String key = Keybindings.nums[1].getCurrentLabel();
+        int handleW = 9 + 4 + Text.smallWidth(label) + 6 + Text.smallWidth(key) + 3 + 10;
+        int handleH = 14;
+
+        List<Army> armies = new ArrayList<>();
+        int unitRows = 1;
+        int cardW = Math.min(CARD_W, (f.layout.width() - 2 * HudLayout.MARGIN - pad * 2 + gap) / Math.max(1, players.size()) - gap);
+        int perRow = Math.max(1, (cardW - 6) / (UNIT + 1));
+        if (armyOpen)
+            for (RTSPlayer p : players) {
+                Army a = army(p.name);
+                armies.add(a);
+                unitRows = Math.max(unitRows, Math.min(2, (a.units().size() + perRow - 1) / perRow));
+            }
+        int cardH = 3 + 10 + 13 + unitRows * (UNIT + 1) + 3;
+        int cardsW = players.size() * (cardW + gap) - gap;
+        int w = armyOpen ? cardsW + pad * 2 : handleW + pad * 2;
+        int h = handleH + pad * 2 + (armyOpen ? cardH + gap : 0);
+        int x = (f.layout.width() - w) / 2;
+        int y = bottom - h;
+        Theme.panel(f.g, x, y, w, h, Theme.floating());
+        f.zone(x, y, w, h);
+
+        // top row: the handle, then the army value bar beside it
+        Rect hr = new Rect(x + pad, y + pad, handleW, handleH);
+        Theme.cell(f.g, hr.x(), hr.y(), hr.w(), hr.h(), armyOpen ? Theme.CellState.ACTIVE : Theme.CellState.READY, f.hovered(hr));
+        MyRenderer.renderIcon(f.g, ARMY_ICON, hr.x() + 5, hr.y() + (handleH - 9) / 2, 9);
+        Text.small(f.g, label, hr.x() + 18, hr.y() + (handleH - 8) / 2, armyOpen ? Theme.GOLD : Theme.BODY);
+        Theme.keyCap(f.g, key, hr.right() - Text.smallWidth(key) - 6, hr.y() + (handleH - 7) / 2, armyOpen ? Theme.GOLD : Theme.MUTED);
+        f.register(new ButtonBuilder(label).onLeftClick(() -> armyOpen = !armyOpen).build(), hr, Keybindings.nums[1], null);
+        if (!armyOpen)
+            return;
+
+        int[] values = armies.stream().mapToInt(Army::value).toArray();
+        splitBar(f, players, values, hr.right() + gap, hr.y() + (handleH - 9) / 2, x + w - pad - hr.right() - gap);
+
+        int cy = hr.bottom() + gap;
+        for (int i = 0; i < players.size(); i++)
+            armyCard(f, players.get(i), armies.get(i), x + pad + i * (cardW + gap), cy, cardW, cardH, perRow, unitRows);
+    }
+
+    /** Name and army value, the hero on one line (portrait, level, health, mana), then units by type. */
+    private static void armyCard(HudFrame f, RTSPlayer p, Army a, int x, int y, int w, int h, int perRow, int rows) {
+        int colour = 0xFF000000 | PlayerColors.getPlayerColorHex(p.name);
+        Theme.card(f.g, x, y, w, h);
+        f.g.fill(x, y, x + w, y + 1, colour);
+        String value = String.valueOf(a.value());
+        Text.draw(f.g, Text.fit(p.name, w - Text.smallWidth(value) - 12), x + 3, y + 3, Theme.TEXT);
+        Text.smallRight(f.g, value, x + w - 3, y + 3, Theme.GOLD);
+
+        int hy = y + 13;
+        if (a.hero() instanceof LivingEntity hero) {
+            ResourceLocation icon = MiscUtil.mobHeadIcon(hero);
+            MyRenderer.renderIcon(f.g, icon, x + 3, hy - 1, 8);
+            String lv = I18n.get("hud.reignofnether.spectator.hero_level", a.hero().getHeroLevel());
+            Text.small(f.g, lv, x + 14, hy, Theme.GOLD);
+            int bx = x + 14 + Text.smallWidth(lv) + 4;
+            int bw = x + w - 3 - bx;
+            float hp = hero.getHealth() / Math.max(1f, hero.getMaxHealth());
+            Theme.bar(f.g, bx, hy + 1, bw, 4, hp, Theme.hpColor(hp));
+            Theme.bar(f.g, bx, hy + 6, bw, 3, a.hero().getMana() / Math.max(1f, a.hero().getMaxMana()), Theme.MANA);
+        } else {
+            Text.small(f.g, I18n.get("hud.reignofnether.spectator.no_hero"), x + 3, hy + 1, Theme.DIM);
+        }
+
+        int uy = hy + 13;
+        int i = 0;
+        for (Map.Entry<String, int[]> unit : a.units().entrySet()) {
+            if (i >= perRow * rows)
+                break;
+            int ux = x + 3 + (i % perRow) * (UNIT + 1);
+            int uyy = uy + (i / perRow) * (UNIT + 1);
+            f.g.fill(ux, uyy, ux + UNIT, uyy + UNIT, Theme.RAISED);
+            MyRenderer.renderIcon(f.g, a.icons().get(unit.getKey()), ux, uyy, UNIT);
+            String n = String.valueOf(unit.getValue()[0]);
+            Text.smallShadowed(f.g, n, ux + UNIT - Text.smallWidth(n), uyy + UNIT - 7, Theme.TEXT);
+            f.register(new ButtonBuilder(unit.getKey()).build(), new Rect(ux, uyy, UNIT, UNIT), null,
+                    () -> Tooltip.of(unit.getKey() + " ×" + unit.getValue()[0]));
+            i++;
+        }
+        if (i == 0)
+            Text.small(f.g, I18n.get("hud.reignofnether.spectator.no_army"), x + 3, uy + 3, Theme.DIM);
+    }
+
+    /** One bar split by player colour, each part sized by its share and labelled with its value. */
+    private static void splitBar(HudFrame f, List<RTSPlayer> players, int[] values, int x, int y, int w) {
+        int total = 0;
+        for (int v : values)
+            total += v;
+        int h = 9;
+        f.g.fill(x, y, x + w, y + h, Theme.INK);
+        if (total <= 0)
+            return;
+        int cx = x;
+        for (int i = 0; i < values.length; i++) {
+            int pw = i == values.length - 1 ? x + w - cx : Math.round(w * values[i] / (float) total);
+            if (pw <= 0)
+                continue;
+            f.g.fill(cx, y, cx + pw, y + h, 0xFF000000 | PlayerColors.getPlayerColorHex(players.get(i).name));
+            String label = String.valueOf(values[i]);
+            if (Text.smallWidth(label) + 4 <= pw)
+                Text.smallShadowed(f.g, label, cx + (pw - Text.smallWidth(label)) / 2, y, Theme.TEXT);
+            cx += pw;
+        }
+    }
+
+    // ------------------------------------------------------------------ camera follow
+
+    private static void startFollowing(String name) {
+        follow = name.equals(follow) ? null : name;
+        if (follow != null && MC.player != null) {
+            followX = MC.player.getX();
+            followZ = MC.player.getZ();
+        }
+    }
+
+    /**
+     * A commander's camera is their player entity, so following them is copying its position every tick.
+     * Panning yourself stops following.
+     */
+    public static void tick() {
+        if (follow == null || MC.player == null || !OrthoviewClientEvents.isEnabled() || !isActive())
+            return;
+        if (Math.abs(MC.player.getX() - followX) > 0.5 || Math.abs(MC.player.getZ() - followZ) > 0.5) {
+            follow = null;
+            return;
+        }
+        AbstractClientPlayer target = playerEntity(follow);
+        if (target == null)
+            return;
+        MC.player.setPos(target.getX(), MC.player.getY(), target.getZ());
+        followX = target.getX();
+        followZ = target.getZ();
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/TopLeftPanel.java b/src/main/java/com/solegendary/reignofnether/hud/panels/TopLeftPanel.java
new file mode 100644
index 000000000..8bf0ca6cf
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/TopLeftPanel.java
@@ -0,0 +1,481 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.config.ReignOfNetherClientConfigs;
+
+import com.solegendary.reignofnether.alliance.AlliancesClient;
+import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.building.BuildingPlacement;
+import com.solegendary.reignofnether.building.buildings.placements.ProductionPlacement;
+import com.solegendary.reignofnether.faction.Faction;
+import com.solegendary.reignofnether.faction.Factions;
+import com.solegendary.reignofnether.gamerules.GameruleClient;
+import com.solegendary.reignofnether.hud.ControlGroup;
+import com.solegendary.reignofnether.hud.GlobalProductionQueue;
+import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.items.ItemClientEvents;
+import com.solegendary.reignofnether.items.RandomItemDropRule;
+import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
+import com.solegendary.reignofnether.player.PlayerClientEvents;
+import com.solegendary.reignofnether.player.PlayerColors;
+import com.solegendary.reignofnether.player.RTSPlayer;
+import com.solegendary.reignofnether.resources.IncomeTracker;
+import com.solegendary.reignofnether.resources.ResourceName;
+import com.solegendary.reignofnether.resources.ResourceSources;
+import com.solegendary.reignofnether.resources.Resources;
+import com.solegendary.reignofnether.resources.ResourcesClientEvents;
+import com.solegendary.reignofnether.sandbox.SandboxClientEvents;
+import com.solegendary.reignofnether.time.TimeUtils;
+import com.solegendary.reignofnether.tutorial.TutorialClientEvents;
+import com.solegendary.reignofnether.ui.Icon;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import com.solegendary.reignofnether.unit.UnitClientEvents;
+import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
+import com.solegendary.reignofnether.util.MyRenderer;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.LivingEntity;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Supplier;
+
+/** Top-left of the HUD: resource bar, then control groups and the global production queue on one row below it. */
+public final class TopLeftPanel {
+
+    private TopLeftPanel() { }
+
+    private static final int CELL_H = HudLayout.TOP_CARD_H;
+    private static final int CELL_MIN_W = 58;
+    private static final int TILE = HudLayout.CELL;
+    private static final int TILE_GAP = 5;
+    private static final float VALUE = Text.px(20); // medium, like the spectator scoreboard
+    private static final ResourceLocation WORKER_ICON =
+            ResourceLocation.fromNamespaceAndPath(com.solegendary.reignofnether.ReignOfNether.MOD_ID, "textures/mobheads/villager.png");
+
+    public static void render(HudFrame f) {
+        int x = HudLayout.MARGIN;
+        int y = HudLayout.MARGIN;
+
+        String viewed = viewedPlayer();
+        // sandbox players have the NONE faction too, but keep their bar for testing costs
+        Resources resources = viewed != null && (PlayerClientEvents.getPlayerFaction(viewed) != Factions.NONE
+                || SandboxClientEvents.isSandboxPlayer(viewed))
+                ? ResourcesClientEvents.getResources(viewed) : null;
+        String self = selfName();
+
+        // an eye when looking at someone else's economy or spectating; the explanation is on hover
+        if (viewed != null && !viewed.equals(self) && resources != null) {
+            eyeBanner(f, x, y, viewed, I18n.get("hud.reignofnether.players_resources", viewed));
+            y += 14;
+        } else if (resources == null && !PlayerClientEvents.isRTSPlayer() && !TutorialClientEvents.isEnabled()) {
+            eyeBanner(f, x, y, "", I18n.get("hud.reignofnether.you_are_spectator"));
+            y += 14;
+        }
+
+        int rowY = y;
+        if (resources != null) {
+            Rect bar = renderResources(f, x, y, viewed, resources);
+            rowY = bar.bottom() + HudLayout.GAP;
+        }
+        renderGroupsAndQueue(f, x, rowY, viewed);
+    }
+
+    private static void eyeBanner(HudFrame f, int x, int y, String name, String tooltip) {
+        Icon.EYE.draw(f.g, x, y, 12, Theme.GOLD);
+        if (!name.isEmpty())
+            Text.draw(f.g, name, x + 15, y + 2, Theme.GOLD);
+        Rect r = new Rect(x, y, 15 + (name.isEmpty() ? 0 : Text.width(name)), 12);
+        f.register(new ButtonBuilder("viewing").build(), r, null, () -> Tooltip.of(tooltip));
+    }
+
+    /**
+     * The player whose economy is shown: the owner of the selection when it's you or an ally (or you
+     * are spectating), otherwise yourself. Selecting an enemy no longer hides your own resources.
+     */
+    @Nullable
+    private static String viewedPlayer() {
+        String self = selfName();
+        String sel = null;
+        if (!UnitClientEvents.getSelectedUnits().isEmpty() && UnitClientEvents.getSelectedUnits().get(0) instanceof Unit u)
+            sel = u.getOwnerName();
+        if (!BuildingClientEvents.getSelectedBuildings().isEmpty())
+            sel = BuildingClientEvents.getSelectedBuildings().get(0).ownerName;
+
+        boolean canSee = sel != null && (sel.equals(self) || AlliancesClient.isAllied(self, sel)
+                || !PlayerClientEvents.isRTSPlayer()
+                || (SandboxClientEvents.isSandboxPlayer() && PlayerClientEvents.isRTSPlayer(sel)));
+        if (canSee)
+            return sel;
+        return PlayerClientEvents.isRTSPlayer() ? self : sel;
+    }
+
+    private static String selfName() {
+        var player = Minecraft.getInstance().player;
+        return player != null ? player.getName().getString() : "";
+    }
+
+    // ------------------------------------------------------------------ resources
+
+    private record Cell(ResourceLocation icon, String value, String sub, int subColour, @Nullable String workers,
+                        boolean alarm, Supplier<Tooltip> tooltip) { }
+
+    static Rect renderResources(HudFrame f, int x, int y, String owner, Resources res) {
+        return renderResources(f, x, y, owner, res, true, VALUE, null);
+    }
+
+    /** Each cell's width in an owner's compact (scoreboard) resource bar, to lay it out before drawing. */
+    static int[] resourceWidths(String owner, Resources res, float valueScale) {
+        return widths(cells(owner, res, true), valueScale);
+    }
+
+    /** @param compact the scoreboard's narrower cells: the emerald and population sub-lines go in their tooltips */
+    private static List<Cell> cells(String owner, Resources res, boolean compact) {
+        List<Cell> cells = new ArrayList<>();
+        RTSPlayer rtsPlayer = PlayerClientEvents.getPlayer(owner);
+        int[] workers = countWorkers(owner);
+        cells.add(resourceCell(owner, ResourceName.FOOD, ButtonCell.ICON_FOOD, res.food, workers[0]));
+        cells.add(resourceCell(owner, ResourceName.WOOD, ButtonCell.ICON_WOOD, res.wood, workers[1]));
+        cells.add(resourceCell(owner, ResourceName.ORE, ButtonCell.ICON_ORE, res.ore, workers[2]));
+        if (ItemClientEvents.ENABLED) {
+            int found = rtsPlayer != null ? rtsPlayer.itemsDropped : 0;
+            String foundText = I18n.get("hud.reignofnether.items_found_short", found);
+            cells.add(new Cell(ButtonCell.ICON_EMERALD, String.format(java.util.Locale.US, "%,d", res.emerald),
+                    compact ? "" : foundText, Theme.MUTED, null, false, () -> {
+                Tooltip t = Tooltip.of(I18n.get("resources.reignofnether.emerald")).tag(I18n.get("hud.reignofnether.tag.resource"), Theme.EMERALD);
+                if (GameruleClient.randomItemDrops != RandomItemDropRule.DISABLED)
+                    t.body(I18n.get("hud.reignofnether.items_hint")).body(I18n.get("hud.reignofnether.items_found_desc"));
+                if (compact)
+                    t.status(foundText, Theme.MUTED);
+                return t;
+            }));
+        }
+        cells.add(populationCell(owner, workers[3], compact));
+        return cells;
+    }
+
+    private static int[] widths(List<Cell> cells, float valueScale) {
+        int[] widths = new int[cells.size()];
+        for (int i = 0; i < cells.size(); i++) {
+            Cell c = cells.get(i);
+            int textW = Math.max(Text.bigWidth(c.value, valueScale), Text.smallWidth(c.sub) + (c.workers != null ? Text.smallWidth(c.workers) + 14 : 0));
+            widths[i] = Math.max(CELL_MIN_W, 7 + 15 + 6 + textW + 8);
+        }
+        return widths;
+    }
+
+    /**
+     * @param framed     false inside another panel (the spectator scoreboard): the cells without their own card
+     * @param valueScale size of the values: big on the player's own bar, medium on the scoreboard
+     * @param colWidths  cell widths to use, so several bars line up in columns; null to fit this bar's values
+     */
+    static Rect renderResources(HudFrame f, int x, int y, String owner, Resources res, boolean framed,
+                                float valueScale, @Nullable int[] colWidths) {
+        List<Cell> cells = cells(owner, res, !framed);
+        int[] widths = colWidths != null && colWidths.length == cells.size() ? colWidths : widths(cells, valueScale);
+        int total = 0;
+        for (int w : widths)
+            total += w;
+        Rect bar = new Rect(x, y, total, CELL_H);
+        if (framed)
+            Theme.panel(f.g, x, y, total, CELL_H, Theme.floating());
+        f.zone(bar);
+
+        int cx = x;
+        for (int i = 0; i < cells.size(); i++) {
+            Cell c = cells.get(i);
+            int w = widths[i];
+            Rect r = new Rect(cx, y, w, CELL_H);
+            if (c.alarm)
+                f.g.fill(cx, y, cx + w, y + CELL_H, Theme.ALARM_TINT);
+            if (f.hovered(r))
+                f.g.fill(cx, y, cx + w, y + CELL_H, Theme.HOVER);
+            MyRenderer.renderIcon(f.g, c.icon, cx + 7, y + 8, 15);
+            int tx = cx + 7 + 15 + 6;
+            // the value's top, so a big or a medium value both end just above the sub-line; centred when it has none
+            int vy = !c.sub.isEmpty() || c.workers != null ? y + 16 - Text.bigHeight(valueScale) : y + (CELL_H - Text.bigHeight(valueScale)) / 2;
+            Text.big(f.g, c.value, tx, vy, c.alarm ? Theme.ERROR : Theme.TEXT, valueScale);
+            Text.small(f.g, c.sub, tx, y + 19, c.alarm ? Theme.ERROR : c.subColour);
+            if (c.workers != null) {
+                int wx = tx + Text.smallWidth(c.sub) + 5;
+                MyRenderer.renderIcon(f.g, workerIcon(owner), wx, y + 21, 6);
+                Text.small(f.g, c.workers, wx + 8, y + 19, Theme.MUTED);
+            }
+            if (i < cells.size() - 1)
+                Theme.divider(f.g, cx + w - 1, y + 1, 1, CELL_H - 2);
+            if (f.hovered(r))
+                c.tooltip.get().show(r.x(), r.y(), r.w(), r.h());
+            cx += w;
+        }
+        return bar;
+    }
+
+    private static ResourceLocation workerIcon(String owner) {
+        RTSPlayer player = PlayerClientEvents.getPlayer(owner);
+        return player != null && player.faction != null ? player.faction.idleWorkerIcon : WORKER_ICON;
+    }
+
+    // every player's drop-offs reach every client, so the income shows for anyone whose bar is visible
+    private static Cell resourceCell(String owner, ResourceName name, ResourceLocation icon, int value, int workers) {
+        String lower = name.name().toLowerCase();
+        int rate = IncomeTracker.perMinute(owner, name);
+        // "+200/-330": gathered/spent per minute
+        String sub = I18n.get("hud.reignofnether.gain_spend_short", rate, IncomeTracker.spentPerMinute(owner, name));
+        return new Cell(icon, String.format(java.util.Locale.US, "%,d", value), sub, Theme.MUTED, String.valueOf(workers), false, () ->
+                Tooltip.of(I18n.get("resources.reignofnether." + lower))
+                        .tag(I18n.get("hud.reignofnether.tag.resource"), Theme.ORANGE)
+                        .body(I18n.get("hud.reignofnether.resource_desc." + lower))
+                        .status(I18n.get("hud.reignofnether.gain_per_minute", IncomeTracker.perMinute(owner, name)), Theme.OK)
+                        .status(I18n.get("hud.reignofnether.spend_per_minute", IncomeTracker.spentPerMinute(owner, name)), Theme.ERROR)
+                        .status(I18n.get("hud.reignofnether.workers_on", workers), Theme.MUTED));
+    }
+
+    private static Cell populationCell(String owner, int workers, boolean compact) {
+        int pop = UnitClientEvents.getCurrentPopulation(owner);
+        int supply = BuildingClientEvents.getTotalPopulationSupply(owner);
+        int max = GameruleClient.maxPopulation;
+        // blocked by housing only: 0/0 has nothing to house, and at the max population more housing wouldn't help
+        boolean full = pop > 0 && pop >= supply && supply < max;
+        String sub = full ? I18n.get("hud.reignofnether.housing_full") : I18n.get("hud.reignofnether.max_short", max);
+        return new Cell(PlayerColors.getPlayerColorBedIcon(owner), pop + "/" + supply, compact ? "" : sub, Theme.MUTED,
+                String.valueOf(workers), full, () -> {
+            Tooltip t = Tooltip.of(I18n.get("resources.reignofnether.population"))
+                    .tag(I18n.get("hud.reignofnether.tag.resource"), Theme.ORANGE)
+                    .body(I18n.get(populationDescKey(owner)));
+            if (compact)
+                t.status(sub, full ? Theme.ERROR : Theme.MUTED);
+            if (full)
+                t.status(I18n.get("hud.reignofnether.housing_full_hint"), Theme.ERROR);
+            return t;
+        });
+    }
+
+    private static String populationDescKey(String owner) {
+        Faction faction = PlayerClientEvents.getPlayerFaction(owner);
+        String key = "hud.reignofnether.resource_desc.population";
+        if (faction == Factions.VILLAGERS)
+            return key + ".villagers";
+        if (faction == Factions.MONSTERS)
+            return key + ".monsters";
+        if (faction == Factions.PIGLINS)
+            return key + ".piglins";
+        return key;
+    }
+
+    /**
+     * One pass over the owner's workers: {food, wood, ore, total}. A worker counts towards a resource when
+     * gathering or carrying it (unless idle); hunters count towards food.
+     */
+    static int[] countWorkers(String owner) {
+        long tick = System.currentTimeMillis() / 50; // counted once a tick: every bar and scoreboard row asks each frame
+        if (tick != workerCountTick) {
+            workerCounts.clear();
+            workerCountTick = tick;
+        }
+        return workerCounts.computeIfAbsent(owner, TopLeftPanel::scanWorkers);
+    }
+
+    private static final java.util.Map<String, int[]> workerCounts = new java.util.HashMap<>();
+    private static long workerCountTick = -1;
+
+    private static int[] scanWorkers(String owner) {
+        int[] counts = new int[4];
+        for (LivingEntity le : UnitClientEvents.getAllUnits()) {
+            if (!(le instanceof Unit u) || !(le instanceof WorkerUnit wu) || !u.getOwnerName().equals(owner))
+                continue;
+            counts[3]++;
+            boolean hunting = ResourceSources.isHuntableAnimal(u.getTargetGoal().getTarget());
+            if (hunting)
+                counts[0]++;
+            if (UnitClientEvents.idleWorkerIds.contains(le.getId()))
+                continue;
+            boolean returning = u.getReturnResourcesGoal() != null;
+            Resources carried = returning ? Resources.getTotalResourcesFromItems(u.getItems()) : null;
+            ResourceName target = wu.getGatherResourceGoal().getTargetResourceName();
+            if (!hunting && (target == ResourceName.FOOD || (returning && carried.food > 0)))
+                counts[0]++;
+            if (target == ResourceName.WOOD || (returning && carried.wood > 0))
+                counts[1]++;
+            if (target == ResourceName.ORE || (returning && carried.ore > 0))
+                counts[2]++;
+        }
+        return counts;
+    }
+
+    // ------------------------------------------------------------------ control groups, then the queue below
+
+    private static void renderGroupsAndQueue(HudFrame f, int x, int y, @Nullable String owner) {
+        int cx = x;
+        for (ControlGroup group : HudClientEvents.controlGroups) {
+            group.clean();
+            if (group.isEmpty())
+                continue;
+            renderGroup(f, group, cx, y);
+            cx += TILE + TILE_GAP;
+        }
+
+        if (owner == null || !canSeeQueue(owner))
+            return;
+        List<GlobalProductionQueue.Group> queue = GlobalProductionQueue.forPlayer(owner);
+        if (queue.isEmpty())
+            return;
+
+        // the queue continues the groups' row, after a divider and a vertical label, like the design; when it
+        // doesn't fit before the middle of the screen, or the player wants it apart, it takes its own row(s) under
+        // the groups instead
+        int limit = f.layout.width() / 2;
+        int step = TILE + TILE_GAP;
+        int labelW = 7 + TILE_GAP;
+        int divider = cx > x ? 1 + TILE_GAP : 0;
+        if (cx > x && (ReignOfNetherClientConfigs.QUEUE_OWN_ROW.get() || cx + divider + labelW + queue.size() * step - TILE_GAP > limit)) {
+            cx = x;
+            y += step;
+            divider = 0;
+        }
+        if (divider > 0) {
+            Theme.divider(f.g, cx, y, 1, TILE);
+            cx += divider;
+        }
+        String label = I18n.get("hud.reignofnether.queue");
+        f.g.pose().pushPose();
+        f.g.pose().translate(cx, y + (TILE + Text.smallWidth(label)) / 2f, 0);
+        f.g.pose().mulPose(com.mojang.math.Axis.ZP.rotationDegrees(-90));
+        Text.smallShadowed(f.g, label, 0, -1, Theme.GOLD);
+        f.g.pose().popPose();
+        int qx = cx + labelW;
+        int perRow = Math.max(1, (limit - qx + TILE_GAP) / step);
+        boolean own = owner.equals(selfName());
+        for (int i = 0; i < queue.size(); i++)
+            renderQueueTile(f, queue.get(i), qx + (i % perRow) * step, y + (i / perRow) * step, own);
+    }
+
+    private static boolean canSeeQueue(String owner) {
+        return owner.equals(selfName()) || !PlayerClientEvents.isRTSPlayer() || SandboxClientEvents.isSandboxPlayer()
+                || AlliancesClient.isAllied(selfName(), owner);
+    }
+
+    private static void renderGroup(HudFrame f, ControlGroup group, int x, int y) {
+        Button b = group.getButton();
+        Rect r = new Rect(x, y, TILE, TILE);
+        boolean selected = isGroupSelected(group);
+        Theme.cell(f.g, x, y, TILE, TILE, selected ? Theme.CellState.ACTIVE : Theme.CellState.READY, f.hovered(r));
+        if (group.getIcon() != null)
+            MyRenderer.renderIcon(f.g, group.getIcon(), x + 7, y + 6, 14);
+
+        List<LivingEntity> members = groupEntities(group);
+        int count = members.isEmpty() ? group.buildingBps.size() : members.size();
+        float hp = averageHealth(group, members);
+        String label = group.getKeybinding() != null ? group.getKeybinding().getCurrentLabel() : "";
+        Theme.keyCap(f.g, label, x + 1, y + 1, selected ? Theme.GOLD : Theme.MUTED);
+        String n = String.valueOf(count);
+        Text.smallShadowed(f.g, n, x + TILE - Text.smallWidth(n) - 2, y + TILE - 13, Theme.TEXT);
+        Theme.bar(f.g, x + 3, y + TILE - 4, TILE - 6, 2, hp, Theme.hpColor(hp));
+
+        f.register(b, r, group.getKeybinding(), () -> Tooltip.of(I18n.get("hud.control_group.reignofnether.title", label))
+                .body(composition(members))
+                .status(I18n.get("hud.control_group.reignofnether.keys", label), Theme.LABEL)
+                .status(I18n.get("hud.control_group.reignofnether.mouse"), Theme.LABEL));
+    }
+
+    private static boolean isGroupSelected(ControlGroup group) {
+        var selected = UnitClientEvents.getSelectedUnits();
+        if (!group.entityIds.isEmpty()) {
+            if (selected.size() != group.entityIds.size())
+                return false;
+            Set<Integer> ids = new HashSet<>(group.entityIds);
+            return selected.stream().allMatch(e -> ids.contains(e.getId()));
+        }
+        var buildings = BuildingClientEvents.getSelectedBuildings();
+        return !group.buildingBps.isEmpty() && buildings.size() == group.buildingBps.size()
+                && buildings.stream().allMatch(b -> group.buildingBps.contains(b.originPos));
+    }
+
+    private static List<LivingEntity> groupEntities(ControlGroup group) {
+        List<LivingEntity> list = new ArrayList<>();
+        Set<Integer> ids = new HashSet<>(group.entityIds);
+        for (LivingEntity e : UnitClientEvents.getAllUnits())
+            if (ids.contains(e.getId()))
+                list.add(e);
+        return list;
+    }
+
+    private static float averageHealth(ControlGroup group, List<LivingEntity> members) {
+        float sum = 0;
+        int n = 0;
+        for (LivingEntity e : members) {
+            sum += e.getHealth() / Math.max(1, e.getMaxHealth());
+            n++;
+        }
+        if (n == 0)
+            for (BuildingPlacement b : BuildingClientEvents.getBuildings())
+                if (group.buildingBps.contains(b.originPos)) {
+                    sum += b.getHealth() / (float) Math.max(1, b.getMaxHealth());
+                    n++;
+                }
+        return n == 0 ? 1f : sum / n;
+    }
+
+    private static String composition(List<LivingEntity> members) {
+        java.util.Map<String, Integer> counts = new java.util.LinkedHashMap<>();
+        for (LivingEntity e : members)
+            counts.merge(SelectionPanel.displayName(e), 1, Integer::sum);
+        StringBuilder sb = new StringBuilder();
+        counts.forEach((name, n) -> sb.append(sb.isEmpty() ? "" : ", ").append(n).append(" ").append(name));
+        return sb.toString();
+    }
+
+    private static void renderQueueTile(HudFrame f, GlobalProductionQueue.Group group, int x, int y, boolean own) {
+        Rect r = new Rect(x, y, TILE, TILE);
+        Theme.cell(f.g, x, y, TILE, TILE, Theme.CellState.READY, f.hovered(r));
+
+        Button cancel = group.item.getCancelButton(group.soonestPlacement, group.inProgress);
+        if (cancel.iconResource != null)
+            MyRenderer.renderIcon(f.g, cancel.iconResource, x + 7, y + 3, 14);
+        if (group.count > 1) {
+            String n = "×" + group.count;
+            Text.smallShadowed(f.g, n, x + TILE - Text.smallWidth(n) - 1, y - 1, Theme.TEXT);
+        }
+        boolean blocked = group.isPopBlocked();
+        String time = blocked ? I18n.get("hud.reignofnether.pop_short") : group.inProgress ? TimeUtils.formatSeconds(group.secondsLeft()) : "";
+        Text.smallShadowed(f.g, time, x + (TILE - Text.smallWidth(time)) / 2, y + TILE - 12, blocked ? Theme.ERROR : Theme.BODY);
+        Theme.bar(f.g, x + 3, y + TILE - 3, TILE - 6, 2, group.progress(), blocked ? Theme.ERROR : Theme.ORANGE);
+
+        Runnable cancelOne = cancel.onLeftClick;
+        Button b = new ButtonBuilder(cancel.name)
+                .onLeftClick(() -> selectNextProducer(group))
+                .onRightClick(own ? cancelOne : null)
+                .build();
+        f.register(b, r, null, () -> {
+            Tooltip t = Tooltip.of(cancel.name + (group.count > 1 ? " ×" + group.count : ""))
+                    .tag(I18n.get("hud.reignofnether.tag.in_production"), Theme.ORANGE);
+            if (blocked)
+                t.status(I18n.get("hud.reignofnether.paused_population"), Theme.ERROR);
+            else if (group.inProgress)
+                t.status(I18n.get("hud.reignofnether.next_ready_in", TimeUtils.formatSeconds(group.secondsLeft())), Theme.MUTED);
+            t.status(I18n.get(own ? "hud.reignofnether.queue_hint" : "hud.reignofnether.queue_hint_view"), Theme.LABEL);
+            return t;
+        });
+    }
+
+    private static void selectNextProducer(GlobalProductionQueue.Group group) {
+        if (group.placements.isEmpty())
+            return;
+        ProductionPlacement next = group.placements.get(0);
+        if (HudClientEvents.hudSelectedPlacement instanceof ProductionPlacement current && group.placements.contains(current))
+            next = group.placements.get((group.placements.indexOf(current) + 1) % group.placements.size());
+        BuildingClientEvents.clearSelectedBuildings();
+        UnitClientEvents.clearSelectedUnits();
+        BuildingClientEvents.addSelectedBuilding(next);
+        OrthoviewClientEvents.centreCameraOnPos(next.centrePos);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/panels/TopRightPanel.java b/src/main/java/com/solegendary/reignofnether/hud/panels/TopRightPanel.java
new file mode 100644
index 000000000..65fc157be
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/hud/panels/TopRightPanel.java
@@ -0,0 +1,261 @@
+package com.solegendary.reignofnether.hud.panels;
+
+import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.attackwarnings.AttackWarningClientEvents;
+import com.solegendary.reignofnether.building.BuildingUtils;
+import com.solegendary.reignofnether.building.buildings.placements.BeaconPlacement;
+import com.solegendary.reignofnether.config.ConfigClientEvents;
+import com.solegendary.reignofnether.gamemode.ClientGameModeHelper;
+import com.solegendary.reignofnether.gamemode.GameMode;
+import com.solegendary.reignofnether.gamerules.GameruleClient;
+import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.buttons.HelperButtons;
+import com.solegendary.reignofnether.hud.buttons.StartButtons;
+import com.solegendary.reignofnether.hud.custombutton.CustomButtonClientEvents;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.hud.playerdisplay.PlayerDisplayClientEvents;
+import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.player.PlayerClientEvents;
+import com.solegendary.reignofnether.scenario.ScenarioClientEvents;
+import com.solegendary.reignofnether.startpos.StartPosClientEvents;
+import com.solegendary.reignofnether.survival.SurvivalClientEvents;
+import com.solegendary.reignofnether.time.TimeClientEvents;
+import com.solegendary.reignofnether.time.TimeUtils;
+import com.solegendary.reignofnether.tutorial.TutorialClientEvents;
+import com.solegendary.reignofnether.tutorial.TutorialStage;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import com.solegendary.reignofnether.unit.UnitClientEvents;
+import com.solegendary.reignofnether.util.MyRenderer;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.resources.ResourceLocation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Top-right of the HUD: the utility bar (idle workers, army, players, chat), a second row with the
+ * buttons that only exist in some situations (match start, scenario, beacon, game rules,
+ * datapack buttons), the clock to the left of the bar and the attack alert under it.
+ */
+public final class TopRightPanel {
+
+    private TopRightPanel() { }
+
+    private static final int BTN = HudLayout.CELL;
+    private static final int GAP = 3;
+    private static final int PAD = (HudLayout.TOP_CARD_H - BTN) / 2;
+
+    static final ResourceLocation MOON = rl("textures/hud/moon.png");
+    static final ResourceLocation BLOOD_MOON = rl("textures/hud/blood_moon.png");
+    private static final ResourceLocation WARNING = rl("textures/hud/warning.png");
+    static final ItemStack CLOCK = new ItemStack(Items.CLOCK);
+
+    private static ResourceLocation rl(String path) {
+        return ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, path);
+    }
+
+    public static int bottom = 48; // where the free space under the panel starts, for the debug text
+
+    public static void render(HudFrame f) {
+        int right = f.layout.width() - HudLayout.MARGIN;
+        int top = HudLayout.MARGIN;
+
+        List<Button> main = new ArrayList<>();
+        addIfShown(main, HelperButtons.idleWorkerButton);
+        addIfShown(main, HelperButtons.armyButton);
+        if (!SpectatorHud.isActive()) // the scoreboard already shows every player
+            addIfShown(main, PlayerDisplayClientEvents.observerButton);
+        addIfShown(main, PlayerDisplayClientEvents.diplomacyButton);
+        addIfShown(main, TutorialClientEvents.helpButton);
+
+        Rect bar = renderBar(f, main, right, top);
+        int barLeft = bar.isEmpty() ? right : bar.x();
+        // a fixed second row, under the clock, so the contextual buttons don't jump as the main ones come and go
+        int below = top + HudLayout.TOP_CARD_H + HudLayout.GAP;
+
+        // spectators have the clock in their scoreboard
+        if (TutorialClientEvents.isAtOrPastStage(TutorialStage.MINIMAP_CLICK) && !SpectatorHud.isActive())
+            renderClock(f, barLeft - (bar.isEmpty() ? 0 : HudLayout.GAP), top);
+
+        Rect contextBar = renderBar(f, contextButtons(), right, below);
+        if (!contextBar.isEmpty())
+            below = contextBar.bottom() + HudLayout.GAP;
+        bottom = renderAlert(f, right, below);
+    }
+
+    private static void addIfShown(List<Button> list, Button b) {
+        if (b != null && !b.isHidden.get())
+            list.add(b);
+    }
+
+    /** Draws buttons right-aligned at (right, top) in one panel. Returns the panel rectangle. */
+    private static Rect renderBar(HudFrame f, List<Button> buttons, int right, int top) {
+        if (buttons.isEmpty())
+            return Rect.EMPTY;
+        int w = PAD * 2 + buttons.size() * BTN + (buttons.size() - 1) * GAP;
+        int h = PAD * 2 + BTN;
+        int x = right - w;
+        Theme.panel(f.g, x, top, w, h, Theme.floating());
+        f.zone(x, top, w, h);
+        int bx = x + PAD;
+        for (Button b : buttons) {
+            String key = b.hotkey != null ? b.hotkey.getCurrentLabel() : null;
+            Rect cell = new Rect(bx, top + PAD, BTN, BTN);
+            ButtonCell.render(f.g, b, bx, top + PAD, BTN, key, f.hovered(cell));
+            f.register(b, cell, b.hotkey, () -> ButtonCell.tooltipFor(b, key));
+            bx += BTN + GAP;
+        }
+        // badges last, so the next button never covers them
+        int idle = buttons.indexOf(HelperButtons.idleWorkerButton);
+        if (idle >= 0)
+            Theme.badge(f.g, String.valueOf(UnitClientEvents.idleWorkerIds.size()), x + PAD + idle * (BTN + GAP) + BTN + 3, top + PAD - 3);
+        return new Rect(x, top, w, h);
+    }
+
+    /** Buttons that only appear in some game states, in a second row under the utility bar. */
+    private static List<Button> contextButtons() {
+        List<Button> list = new ArrayList<>();
+        if (!PlayerClientEvents.isRTSPlayer() && !PlayerClientEvents.rtsLocked) {
+            if (GameruleClient.scenarioMode) {
+                Button cycleRole = ScenarioClientEvents.getCycleRoleToPlayButton();
+                if (cycleRole != null)
+                    list.add(cycleRole);
+                list.add(ScenarioClientEvents.getScenarioStartButton());
+            } else {
+                addIfShown(list, ConfigClientEvents.getDiffsButton());
+                if (ClientGameModeHelper.gameMode != GameMode.SANDBOX) {
+                    if (!StartPosClientEvents.isEnabled()) {
+                        addIfShown(list, StartButtons.villagerStartButton);
+                        addIfShown(list, StartButtons.monsterStartButton);
+                        addIfShown(list, StartButtons.piglinStartButton);
+                    }
+                } else {
+                    addIfShown(list, StartButtons.sandboxStartButton);
+                }
+                Button gamemode = ClientGameModeHelper.getButton();
+                if (gamemode != null && !TutorialClientEvents.isEnabled())
+                    addIfShown(list, gamemode);
+            }
+        } else if (SurvivalClientEvents.isEnabled) {
+            addIfShown(list, SurvivalClientEvents.getNextWaveButton());
+        }
+
+        BeaconPlacement beacon = BuildingUtils.getBeacon(true);
+        if (beacon != null)
+            addIfShown(list, HelperButtons.getBeaconButton(beacon.ownerName));
+
+        for (ResourceLocation id : CustomButtonClientEvents.alwaysRenderButtons)
+            addIfShown(list, CustomButtonClientEvents.getButton(id));
+        if (HudClientEvents.hudSelectedEntity != null) {
+            var ids = CustomButtonClientEvents.entityMappings.get(HudClientEvents.hudSelectedEntity.getType());
+            if (ids != null)
+                for (ResourceLocation id : ids)
+                    addIfShown(list, CustomButtonClientEvents.getButton(id));
+        }
+        if (HudClientEvents.hudSelectedPlacement != null) {
+            var ids = CustomButtonClientEvents.buildingMappings.get(HudClientEvents.hudSelectedPlacement.getBuilding());
+            if (ids != null)
+                for (ResourceLocation id : ids)
+                    addIfShown(list, CustomButtonClientEvents.getButton(id));
+        }
+        return list;
+    }
+
+    // ------------------------------------------------------------------ clock
+
+    private static void renderClock(HudFrame f, int right, int top) {
+        long time = TimeClientEvents.serverNormDayTime;
+        boolean bloodMoon = TimeClientEvents.isBloodMoonActive();
+        boolean day = TimeUtils.isDay(time);
+        boolean showGameTime = PlayerClientEvents.isRTSPlayer() && !SurvivalClientEvents.isEnabled;
+
+        String phase = bloodMoon ? I18n.get("hud.reignofnether.clock.blood_moon")
+                : I18n.get(day ? "hud.reignofnether.clock.day" : "hud.reignofnether.clock.night") + " " + TimeClientEvents.dayNumber();
+        String until = bloodMoon ? TimeUtils.getTimeStrFromTicks(TimeClientEvents.getBloodMoonTicksLeft())
+                : I18n.get(day ? "hud.reignofnether.clock.dusk_in" : "hud.reignofnether.clock.dawn_in",
+                        TimeUtils.getTimeUntilStr(time, day ? TimeUtils.DUSK : TimeUtils.DAWN));
+        String gameTime = TimeUtils.getTimeStrFromTicks(PlayerClientEvents.rtsGameTicks);
+
+        int phaseColour = bloodMoon ? Theme.ERROR : day ? Theme.GOLD : Theme.MANA_TEXT;
+        float big = Text.px(20);
+        int barW = Math.max(80, Text.bigWidth(phase, big) + Text.smallWidth(until) + 10);
+        int timeW = showGameTime ? Math.max(Text.bigWidth(gameTime, big), Text.smallWidth(I18n.get("hud.reignofnether.clock.game_time"))) + 12 : 0;
+        int w = 7 + 15 + 7 + barW + timeW + 7;
+        int h = HudLayout.TOP_CARD_H;
+        int x = right - w;
+        Rect r = new Rect(x, top, w, h);
+        Theme.panel(f.g, x, top, w, h, Theme.floating());
+        if (f.hovered(r))
+            f.g.fill(x, top, x + w, top + h, Theme.HOVER);
+
+        int cy = top + 2; // content offsets are from a 32-high card; this centres them in TOP_CARD_H
+        int ix = x + 7;
+        if (bloodMoon)
+            MyRenderer.renderIcon(f.g, BLOOD_MOON, ix, cy + 8, 15);
+        else if (day)
+            MyRenderer.renderItem(f.g, CLOCK, ix - 1, cy + 7, 15 / 16f);
+        else
+            MyRenderer.renderIcon(f.g, MOON, ix, cy + 8, 15);
+
+        int tx = ix + 15 + 7;
+        Text.big(f.g, phase, tx, cy + 6, phaseColour, big);
+        Text.smallRight(f.g, until, tx + barW, cy + 7, Theme.MUTED);
+        Theme.bar(f.g, tx, cy + 22, barW, 3, phaseProgress(time, day, bloodMoon), phaseColour);
+
+        if (showGameTime) {
+            int gx = tx + barW + 6;
+            Theme.divider(f.g, gx, top + 4, 1, h - 8);
+            int mid = gx + timeW / 2;
+            Text.smallCentered(f.g, I18n.get("hud.reignofnether.clock.game_time"), mid, cy + 4, Theme.DIM);
+            Text.bigCentered(f.g, gameTime, mid, cy + 15, Theme.TEXT, big);
+        }
+
+        f.zone(r);
+        Button clock = new ButtonBuilder("Clock")
+                .onRightClick(TimeClientEvents::centreOnBloodMoon)
+                .build();
+        f.register(clock, r, null, TimeClientEvents::clockTooltip);
+    }
+
+    private static float phaseProgress(long time, boolean day, boolean bloodMoon) {
+        if (bloodMoon)
+            return 1f;
+        long t = TimeUtils.normaliseTime(time);
+        long start = day ? TimeUtils.DAWN : TimeUtils.DUSK;
+        long elapsed = (t - start + 24000) % 24000;
+        return elapsed / 12000f;
+    }
+
+    // ------------------------------------------------------------------ alert
+
+    /** Returns the y under it. */
+    private static int renderAlert(HudFrame f, int right, int top) {
+        Button warning = AttackWarningClientEvents.getWarningButton();
+        if (warning.isHidden.get())
+            return top;
+        String title = I18n.get("hud.reignofnether.under_attack");
+        String hint = I18n.get("hud.reignofnether.under_attack_hint");
+        int w = Math.max(150, 7 + 16 + 7 + Math.max(Text.mediumWidth(title), Text.width(hint)) + 30);
+        int h = HudLayout.TOP_CARD_H;
+        int x = right - w;
+        Rect r = new Rect(x, top, w, h);
+        boolean flash = warning.isSelected.get();
+        Theme.popup(f.g, x, top, w, h, flash ? Theme.ERROR : Theme.DANGER_TEXT);
+        if (flash)
+            Theme.outline(f.g, x - 1, top - 1, w + 2, h + 2, 1, Theme.ALARM_GLOW);
+        int cy = top + 2; // centred in TOP_CARD_H, like the clock
+        MyRenderer.renderIcon(f.g, WARNING, x + 7, cy + 8, 16);
+        Text.medium(f.g, title, x + 30, cy + 5, Theme.ERROR);
+        Text.draw(f.g, hint, x + 30, cy + 17, Theme.LABEL);
+        f.zone(r);
+        f.register(warning, r, Keybindings.jumpToAlert, () -> Tooltip.fromLines(warning.tooltipLines).key(Keybindings.jumpToAlert.getCurrentLabel()));
+        return top + h + HudLayout.GAP;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/AbstractPlayerDisplay.java b/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/AbstractPlayerDisplay.java
index 3256abd70..3c18db5d9 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/AbstractPlayerDisplay.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/AbstractPlayerDisplay.java
@@ -1,48 +1,56 @@
 package com.solegendary.reignofnether.hud.playerdisplay;
 
 import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.alliance.AlliancesClient;
 import com.solegendary.reignofnether.faction.Faction;
+import com.solegendary.reignofnether.fogofwar.FogOfWarClientEvents;
 import com.solegendary.reignofnether.faction.Factions;
 import com.solegendary.reignofnether.hud.buttons.Button;
-import com.solegendary.reignofnether.hud.RectZone;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
 import com.solegendary.reignofnether.player.PlayerColors;
 import com.solegendary.reignofnether.player.RTSPlayer;
-import com.solegendary.reignofnether.util.MiscUtil;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
 import com.solegendary.reignofnether.util.MyRenderer;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.resources.ResourceLocation;
 
 import javax.annotation.Nullable;
+import net.minecraft.client.multiplayer.PlayerInfo;
+import net.minecraft.client.resources.language.I18n;
 
+/** One row of the player panels: the player's colour, faction, head, name and a status line. */
 public abstract class AbstractPlayerDisplay {
 
     private static final Minecraft MC = Minecraft.getInstance();
 
+    public static final int ROW_H = 32;
+    private static final int NAME_W = 120;
+    /** Where a row's content starts, after the colour strip, faction, head and name. */
+    public static final int CONTENT_X = 3 + 7 + 13 + 7 + 16 + 7 + NAME_W + 7;
+    private static final ResourceLocation DEFAULT_HEAD = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_back.png");
+
     public final String playerName;
     public final Faction faction;
     public final @Nullable AbstractClientPlayer player;
 
-    private int color;
-    private int backgroundColor;
-
     public AbstractPlayerDisplay(RTSPlayer rtsPlayer) {
-        var server = MC.getCurrentServer();
-        if (server != null) {
-            AbstractClientPlayer found = null;
+        AbstractClientPlayer found = null;
+        if (MC.getCurrentServer() != null) {
             for (AbstractClientPlayer p : MC.level.players()) {
                 if (p.getName().getString().equals(rtsPlayer.name)) {
                     found = p;
                     break;
                 }
             }
-            this.player = found;
-        } else if (MC.player.getName().getString().equals(rtsPlayer.name)) {
-            this.player = MC.player;
-        } else {
-            this.player = null;
+        } else if (MC.player != null && MC.player.getName().getString().equals(rtsPlayer.name)) {
+            found = MC.player;
         }
+        this.player = found;
         this.faction = rtsPlayer.faction;
         this.playerName = rtsPlayer.name;
     }
@@ -54,94 +62,101 @@ public AbstractPlayerDisplay(AbstractClientPlayer clientPlayer) {
         this.faction = Factions.NONE;
     }
 
+    /** With fog of war, only you and your allies' faction and economy are shown. */
+    protected boolean hiddenByFog() {
+        if (!FogOfWarClientEvents.isMatchFogOn() || MC.player == null || !com.solegendary.reignofnether.player.PlayerClientEvents.isRTSPlayer())
+            return false;
+        return !AlliancesClient.isAlliedOrOwned(MC.player.getName().getString(), playerName);
+    }
+
+    @Nullable
+    public static String pingText(String name) {
+        PlayerInfo info = MC.getConnection() == null ? null : MC.getConnection().getPlayerInfo(name);
+        return info == null ? null : I18n.get("hud.reignofnether.ping", info.getLatency());
+    }
+
+    public static int pingColour(String name) {
+        PlayerInfo info = MC.getConnection() == null ? null : MC.getConnection().getPlayerInfo(name);
+        int ms = info == null ? 0 : info.getLatency();
+        return ms < 80 ? Theme.OK : ms < 150 ? Theme.YELLOW : Theme.ERROR;
+    }
+
     public boolean isPlayerLoggedIn() {
         return MC.getConnection() != null && MC.getConnection().getPlayerInfo(playerName) != null;
     }
 
-    public static final int PLAYER_FRAME_WIDTH = Button.DEFAULT_ICON_FRAME_SIZE * 6; // frame containing player name + player icon + race icon
-
-    public static final ResourceLocation defaultIconLocation = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_back.png");
-
-    private void renderPlayer(GuiGraphics guiGraphics, int x, int y) {
-        // render colored background
-        MyRenderer.renderFrameWithBg(guiGraphics,
-                x, y,
-                PLAYER_FRAME_WIDTH,
-                Button.DEFAULT_ICON_FRAME_SIZE,
-                this.backgroundColor
-        );
-        // render faction icon
-        ResourceLocation factionIcon = faction.icon;
-        if(factionIcon != null) {
-            MyRenderer.renderIcon(guiGraphics,
-                    factionIcon,
-                    x + 4,
-                    y + 4,
-                    Button.DEFAULT_ICON_SIZE
-            );
-        }
-
-        // render player head
-        if (this.player != null && this.player.isSkinLoaded()) {
-            var iconLocation = player.getSkinTextureLocation();
-            //RenderSystem.setShaderTexture(0, iconLocation);
-            // draw base layer
-            guiGraphics.blit(iconLocation,
-                    x + Button.DEFAULT_ICON_FRAME_SIZE,
-                    y + 4,
-                    Button.DEFAULT_ICON_SIZE, Button.DEFAULT_ICON_SIZE,
-                    8.0f, 8.0f, // where on texture to start drawing from
-                    8, 8, // dimensions of blit texture
-                    64, 64 // size of texture itself (if < dimensions, texture is repeated)
-            );
-            // draw hat
-            guiGraphics.blit(iconLocation,
-                    x + Button.DEFAULT_ICON_FRAME_SIZE,
-                    y + 4,
-                    Button.DEFAULT_ICON_SIZE, Button.DEFAULT_ICON_SIZE,
-                    40.0f, 8.0f, // where on texture to start drawing from
-                    8, 8, // dimensions of blit texture
-                    64, 64 // size of texture itself (if < dimensions, texture is repeated)
-            );
+    /** Row background, colour strip, faction icon, head, name and status. Returns the x where the row's content starts. */
+    protected int renderIdentity(HudFrame f, int x, int y, int w, String status, int statusColour) {
+        Theme.cell(f.g, x, y, w, ROW_H, Theme.CellState.READY, false);
+        f.g.fill(x, y, x + 3, y + ROW_H, 0xFF000000 | PlayerColors.getPlayerColorHex(playerName));
+
+        int cx = x + 3 + 7;
+        int cy = y + ROW_H / 2;
+        if (faction != null && faction.icon != null && faction != Factions.NONE && !hiddenByFog())
+            MyRenderer.renderIcon(f.g, faction.icon, cx, cy - 6, 13);
+        cx += 13 + 7;
+
+        Theme.outline(f.g, cx, cy - 8, 16, 16, 1, Theme.INK);
+        if (player != null && player.isSkinLoaded()) {
+            ResourceLocation skin = player.getSkinTextureLocation();
+            f.g.blit(skin, cx, cy - 8, 16, 16, 8f, 8f, 8, 8, 64, 64);  // face
+            f.g.blit(skin, cx, cy - 8, 16, 16, 40f, 8f, 8, 8, 64, 64);  // hat layer
         } else {
-            MyRenderer.renderIcon(guiGraphics,
-                    defaultIconLocation,
-                    x + Button.DEFAULT_ICON_FRAME_SIZE,
-                    y + 4,
-                    Button.DEFAULT_ICON_SIZE
-            );
-        }
-
-        // render player name
-        guiGraphics.drawString(
-                MC.font,
-                this.playerName,
-                x + (Button.DEFAULT_ICON_FRAME_SIZE * 2),
-                y + (Button.DEFAULT_ICON_SIZE / 2) + 1,
-                0xFFFFFF
-        );
-        if (!isPlayerLoggedIn()) {
-            guiGraphics.pose().translate(0,0,1);
-            guiGraphics.fill(
-                    x, y,
-                    x + PLAYER_FRAME_WIDTH,
-                    y + Button.DEFAULT_ICON_FRAME_SIZE,
-                    0x99000000
-            );
+            MyRenderer.renderIcon(f.g, DEFAULT_HEAD, cx, cy - 8, 16);
         }
+        cx += 16 + 7;
+
+        // ping right-aligned on the name line; bots and offline players have no connection entry
+        String ping = pingText(playerName);
+        int pingW = ping == null ? 0 : Text.smallWidth(ping) + 4;
+        if (ping != null)
+            Text.small(f.g, ping, cx + NAME_W - pingW + 4, cy - 8, pingColour(playerName));
+        Text.draw(f.g, Text.fit(playerName, NAME_W - pingW), cx, cy - 9, Theme.TEXT);
+        Text.small(f.g, Text.fitSmall(status, NAME_W), cx, cy + 1, statusColour);
+        return cx + NAME_W + 7;
     }
 
-    public void render(GuiGraphics guiGraphics, int x, int y) {
-        int playerColorHex = PlayerColors.getPlayerColorHex(this.playerName);
-        this.color = 0xFF000000 | playerColorHex;
-        this.backgroundColor = 0xA0000000 | playerColorHex;
-        if (this instanceof DiplomacyPlayerDisplay dpd && !dpd.isRTSPlayer())
-            this.backgroundColor = 0x99000000;
-        this.renderPlayer(guiGraphics, x, y);
+    public enum Style { PRIMARY, SECONDARY, DANGER, ON }
+
+    public static final int BTN_H = 15;
+
+    public static int buttonWidth(String label) {
+        return Text.smallWidth(label) + 14;
     }
 
-    public RectZone getRectZone(int blitX, int blitY, int borderWidth) {
-        return new RectZone(blitX, blitY, blitX, blitY);
+    /** Text button in the small font, registered with the frame. Returns its width. */
+    public static int textButton(HudFrame f, String label, int x, int y, Style style, boolean enabled,
+                                 Runnable action, @Nullable Tooltip tooltip) {
+        int w = buttonWidth(label);
+        Rect r = new Rect(x, y, w, BTN_H);
+        boolean hovered = enabled && f.hovered(r);
+        int colour;
+        if (!enabled) {
+            Theme.bevel(f.g, x, y, w, BTN_H, Theme.LOCKED, 0, 0, 1, Theme.INK);
+            colour = Theme.DIM;
+        } else if (style == Style.PRIMARY) {
+            Theme.primaryButton(f.g, x, y, w, BTN_H, hovered);
+            colour = Theme.ON_ORANGE;
+        } else if (style == Style.DANGER) {
+            Theme.bevel(f.g, x, y, w, BTN_H, hovered ? Theme.CANCEL_HOVER : Theme.DANGER_BG, 0, 0, 1, Theme.INK);
+            colour = Theme.DANGER_TEXT;
+        } else if (style == Style.ON) {
+            Theme.bevel(f.g, x, y, w, BTN_H, Theme.TOGGLE_ON, 0, 0, 1, Theme.INK);
+            Theme.ring(f.g, x, y, w, BTN_H, 1, Theme.OK);
+            colour = Theme.OK_TEXT;
+        } else {
+            Theme.secondaryButton(f.g, x, y, w, BTN_H, hovered);
+            colour = hovered ? Theme.GOLD : Theme.BODY;
+        }
+        Text.smallCentered(f.g, label, x + w / 2, y + 4, colour);
+        Button b = new ButtonBuilder(label).isEnabled(() -> enabled).onLeftClick(action).build();
+        f.register(b, r, null, () -> tooltip);
+        return w;
     }
 
+    /** Offline players fade out, like the design's 55% opacity. */
+    protected void fadeIfOffline(HudFrame f, int x, int y, int w) {
+        if (!isPlayerLoggedIn())
+            f.g.fill(x, y, x + w, y + ROW_H, Theme.withAlpha(Theme.PANEL, 0.45f));
+    }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/DiplomacyPlayerDisplay.java b/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/DiplomacyPlayerDisplay.java
index 6828690db..941337cfc 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/DiplomacyPlayerDisplay.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/DiplomacyPlayerDisplay.java
@@ -1,329 +1,263 @@
 package com.solegendary.reignofnether.hud.playerdisplay;
 
-import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.alliance.AllianceAction;
 import com.solegendary.reignofnether.alliance.AllianceServerboundPacket;
 import com.solegendary.reignofnether.alliance.AlliancesClient;
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.solegendary.reignofnether.gamerules.GameruleClient;
-import com.solegendary.reignofnether.hud.buttons.Button;
-import com.solegendary.reignofnether.hud.RectZone;
-import com.solegendary.reignofnether.keybinds.Keybinding;
-import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.panels.ButtonCell;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import com.solegendary.reignofnether.player.PlayerClientEvents;
-import com.solegendary.reignofnether.player.PlayerColors;
 import com.solegendary.reignofnether.player.RTSPlayer;
-import com.solegendary.reignofnether.resources.ResourceName;
 import com.solegendary.reignofnether.resources.Resources;
 import com.solegendary.reignofnether.resources.ResourcesClientEvents;
 import com.solegendary.reignofnether.resources.ResourcesServerboundPacket;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
 import com.solegendary.reignofnether.util.MyRenderer;
+import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import org.lwjgl.glfw.GLFW;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import static com.solegendary.reignofnether.util.MiscUtil.fcs;
 
-// Dashboard for RTS players to make/break alliances and send resources to each other
+/** A diplomacy row: alliance status and actions, and resource sending for RTS players. */
 public class DiplomacyPlayerDisplay extends AbstractPlayerDisplay {
 
     private static final Minecraft MC = Minecraft.getInstance();
-    private Resources resourcesToSend = new Resources("", 0,0,0);
+
+    private static final ResourceLocation[] TRADE_ICONS = { ButtonCell.ICON_FOOD, ButtonCell.ICON_WOOD, ButtonCell.ICON_ORE, ButtonCell.ICON_EMERALD };
+    private static final String[] TRADE_TOOLTIPS = { "alliances.reignofnether.tooltip.send_food",
+            "alliances.reignofnether.tooltip.send_wood", "alliances.reignofnether.tooltip.send_ore",
+            "alliances.reignofnether.tooltip.send_emerald" };
+    private static final int FIELD_W = 51;
+    private static final int FIELD_H = 17;
+    private static final int MAX_AMOUNT = 99999;
+
+    // the amount field being typed in, if any
+    @Nullable private static DiplomacyPlayerDisplay focused = null;
+    private static int focusedSlot = 0;
+
+    private final int[] amounts = new int[4]; // food, wood, ore, emerald
 
     public DiplomacyPlayerDisplay(RTSPlayer rtsPlayer) {
         super(rtsPlayer);
-        resourcesToSend = new Resources(rtsPlayer.name,0,0,0);
     }
 
     public DiplomacyPlayerDisplay(AbstractClientPlayer player) {
         super(player);
     }
 
-    private static final int RESOURCE_FRAME_WIDTH = Button.DEFAULT_ICON_FRAME_SIZE * 2; // frame containing a resource value + icon
-    private static final int ALLIANCE_FRAME_WIDTH = (Button.DEFAULT_ICON_FRAME_SIZE * 5); // frame containing a resource value + icon
-    public static final int DISPLAY_WIDTH = // total width of a player display
-            PLAYER_FRAME_WIDTH +
-                    RESOURCE_FRAME_WIDTH * 4 +
-                    (int) (Button.DEFAULT_ICON_FRAME_SIZE * 2.5f) +
-                    ALLIANCE_FRAME_WIDTH;
+    private enum Relation {
+        ALLY("ally", Theme.OK), ENEMY("enemy", Theme.ERROR), SENT("request_sent", Theme.ORANGE), INCOMING("wants_alliance", Theme.GOLD);
 
+        final String key;
+        final int colour;
 
-    private boolean isAllied() {
-        return MC.player != null && AlliancesClient.isAllied(MC.player.getName().getString(), playerName);
+        Relation(String key, int colour) {
+            this.key = key;
+            this.colour = colour;
+        }
     }
 
-    protected boolean isRTSPlayer() {
-        return PlayerClientEvents.isRTSPlayer(playerName);
+    private Relation relation() {
+        if (MC.player != null && AlliancesClient.isAllied(MC.player.getName().getString(), playerName))
+            return Relation.ALLY;
+        if (AlliancesClient.outboundPendingAlliances.contains(playerName))
+            return Relation.SENT;
+        if (AlliancesClient.inboundPendingAlliances.contains(playerName))
+            return Relation.INCOMING;
+        return Relation.ENEMY;
     }
 
-    private boolean allianceRequested() {
-        return AlliancesClient.outboundPendingAlliances.contains(playerName);
+    protected boolean isRTSPlayer() {
+        return PlayerClientEvents.isRTSPlayer(playerName);
     }
 
-    private boolean allianceReceived() {
-        return AlliancesClient.inboundPendingAlliances.contains(playerName);
+    public void render(HudFrame f, int x, int y, int w) {
+        Relation rel = relation();
+        boolean online = isPlayerLoggedIn();
+        boolean rts = isRTSPlayer();
+
+        StringBuilder status = new StringBuilder();
+        if (!rts)
+            status.append(I18n.get("hud.reignofnether.diplomacy.first_person")).append(" · ");
+        if (!online)
+            status.append(I18n.get("hud.reignofnether.diplomacy.offline")).append(" · ");
+        status.append(I18n.get("hud.reignofnether.diplomacy." + rel.key));
+        if (rel == Relation.ALLY && AlliancesClient.canControlAlly(playerName))
+            status.append(" · ").append(I18n.get("hud.reignofnether.diplomacy.shares_control"));
+
+        int cx = renderIdentity(f, x, y, w, status.toString(), online ? rel.colour : Theme.LABEL);
+        int by = y + (ROW_H - BTN_H) / 2;
+        int actionsX = renderActions(f, rel, x + w - 7, by);
+
+        if (rts) {
+            for (int i = 0; i < amounts.length; i++) {
+                renderField(f, i, cx, y + (ROW_H - FIELD_H) / 2, online);
+                cx += FIELD_W + 5;
+            }
+            textButton(f, I18n.get("hud.reignofnether.diplomacy.send"), cx, by, Style.SECONDARY,
+                    online && total() > 0, this::sendResources,
+                    Tooltip.of(I18n.get("alliances.reignofnether.tooltip.confirm_send_resources")));
+        } else {
+            String go = I18n.get("hud.reignofnether.diplomacy.go_to_player");
+            int goW = buttonWidth(go);
+            int hintW = actionsX - 7 - goW - 6 - cx;
+            Text.draw(f.g, Text.fit(I18n.get("hud.reignofnether.diplomacy.first_person_hint"), hintW), cx, y + ROW_H / 2 - 4, Theme.LABEL);
+            textButton(f, go, actionsX - 7 - goW, by, Style.SECONDARY, rel == Relation.ALLY, this::goToPlayer,
+                    Tooltip.of(I18n.get("alliances.reignofnether.tooltip.goto_player")));
+        }
+        fadeIfOffline(f, x, y, w);
     }
 
-    private Button renderTradeResources(GuiGraphics guiGraphics, ResourceName resourceName,
-                                        int x, int y, int mouseX, int mouseY) {
-        String iconPath;
-        String value;
-        int color;
-        switch (resourceName) {
-            case FOOD -> {
-                iconPath = "textures/icons/items/wheat.png";
-                value = String.valueOf(resourcesToSend.food);
-                color = 0xE8BC5F;
-            }
-            case WOOD -> {
-                iconPath = "textures/icons/items/wood.png";
-                value = String.valueOf(resourcesToSend.wood);
-                color = 0xA3753B;
-            }
-            default -> {
-                iconPath = "textures/icons/items/iron_ore.png";
-                value = String.valueOf(resourcesToSend.ore);
-                color = 0xFFF4ED;
-            }
+    /** Alliance buttons, right-aligned at right. Returns their left edge. */
+    private int renderActions(HudFrame f, Relation rel, int right, int y) {
+        record Action(String key, Style style, Runnable run, String tooltipKey) { }
+        List<Action> actions = new ArrayList<>();
+        switch (rel) {
+            case ALLY -> actions.add(new Action("disband", Style.DANGER, this::disbandAlliance, "disband_alliance"));
+            case ENEMY -> actions.add(new Action("request", Style.SECONDARY, this::requestAlliance, "request_alliance"));
+            case SENT -> actions.add(new Action("cancel_request", Style.SECONDARY, this::cancelAllianceRequest, "cancel_request_alliance"));
+            case INCOMING -> actions.add(new Action("accept", Style.PRIMARY, this::acceptAllianceRequest, "accept_alliance"));
         }
-        MyRenderer.renderFrameWithBg(guiGraphics,
-                x, y,
-                RESOURCE_FRAME_WIDTH,
-                Button.DEFAULT_ICON_FRAME_SIZE,
-                0xA0000000
-        );
-        guiGraphics.drawString(
-                MC.font,
-                value,
-                x + (Button.DEFAULT_ICON_SIZE / 2) + 1,
-                y + (Button.DEFAULT_ICON_SIZE / 2) + 1,
-                color
-        );
-
-        Button changeResourceButton = new Button(
-                "Change resources",
-                Button.DEFAULT_ICON_SIZE,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/corner_plus.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                this::isPlayerLoggedIn,
-                () -> {
-                    switch (resourceName) {
-                        case FOOD -> resourcesToSend.food += Keybindings.shiftMod.isDown() ? 1000 : 100;
-                        case WOOD -> resourcesToSend.wood += Keybindings.shiftMod.isDown() ? 1000 : 100;
-                        default -> resourcesToSend.ore += Keybindings.shiftMod.isDown() ? 1000 : 100;
-                    }
-                    Resources res = ResourcesClientEvents.getOwnResources();
-                    if (res != null) {
-                        resourcesToSend.food = Math.min(resourcesToSend.food, res.food);
-                        resourcesToSend.wood = Math.min(resourcesToSend.wood, res.wood);
-                        resourcesToSend.ore = Math.min(resourcesToSend.ore, res.ore);
-                    }
-                },
-                () -> {
-                    switch (resourceName) {
-                        case FOOD -> resourcesToSend.food -= Keybindings.shiftMod.isDown() ? 1000 : 100;
-                        case WOOD -> resourcesToSend.wood -= Keybindings.shiftMod.isDown() ? 1000 : 100;
-                        default -> resourcesToSend.ore -= Keybindings.shiftMod.isDown() ? 1000 : 100;
-                    }
-                    resourcesToSend.food = Math.max(resourcesToSend.food, 0);
-                    resourcesToSend.wood = Math.max(resourcesToSend.wood, 0);
-                    resourcesToSend.ore = Math.max(resourcesToSend.ore, 0);
-                },
-                switch (resourceName) {
-                    case FOOD -> List.of(fcs(I18n.get("alliances.reignofnether.tooltip.send_food")));
-                    case WOOD -> List.of(fcs(I18n.get("alliances.reignofnether.tooltip.send_wood")));
-                    case ORE -> List.of(fcs(I18n.get("alliances.reignofnether.tooltip.send_ore")));
-                    default -> null;
-                }
-        );
-        changeResourceButton.bgIconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, iconPath);
-        changeResourceButton.render(guiGraphics, x + RESOURCE_FRAME_WIDTH, y, mouseX, mouseY);
-
-        if (!isPlayerLoggedIn()) {
-            guiGraphics.fill(
-                    x, y,
-                    x + RESOURCE_FRAME_WIDTH,
-                    y + Button.DEFAULT_ICON_FRAME_SIZE,
-                    0x99000000
-            );
+        // only asking for an alliance needs the player online
+        boolean enabled = rel != Relation.ENEMY || isPlayerLoggedIn();
+        int x = right;
+        for (int i = actions.size() - 1; i >= 0; i--) {
+            Action a = actions.get(i);
+            String label = I18n.get("hud.reignofnether.diplomacy." + a.key);
+            x -= buttonWidth(label);
+            textButton(f, label, x, y, a.style, enabled, a.run,
+                    Tooltip.of(I18n.get("alliances.reignofnether.tooltip." + a.tooltipKey)));
+            x -= 5;
         }
-        return changeResourceButton;
+        return x;
     }
 
-    private List<Button> renderTradeConfirms(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
-        Button confirmButton = new Button(
-                "Confirm trade",
-                Button.DEFAULT_ICON_SIZE,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/tick.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> resourcesToSend.getTotalValue() > 0 && isPlayerLoggedIn(),
-                this::sendResources,
-                null,
-                List.of(fcs(I18n.get("alliances.reignofnether.tooltip.confirm_send_resources")))
-        );
-        confirmButton.render(guiGraphics, x, y, mouseX, mouseY);
-
-        Button cancelButton = new Button(
-                "Cancel trade",
-                Button.DEFAULT_ICON_SIZE,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/cross.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> resourcesToSend.getTotalValue() > 0,
-                this::resetResources,
-                null,
-                List.of(fcs(I18n.get("alliances.reignofnether.tooltip.cancel_send_resources")))
-        );
-        cancelButton.render(guiGraphics, x + Button.DEFAULT_ICON_FRAME_SIZE, y, mouseX, mouseY);
-
-        return List.of(confirmButton, cancelButton);
+    private void renderField(HudFrame f, int slot, int x, int y, boolean online) {
+        Rect r = new Rect(x, y, FIELD_W, FIELD_H);
+        Theme.outline(f.g, x, y, FIELD_W, FIELD_H, 1, Theme.INK);
+        f.g.fill(x, y, x + FIELD_W, y + FIELD_H, Theme.EMPTY);
+        MyRenderer.renderIcon(f.g, TRADE_ICONS[slot], x + 4, y + 4, 9);
+
+        int ix = x + 16;
+        int iw = FIELD_W - 18;
+        boolean isFocused = focused == this && focusedSlot == slot;
+        f.g.fill(ix, y + 2, ix + iw, y + FIELD_H - 2, Theme.INK);
+        if (isFocused)
+            Theme.ring(f.g, ix, y + 2, iw, FIELD_H - 4, 1, Theme.ORANGE);
+        else if (f.hovered(r) && online)
+            Theme.ring(f.g, ix, y + 2, iw, FIELD_H - 4, 1, Theme.FAINT);
+
+        String value = amounts[slot] > 0 ? String.valueOf(amounts[slot]) : "0";
+        int textRight = ix + iw - 3;
+        Text.bigRight(f.g, value, textRight, y + 5, amounts[slot] > 0 ? Theme.GOLD : Theme.FAINT, 1f);
+        if (isFocused && (Util.getMillis() / 500) % 2 == 0)
+            f.g.fill(textRight + 1, y + 4, textRight + 2, y + FIELD_H - 4, Theme.GOLD);
+
+        f.register(new ButtonBuilder("Trade amount").isEnabled(() -> online).onLeftClick(() -> {
+            focused = this;
+            focusedSlot = slot;
+        }).build(), r, null, () -> Tooltip.of(I18n.get(TRADE_TOOLTIPS[slot])));
     }
 
-    private Button renderAllianceButton(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
-        Button allyRequestButton = new Button(
-                "Request Alliance",
-                Button.DEFAULT_ICON_SIZE,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/sweet_berries.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                this::isPlayerLoggedIn,
-                this::requestAlliance,
-                null,
-                List.of(fcs(I18n.get("alliances.reignofnether.tooltip.request_alliance")))
-        );
-        Button allyCancelRequestButton = new Button(
-                "Cancel Request Alliance",
-                Button.DEFAULT_ICON_SIZE,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/cross.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                this::cancelAllianceRequest,
-                null,
-                List.of(fcs(I18n.get("alliances.reignofnether.tooltip.cancel_request_alliance")))
-        );
-        allyCancelRequestButton.bgIconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/sweet_berries.png");
-        Button allyConfirmButton = new Button(
-                "Accept Alliance",
-                Button.DEFAULT_ICON_SIZE,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/tick.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                this::acceptAllianceRequest,
-                null,
-                List.of(fcs(I18n.get("alliances.reignofnether.tooltip.accept_alliance")))
-        );
-        Button disbandButton = new Button(
-                "Disband Alliance",
-                Button.DEFAULT_ICON_SIZE,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/crossed_swords.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                this::isAllied,
-                this::disbandAlliance,
-                null,
-                List.of(fcs(I18n.get("alliances.reignofnether.tooltip.disband_alliance")))
-        );
-
-        Button renderedButton;
-        String allianceStatusStr;
-        int frameBgColour = 0xA0000000 | PlayerColors.getPlayerAllianceColorHex(playerName);
-
-        if (!isAllied() && !allianceRequested() && !allianceReceived()) {
-            allianceStatusStr = I18n.get("alliances.reignofnether.tooltip.status.enemy");
-            allyRequestButton.render(guiGraphics, x, y, mouseX, mouseY);
-            renderedButton = allyRequestButton;
-        } else if (!isAllied() && allianceRequested()) {
-            allianceStatusStr = I18n.get("alliances.reignofnether.tooltip.status.requested");
-            allyCancelRequestButton.render(guiGraphics, x, y, mouseX, mouseY);
-            renderedButton = allyCancelRequestButton;
-        } else if (!isAllied() && allianceReceived()) {
-            allianceStatusStr = I18n.get("alliances.reignofnether.tooltip.status.accept");
-            allyConfirmButton.render(guiGraphics, x, y, mouseX, mouseY);
-            renderedButton = allyConfirmButton;
-        } else {
-            allianceStatusStr = I18n.get("alliances.reignofnether.tooltip.status.allied");
-            disbandButton.render(guiGraphics, x, y, mouseX, mouseY);
-            renderedButton = disbandButton;
-            if (AlliancesClient.canControlAlly(playerName)) {
-                allianceStatusStr += I18n.get("alliances.reignofnether.tooltip.status.allied.plural");
-            }
-        }
+    private int total() {
+        return amounts[0] + amounts[1] + amounts[2] + amounts[3];
+    }
 
-        int drawStringStartOffset = Button.DEFAULT_ICON_FRAME_SIZE + (Button.DEFAULT_ICON_SIZE / 2) + 1;
-        int frameWidth = drawStringStartOffset + MC.font.width(allianceStatusStr);
-        MyRenderer.renderFrameWithBg(
-                guiGraphics,
-                x + Button.DEFAULT_ICON_FRAME_SIZE,
-                y,
-                frameWidth,
-                Button.DEFAULT_ICON_FRAME_SIZE,
-                frameBgColour
-        );
-        guiGraphics.drawString(
-                MC.font,
-                allianceStatusStr,
-                x + drawStringStartOffset,
-                y + (Button.DEFAULT_ICON_SIZE / 2) + 1,
-                0xFFFFFF
-        );
-        if (!isPlayerLoggedIn()) {
-            guiGraphics.pose().translate(0,0,1);
-            guiGraphics.fill(
-                    x + Button.DEFAULT_ICON_FRAME_SIZE,
-                    y,
-                    x + (Button.DEFAULT_ICON_FRAME_SIZE * 2) + 4 + MC.font.width(allianceStatusStr),
-                    y + Button.DEFAULT_ICON_FRAME_SIZE,
-                    0x99000000
-            );
-        }
-        return renderedButton;
+    // ------------------------------------------------------------------ typing
+
+    public static boolean isTyping() {
+        return focused != null;
     }
 
-    private void sendResources() {
-        if (MC.player != null) {
-            ResourcesServerboundPacket.sendResources(resourcesToSend, MC.player.getName().getString());
-            resetResources();
+    public static void stopTyping() {
+        focused = null;
+    }
+
+    /** @return true if the key was used by the focused amount field */
+    public static boolean keyPressed(int keyCode) {
+        if (focused == null)
+            return false;
+        int[] a = focused.amounts;
+        switch (keyCode) {
+            case GLFW.GLFW_KEY_BACKSPACE -> a[focusedSlot] /= 10;
+            case GLFW.GLFW_KEY_DELETE -> a[focusedSlot] = 0;
+            case GLFW.GLFW_KEY_TAB -> focusedSlot = (focusedSlot + 1) % a.length;
+            case GLFW.GLFW_KEY_ENTER, GLFW.GLFW_KEY_KP_ENTER, GLFW.GLFW_KEY_ESCAPE -> focused = null;
+            default -> { }
         }
+        return true;
     }
 
-    private void resetResources() {
-        this.resourcesToSend.food = 0;
-        this.resourcesToSend.wood = 0;
-        this.resourcesToSend.ore = 0;
+    public static void charTyped(char c) {
+        if (focused == null || c < '0' || c > '9')
+            return;
+        int[] a = focused.amounts;
+        long next = a[focusedSlot] * 10L + (c - '0');
+        a[focusedSlot] = (int) Math.min(next, Math.min(MAX_AMOUNT, owned(focusedSlot)));
     }
 
-    private void requestAlliance() {
-        if (GameruleClient.lockAlliances && MC.player != null) {
-            MC.player.sendSystemMessage(Component.translatable("alliance.reignofnether.alliances_lock"));
+    private static int owned(int slot) {
+        Resources res = ResourcesClientEvents.getOwnResources();
+        if (res == null)
+            return MAX_AMOUNT;
+        return slot == 0 ? res.food : slot == 1 ? res.wood : slot == 2 ? res.ore : res.emerald;
+    }
+
+    // ------------------------------------------------------------------ actions
+
+    private void sendResources() {
+        if (MC.player == null)
             return;
+        ResourcesServerboundPacket.sendResources(new Resources(playerName, amounts[0], amounts[1], amounts[2], amounts[3]),
+                MC.player.getName().getString());
+        java.util.Arrays.fill(amounts, 0);
+        if (focused == this)
+            focused = null;
+    }
+
+    private void goToPlayer() {
+        if (player != null)
+            OrthoviewClientEvents.centreCameraOnPos(player.position());
+    }
+
+    private static boolean alliancesLocked() {
+        if (MC.player == null)
+            return true;
+        if (GameruleClient.lockAlliances) {
+            MC.player.sendSystemMessage(SystemMessage.error(Component.translatable("alliance.reignofnether.alliances_lock")));
+            return true;
         }
-        if (GameruleClient.coopMode && MC.player != null) {
-            MC.player.sendSystemMessage(Component.translatable("alliance.reignofnether.alliances_lock_coop"));
-            return;
+        if (GameruleClient.coopMode) {
+            MC.player.sendSystemMessage(SystemMessage.error(Component.translatable("alliance.reignofnether.alliances_lock_coop")));
+            return true;
         }
+        return false;
+    }
+
+    private void requestAlliance() {
+        if (alliancesLocked())
+            return;
         AllianceServerboundPacket.doAllianceAction(AllianceAction.REQUEST, playerName);
         AlliancesClient.outboundPendingAlliances.add(playerName);
     }
 
     private void cancelAllianceRequest() {
         AllianceServerboundPacket.doAllianceAction(AllianceAction.CANCEL_REQUEST, playerName);
-        AlliancesClient.outboundPendingAlliances.removeIf(p -> p.equals(playerName));
+        AlliancesClient.outboundPendingAlliances.remove(playerName);
     }
 
     private void acceptAllianceRequest() {
@@ -331,63 +265,8 @@ private void acceptAllianceRequest() {
     }
 
     private void disbandAlliance() {
-        if (GameruleClient.lockAlliances && MC.player != null) {
-            MC.player.sendSystemMessage(Component.translatable("alliance.reignofnether.alliances_lock"));
-            return;
-        }
-        if (GameruleClient.coopMode && MC.player != null) {
-            MC.player.sendSystemMessage(Component.translatable("alliance.reignofnether.alliances_lock_coop"));
+        if (alliancesLocked())
             return;
-        }
         AllianceServerboundPacket.doAllianceAction(AllianceAction.DISBAND, playerName);
     }
-
-    private final Button gotoFpvPlayerButton = new Button(
-            "Go to player",
-            Button.DEFAULT_ICON_SIZE,
-            ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/map.png"),
-            (Keybinding) null,
-            () -> false,
-            () -> false,
-            this::isAllied,
-            () -> {
-                if (this.player != null)
-                    OrthoviewClientEvents.centreCameraOnPos(this.player.position());
-            },
-            null,
-            List.of(fcs(I18n.get("alliances.reignofnether.tooltip.goto_player")))
-    );
-
-    // render and return all relevant buttons
-    public ArrayList<Button> render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY) {
-        super.render(guiGraphics, x, y);
-        ArrayList<Button> renderedButtons = new ArrayList<>();
-        x += PLAYER_FRAME_WIDTH;
-
-        if (isRTSPlayer()) {
-            renderedButtons.add(this.renderTradeResources(guiGraphics, ResourceName.FOOD, x, y, mouseX, mouseY));
-            x += RESOURCE_FRAME_WIDTH + Button.DEFAULT_ICON_FRAME_SIZE;
-            renderedButtons.add(this.renderTradeResources(guiGraphics, ResourceName.WOOD, x, y, mouseX, mouseY));
-            x += RESOURCE_FRAME_WIDTH + Button.DEFAULT_ICON_FRAME_SIZE;
-            renderedButtons.add(this.renderTradeResources(guiGraphics, ResourceName.ORE, x, y, mouseX, mouseY));
-            x += RESOURCE_FRAME_WIDTH + (Button.DEFAULT_ICON_FRAME_SIZE * 1.25f);
-            renderedButtons.addAll(this.renderTradeConfirms(guiGraphics, x, y, mouseX, mouseY));
-            x += (Button.DEFAULT_ICON_FRAME_SIZE * 2.25f);
-        } else {
-            gotoFpvPlayerButton.render(guiGraphics, x, y, mouseX, mouseY);
-            renderedButtons.add(gotoFpvPlayerButton);
-            x += (Button.DEFAULT_ICON_FRAME_SIZE * 1.25f);
-        }
-        renderedButtons.add(this.renderAllianceButton(guiGraphics, x, y, mouseX, mouseY));
-        return renderedButtons;
-    }
-
-    @Override
-    public RectZone getRectZone(int blitX, int blitY, int borderWidth) {
-        return new RectZone(
-                blitX - borderWidth, blitY - borderWidth,
-                blitX + DISPLAY_WIDTH + borderWidth,
-                blitY + Button.DEFAULT_ICON_FRAME_SIZE + borderWidth
-        );
-    }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/ObserverPlayerDisplay.java b/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/ObserverPlayerDisplay.java
index 86169b6b5..312d36bf4 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/ObserverPlayerDisplay.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/ObserverPlayerDisplay.java
@@ -1,177 +1,94 @@
 package com.solegendary.reignofnether.hud.playerdisplay;
 
 import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.alliance.AlliancesClient;
 import com.solegendary.reignofnether.building.BuildingClientEvents;
-import com.solegendary.reignofnether.hud.buttons.Button;
-import com.solegendary.reignofnether.hud.RectZone;
+import com.solegendary.reignofnether.hud.panels.ButtonCell;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
 import com.solegendary.reignofnether.player.PlayerColors;
 import com.solegendary.reignofnether.player.RTSPlayer;
-import com.solegendary.reignofnether.resources.ResourceName;
 import com.solegendary.reignofnether.resources.Resources;
 import com.solegendary.reignofnether.resources.ResourcesClientEvents;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
 import com.solegendary.reignofnether.unit.UnitClientEvents;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
 import com.solegendary.reignofnether.util.MyRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.resources.language.I18n;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.LivingEntity;
 
-// Dashboard for Observer players to track RTS players' resources and population
+/** An observer row: a player's resources and population, for spectators. */
 public class ObserverPlayerDisplay extends AbstractPlayerDisplay {
 
-    private static final Minecraft MC = Minecraft.getInstance();
-    public final Resources resources;
+    private static final ResourceLocation WORKER_ICON = rl("textures/icons/items/shovel.png");
+    private static final ResourceLocation ARMY_ICON = rl("textures/icons/items/sword_and_bow.png");
+    private static final int CELL_W = 56;
+    private static final int CELL_H = 17;
+    public static final int CELL_STEP = CELL_W + 5;
 
     public ObserverPlayerDisplay(RTSPlayer rtsPlayer) {
         super(rtsPlayer);
-        this.resources = ResourcesClientEvents.getResources(rtsPlayer.name);
     }
 
-    private static final int RESOURCE_FRAME_WIDTH = Button.DEFAULT_ICON_FRAME_SIZE * 3; // frame containing a resource value + icon
-    private static final int SUPPLY_DETAIL_FRAME_WIDTH = Button.DEFAULT_ICON_FRAME_SIZE * 4; // frame containing a resource value + icon
-    public static final int DISPLAY_WIDTH = PLAYER_FRAME_WIDTH + RESOURCE_FRAME_WIDTH * 4 + SUPPLY_DETAIL_FRAME_WIDTH; // total width of a player display
-
-    private final static int frameBgColour = 0xA0000000;
+    private static ResourceLocation rl(String path) {
+        return ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, path);
+    }
 
-    private void renderResource(GuiGraphics guiGraphics, int x, int y, ResourceName resource) {
-        ResourceLocation icon;
-        String value;
-        int color = 0xFFFFFF;
-        switch (resource) {
-            case FOOD -> {
-                icon = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/wheat.png");
-                value = String.valueOf(resources.food);
-                color = 0xE8BC5F;
-            }
-            case WOOD -> {
-                icon = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/wood.png");
-                value = String.valueOf(resources.wood);
-                color = 0xA3753B;
-            }
-            case ORE -> {
-                icon = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/iron_ore.png");
-                value = String.valueOf(resources.ore);
-                color = 0xFFF4ED;
-            }
-            default -> {
-                icon = PlayerColors.getPlayerColorBedIcon(this.playerName);
-                var used = UnitClientEvents.getCurrentPopulation(this.playerName);
-                var produced = BuildingClientEvents.getTotalPopulationSupply(this.playerName);
-                value = used + "/" + produced;
-                color = used > produced
-                        ? 0xFF0000
-                        : 0xFFFFFF;
-            }
+    public void render(HudFrame f, int x, int y, int w) {
+        String status;
+        if (!isPlayerLoggedIn())
+            status = I18n.get("hud.reignofnether.diplomacy.offline");
+        else if (!AlliancesClient.getAllAllies(playerName).isEmpty())
+            status = I18n.get("hud.reignofnether.observer.allies", String.join(", ", AlliancesClient.getAllAllies(playerName)));
+        else
+            status = "";
+        int cx = renderIdentity(f, x, y, w, status, Theme.OK);
+        int cy = y + (ROW_H - CELL_H) / 2;
+        if (hiddenByFog()) {
+            Text.draw(f.g, I18n.get("hud.reignofnether.observer.fog_hidden"), cx, y + ROW_H / 2 - 4, Theme.LABEL);
+            fadeIfOffline(f, x, y, w);
+            return;
         }
 
-        MyRenderer.renderFrameWithBg(guiGraphics,
-                x, y,
-                RESOURCE_FRAME_WIDTH,
-                Button.DEFAULT_ICON_FRAME_SIZE,
-                frameBgColour
-        );
-        MyRenderer.renderIcon(guiGraphics,
-                icon,
-                x + 4,
-                y + 4,
-                Button.DEFAULT_ICON_SIZE
-        );
-        guiGraphics.drawString(
-                MC.font,
-                value,
-                x + (Button.DEFAULT_ICON_FRAME_SIZE),
-                y + (Button.DEFAULT_ICON_SIZE / 2) + 1,
-                color
-        );
-        if (!isPlayerLoggedIn()) {
-            guiGraphics.fill(
-                    x, y,
-                    x + RESOURCE_FRAME_WIDTH,
-                    y + Button.DEFAULT_ICON_FRAME_SIZE,
-                    0x99000000
-            );
+        Resources resources = ResourcesClientEvents.getResources(playerName);
+        if (resources != null) {
+            cx = cell(f, cx, cy, ButtonCell.ICON_FOOD, String.valueOf(resources.food), Theme.TEXT, "resources.reignofnether.food");
+            cx = cell(f, cx, cy, ButtonCell.ICON_WOOD, String.valueOf(resources.wood), Theme.TEXT, "resources.reignofnether.wood");
+            cx = cell(f, cx, cy, ButtonCell.ICON_ORE, String.valueOf(resources.ore), Theme.TEXT, "resources.reignofnether.ore");
         }
-    }
-
-    private void renderSupplyDetail(GuiGraphics guiGraphics, int x, int y) {
-        int civilianSupply = 0;
-        int militarySupply = 0;
+        int used = UnitClientEvents.getCurrentPopulation(playerName);
+        int supply = BuildingClientEvents.getTotalPopulationSupply(playerName);
+        cx = cell(f, cx, cy, PlayerColors.getPlayerColorBedIcon(playerName), used + "/" + supply,
+                used > supply ? Theme.ERROR : Theme.TEXT, "resources.reignofnether.population");
 
-        for (LivingEntity entities : UnitClientEvents.getAllUnits()) {
-            if (!(entities instanceof Unit unit)) {
-                continue;
-            }
-
-            if (!this.playerName.equals(unit.getOwnerName())) {
-                continue;
-            }
-
-            if (unit instanceof WorkerUnit) {
-                civilianSupply += unit.getCost().population;
-            } else {
-                militarySupply += unit.getCost().population;
+        int workers = 0;
+        int army = 0;
+        for (LivingEntity entity : UnitClientEvents.getAllUnits()) {
+            if (entity instanceof Unit unit && playerName.equals(unit.getOwnerName())) {
+                if (unit instanceof WorkerUnit)
+                    workers += unit.getCost().population;
+                else
+                    army += unit.getCost().population;
             }
         }
-
-        MyRenderer.renderFrameWithBg(guiGraphics,
-                x, y,
-                SUPPLY_DETAIL_FRAME_WIDTH,
-                Button.DEFAULT_ICON_FRAME_SIZE,
-                frameBgColour
-        );
-        MyRenderer.renderIcon(guiGraphics,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/shovel.png"),
-                x + 4,
-                y + 4,
-                Button.DEFAULT_ICON_SIZE
-        );
-        guiGraphics.drawString(
-                MC.font,
-                "" + civilianSupply,
-                x + (Button.DEFAULT_ICON_FRAME_SIZE),
-                y + (Button.DEFAULT_ICON_SIZE / 2) + 1,
-                0xFFFFFF
-        );
-        MyRenderer.renderIcon(guiGraphics,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/sword_and_bow.png"),
-                x + SUPPLY_DETAIL_FRAME_WIDTH / 2 + 4,
-                y + 4,
-                Button.DEFAULT_ICON_SIZE
-        );
-        guiGraphics.drawString(
-                MC.font,
-                "" + militarySupply,
-                x + SUPPLY_DETAIL_FRAME_WIDTH / 2 + (Button.DEFAULT_ICON_FRAME_SIZE),
-                y + (Button.DEFAULT_ICON_SIZE / 2) + 1,
-                0xFFFFFF
-        );
-        if (!isPlayerLoggedIn()) {
-            guiGraphics.fill(
-                    x, y,
-                    x + SUPPLY_DETAIL_FRAME_WIDTH,
-                    y + Button.DEFAULT_ICON_FRAME_SIZE,
-                    0x99000000
-            );
-        }
-    }
-
-    public void render(GuiGraphics guiGraphics, int x, int y) {
-        super.render(guiGraphics, x, y);
-        this.renderResource(guiGraphics, x += PLAYER_FRAME_WIDTH, y, ResourceName.FOOD);
-        this.renderResource(guiGraphics, x += RESOURCE_FRAME_WIDTH, y, ResourceName.WOOD);
-        this.renderResource(guiGraphics, x += RESOURCE_FRAME_WIDTH, y, ResourceName.ORE);
-        this.renderResource(guiGraphics, x += RESOURCE_FRAME_WIDTH, y, ResourceName.NONE); // supply
-        this.renderSupplyDetail(guiGraphics, x += RESOURCE_FRAME_WIDTH, y);
+        cx = cell(f, cx, cy, WORKER_ICON, String.valueOf(workers), Theme.TEXT, "hud.reignofnether.observer.worker_pop");
+        cell(f, cx, cy, ARMY_ICON, String.valueOf(army), Theme.TEXT, "hud.reignofnether.observer.army_pop");
+        fadeIfOffline(f, x, y, w);
     }
 
-    @Override
-    public RectZone getRectZone(int blitX, int blitY, int borderWidth) {
-        return new RectZone(
-            blitX - borderWidth, blitY - borderWidth,
-            blitX + ObserverPlayerDisplay.DISPLAY_WIDTH + borderWidth,
-            blitY + Button.DEFAULT_ICON_FRAME_SIZE + borderWidth
-        );
+    /** Compact stat cell. Returns the x of the next cell. */
+    private static int cell(HudFrame f, int x, int y, ResourceLocation icon, String value, int colour, String tooltipKey) {
+        Theme.outline(f.g, x, y, CELL_W, CELL_H, 1, Theme.INK);
+        f.g.fill(x, y, x + CELL_W, y + CELL_H, Theme.EMPTY);
+        MyRenderer.renderIcon(f.g, icon, x + 4, y + 4, 9);
+        Text.bigRight(f.g, value, x + CELL_W - 4, y + 5, colour, 1f);
+        Rect r = new Rect(x, y, CELL_W, CELL_H);
+        if (f.hovered(r))
+            Tooltip.of(I18n.get(tooltipKey)).show(r.x(), r.y(), r.w(), r.h());
+        return x + CELL_STEP;
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/PlayerDisplayClientEvents.java b/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/PlayerDisplayClientEvents.java
index 6d681c7d0..0a5fc3d6a 100644
--- a/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/PlayerDisplayClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/hud/playerdisplay/PlayerDisplayClientEvents.java
@@ -1,37 +1,54 @@
 package com.solegendary.reignofnether.hud.playerdisplay;
 
+import net.minecraft.resources.ResourceLocation;
+
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.minimap.StrategicMapClientEvents;
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.alliance.AllianceAction;
 import com.solegendary.reignofnether.alliance.AllianceServerboundPacket;
 import com.solegendary.reignofnether.alliance.AlliancesClient;
 import com.solegendary.reignofnether.guiscreen.TopdownGui;
-import com.solegendary.reignofnether.hud.buttons.Button;
-import com.solegendary.reignofnether.hud.RectZone;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
 import com.solegendary.reignofnether.hud.TextInputClientEvents;
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
+import com.solegendary.reignofnether.hud.panels.SpectatorHud;
 import com.solegendary.reignofnether.keybinds.Keybinding;
 import com.solegendary.reignofnether.keybinds.Keybindings;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import com.solegendary.reignofnether.player.PlayerClientEvents;
 import com.solegendary.reignofnether.player.RTSPlayer;
-import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.ui.Clip;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.Style;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FormattedCharSequence;
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import org.lwjgl.glfw.GLFW;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import static com.solegendary.reignofnether.util.MiscUtil.fcs;
 
+/**
+ * The player panels opened from the top-right bar: diplomacy for RTS players (alliances and sending
+ * resources) and the observer panel for spectators (every player's economy). Drawn by the HUD in units.
+ */
 public class PlayerDisplayClientEvents {
 
+    static {
+        WorldState.onClientReset(PlayerDisplayClientEvents::clearAll);
+    }
+
     private enum DisplayType {
         OBSERVER,
         DIPLOMACY,
@@ -39,16 +56,20 @@ private enum DisplayType {
     }
     private static final Minecraft MC = Minecraft.getInstance();
 
-    private static ArrayList<ObserverPlayerDisplay> observerPlayerDisplays = new ArrayList<>();
-    private static ArrayList<DiplomacyPlayerDisplay> rtsDiplomacyPlayerDisplays = new ArrayList<>();
-    private static ArrayList<DiplomacyPlayerDisplay> fpvDiplomacyPlayerDisplays = new ArrayList<>();
-    private static final ArrayList<Button> renderedButtons = new ArrayList<>();
-    private static final ArrayList<RectZone> hudZones = new ArrayList<>();
+    private static final List<ObserverPlayerDisplay> observerPlayerDisplays = new ArrayList<>();
+    private static final List<DiplomacyPlayerDisplay> rtsDiplomacyPlayerDisplays = new ArrayList<>();
+    private static final List<DiplomacyPlayerDisplay> fpvDiplomacyPlayerDisplays = new ArrayList<>();
     private static DisplayType displayType = DisplayType.NONE;
-    private static final int BG_BORDER_WIDTH = 7;
+
+    private static final int TOP = 50;
+    private static final int WIDTH = 575;
+    private static final int PAD = 10;
+    private static final int HEADER_H = 40; // title row and column labels
+    private static final int ROW_GAP = 4;
 
     public static void resetDisplay() {
         displayType = DisplayType.NONE;
+        DiplomacyPlayerDisplay.stopTyping();
     }
 
     public static void clearAll() {
@@ -58,20 +79,23 @@ public static void clearAll() {
         resetDisplay();
     }
 
+    /** Diplomacy key: diplomacy for RTS players, the economy overview for everyone else. */
+    private static void toggle(DisplayType type) {
+        if (displayType != DisplayType.NONE)
+            resetDisplay();
+        else
+            displayType = type;
+    }
+
     public static final Button observerButton = new Button(
             "Toggle Observer Displays",
             Button.DEFAULT_ICON_SIZE,
-            ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/observer.png"),
-            Keybindings.hotkey8,
+            ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/map.png"),
+            (Keybinding) null, // its key is handled in onKeyPress so it works even when this button isn't shown
             () -> displayType == DisplayType.OBSERVER,
-            () -> PlayerClientEvents.isRTSPlayer() || PlayerClientEvents.rtsPlayers.isEmpty(),
+            PlayerClientEvents::isRTSPlayer, // with no players its panel is just the big map, so it's shown before a match too
             () -> true,
-            () -> {
-                if (displayType != DisplayType.NONE)
-                    displayType = DisplayType.NONE;
-                else
-                    displayType = DisplayType.OBSERVER;
-            },
+            () -> toggle(DisplayType.OBSERVER),
             null,
             List.of(fcs(I18n.get("alliances.reignofnether.tooltip.toggle_observer_player_displays"))
             ));
@@ -79,233 +103,169 @@ public static void clearAll() {
     public static final Button diplomacyButton = new Button(
             "Toggle Diplomacy Displays",
             Button.DEFAULT_ICON_SIZE,
-            ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/sweet_berries.png"),
-            Keybindings.hotkey8,
+            ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/map.png"),
+            (Keybinding) null,
             () -> displayType == DisplayType.DIPLOMACY,
-            () -> !PlayerClientEvents.isRTSPlayer() || (PlayerClientEvents.rtsPlayers.size() + getNumFpvPlayers()) <= 1,
+            () -> !PlayerClientEvents.isRTSPlayer(),
             () -> true,
-            () -> {
-                if (displayType != DisplayType.NONE)
-                    displayType = DisplayType.NONE;
-                else
-                    displayType = DisplayType.DIPLOMACY;
-            },
+            () -> toggle(DisplayType.DIPLOMACY),
             null,
             List.of(fcs(I18n.get("alliances.reignofnether.tooltip.toggle_diplomacy_player_displays"))
             ));
 
-    private static int getNumFpvPlayers() {
-        if (MC.level == null)
-            return 0;
-        var size = 0;
-        for (AbstractClientPlayer p : MC.level.players()) {
-            if (!p.isSpectator() && !p.isCreative()) {
-                size++;
-            }
+    // ------------------------------------------------------------------ rendering
+
+    public static void render(HudFrame f) {
+        // opened before the match started: it would show every enemy's economy
+        if (displayType == DisplayType.OBSERVER && PlayerClientEvents.isRTSPlayer())
+            resetDisplay();
+        boolean diplomacy = displayType == DisplayType.DIPLOMACY && MC.level != null && MC.player != null;
+        if (diplomacy)
+            renderDiplomacy(f);
+        if (!diplomacy) {
+            DiplomacyPlayerDisplay.stopTyping();
+            if (displayType == DisplayType.OBSERVER)
+                renderObserver(f);
         }
-        return size;
     }
 
-    public static final Button shareUnitControlButton = new Button(
-            "Toggle Share Unit Control",
-            Button.DEFAULT_ICON_SIZE,
-            ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/chain_command_block_back.png"),
-            (Keybinding) null,
-            AlliancesClient::sharingAllyControl,
-            () -> !PlayerClientEvents.isRTSPlayer() || PlayerClientEvents.rtsPlayers.size() <= 1,
-            () -> true,
-            () -> AllianceServerboundPacket.doAllianceAction(
-                    AllianceAction.SET_ALLY_CONTROL,
-                    !AlliancesClient.sharingAllyControl()
-            ),
-            null,
-            List.of(fcs(I18n.get("alliances.reignofnether.tooltip.toggle_shared_unit_control"))
-            ));
+    private static void renderObserver(HudFrame f) {
+        List<String> names = PlayerClientEvents.rtsPlayers.stream().map(p -> p.name).toList();
+        observerPlayerDisplays.removeIf(d -> !names.contains(d.playerName));
+        for (RTSPlayer rtsPlayer : PlayerClientEvents.rtsPlayers)
+            if (observerPlayerDisplays.stream().noneMatch(d -> d.playerName.equals(rtsPlayer.name)))
+                observerPlayerDisplays.add(new ObserverPlayerDisplay(rtsPlayer));
 
-    @SubscribeEvent
-    public static void onDrawScreen(ScreenEvent.Render.Post evt) {
-        if (!OrthoviewClientEvents.isEnabled() ||
-                !(evt.getScreen() instanceof TopdownGui) ||
-                MC.level == null) {
-            return;
-        }
-        renderedButtons.clear();
-        hudZones.clear();
+        Rect panel = renderPanel(f, I18n.get("hud.reignofnether.observer.title"), observerPlayerDisplays.size());
+        int cx = panel.x() + PAD + AbstractPlayerDisplay.CONTENT_X;
+        int ly = panel.y() + HEADER_H - 9;
+        Text.small(f.g, I18n.get("hud.reignofnether.diplomacy.col_player"), panel.x() + PAD + 10, ly, Theme.DIM);
+        Text.small(f.g, I18n.get("hud.reignofnether.observer.col_resources"), cx, ly, Theme.DIM);
+        Text.small(f.g, I18n.get("hud.reignofnether.observer.col_population"), cx + 3 * ObserverPlayerDisplay.CELL_STEP, ly, Theme.DIM);
 
-        if (displayType == DisplayType.DIPLOMACY) {
-            renderDiplomacyPlayerDisplays(evt);
-        } else if (displayType == DisplayType.OBSERVER) {
-            renderObserverPlayerDisplays(evt);
+        int y = panel.y() + HEADER_H;
+        for (ObserverPlayerDisplay d : observerPlayerDisplays) {
+            d.render(f, panel.x() + PAD, y, panel.w() - PAD * 2);
+            y += AbstractPlayerDisplay.ROW_H + ROW_GAP;
         }
-        for (Button button : renderedButtons)
-            if (button.isMouseOver(evt.getMouseX(), evt.getMouseY()))
-                button.renderTooltip(evt.getGuiGraphics(), evt.getMouseX(), evt.getMouseY());
     }
 
-    @SubscribeEvent
-    public static void onMousePress(ScreenEvent.MouseButtonPressed.Post evt) {
-        for (Button button : renderedButtons) {
-            if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_1) {
-                button.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), true);
-            } else if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_2) {
-                button.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), false);
+    private static void renderDiplomacy(HudFrame f) {
+        String self = MC.player.getName().getString();
+        List<String> rtsNames = PlayerClientEvents.rtsPlayers.stream().map(p -> p.name).toList();
+        List<String> levelNames = MC.level.players().stream().map(p -> p.getName().getString()).toList();
+        rtsDiplomacyPlayerDisplays.removeIf(d -> !rtsNames.contains(d.playerName));
+        fpvDiplomacyPlayerDisplays.removeIf(d -> !levelNames.contains(d.playerName));
+
+        for (AbstractClientPlayer player : MC.level.players()) {
+            String name = player.getName().getString();
+            if (player != MC.player && PlayerClientEvents.getRTSPlayer(name) == null
+                    && !player.isSpectator() && !player.isCreative()
+                    && fpvDiplomacyPlayerDisplays.stream().noneMatch(d -> d.playerName.equals(name))) {
+                fpvDiplomacyPlayerDisplays.add(new DiplomacyPlayerDisplay(player));
+                rtsDiplomacyPlayerDisplays.removeIf(d -> d.playerName.equals(name));
+            }
+        }
+        for (RTSPlayer rtsPlayer : PlayerClientEvents.rtsPlayers) {
+            if (!rtsPlayer.name.equals(self)
+                    && rtsDiplomacyPlayerDisplays.stream().noneMatch(d -> d.playerName.equals(rtsPlayer.name))) {
+                rtsDiplomacyPlayerDisplays.add(new DiplomacyPlayerDisplay(rtsPlayer));
+                fpvDiplomacyPlayerDisplays.removeIf(d -> d.playerName.equals(rtsPlayer.name));
             }
         }
-    }
-
-    @SubscribeEvent
-    public static void onKeyRelease(ScreenEvent.KeyReleased.KeyReleased.Post evt) {
-        if (TextInputClientEvents.isAnyInputFocused())
-            return;
-        if (MC.screen == null || !MC.screen.getTitle().getString().contains("topdowngui_container"))
-            return;
-        for (Button button : renderedButtons)
-            button.checkPressed(evt.getKeyCode());
-    }
-
-    private static void renderObserverPlayerDisplays(ScreenEvent.Render.Post evt) {
-        int screenWidth = MC.getWindow().getGuiScaledWidth();
 
-        int blitX = (screenWidth / 2 - ObserverPlayerDisplay.DISPLAY_WIDTH / 2) + 10;
-        int blitY = 70;
+        List<DiplomacyPlayerDisplay> rows = new ArrayList<>(rtsDiplomacyPlayerDisplays);
+        rows.addAll(fpvDiplomacyPlayerDisplays);
+        Rect panel = renderPanel(f, I18n.get("hud.reignofnether.diplomacy.title"), rows.size());
 
-        GuiGraphics guiGraphics = evt.getGuiGraphics();
+        boolean canShareUnitControl = !rtsDiplomacyPlayerDisplays.isEmpty()
+                && PlayerClientEvents.isRTSPlayer() && PlayerClientEvents.rtsPlayers.size() > 1;
+        if (canShareUnitControl)
+            renderShareControlToggle(f, panel.right() - PAD - 16 - 8, panel.y() + 8);
 
-        List<String> list = new ArrayList<>();
-        for (RTSPlayer rtsp : PlayerClientEvents.rtsPlayers) {
-            String name = rtsp.name;
-            list.add(name);
-        }
-        observerPlayerDisplays.removeIf(r -> !list.contains(r.playerName));
+        int ly = panel.y() + HEADER_H - 9;
+        Text.small(f.g, I18n.get("hud.reignofnether.diplomacy.col_player"), panel.x() + PAD + 10, ly, Theme.DIM);
+        Text.small(f.g, I18n.get("hud.reignofnether.diplomacy.col_send"), panel.x() + PAD + AbstractPlayerDisplay.CONTENT_X, ly, Theme.DIM);
+        Text.smallRight(f.g, I18n.get("hud.reignofnether.diplomacy.col_alliance"), panel.right() - PAD - 7, ly, Theme.DIM);
 
-        List<String> trackedPlayers = new ArrayList<>();
-        for (ObserverPlayerDisplay d : observerPlayerDisplays) {
-            String playerName = d.playerName;
-            trackedPlayers.add(playerName);
-        }
-        for (RTSPlayer rtsPlayer : PlayerClientEvents.rtsPlayers) {
-            if (!trackedPlayers.contains(rtsPlayer.name)) {
-                observerPlayerDisplays.add(new ObserverPlayerDisplay(rtsPlayer));
-            }
-        }
-        guiGraphics.fill(
-                blitX - BG_BORDER_WIDTH, blitY - BG_BORDER_WIDTH,
-                blitX + ObserverPlayerDisplay.DISPLAY_WIDTH + BG_BORDER_WIDTH,
-                (blitY + Button.DEFAULT_ICON_FRAME_SIZE + BG_BORDER_WIDTH) * observerPlayerDisplays.size(),
-                0x99000000
-        );
-
-        for (ObserverPlayerDisplay playerDisplay : observerPlayerDisplays) {
-            hudZones.add(playerDisplay.getRectZone(blitX, blitY, BG_BORDER_WIDTH));
-            playerDisplay.render(guiGraphics, blitX, blitY);
-            blitY += Button.DEFAULT_ICON_FRAME_SIZE;
+        int y = panel.y() + HEADER_H;
+        for (DiplomacyPlayerDisplay d : rows) {
+            d.render(f, panel.x() + PAD, y, panel.w() - PAD * 2);
+            y += AbstractPlayerDisplay.ROW_H + ROW_GAP;
         }
     }
 
-    private static void renderDiplomacyPlayerDisplays(ScreenEvent.Render.Post evt) {
-        if (MC.level == null || MC.player == null)
-            return;
+    /** Panel background, title, close hint and close button. Returns the panel rectangle. */
+    private static Rect renderPanel(HudFrame f, String title, int rows) {
+        // only as tall as the rows need
+        int rowsH = Math.max(AbstractPlayerDisplay.ROW_H, rows * (AbstractPlayerDisplay.ROW_H + ROW_GAP) - ROW_GAP);
+        // below the spectator scoreboard, which grows a row per two players
+        int minTop = SpectatorHud.isActive() ? Math.max(TOP, SpectatorHud.bottom() + HudLayout.GAP) : TOP;
+        int h = HEADER_H + rowsH + PAD;
+        int x = (f.layout.width() - WIDTH) / 2;
+        // centred between the top of the screen and the console, never over the top bar
+        int top = Math.max(minTop, (f.layout.console().y() - h) / 2);
+        Rect panel = new Rect(x, top, WIDTH, h);
+        Theme.panel(f.g, x, top, WIDTH, h, Theme.floating());
+        f.g.fill(x, top, x + WIDTH, top + 2, Theme.ORANGE);
+        f.zone(panel);
 
-        int screenWidth = MC.getWindow().getGuiScaledWidth();
+        Text.heading(f.g, title, x + PAD, top + 10, Theme.GOLD, Text.px(24));
 
-        int blitX = (screenWidth / 2 - DiplomacyPlayerDisplay.DISPLAY_WIDTH / 2) + 10;
-        int blitY = 37;
+        Rect close = new Rect(panel.right() - PAD - 16, top + 8, 16, 16);
+        boolean hovered = f.hovered(close);
+        Theme.secondaryButton(f.g, close.x(), close.y(), close.w(), close.h(), hovered);
+        Theme.cross(f.g, close, hovered ? Theme.GOLD : Theme.BODY);
+        f.register(new ButtonBuilder("Close player panel").onLeftClick(PlayerDisplayClientEvents::resetDisplay).build(),
+                close, null, () -> null);
+        return panel;
+    }
 
-        GuiGraphics guiGraphics = evt.getGuiGraphics();
-        List<String> list = new ArrayList<>();
-        for (RTSPlayer rtsp : PlayerClientEvents.rtsPlayers) {
-            String name = rtsp.name;
-            list.add(name);
-        }
-        rtsDiplomacyPlayerDisplays.removeIf(d -> !list.contains(d.playerName));
-        List<String> result = new ArrayList<>();
-        for (AbstractClientPlayer p : MC.level.players()) {
-            String string = p.getName().getString();
-            result.add(string);
-        }
-        fpvDiplomacyPlayerDisplays.removeIf(d -> !result.contains(d.playerName));
+    /** "Allies can control my units" chip with an on/off dot, like the match setup's rule toggles. */
+    private static void renderShareControlToggle(HudFrame f, int right, int y) {
+        boolean sharing = AlliancesClient.sharingAllyControl();
+        String label = I18n.get("hud.reignofnether.diplomacy.share_control").toUpperCase(java.util.Locale.ROOT);
+        int w = Text.smallWidth(label) + 19;
+        Rect r = new Rect(right - w, y, w, 16);
+        Theme.chip(f.g, r.x(), y, w, r.h(), false, f.hovered(r));
+        f.g.fill(r.x() + 5, y + 5, r.x() + 10, y + 10, sharing ? Theme.OK : Theme.FAINT);
+        Text.small(f.g, label, r.x() + 14, y + 4, Theme.BODY);
+        f.register(new ButtonBuilder("Share unit control")
+                .onLeftClick(() -> AllianceServerboundPacket.doAllianceAction(AllianceAction.SET_ALLY_CONTROL, !sharing))
+                .build(), r, null, () -> null);
+    }
 
-        Set<String> trackedRtsPlayers = new HashSet<>();
-        for (DiplomacyPlayerDisplay rtsDiplomacyPlayerDisplay : rtsDiplomacyPlayerDisplays) {
-            String playerName = rtsDiplomacyPlayerDisplay.playerName;
-            trackedRtsPlayers.add(playerName);
-        }
-        Set<String> trackedFpvPlayers = new HashSet<>();
-        for (DiplomacyPlayerDisplay fpvDiplomacyPlayerDisplay : fpvDiplomacyPlayerDisplays) {
-            String playerName = fpvDiplomacyPlayerDisplay.playerName;
-            trackedFpvPlayers.add(playerName);
-        }
-        for (AbstractClientPlayer player : MC.level.players()) {
-            if (player != MC.player) {
-                RTSPlayer rtsPlayer = PlayerClientEvents.getRTSPlayer(player.getName().getString());
-                if (rtsPlayer == null && !trackedFpvPlayers.contains(player.getName().getString()) &&
-                        !player.isSpectator() && !player.isCreative()) {
-                    fpvDiplomacyPlayerDisplays.add(new DiplomacyPlayerDisplay(player));
-                    rtsDiplomacyPlayerDisplays.removeIf(d -> d.playerName.equals(player.getName().getString()));
-                }
-            }
-        }
-        for (RTSPlayer rtsPlayer : PlayerClientEvents.rtsPlayers) {
-            if (!rtsPlayer.name.equals(MC.player.getName().getString())) {
-                if (!trackedRtsPlayers.contains(rtsPlayer.name)) {
-                    rtsDiplomacyPlayerDisplays.add(new DiplomacyPlayerDisplay(rtsPlayer));
-                    fpvDiplomacyPlayerDisplays.removeIf(d -> d.playerName.equals(rtsPlayer.name));
-                }
-            }
-        }
-        boolean canShareUnitControl = !rtsDiplomacyPlayerDisplays.isEmpty() && !shareUnitControlButton.isHidden.get();
-        int x1 = blitX - BG_BORDER_WIDTH;
-        int y1 = blitY - BG_BORDER_WIDTH;
-        int x2 = blitX + DiplomacyPlayerDisplay.DISPLAY_WIDTH + BG_BORDER_WIDTH;
-        int y2 = blitY + ((Button.DEFAULT_ICON_FRAME_SIZE + BG_BORDER_WIDTH) *
-                (rtsDiplomacyPlayerDisplays.size() + fpvDiplomacyPlayerDisplays.size() )) +
-                (canShareUnitControl ? (int) (Button.DEFAULT_ICON_FRAME_SIZE * 1.5f) : 0);
-        guiGraphics.fill(x1, y1, x2, y2, 0x99000000);
-        hudZones.add(new RectZone(x1, y1, x2, y2));
-
-        if (!rtsDiplomacyPlayerDisplays.isEmpty() && !shareUnitControlButton.isHidden.get()) {
-            String tooltipSharedUnitEnable = I18n.get("alliances.reignofnether.tooltip.shared_unit_control.enable");
-            String tooltipSharedUnitDisable = I18n.get("alliances.reignofnether.tooltip.shared_unit_control.disable");
-
-            shareUnitControlButton.render(guiGraphics, blitX, blitY, evt.getMouseX(), evt.getMouseY());
-            MyRenderer.renderFrameWithBg(
-                    guiGraphics,
-                    blitX + Button.DEFAULT_ICON_FRAME_SIZE,
-                    blitY,
-                    102 + (
-                            AlliancesClient.sharingAllyControl()
-                                    ? MC.font.width(tooltipSharedUnitEnable)
-                                    : MC.font.width(tooltipSharedUnitDisable)
-                    ),
-                    Button.DEFAULT_ICON_FRAME_SIZE,
-                    0xA0000000
-            );
-            guiGraphics.drawString(
-                    MC.font,
-                    I18n.get("alliances.reignofnether.tooltip.shared_unit_control") + (AlliancesClient.sharingAllyControl() ? tooltipSharedUnitEnable : tooltipSharedUnitDisable),
-                    blitX + (Button.DEFAULT_ICON_SIZE / 2) + 1 + Button.DEFAULT_ICON_FRAME_SIZE,
-                    blitY + (Button.DEFAULT_ICON_SIZE / 2) + 1,
-                    0xFFFFFF
-            );
-            blitY += (Button.DEFAULT_ICON_FRAME_SIZE * 1.5f);
-            renderedButtons.add(shareUnitControlButton);
-        }
-        for (DiplomacyPlayerDisplay playerDisplay : rtsDiplomacyPlayerDisplays) {
-            hudZones.add(playerDisplay.getRectZone(blitX, blitY, BG_BORDER_WIDTH));
-            renderedButtons.addAll(playerDisplay.render(guiGraphics, blitX, blitY, evt.getMouseX(), evt.getMouseY()));
-            blitY += Button.DEFAULT_ICON_FRAME_SIZE;
-        }
-        for (DiplomacyPlayerDisplay playerDisplay : fpvDiplomacyPlayerDisplays) {
-            hudZones.add(playerDisplay.getRectZone(blitX, blitY, BG_BORDER_WIDTH));
-            renderedButtons.addAll(playerDisplay.render(guiGraphics, blitX, blitY, evt.getMouseX(), evt.getMouseY()));
-            blitY += Button.DEFAULT_ICON_FRAME_SIZE;
+    // ------------------------------------------------------------------ typing in the amount fields
+
+    @SubscribeEvent
+    public static void onMousePress(ScreenEvent.MouseButtonPressed.Pre evt) {
+        // a click on an amount field focuses it again after this, through the HUD
+        DiplomacyPlayerDisplay.stopTyping();
+    }
+
+    @SubscribeEvent
+    public static void onKeyPress(ScreenEvent.KeyPressed.Pre evt) {
+        if (DiplomacyPlayerDisplay.keyPressed(evt.getKeyCode())) {
+            evt.setCanceled(true);
+        } else if (evt.getScreen() instanceof TopdownGui && OrthoviewClientEvents.isEnabled() && !TextInputClientEvents.isAnyInputFocused()) {
+            int key = evt.getKeyCode();
+            if (key == Keybindings.bigMap.getKey())
+                HudGeometry.setBigMap(!HudGeometry.isBigMap());
+            else if (key == Keybindings.satellite.getKey())
+                StrategicMapClientEvents.toggle();
+            else if (key == Keybindings.diplomacy.getKey())
+                toggle(PlayerClientEvents.isRTSPlayer() ? DisplayType.DIPLOMACY : DisplayType.OBSERVER);
+            else
+                return;
+            evt.setCanceled(true);
         }
     }
 
-    public static boolean isMouseOverHud(int mouseX, int mouseY) {
-        for (RectZone hudZone : hudZones)
-            if (hudZone.isMouseOver(mouseX, mouseY))
-                return true;
-        return false;
+    @SubscribeEvent
+    public static void onCharTyped(ScreenEvent.CharacterTyped.Pre evt) {
+        if (DiplomacyPlayerDisplay.isTyping()) {
+            DiplomacyPlayerDisplay.charTyped(evt.getCodePoint());
+            evt.setCanceled(true);
+        }
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/items/ItemClientEvents.java b/src/main/java/com/solegendary/reignofnether/items/ItemClientEvents.java
index 85c979e4f..2af42e828 100644
--- a/src/main/java/com/solegendary/reignofnether/items/ItemClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/items/ItemClientEvents.java
@@ -1,6 +1,7 @@
 package com.solegendary.reignofnether.items;
 
-import com.solegendary.reignofnether.alliance.AlliancesClient;
+import javax.annotation.Nullable;
+
 import com.solegendary.reignofnether.building.BuildingClientEvents;
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.building.buildings.placements.ItemShopPlacement;
@@ -10,7 +11,6 @@
 import com.solegendary.reignofnether.guiscreen.TopdownGui;
 import com.solegendary.reignofnether.hud.HudClientEvents;
 import com.solegendary.reignofnether.hud.HudClientboundPacket;
-import com.solegendary.reignofnether.hud.RectZone;
 import com.solegendary.reignofnether.hud.buttons.AbstractUnitItemButton;
 import com.solegendary.reignofnether.hud.buttons.Button;
 import com.solegendary.reignofnether.hud.buttons.UnitItemInventoryButton;
@@ -29,6 +29,7 @@
 import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
@@ -49,6 +50,14 @@
 
 public class ItemClientEvents {
 
+    static {
+        WorldState.onClientReset(() -> {
+            resetActions();
+            hoveredInvItem = null;
+            openItemShop = null;
+        });
+    }
+
     public static final boolean ENABLED = UnitItem.ENABLED;
 
     private static final Minecraft MC = Minecraft.getInstance();
@@ -99,6 +108,9 @@ public static void addRenderedItem(ItemEntity itemEntity) {
     public static void clearRenderedItems() {
         renderedItems.clear();
     }
+    public static ArrayList<ItemEntity> getRenderedItems() {
+        return renderedItems;
+    }
 
     public static boolean hasDragActionItem() {
         return actionableUnitItemDrag != null && (mouseX != mouseLeftDownX || mouseY != mouseLeftDownY) && !hasLeftClickAction();
@@ -108,9 +120,8 @@ public static boolean shouldRenderUnitInventory(LivingEntity le) {
         return ENABLED &&
                 le instanceof UnitInventory inv &&
                 le instanceof Unit unit &&
-                Resources.getTotalResourcesFromItems(unit.getItems()).getTotalValue() <= 0 &&
-                (!inv.isEmpty() || (le instanceof HeroUnit && unit.getItemGoal() != null && MC.player != null &&
-                        AlliancesClient.isAlliedOrOwned(unit.getOwnerName(), MC.player.getName().getString())));
+                // heroes always show their slots, enemies' too; the slot buttons gate who can use them
+                (!inv.isEmpty() || (le instanceof HeroUnit && unit.getItemGoal() != null));
     }
 
     public static void syncInventory(int unitId, List<ItemStack> items) {
@@ -161,39 +172,31 @@ public static void setStockedShopItems(BlockPos buildingPos, ArrayList<StockedSh
             Keybindings.item6
     );
 
-    public static RectZone renderUnitInventory(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY, UnitInventory inv) {
-        ItemClientEvents.renderedButtons.clear();
-        ItemClientEvents.hoveredInvItem = null;
+    /** The inventory slots of a unit, in slot order. The HUD draws them and routes their clicks and keys. */
+    public static List<Button> inventoryButtons(UnitInventory inv) {
+        renderedButtons.clear();
         for (int i = 0; i < inv.getAllItems().size(); i++) {
             Keybinding hotkey = i < hotkeys.size() ? hotkeys.get(i) : null;
             ItemStack itemStack = inv.getAllItems().get(i);
             UnitItem unitItem = ItemUtil.getUnitItem(itemStack);
-            if (unitItem instanceof EmptyUnitItem emptyItem) {
-                ItemClientEvents.renderedButtons.add(emptyItem.getEmptySlotButton(i, hasDragActionItem(), (Unit) inv));
-            } else if (unitItem != null) {
-                ItemClientEvents.renderedButtons.add(unitItem.getInventoryButton(i, itemStack, (Unit) inv, hotkey));
-            }
-        }
-        int i = 0;
-        for (Button button : ItemClientEvents.renderedButtons) {
-            int xi = i % 2 == 0 ? x : x + BUTTON_WIDTH;
-            int yi = y + ((i / 2) * BUTTON_WIDTH);
-            button.render(guiGraphics, xi, yi, mouseX, mouseY);
-            i += 1;
+            if (unitItem instanceof EmptyUnitItem emptyItem)
+                renderedButtons.add(emptyItem.getEmptySlotButton(i, hasDragActionItem(), (Unit) inv));
+            else if (unitItem != null)
+                renderedButtons.add(unitItem.getInventoryButton(i, itemStack, (Unit) inv, hotkey));
         }
+        return renderedButtons;
+    }
 
-        for (Button button : ItemClientEvents.renderedButtons) {
-            if (button.isMouseOver(mouseX, mouseY)) {
-                button.renderTooltip(guiGraphics, mouseX, mouseY);
-                if (button instanceof UnitItemInventoryButton uiInvButton) {
-                    if (hoveredInvItem == null) {
-                        hoveredInvItem = uiInvButton.unitItem;
-                        hoveredInvItem.updateHighlightBps(MC.level);
-                    }
-                }
+    /** Called by the HUD with the slot under the mouse, so the world highlights what that item would hit. */
+    public static void setHoveredButton(@Nullable Button button) {
+        if (button instanceof UnitItemInventoryButton slot) {
+            if (hoveredInvItem != slot.unitItem) {
+                hoveredInvItem = slot.unitItem;
+                hoveredInvItem.updateHighlightBps(MC.level);
             }
+        } else {
+            hoveredInvItem = null;
         }
-        return RectZone.getZoneByLW(x, y, INV_WIDTH, INV_HEIGHT);
     }
 
     @SubscribeEvent
@@ -220,27 +223,25 @@ public static void onLeftMouseRelease(ScreenEvent.MouseButtonReleased.Post evt)
         if (!shouldRenderUnitInventory(HudClientEvents.hudSelectedEntity) || MC.player == null || evt.getButton() != GLFW.GLFW_MOUSE_BUTTON_1)
             return;
 
-        for (Button button : renderedButtons)
-            button.checkClickedReleased((int) evt.getMouseX(), (int) evt.getMouseY(), true);
+        HudClientEvents.releaseMouse();
 
         if (hasDragActionItem() &&
             HudClientEvents.hudSelectedEntity instanceof UnitInventory inv &&
             HudClientEvents.hudSelectedEntity instanceof Unit unit
         ) {
-            Button mousedOverButton = getMousedOverButton();
-            Button hudMousedOverButton = HudClientEvents.getMousedOverButton();
+            Button mousedOverButton = HudClientEvents.getMousedOverButton();
             if (mousedOverButton instanceof UnitItemInventoryButton uiButton && actionableInvIndex != uiButton.invIndex) {
                 inv.swapSlots(actionableInvIndex, uiButton.invIndex);
                 ItemServerboundPacket.swap(((Entity) inv).getId(), actionableInvIndex, uiButton.invIndex);
-            } else if (hudMousedOverButton != null &&
-                    hudMousedOverButton.entity != HudClientEvents.hudSelectedEntity &&
-                    hudMousedOverButton.entity instanceof UnitInventory inv1) {
-                Relationship rlu = UnitClientEvents.getPlayerToEntityRelationship(hudMousedOverButton.entity);
+            } else if (mousedOverButton != null &&
+                    mousedOverButton.entity != HudClientEvents.hudSelectedEntity &&
+                    mousedOverButton.entity instanceof UnitInventory inv1) {
+                Relationship rlu = UnitClientEvents.getPlayerToEntityRelationship(mousedOverButton.entity);
                 if (rlu == Relationship.FRIENDLY || rlu == Relationship.OWNED || SandboxClientEvents.isSandboxPlayer()) {
                     // Give via group button
                     unit.getCheckpoints().clear();
-                    unit.getCheckpoints().add(new Checkpoint(hudMousedOverButton.entity, true));
-                    ItemServerboundPacket.give(((Entity) inv).getId(), actionableInvUUID, hudMousedOverButton.entity.getId());
+                    unit.getCheckpoints().add(new Checkpoint(mousedOverButton.entity, true));
+                    ItemServerboundPacket.give(((Entity) inv).getId(), actionableInvUUID, mousedOverButton.entity.getId());
                 }
             } else if (!HudClientEvents.isMouseOverAnyButtonOrHud()) {
                 BuildingPlacement bpl = BuildingClientEvents.getPreselectedBuilding();
@@ -282,27 +283,11 @@ public static boolean hasLeftClickAction() {
         return leftClickUseItem && actionableUnitItem != null && actionableInvUUID != null;
     }
 
-    // for some reason some bound vanilla keys like Q and E don't trigger KeyPressed but still trigger keyReleased
-    @SubscribeEvent
-    public static void onKeyRelease(ScreenEvent.KeyReleased.KeyReleased.Post evt) {
-        if (!shouldRenderUnitInventory(HudClientEvents.hudSelectedEntity))
-            return;
-        for (Button button : renderedButtons)
-            button.checkPressed(evt.getKeyCode());
-    }
-
     @SubscribeEvent
     public static void onMousePress(ScreenEvent.MouseButtonPressed.Post evt) {
         if (!shouldRenderUnitInventory(HudClientEvents.hudSelectedEntity) || !(MC.screen instanceof TopdownGui) || MC.player == null)
             return;
 
-        for (Button button : renderedButtons) {
-            if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_1) {
-                button.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), true);
-            } else if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_2) {
-                button.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), false);
-            }
-        }
         if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_1) {
             mouseLeftDownX = (int) evt.getMouseX();
             mouseLeftDownY = (int) evt.getMouseY();
@@ -345,13 +330,6 @@ public static void resetActions() {
         leftClickUseItem = false;
     }
 
-    private static Button getMousedOverButton() {
-        for (Button button : renderedButtons)
-            if (button.isMouseOver(mouseX, mouseY))
-                return button;
-        return null;
-    }
-
     @SubscribeEvent
     public static void onRenderLevel(RenderLevelStageEvent evt) {
         if (!ENABLED) return;
diff --git a/src/main/java/com/solegendary/reignofnether/items/ItemServerEvents.java b/src/main/java/com/solegendary/reignofnether/items/ItemServerEvents.java
index 0d1640eaf..66eec1317 100644
--- a/src/main/java/com/solegendary/reignofnether/items/ItemServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/items/ItemServerEvents.java
@@ -1,5 +1,6 @@
 package com.solegendary.reignofnether.items;
 
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.building.BuildingServerEvents;
@@ -232,17 +233,17 @@ public static void onEntityInteract(PlayerInteractEvent.EntityInteract evt) {
             evt.setCanceled(true);
 
             if (inv.isFull(unitItem)) {
-                player.sendSystemMessage(Component.translatable("item.reignofnether.error.full_inventory", mobName));
+                player.sendSystemMessage(SystemMessage.error(Component.translatable("item.reignofnether.error.full_inventory", mobName)));
                 evt.setCancellationResult(InteractionResult.FAIL);
             } else if (inv.tryAdding(new ItemStack(stack.getItem(), 1))) {
-                player.sendSystemMessage(Component.translatable("item.reignofnether.hud.give_to_unit", itemName, mobName));
+                player.sendSystemMessage(SystemMessage.info(Component.translatable("item.reignofnether.hud.give_to_unit", itemName, mobName)));
                 if (!player.isCreative()) {
                     stack.setCount(stack.getCount() - 1);
                 }
                 evt.setCancellationResult(InteractionResult.SUCCESS);
             }
             else {
-                player.sendSystemMessage(Component.translatable("item.reignofnether.error.failed_other", mobName));
+                player.sendSystemMessage(SystemMessage.error(Component.translatable("item.reignofnether.error.failed_other", mobName)));
                 evt.setCancellationResult(InteractionResult.FAIL);
             }
         }
diff --git a/src/main/java/com/solegendary/reignofnether/items/ItemShopMenu.java b/src/main/java/com/solegendary/reignofnether/items/ItemShopMenu.java
index 30a1d6070..ff666ec81 100644
--- a/src/main/java/com/solegendary/reignofnether/items/ItemShopMenu.java
+++ b/src/main/java/com/solegendary/reignofnether/items/ItemShopMenu.java
@@ -1,173 +1,98 @@
 package com.solegendary.reignofnether.items;
 
 import com.solegendary.reignofnether.ReignOfNether;
-import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.building.addon.ItemShopAddon;
 import com.solegendary.reignofnether.building.buildings.placements.ItemShopPlacement;
 import com.solegendary.reignofnether.hud.HudClientEvents;
-import com.solegendary.reignofnether.hud.RectZone;
 import com.solegendary.reignofnether.hud.buttons.Button;
 import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
 import com.solegendary.reignofnether.hud.buttons.UnitItemShopButton;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
+import com.solegendary.reignofnether.hud.panels.SpectatorHud;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.util.MiscUtil;
 import com.solegendary.reignofnether.util.MyRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.resources.language.I18n;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.LivingEntity;
-import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
+import static com.solegendary.reignofnether.hud.layout.CommandGrid.SLOT_Z;
 import static com.solegendary.reignofnether.util.MiscUtil.capitaliseAndSpace;
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
 
+/** Item shop pop-over shown above the HUD console while a shop (or the hero it serves) is selected. */
 public class ItemShopMenu {
 
-    private static final Minecraft MC = Minecraft.getInstance();
-
-    private static final int TITLE_X_OFFSET = 6;
-    private static final int TITLE_Y_OFFSET = 6;
-    private static final int HEADER_HEIGHT = 22;
-    private static final int ITEM_SLOT_SIZE = Button.DEFAULT_ICON_FRAME_SIZE;
-    private static final int MENU_WIDTH = ITEM_SLOT_SIZE * 6;
-    private static final int ITEMS_PER_ROW = MENU_WIDTH / ITEM_SLOT_SIZE;
-
-    private static final int PANEL_BG_COLOUR = 0xA0000000;
-    private static final int PANEL_PADDING = 10;
-    private static final int PANEL_INSET = PANEL_PADDING / 2;
-
-    public static @NotNull RectZone renderFrame(GuiGraphics guiGraphics, ItemShopAddon shop, int x, int y) {
-        ItemShopPlacement bpl = ItemClientEvents.openItemShop;
-        ArrayList<StockedShopItem> stocks = bpl.getDataStorage().getData(ItemShopAddon.STOCKED_ITEMS);
-        if (stocks == null)
-            stocks = new ArrayList<>();
-
-        int extraRows = ((stocks.size() - 1) / ITEMS_PER_ROW);
-        y -= (extraRows * ItemShopMenu.ITEM_SLOT_SIZE);
-
-        int contentHeight = getMenuHeight(stocks.size());
-        int panelWidth = MENU_WIDTH + PANEL_PADDING;
-        int panelHeight = contentHeight + PANEL_PADDING;
-
-        MyRenderer.renderFrameWithBg(guiGraphics, x, y, panelWidth, panelHeight, PANEL_BG_COLOUR);
-        return RectZone.getZoneByLW(x, y, panelWidth, panelHeight);
+    private static final int SLOT = HudLayout.CELL;
+    private static final int GAP = 3;
+    private static final int PER_ROW = 5; // like the command card, whose keys buy with Alt held
+    private static final int PAD = 6;
+    private static final int CONTROL = HudLayout.TILE_SMALL;
+    private static final int HEADER = CONTROL + 3;
+
+    /** The close button and the unit being served, ending at the right edge given. */
+    private static void renderControls(HudFrame f, ItemShopPlacement shop, int right, int y) {
+        Button close = new ButtonBuilder("Close Item Shop Menu")
+                .onLeftClick(() -> ItemClientEvents.openItemShop = null)
+                .build();
+        Rect closeRect = new Rect(right - CONTROL, y + PAD, CONTROL, CONTROL);
+        Theme.secondaryButton(f.g, closeRect.x(), closeRect.y(), CONTROL, CONTROL, f.hovered(closeRect));
+        Theme.cross(f.g, closeRect, f.hovered(closeRect) ? Theme.DANGER_TEXT : Theme.BODY);
+        f.register(close, closeRect, null, () -> Tooltip.of(I18n.get("itemshop.reignofnether.close")));
+
+        Unit served = shop.getServedUnit();
+        if (served instanceof LivingEntity servedEntity) {
+            String name = capitaliseAndSpace(HudClientEvents.getModifiedEntityName(servedEntity));
+            String icon = MiscUtil.getEntityIconName(servedEntity) + (servedEntity.isVehicle() ? "_half.png" : ".png");
+            Rect servingRect = new Rect(closeRect.x() - CONTROL - GAP, y + PAD, CONTROL, CONTROL);
+            MyRenderer.renderIcon(f.g, ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/mobheads/" + icon),
+                    servingRect.x(), servingRect.y(), CONTROL);
+            Button serving = new ButtonBuilder("Serving Unit").onLeftClick(shop::cycleServedUnit).build();
+            f.register(serving, servingRect, null, () -> Tooltip.of(I18n.get("itemshop.reignofnether.serving", name))
+                    .status(I18n.get("itemshop.reignofnether.serving_hint"), Theme.LABEL));
+        }
     }
 
-    public static List<Button> renderButtons(GuiGraphics guiGraphics, ItemShopAddon shop, int x, int y, int mouseX, int mouseY) {
-        ItemShopPlacement bpl = ItemClientEvents.openItemShop;
-        ArrayList<StockedShopItem> stocks = bpl.getDataStorage().getData(ItemShopAddon.STOCKED_ITEMS);
+    /** Draws the menu with its bottom-left corner at (x, bottomY). */
+    public static void render(HudFrame f, ItemShopPlacement shop, int x, int bottomY) {
+        ArrayList<StockedShopItem> stocks = shop.getDataStorage().getData(ItemShopAddon.STOCKED_ITEMS);
         if (stocks == null)
             stocks = new ArrayList<>();
 
-        int extraRows = ((stocks.size() - 1) / ITEMS_PER_ROW);
-        y -= (extraRows * ItemShopMenu.ITEM_SLOT_SIZE);
-
-        ArrayList<Button> allButtons = new ArrayList<>();
-        int contentX = x + PANEL_INSET;
-        int contentY = y + PANEL_INSET;
-        allButtons.addAll(renderTitleAndButtons(guiGraphics, bpl, contentX, contentY, mouseX, mouseY));
-        allButtons.addAll(renderShopItemButtons(guiGraphics, bpl, shop, stocks, contentX, contentY + HEADER_HEIGHT, mouseX, mouseY));
-        return allButtons;
-    }
+        int rows = Math.max(1, (stocks.size() + PER_ROW - 1) / PER_ROW);
+        int w = PAD * 2 + PER_ROW * SLOT + (PER_ROW - 1) * GAP;
+        int h = PAD * 2 + HEADER + rows * SLOT + (rows - 1) * GAP;
+        int y = bottomY - h;
+        Theme.popup(f.g, x, y, w, h, Theme.EMERALD);
+        f.zone(x, y, w, h);
+        Text.heading(f.g, I18n.get("itemshop.reignofnether.title"), x + PAD, y + PAD + 5, Theme.GOLD, Text.px(18));
 
-    /** Draws the "Item Shop" title top-left, served unit and close button top-right; returns the buttons. */
-    private static List<Button> renderTitleAndButtons(GuiGraphics guiGraphics, ItemShopPlacement bpl, int x, int y, int mouseX, int mouseY) {
-        guiGraphics.drawString(
-                MC.font,
-                "Item Shop", // title text as specified; not pulled through I18n since no lang key was given for it
-                x + TITLE_X_OFFSET,
-                y + TITLE_Y_OFFSET,
-                0xFFFFFF
-        );
+        if (!SpectatorHud.isActive())
+            renderControls(f, shop, x + w - PAD, y);
 
         List<Button> buttons = new ArrayList<>();
-        int closeButtonX = x + MENU_WIDTH - Button.itemIconSize - TITLE_X_OFFSET;
-
-        // served-unit button (same mobhead-icon pattern as HudClientEvents' unit icon buttons)
-        Unit servedUnit = bpl.getServedUnit();
-        if (servedUnit instanceof LivingEntity servedEntity) {
-            String unitName = MiscUtil.getEntityIconName(servedEntity);
-            ResourceLocation iconRl = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID,
-                    "textures/mobheads/" + unitName + (servedEntity.isVehicle() ? "_half.png" : ".png"));
-
-            Button servingButton = new ButtonBuilder("Serving Unit")
-                    .iconSize(Button.itemIconSize)
-                    .iconResource(iconRl)
-                    .onLeftClick(bpl::cycleServedUnit)
-                    .tooltipLines(List.of(fcs("Serving: " + capitaliseAndSpace(HudClientEvents.getModifiedEntityName(servedEntity)))))
-                    .build();
-
-            servingButton.frameResource = null;
-
-            int servingButtonX = closeButtonX - Button.itemIconSize - TITLE_X_OFFSET - 2;
-            renderButton(guiGraphics, servingButton, servingButtonX, y, mouseX, mouseY);
-            buttons.add(servingButton);
-        }
-
-        Button closeButton = new Button(
-                "Close Item Shop Menu",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/cross_square.png"),
-                null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> ItemClientEvents.openItemShop = null,
-                null,
-                List.of()
-        );
-        closeButton.frameResource = null;
-        renderButton(guiGraphics, closeButton, closeButtonX, y, mouseX, mouseY);
-        buttons.add(closeButton);
-
-        return buttons;
-    }
-
-    /** Tightly-packed grid of one button per stocked item, wrapping to a new row every ITEMS_PER_ROW items. */
-    private static List<Button> renderShopItemButtons(
-            GuiGraphics guiGraphics,
-            BuildingPlacement bpl,
-            ItemShopAddon shop,
-            ArrayList<StockedShopItem> stocks,
-            int x,
-            int y,
-            int mouseX,
-            int mouseY
-    ) {
-        ArrayList<Button> buttons = new ArrayList<>();
-
-        int i = 0;
-        for (StockedShopItem stockedItem : stocks) {
-
-            int col = i % ITEMS_PER_ROW;
-            int row = i / ITEMS_PER_ROW;
-            int buttonX = x + col * ITEM_SLOT_SIZE;
-            int buttonY = y + row * ITEM_SLOT_SIZE;
-
-            Button itemButton = new UnitItemShopButton(stockedItem);
-            renderButton(guiGraphics, itemButton, buttonX, buttonY, mouseX, mouseY);
-            buttons.add(itemButton);
-
-            i += 1;
-        }
-        return buttons;
-    }
-
-    /** Total panel height needed to fit itemCount items in the grid, plus the header row. */
-    public static int getMenuHeight(int itemCount) {
-        int rows = Math.max(1, (int) Math.ceil(itemCount / (double) ITEMS_PER_ROW));
-        return HEADER_HEIGHT + rows * ITEM_SLOT_SIZE;
-    }
-
-    // same helper pattern as CustomBuildingMenu.renderButton(): renders a button unless
-    // hidden, and renders its tooltip when moused over
-    private static void renderButton(GuiGraphics guiGraphics, Button button, int x, int y, int mouseX, int mouseY) {
-        if (!button.isHidden.get()) {
-            button.render(guiGraphics, x, y, mouseX, mouseY);
-            if (button.isMouseOver(mouseX, mouseY) && button.tooltipLines != null)
-                button.renderTooltip(guiGraphics, mouseX, mouseY);
+        for (StockedShopItem stocked : stocks)
+            buttons.add(new UnitItemShopButton(stocked, shop));
+        for (int i = 0; i < buttons.size(); i++) {
+            Button b = buttons.get(i);
+            if (b.isHidden.get())
+                continue;
+            int bx = x + PAD + (i % PER_ROW) * (SLOT + GAP);
+            int by = y + PAD + HEADER + (i / PER_ROW) * (SLOT + GAP);
+            f.cell(b, bx, by, SLOT, null);
+            if (i < SLOT_Z && !SpectatorHud.isActive()) {
+                f.altKey(Keybindings.grid[i], b);
+                if (Keybindings.altMod.isDown())
+                    Theme.keyCap(f.g, Keybindings.grid[i].getCurrentLabel(), bx + 1, by + 1, Theme.MUTED);
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/solegendary/reignofnether/keybinds/Keybindings.java b/src/main/java/com/solegendary/reignofnether/keybinds/Keybindings.java
index 7718d261d..703ce76ff 100644
--- a/src/main/java/com/solegendary/reignofnether/keybinds/Keybindings.java
+++ b/src/main/java/com/solegendary/reignofnether/keybinds/Keybindings.java
@@ -44,13 +44,11 @@ public class Keybindings {
     public static final Keybinding abilitySlot10       = new Keybinding("key.reignofnether.ability_10",   GLFW.GLFW_KEY_P,             CATEGORY_RTS, "P");
     public static final Keybinding hotkey1        = new Keybinding("key.reignofnether.hotkey_1",        GLFW.GLFW_KEY_V,             CATEGORY_RTS, "V");
     public static final Keybinding hotkey2        = new Keybinding("key.reignofnether.hotkey_2",        GLFW.GLFW_KEY_L,             CATEGORY_RTS, "L");
-    public static final Keybinding minimapToggle  = new Keybinding("key.reignofnether.minimap_toggle",        GLFW.GLFW_KEY_M,             CATEGORY_RTS, "M");
     public static final Keybinding hotkey3        = new Keybinding("key.reignofnether.hotkey_3",        GLFW.GLFW_KEY_F,             CATEGORY_RTS, "F");
     public static final Keybinding hotkey4        = new Keybinding("key.reignofnether.hotkey_4",        GLFW.GLFW_KEY_C,             CATEGORY_RTS, "C");
     public static final Keybinding hotkey5        = new Keybinding("key.reignofnether.hotkey_5",        GLFW.GLFW_KEY_D,             CATEGORY_RTS, "D");
     public static final Keybinding hotkey6        = new Keybinding("key.reignofnether.hotkey_6",        GLFW.GLFW_KEY_J,             CATEGORY_RTS, "J");
     public static final Keybinding hotkey7        = new Keybinding("key.reignofnether.hotkey_7",        GLFW.GLFW_KEY_K,             CATEGORY_RTS, "K");
-    public static final Keybinding hotkey8        = new Keybinding("key.reignofnether.hotkey_8",        GLFW.GLFW_KEY_Z,             CATEGORY_RTS, "Z");
     public static final Keybinding hotkey9        = new Keybinding("key.reignofnether.hotkey_9",        GLFW.GLFW_KEY_X,             CATEGORY_RTS, "X");
     public static final Keybinding hotkey10       = new Keybinding("key.reignofnether.hotkey_10",       GLFW.GLFW_KEY_H,             CATEGORY_RTS, "H");
     public static final Keybinding attack      = new Keybinding("key.reignofnether.attack",       GLFW.GLFW_KEY_A,             CATEGORY_RTS, "A");
@@ -64,12 +62,26 @@ public class Keybindings {
     public static final Keybinding tab         = new Keybinding("key.reignofnether.tab",          GLFW.GLFW_KEY_TAB,           CATEGORY_RTS, "");
     public static final Keybinding openShop    = new Keybinding("key.reignofnether.open_shop",         GLFW.GLFW_KEY_S,             CATEGORY_RTS, "S");
 
-    public static final Keybinding item1 = new Keybinding("key.reignofnether.item1", GLFW.GLFW_KEY_T, CATEGORY_RTS, "T");
-    public static final Keybinding item2 = new Keybinding("key.reignofnether.item2", GLFW.GLFW_KEY_Y, CATEGORY_RTS, "Y");
-    public static final Keybinding item3 = new Keybinding("key.reignofnether.item3", GLFW.GLFW_KEY_F, CATEGORY_RTS, "F");
-    public static final Keybinding item4 = new Keybinding("key.reignofnether.item4", GLFW.GLFW_KEY_G, CATEGORY_RTS, "G");
-    public static final Keybinding item5 = new Keybinding("key.reignofnether.item5", GLFW.GLFW_KEY_C, CATEGORY_RTS, "C");
-    public static final Keybinding item6 = new Keybinding("key.reignofnether.item6", GLFW.GLFW_KEY_B, CATEGORY_RTS, "V");
+    // hero items; the command card's bottom row is empty for heroes, so its keys are free here
+    public static final Keybinding item1 = new Keybinding("key.reignofnether.item1", GLFW.GLFW_KEY_Z, CATEGORY_RTS, RtsConflictContext.ITEM, "Z");
+    public static final Keybinding item2 = new Keybinding("key.reignofnether.item2", GLFW.GLFW_KEY_X, CATEGORY_RTS, RtsConflictContext.ITEM, "X");
+    public static final Keybinding item3 = new Keybinding("key.reignofnether.item3", GLFW.GLFW_KEY_C, CATEGORY_RTS, RtsConflictContext.ITEM, "C");
+    public static final Keybinding item4 = new Keybinding("key.reignofnether.item4", GLFW.GLFW_KEY_V, CATEGORY_RTS, RtsConflictContext.ITEM, "V");
+    public static final Keybinding item5 = new Keybinding("key.reignofnether.item5", GLFW.GLFW_KEY_B, CATEGORY_RTS, RtsConflictContext.ITEM, "B");
+    public static final Keybinding item6 = new Keybinding("key.reignofnether.item6", GLFW.GLFW_KEY_N, CATEGORY_RTS, RtsConflictContext.ITEM, "N");
+
+    public static final Keybinding jumpToAlert = new Keybinding("key.reignofnether.jump_to_alert", GLFW.GLFW_KEY_SPACE, CATEGORY_RTS, RtsConflictContext.COMMAND, "SPC");
+
+    // the command card: one key per slot, by position (see CommandGrid)
+    public static final Keybinding[] grid = {
+        gridKey("q", GLFW.GLFW_KEY_Q), gridKey("w", GLFW.GLFW_KEY_W), gridKey("e", GLFW.GLFW_KEY_E), gridKey("r", GLFW.GLFW_KEY_R), gridKey("t", GLFW.GLFW_KEY_T),
+        gridKey("a", GLFW.GLFW_KEY_A), gridKey("s", GLFW.GLFW_KEY_S), gridKey("d", GLFW.GLFW_KEY_D), gridKey("f", GLFW.GLFW_KEY_F), gridKey("g", GLFW.GLFW_KEY_G),
+        gridKey("z", GLFW.GLFW_KEY_Z), gridKey("x", GLFW.GLFW_KEY_X), gridKey("c", GLFW.GLFW_KEY_C), gridKey("v", GLFW.GLFW_KEY_V), gridKey("b", GLFW.GLFW_KEY_B)
+    };
+
+    private static Keybinding gridKey(String slot, int key) {
+        return new Keybinding("key.reignofnether.grid_" + slot, key, CATEGORY_RTS, RtsConflictContext.COMMAND, slot.toUpperCase());
+    }
 
     public static final Keybinding[] nums = {
         new Keybinding("key.reignofnether.control_group_0", GLFW.GLFW_KEY_0, CATEGORY_RTS, "0"),
@@ -98,22 +110,25 @@ public class Keybindings {
         new Keybinding("key.reignofnether.fn_12", GLFW.GLFW_KEY_F12, CATEGORY_RTS, "F12")
     };
 
+    // RTS view only, like the command card; off the grid so Z stays a command
+    public static final Keybinding bigMap = new Keybinding("key.reignofnether.big_map", GLFW.GLFW_KEY_M, CATEGORY_RTS, RtsConflictContext.COMMAND, "M");
+    public static final Keybinding satellite = new Keybinding("key.reignofnether.satellite", GLFW.GLFW_KEY_COMMA, CATEGORY_RTS, RtsConflictContext.COMMAND, ",");
+    public static final Keybinding diplomacy = new Keybinding("key.reignofnether.diplomacy_panel", GLFW.GLFW_KEY_PERIOD, CATEGORY_RTS, RtsConflictContext.COMMAND, ".");
+
     private static final List<Keybinding> ALL;
     static {
+        // Only global keys are registered. The per-button keys above (ability slots, hotkey1-10, attack...)
+        // are kept as ordering hints for the buttons that use them; the command card binds keys by slot.
         List<Keybinding> list = new ArrayList<>(List.of(
             pause, shiftMod, ctrlMod, altMod,
             zoomIn, zoomOut,
             panPlusX, panMinusX, panPlusZ, panMinusZ,
             rotCW, rotCCW, reset,
-            cancelBuild,
-            abilitySlot1, abilitySlot2, abilitySlot3, abilitySlot4, abilitySlot5,
-            abilitySlot6, abilitySlot7, abilitySlot8, abilitySlot9, abilitySlot10,
-            hotkey1, hotkey2, minimapToggle, hotkey3, hotkey4, hotkey5, hotkey6, hotkey7, hotkey8, hotkey9,
-            attack, stop, hold,
-            build, gather, garrison,
-            chat, deselect, tab, openShop,
+            hotkey6, hotkey7, jumpToAlert, bigMap, satellite, diplomacy,
+            chat, deselect, tab,
             item1, item2, item3, item4, item5, item6
         ));
+        Collections.addAll(list, grid);
         Collections.addAll(list, nums);
         Collections.addAll(list, fnums);
         ALL = Collections.unmodifiableList(list);
diff --git a/src/main/java/com/solegendary/reignofnether/keybinds/RtsConflictContext.java b/src/main/java/com/solegendary/reignofnether/keybinds/RtsConflictContext.java
index 210befc06..4199d95a2 100644
--- a/src/main/java/com/solegendary/reignofnether/keybinds/RtsConflictContext.java
+++ b/src/main/java/com/solegendary/reignofnether/keybinds/RtsConflictContext.java
@@ -5,11 +5,12 @@
 
 // Splits the mod's bindings into disjoint "contexts" so the Controls UI
 // doesn't flag intentional default-key overlaps (LEFT for both panPlusX
-// and rotCCW; M for minimapToggle/move) as conflicts.
+// and rotCCW) as conflicts.
 public enum RtsConflictContext implements IKeyConflictContext {
     PAN,
     ROTATE,
-    COMMAND;
+    COMMAND,
+    ITEM; // hero item keys share the command card's bottom row on purpose
 
     @Override
     public boolean isActive() {
diff --git a/src/main/java/com/solegendary/reignofnether/loading/LoadProgress.java b/src/main/java/com/solegendary/reignofnether/loading/LoadProgress.java
new file mode 100644
index 000000000..4bd078759
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/loading/LoadProgress.java
@@ -0,0 +1,40 @@
+package com.solegendary.reignofnether.loading;
+
+import com.solegendary.reignofnether.minimap.MapGrid;
+import com.solegendary.reignofnether.util.WorldState;
+
+/**
+ * What the server is doing while a world loads, after vanilla's spawn chunks: drawing the map, building the navmesh
+ * and taking the fog snapshot. Written by the server thread; in singleplayer and for a P2P host the loading screen
+ * reads it from the same game, which is the only time anyone can see it (players joining see the connection instead).
+ */
+public final class LoadProgress {
+
+    private LoadProgress() { }
+
+    public enum Step { MAP, NAVMESH, FOG }
+
+    public static volatile Step step = null; // null: not started, or vanilla still preparing the spawn
+    public static volatile int done = 0;
+    public static volatile int total = 0;
+    public static volatile boolean finished = false;
+    // the map as it is drawn, so the loading screen paints it in as it is built
+    public static volatile MapGrid map = null;
+    static {
+        WorldState.onServerReset(LoadProgress::reset);
+    }
+
+    public static void begin(Step s, int of) {
+        done = 0;
+        total = Math.max(1, of);
+        step = s;
+    }
+
+    public static void reset() {
+        step = null;
+        done = 0;
+        total = 0;
+        finished = false;
+        map = null;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/loading/LoadingScreenClientEvents.java b/src/main/java/com/solegendary/reignofnether/loading/LoadingScreenClientEvents.java
new file mode 100644
index 000000000..293aff18e
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/loading/LoadingScreenClientEvents.java
@@ -0,0 +1,711 @@
+package com.solegendary.reignofnether.loading;
+
+import com.mojang.blaze3d.platform.NativeImage;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.building.BuildingPlacement;
+import com.solegendary.reignofnether.player.PlayerClientEvents;
+import com.solegendary.reignofnether.guiscreen.TopdownGui;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.matchstart.MatchStartScreen;
+import com.solegendary.reignofnether.minimap.MapGrid;
+import com.solegendary.reignofnether.minimap.MinimapClientEvents;
+import com.solegendary.reignofnether.minimap.StrategicMapClientEvents;
+import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
+import com.solegendary.reignofnether.player.PlayerServerboundPacket;
+import com.solegendary.reignofnether.time.TimeUtils;
+import com.solegendary.reignofnether.rtsmap.RTSMapInfo;
+import com.solegendary.reignofnether.rtsmap.RTSMapInfoClientEvents;
+import com.solegendary.reignofnether.rtsmap.RTSMapInfoLoader;
+import com.solegendary.reignofnether.ui.Backdrop;
+import com.solegendary.reignofnether.ui.Easing;
+import com.solegendary.reignofnether.ui.HudScale;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.util.MiscUtil;
+import com.solegendary.reignofnether.util.WorldToScreen;
+import com.mojang.math.Axis;
+import com.solegendary.reignofnether.worldborder.WorldBorderServerEvents;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Renderable;
+import net.minecraft.client.gui.screens.ConnectScreen;
+import net.minecraft.client.gui.screens.GenericDirtMessageScreen;
+import net.minecraft.client.gui.screens.LevelLoadingScreen;
+import net.minecraft.client.gui.screens.ProgressScreen;
+import net.minecraft.client.gui.screens.ReceivingLevelScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.contents.TranslatableContents;
+import net.minecraft.util.FormattedCharSequence;
+import net.minecraft.world.level.storage.LevelResource;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.border.WorldBorder;
+import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.client.event.RenderGuiEvent;
+import net.minecraftforge.client.event.ScreenEvent;
+import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.eventbus.api.EventPriority;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Draws over vanilla's loading, joining and saving screens instead of them, which keep doing the work underneath.
+ * Each step plays out in turn, at least as long as its animation: the map paints in chunk by chunk from the top
+ * corner, the navmesh and fog snapshot sweep across it the same way. It then glides into the match setup map, opens
+ * into the satellite view, or dives into the world.
+ */
+public final class LoadingScreenClientEvents {
+
+    private LoadingScreenClientEvents() { }
+
+    private static final Minecraft MC = Minecraft.getInstance();
+
+    // laid out on a fixed canvas scaled to the screen, so it looks the same on any screen
+    private static final int VW = 640;
+    private static final int VH = 360;
+    private static final int MAP_X = 70, MAP_Y = 55, MAP_SIDE = 250;
+    private static final int COL_X = MAP_X + MAP_SIDE + 36, COL_W = 214;
+
+    private static final long FADE_IN_MS = 400;
+    private static final long SETTLE_MS = 300;  // lets the screen that follows open before the map heads for it
+    private static final long MOVE_MS = 1000;  // the map slides to the middle, or into the match setup map
+    private static final long SAVED_FADE_MS = 250;
+    private static final long ZOOM_MS = 1100;  // then grows into the satellite view or the world, fading out
+    private static final long VEIL_FADE_MS = 600;
+    private static final long RTS_VIEW_WAIT_MS = 4000;
+    private static final long AFTER_DONE_MS = 1000;
+    private static final int MAX_CELLS = 40;    // cells across the map: one a chunk, grouped on big maps
+    // the least time each step is shown, so one animation finishes before the next starts
+    private static final Map<String, Long> MIN_MS = Map.of("prepare", 700L, "connect", 700L, "map", 1800L, "receive", 1200L,
+            "navmesh", 1600L, "fog", 1300L, "join", 800L, "save", 900L);
+    private static final List<String> NO_END = List.of("prepare", "connect", "join", "save");
+    private static final int TRACK = 0x1C1B23;
+
+    private enum Mode { LOCAL, JOIN, SAVING }
+    private enum State { PENDING, ACTIVE, DONE }
+    private record Row(String key, State state, float frac, int total) { } // frac < 0: no known end
+
+    @Nullable
+    private static Mode mode = null;
+    private static long shownMs = 0;
+    private static long endMs = 0;   // when the last loading screen closed
+    private static long morphMs = 0; // when the map set off for where it goes
+    private static boolean rtsMap = false;
+    private static boolean localInfoRead = false;
+    private static boolean replay = false; // loading a replay: no map, and it waits for the recording to start
+    private static String title = "";
+    private static String byLine = "";      // the map's authors and version
+    private static String description = "";
+    @Nullable
+    private static Rect target = null; // in canvas units: the match setup map, else the middle of the screen
+    private static boolean zoom = false;      // after the slide, grow and fade into what's behind
+    private static boolean satellite = false; // the satellite view was opened for the zoom, and closes after it
+    private static float[] shown = new float[0];
+    private static long[] since = new long[0];
+    private static int[] totals = new int[0];
+    private static long veilDoneMs = 0;
+    @Nullable
+    private static Runnable afterDone = null;
+    @Nullable
+    private static Runnable delayed = null; // afterDone, once played out, waiting AFTER_DONE_MS
+    private static long delayedAt = 0;
+
+    private static DynamicTexture texture = null;
+    private static ResourceLocation textureLoc = null;
+    private static int textureSize = 0;
+    private static int uploadedRows = 0;
+    private static long lastFrameMs = 0;
+
+    // a dirt message counts only when it's saving or connecting: the others ("preparing world data" before create
+    // world's options, reading a world) are a blink between menus, which keep their own background
+    private static boolean isLoading(@Nullable Screen s) {
+        return s instanceof LevelLoadingScreen || s instanceof ConnectScreen || s instanceof ReceivingLevelScreen
+                || s instanceof ProgressScreen || s instanceof GenericDirtMessageScreen && (isSaving(s) || isConnecting(s));
+    }
+
+    private static boolean isSaving(Screen s) {
+        return s instanceof GenericDirtMessageScreen && s.getTitle().getContents() instanceof TranslatableContents tc
+                && tc.getKey().startsWith("menu.saving");
+    }
+
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    public static void onScreenRender(ScreenEvent.Render.Pre evt) {
+        Screen s = evt.getScreen();
+        if (!isLoading(s))
+            return;
+        begin(s);
+        evt.setCanceled(true);
+        GuiGraphics g = evt.getGuiGraphics();
+        draw(g, s);
+        if (s instanceof ConnectScreen) // its cancel button still works, so it stays visible
+            for (var child : s.children())
+                if (child instanceof Renderable r)
+                    r.render(g, evt.getMouseX(), evt.getMouseY(), evt.getPartialTick());
+    }
+
+    // over whatever opened next while it plays out
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    public static void onScreenRenderPost(ScreenEvent.Render.Post evt) {
+        if (mode != null && !isLoading(evt.getScreen()))
+            draw(evt.getGuiGraphics(), evt.getScreen());
+    }
+
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    public static void onRenderGui(RenderGuiEvent.Post evt) {
+        if (mode != null && MC.screen == null)
+            draw(evt.getGuiGraphics(), null);
+    }
+
+    private static boolean isConnecting(Screen s) {
+        return s instanceof ConnectScreen || s instanceof GenericDirtMessageScreen
+                && s.getTitle().getContents() instanceof TranslatableContents tc && tc.getKey().startsWith("connect.");
+    }
+
+    private static void begin(Screen s) {
+        // our own world's screens (preparing world data, then loading) are local; only a connection is joining
+        Mode wanted = isSaving(s) ? Mode.SAVING : isConnecting(s) || mode == Mode.JOIN && !(s instanceof LevelLoadingScreen)
+                ? Mode.JOIN : Mode.LOCAL;
+        if (mode == wanted && morphMs == 0) {
+            endMs = 0; // another loading screen in the same load
+            if (mode == Mode.LOCAL && !localInfoRead && MC.getSingleplayerServer() != null)
+                readLocalInfo(); // began on "preparing world data", before the server existed
+            return;
+        }
+        finish(false);
+        mode = wanted;
+        shownMs = System.currentTimeMillis();
+        lastFrameMs = shownMs;
+        title = "";
+        byLine = "";
+        description = "";
+        rtsMap = false;
+        replay = false;
+        localInfoRead = false;
+        if (mode == Mode.LOCAL && MC.getSingleplayerServer() != null) {
+            readLocalInfo();
+        } else if (mode == Mode.JOIN && MC.getCurrentServer() != null) {
+            title = MC.getCurrentServer().name;
+        }
+        sizeRows();
+    }
+
+    private static void sizeRows() {
+        int n = mode == Mode.SAVING ? 1 : mode == Mode.JOIN || replay ? 3 : rtsMap ? 5 : 2;
+        shown = new float[n];
+        since = new long[n];
+        totals = new int[n];
+    }
+
+    // the world's name, its map info and whether it's an RTS map, once the server exists
+    private static void readLocalInfo() {
+        localInfoRead = true;
+        var data = MC.getSingleplayerServer().getWorldData();
+        title = data.getLevelName();
+        try { // read here rather than waiting for the server, so the column never changes once shown
+            RTSMapInfo info = RTSMapInfoLoader.load(MC.getSingleplayerServer().getWorldPath(LevelResource.ROOT));
+            if (info != null)
+                setMapInfo(info.getName(), info.getAuthor(), info.getVersion(), info.getDescription());
+        } catch (RuntimeException e) {
+            ReignOfNether.LOGGER.warn("Couldn't read the map info for the loading screen", e);
+        }
+        // known before the server starts, so the steps never change once shown
+        WorldBorder.Settings border = data.overworldData().getWorldBorder();
+        boolean wasRts = rtsMap;
+        rtsMap = border.getSize() <= WorldBorderServerEvents.RTS_OPTIMIZED_BORDER;
+        if (rtsMap != wasRts)
+            sizeRows();
+    }
+
+    private static void setMapInfo(@Nullable String name, @Nullable Collection<String> authors, @Nullable String version, @Nullable String desc) {
+        if (name != null && !name.isBlank())
+            title = name;
+        String by = authors == null || authors.isEmpty() ? "" : I18n.get("loading.reignofnether.by", String.join(", ", authors));
+        String v = version == null || version.isBlank() ? "" : I18n.get("loading.reignofnether.version", version);
+        byLine = by.isEmpty() ? v : v.isEmpty() ? by : by + " · " + v;
+        description = desc == null ? "" : desc;
+    }
+
+    public static boolean isShowing() {
+        return mode != null;
+    }
+
+    /** Runs once the whole animation has played out, or now if nothing is showing (the resume screen waits for it). */
+    public static void whenDone(@Nullable Runnable action) {
+        if (delayed != null) // still waiting out the moment after
+            delayed = action;
+        else if (mode == null && action != null)
+            action.run();
+        else
+            afterDone = action;
+    }
+
+    /** @param completed it played out; otherwise a new load replaced it, and what was waiting is dropped */
+    private static void finish(boolean completed) {
+        Runnable after = afterDone;
+        afterDone = null;
+        mode = null;
+        endMs = 0;
+        morphMs = 0;
+        target = null;
+        zoom = false;
+        if (satellite)
+            StrategicMapClientEvents.close(); // the camera tilts back down to the normal view
+        satellite = false;
+        veilDoneMs = 0;
+        uploadedRows = 0;
+        if (textureLoc != null)
+            MC.getTextureManager().release(textureLoc); // also closes the texture
+        texture = null;
+        textureLoc = null;
+        textureSize = 0;
+        // a moment after, so the camera has tilted back from the satellite view first
+        if (completed && after != null) {
+            delayed = after;
+            delayedAt = System.currentTimeMillis() + AFTER_DONE_MS;
+        } else if (!completed) {
+            delayed = null;
+        }
+    }
+
+    /** In a match we play in: our capitol, else our first building; null otherwise. */
+    @Nullable
+    private static BuildingPlacement ownBase() {
+        if (MC.player == null || !PlayerClientEvents.isRTSPlayer())
+            return null;
+        String me = MC.player.getName().getString();
+        BuildingPlacement base = null;
+        for (BuildingPlacement b : BuildingClientEvents.getBuildings())
+            if (me.equals(b.ownerName) && (base == null || b.isCapitol && !base.isCapitol))
+                base = b;
+        return base;
+    }
+
+    @SubscribeEvent
+    public static void onClientTick(TickEvent.ClientTickEvent evt) {
+        if (evt.phase != TickEvent.Phase.END || delayed == null || System.currentTimeMillis() < delayedAt)
+            return;
+        Runnable run = delayed;
+        delayed = null;
+        if (MC.level != null)
+            run.run();
+    }
+
+    @Nullable
+    private static MapGrid grid() {
+        if (mode == Mode.LOCAL)
+            return LoadProgress.map;
+        if (mode == Mode.JOIN)
+            return MinimapClientEvents.getKnownMap();
+        return null;
+    }
+
+    // ------------------------------------------------------------------ steps
+
+    /** Where each step really is. */
+    private static List<Row> realRows(@Nullable Screen s) {
+        List<Row> rows = new ArrayList<>();
+        boolean joining = s instanceof ReceivingLevelScreen || s instanceof ProgressScreen;
+        boolean ended = endMs != 0;
+        if (mode == Mode.SAVING) {
+            rows.add(new Row("save", ended ? State.DONE : State.ACTIVE, -1, 0));
+            return rows;
+        }
+        if (mode == Mode.JOIN) {
+            boolean connecting = !joining && !ended;
+            rows.add(new Row("connect", connecting ? State.ACTIVE : State.DONE, -1, 0));
+            // a server on a map that isn't RTS-optimised sends none, so the step just passes
+            MapGrid g = grid();
+            float got = g == null ? 1 : g.rows / (float) g.size;
+            rows.add(new Row("receive", connecting ? State.PENDING : got >= 1 || ended ? State.DONE : State.ACTIVE, got, 0));
+            rows.add(new Row("join", ended ? State.DONE : connecting ? State.PENDING : State.ACTIVE, -1, 0));
+            return rows;
+        }
+        LoadProgress.Step step = LoadProgress.step;
+        boolean serverDone = !rtsMap || LoadProgress.finished;
+        boolean preparing = (!rtsMap || step == null) && !joining && !ended;
+        rows.add(new Row("prepare", preparing ? State.ACTIVE : State.DONE, -1, 0));
+        if (rtsMap) {
+            for (LoadProgress.Step st : LoadProgress.Step.values()) {
+                State state = serverDone || ended || step != null && step.ordinal() > st.ordinal() ? State.DONE
+                        : step == st ? State.ACTIVE : State.PENDING;
+                float frac = state == State.DONE ? 1 : state == State.ACTIVE ? Math.min(1, LoadProgress.done / (float) LoadProgress.total) : 0;
+                rows.add(new Row(st.name().toLowerCase(Locale.ROOT), state, frac, step == st ? LoadProgress.total : 0));
+            }
+        }
+        rows.add(new Row("join", ended ? State.DONE : serverDone && !preparing || joining ? State.ACTIVE : State.PENDING, -1, 0));
+        return rows;
+    }
+
+    /** What is shown: each step starts once the one before has finished showing, and fills no faster than its pace. */
+    private static List<Row> shownRows(List<Row> real, float dt, long now) {
+        List<Row> out = new ArrayList<>();
+        boolean before = true;
+        for (int i = 0; i < real.size() && i < shown.length; i++) {
+            Row r = real.get(i);
+            if (r.total > 0)
+                totals[i] = r.total;
+            if (!before || r.state == State.PENDING) {
+                out.add(new Row(r.key, State.PENDING, 0, totals[i]));
+                before = false;
+                continue;
+            }
+            if (since[i] == 0)
+                since[i] = now;
+            long min = MIN_MS.getOrDefault(r.key, 800L);
+            if (NO_END.contains(r.key)) {
+                if (r.state == State.DONE && now - since[i] >= min)
+                    shown[i] = 1;
+            } else {
+                shown[i] = Math.min(r.state == State.DONE ? 1 : r.frac, shown[i] + dt / min);
+            }
+            boolean done = shown[i] >= 1;
+            out.add(new Row(r.key, done ? State.DONE : State.ACTIVE, NO_END.contains(r.key) ? -1 : shown[i], totals[i]));
+            before = done;
+        }
+        return out;
+    }
+
+    private static float shownOf(List<Row> rows, String key) {
+        for (Row r : rows)
+            if (r.key.equals(key))
+                return r.state == State.DONE ? 1 : r.state == State.ACTIVE ? Math.max(0, r.frac) : 0;
+        return 0;
+    }
+
+    // ------------------------------------------------------------------ drawing
+
+    private static void draw(GuiGraphics g, @Nullable Screen s) {
+        if (mode == null)
+            return;
+        long now = System.currentTimeMillis();
+        float dt = Math.min(100, now - lastFrameMs); // a long frame (the world appearing) doesn't skip a step
+        lastFrameMs = now;
+
+        if (mode == Mode.JOIN && !RTSMapInfoClientEvents.mapName.isBlank())
+            setMapInfo(RTSMapInfoClientEvents.mapName, RTSMapInfoClientEvents.authors, RTSMapInfoClientEvents.version,
+                    RTSMapInfoClientEvents.description);
+        MapGrid grid = grid();
+        updateTexture(grid);
+        List<Row> rows = shownRows(realRows(s), dt, now);
+        boolean allShown = rows.stream().allMatch(r -> r.state == State.DONE);
+
+        HudScale scale = HudGeometry.scale();
+        int w = scale.width();
+        int h = scale.height();
+        float k = Math.min(w / (float) VW, h / (float) VH);
+        float ox = (w - VW * k) / 2, oy = (h - VH * k) / 2;
+        updateEnding(s, grid, now, allShown, k, ox, oy);
+
+        // the slide, then the zoom; with no zoom the map fades into the match setup map as it lands
+        // saving has nothing to slide: it just gets out of the way of the title screen, quickly, so its fading
+        // background never sits over the menu as a grey veil
+        long moveMs = mode == Mode.SAVING ? SAVED_FADE_MS : MOVE_MS;
+        float move = morphMs == 0 ? 0 : Math.min(1, (now - morphMs) / (float) moveMs);
+        float grow = morphMs == 0 || !zoom ? 0 : Math.min(1, (now - morphMs - MOVE_MS) / (float) ZOOM_MS);
+        if (morphMs != 0 && move >= 1 && (!zoom || grow >= 1)) {
+            finish(true);
+            return;
+        }
+        float fadeIn = smooth((now - shownMs) / (float) FADE_IN_MS);
+        // the zoom lands on the satellite view first, then the map fades out over it, lined up
+        float rest = zoom ? fadeIn * (1 - smooth((grow - 0.2f) / 0.6f)) : fadeIn * (1 - smooth((move - 0.6f) / 0.4f));
+        float mapAlpha = zoom ? fadeIn * (1 - smooth((grow - 0.65f) / 0.35f)) : fadeIn * (1 - smooth((move - 0.8f) / 0.2f));
+
+        g.pose().pushPose();
+        g.pose().scale(scale.poseScale(), scale.poseScale(), 1);
+        g.pose().translate(0, 0, 400); // over the screen below and its tooltips
+        Backdrop.website(g, w, h, rest);
+        g.pose().translate(ox, oy, 0);
+        g.pose().scale(k, k, 1);
+
+        // only an RTS map has a map to show (joining: once the server has sent one); anything else is centred
+        boolean showMap = mode != Mode.SAVING && !replay && (mode == Mode.LOCAL ? rtsMap : grid != null);
+        if (showMap) {
+            Rect home = new Rect(MAP_X, MAP_Y, MAP_SIDE, MAP_SIDE);
+            // centre x, centre y, side, turn: the map can end up turned to match the camera
+            float[] at = box(home, 0);
+            if (morphMs != 0 && target != null) {
+                at = mix(at, box(target, 0), Easing.heavy(move));
+                if (zoom && grow > 0) {
+                    float[] end = grid != null ? satelliteBox(grid, k, ox, oy) : null;
+                    at = mix(at, end != null ? end : box(grown(target, 2.4f), 0), Easing.dive(grow / 0.7f));
+                }
+            }
+            if (grid != null && texture != null) {
+                g.pose().pushPose();
+                g.pose().translate(at[0], at[1], 0);
+                g.pose().mulPose(Axis.ZP.rotation(at[3]));
+                int side = Math.round(at[2]);
+                drawMap(g, grid, new Rect(-side / 2, -side / 2, side, side), rows, mapAlpha, rest, now);
+                g.pose().popPose();
+            } else { // the glowing frame is there from the start, so nothing shifts when the map arrives
+                Backdrop.glow(g, home.x(), home.y(), home.w(), home.h(), rest);
+            }
+            // the steps are shoved off the right of the screen as the map heads for the middle
+            int off = morphMs == 0 ? 0 : Math.round(Easing.heavy(move) * (VW - COL_X + 40 + ox / k));
+            drawColumn(g, rows, COL_X + off, MAP_Y + 10, COL_W, fadeIn, now);
+        } else {
+            // the title and its info sit above the steps, so a loading column starts higher than saving's lone bar
+            drawColumn(g, rows, (VW - COL_W) / 2, mode == Mode.SAVING ? VH / 2 - 20 : VH / 2 - 75, COL_W, rest, now);
+        }
+        g.pose().popPose();
+    }
+
+    private static void drawColumn(GuiGraphics g, List<Row> rows, int x, int y, int w, float a, long now) {
+        if (a < 0.02f)
+            return;
+        if (!title.isBlank()) {
+            float ts = Text.px(30);
+            Text.big(g, Text.fit(title, w), x, y, alpha(a) | Theme.GOLD & 0xFFFFFF, ts);
+            y += Text.bigHeight(ts) + 6;
+        }
+        if (mode != Mode.SAVING) {
+            // room kept for the by-line and two lines of description, so nothing moves when they arrive
+            if (!byLine.isBlank())
+                Text.small(g, Text.fitSmall(byLine.toUpperCase(Locale.ROOT), w), x, y, alpha(a) | Theme.DIM & 0xFFFFFF);
+            y += 12;
+            List<FormattedCharSequence> lines = MC.font.split(Component.literal(description), w);
+            for (int i = 0; i < Math.min(2, lines.size()); i++)
+                Text.draw(g, lines.get(i), x, y + i * 10, alpha(a) | Theme.MUTED & 0xFFFFFF);
+            y += 2 * 10 + 14;
+        }
+        for (int i = 0; i < rows.size(); i++) {
+            Row r = rows.get(i);
+            int num = r.state == State.ACTIVE ? Theme.ORANGE : Theme.FAINT;
+            int name = r.state == State.ACTIVE ? Theme.GOLD : r.state == State.DONE ? Theme.LABEL : Theme.FAINT;
+            // a lone step (saving) needs no number
+            int indent = rows.size() > 1 ? 14 : 0;
+            if (indent > 0)
+                Text.draw(g, String.valueOf(i + 1), x, y, alpha(a) | num & 0xFFFFFF);
+            Text.draw(g, I18n.get("loading.reignofnether." + r.key), x + indent, y, alpha(a) | name & 0xFFFFFF);
+            if (r.state == State.ACTIVE && r.total > 0)
+                Text.smallRight(g, I18n.get("loading.reignofnether.count", Math.round(r.frac * r.total), r.total), x + w, y + 1, alpha(a) | Theme.DIM & 0xFFFFFF);
+            int bx = x + indent, by = y + 11, bw = w - indent;
+            g.fill(bx, by, bx + bw, by + 2, alpha(a) | TRACK);
+            if (r.state == State.DONE)
+                g.fill(bx, by, bx + bw, by + 2, alpha(a) | Theme.FAINT & 0xFFFFFF);
+            else if (r.state == State.ACTIVE && r.frac < 0) {
+                // no known end: a segment sweeps across, round and round
+                float t = (now % 1200) / 1200f;
+                int seg = bw * 3 / 10;
+                int sx = bx + (int) ((bw + seg) * t) - seg;
+                g.fill(Math.max(bx, sx), by, Math.min(bx + bw, sx + seg), by + 2, alpha(a) | Theme.ORANGE & 0xFFFFFF);
+            } else if (r.state == State.ACTIVE)
+                g.fill(bx, by, bx + (int) (bw * r.frac), by + 2, alpha(a) | Theme.ORANGE & 0xFFFFFF);
+            y += 24;
+        }
+    }
+
+    /** The map in cells, one a chunk, each step sweeping from the top corner to the bottom one. */
+    private static void drawMap(GuiGraphics g, MapGrid grid, Rect r, List<Row> rows, float a, float overlay, long now) {
+        if (a < 0.02f)
+            return;
+        Backdrop.glow(g, r.x(), r.y(), r.w(), r.h(), overlay);
+        float paint = shownOf(rows, mode == Mode.JOIN ? "receive" : "map");
+        float nav = shownOf(rows, "navmesh");
+        float fog = shownOf(rows, "fog");
+        int cells = Mth.clamp(grid.size / 16, 1, MAX_CELLS);
+        float texCell = grid.size / (float) cells;
+        float cell = r.w() / (float) cells;
+        int diagonals = Math.max(1, 2 * cells - 2);
+
+        RenderSystem.enableBlend();
+        RenderSystem.setShaderColor(1, 1, 1, a);
+        if (paint >= 1 && uploadedRows >= grid.size) {
+            g.blit(textureLoc, r.x(), r.y(), r.w(), r.h(), 0, 0, textureSize, textureSize, textureSize, textureSize);
+        } else {
+            for (int cz = 0; cz < cells; cz++) {
+                int v = (int) (cz * texCell), vh = (int) ((cz + 1) * texCell) - v;
+                if (v + vh > uploadedRows)
+                    break; // not drawn yet, so neither is anything below
+                for (int cx = 0; cx < cells; cx++) {
+                    if ((cx + cz) / (float) diagonals > paint)
+                        continue;
+                    int u = (int) (cx * texCell), uw = (int) ((cx + 1) * texCell) - u;
+                    int x0 = r.x() + Math.round(cx * cell), y0 = r.y() + Math.round(cz * cell);
+                    int x1 = r.x() + Math.round((cx + 1) * cell), y1 = r.y() + Math.round((cz + 1) * cell);
+                    g.blit(textureLoc, x0, y0, x1 - x0, y1 - y0, u, v, uw, vh, textureSize, textureSize);
+                }
+            }
+        }
+        RenderSystem.setShaderColor(1, 1, 1, 1);
+        if (overlay < 0.02f)
+            return;
+
+        // the fog veil lifts once the snapshot is taken
+        if (fog >= 1 && veilDoneMs == 0)
+            veilDoneMs = now;
+        float veil = fog >= 1 ? 1 - smooth((now - veilDoneMs) / (float) VEIL_FADE_MS) : 1;
+        for (int cz = 0; cz < cells; cz++) {
+            for (int cx = 0; cx < cells; cx++) {
+                float t = (cx + cz) / (float) diagonals;
+                int x0 = r.x() + Math.round(cx * cell), y0 = r.y() + Math.round(cz * cell);
+                int x1 = r.x() + Math.round((cx + 1) * cell), y1 = r.y() + Math.round((cz + 1) * cell);
+                // the edge being painted glows
+                if (paint < 1 && t <= paint && paint - t < 0.05f)
+                    g.fill(x0, y0, x1, y1, alpha(overlay * 0.35f * (1 - (paint - t) / 0.05f)) | Theme.GOLD & 0xFFFFFF);
+                // a band of chunks lights up as the navmesh works through them
+                if (nav > 0 && nav < 1 && t <= nav && nav - t < 0.12f)
+                    g.fill(x0 + 1, y0 + 1, x1 - 1, y1 - 1, alpha(overlay * 0.45f * (1 - (nav - t) / 0.12f)) | 0xB8F5BB);
+                if (fog > 0 && t <= fog && veil > 0)
+                    g.fill(x0, y0, x1, y1, alpha(overlay * 0.5f * veil) | 0x05040A);
+            }
+        }
+    }
+
+    private static void updateTexture(@Nullable MapGrid grid) {
+        if (grid == null)
+            return;
+        if (texture == null || textureSize != grid.size) {
+            if (textureLoc != null)
+                MC.getTextureManager().release(textureLoc);
+            texture = new DynamicTexture(grid.size, grid.size, true);
+            textureLoc = MC.getTextureManager().register(ReignOfNether.MOD_ID + "_loading_map", texture);
+            textureSize = grid.size;
+            uploadedRows = 0;
+        }
+        int rows = Math.min(grid.rows, grid.size);
+        if (rows > uploadedRows) {
+            NativeImage pixels = texture.getPixels();
+            if (pixels != null) {
+                for (int z = uploadedRows; z < rows; z++)
+                    for (int x = 0; x < grid.size; x++)
+                        pixels.setPixelRGBA(x, z, MiscUtil.reverseHexRGB(grid.rgb[z * grid.size + x]) | 0xFF000000);
+                texture.upload();
+            }
+            uploadedRows = rows;
+        }
+    }
+
+    private static void updateEnding(@Nullable Screen s, @Nullable MapGrid grid, long now, boolean allShown, float k, float ox, float oy) {
+        if (isLoading(s)) {
+            endMs = 0;
+            return;
+        }
+        if (mode != Mode.SAVING && MC.level == null) {
+            // a menu instead of the world (create world's options, a cancelled connection): nothing is coming
+            if (s != null && morphMs == 0) {
+                target = null;
+                zoom = false;
+                morphMs = now;
+            }
+            return; // otherwise between screens, before the world
+        }
+        if (endMs == 0)
+            endMs = now;
+        if (morphMs != 0 || now < endMs + SETTLE_MS || !allShown)
+            return;
+        if (!rtsViewReady(now))
+            return;
+        target = null;
+        zoom = false;
+        if (mode != Mode.SAVING && grid != null) {
+            if (s instanceof MatchStartScreen) {
+                Rect r = MatchStartScreen.mapRect;
+                if (r == null)
+                    return; // not drawn yet
+                target = new Rect(Math.round((r.x() - ox) / k), Math.round((r.y() - oy) / k), Math.round(r.w() / k), Math.round(r.h() / k));
+            } else {
+                int side = MAP_SIDE + 30;
+                target = new Rect((VW - side) / 2, (VH - side) / 2, side, side);
+                zoom = true;
+                if (s instanceof TopdownGui && OrthoviewClientEvents.isEnabled()) {
+                    // behind the backdrop the camera goes over the middle of the map and looks straight down, so
+                    // the map zooms into the satellite view; it tilts back once the fade is done
+                    // straight down, the middle of the screen is right under the camera: centreCameraOnPos would
+                    // offset it for a tilted view, by how high the camera is, and miss on a high map
+                    // in a match we play in, over our base, so the view settles there; the zoom lines up wherever
+                    // the map ends up on screen
+                    BuildingPlacement base = ownBase();
+                    double cx = base != null ? base.centrePos.getX() + 0.5 : grid.minX + grid.size / 2.0;
+                    double cz = base != null ? base.centrePos.getZ() + 0.5 : grid.minZ + grid.size / 2.0;
+                    MinimapClientEvents.setMapCentre(cx, cz);
+                    PlayerServerboundPacket.teleportPlayer(cx, MC.player.getY(), cz);
+                    StrategicMapClientEvents.open();
+                    satellite = StrategicMapClientEvents.isOpen();
+                }
+            }
+        }
+        morphMs = now;
+    }
+
+    /**
+     * On an RTS map the world opens in the RTS view: once the server has made us a spectator, the view is turned on
+     * and the transition waits for it to open. Gives up after a few seconds so it never hangs.
+     */
+    private static boolean rtsViewReady(long now) {
+        if (mode == Mode.SAVING || MC.level == null || MC.player == null || MC.gameMode == null
+                || MC.level.getWorldBorder().getSize() > WorldBorderServerEvents.RTS_OPTIMIZED_BORDER
+                || now > endMs + RTS_VIEW_WAIT_MS)
+            return true;
+        if (MC.screen instanceof TopdownGui || MC.screen instanceof MatchStartScreen)
+            return true;
+        GameType type = MC.gameMode.getPlayerMode();
+        if (!OrthoviewClientEvents.isEnabled() && (type == GameType.SPECTATOR || type == GameType.CREATIVE))
+            OrthoviewClientEvents.toggleEnable();
+        return false;
+    }
+
+    // ------------------------------------------------------------------ helpers
+
+    private static int alpha(float a) {
+        return Mth.clamp((int) (a * 255), 0, 255) << 24;
+    }
+
+    private static float smooth(float t) {
+        t = Mth.clamp(t, 0, 1);
+        return t * t * (3 - 2 * t);
+    }
+
+    private static float[] box(Rect r, float turn) {
+        return new float[] { r.x() + r.w() / 2f, r.y() + r.h() / 2f, r.w(), turn };
+    }
+
+    private static float[] mix(float[] a, float[] b, float t) {
+        float turn = Mth.wrapDegrees((float) Math.toDegrees(b[3] - a[3])); // the short way round
+        return new float[] { a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t, a[2] + (b[2] - a[2]) * t,
+                a[3] + (float) Math.toRadians(turn) * t };
+    }
+
+    /** Where the map's corners are on screen in the satellite view, in canvas units, so the zoom ends lined up. */
+    @Nullable
+    private static float[] satelliteBox(MapGrid grid, float k, float ox, float oy) {
+        if (!satellite || MC.level == null)
+            return null;
+        double y = MC.level.getSeaLevel();
+        Vec2 nw = WorldToScreen.project(new Vec3(grid.minX, y, grid.minZ));
+        Vec2 ne = WorldToScreen.project(new Vec3(grid.minX + grid.size, y, grid.minZ));
+        Vec2 sw = WorldToScreen.project(new Vec3(grid.minX, y, grid.minZ + grid.size));
+        if (nw == null || ne == null || sw == null)
+            return null;
+        HudScale scale = HudGeometry.scale();
+        float[] a = canvas(scale, nw, k, ox, oy), b = canvas(scale, ne, k, ox, oy), c = canvas(scale, sw, k, ox, oy);
+        float side = (float) Math.hypot(b[0] - a[0], b[1] - a[1]);
+        // the corner opposite nw is ne + sw - nw, so the centre is halfway between ne and sw
+        return new float[] { (b[0] + c[0]) / 2, (b[1] + c[1]) / 2, side, (float) Math.atan2(b[1] - a[1], b[0] - a[0]) };
+    }
+
+    private static float[] canvas(HudScale scale, Vec2 gui, float k, float ox, float oy) {
+        return new float[] { (scale.toUnits(gui.x) - ox) / k, (scale.toUnits(gui.y) - oy) / k };
+    }
+
+    // the same rect grown around its centre: the map rushing up as the world takes its place
+    private static Rect grown(Rect r, float by) {
+        int w = Math.round(r.w() * by), h = Math.round(r.h() * by);
+        return new Rect(r.x() + (r.w() - w) / 2, r.y() + (r.h() - h) / 2, w, h);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/matchstart/MatchStartClientEvents.java b/src/main/java/com/solegendary/reignofnether/matchstart/MatchStartClientEvents.java
index ee994fb6d..97cf9a36f 100644
--- a/src/main/java/com/solegendary/reignofnether/matchstart/MatchStartClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/matchstart/MatchStartClientEvents.java
@@ -1,12 +1,12 @@
 package com.solegendary.reignofnether.matchstart;
 
+import com.solegendary.reignofnether.chat.ChatLog;
 import com.solegendary.reignofnether.guiscreen.TopdownGui;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import com.solegendary.reignofnether.player.PlayerClientEvents;
 import com.solegendary.reignofnether.startpos.StartPosClientEvents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
-import net.minecraftforge.client.event.ClientChatReceivedEvent;
 import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -23,29 +23,14 @@ public class MatchStartClientEvents {
     private static boolean wasStartingLastTick = false;
     private static boolean wasOrthoLastTick = false;
 
-    private static final int CHAT_BUFFER_MAX = 80;
-    private static final Deque<Component> chatBuffer = new ArrayDeque<>();
-
     public static int getCountdownTicks() {
         return countdownTicks;
     }
 
-    public static Deque<Component> getChatBuffer() {
-        return chatBuffer;
-    }
-
-    @SubscribeEvent
-    public static void onChatReceived(ClientChatReceivedEvent evt) {
-        Component msg = evt.getMessage();
-        if (msg == null) return;
-        if (chatBuffer.size() >= CHAT_BUFFER_MAX) chatBuffer.pollFirst();
-        chatBuffer.addLast(msg);
-    }
-
     public static void dismiss() {
         Minecraft mc = Minecraft.getInstance();
-        if (mc.screen instanceof MatchStartScreen) {
-            mc.setScreen(null);
+        if (mc.screen instanceof MatchStartScreen screen) {
+            screen.onClose();
         }
     }
 
@@ -85,7 +70,6 @@ public static void onClientLogout(ClientPlayerNetworkEvent.LoggingOut evt) {
         countdownTicks = -1;
         wasStartingLastTick = false;
         wasOrthoLastTick = false;
-        chatBuffer.clear();
         Minecraft mc = Minecraft.getInstance();
         if (mc.screen instanceof MatchStartScreen) {
             mc.setScreen(null);
diff --git a/src/main/java/com/solegendary/reignofnether/matchstart/MatchStartScreen.java b/src/main/java/com/solegendary/reignofnether/matchstart/MatchStartScreen.java
index c1a0429a6..28911c91f 100644
--- a/src/main/java/com/solegendary/reignofnether/matchstart/MatchStartScreen.java
+++ b/src/main/java/com/solegendary/reignofnether/matchstart/MatchStartScreen.java
@@ -3,14 +3,31 @@
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.faction.Faction;
 import com.solegendary.reignofnether.faction.Factions;
+import com.solegendary.reignofnether.fogofwar.FogOfWarClientEvents;
 import com.solegendary.reignofnether.gamerules.GameruleClient;
+import com.solegendary.reignofnether.gamerules.GameruleServerboundPacket;
+import com.solegendary.reignofnether.chat.ChatLines;
+import com.solegendary.reignofnether.chat.ChatLog;
+import com.solegendary.reignofnether.chat.ChatPanel;
 import com.solegendary.reignofnether.hud.buttons.Button;
 import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.hud.panels.SettingRows;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
 import com.solegendary.reignofnether.minimap.MinimapClientEvents;
 import com.solegendary.reignofnether.rtsmap.RTSMapInfoClientEvents;
+import com.solegendary.reignofnether.rtsmap.RTSMapInfoServerboundPacket;
 import com.solegendary.reignofnether.startpos.StartPos;
 import com.solegendary.reignofnether.startpos.StartPosClientEvents;
 import com.solegendary.reignofnether.startpos.StartPosServerboundPacket;
+import com.solegendary.reignofnether.ui.Clip;
+import com.solegendary.reignofnether.ui.Icon;
+import com.solegendary.reignofnether.ui.HudScale;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.SettingRow;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
 import com.solegendary.reignofnether.util.MiscUtil;
 import com.solegendary.reignofnether.util.MyRenderer;
 import net.minecraft.client.Minecraft;
@@ -21,100 +38,98 @@
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FormattedCharSequence;
 import org.joml.Vector2f;
 import org.lwjgl.glfw.GLFW;
 
-import java.util.*;
-
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
-
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Consumer;
+
+/**
+ * Match setup: pick a seat on the map or in the roster, pick a faction, ready up. Drawn in HUD units
+ * (see {@link HudScale}) so it keeps its proportions on any screen.
+ *
+ * <pre>
+ *  MATCH SETUP · MODE                                   PLAYERS 2/4 READY  [GAME RULES] [CLOSE]
+ *  MAP NAME    description
+ *  +-- map with seat markers --+   +-- roster (teams, seats, spectators) -----------------+
+ *  |                           |   |                                                       |
+ *  +---------------------------+   +-- lobby chat ----------------------+-- your pick ----+
+ *  [1 take a seat][2 faction][3 ready] |                                 |  READY UP       |
+ * </pre>
+ */
 public class MatchStartScreen extends Screen {
 
-    private static final ResourceLocation ICON_FRAME      = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png");
-    private static final ResourceLocation TICK_ICON       = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/tick.png");
-    private static final ResourceLocation CROSS_ICON      = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/cross.png");
-    private static final ResourceLocation CLOSE_ICON      = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/cross_square.png");
-
-    private static final int BG_PANEL     = 0xDC000000;
-    private static final int BG_ICON      = 0x64000000;
-    private static final int ACCENT       = 0xFFE6C76A;
-    private static final int TEXT_DIM     = 0xFFB0B8C0;
-    private static final int TEXT_NORMAL  = 0xFFFFFFFF;
-    private static final int READY_COL    = 0xFF6CE26C;
-
-    private static final int MARGIN = 12;
-    private static final int HEADER_H = 32;
-    private static final int BOTTOM_H = 28;
-    private static final int FRAME_SIZE = 22;
-    private static final int ICON_SIZE = 14;
-    private static final int ROW_H = 26;
-
-    private final List<RowHit> rowHits = new ArrayList<>();
-    private final List<Button> hudButtons = new ArrayList<>();
-    private int rosX1, rosY1, rosX2, rosY2;
-    private int grBtnX, grBtnY;  // gamerules button position for popover anchor
-    private int spectateBtnX1, spectateBtnY1, spectateBtnX2, spectateBtnY2;
-    private boolean spectateBtnVisible;
-
-    private EditBox chatInput;
-    private int chatX1, chatY1, chatX2, chatY2;
-    private int chatScroll = 0;
-    private int chatTotalLines = 0;
-    private int chatViewLines = 0;
-    private boolean chatMinimised = false;
+    private static final ResourceLocation RANDOM_ICON = rl("textures/hud/question_mark.png");
+    private static final Faction[] FACTIONS = { Factions.VILLAGERS, Factions.MONSTERS, Factions.PIGLINS, Factions.RANDOM };
 
-    // Size of the small minimise/maximise toggle button
-    private static final int MINI_BTN = 10;
+    private static final int M = 14;   // outer margin
+    private static final int G = 10;   // gap between panels
+    private static final int ROW_H = 36;
+    private static final int ROW_PAD = 7;  // roster row padding before the team strip
+    private static final int HEAD = 24;    // roster row head box
+    // mostly solid so the rows read clearly, a hint of the world behind
+    private static final int PANEL_FILL = 0xE016151B;
 
-    private boolean priorLargeMap;
-    private boolean priorMapLocked;
+    private static ResourceLocation rl(String path) {
+        return ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, path);
+    }
 
+    private HudFrame frame;
+    private EditBox chatInput;
+    private Rect chatRect = Rect.EMPTY;
+    private Rect rosterRect = Rect.EMPTY;
+    // the map is drawn before the roster, so it shows the seat row hovered last frame
+    private StartPos hoveredRow, nextHoveredRow;
     private int rosterScroll = 0;
-    private int rosterContentH = 0;
-    private int rosterViewH = 0;
+    private int rosterMaxScroll = 0;
+    private int chatScroll = 0;
+    private int chatMaxScroll = 0;
 
-    private record RowHit(StartPos pos, int x1, int y1, int x2, int y2) {}
+    // the minimap as it was before this screen, restored on close (init runs again on every resize)
+    private final boolean priorLargeMap = MinimapClientEvents.isLargeMap();
+    private final boolean priorMapLocked = MinimapClientEvents.isMapLocked();
 
     public MatchStartScreen() {
-        super(Component.literal("Match Setup"));
+        super(Component.translatable("matchstart.reignofnether.title"));
     }
 
+    // where the map was last drawn, in HUD units, so the loading screen's map can glide into it
+    @Nullable
+    public static Rect mapRect = null;
+
     @Override
     protected void init() {
         super.init();
-
-        priorLargeMap = MinimapClientEvents.isLargeMap();
-        priorMapLocked = MinimapClientEvents.isMapLocked();
+        mapRect = null;
         MinimapClientEvents.setLargeMap(true);
         MinimapClientEvents.suppressViewQuad = true;
         recentreMapOnStartPoses();
 
-        // Chat input sits above the bottom of the right panel
-        int chatBLocal = this.height - MARGIN - 6;
-        int chatLLocal = this.width / 2 + 3;
-        int chatRLocal = this.width - MARGIN;
-
-        chatInput = new EditBox(this.font, chatLLocal + 6, chatBLocal - 12,
-                chatRLocal - chatLLocal - 12, 16,
-                Component.translatable("matchstart.reignofnether.chat.placeholder"));
-        chatInput.setBordered(true);
-        chatInput.setMaxLength(256);
-        chatInput.setFocused(false);
-        addRenderableWidget(chatInput);
+        // drawn and fed input by this screen in HUD units, so it is not added as a vanilla widget; kept across resizes
+        if (chatInput != null)
+            return;
+        chatInput = new EditBox(this.font, 0, 0, 100, 16, Component.translatable("matchstart.reignofnether.chat.placeholder"));
+        chatInput.setBordered(false);
+        chatInput.setMaxLength(ChatPanel.MAX_LENGTH);
+        chatInput.setTextColor(Theme.TEXT);
     }
 
     private void recentreMapOnStartPoses() {
         Minecraft mc = Minecraft.getInstance();
         List<StartPos> poses = StartPosClientEvents.startPoses;
         if (poses.isEmpty()) {
-            if (mc.player != null) {
+            if (mc.player != null)
                 MinimapClientEvents.forceMapCentre((int) mc.player.getX(), (int) mc.player.getZ());
-            }
             MinimapClientEvents.setMapLocked(false);
             return;
         }
-        int minX = Integer.MAX_VALUE, maxX = Integer.MIN_VALUE;
-        int minZ = Integer.MAX_VALUE, maxZ = Integer.MIN_VALUE;
+        int minX = Integer.MAX_VALUE, maxX = Integer.MIN_VALUE, minZ = Integer.MAX_VALUE, maxZ = Integer.MIN_VALUE;
         for (StartPos sp : poses) {
             minX = Math.min(minX, sp.pos.getX());
             maxX = Math.max(maxX, sp.pos.getX());
@@ -125,587 +140,879 @@ private void recentreMapOnStartPoses() {
         MinimapClientEvents.setMapLocked(true);
     }
 
-    @Override
-    public void render(GuiGraphics g, int mouseX, int mouseY, float partialTick) {
-        rowHits.clear();
-        hudButtons.clear();
-
-        int leftBottom = this.height - MARGIN;
-        int mapX1 = MARGIN;
-        int mapY1 = MARGIN + HEADER_H + 6;
-        int mapX2 = this.width / 2 - 3;
-        int mapY2 = leftBottom - BOTTOM_H;
-
-        chatX1 = this.width / 2 + 3;
-        chatX2 = this.width - MARGIN;
-        rosX1 = chatX1;
-        rosY1 = mapY1;
-        rosX2 = chatX2;
-
-        int instrTop = mapY2 + 6;
-        chatY2 = leftBottom + 3;
-        if (chatMinimised) {
-            chatY1 = instrTop;
-            rosY2 = chatY1 - 6;
-        } else {
-            int rosterH = leftBottom * 50 / 100;
-            rosY2 = rosY1 + rosterH;
-            chatY1 = rosY2 + 6;
-        }
+    // ------------------------------------------------------------------ helpers
 
-        renderHeader(g, mouseX, mouseY);
-        renderMap(g, mapX1, mapY1, mapX2, mapY2, mouseX, mouseY);
-        renderRoster(g, rosX1, rosY1, rosX2, rosY2, mouseX, mouseY, isMouseOverOverlay(mouseX, mouseY));
-        renderChatCard(g, chatX1, chatY1, chatX2, chatY2, mouseX, mouseY);
+    private static String localName() {
+        var player = Minecraft.getInstance().player;
+        return player != null ? player.getName().getString() : "";
+    }
 
-        if (chatInput != null && !chatMinimised) {
-            int chatBLocal = chatY2 - 6;
-            chatInput.setX(chatX1 + 6);
-            chatInput.setY(chatBLocal - 12);
-            chatInput.setWidth(chatX2 - chatX1 - 12);
-        }
-        renderInstructions(g, mapX1, mapY2 + 6, mapX2, this.height - 9);
+    /**
+     * The enemy on a hidden seat when it can only be them: one hidden enemy and one hidden seat. Their faction
+     * stays hidden; only the seat is no secret.
+     */
+    @Nullable
+    private static String deduced(StartPos sp) {
+        if (!sp.hidden || StartPosClientEvents.hiddenPlayers.size() != 1
+                || StartPosClientEvents.startPoses.stream().filter(p -> p.hidden).count() != 1)
+            return null;
+        return StartPosClientEvents.hiddenPlayers.keySet().iterator().next();
+    }
 
-        if (GameruleClient.gamerulesMenuOpen) {
-            renderGamerulesPopover(g, mouseX, mouseY);
-        }
+    /** Taken by someone, including an enemy whose pick is hidden from us. */
+    private static boolean taken(StartPos sp) {
+        return !sp.playerName.isBlank() || sp.hidden;
+    }
 
-        super.render(g, mouseX, mouseY, partialTick);
+    private static ResourceLocation factionIcon(Faction f) {
+        return f == Factions.RANDOM ? RANDOM_ICON : f.icon;
+    }
 
-        for (Button b : hudButtons) {
-            if (b.isMouseOver(mouseX, mouseY) &&
-                    ((!isMouseOverOverlay(mouseX, mouseY)) ||
-                    b.name.equals(GameruleClient.BOOLEAN_BUTTON_NAME) ||
-                    b.name.equals(GameruleClient.INTEGER_BUTTON_NAME))) {
-                b.renderTooltip(g, mouseX, mouseY);
-            }
-        }
+    private static String factionKey(Faction f) {
+        return f == Factions.RANDOM ? "random" : f.getName();
     }
 
-    private boolean isMouseOverOverlay(int mx, int my) {
-        if (mx >= chatX1 && mx <= chatX2 && my >= chatY1 && my <= chatY2) return true;
-        return GameruleClient.gamerulesMenuOpen;
+    /** Seat colour, with the design's brighter red and blue in place of Minecraft's dark ones. */
+    private static int seatColour(StartPos sp) {
+        int hex = sp.getHexColor();
+        if (hex == 0xA12722)
+            hex = 0xD8443A;
+        else if (hex == 0x35399D && StartPosClientEvents.startPoses.stream().noneMatch(o -> o.getHexColor() == 0x3AAFD9))
+            hex = 0x3AAFD9;
+        return 0xFF000000 | hex;
     }
 
-    private void renderHeader(GuiGraphics g, int lastMouseX, int lastMouseY) {
-        MyRenderer.renderFrameWithBg(g, MARGIN, MARGIN, this.width - MARGIN * 2, HEADER_H, BG_PANEL);
-        String cd = countdownLabel();
-        int cdW = this.font.width(cd);
-        int cdCol = StartPosClientEvents.isStarting ? READY_COL : TEXT_DIM;
+    /** Enabled and disabled seats grouped by team colour, in map order. */
+    private static Map<Integer, List<StartPos>> teams() {
+        Map<Integer, List<StartPos>> byColour = new LinkedHashMap<>();
+        for (StartPos sp : StartPosClientEvents.startPoses)
+            byColour.computeIfAbsent(sp.colorId, k -> new ArrayList<>()).add(sp);
+        return byColour;
+    }
 
-        int modeX = MARGIN + 5;
-        int modeY = MARGIN + 5;
-        Button modeButton = RTSMapInfoClientEvents.getCycleModeButton();
-        if (!modeButton.isHidden.get()) {
-            modeButton.render(g, modeX, modeY, lastMouseX, lastMouseY);
-            hudButtons.add(modeButton);
-            g.drawString(this.font, RTSMapInfoClientEvents.selectedMode, modeX + 26, modeY + 7, cdCol, false);
-        }
-        g.drawCenteredString(this.font, RTSMapInfoClientEvents.mapName + " " + RTSMapInfoClientEvents.version, this.width / 2, MARGIN + 12, ACCENT);
+    private static List<String> spectators() {
+        List<String> seated = new ArrayList<>(StartPosClientEvents.hiddenPlayers.keySet());
+        for (StartPos sp : StartPosClientEvents.startPoses)
+            if (!sp.playerName.isBlank())
+                seated.add(sp.playerName);
+        List<String> specs = new ArrayList<>();
+        var level = Minecraft.getInstance().level;
+        if (level != null)
+            for (AbstractClientPlayer p : level.players())
+                if (!seated.contains(p.getName().getString()))
+                    specs.add(p.getName().getString());
+        return specs;
+    }
 
-        int closeW = 20;
-        int closeH = 20;
-        int closeX = this.width - MARGIN - closeW - 7;
-        int closeY = MARGIN + ((HEADER_H - closeH) / 2) - 1;
+    private static int[] readyCount() {
+        return new int[] { StartPosClientEvents.getNumPlayersReady(), StartPosClientEvents.getNumEnabledPoses() };
+    }
 
-        Button closeButton = new ButtonBuilder("Close Start Match Menu")
-                .iconResource(CLOSE_ICON)
-                .onLeftClick(MatchStartClientEvents::dismiss)
-                .build();
-        closeButton.frameResource = null;
+    // ------------------------------------------------------------------ render
 
-        if (!closeButton.isHidden.get()) {
-            closeButton.render(g, closeX, closeY, lastMouseX, lastMouseY);
-            hudButtons.add(closeButton);
+    @Override
+    public void render(GuiGraphics g, int mouseX, int mouseY, float partialTick) {
+        HudScale scale = HudGeometry.scale();
+        frame = new HudFrame(g, scale, HudGeometry.layout(), scale.toUnits(mouseX), scale.toUnits(mouseY));
+        hoveredRow = nextHoveredRow;
+        nextHoveredRow = null;
+        int w = scale.width();
+        int h = scale.height();
+
+        g.pose().pushPose();
+        g.pose().scale(scale.poseScale(), scale.poseScale(), 1);
+
+        // the world stays visible under a nether-red wash
+        g.fillGradient(0, 0, w, h, 0xA62A0806, 0xCC140303);
+
+        int headerH = 38;
+        renderHeader(w);
+
+        int bodyTop = M + headerH + G;
+        int bodyH = h - M - bodyTop;
+        int leftW = Math.max(200, Math.min(420, (w - 2 * M - G) * 42 / 100));
+        boolean showSteps = bodyH > 240;
+        int stepsH = showSteps ? 32 : 0;
+
+        Rect mapPanel = new Rect(M, bodyTop, leftW, bodyH - (showSteps ? stepsH + G : 0));
+        renderMap(mapPanel);
+        if (showSteps) {
+            Rect steps = new Rect(M, bodyTop + bodyH - stepsH, leftW, stepsH);
+            renderSteps(steps);
         }
 
-        // Gamerules button is placed to the left of close in the header
-        grBtnX = closeX - FRAME_SIZE - 8;
-        grBtnY = MARGIN + (HEADER_H - FRAME_SIZE) / 2;
-
-        // Leave room for the gamerules button and close button
-        int cdRight = grBtnX - 10;
-        g.drawString(this.font, cd, cdRight - cdW, MARGIN + 12, cdCol, false);
-
-        // Gamerules button (only for ops)
-        Minecraft mcRef = Minecraft.getInstance();
-        if (mcRef.player != null && mcRef.player.hasPermissions(2)) {
-            Button grBtn = GameruleClient.getGamerulesButton();
-            if (!grBtn.isHidden.get()) {
-                grBtn.render(g, grBtnX, grBtnY, lastMouseX, lastMouseY);
-                hudButtons.add(grBtn);
-            }
-        }
+        int rx = M + leftW + G;
+        int rw = w - M - rx;
+        int bottomH = Math.max(96, Math.min(150, bodyH * 38 / 100));
+        rosterRect = new Rect(rx, bodyTop, rw, bodyH - bottomH - G);
+        renderRoster(rosterRect);
+        int pickW = Math.max(150, Math.min(215, rw * 42 / 100));
+        chatRect = new Rect(rx, bodyTop + bodyH - bottomH, rw - pickW - G, bottomH);
+        renderChat(chatRect);
+        Rect pick = new Rect(chatRect.right() + G, chatRect.y(), pickW, bottomH);
+        renderPick(pick);
+
+        if (StartPosClientEvents.isStarting)
+            renderCountdown(w);
+        if (GameruleClient.gamerulesMenuOpen)
+            renderRulesModal(w, h);
+
+        frame.showHoveredTooltip();
+        Tooltip.renderPending(g, w, h);
+        g.pose().popPose();
     }
 
-    private void renderMap(GuiGraphics g, int x1, int y1, int x2, int y2, int mx, int my) {
-        MyRenderer.renderFrameWithBg(g, x1, y1, x2 - x1, y2 - y1, BG_PANEL);
-
-        g.drawString(this.font,
-                Component.translatable("matchstart.reignofnether.map_preview").getString(),
-                x1 + 10, y1 + 8, ACCENT, false);
-
-        int padL = x1 + 8;
-        int padT = y1 + 22;
-        int padR = x2 - 8;
-        int padB = y2 - 8;
-        int availW = padR - padL;
-        int availH = padB - padT;
+    private void renderHeader(int w) {
+        var g = frame.g;
+        String mode = RTSMapInfoClientEvents.selectedMode;
+        String kicker = I18n.get("matchstart.reignofnether.header", mode.isBlank() ? "" : " · " + mode.toUpperCase(Locale.ROOT));
+        Text.medium(g, kicker, M, M - 2, Theme.ORANGE);
+
+        String map = RTSMapInfoClientEvents.mapName.isBlank() ? I18n.get("matchstart.reignofnether.unnamed_map") : RTSMapInfoClientEvents.mapName;
+        float titleScale = Text.px(48);
+        Text.title(g, map.toUpperCase(Locale.ROOT), M, M + 9, titleScale);
+        int tx = M + Text.titleWidth(map.toUpperCase(Locale.ROOT), titleScale) + 12;
+
+        // right side: ready count, game rules, close
+        int right = w - M;
+        int bh = 22;
+        int by = M + 6;
+        right = headerButton(I18n.get("matchstart.reignofnether.close"), null, right, by, bh, MatchStartClientEvents::dismiss, null, true);
+        right = headerButton(I18n.get("matchstart.reignofnether.game_rules"), Icon.LIST, right - 6, by, bh,
+                () -> GameruleClient.gamerulesMenuOpen = !GameruleClient.gamerulesMenuOpen,
+                Tooltip.of(I18n.get("matchstart.reignofnether.game_rules")).body(I18n.get(StartPosClientEvents.isHost()
+                        ? "matchstart.reignofnether.rules_host" : "matchstart.reignofnether.rules_view")), true);
+
+        int[] rc = readyCount();
+        String ready = I18n.get("matchstart.reignofnether.ready_count", rc[0], rc[1]);
+        int rx = right - 12;
+        float readyScale = Text.px(26);
+        Text.smallRight(g, I18n.get("matchstart.reignofnether.players"), rx, by - 2, Theme.LABEL);
+        Text.bigRight(g, ready.toUpperCase(Locale.ROOT), rx, by + 8, rc[0] == rc[1] && rc[1] > 1 ? Theme.OK : Theme.TEXT, readyScale);
+        int infoRight = rx - Math.max(Text.bigWidth(ready.toUpperCase(Locale.ROOT), readyScale), Text.smallWidth(I18n.get("matchstart.reignofnether.players"))) - 16;
+
+        int infoW = infoRight - tx;
+        if (infoW > 60) {
+            String desc = RTSMapInfoClientEvents.description;
+            if (!desc.isBlank())
+                Text.draw(g, Text.fit(desc, infoW), tx, M + 13, Theme.MUTED);
+            String meta = I18n.get("matchstart.reignofnether.meta", RTSMapInfoClientEvents.version, StartPosClientEvents.startPoses.size());
+            Text.small(g, Text.fitSmall(meta.toUpperCase(Locale.ROOT), infoW), tx, M + 23, Theme.DIM);
+        }
+    }
 
-        // Render at square aspect ratio, centred in the available space
-        int side = Math.min(availW, availH);
-        int drawL = padL + (availW - side) / 2;
-        int drawT = padT + (availH - side) / 2;
-        int drawR = drawL + side;
-        int drawB = drawT + side;
-        int drawW = side;
-        int drawH = side;
+    /** A secondary button right-aligned at `right`. Returns its left edge. */
+    private int headerButton(String label, @Nullable Icon icon, int right, int y, int h, Runnable action, @Nullable Tooltip tooltip, boolean enabled) {
+        int iconW = icon != null ? 12 + 5 : 0;
+        int w = Text.width(label) + iconW + 18;
+        Rect r = new Rect(right - w, y, w, h);
+        boolean hovered = enabled && frame.hovered(r);
+        Theme.secondaryButton(frame.g, r.x(), y, w, h, hovered);
+        if (icon != null)
+            icon.draw(frame.g, r.x() + 9, y + (h - 12) / 2, 12, hovered ? Theme.GOLD : Theme.BODY);
+        Text.draw(frame.g, label, r.x() + 9 + iconW, y + (h - 8) / 2 + 1, hovered ? Theme.GOLD : Theme.BODY);
+        frame.register(new ButtonBuilder(label).isEnabled(() -> enabled).onLeftClick(action).build(), r, null,
+                tooltip == null ? null : () -> tooltip);
+        return r.x();
+    }
 
+    // ------------------------------------------------------------------ map
+
+    private void renderMap(Rect p) {
+        var g = frame.g;
+        Theme.panel(g, p.x(), p.y(), p.w(), p.h(), PANEL_FILL);
+        Text.small(g, I18n.get("matchstart.reignofnether.map_hint"), p.x() + 11, p.y() + 9, Theme.LABEL);
+        renderModeChips(p.right() - 11, p.y() + 6);
+
+        int top = p.y() + 24;
+        int side = Math.max(40, Math.min(p.w() - 16, p.bottom() - top - 8));
+        int mx = p.x() + (p.w() - side) / 2;
+        int my = top + (p.bottom() - top - 8 - side) / 2;
+        mapRect = new Rect(mx, my, side, side);
+        Theme.outline(g, mx - 2, my - 2, side + 4, side + 4, 1, Theme.INK);
+        Theme.outline(g, mx, my, side, side, 1, Theme.CONSOLE_RIM);
         if (MinimapClientEvents.isMapReady()) {
-            MinimapClientEvents.renderMapInto(g, drawL, drawT, drawW, drawH);
+            MinimapClientEvents.renderMapInto(g, mx, my, side, side);
+            g.fill(mx, my, mx + side, my + side, 0x33000000);
         } else {
-            g.fill(drawL, drawT, drawR, drawB, 0xFF0A0E12);
-            String msg = Component.translatable("matchstart.reignofnether.map_loading").getString();
-            g.drawString(this.font, msg,
-                    (drawL + drawR) / 2 - this.font.width(msg) / 2,
-                    (drawT + drawB) / 2 - 4, TEXT_DIM, false);
+            g.fill(mx, my, mx + side, my + side, Theme.EMPTY);
+            Text.drawCentered(g, I18n.get("matchstart.reignofnether.map_loading"), mx + side / 2, my + side / 2 - 4, Theme.DIM);
         }
 
-        Minecraft mcRef = Minecraft.getInstance();
-        String localName = mcRef.player != null ? mcRef.player.getName().getString() : "";
-        boolean isOp = mcRef.player != null && mcRef.player.hasPermissions(4);
-        int btnFrame = Button.DEFAULT_ICON_FRAME_SIZE;
-
+        int marker = Math.max(18, Math.min(40, side * 12 / 100));
+        Clip.push(g, mx - marker, my - marker, side + marker * 2, side + marker * 2);
         for (StartPos sp : StartPosClientEvents.startPoses) {
-            Vector2f screen = MinimapClientEvents.worldToRect(
-                    sp.pos.getX(), sp.pos.getZ(), drawL, drawT, drawW, drawH);
-            int px = (int) screen.x;
-            int pz = (int) screen.y;
-
-            if (px < drawL - btnFrame || px > drawR + btnFrame ||
-                    pz < drawT - btnFrame || pz > drawB + btnFrame) {
+            Vector2f pos = MinimapClientEvents.worldToRect(sp.pos.getX(), sp.pos.getZ(), mx, my, side, side);
+            if (pos.x < mx || pos.x > mx + side || pos.y < my || pos.y > my + side)
                 continue;
-            }
+            renderMarker(sp, (int) pos.x, (int) pos.y, marker);
+        }
+        Clip.pop(g);
+    }
 
-            Button spButton = sp.getButton(localName, isOp);
-            int bx = px - btnFrame / 2;
-            int by = pz - btnFrame / 2;
-            spButton.render(g, bx, by, mx, my);
-            hudButtons.add(spButton);
+    private void renderModeChips(int right, int y) {
+        List<String> modes = RTSMapInfoClientEvents.modeNames;
+        if (modes.size() <= 1)
+            return;
+        boolean canPick = StartPosClientEvents.isHost() && !StartPosClientEvents.isStarting;
+        int x = right;
+        for (int i = modes.size() - 1; i >= 0; i--) {
+            String mode = modes.get(i);
+            String label = mode.toUpperCase(Locale.ROOT);
+            int w = Text.smallWidth(label) + 12;
+            x -= w;
+            Rect r = new Rect(x, y, w, 15);
+            boolean on = mode.equals(RTSMapInfoClientEvents.selectedMode);
+            Theme.chip(frame.g, x, y, w, 15, on, canPick && frame.hovered(r));
+            Text.smallCentered(frame.g, label, r.centerX(), y + 3, on ? Theme.GOLD : canPick ? Theme.DESC : Theme.DIM);
+            frame.register(new ButtonBuilder(mode)
+                    .isEnabled(() -> canPick && !on)
+                    .onLeftClick(() -> RTSMapInfoServerboundPacket.setStartingMode(mode))
+                    .build(), r, null, canPick ? null : () -> Tooltip.of(label).status(I18n.get("matchstart.reignofnether.host_only"), Theme.LABEL));
+            x -= 4;
         }
     }
 
-    private void renderRoster(GuiGraphics g, int x1, int y1, int x2, int y2, int mx, int my, boolean overlayActive) {
-        MyRenderer.renderFrameWithBg(g, x1, y1, x2 - x1, y2 - y1, BG_PANEL);
+    private void renderMarker(StartPos sp, int cx, int cy, int size) {
+        var g = frame.g;
+        String me = localName();
+        boolean mine = !sp.playerName.isBlank() && sp.playerName.equals(me);
+        boolean open = sp.enabled && !taken(sp);
+        int x = cx - size / 2;
+        int y = cy - size / 2;
+        Rect r = new Rect(x, y, size, size);
+        boolean hovered = frame.hovered(r) && (open || mine);
+
+        if (hoveredRow != null && hoveredRow.pos.equals(sp.pos))
+            Theme.outline(g, x - 4, y - 4, size + 8, size + 8, 2, Theme.GOLD);
+        if (mine)
+            Theme.outline(g, x - 2, y - 2, size + 4, size + 4, 2, Theme.ORANGE);
+        Theme.outline(g, x, y, size, size, 1, Theme.INK);
+        g.fill(x, y + (hovered ? -1 : 0), x + size, y + size + (hovered ? -1 : 0), sp.enabled ? seatColour(sp) : 0xFF2A2930);
+        g.fill(x, y, x + size, y + 2, 0x4DFFFFFF);
+        g.fill(x, y + size - 2, x + size, y + size, 0x4D000000);
+
+        int inner = size * 2 / 3;
+        if (!sp.enabled)
+            Icon.LOCK.drawIn(g, x, y, size, size, Theme.TEXT);
+        else if (sp.hidden && deduced(sp) != null)
+            MyRenderer.renderPlayerHead(g, deduced(sp), x + (size - inner) / 2, y + (size - inner) / 2, inner, RANDOM_ICON);
+        else if (sp.hidden)
+            MyRenderer.renderIcon(g, RANDOM_ICON, x + (size - inner) / 2, y + (size - inner) / 2, inner);
+        else if (sp.playerName.isBlank())
+            Icon.PLUS.drawIn(g, x, y, size, size, Theme.TEXT);
+        else
+            MyRenderer.renderPlayerHead(g, sp.playerName, x + (size - inner) / 2, y + (size - inner) / 2, inner, factionIcon(sp.faction));
+        if (sp.ready && !sp.playerName.isBlank()) {
+            g.fill(x + size - 7, y + size - 7, x + size + 2, y + size + 2, Theme.OK_DARK);
+            Theme.ring(g, x + size - 7, y + size - 7, 9, 9, 1, Theme.OK);
+        }
 
-        g.drawString(this.font,
-                Component.translatable("matchstart.reignofnether.roster").getString(),
-                x1 + 10, y1 + 8, ACCENT, false);
+        String label = !sp.enabled ? I18n.get("matchstart.reignofnether.seat.closed")
+                : sp.hidden ? (deduced(sp) != null ? deduced(sp).toUpperCase(Locale.ROOT) : I18n.get("matchstart.reignofnether.pick_hidden"))
+                : sp.playerName.isBlank() ? I18n.get("matchstart.reignofnether.seat.open")
+                : mine ? I18n.get("matchstart.reignofnether.seat.you") : sp.playerName.toUpperCase(Locale.ROOT);
+        int lw = Text.smallWidth(label) + 8;
+        int ly = y + size + 4;
+        g.fill(cx - lw / 2, ly, cx - lw / 2 + lw, ly + 11, 0xE60B0A0F);
+        Text.smallCentered(g, label, cx, ly + 2, mine ? Theme.GOLD : open ? Theme.TEXT : Theme.MUTED);
+
+        Button b = new ButtonBuilder(StartPos.BUTTON_NAME)
+                .onLeftClick(() -> claim(sp))
+                .onRightClick(StartPosClientEvents.isHost() && !StartPosClientEvents.isStarting ? () -> setSeatOpen(sp, !sp.enabled) : null)
+                .build();
+        frame.register(b, r, null, () -> seatTooltip(sp));
+    }
 
-        Minecraft mc = Minecraft.getInstance();
-        String localName = mc.player != null ? mc.player.getName().getString() : "";
+    private Tooltip seatTooltip(StartPos sp) {
+        Tooltip t = Tooltip.of(sp.hidden ? (deduced(sp) != null ? deduced(sp) : I18n.get("matchstart.reignofnether.pick_hidden"))
+                : sp.playerName.isBlank() ? I18n.get(sp.enabled ? "matchstart.reignofnether.seat.open_title"
+                : "matchstart.reignofnether.seat.closed_title") : sp.playerName);
+        if (sp.enabled && !taken(sp))
+            t.status(I18n.get(StartPosClientEvents.getPos() != null ? "matchstart.reignofnether.seat.move_hint" : "matchstart.reignofnether.seat.take_hint"), Theme.GOLD);
+        if (StartPosClientEvents.isHost())
+            t.status(I18n.get(sp.enabled ? "matchstart.reignofnether.seat.close_hint" : "matchstart.reignofnether.seat.open_hint"), Theme.LABEL);
+        return t;
+    }
 
-        Map<Integer, List<StartPos>> byColor = new LinkedHashMap<>();
-        Set<String> seatedPlayers = new HashSet<>();
-        for (StartPos sp : StartPosClientEvents.startPoses) {
-            if (!sp.enabled) continue;
-            byColor.computeIfAbsent(sp.colorId, k -> new ArrayList<>()).add(sp);
-            if (!sp.playerName.isBlank()) seatedPlayers.add(sp.playerName);
-        }
-        seatedPlayers.addAll(StartPosClientEvents.hiddenPlayers.keySet());
+    // ------------------------------------------------------------------ steps
+
+    private void renderSteps(Rect r) {
+        StartPos mine = StartPosClientEvents.getPos();
+        boolean seated = mine != null;
+        boolean picked = seated && mine.faction != Factions.NONE;
+        boolean ready = seated && mine.ready;
+        int w = (r.w() - 2 * 6) / 3;
+        step(r.x(), r.y(), w, r.h(), 1, I18n.get("matchstart.reignofnether.step.seat"), seated, !seated);
+        step(r.x() + w + 6, r.y(), w, r.h(), 2, I18n.get("matchstart.reignofnether.step.faction"), picked, seated && !picked);
+        step(r.x() + 2 * (w + 6), r.y(), w, r.h(), 3, I18n.get("matchstart.reignofnether.step.ready"), ready, picked && !ready);
+    }
 
-        List<String> spectators = new ArrayList<>();
-        if (mc.level != null) {
-            for (AbstractClientPlayer p : mc.level.players()) {
-                String n = p.getName().getString();
-                if (!seatedPlayers.contains(n)) spectators.add(n);
-            }
-        }
+    private void step(int x, int y, int w, int h, int n, String title, boolean done, boolean current) {
+        var g = frame.g;
+        Theme.bevel(g, x, y, w, h, current ? Theme.ACTIVE : Theme.PANEL, current ? Theme.ORANGE : 0x0AFFFFFF, 0, 1, Theme.INK);
+        int mark = 16;
+        int mx = x + 8;
+        int my = y + (h - mark) / 2;
+        g.fill(mx, my, mx + mark, my + mark, done ? Theme.OK_DARK : current ? Theme.ORANGE : Theme.RAISED);
+        if (done)
+            Icon.CHECK.drawIn(g, mx, my, mark, mark, Theme.OK_TEXT);
+        else
+            Text.drawCentered(g, String.valueOf(n), mx + mark / 2 + 1, my + (mark - 8) / 2 + 1, current ? Theme.ON_ORANGE : Theme.DIM);
+        int tx = mx + mark + 7;
+        Text.draw(g, Text.fit(title, x + w - tx - 6), tx, y + (h - 8) / 2 + 1, done ? Theme.MUTED : current ? Theme.GOLD : Theme.TEXT);
+    }
+
+    // ------------------------------------------------------------------ roster
 
-        int contentTop = y1 + 24;
-        int viewTop = contentTop;
-        int viewBottom = y2 - 4;
-        rosterViewH = viewBottom - viewTop;
+    private void renderRoster(Rect p) {
+        var g = frame.g;
+        Theme.panel(g, p.x(), p.y(), p.w(), p.h(), PANEL_FILL);
+        Text.small(g, I18n.get("matchstart.reignofnether.roster"), p.x() + 11, p.y() + 9, Theme.LABEL);
+        renderRuleToggles(p.right() - 11, p.y() + 6);
 
-        boolean localSeated = mc.player != null && seatedPlayers.contains(localName);
-        int contentH = 0;
-        for (List<StartPos> team : byColor.values()) {
-            contentH += 12 + team.size() * ROW_H + 4;
+        List<StartPos> empty = new ArrayList<>();
+        boolean anySeated = false;
+        for (StartPos sp : StartPosClientEvents.startPoses) {
+            if (sp.enabled && !taken(sp))
+                empty.add(sp);
+            if (taken(sp))
+                anySeated = true;
         }
-        contentH += 12 + Math.max(spectators.size(), 1) * ROW_H;
-        if (localSeated) contentH += ROW_H + 2;
-        rosterContentH = contentH;
-
-        int maxScroll = Math.max(0, contentH - rosterViewH);
-        if (rosterScroll > maxScroll) rosterScroll = maxScroll;
-        if (rosterScroll < 0) rosterScroll = 0;
-
-        g.enableScissor(x1 + 6, viewTop, x2 - 6, viewBottom);
-
-        int y = contentTop - rosterScroll;
-        int teamIdx = 1;
-        for (Map.Entry<Integer, List<StartPos>> entry : byColor.entrySet()) {
-            int teamCol = 0xFF000000 | entry.getValue().get(0).getHexColor();
-            g.fill(x1 + 8, y, x1 + 12, y + 10, teamCol);
-            g.drawString(this.font,
-                    Component.translatable("matchstart.reignofnether.team", teamIdx).getString(),
-                    x1 + 16, y + 1, 0xFFE0E0E0, false);
-            y += 12;
-            for (StartPos sp : entry.getValue()) {
-                renderSlotRow(g, sp, localName, x1 + 8, y, x2 - x1 - 16, mx, my, overlayActive);
-                y += ROW_H;
+        anySeated |= !StartPosClientEvents.hiddenPlayers.isEmpty();
+        int blockerH = !empty.isEmpty() && anySeated ? 22 : 0;
+
+        int top = p.y() + 24;
+        int bottom = p.bottom() - 4 - blockerH;
+        int x = p.x() + 8;
+        int w = p.w() - 16;
+        Clip.push(g, p.x(), top, p.w(), bottom - top);
+        int y = top - rosterScroll;
+
+        String me = localName();
+        StartPos mine = StartPosClientEvents.getPos();
+        int teamIndex = 1;
+        for (List<StartPos> team : teams().values()) {
+            boolean myTeam = mine != null && team.contains(mine);
+            long filled = team.stream().filter(MatchStartScreen::taken).count();
+            long open = team.stream().filter(sp -> sp.enabled).count();
+            y = teamHeader(x, y, seatColour(team.get(0)), I18n.get("matchstart.reignofnether.team", teamIndex++),
+                    I18n.get("matchstart.reignofnether.team_sub", filled, open) + (myTeam ? " · " + I18n.get("matchstart.reignofnether.your_team") : ""));
+            for (StartPos sp : team) {
+                if (y + ROW_H > top - ROW_H && y < bottom + ROW_H)
+                    renderSeatRow(sp, me, x, y, w, top, bottom);
+                y += ROW_H + 3;
             }
             y += 4;
-            teamIdx++;
-        }
-
-        if (byColor.isEmpty() && spectators.isEmpty()) {
-            g.drawString(this.font,
-                    Component.translatable("matchstart.reignofnether.no_positions").getString(),
-                    x1 + 10, contentTop, TEXT_DIM, false);
         }
-
-        g.fill(x1 + 8, y, x1 + 12, y + 10, 0xFF8E8E86);
-        g.drawString(this.font,
-                Component.translatable("matchstart.reignofnether.spectators").getString(),
-                x1 + 16, y + 1, 0xFFE0E0E0, false);
-        y += 12;
-        spectateBtnVisible = false;
-        if (localSeated) {
-            int rowX1 = x1 + 8;
-            int rowX2 = x2 - 8;
-            int rowY2 = y + ROW_H - 4;
-            g.fill(rowX1, y, rowX2, rowY2, 0x40404040);
-            boolean hovered = !overlayActive && mx >= rowX1 && mx <= rowX2 && my >= y && my <= rowY2;
-            if (hovered) g.fill(rowX1, y, rowX2, rowY2, 0x32FFFFFF);
-            String join = Component.translatable("matchstart.reignofnether.join_spectators").getString();
-            g.drawString(this.font, join, rowX1 + 8, y + 7, ACCENT, false);
-            spectateBtnX1 = rowX1;
-            spectateBtnY1 = y;
-            spectateBtnX2 = rowX2;
-            spectateBtnY2 = rowY2;
-            spectateBtnVisible = true;
-            y += ROW_H + 2;
+        boolean onSeat = StartPosClientEvents.startPoses.stream().anyMatch(seat -> deduced(seat) != null);
+        if (!StartPosClientEvents.hiddenPlayers.isEmpty() && !onSeat) {
+            y = teamHeader(x, y, Theme.DIM, I18n.get("matchstart.reignofnether.other_teams"), I18n.get("matchstart.reignofnether.picks_hidden"));
+            for (Map.Entry<String, Boolean> e : StartPosClientEvents.hiddenPlayers.entrySet()) {
+                renderHiddenRow(e.getKey(), e.getValue(), x, y, w);
+                y += ROW_H + 3;
+            }
+            y += 4;
         }
-        for (String name : spectators) {
-            renderSpectatorRow(g, name, name.equals(localName), x1 + 8, y, x2 - x1 - 16);
-            y += ROW_H;
+        if (StartPosClientEvents.startPoses.isEmpty())
+            Text.draw(g, I18n.get("matchstart.reignofnether.no_positions"), x, y, Theme.DIM);
+
+        y = renderSpectators(x, y, w, mine != null, top, bottom);
+        Clip.pop(g);
+
+        int contentH = y + rosterScroll - top;
+        rosterMaxScroll = Math.max(0, contentH - (bottom - top));
+        rosterScroll = Math.min(rosterScroll, rosterMaxScroll);
+        if (rosterMaxScroll > 0) {
+            int trackH = bottom - top;
+            int thumbH = Math.max(16, trackH * trackH / Math.max(1, contentH));
+            int thumbY = top + (trackH - thumbH) * rosterScroll / rosterMaxScroll;
+            g.fill(p.right() - 4, top, p.right() - 2, bottom, Theme.INK);
+            g.fill(p.right() - 4, thumbY, p.right() - 2, thumbY + thumbH, Theme.FAINT);
         }
 
-        g.disableScissor();
+        if (blockerH > 0)
+            renderBlocker(new Rect(p.x() + 1, p.bottom() - blockerH - 1, p.w() - 2, blockerH), empty.size());
+    }
 
-        if (maxScroll > 0) {
-            int trackX = x2 - 6;
-            g.fill(trackX, viewTop, trackX + 2, viewBottom, 0x40000000);
-            int thumbH = Math.max(20, rosterViewH * rosterViewH / contentH);
-            int thumbY = viewTop + (rosterViewH - thumbH) * rosterScroll / maxScroll;
-            g.fill(trackX, thumbY, trackX + 2, thumbY + thumbH, ACCENT);
-        }
+    /** Fog of war and alliance lock as quick toggles, right-aligned at `right`. Host only; players see them in the rules panel. */
+    private void renderRuleToggles(int right, int y) {
+        if (!StartPosClientEvents.isHost())
+            return;
+        int x = ruleToggle(right, y, "fog_of_war", FogOfWarClientEvents.isMatchFogOn(), GameruleServerboundPacket::setFogOfWar);
+        ruleToggle(x - 4, y, "lock_alliances", GameruleClient.lockAlliances, GameruleServerboundPacket::setLockAlliances);
     }
 
-    private void renderSlotRow(GuiGraphics g, StartPos sp, String localName,
-                               int x, int y, int width, int mx, int my, boolean overlayActive) {
-        boolean mine = !sp.playerName.isBlank() && sp.playerName.equals(localName);
-        boolean hidden = sp.hidden; // an enemy sits here but hideEnemyPicks hides who
-        boolean empty = sp.playerName.isBlank() && !hidden;
-        int tint = (0x60000000) | (sp.getHexColor() & 0xFFFFFF);
-        int rowBottom = y + ROW_H - 2;
-        g.fill(x, y, x + width, rowBottom, tint);
-        if (mine) {
-            g.fill(x, y, x + 2, rowBottom, ACCENT);
-        }
+    /** An ON/OFF chip for a lobby game rule. Returns its left edge. */
+    private int ruleToggle(int right, int y, String rule, boolean on, Consumer<Boolean> set) {
+        return ruleChip(right, y, rule, on, null, () -> set.accept(!on));
+    }
 
-        // Highlight clickable rows (empty slots or my slot's left area) like the spectate button
-        if (sp.enabled && (empty || mine)) {
-            int rowHitRight = x + width - FRAME_SIZE * 3 - 2 * 2 - FRAME_SIZE - 6 - 8 - 16;
-            boolean hovered = !overlayActive && mx >= x && mx <= rowHitRight && my >= y && my <= rowBottom;
-            if (hovered) g.fill(x, y, rowHitRight, rowBottom, 0x32FFFFFF);
-        }
+    /** A lobby game rule chip, with its value after the name when given. Returns its left edge. */
+    private int ruleChip(int right, int y, String rule, boolean on, @Nullable String value, Runnable click) {
+        boolean teamLocked = rule.equals("lock_alliances") && RTSMapInfoClientEvents.teamMode;
+        boolean canToggle = StartPosClientEvents.isHost() && !StartPosClientEvents.isStarting && !teamLocked;
+        String label = I18n.get("gamerule.reignofnether.name." + rule).toUpperCase(Locale.ROOT) + (value != null ? " " + value : "");
+        int w = Text.smallWidth(label) + 19;
+        Rect r = new Rect(right - w, y, w, 15);
+        Theme.chip(frame.g, r.x(), y, w, 15, false, canToggle && frame.hovered(r));
+        frame.g.fill(r.x() + 5, y + 5, r.x() + 10, y + 10, on ? Theme.OK : Theme.FAINT);
+        Text.small(frame.g, label, r.x() + 14, y + 3, canToggle ? Theme.BODY : Theme.LABEL);
+        frame.register(new ButtonBuilder(rule)
+                .isEnabled(() -> canToggle)
+                .onLeftClick(click)
+                .build(), r, null, () -> Tooltip.of(I18n.get("gamerule.reignofnether.name." + rule))
+                .tag(value != null ? value : I18n.get(on ? "options.on" : "options.off"), on ? Theme.OK : Theme.LABEL)
+                .body(I18n.get("commands.reignofnether.gamerule." + rule))
+                .status(canToggle ? "" : I18n.get(teamLocked ? "hud.gamerule.reignofnether.team_locked" : "matchstart.reignofnether.host_only"), Theme.LABEL));
+        return r.x();
+    }
 
-        int tileY = y + ((ROW_H - FRAME_SIZE) / 2) - 1;
-        int readyX = x + width - FRAME_SIZE - 2;
-        int factionTotalW = FRAME_SIZE * 3 + 2 * 2;
-        int factionStartX = readyX - 20 - factionTotalW;
-
-        int headX = x + 6;
-        int innerOffset = (FRAME_SIZE - ICON_SIZE) / 2;
-        if (empty || hidden) {
-            MyRenderer.renderIconFrameWithBg(g, ICON_FRAME, headX, tileY, FRAME_SIZE, BG_ICON);
-            String plus = hidden ? "?" : "+";
-            float scale = 1.15f;
-            int plusW = this.font.width(plus);
-            int plusH = this.font.lineHeight;
-            g.pose().pushPose();
-            g.pose().translate(headX + FRAME_SIZE / 2.0f, tileY + FRAME_SIZE / 2.0f + 1, 0);
-            g.pose().scale(scale, scale, 1f);
-            g.drawString(this.font, plus, (-plusW / 2) + 1, -plusH / 2, ACCENT, false);
-            g.pose().popPose();
-        } else {
-            MyRenderer.renderIconFrameWithBg(g, ICON_FRAME, headX, tileY, FRAME_SIZE, BG_ICON);
-            MyRenderer.renderPlayerHead(g, sp.playerName, headX + innerOffset, tileY + innerOffset, ICON_SIZE, ICON_FRAME);
-        }
+    private int teamHeader(int x, int y, int colour, String name, String sub) {
+        Theme.outline(frame.g, x, y + 1, 7, 7, 1, Theme.INK);
+        frame.g.fill(x, y + 1, x + 7, y + 8, colour);
+        Text.big(frame.g, name, x + 12, y, Theme.TEXT, Text.px(18));
+        Text.small(frame.g, sub.toUpperCase(Locale.ROOT), x + 12 + Text.bigWidth(name, Text.px(18)) + 8, y, Theme.DIM);
+        return y + 12;
+    }
 
-        String name = hidden ? "?" : empty
-                ? Component.translatable("matchstart.reignofnether.empty_slot").getString()
-                : sp.playerName;
-        int nameCol = empty || hidden ? TEXT_DIM : TEXT_NORMAL;
-        int nameX = headX + FRAME_SIZE + 6;
-        int nameMaxW = factionStartX - nameX - 6;
-        String drawnName = this.font.plainSubstrByWidth(name, nameMaxW);
-        g.drawString(this.font, drawnName, nameX, tileY + (FRAME_SIZE - this.font.lineHeight) / 2 + 1, nameCol, false);
-
-        Faction[] order = { Factions.VILLAGERS, Factions.MONSTERS, Factions.PIGLINS, Factions.RANDOM };
-        int currentX = factionStartX - 6;
-        for (Faction f : order) {
-            renderFactionTile(g, sp, f, currentX, tileY, localName, mx, my);
-            currentX += FRAME_SIZE;
+    private void renderSeatRow(StartPos sp, String me, int x, int y, int w, int clipTop, int clipBottom) {
+        var g = frame.g;
+        boolean mine = !sp.playerName.isBlank() && sp.playerName.equals(me);
+        boolean empty = !taken(sp);
+        boolean host = StartPosClientEvents.isHost() && !StartPosClientEvents.isStarting;
+        boolean visible = y >= clipTop && y + ROW_H <= clipBottom;
+        boolean claimable = sp.enabled && empty && !StartPosClientEvents.isStarting;
+        Rect row = new Rect(x, y, w, ROW_H);
+        if (visible && frame.hovered(row))
+            nextHoveredRow = sp;
+
+        // the whole row of an open seat takes it; its buttons are registered after, so they win
+        int hx = rowFrame(x, y, w, mine, !sp.enabled ? Theme.SUNKEN : Theme.RAISED, claimable && frame.hovered(row),
+                sp.enabled ? seatColour(sp) : Theme.FAINT);
+        int hy = y + (ROW_H - HEAD) / 2;
+        if (visible && claimable)
+            frame.register(new ButtonBuilder("take seat row").onLeftClick(() -> claim(sp)).build(), row, null,
+                    () -> Tooltip.of(I18n.get("matchstart.reignofnether.seat.open_title"))
+                            .status(I18n.get(StartPosClientEvents.getPos() != null ? "matchstart.reignofnether.seat.move_hint" : "matchstart.reignofnether.seat.take_hint"), Theme.GOLD));
+
+        if (!sp.enabled)
+            Icon.LOCK.drawIn(g, hx, hy, HEAD, HEAD, Theme.DIM);
+        else if (sp.hidden && deduced(sp) != null)
+            MyRenderer.renderPlayerHead(g, deduced(sp), hx + 2, hy + 2, HEAD - 4, RANDOM_ICON);
+        else if (sp.hidden)
+            MyRenderer.renderIcon(g, RANDOM_ICON, hx + 2, hy + 2, HEAD - 4);
+        else if (empty)
+            Icon.PLUS.drawIn(g, hx, hy, HEAD, HEAD, Theme.DIM);
+        else
+            MyRenderer.renderPlayerHead(g, sp.playerName, hx + 2, hy + 2, HEAD - 4, factionIcon(sp.faction));
+
+        // right side first, so the name gets what's left: status column, then actions
+        int right = x + w - ROW_PAD;
+        // a hidden enemy's ready state is in the other teams list, not on their seat
+        String known = deduced(sp);
+        boolean ready = known != null ? StartPosClientEvents.hiddenPlayers.getOrDefault(known, false) : sp.ready;
+        String status = !sp.enabled || (sp.hidden && known == null) ? "" : empty ? I18n.get("matchstart.reignofnether.status.waiting")
+                : ready ? I18n.get("matchstart.reignofnether.status.ready") : I18n.get("matchstart.reignofnether.status.not_ready");
+        if (!mine) {
+            Text.mediumRight(g, status, right, y + (ROW_H - 8) / 2, ready ? Theme.OK : empty ? Theme.ORANGE : Theme.LABEL);
+            right -= 52 + 8;
         }
-        renderReadyTile(g, sp, readyX, tileY, localName, mx, my);
+        if (visible)
+            right = renderSeatActions(sp, mine, empty, host, right, y + (ROW_H - 20) / 2, 20);
 
-        if (sp.enabled && (empty || mine)) {
-            int rowHitRight = factionStartX - 5;
-            rowHits.add(new RowHit(sp, x, y, rowHitRight, rowBottom));
+        int nx = hx + HEAD + 8;
+        if (mine) {
+            int size = 20;
+            boolean labels = right - pickerWidth(size, true) > nx + 70;
+            int fx = right - pickerWidth(size, labels);
+            renderFactionPicker(sp, fx, y + (ROW_H - size) / 2, size, visible, labels);
+            right = fx - 8;
+        } else if (known != null) {
+            String fLabel = I18n.get("matchstart.reignofnether.faction_hidden");
+            int fx = right - Text.smallWidth(fLabel);
+            if (fx > nx + 50) {
+                Text.small(g, fLabel, fx, y + (ROW_H - 8) / 2, Theme.DIM);
+                right = fx - 8;
+            }
+        } else if (!empty && !sp.hidden) {
+            boolean picked = sp.faction != Factions.NONE;
+            String fLabel = picked ? MiscUtil.getFactionName(sp.faction) : I18n.get("matchstart.reignofnether.choosing");
+            int fw = Text.smallWidth(fLabel) + (picked ? 19 : 0);
+            int fx = right - fw;
+            if (fx > nx + 50) {
+                if (picked)
+                    drawFactionIcon(g, sp.faction, fx, y + (ROW_H - 14) / 2, 14);
+                Text.small(g, fLabel, fx + (picked ? 19 : 0), y + (ROW_H - 8) / 2, picked ? Theme.BODY : Theme.LABEL);
+                right = fx - 8;
+            }
         }
+
+        String name = !sp.enabled ? I18n.get("matchstart.reignofnether.seat.closed_title")
+                : sp.hidden ? (known != null ? known : I18n.get("matchstart.reignofnether.pick_hidden"))
+                : empty ? I18n.get("matchstart.reignofnether.seat.open_title")
+                : mine ? I18n.get("matchstart.reignofnether.you_name", sp.playerName) : sp.playerName;
+        Text.draw(g, Text.fit(name, Math.max(10, Math.min(90, right - nx))), nx, y + 8, mine ? Theme.GOLD : empty || (sp.hidden && known == null) || !sp.enabled ? Theme.LABEL : Theme.TEXT);
+        String seat = I18n.get("matchstart.reignofnether.seat_number", StartPosClientEvents.startPoses.indexOf(sp) + 1);
+        Text.small(g, seat, nx, y + 19, Theme.DIM);
+        if (!sp.enabled)
+            g.fill(x, y, x + w, y + ROW_H, 0x66121118);
     }
 
-    private void renderSpectatorRow(GuiGraphics g, String name, boolean isLocal,
-                                    int x, int y, int width) {
-        int rowBottom = y + ROW_H - 2;
-        g.fill(x, y, x + width, rowBottom, 0x40808080);
-        if (isLocal) g.fill(x, y, x + 2, rowBottom, ACCENT);
-        MyRenderer.renderPlayerHead(g, name, x + 6, y + (ROW_H - ICON_SIZE) / 2, ICON_SIZE, ICON_FRAME);
-        g.drawString(this.font, name, x + 6 + ICON_SIZE + 4, y + 9, TEXT_DIM, false);
-        String tag = Component.translatable("matchstart.reignofnether.spectator_tag").getString();
-        int w = this.font.width(tag);
-        g.drawString(this.font, tag, x + width - w - 8, y + 9, TEXT_DIM, false);
+    /** Background, team strip and empty head box shared by every roster row. Returns the head box's x. */
+    private int rowFrame(int x, int y, int w, boolean mine, int fill, boolean hovered, int strip) {
+        var g = frame.g;
+        Theme.bevel(g, x, y, w, ROW_H, mine ? Theme.ACTIVE : fill, mine ? 0 : 0x0AFFFFFF, 0, 1, Theme.INK);
+        if (mine)
+            Theme.ring(g, x, y, w, ROW_H, 1, Theme.ORANGE);
+        else if (hovered)
+            g.fill(x, y, x + w, y + ROW_H, Theme.HOVER);
+        g.fill(x + ROW_PAD, y + 5, x + ROW_PAD + 3, y + ROW_H - 5, strip);
+        int hx = x + ROW_PAD + 3 + 8;
+        int hy = y + (ROW_H - HEAD) / 2;
+        Theme.outline(g, hx, hy, HEAD, HEAD, 1, Theme.INK);
+        g.fill(hx, hy, hx + HEAD, hy + HEAD, Theme.EMPTY);
+        return hx;
     }
 
-    private void renderFactionTile(GuiGraphics g, StartPos sp, Faction f,
-                                   int x, int y, String localName, int mx, int my) {
-        boolean mine = !sp.playerName.isBlank() && sp.playerName.equals(localName);
-        ResourceLocation icon = f.icon;
+    /** Faction icon; random uses the shuffle icon. */
+    private static void drawFactionIcon(GuiGraphics g, Faction f, int x, int y, int size) {
         if (f == Factions.RANDOM)
-            icon = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/question_mark.png");
-
-        Button button = new ButtonBuilder("Faction " + f.getName())
-                .iconResource(icon)
-                .isSelected(() -> sp.faction == f && !sp.playerName.isBlank())
-                .isEnabled(() -> mine)
-                .onLeftClick(() -> pickFaction(sp, f))
-                .tooltipLines(List.of(fcs(MiscUtil.getFactionName(f))))
-                .showSelectedFrameWhenDisabled()
-                .build();
+            Icon.SHUFFLE.drawIn(g, x, y, size, size, Theme.BUFF);
+        else
+            MyRenderer.renderIcon(g, f.icon, x, y, size);
+    }
 
-        button.render(g, x, y, mx, my);
-        hudButtons.add(button);
+    /** Take / move / leave / kick / open / close buttons for a seat row. Returns the new right edge. */
+    private int renderSeatActions(StartPos sp, boolean mine, boolean empty, boolean host, int right, int y, int h) {
+        if (StartPosClientEvents.isStarting)
+            return right;
+        if (!sp.enabled) {
+            if (host)
+                right = rowButton(I18n.get("matchstart.reignofnether.action.open"), right, y, h, false, () -> setSeatOpen(sp, true)) - 4;
+            return right;
+        }
+        if (empty) {
+            if (host)
+                right = rowButton(I18n.get("matchstart.reignofnether.action.close"), right, y, h, false, () -> setSeatOpen(sp, false)) - 4;
+            String take = I18n.get(StartPosClientEvents.getPos() != null ? "matchstart.reignofnether.action.move" : "matchstart.reignofnether.action.take");
+            return primaryRowButton(take, right, y, h, () -> claim(sp)) - 4;
+        }
+        if (mine)
+            return rowButton(I18n.get("matchstart.reignofnether.action.leave"), right, y, h, false, this::leaveOwnSeat) - 4;
+        if (host)
+            right = rowButton(I18n.get("matchstart.reignofnether.action.kick"), right, y, h, true,
+                    () -> StartPosServerboundPacket.unreservePos(sp.pos)) - 4;
+        return right;
     }
 
-    private void renderReadyTile(GuiGraphics g, StartPos sp, int x, int y,
-                                 String localName, int mx, int my) {
-        boolean mine = !sp.playerName.isBlank() && sp.playerName.equals(localName);
-        MyRenderer.renderIconFrameWithBg(g, ICON_FRAME, x, y, FRAME_SIZE, BG_ICON);
-        ResourceLocation icon = sp.ready ? TICK_ICON : CROSS_ICON;
+    private int rowButton(String label, int right, int y, int h, boolean danger, Runnable action) {
+        int w = Text.width(label) + 14;
+        Rect r = new Rect(right - w, y, w, h);
+        boolean hovered = frame.hovered(r);
+        if (danger)
+            Theme.dangerButton(frame.g, r.x(), y, w, h, hovered);
+        else
+            Theme.button(frame.g, r.x(), y, w, h, hovered);
+        Text.drawCentered(frame.g, label, r.centerX(), y + (h - 8) / 2 + 1, danger ? Theme.DANGER_TEXT : hovered ? Theme.GOLD : Theme.BODY);
+        frame.register(new ButtonBuilder(label).onLeftClick(action).build(), r, null, null);
+        return r.x();
+    }
 
-        Button button = new ButtonBuilder("Ready toggle")
-                .iconResource(icon)
-                .isEnabled(() -> mine && sp.faction != Factions.NONE && sp.faction != Factions.NEUTRAL)
-                .onLeftClick(() -> toggleReady(sp))
-                .tooltipLines(List.of(fcs(sp.ready
-                        ? I18n.get("startpos.reignofnether.ready_button.unready")
-                        : I18n.get("startpos.reignofnether.ready_button.ready"))))
-                .build();
+    private int primaryRowButton(String label, int right, int y, int h, Runnable action) {
+        int w = Text.width(label) + 14;
+        Rect r = new Rect(right - w, y, w, h);
+        Theme.primaryButton(frame.g, r.x(), y, w, h, frame.hovered(r));
+        Text.drawCentered(frame.g, label, r.centerX(), y + (h - 8) / 2 + 1, Theme.ON_ORANGE);
+        frame.register(new ButtonBuilder(label).onLeftClick(action).build(), r, null, null);
+        return r.x();
+    }
 
-        button.render(g, x, y, mx, my);
-        hudButtons.add(button);
-    }
-
-    private void renderGamerulesPopover(GuiGraphics g, int mx, int my) {
-        // Anchor the popover below the gamerules button in the header
-        int xTR = grBtnX - 8;
-        int yTR = grBtnY + FRAME_SIZE + 6;
-        List<Button> buttons = GameruleClient.renderGamerulesGUI(g, xTR, yTR, mx, my);
-        hudButtons.addAll(buttons);
-    }
-
-    private void renderChatCard(GuiGraphics g, int x1, int y1, int x2, int y2, int mx, int my) {
-        MyRenderer.renderFrameWithBg(g, x1, y1, x2 - x1, y2 - y1, BG_PANEL);
-        g.drawString(this.font,
-                Component.translatable("matchstart.reignofnether.chat").getString(),
-                x1 + 10, y1 + (chatMinimised ? 9 : 7), ACCENT, false);
-
-        // ── Minimise / Maximise toggle button ────────────────────────────────
-        // A small frameless square in the top-right corner of the chat card.
-        int btnSize = MINI_BTN;
-        int btnX = x2 - btnSize - 9;
-        int btnY = y1 + 8;
-        boolean btnHovered = mx >= btnX && mx <= btnX + btnSize
-                && my >= btnY && my <= btnY + btnSize;
-        g.fill(btnX, btnY, btnX + btnSize + 1, btnY + btnSize, btnHovered ? 0x50FFFFFF : 0x30FFFFFF);
-        int symCol = btnHovered ? TEXT_NORMAL : TEXT_DIM;
-        String sym = chatMinimised ? "+" : "-";
-        int symW = this.font.width(sym);
-        g.drawString(this.font, sym,
-                btnX + ((btnSize - symW) / 2) + 1,
-                btnY + 1,
-                symCol, false);
-
-        if (chatMinimised)
-            return;
+    private static int pickerButtonWidth(Faction f, int size, boolean label) {
+        return label ? size + Text.width(MiscUtil.getFactionName(f)) + 8 : size;
+    }
 
-        // ── Full chat body ────────────────────────────────────────────────────
-        int textTop = y1 + 18;
-        int textBottom = y2 - 26;
-        int maxWidth = (x2 - x1) - 16;
+    private static int pickerWidth(int size, boolean labels) {
+        int w = 0;
+        for (Faction f : FACTIONS)
+            w += pickerButtonWidth(f, size, labels) + 4;
+        return w - 4;
+    }
 
-        java.util.List<net.minecraft.util.FormattedCharSequence> allLines = new ArrayList<>();
-        for (Component c : MatchStartClientEvents.getChatBuffer()) {
-            allLines.addAll(this.font.split(c, maxWidth));
+    /** Your faction choice: icon and name buttons like the design, or icons only when the row is narrow. */
+    private void renderFactionPicker(StartPos sp, int x, int y, int size, boolean clickable, boolean labels) {
+        for (Faction f : FACTIONS) {
+            int w = pickerButtonWidth(f, size, labels);
+            Rect r = new Rect(x, y, w, size);
+            boolean on = sp.faction == f;
+            boolean hovered = frame.hovered(r);
+            if (on)
+                Theme.chip(frame.g, x, y, w, size, true, hovered);
+            else
+                Theme.button(frame.g, x, y, w, size, hovered);
+            drawFactionIcon(frame.g, f, x + 3, y + 3, size - 6);
+            if (labels)
+                Text.draw(frame.g, MiscUtil.getFactionName(f), x + size, y + (size - 8) / 2 + 1, on ? Theme.GOLD : Theme.DESC);
+            if (clickable)
+                frame.register(new ButtonBuilder(f.getName()).onLeftClick(() -> pickFaction(sp, f)).build(), r, null,
+                        () -> Tooltip.of(MiscUtil.getFactionName(f)).body(I18n.get("matchstart.reignofnether.faction_desc." + factionKey(f))));
+            x += w + 4;
         }
+    }
+
+    private void renderHiddenRow(String name, boolean ready, int x, int y, int w) {
+        var g = frame.g;
+        Theme.outline(g, x, y, w, ROW_H, 1, Theme.INK);
+        g.fill(x, y, x + w, y + ROW_H, Theme.RAISED);
+        g.fill(x, y, x + 3, y + ROW_H, Theme.DIM);
+        int hs = ROW_H - 8;
+        MyRenderer.renderPlayerHead(g, name, x + 9, y + 5, hs - 2, RANDOM_ICON);
+        Text.draw(g, Text.fit(name, w / 2), x + 8 + hs + 7, y + (ROW_H - 8) / 2, Theme.TEXT);
+        String status = I18n.get(ready ? "matchstart.reignofnether.status.ready" : "matchstart.reignofnether.status.not_ready");
+        Text.mediumRight(g, status, x + w - 6, y + (ROW_H - 8) / 2, ready ? Theme.OK : Theme.LABEL);
+        String hidden = I18n.get("matchstart.reignofnether.faction_hidden");
+        Text.smallRight(g, hidden, x + w - 14 - Text.mediumWidth(status), y + (ROW_H - 8) / 2, Theme.DIM);
+    }
 
-        int lineH = this.font.lineHeight + 1;
-        chatTotalLines = allLines.size();
-        chatViewLines = Math.max(1, (textBottom - textTop) / lineH);
-        int maxScroll = Math.max(0, chatTotalLines - chatViewLines);
-        if (chatScroll > maxScroll) chatScroll = maxScroll;
-        if (chatScroll < 0) chatScroll = 0;
-
-        g.enableScissor(x1 + 4, textTop, x2 - 4, textBottom);
-        int bottomIdx = allLines.size() - 1 - chatScroll;
-        int y = textBottom - lineH;
-        for (int i = bottomIdx; i >= 0 && y >= textTop - lineH; i--) {
-            g.drawString(this.font, allLines.get(i), x1 + 8, y, TEXT_NORMAL, false);
-            y -= lineH;
+    private int renderSpectators(int x, int y, int w, boolean seated, int clipTop, int clipBottom) {
+        var g = frame.g;
+        List<String> specs = spectators();
+        y = teamHeader(x, y, Theme.DIM, I18n.get("matchstart.reignofnether.spectators"), String.valueOf(specs.size()));
+        if (seated && !StartPosClientEvents.isStarting && y - 16 >= clipTop && y < clipBottom) {
+            String label = I18n.get("matchstart.reignofnether.spectate");
+            rowButton(label, x + w, y - 16, 14, false, this::leaveOwnSeat);
         }
-        g.disableScissor();
-
-        if (chatTotalLines > chatViewLines) {
-            int trackX = x2 - 6;
-            g.fill(trackX, textTop, trackX + 2, textBottom, 0x40000000);
-            int thumbH = Math.max(20, (textBottom - textTop) * chatViewLines / chatTotalLines);
-            int travel = (textBottom - textTop) - thumbH;
-            int thumbY = textBottom - thumbH - travel * chatScroll / maxScroll;
-            g.fill(trackX, thumbY, trackX + 2, thumbY + thumbH, ACCENT);
+        if (specs.isEmpty()) {
+            Text.draw(g, I18n.get("matchstart.reignofnether.no_spectators"), x, y + 2, Theme.DIM);
+            return y + 14;
         }
-
-        if (chatInput != null && !chatMinimised && chatInput.getValue().isEmpty()) {
-            g.drawString(this.font,
-                    Component.translatable("matchstart.reignofnether.chat.click_to_type").getString(),
-                    chatInput.getX() + 4, chatInput.getY() + 5, TEXT_DIM, false);
+        int cx = x;
+        String me = localName();
+        for (String name : specs) {
+            String label = name.equals(me) ? I18n.get("matchstart.reignofnether.you_name", name) : name;
+            int cw = Text.width(label) + 13 + 4 + 12;
+            if (cx + cw > x + w) {
+                cx = x;
+                y += 25;
+            }
+            Theme.bevel(g, cx, y, cw, 21, Theme.RAISED, 0, 0, 1, Theme.INK);
+            if (name.equals(me))
+                Theme.ring(g, cx, y, cw, 21, 1, Theme.ORANGE);
+            MyRenderer.renderPlayerHead(g, name, cx + 4, y + 4, 13, RANDOM_ICON);
+            Text.draw(g, label, cx + 21, y + 7, name.equals(me) ? Theme.GOLD : Theme.BODY);
+            cx += cw + 4;
         }
+        return y + 27;
     }
 
-    private void sendChatFromInput() {
-        if (chatInput == null) return;
-        String text = chatInput.getValue().trim();
-        chatInput.setValue("");
-        // Do NOT defocus — keep the input active so the player can send more messages
-        if (text.isEmpty()) return;
-        Minecraft mc = Minecraft.getInstance();
-        if (mc.player == null || mc.player.connection == null) return;
-        mc.gui.getChat().addRecentChat(text);
-        if (text.startsWith("/")) {
-            mc.player.connection.sendCommand(text.substring(1));
-        } else {
-            mc.player.connection.sendChat(text);
-        }
+    private void renderBlocker(Rect r, int openSeats) {
+        var g = frame.g;
+        g.fill(r.x(), r.y(), r.right(), r.bottom(), 0xF22F2418);
+        g.fill(r.x(), r.y(), r.right(), r.y() + Theme.BEVEL, Theme.ORANGE);
+        if ((System.currentTimeMillis() / 500) % 2 == 0)
+            g.fill(r.x() + 7, r.y() + 8, r.x() + 12, r.y() + 13, Theme.ORANGE);
+        int right = r.right() - 6;
+        if (StartPosClientEvents.isHost() && !StartPosClientEvents.isStarting)
+            right = rowButton(I18n.get("matchstart.reignofnether.close_empty"), right, r.y() + 4, r.h() - 8, false,
+                    StartPosServerboundPacket::closeEmptyPositions) - 6;
+        Text.draw(g, Text.fit(I18n.get("matchstart.reignofnether.blocker", openSeats), right - r.x() - 18), r.x() + 17, r.y() + 7, Theme.TEXT);
     }
 
-    private void renderInstructions(GuiGraphics g, int x1, int y1, int x2, int y2) {
-        MyRenderer.renderFrameWithBg(g, x1, y1, x2 - x1, y2 - y1, BG_PANEL);
+    // ------------------------------------------------------------------ chat
+
+    private void renderChat(Rect p) {
+        var g = frame.g;
+        Theme.panel(g, p.x(), p.y(), p.w(), p.h(), PANEL_FILL);
+        Text.small(g, I18n.get("matchstart.reignofnether.chat"), p.x() + 11, p.y() + 9, Theme.LABEL);
+
+        int inputH = 26;
+        int top = p.y() + 22;
+        int bottom = p.bottom() - inputH - 4;
+        int x = p.x() + 11;
+        int w = p.w() - 22;
+
+        int total = ChatLines.render(g, ChatLog.entries(), new Rect(x, top, w, bottom - top), chatScroll);
+        chatMaxScroll = Math.max(0, total - (bottom - top) / ChatLines.LINE_H);
+        chatScroll = Math.min(chatScroll, chatMaxScroll);
+
+        // input row
+        int iy = p.bottom() - inputH;
+        g.fill(p.x(), iy, p.right(), p.bottom(), Theme.SUNKEN);
+        g.fill(p.x(), iy, p.right(), iy + 1, Theme.INK);
+        String send = I18n.get("matchstart.reignofnether.send");
+        int sendW = Text.smallWidth(send) + 16;
+        Rect field = new Rect(p.x() + 6, iy + 6, p.w() - 12 - sendW - 4, inputH - 12);
+        g.fill(field.x(), field.y(), field.right(), field.bottom(), Theme.INK);
+        g.fill(field.x(), field.y(), field.right(), field.y() + Theme.BEVEL, 0x99000000);
+        chatInput.setX(field.x() + 6);
+        chatInput.setY(field.y() + (field.h() - 8) / 2 + 1);
+        chatInput.setWidth(field.w() - 8);
+        chatInput.render(g, frame.mouseX, frame.mouseY, 0);
+        if (chatInput.getValue().isEmpty() && !chatInput.isFocused())
+            Text.draw(g, Text.fit(I18n.get("matchstart.reignofnether.chat.click_to_type"), field.w() - 12), field.x() + 6, field.y() + (field.h() - 8) / 2 + 1, Theme.DIM);
+        frame.register(new ButtonBuilder("chat input").onLeftClick(() -> chatInput.setFocused(true)).build(), field, null, null);
+        rowButton(send, p.right() - 6, field.y(), field.h(), false, this::sendChat);
+    }
 
-        StartPos current = StartPosClientEvents.getPos();
-        String hint;
-        if (current == null) {
-            hint = Component.translatable("matchstart.reignofnether.hint.pick_pos").getString();
-        } else if (current.faction == Factions.NONE) {
-            hint = Component.translatable("matchstart.reignofnether.hint.pick_faction").getString();
-        } else if (!current.ready) {
-            hint = Component.translatable("matchstart.reignofnether.hint.ready_up").getString();
-        } else {
-            hint = Component.translatable("matchstart.reignofnether.hint.waiting").getString();
-        }
-        g.drawString(this.font, hint, x1 + MARGIN, y1 + 9, ACCENT, false);
+    private void sendChat() {
+        ChatPanel.sendMessage(chatInput.getValue());
+        chatInput.setValue("");
+        chatScroll = 0;
     }
 
-    private String countdownLabel() {
-        if (StartPosClientEvents.isStarting) {
-            int seconds = Math.max(0, (MatchStartClientEvents.getCountdownTicks() + 19) / 20);
-            return Component.translatable("matchstart.reignofnether.starting", seconds).getString();
+    // ------------------------------------------------------------------ your pick + ready
+
+    private void renderPick(Rect p) {
+        var g = frame.g;
+        StartPos mine = StartPosClientEvents.getPos();
+        Faction faction = mine != null ? mine.faction : Factions.NONE;
+        boolean picked = mine != null && faction != Factions.NONE;
+        boolean ready = mine != null && mine.ready;
+
+        frame.zone(p);
+        Theme.outline(g, p.x(), p.y(), p.w(), p.h(), 1, Theme.INK);
+        g.fill(p.x(), p.y(), p.right(), p.bottom(), Theme.PANEL);
+        ResourceLocation art = rl("textures/gui/factions/" + faction.getName() + "_blur.png");
+        // blurred art, zoomed to cover the whole card like the design's object-fit: cover; addon factions may ship none
+        if (mine != null && picked && faction != Factions.RANDOM && minecraft.getResourceManager().getResource(art).isPresent()) {
+            float zoom = Math.max(p.w() / 480f, p.h() / 253f) * 1.15f;
+            int aw = Math.round(480 * zoom);
+            int ah = Math.round(253 * zoom);
+            Clip.push(g, p.x(), p.y(), p.w(), p.h());
+            g.blit(art, p.x() + (p.w() - aw) / 2, p.y() + (p.h() - ah) / 2, aw, ah, 0, 0, 480, 253, 480, 253);
+            g.fill(p.x(), p.y(), p.right(), p.bottom(), 0x9E000000);
+            Clip.pop(g);
         }
-        int ready = 0, total = 0;
-        for (StartPos sp : StartPosClientEvents.startPoses) {
-            if (!sp.enabled) continue;
-            total++;
-            if (sp.ready && !sp.playerName.isBlank()) ready++;
+        g.fillGradient(p.x(), p.y(), p.right(), p.bottom(), 0x3316151B, 0xF516151B);
+        g.fill(p.x(), p.y(), p.right(), p.y() + Theme.BEVEL, ready ? Theme.OK : picked ? Theme.ORANGE : Theme.FAINT);
+
+        String kicker, title, desc;
+        if (mine == null) {
+            kicker = I18n.get("matchstart.reignofnether.pick.spectating");
+            title = I18n.get("matchstart.reignofnether.pick.no_seat");
+            desc = I18n.get("matchstart.reignofnether.pick.no_seat_desc");
+        } else if (!picked) {
+            kicker = I18n.get("matchstart.reignofnether.pick.seated");
+            title = I18n.get("matchstart.reignofnether.pick.pick_faction");
+            desc = I18n.get("matchstart.reignofnether.pick.pick_faction_desc");
+        } else {
+            kicker = I18n.get("matchstart.reignofnether.pick.your_faction");
+            title = MiscUtil.getFactionName(faction);
+            desc = I18n.get("matchstart.reignofnether.faction_desc." + factionKey(faction));
         }
-        for (boolean hiddenReady : StartPosClientEvents.hiddenPlayers.values())
-            if (hiddenReady) ready++;
-        return Component.translatable("matchstart.reignofnether.ready_count", ready, total).getString();
-    }
 
-    @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
-        int mx = (int) mouseX, my = (int) mouseY;
-        if (mx >= rosX1 && mx <= rosX2 && my >= rosY1 && my <= rosY2) {
-            rosterScroll -= (int) (delta * 18);
-            int maxScroll = Math.max(0, rosterContentH - rosterViewH);
-            if (rosterScroll > maxScroll) rosterScroll = maxScroll;
-            if (rosterScroll < 0) rosterScroll = 0;
-            return true;
-        }
-        if (mx >= chatX1 && mx <= chatX2 && my >= chatY1 && my <= chatY2) {
-            chatScroll += (int) (delta * 3);
-            int maxScroll = Math.max(0, chatTotalLines - chatViewLines);
-            if (chatScroll > maxScroll) chatScroll = maxScroll;
-            if (chatScroll < 0) chatScroll = 0;
-            return true;
+        int pad = 11;
+        int btnH = 26;
+        int btnY = p.bottom() - pad - btnH - 3;
+        List<FormattedCharSequence> descLines = Text.wrap(desc, p.w() - pad * 2);
+        int lh = Text.lineHeight();
+        int maxLines = Math.max(0, (btnY - 6 - (p.y() + pad + 30)) / lh);
+        int y = btnY - 6 - Math.min(maxLines, descLines.size()) * lh;
+        for (int i = 0; i < Math.min(maxLines, descLines.size()); i++)
+            Text.draw(g, descLines.get(i), p.x() + pad, y + i * lh, Theme.DESC);
+        Text.heading(g, title.toUpperCase(Locale.ROOT), p.x() + pad, y - 19, Theme.TEXT, Text.px(32));
+        Text.medium(g, kicker, p.x() + pad, y - 30, Theme.ORANGE);
+
+        boolean canReady = picked && !(StartPosClientEvents.isStarting && !ready);
+        String label = mine == null ? I18n.get("matchstart.reignofnether.ready.take_seat")
+                : !picked ? I18n.get("matchstart.reignofnether.ready.pick_faction")
+                : ready ? I18n.get("matchstart.reignofnether.ready.unready") : I18n.get("matchstart.reignofnether.ready.ready_up");
+        Rect btn = new Rect(p.x() + pad, btnY, p.w() - pad * 2, btnH);
+        boolean hover = canReady && frame.hovered(btn);
+        Theme.readyButton(g, btn.x(), btn.y(), btn.w(), btn.h(),
+                ready ? Theme.ReadyState.READY : canReady ? Theme.ReadyState.CAN_READY : Theme.ReadyState.DISABLED, hover);
+        // ready: a check and READY, turning into UNREADY on hover
+        if (ready && hover)
+            label = I18n.get("matchstart.reignofnether.ready.unready_short");
+        else if (ready)
+            label = I18n.get("matchstart.reignofnether.ready.ready");
+        int lw = Text.mediumWidth(label) + (ready && !hover ? 12 + 6 : 0);
+        int lx = btn.centerX() - lw / 2;
+        if (ready && !hover) {
+            Icon.CHECK.draw(g, lx, btn.y() + (btnH - 12) / 2, 12, Theme.OK_TEXT);
+            lx += 12 + 6;
         }
-        return super.mouseScrolled(mouseX, mouseY, delta);
+        Text.medium(g, label, lx, btn.y() + (btnH - 9) / 2,
+                ready ? Theme.OK_TEXT : canReady ? Theme.ON_ORANGE : Theme.DIM);
+        frame.register(new ButtonBuilder("ready").isEnabled(() -> canReady).onLeftClick(() -> toggleReady(mine)).build(), btn, null, null);
     }
 
-    @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        int mx = (int) mouseX, my = (int) mouseY;
-        boolean left = button == 0;
-
-        // Minimise / maximise toggle for chat card
-        if (left) {
-            int btnSize = MINI_BTN;
-            int btnX = chatX2 - btnSize - 9;
-            int btnY = chatY1 + 8;
-            if (mx >= btnX && mx <= btnX + btnSize && my >= btnY && my <= btnY + btnSize) {
-                chatMinimised = !chatMinimised;
-                chatInput.setVisible(!chatMinimised);
-                chatInput.setFocused(!chatMinimised);
-                return true;
-            }
-        }
+    // ------------------------------------------------------------------ overlays
+
+    private void renderCountdown(int w) {
+        var g = frame.g;
+        int seconds = Math.max(0, (MatchStartClientEvents.getCountdownTicks() + 19) / 20);
+        String label = I18n.get("matchstart.reignofnether.all_ready");
+        String title = I18n.get("matchstart.reignofnether.starting_in", seconds);
+        StartPos mine = StartPosClientEvents.getPos();
+        boolean canCancel = mine != null && mine.ready;
+        String unready = I18n.get("matchstart.reignofnether.ready.unready_short");
+        float titleScale = Text.px(34);
+        int titleW = Text.headingWidth(title, titleScale);
+        int bw = canCancel ? Text.smallWidth(unready) + 14 : 0;
+        int pw = 12 + Text.mediumWidth(label) + 12 + titleW + 12 + bw + (canCancel ? 12 : 0);
+        int ph = 34;
+        int x = (w - pw) / 2;
+        int y = M + 4;
+        // shadowed text sits slightly above z 0, so it would show through a banner drawn at the same level
+        g.pose().pushPose();
+        g.pose().translate(0, 0, 200);
+        frame.zone(x, y, pw, ph);
+        Theme.bevel(g, x, y, pw, ph, 0xFF24232C, Theme.OK, 0, 2, Theme.INK);
+        Text.medium(g, label, x + 12, y + 12, Theme.OK);
+        Text.heading(g, title, x + 24 + Text.mediumWidth(label), y + 11, Theme.TEXT, titleScale);
+        if (canCancel)
+            rowButton(unready, x + pw - 12, y + 8, 18, false, () -> toggleReady(mine));
+        g.pose().popPose();
+    }
 
-        if (left && spectateBtnVisible
-                && !isMouseOverOverlay(mx, my)
-                && mx >= spectateBtnX1 && mx <= spectateBtnX2
-                && my >= spectateBtnY1 && my <= spectateBtnY2) {
-            leaveOwnSlot();
-            return true;
-        }
+    private void renderRulesModal(int w, int h) {
+        var g = frame.g;
+        g.pose().pushPose();
+        g.pose().translate(0, 0, 300);
+        g.fill(0, 0, w, h, 0xCC050203);
+        frame.register(new ButtonBuilder("close rules").onLeftClick(() -> GameruleClient.gamerulesMenuOpen = false).build(),
+                new Rect(0, 0, w, h), null, null);
+
+        List<SettingRow> rules = GameruleClient.ruleRows();
+        int colW = 253;
+        int pad = 12;
+        int maxH = h - 2 * M - 60;
+        Rect size = SettingRows.measure(rules, colW, maxH);
+        int pw = Math.min(w - 2 * M, size.w() + pad * 2);
+        int ph = size.h() + pad * 2 + 30;
+        int x = (w - pw) / 2;
+        int y = (h - ph) / 2;
+        Theme.popup(g, x, y, pw, ph, Theme.ORANGE);
+        frame.register(new ButtonBuilder("rules panel").build(), new Rect(x, y, pw, ph), null, null);
+        Text.heading(g, I18n.get("matchstart.reignofnether.game_rules").toUpperCase(Locale.ROOT), x + pad, y + pad - 1, Theme.GOLD, Text.px(26));
+        String note = I18n.get(StartPosClientEvents.isHost() ? "matchstart.reignofnether.rules_host" : "matchstart.reignofnether.rules_view");
+        Rect close = new Rect(x + pw - pad - 18, y + pad - 4, 18, 18);
+        Text.smallRight(g, note, close.x() - 8, y + pad + 1, StartPosClientEvents.isHost() ? Theme.OK : Theme.LABEL);
+        Theme.button(g, close.x(), close.y(), 18, 18, frame.hovered(close));
+        Icon.CLOSE.drawIn(g, close.x(), close.y(), 18, 18, frame.hovered(close) ? Theme.GOLD : Theme.BODY);
+        frame.register(new ButtonBuilder("close").onLeftClick(() -> GameruleClient.gamerulesMenuOpen = false).build(), close, null, null);
+        SettingRows.render(frame, rules, x + pad, y + pad + 26, colW, maxH);
+        g.pose().popPose();
+    }
 
-        for (Button b : hudButtons) {
-            b.checkClicked(mx, my, left);
-        }
+    // ------------------------------------------------------------------ actions
 
-        if (left && !isMouseOverOverlay(mx, my)) {
-            for (RowHit rh : rowHits) {
-                if (mx >= rh.x1 && mx <= rh.x2 && my >= rh.y1 && my <= rh.y2) {
-                    claimDot(rh.pos);
-                    return true;
-                }
-            }
-        }
+    private void claim(StartPos sp) {
+        if (Minecraft.getInstance().player == null || !sp.enabled || StartPosClientEvents.isStarting)
+            return;
+        if (!taken(sp))
+            StartPosServerboundPacket.reservePos(sp.pos, StartPosClientEvents.selectedFaction);
+    }
 
-        return super.mouseClicked(mouseX, mouseY, button);
+    private void setSeatOpen(StartPos sp, boolean open) {
+        if (open)
+            StartPosServerboundPacket.enablePos(sp.pos);
+        else
+            StartPosServerboundPacket.disablePos(sp.pos);
     }
 
-    private void leaveOwnSlot() {
+    private void leaveOwnSeat() {
         StartPos current = StartPosClientEvents.getPos();
         if (current != null) {
             StartPosServerboundPacket.unreservePos(current.pos);
@@ -714,70 +1021,80 @@ private void leaveOwnSlot() {
     }
 
     private void pickFaction(StartPos pos, Faction faction) {
-        if (Minecraft.getInstance().player == null) return;
-        String name = Minecraft.getInstance().player.getName().getString();
-        if (pos.playerName.isBlank() && !pos.hidden) {
-            StartPosClientEvents.selectedFaction = faction;
-            StartPosServerboundPacket.reservePos(pos.pos, faction);
-        } else if (pos.playerName.equals(name)) {
-            if (pos.faction == faction) {
-                StartPosClientEvents.selectedFaction = Factions.NONE;
-                StartPosServerboundPacket.reservePos(pos.pos, Factions.NONE);
-            } else {
-                StartPosClientEvents.selectedFaction = faction;
-                StartPosServerboundPacket.reservePos(pos.pos, faction);
-            }
-        }
-        if (pos.ready) {
-            toggleReady(pos);
-        }
+        if (!pos.playerName.equals(localName()))
+            return;
+        Faction next = pos.faction == faction ? Factions.NONE : faction;
+        StartPosClientEvents.selectedFaction = next;
+        StartPosServerboundPacket.reservePos(pos.pos, next);
     }
 
-    private void claimDot(StartPos pos) {
-        if (Minecraft.getInstance().player == null || !pos.enabled) return;
-        String name = Minecraft.getInstance().player.getName().getString();
-        if (pos.playerName.equals(name)) {
-            StartPosServerboundPacket.unreservePos(pos.pos);
-        } else if (pos.playerName.isBlank() && !pos.hidden) {
-            StartPosServerboundPacket.reservePos(pos.pos, StartPosClientEvents.selectedFaction);
-        }
+    private void toggleReady(@Nullable StartPos pos) {
+        if (pos != null)
+            toggleReady(pos.ready);
     }
 
-    private void toggleReady(StartPos pos) {
-        if (pos.ready) {
+    private void toggleReady(boolean ready) {
+        if (ready)
             StartPosServerboundPacket.unreadyPlayer();
-        } else {
+        else
             StartPosServerboundPacket.readyPlayer();
-        }
     }
 
+    // ------------------------------------------------------------------ input
+
     @Override
-    public boolean shouldCloseOnEsc() {
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (frame == null)
+            return super.mouseClicked(mouseX, mouseY, button);
+        int ux = frame.scale.toUnits(mouseX);
+        int uy = frame.scale.toUnits(mouseY);
+        boolean inInput = !GameruleClient.gamerulesMenuOpen && chatInput.isMouseOver(ux, uy);
+        chatInput.setFocused(inInput);
+        if (inInput)
+            return chatInput.mouseClicked(ux, uy, button);
+        frame.click(ux, uy, button == GLFW.GLFW_MOUSE_BUTTON_1);
+        return true;
+    }
+
+    @Override
+    public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
+        if (frame == null)
+            return false;
+        int ux = frame.scale.toUnits(mouseX);
+        int uy = frame.scale.toUnits(mouseY);
+        if (rosterRect.contains(ux, uy))
+            rosterScroll = Math.max(0, Math.min(rosterMaxScroll, rosterScroll - (int) (delta * 18)));
+        else if (chatRect.contains(ux, uy))
+            chatScroll = Math.max(0, Math.min(chatMaxScroll, chatScroll + (int) (delta * 3)));
         return true;
     }
 
     @Override
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        if (chatInput != null && !chatMinimised) {
+        if (chatInput.isFocused()) {
             if (keyCode == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER) {
-                sendChatFromInput();
+                sendChat();
                 return true;
             }
             if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
-                MatchStartClientEvents.dismiss();
+                chatInput.setFocused(false);
                 return true;
             }
-            return super.keyPressed(keyCode, scanCode, modifiers);
+            return chatInput.keyPressed(keyCode, scanCode, modifiers);
+        }
+        if (keyCode == GLFW.GLFW_KEY_ESCAPE && GameruleClient.gamerulesMenuOpen) {
+            GameruleClient.gamerulesMenuOpen = false;
+            return true;
         }
         if (keyCode == GLFW.GLFW_KEY_ESCAPE || keyCode == GLFW.GLFW_KEY_F9) {
             MatchStartClientEvents.dismiss();
             return true;
         }
-        if (chatInput != null && keyCode == GLFW.GLFW_KEY_T) {
+        if (keyCode == GLFW.GLFW_KEY_T || keyCode == GLFW.GLFW_KEY_ENTER) {
             chatInput.setFocused(true);
             return true;
         }
-        if (chatInput != null && keyCode == GLFW.GLFW_KEY_SLASH) {
+        if (keyCode == GLFW.GLFW_KEY_SLASH) {
             chatInput.setFocused(true);
             chatInput.setValue("/");
             chatInput.moveCursorToEnd();
@@ -786,6 +1103,21 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
         return super.keyPressed(keyCode, scanCode, modifiers);
     }
 
+    @Override
+    public boolean charTyped(char codePoint, int modifiers) {
+        return chatInput.isFocused() ? chatInput.charTyped(codePoint, modifiers) : super.charTyped(codePoint, modifiers);
+    }
+
+    @Override
+    public void tick() {
+        chatInput.tick();
+    }
+
+    @Override
+    public boolean shouldCloseOnEsc() {
+        return true;
+    }
+
     @Override
     public boolean isPauseScreen() {
         return false;
@@ -799,4 +1131,4 @@ public void removed() {
         GameruleClient.gamerulesMenuOpen = false;
         super.removed();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/solegendary/reignofnether/matchstart/ResultBanner.java b/src/main/java/com/solegendary/reignofnether/matchstart/ResultBanner.java
new file mode 100644
index 000000000..791ef679e
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/matchstart/ResultBanner.java
@@ -0,0 +1,43 @@
+package com.solegendary.reignofnether.matchstart;
+
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.ui.Text;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraftforge.client.event.RenderGuiEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+
+/** VICTORY / DEFEAT across the screen when your match ends, styled like the launcher's post-match title. */
+public final class ResultBanner {
+
+    private ResultBanner() { }
+
+    private static final long SHOW_MS = 5000;
+    // the launcher's gradients, top to bottom, and drop shadows
+    private static final int[] WIN = { 0xFFFEF481, 0xFFFBEB3C, 0xFFF19A0F, 0xFFDD6003 };
+    private static final int[] LOSS = { 0xFFE7E9F5, 0xFFB7BCD6, 0xFF8A5A6A, 0xFF6A2A2A };
+
+    private static long shownAt = -SHOW_MS;
+    private static boolean win;
+
+    public static void show(boolean victory) {
+        win = victory;
+        shownAt = System.currentTimeMillis();
+    }
+
+    @SubscribeEvent
+    public static void onRenderGui(RenderGuiEvent.Post evt) {
+        if (System.currentTimeMillis() - shownAt > SHOW_MS)
+            return;
+        GuiGraphics g = evt.getGuiGraphics();
+        var scale = HudGeometry.scale();
+        String s = I18n.get(win ? "titles.reignofnether.victory" : "titles.reignofnether.defeat");
+        float size = Text.px(88);
+        g.pose().pushPose();
+        g.pose().translate(0, 0, 500);
+        g.pose().scale(scale.poseScale(), scale.poseScale(), 1);
+        int w = Text.titleWidth(s, size);
+        Text.title(g, s, (scale.width() - w) / 2, scale.height() / 4, size, win ? WIN : LOSS, win ? 0xFF380000 : 0xFF000000);
+        g.pose().popPose();
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/minimap/MapColourServerEvents.java b/src/main/java/com/solegendary/reignofnether/minimap/MapColourServerEvents.java
new file mode 100644
index 000000000..67a17e438
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/minimap/MapColourServerEvents.java
@@ -0,0 +1,113 @@
+package com.solegendary.reignofnether.minimap;
+
+import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.fogofwar.FogOfWarServerEvents;
+import com.solegendary.reignofnether.loading.LoadProgress;
+import com.solegendary.reignofnether.player.PlayerServerEvents;
+import com.solegendary.reignofnether.registrars.PacketHandler;
+import com.solegendary.reignofnether.util.WorldState;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.border.WorldBorder;
+import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.network.PacketDistributor;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.Deflater;
+
+/**
+ * Draws the whole map of an RTS-optimised world once at load and sends it to each player as they join, so their
+ * minimap shows the whole play area from the start, even chunks their client has never had. Their client then keeps
+ * it up to date from the chunks it receives.
+ */
+public final class MapColourServerEvents {
+
+    private MapColourServerEvents() { }
+
+    public static final int STRIP = 16; // rows per packet: 1280 wide is ~60 KB raw, well under the packet limit
+
+    private static MapGrid grid = null;
+    private static List<byte[]> strips = List.of(); // compressed once, sent to every player
+    static {
+        WorldState.onServerReset(() -> {
+            grid = null;
+            strips = List.of();
+        });
+    }
+
+    /** The square the match setup map shows: the border, centred, as wide as its longest side. */
+    public static MapGrid gridFor(WorldBorder border) {
+        int size = (int) Math.ceil(Math.max(border.getMaxX() - border.getMinX(), border.getMaxZ() - border.getMinZ()));
+        int minX = (int) Math.floor((border.getMinX() + border.getMaxX()) / 2 - size / 2.0);
+        int minZ = (int) Math.floor((border.getMinZ() + border.getMaxZ()) / 2 - size / 2.0);
+        return new MapGrid(minX, minZ, size);
+    }
+
+    /** Loads every chunk in the border, which the navmesh and fog snapshot then reuse. On the server thread, at load. */
+    public static void build(ServerLevel level) {
+        MapGrid g = gridFor(level.getWorldBorder());
+        int cxMin = g.minX >> 4, cxMax = (g.minX + g.size - 1) >> 4;
+        int czMin = g.minZ >> 4, czMax = (g.minZ + g.size - 1) >> 4;
+        LoadProgress.map = g;
+        LoadProgress.begin(LoadProgress.Step.MAP, (cxMax - cxMin + 1) * (czMax - czMin + 1));
+        long startMs = System.currentTimeMillis();
+        BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
+        for (int cz = czMin; cz <= czMax; cz++) {
+            for (int cx = cxMin; cx <= cxMax; cx++) {
+                level.getChunk(cx, cz);
+                LoadProgress.done++;
+            }
+            int zFrom = Math.max(g.minZ, cz << 4), zTo = Math.min(g.minZ + g.size, (cz + 1) << 4);
+            for (int z = zFrom; z < zTo; z++)
+                for (int x = g.minX; x < g.minX + g.size; x++) // the top row has nothing loaded north of it to compare
+                    g.set(x, z, MapColours.column(level, x, z, z == g.minZ ? z : z - 1, pos));
+            g.rows = zTo - g.minZ;
+        }
+        grid = g;
+        strips = compress(g);
+        ReignOfNether.LOGGER.info("Drew the RTS map: {}x{} in {} ms", g.size, g.size, System.currentTimeMillis() - startMs);
+    }
+
+    private static List<byte[]> compress(MapGrid g) {
+        List<byte[]> out = new ArrayList<>();
+        for (int row = 0; row < g.size; row += STRIP) {
+            int rows = Math.min(STRIP, g.size - row);
+            byte[] raw = new byte[rows * g.size * 3];
+            for (int i = 0; i < rows * g.size; i++) {
+                int c = g.rgb[row * g.size + i];
+                raw[i * 3] = (byte) (c >> 16);
+                raw[i * 3 + 1] = (byte) (c >> 8);
+                raw[i * 3 + 2] = (byte) c;
+            }
+            Deflater deflater = new Deflater(Deflater.BEST_SPEED);
+            deflater.setInput(raw);
+            deflater.finish();
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream(raw.length / 4);
+            byte[] buf = new byte[8192];
+            while (!deflater.finished())
+                bytes.write(buf, 0, deflater.deflate(buf));
+            deflater.end();
+            out.add(bytes.toByteArray());
+        }
+        return out;
+    }
+
+    @SubscribeEvent
+    public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent evt) {
+        if (grid == null || !(evt.getEntity() instanceof ServerPlayer sp))
+            return;
+        // the picture is the world at load: in a resumed match with fog that could show enemy bases, so it waits
+        // ponytail: those players get only the chunks they receive; draw it from the fog snapshot if that matters
+        if (FogOfWarServerEvents.isEnabled() && PlayerServerEvents.isGameActive())
+            return;
+        for (int i = 0; i < strips.size(); i++)
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> sp),
+                    new MapColoursClientboundPacket(grid.minX, grid.minZ, grid.size, i * STRIP, strips.get(i)));
+    }
+
+    // statics outlive the world: clear them so the next world opened in this game starts clean
+}
diff --git a/src/main/java/com/solegendary/reignofnether/minimap/MapColours.java b/src/main/java/com/solegendary/reignofnether/minimap/MapColours.java
new file mode 100644
index 000000000..a68630996
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/minimap/MapColours.java
@@ -0,0 +1,68 @@
+package com.solegendary.reignofnether.minimap;
+
+import com.solegendary.reignofnether.util.MiscUtil;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.SnowLayerBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.material.MapColor;
+
+/**
+ * The colour of one column on the map, shaded for height and water depth. Shared by the client's minimap and the
+ * server, which draws the whole map once at load (MapColourServerEvents), so both paint the same picture.
+ */
+public final class MapColours {
+
+    private MapColours() { }
+
+    /** Plain RGB, before fog or border darkening. northZ is the row compared for slope shading (z itself at an edge). */
+    public static int column(Level level, int x, int z, int northZ, BlockPos.MutableBlockPos pos) {
+        int y = surfaceY(level, x, z, pos);
+        // a full snow layer reports the block above it as the surface
+        boolean snow = level.getBlockState(pos.set(x, y, z)).getBlock() instanceof SnowLayerBlock
+                || level.getBlockState(pos.set(x, y - 1, z)).getBlock() instanceof SnowLayerBlock;
+        int yNorth = surfaceY(level, x, northZ, pos);
+
+        pos.set(x, yNorth, northZ);
+        MapColor mat = level.getBlockState(pos).getMapColor(level, pos);
+        int rgb = mat.col;
+        if (snow)
+            rgb = 0xFFFFFF;
+
+        // shade blocks to give elevation effects, excluding liquids and nonblocking blocks (eg. grass, flowers)
+        if (level.getBlockState(pos).getFluidState().isEmpty()) {
+            if (yNorth > y)
+                rgb = MiscUtil.shadeHexRGB(rgb, 0.82F);
+            else if (yNorth < y)
+                rgb = MiscUtil.shadeHexRGB(rgb, 1.16F);
+        } else { // shade liquid based on depth
+            int depth = 0;
+            int depthMax = 20;
+            BlockState matBelow;
+            do {
+                depth += 1;
+                matBelow = level.getBlockState(pos.set(x, y - depth, z));
+            } while (!matBelow.getFluidState().isEmpty() && depth < depthMax);
+
+            // only reduce shade every nth step to have the map look sharper
+            depth = (int) (5 * (Math.ceil(Math.abs(depth / 5))));
+            rgb = MiscUtil.shadeHexRGB(rgb, 1.2F - (0.025F * depth));
+        }
+        return rgb;
+    }
+
+    // the highest solid or liquid block, or the top of a snow layer
+    private static int surfaceY(Level level, int x, int z, BlockPos.MutableBlockPos pos) {
+        int y = level.getChunkAt(pos.set(x, 0, z)).getHeight(Heightmap.Types.WORLD_SURFACE, x, z);
+        while (true) {
+            BlockState bs = level.getBlockState(pos.set(x, y, z));
+            if (bs.getBlock() instanceof SnowLayerBlock)
+                return y + (int) (bs.getValue(SnowLayerBlock.LAYERS) * (1.0F / 8.0F));
+            if (!bs.isSolid() && bs.getFluidState().isEmpty() && y > 0)
+                y -= 1;
+            else
+                return y;
+        }
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/minimap/MapColoursClientboundPacket.java b/src/main/java/com/solegendary/reignofnether/minimap/MapColoursClientboundPacket.java
new file mode 100644
index 000000000..4f42654ad
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/minimap/MapColoursClientboundPacket.java
@@ -0,0 +1,81 @@
+package com.solegendary.reignofnether.minimap;
+
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.network.NetworkEvent;
+
+import java.util.function.Supplier;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
+
+/** A strip of the map the server drew at load: deflated RGB, three bytes a column. */
+public class MapColoursClientboundPacket {
+    private final int minX;
+    private final int minZ;
+    private final int size;
+    private final int row;
+    private final byte[] data;
+
+    public MapColoursClientboundPacket(int minX, int minZ, int size, int row, byte[] data) {
+        this.minX = minX;
+        this.minZ = minZ;
+        this.size = size;
+        this.row = row;
+        this.data = data;
+    }
+
+    public MapColoursClientboundPacket(FriendlyByteBuf buffer) {
+        this.minX = buffer.readInt();
+        this.minZ = buffer.readInt();
+        this.size = buffer.readVarInt();
+        this.row = buffer.readVarInt();
+        this.data = buffer.readByteArray();
+    }
+
+    public void encode(FriendlyByteBuf buffer) {
+        buffer.writeInt(this.minX);
+        buffer.writeInt(this.minZ);
+        buffer.writeVarInt(this.size);
+        buffer.writeVarInt(this.row);
+        buffer.writeByteArray(this.data);
+    }
+
+    /** The strip's colours, or null if it doesn't fit the map it claims to be part of. */
+    private int[] decode() {
+        if (size <= 0 || size > 4096 || row < 0 || row >= size)
+            return null;
+        int rows = Math.min(MapColourServerEvents.STRIP, size - row);
+        byte[] raw = new byte[rows * size * 3];
+        Inflater inflater = new Inflater();
+        try {
+            inflater.setInput(data);
+            int n = 0;
+            while (n < raw.length && !inflater.finished()) {
+                int got = inflater.inflate(raw, n, raw.length - n);
+                if (got == 0 && (inflater.needsInput() || inflater.needsDictionary()))
+                    break;
+                n += got;
+            }
+            if (n != raw.length)
+                return null;
+        } catch (DataFormatException e) {
+            return null;
+        } finally {
+            inflater.end();
+        }
+        int[] rgb = new int[rows * size];
+        for (int i = 0; i < rgb.length; i++)
+            rgb[i] = (raw[i * 3] & 0xFF) << 16 | (raw[i * 3 + 1] & 0xFF) << 8 | raw[i * 3 + 2] & 0xFF;
+        return rgb;
+    }
+
+    public void handle(Supplier<NetworkEvent.Context> ctx) {
+        ctx.get().enqueueWork(() -> DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
+            int[] rgb = decode();
+            if (rgb != null)
+                MinimapClientEvents.receiveMapStrip(minX, minZ, size, row, rgb);
+        }));
+        ctx.get().setPacketHandled(true);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/minimap/MapGrid.java b/src/main/java/com/solegendary/reignofnether/minimap/MapGrid.java
new file mode 100644
index 000000000..9385462be
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/minimap/MapGrid.java
@@ -0,0 +1,29 @@
+package com.solegendary.reignofnether.minimap;
+
+/** A square of map colours (RGB, row-major from minX/minZ), filled row by row. */
+public final class MapGrid {
+
+    public final int minX, minZ, size;
+    public final int[] rgb;
+    // rows filled so far, top down; read from another thread by the loading screen
+    public volatile int rows = 0;
+
+    public MapGrid(int minX, int minZ, int size) {
+        this.minX = minX;
+        this.minZ = minZ;
+        this.size = size;
+        this.rgb = new int[size * size];
+    }
+
+    public boolean contains(int x, int z) {
+        return x >= minX && z >= minZ && x < minX + size && z < minZ + size;
+    }
+
+    public int get(int x, int z) {
+        return rgb[(z - minZ) * size + (x - minX)];
+    }
+
+    public void set(int x, int z, int colour) {
+        rgb[(z - minZ) * size + (x - minX)] = colour;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/minimap/MinimapClientEvents.java b/src/main/java/com/solegendary/reignofnether/minimap/MinimapClientEvents.java
index 1d040b14e..30ed44666 100644
--- a/src/main/java/com/solegendary/reignofnether/minimap/MinimapClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/minimap/MinimapClientEvents.java
@@ -1,7 +1,7 @@
 package com.solegendary.reignofnether.minimap;
 
+import com.solegendary.reignofnether.config.ReignOfNetherClientConfigs;
 import com.mojang.blaze3d.platform.NativeImage;
-import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
 import com.mojang.datafixers.util.Pair;
 import com.solegendary.reignofnether.ReignOfNether;
@@ -12,12 +12,14 @@
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.building.addon.RangeIndicatorAddon;
 import com.solegendary.reignofnether.building.buildings.shared.AbstractBridge;
-import com.solegendary.reignofnether.config.ReignOfNetherClientConfigs;
 import com.solegendary.reignofnether.cursor.CursorClientEvents;
 import com.solegendary.reignofnether.fogofwar.FogOfWarClientEvents;
 import com.solegendary.reignofnether.guiscreen.TopdownGui;
 import com.solegendary.reignofnether.hud.buttons.Button;
 import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.hud.panels.MapZoom;
+import com.solegendary.reignofnether.ui.Icon;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
 import com.solegendary.reignofnether.keybinds.Keybindings;
 import com.solegendary.reignofnether.matchstart.MatchStartScreen;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
@@ -36,9 +38,9 @@
 import com.solegendary.reignofnether.util.MiscUtil;
 import com.solegendary.reignofnether.util.MyMath;
 import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.DynamicTexture;
@@ -57,7 +59,6 @@
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.client.event.RenderGuiOverlayEvent;
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -78,16 +79,24 @@
 
 public class MinimapClientEvents {
 
+    static {
+        WorldState.onClientReset(() -> {
+            clearVirtualUnits();
+            clearKnownMap();
+        });
+    }
+
     private static final Minecraft MC = Minecraft.getInstance();
     private static int worldRadius = 100; // how many world blocks should be mapped
     private static int mapGuiRadius = 50; // actual size on the screen
-    public static final int CORNER_OFFSET = 10;
-    public static final int BG_OFFSET = 6;
+    // bottom-right corner of the map in GUI coordinates, set from the HUD layout every frame
+    private static float mapRight = 0;
+    private static float mapBottom = 0;
 
+    // ponytail: terrain cost grows with the area, so the last step is 1.5x rather than double; raise it if 360 stays smooth
+    private static final int[] MAP_RADII = { 120, 240, 360 };
     private static boolean largeMap = false;
     public static boolean isLargeMap() { return largeMap; }
-    private static boolean shouldToggleSize = false;
-    private static boolean markerMode = false;
 
     private static final int UNIT_RADIUS = 3;
     private static final int UNIT_THICKNESS = 1;
@@ -95,8 +104,6 @@ public class MinimapClientEvents {
     private static final int PLAYER_THICKNESS = 1;
     private static final int START_POS_RADIUS = 7;
     private static final int START_POS_THICKNESS = 2;
-    private static final int MARKER_RADIUS = 16;
-    private static final int MARKER_THICKNESS = 3;
     private static final int MARKER_PIXEL_OFFSET = 4; // shift rendered marker to better align with cursor
 
     // rate-limit teleporting from dragging the minimap to prevent being kicked from packet spamming
@@ -122,10 +129,10 @@ public class MinimapClientEvents {
 
     private static int xc_world = 0; // world pos x centre, maps to xc
     private static int zc_world = 0; // world pos zcentre, maps to yc
-    private static float xl, xc, xr, yt, yc, yb;
+    private static float xc, yc;
 
     public static final ArrayList<VirtualUnit> virtualUnits = new ArrayList<>();
-    public static final ArrayList<MapMarker> mapMarkers = new ArrayList<>();
+    public static final ArrayList<MapMarker> mapMarkers = WorldState.client(new ArrayList<>());
 
     // last known position of neutral units in fog
     public static final ArrayList<VirtualUnit> neutralFogUnits = new ArrayList<>();
@@ -134,15 +141,14 @@ public class MinimapClientEvents {
     private static final float EXTRA_DARK = 0.10f;
 
     private static boolean lockedMap = false; // does map follow when moving offscreen?
-    private static boolean highlightAnimals = false; // apply glow effect (clientside only) to animals
-    private static boolean underlineUnitsAndBuildings = true; // underline units and buildings
-
+    // apply glow effect (clientside only) to animals
     public static boolean shouldHighlightAnimals() {
-        return highlightAnimals;
+        return ReignOfNetherClientConfigs.HIGHLIGHT_ANIMALS.get();
     }
 
+    // underline units and buildings
     public static boolean shouldUnderline() {
-        return underlineUnitsAndBuildings;
+        return ReignOfNetherClientConfigs.UNDERLINES.get();
     }
 
     public static void addNeutralFogUnit(int id, Vector3f vec3fMin, Vector3f vec3fMax) {
@@ -179,7 +185,7 @@ public static void clearVirtualUnits() {
         neutralFogUnits.clear();
     }
 
-    private static class MapMarker {
+    public static class MapMarker {
         public final int x;
         public final int z;
         public final String playerName;
@@ -206,17 +212,9 @@ public static void addMapMarker(int x, int z, String playerName) {
     }
 
     public static void addMapMarkerForSelfAndAllies(int mouseX, int mouseY) {
-        if (Keybindings.altMod.isDown()){
-            mouseX += 2;
-            mouseY += 1;
-        } else {
-            mouseX -= 1;
-            mouseY += 1;
-        }
         BlockPos markerPos = getWorldPosOnMinimap(mouseX, mouseY, false);
-        if (markerPos != null) {
+        if (markerPos != null)
             PacketHandler.INSTANCE.sendToServer(new MapMarkerServerboundPacket(markerPos.getX(), markerPos.getZ()));
-        }
     }
 
     public static void removeVirtualUnit(int id) {
@@ -240,10 +238,6 @@ public static void setMapCentre(double x, double z) {
         }
     }
 
-    public static int getMapGuiRadius() {
-        return mapGuiRadius;
-    }
-
     public static int getWorldRadius() {
         return worldRadius;
     }
@@ -256,43 +250,69 @@ public static int getMapCentreWorldZ() {
         return zc_world;
     }
 
+    // the whole map as last known: the server's drawing from load, kept up to date from chunks as they arrive
+    private static MapGrid knownMap = null;
+
+    public static MapGrid getKnownMap() {
+        return knownMap;
+    }
+
+    public static void receiveMapStrip(int minX, int minZ, int size, int row, int[] rgb) {
+        if (knownMap == null || knownMap.minX != minX || knownMap.minZ != minZ || knownMap.size != size)
+            knownMap = new MapGrid(minX, minZ, size);
+        System.arraycopy(rgb, 0, knownMap.rgb, row * size, rgb.length);
+        knownMap.rows = Math.max(knownMap.rows, row + rgb.length / size);
+        forceUpdateAllPartitions = true;
+    }
+
+    public static void clearKnownMap() {
+        knownMap = null;
+    }
+
     public static boolean isMapReady() {
         return mapTexture != null && mapTexLoc != null;
     }
 
+    /**
+     * The square of the world shown by the match setup map, in blocks: {minX, minZ, size}. The playable
+     * area (world border) when the mapped texture covers it, so the map is centred on it with no unmapped
+     * edges; otherwise the whole mapped area.
+     */
+    private static int[] playArea() {
+        int texMinX = xc_world - worldRadius;
+        int texMinZ = zc_world - worldRadius;
+        int tex = worldRadius * 2;
+        if (MC.level != null) {
+            var border = MC.level.getWorldBorder();
+            int size = (int) Math.ceil(Math.max(border.getMaxX() - border.getMinX(), border.getMaxZ() - border.getMinZ()));
+            int minX = (int) Math.floor((border.getMinX() + border.getMaxX()) / 2 - size / 2.0);
+            int minZ = (int) Math.floor((border.getMinZ() + border.getMaxZ()) / 2 - size / 2.0);
+            if (minX >= texMinX && minZ >= texMinZ && minX + size <= texMinX + tex && minZ + size <= texMinZ + tex)
+                return new int[] { minX, minZ, size };
+        }
+        return new int[] { texMinX, texMinZ, tex };
+    }
+
+    /** Draws the playable area of the map, north up, into the rectangle. */
     public static void renderMapInto(GuiGraphics g, int x, int y, int w, int h) {
         if (mapTexture == null || mapTexLoc == null) return;
         int tex = worldRadius * 2;
-        g.blit(mapTexLoc, x, y, w, h, 0, 0, tex, tex, tex, tex);
+        int[] area = playArea();
+        int u = area[0] - (xc_world - worldRadius);
+        int v = area[1] - (zc_world - worldRadius);
+        g.blit(mapTexLoc, x, y, w, h, u, v, area[2], area[2], tex, tex);
     }
 
-    public static Vector2f worldToRect(int worldX, int worldZ,
-                                                int rectX, int rectY, int rectW, int rectH) {
-        int centreX = xc_world;
-        int centreZ = zc_world;
-        int span = worldRadius * 2;
-        float u = (worldX - (centreX - worldRadius)) / (float) span;
-        float v = (worldZ - (centreZ - worldRadius)) / (float) span;
+    public static Vector2f worldToRect(int worldX, int worldZ, float rectX, float rectY, float rectW, float rectH) {
+        int[] area = playArea();
+        float u = (worldX - area[0]) / (float) area[2];
+        float v = (worldZ - area[1]) / (float) area[2];
         return new Vector2f(rectX + u * rectW, rectY + v * rectH);
     }
 
-    public static BlockPos rectToWorld(int sx, int sy,
-                                                          int rectX, int rectY, int rectW, int rectH) {
-        float u = (sx - rectX) / (float) Math.max(1, rectW);
-        float v = (sy - rectY) / (float) Math.max(1, rectH);
-        int span = worldRadius * 2;
-        int wx = (int) (xc_world - worldRadius + u * span);
-        int wz = (int) (zc_world - worldRadius + v * span);
-        int y = 64;
-        if (MC.level != null) {
-            y = MC.level.getHeight(Heightmap.Types.MOTION_BLOCKING, wx, wz);
-        }
-        return new BlockPos(wx, y, wz);
-    }
-
     public static void setLargeMap(boolean large) {
         if (largeMap != large) {
-            toggleMapSize();
+            setWideStep(large ? 1 : 0);
         }
     }
 
@@ -312,15 +332,10 @@ public static boolean isMapLocked() {
 
     public static boolean suppressViewQuad = false;
 
-    private static void toggleMapSize() {
-        largeMap = !largeMap;
-        if (largeMap) {
-            worldRadius = 240;
-            mapGuiRadius = 120;
-        } else {
-            worldRadius = 120;
-            mapGuiRadius = 60;
-        }
+    private static void setWideStep(int step) {
+        largeMap = step > 0;
+        // the on-screen size comes from the HUD layout, see updateScreenGeometry()
+        worldRadius = MAP_RADII[step];
         if (mapTexLoc != null)
             Minecraft.getInstance().textureManager.release(mapTexLoc); // also closes the old DynamicTexture
         mapTexture = new DynamicTexture(worldRadius * 2, worldRadius * 2, true);
@@ -334,46 +349,10 @@ private static void toggleMapSize() {
         forceUpdateAllPartitions = true;
     }
 
-    public static Button getToggleSizeButton() {
-        return new Button(largeMap ? "Close" : "Open large map",
-                14,
-                largeMap
-                        ? ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/barrier.png")
-                        : ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/map.png"),
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
-                Keybindings.minimapToggle,
-                () -> false,
-                () -> !TutorialClientEvents.isAtOrPastStage(TutorialStage.MINIMAP_CLICK),
-                () -> true,
-                () -> shouldToggleSize = true,
-                null,
-                List.of(fcs(largeMap
-                        ? I18n.get("hud.map.reignofnether.close")
-                        : I18n.get("hud.map.reignofnether.open")))
-        );
-    }
-
-    public static Button getMarkerModeButton() {
-        return new Button("Marker",
-                14,
-                ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/target_top.png"),
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
-                null,
-                () -> markerMode,
-                () -> !Keybindings.altMod.isDown() && !isLargeMap(),
-                () -> Keybindings.altMod.isDown() || isLargeMap(),
-                () -> markerMode = !markerMode,
-                null,
-                List.of(markerMode
-                        ? fcs(I18n.get("hud.map.reignofnether.marker_mode_enabled"))
-                        : fcs(I18n.get("hud.map.reignofnether.marker_mode_disabled")))
-        );
-    }
-
     public static Button getCamSensitivityButton() {
         return new Button("Camera Sensitivity",
                 14,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_front.png"),
+                Icon.SLIDERS.texture,
                 ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
                 null,
                 () -> false,
@@ -406,6 +385,7 @@ public static Button getNightCirclesModeButton() {
                     } else if (nightCircleMode == NightCircleMode.OFF) {
                         nightCircleMode = NightCircleMode.ALL;
                     }
+                    ReignOfNetherClientConfigs.NIGHT_CIRCLES.set(nightCircleMode);
                     for (BuildingPlacement building : BuildingClientEvents.getBuildings()) {
                         RangeIndicatorAddon ria;
                         if ((ria = building.getBuilding().getActiveAddon(RangeIndicatorAddon.class)) != null)
@@ -424,9 +404,7 @@ public static Button getNightCirclesModeButton() {
     public static Button getMapLockButton() {
         return new Button("Lock Map",
                 14,
-                lockedMap ?
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/chain_command_block_front.png") :
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/chain_command_block_front_dark.png"),
+                lockedMap ? Icon.LOCK.texture : Icon.UNLOCK.texture,
                 ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
                 null,
                 () -> false,
@@ -448,19 +426,15 @@ public static Button getMapLockButton() {
     public static Button getHighlightAnimalsButton() {
         return new Button("Highlight Animals",
                 14,
-                highlightAnimals ?
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/mobheads/sheep.png") :
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/mobheads/sheep_dark.png"),
+                Icon.PAW.texture,
                 ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
                 null,
-                () -> false,
+                MinimapClientEvents::shouldHighlightAnimals,
                 () -> !TutorialClientEvents.isAtOrPastStage(TutorialStage.MINIMAP_CLICK) || !largeMap,
                 () -> true,
-                () -> {
-                    highlightAnimals = !highlightAnimals;
-                },
+                () -> ReignOfNetherClientConfigs.HIGHLIGHT_ANIMALS.set(!shouldHighlightAnimals()),
                 null,
-                List.of(fcs(highlightAnimals
+                List.of(fcs(shouldHighlightAnimals()
                         ? I18n.get("hud.map.reignofnether.highlight_animals.enabled")
                         : I18n.get("hud.map.reignofnether.highlight_animals.disabled"))
                 )
@@ -470,7 +444,7 @@ public static Button getHighlightAnimalsButton() {
     public static Button getToggleUnderlinesButton() {
         return new Button("Toggle Underlines",
                 14,
-                underlineUnitsAndBuildings ?
+                shouldUnderline() ?
                         ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/dirt_green_diamond.png") :
                         ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/dirt_dark.png"),
                 ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
@@ -478,9 +452,9 @@ public static Button getToggleUnderlinesButton() {
                 () -> false,
                 () -> !TutorialClientEvents.isAtOrPastStage(TutorialStage.MINIMAP_CLICK) || !largeMap,
                 () -> true,
-                () -> underlineUnitsAndBuildings = !underlineUnitsAndBuildings,
+                () -> ReignOfNetherClientConfigs.UNDERLINES.set(!shouldUnderline()),
                 null,
-                List.of(fcs(underlineUnitsAndBuildings
+                List.of(fcs(shouldUnderline()
                         ? I18n.get("hud.map.reignofnether.underlines.enabled")
                         : I18n.get("hud.map.reignofnether.underlines.disabled"))
                 )
@@ -490,12 +464,12 @@ public static Button getToggleUnderlinesButton() {
     public static Button getCameraRotateCWButton() {
         return new Button("Rotate camera clockwise",
                 14,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/rotate_cw.png"),
+                Icon.REDO.texture,
                 ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
                 Keybindings.rotCW,
                 () -> false,
-                () -> !Keybindings.altMod.isDown() && !isLargeMap(),
-                () -> Keybindings.altMod.isDown() || isLargeMap(),
+                () -> false, // has its own tile in the HUD's minimap tools
+                () -> true,
                 () -> OrthoviewClientEvents.fixedRotateCam(true),
                 null,
                 List.of(
@@ -508,12 +482,12 @@ public static Button getCameraRotateCWButton() {
     public static Button getCameraRotateCCWButton() {
         return new Button("Rotate camera counter-clockwise",
                 14,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/rotate_ccw.png"),
+                Icon.UNDO.texture,
                 ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
                 Keybindings.rotCCW,
                 () -> false,
-                () -> !Keybindings.altMod.isDown() && !isLargeMap(),
-                () -> Keybindings.altMod.isDown() || isLargeMap(),
+                () -> false, // has its own tile in the HUD's minimap tools
+                () -> true,
                 () -> OrthoviewClientEvents.fixedRotateCam(false),
                 null,
                 List.of(
@@ -639,66 +613,15 @@ private static void updateMapTerrain(int partition, int darkPartition) {
                     }
                 }
 
-                int y = MC.level.getChunkAt(pos.set(x, 0, z)).getHeight(Heightmap.Types.WORLD_SURFACE, x, z);
-                BlockState bs;
-                do {
-                    bs = MC.level.getBlockState(pos.set(x, y, z));
-                    if (bs.getBlock() instanceof SnowLayerBlock) {
-                        int layers = bs.getValue(SnowLayerBlock.LAYERS);
-                        y += (int) (layers * (1.0F / 8.0F));
-                        break;
-                    }
-                    if (!bs.isSolid() && bs.getFluidState().isEmpty() && y > 0) {
-                        y -= 1;
-                    } else {
-                        break;
-                    }
-                } while (true);
-
-                int yNorth = MC.level.getChunkAt(pos.set(x, 0, z - 1))
-                        .getHeight(Heightmap.Types.WORLD_SURFACE, x, z - 1);
-                BlockState bsNorth;
-                do {
-                    bsNorth = MC.level.getBlockState(pos.set(x, yNorth, z - 1));
-                    if (bsNorth.getBlock() instanceof SnowLayerBlock) {
-                        int layersNorth = bsNorth.getValue(SnowLayerBlock.LAYERS);
-                        yNorth += (int) (layersNorth * (1.0F / 8.0F));
-                        break;
-                    }
-                    if (!bsNorth.isSolid() && bsNorth.getFluidState().isEmpty() && yNorth > 0) {
-                        yNorth -= 1;
-                    } else {
-                        break;
-                    }
-                } while (true);
-
-                pos.set(x, yNorth, z - 1);
-                MapColor mat = MC.level.getBlockState(pos).getMapColor(MC.level, pos);
-                int rgb = mat.col;
-                if (bs.getBlock() instanceof SnowLayerBlock) {
-                    rgb = 0xFFFFFF;
-                }
-
-                // shade blocks to give elevation effects, excluding liquids and nonblocking blocks (eg. grass, flowers)
-                if (MC.level.getBlockState(pos).getFluidState().isEmpty()) {
-                    if (yNorth > y) {
-                        rgb = MiscUtil.shadeHexRGB(rgb, 0.82F);
-                    } else if (yNorth < y) {
-                        rgb = MiscUtil.shadeHexRGB(rgb, 1.16F);
-                    }
-                } else { // shade liquid based on depth
-                    int depth = 0;
-                    int depthMax = 20;
-                    BlockState matBelow;
-                    do {
-                        depth += 1;
-                        matBelow = MC.level.getBlockState(pos.set(x, y - depth, z));
-                    } while (!matBelow.getFluidState().isEmpty() && depth < depthMax);
-
-                    // only reduce shade every nth step to have the map look sharper
-                    depth = (int) (5 * (Math.ceil(Math.abs(depth / 5))));
-
-                    rgb = MiscUtil.shadeHexRGB(rgb, 1.2F - (0.025F * depth));
+                // a chunk the client doesn't have keeps the colour last known for it, from the server's map or from
+                // when it was loaded, instead of drawing void
+                int rgb;
+                if (MC.level.getChunkSource().hasChunk(x >> 4, chunkZ)) {
+                    rgb = MapColours.column(MC.level, x, z, z - 1, pos);
+                    if (knownMap != null && knownMap.contains(x, z))
+                        knownMap.set(x, z, rgb);
+                } else {
+                    rgb = knownMap != null && knownMap.contains(x, z) ? knownMap.get(x, z) : 0;
                 }
 
                 // normalise xz's to colour array ranges
@@ -730,8 +653,8 @@ private static void updateNightCircles() {
 
             int xc = ns.getFirst().getX() + (7 / 2);
             int zc = ns.getFirst().getZ() + (7 / 2);
-            int xN = xc - xc_world + (mapGuiRadius * 2);
-            int zN = zc - zc_world + (mapGuiRadius * 2);
+            int xN = xc - xc_world + worldRadius;
+            int zN = zc - zc_world + worldRadius;
 
             nightSources.add(new Pair<>(new BlockPos(xN, 0, zN), ns.getSecond()));
         }
@@ -877,8 +800,8 @@ private static void drawBuildingOnMap(int xc, int zc, int color, int radius, int
                             ? 0x000000
                             : color;
 
-                    int xN = x - xc_world + (mapGuiRadius * 2);
-                    int zN = z - zc_world + (mapGuiRadius * 2);
+                    int xN = x - xc_world + worldRadius;
+                    int zN = z - zc_world + worldRadius;
 
                     mapColoursOverlays[xN][zN] = MiscUtil.reverseHexRGB(rgb) | (0xFF << 24);
                 }
@@ -899,8 +822,8 @@ private static void drawUnitOnMap(int xc, int zc, int color) {
                             ? 0x000000
                             : color;
 
-                    int xN = x - xc_world + (mapGuiRadius * 2);
-                    int zN = z - zc_world + (mapGuiRadius * 2);
+                    int xN = x - xc_world + worldRadius;
+                    int zN = z - zc_world + worldRadius;
 
                     mapColoursOverlays[xN][zN] = MiscUtil.reverseHexRGB(rgb) | (0xFF << 24);
                 }
@@ -935,8 +858,8 @@ private static void drawPlayerOnMap(int xc, int zc, Player player) {
                         else
                             rgb = 0xFF0000;
                     }
-                    int xN = x - xc_world + (mapGuiRadius * 2);
-                    int zN = z - zc_world + (mapGuiRadius * 2);
+                    int xN = x - xc_world + worldRadius;
+                    int zN = z - zc_world + worldRadius;
 
                     mapColoursOverlays[xN][zN] = MiscUtil.reverseHexRGB(rgb) | (0xFF << 24);
                 }
@@ -968,8 +891,8 @@ private static void drawStartingPosesOnMap() {
                             //    rgb = 0xFFFF00;
                             rgb = startPos.getHexColor();
                         }
-                        int xN = x - xc_world + (mapGuiRadius * 2);
-                        int zN = z - zc_world + (mapGuiRadius * 2);
+                        int xN = x - xc_world + worldRadius;
+                        int zN = z - zc_world + worldRadius;
 
                         mapColoursOverlays[xN][zN] = MiscUtil.reverseHexRGB(rgb) | (0xFF << 24);
                     }
@@ -980,51 +903,42 @@ private static void drawStartingPosesOnMap() {
 
     /** Converts a world XZ coordinate to a minimap screen XY position (centre of that pixel). */
     public static Vec2 worldPosToMinimapScreen(int worldX, int worldZ) {
-        float pixelsToBlocks = (float) worldRadius / (float) mapGuiRadius;
-
-        // normalised offset from map centre in pixels (pre-rotation)
-        float dx = (worldX - xc_world) / pixelsToBlocks;
-        float dz = (worldZ - zc_world) / pixelsToBlocks;
-
-        if (ReignOfNetherClientConfigs.SQUARE_MINIMAP.get()) {
-            // square mode: same -45° rotation as the diamond, but with the rotated quad
-            // circumscribing the visible square (content zoom = SQUARE_CONTENT_SCALE)
-            Vec2 rotated = MyMath.rotateCoords(
-                (float) (dx / Math.sqrt(2) * SQUARE_CONTENT_SCALE),
-                (float) (dz / Math.sqrt(2) * SQUARE_CONTENT_SCALE),
-                -45
-            );
-            return new Vec2(xc + rotated.x, yc + rotated.y);
-        }
+        float d = contentRadius();
+        float u = (worldX + 0.5f - xc_world) / worldRadius;
+        float v = (worldZ + 0.5f - zc_world) / worldRadius;
+        return new Vec2(xc + d * (u + v) / 2, yc + d * (v - u) / 2);
+    }
 
-        // rotate -45° to go from axis-aligned → diamond orientation
-        Vec2 rotated = MyMath.rotateCoords((float) (dx / Math.sqrt(2)), (float) (dz / Math.sqrt(2)), -45);
+    /**
+     * Half-diagonal the whole map texture would have on screen. The texture is turned 45 degrees to match
+     * the camera; at zoom 1 it fills the diamond frame, zoomed in only its middle is drawn.
+     */
+    private static float contentRadius() {
+        // the square frame is filled by a texture twice the diamond's size
+        return (isSquare() ? 2 : 1) * ZOOM.value() * mapGuiRadius;
+    }
 
-        return new Vec2(xc + rotated.x, yc + rotated.y);
+    /** Square frame (the corners of the turned map are cut off) instead of the diamond; a client setting. */
+    public static boolean isSquare() {
+        return ReignOfNetherClientConfigs.SQUARE_MINIMAP.get();
     }
 
+    /** The HUD minimap's zoom: 1 shows the whole map. */
+    public static final MapZoom ZOOM = new MapZoom(1f).withWideSteps(MAP_RADII.length - 1, MinimapClientEvents::setWideStep);
+
     private static void drawMapMarker(MapMarker marker) {
         int xc = marker.x;
         int zc = marker.z;
-        int color = getPulsingMarkerColor(marker);
+        int color = PlayerColors.getPlayerDisplayColorHex(marker.playerName) & 0xFFFFFF;
         float alphaPulse = MiscUtil.getOscillatingFloat(0.45d, 1.0d, marker.ageTicks * 35L);
         int alpha = Mth.clamp((int) (alphaPulse * 255f), 90, 255);
 
-        for (int x = xc - MARKER_RADIUS; x < xc + MARKER_RADIUS; x++) {
-            for (int z = zc - MARKER_RADIUS; z < zc + MARKER_RADIUS; z++) {
+        for (int x = xc - PING_RADIUS - 1; x <= xc + PING_RADIUS + 1; x++) {
+            for (int z = zc - PING_RADIUS - 1; z <= zc + PING_RADIUS + 1; z++) {
                 if (isWorldXZinsideMap(x, z)) {
-                    double dist = Math.sqrt(Math.pow(x - xc, 2) + Math.pow(z - zc, 2));
-
-                    boolean draw = false;
-
-                    // Draw concentric rings
-                    if (dist > MARKER_RADIUS - MARKER_THICKNESS && dist < MARKER_RADIUS) draw = true;
-                    if (dist > MARKER_RADIUS * 0.6 - MARKER_THICKNESS && dist < MARKER_RADIUS * 0.6) draw = true;
-                    if (dist > MARKER_RADIUS * 0.2 - MARKER_THICKNESS && dist < MARKER_RADIUS * 0.2) draw = true;
-
-                    if (draw) {
-                        int xN = x - xc_world + (mapGuiRadius * 2) + MARKER_PIXEL_OFFSET;
-                        int zN = z - zc_world + (mapGuiRadius * 2);
+                    if (isMarkerPixel(x - xc, z - zc)) {
+                        int xN = x - xc_world + worldRadius + MARKER_PIXEL_OFFSET;
+                        int zN = z - zc_world + worldRadius;
                         if (xN >= 0 && xN < mapColoursOverlays.length && zN >= 0 && zN < mapColoursOverlays[0].length) {
                             mapColoursOverlays[xN][zN] = MiscUtil.reverseHexRGB(color) | (alpha << 24);
                         }
@@ -1034,15 +948,13 @@ private static void drawMapMarker(MapMarker marker) {
         }
     }
 
-    private static int getPulsingMarkerColor(MapMarker marker) {
-        int baseColor = PlayerColors.getPlayerDisplayColorHex(marker.playerName);
-        float pulse = MiscUtil.getOscillatingFloat(0.35d, 1.0d, marker.ageTicks * 25L);
-
-        int r = Mth.clamp((int) (((baseColor >> 16) & 0xFF) * pulse), 0, 255);
-        int g = Mth.clamp((int) (((baseColor >> 8) & 0xFF) * pulse), 0, 255);
-        int b = Mth.clamp((int) ((baseColor & 0xFF) * pulse), 0, 255);
+    private static final int PING_RADIUS = 9;    // marker shapes, in map texture pixels
+    private static final double PING_THICKNESS = 2.5;
 
-        return (r << 16) | (g << 8) | b;
+    // a ring with a dot in the middle
+    static boolean isMarkerPixel(int dx, int dz) {
+        double d = Math.sqrt(dx * dx + dz * dz);
+        return (d > PING_RADIUS - PING_THICKNESS && d <= PING_RADIUS) || d <= PING_THICKNESS;
     }
 
 
@@ -1056,153 +968,93 @@ private static void renderMap(GuiGraphics guiGraphics) {
         PoseStack stack = guiGraphics.pose();
         Matrix4f matrix4f = stack.last().pose();
 
-        // place vertices in a diamond shape - left, centre, right, top, centre, bottom
-        // map vertex coordinates (left, centre, right, top, centre, bottom)
-        xl = MC.getWindow().getGuiScaledWidth() - (mapGuiRadius * 2) - CORNER_OFFSET;
-        xc = MC.getWindow().getGuiScaledWidth() - mapGuiRadius - CORNER_OFFSET;
-        xr = MC.getWindow().getGuiScaledWidth() - CORNER_OFFSET;
-        yt = MC.getWindow().getGuiScaledHeight() - (mapGuiRadius * 2) - CORNER_OFFSET;
-        yc = MC.getWindow().getGuiScaledHeight() - mapGuiRadius - CORNER_OFFSET;
-        yb = MC.getWindow().getGuiScaledHeight() - CORNER_OFFSET;
-
-        if (ReignOfNetherClientConfigs.SQUARE_MINIMAP.get()) {
-            renderSquareMap(guiGraphics, matrix4f);
-            return;
+        // diamond frame, the map turned 45 degrees like the camera view
+        updateScreenGeometry();
+        xc = mapRight - mapGuiRadius;
+        yc = mapBottom - mapGuiRadius;
+
+        if (isSquare()) {
+            guiGraphics.enableScissor(Math.round(xc - mapGuiRadius), Math.round(yc - mapGuiRadius),
+                    Math.round(xc + mapGuiRadius), Math.round(yc + mapGuiRadius));
+            drawMapTexture(matrix4f, xc, yc, contentRadius(), 1);
+            guiGraphics.disableScissor();
+        } else {
+            drawMapTexture(matrix4f, xc, yc, mapGuiRadius, ZOOM.value());
         }
+        renderPingPulses(guiGraphics);
+    }
 
-        // background vertex coords need to be slightly larger
-        float xl_bg = xl - BG_OFFSET;
-        float xc_bg = xc;
-        float xr_bg = xr + BG_OFFSET;
-        float yt_bg = yt - BG_OFFSET;
-        float yc_bg = yc;
-        float yb_bg = yb + BG_OFFSET;
-
-        // render map background first
-        ResourceLocation iconFrameResource = ResourceLocation.fromNamespaceAndPath(
-            ReignOfNether.MOD_ID,
-            "textures/hud/map_background.png"
-        );
-        RenderSystem.setShaderTexture(0, iconFrameResource);
-        // code taken from GuiComponent.blit()
-        RenderSystem.setShader(GameRenderer::getPositionTexShader);
-        BufferBuilder bufferbuilder = Tesselator.getInstance().getBuilder();
-        bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX);
-        bufferbuilder.vertex(matrix4f, xc_bg, yb_bg, 0.0F).uv(0.0F, 1.0F).endVertex();
-        bufferbuilder.vertex(matrix4f, xr_bg, yc_bg, 0.0F).uv(1.0F, 1.0F).endVertex();
-        bufferbuilder.vertex(matrix4f, xc_bg, yt_bg, 0.0F).uv(1.0F, 0.0F).endVertex();
-        bufferbuilder.vertex(matrix4f, xl_bg, yc_bg, 0.0F).uv(0.0F, 0.0F).endVertex();
-
-        BufferUploader.drawWithShader(bufferbuilder.end());
-
-        // render map itself
-        MultiBufferSource.BufferSource buffer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        VertexConsumer consumer = buffer.getBuffer(mapRenderType);
-        consumer.vertex(matrix4f, xc, yb, 0.0F).color(255, 255, 255, 255).uv(0.0F, 1.0F).uv2(255).endVertex();
-        consumer.vertex(matrix4f, xr, yc, 0.0F).color(255, 255, 255, 255).uv(1.0F, 1.0F).uv2(255).endVertex();
-        consumer.vertex(matrix4f, xc, yt, 0.0F).color(255, 255, 255, 255).uv(1.0F, 0.0F).uv2(255).endVertex();
-        consumer.vertex(matrix4f, xl, yc, 0.0F).color(255, 255, 255, 255).uv(0.0F, 0.0F).uv2(255).endVertex();
+    // a square outline growing and fading from each marker, once a second while it lasts
+    private static void renderPingPulses(GuiGraphics g) {
+        for (MapMarker m : mapMarkers) {
+            Vec2 p = worldPosToMinimapScreen(m.x, m.z);
+            if (!isPointInsideMinimap(p.x, p.y))
+                continue;
+            float t = (m.ageTicks % 20) / 20f;
+            int s = Math.round(4 * (0.4f + 1.8f * t));
+            int colour = ((int) ((1 - t) * 255) << 24) | (PlayerColors.getPlayerDisplayColorHex(m.playerName) & 0xFFFFFF);
+            int x = Math.round(p.x), y = Math.round(p.y);
+            g.fill(x - s, y - s, x + s, y - s + 1, colour);
+            g.fill(x - s, y + s - 1, x + s, y + s, colour);
+            g.fill(x - s, y - s + 1, x - s + 1, y + s - 1, colour);
+            g.fill(x + s - 1, y - s + 1, x + s, y + s - 1, colour);
+        }
+    }
 
-        buffer.endBatch();
+    /**
+     * Draws the map turned like the HUD minimap, centred in the square (x, y, size) in the current pose.
+     * Zoom 1 shows the whole map, 2 fills the square like the HUD minimap; the caller clips to the square.
+     */
+    public static void renderSquare(GuiGraphics g, float x, float y, float size, float zoom) {
+        drawMapTexture(g.pose().last().pose(), x + size / 2, y + size / 2, size / 2 * zoom, 1);
     }
 
-    public static final float SQUARE_SCALE = 1.2f; // 20% bigger than the inscribed square
-    public static float squareHalf = 0; // half-side of the visible square, set per frame
-    // content-zoom factor for square mode: 2 * SQUARE_SCALE / sqrt(2) — chosen so the rotated
-    // (-45°) texture quad circumscribes the visible square (no empty corners after scissor)
-    public static final float SQUARE_CONTENT_SCALE = (float) (SQUARE_SCALE * Math.sqrt(2));
-
-    private static void renderSquareMap(GuiGraphics guiGraphics, Matrix4f matrix4f) {
-        float baseHalf = (float) (mapGuiRadius / Math.sqrt(2));
-        float half = baseHalf * SQUARE_SCALE;
-        squareHalf = half;
-
-        // anchor bottom-right corner at the very bottom-right of the screen
-        int sw = MC.getWindow().getGuiScaledWidth();
-        int sh = MC.getWindow().getGuiScaledHeight();
-        float brX = sw - CORNER_OFFSET;
-        float brY = sh - CORNER_OFFSET;
-        // centre of the bigger square (grows up-left from the fixed bottom-right)
-        xc = brX - half;
-        yc = brY - half;
-
-        float x1 = brX - 2 * half;
-        float x2 = brX;
-        float y1 = brY - 2 * half;
-        float y2 = brY;
-
-        // parchment frame: same texture as the diamond — the artwork is a square frame drawn
-        // axis-aligned in the image, so standard (0,0)→(1,1) UVs render it as-is here.
-        float xl_bg = x1 - BG_OFFSET, xr_bg = x2 + BG_OFFSET;
-        float yt_bg = y1 - BG_OFFSET, yb_bg = y2 + BG_OFFSET;
-        ResourceLocation bg = ResourceLocation.fromNamespaceAndPath(
-                ReignOfNether.MOD_ID, "textures/hud/map_background.png");
-        RenderSystem.setShaderTexture(0, bg);
-        RenderSystem.setShader(GameRenderer::getPositionTexShader);
-        BufferBuilder bb = Tesselator.getInstance().getBuilder();
-        bb.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX);
-        bb.vertex(matrix4f, xl_bg, yb_bg, 0.0F).uv(0.0F, 1.0F).endVertex();
-        bb.vertex(matrix4f, xr_bg, yb_bg, 0.0F).uv(1.0F, 1.0F).endVertex();
-        bb.vertex(matrix4f, xr_bg, yt_bg, 0.0F).uv(1.0F, 0.0F).endVertex();
-        bb.vertex(matrix4f, xl_bg, yt_bg, 0.0F).uv(0.0F, 0.0F).endVertex();
-        BufferUploader.drawWithShader(bb.end());
-
-        // clip the rotated content to the visible square (after the frame, so frame isn't clipped)
-        guiGraphics.enableScissor((int) x1, (int) y1, (int) x2, (int) y2);
-
-        // render the texture as a rotated quad that fully circumscribes the visible square
-        // (d = 2*half makes the diamond's edges meet the square's corners — no black borders)
-        float d = 2 * half;
+    /** A diamond of half-diagonal d showing the middle 1/zoom of the map texture. */
+    private static void drawMapTexture(Matrix4f matrix4f, float cx, float cy, float d, float zoom) {
+        float lo = 0.5f - 0.5f / zoom, hi = 0.5f + 0.5f / zoom;
         MultiBufferSource.BufferSource buffer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
         VertexConsumer consumer = buffer.getBuffer(mapRenderType);
-        consumer.vertex(matrix4f, xc, yc + d, 0.0F).color(255, 255, 255, 255).uv(0.0F, 1.0F).uv2(255).endVertex();
-        consumer.vertex(matrix4f, xc + d, yc, 0.0F).color(255, 255, 255, 255).uv(1.0F, 1.0F).uv2(255).endVertex();
-        consumer.vertex(matrix4f, xc, yc - d, 0.0F).color(255, 255, 255, 255).uv(1.0F, 0.0F).uv2(255).endVertex();
-        consumer.vertex(matrix4f, xc - d, yc, 0.0F).color(255, 255, 255, 255).uv(0.0F, 0.0F).uv2(255).endVertex();
+        consumer.vertex(matrix4f, cx, cy + d, 0.0F).color(255, 255, 255, 255).uv(lo, hi).uv2(255).endVertex();
+        consumer.vertex(matrix4f, cx + d, cy, 0.0F).color(255, 255, 255, 255).uv(hi, hi).uv2(255).endVertex();
+        consumer.vertex(matrix4f, cx, cy - d, 0.0F).color(255, 255, 255, 255).uv(hi, lo).uv2(255).endVertex();
+        consumer.vertex(matrix4f, cx - d, cy, 0.0F).color(255, 255, 255, 255).uv(lo, lo).uv2(255).endVertex();
         buffer.endBatch();
-
-        guiGraphics.disableScissor();
     }
 
-    // https://stackoverflow.com/questions/27022064/detect-click-in-a-diamond
     public static boolean isPointInsideMinimap(double x, double y) {
-        double dx = Math.abs(x - xc);
-        double dy = Math.abs(y - yc);
-        if (ReignOfNetherClientConfigs.SQUARE_MINIMAP.get()) {
-            return dx <= squareHalf && dy <= squareHalf;
-        }
-        double d = dx / (mapGuiRadius * 2) + dy / (mapGuiRadius * 2);
-        return d <= 0.5;
+        if (isSquare())
+            return Math.abs(x - xc) <= mapGuiRadius && Math.abs(y - yc) <= mapGuiRadius;
+        return Math.abs(x - xc) + Math.abs(y - yc) <= mapGuiRadius;
     }
 
     // given an x and y on the screen that the player clicked, return the world position of that spot
-    private static BlockPos getWorldPosOnMinimap(float x, float y, boolean offsetForCamera) {
+    public static BlockPos getWorldPosOnMinimap(float x, float y, boolean offsetForCamera) {
         if (!isPointInsideMinimap(x, y) || CursorClientEvents.isBoxSelecting() || MC.level == null) {
             return null;
         }
 
-        float pixelsToBlocks = (float) worldRadius / (float) mapGuiRadius;
+        return toWorldPos(x - xc, y - yc, contentRadius(), offsetForCamera);
+    }
 
-        // offset x,y so that user clicks the centre of the view quad instead of bottom border
-        if (offsetForCamera) {
-            float camRotX = OrthoviewClientEvents.getCamRotX();
-            double radius = OrthoviewClientEvents.getZoom() * 0.5F / pixelsToBlocks;
-            double angleRad = Math.toRadians(camRotX - 315.0);
-            x -= radius * Math.cos(angleRad);
-            y -= radius * Math.sin(angleRad);
-        }
+    /** The world position under (x, y) on a map drawn by renderSquare into the square at (left, top). */
+    public static BlockPos getWorldPosOnSquare(float x, float y, float left, float top, float size, float zoom) {
+        if (MC.level == null || x < left || y < top || x > left + size || y > top + size)
+            return null;
+        return toWorldPos(x - (left + size / 2), y - (top + size / 2), size / 2 * zoom, true);
+    }
 
-        double xWorld;
-        double zWorld;
-        if (ReignOfNetherClientConfigs.SQUARE_MINIMAP.get()) {
-            // square mode: undo -45° rotation and SQUARE_CONTENT_SCALE
-            Vec2 clicked = MyMath.rotateCoords(x - xc, y - yc, 45);
-            xWorld = xc_world + clicked.x * pixelsToBlocks * Math.sqrt(2) / SQUARE_CONTENT_SCALE;
-            zWorld = zc_world + clicked.y * pixelsToBlocks * Math.sqrt(2) / SQUARE_CONTENT_SCALE;
-        } else {
-            Vec2 clicked = MyMath.rotateCoords(x - xc, y - yc, 45);
-            xWorld = xc_world + clicked.x * pixelsToBlocks * Math.sqrt(2);
-            zWorld = zc_world + clicked.y * pixelsToBlocks * Math.sqrt(2);
+    // dx, dy from the centre of a diamond of half-diagonal d
+    private static BlockPos toWorldPos(float dx, float dy, float d, boolean offsetForCamera) {
+        double xWorld = xc_world + (dx - dy) / d * worldRadius;
+        double zWorld = zc_world + (dx + dy) / d * worldRadius;
+
+        // offset so the click lands on the centre of the view quad instead of its bottom edge
+        if (offsetForCamera) {
+            double angleRad = Math.toRadians(OrthoviewClientEvents.getCamRotX() - 315.0);
+            Vec2 dir = MyMath.rotateCoords((float) Math.cos(angleRad), (float) Math.sin(angleRad), 45);
+            double blocks = OrthoviewClientEvents.getZoom() * 0.5 * Math.sqrt(2);
+            xWorld -= dir.x * blocks;
+            zWorld -= dir.y * blocks;
         }
         int roundedX = Mth.floor(xWorld + 0.5d);
         int roundedZ = Mth.floor(zWorld + 0.5d);
@@ -1220,10 +1072,6 @@ public static void onMouseDrag(ScreenEvent.MouseDragged.Pre evt) {
             return;
         }
 
-        if (markerMode) {
-            return;
-        }
-
         if (evt.getMouseButton() == GLFW.GLFW_MOUSE_BUTTON_1 &&
             !Keybindings.shiftMod.isDown() && !OrthoviewClientEvents.isCameraLocked() &&
             lastDragTeleportTimestamp < System.currentTimeMillis() - 100) {
@@ -1267,13 +1115,12 @@ public static void onMouseClick(ScreenEvent.MouseButtonPressed.Pre evt) {
         Button startPosButton = getMousedOverStartPosButton();
         if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_1 && (!isMouseOverAnyButton() || startPosButton != null)) {
             BlockPos moveTo = startPosButton != null ?
-                    getWorldPosOnMinimap((float) startPosButton.x + 11, startPosButton.y + 11, true) :
+                    getWorldPosOnMinimap((float) HudGeometry.scale().toGui(startPosButton.x + startPosButton.drawnSize / 2.0),
+                            (float) HudGeometry.scale().toGui(startPosButton.y + startPosButton.drawnSize / 2.0), true) :
                     getWorldPosOnMinimap((float) evt.getMouseX(), (float) evt.getMouseY(), true);
 
             if (MC.player != null && moveTo != null) {
-                if (markerMode) {
-                    addMapMarkerForSelfAndAllies((int) evt.getMouseX(), (int) evt.getMouseY());
-                } else if (!altDown && Keybindings.shiftMod.isDown()) {
+                if (!altDown && Keybindings.shiftMod.isDown()) {
                     setMapCentre(moveTo.getX(), moveTo.getZ());
                     forceUpdateAllPartitions = true;
                     TutorialClientEvents.clickedMinimap = true;
@@ -1351,24 +1198,25 @@ public static void onMouseRelease(ScreenEvent.MouseButtonReleased.Post evt) {
         }
     }
 
-    @SubscribeEvent
-    public static void onRenderOverlay(RenderGuiOverlayEvent.Post evt) {
-        if (!OrthoviewClientEvents.isEnabled() || MC.isPaused() || !HudClientEvents.enabled
-            || !TutorialClientEvents.isAtOrPastStage(TutorialStage.MINIMAP_CLICK) || MC.screen instanceof MatchStartScreen) {
-            return;
-        }
+    /** Size and corner of the map on screen, taken from the HUD layout so it always sits in the console. */
+    private static void updateScreenGeometry() {
+        float[] r = HudGeometry.toGui(HudGeometry.layout().minimap());
+        float size = r[2];
+        mapGuiRadius = Math.max(1, Math.round(size / 2));
+        mapRight = r[0] + r[2];
+        mapBottom = r[1] + r[3];
+    }
 
-        // toggle here to ensure it doesn't happen in the middle of the updates
-        if (shouldToggleSize) {
-            shouldToggleSize = false;
-            toggleMapSize();
+    /** Drawn by the HUD, after the console background and before the panels. */
+    public static void render(GuiGraphics guiGraphics) {
+        // still drawn while paused and under the match screens: the HUD stays in view behind Esc and slides out
+        // under the start screen, and a missing map would blink
+        if (!OrthoviewClientEvents.isEnabled() || !HudClientEvents.enabled
+            || !TutorialClientEvents.isAtOrPastStage(TutorialStage.MINIMAP_CLICK)) {
+            return;
         }
 
-        renderMap(evt.getGuiGraphics());
-
-        //MiscUtil.drawDebugStrings(evt.getGuiGraphics(), MC.font, new String[] {
-        //        "camrotX: " + OrthoviewClientEvents.getCamRotX()
-        //});
+        renderMap(guiGraphics);
     }
 
     @SubscribeEvent
diff --git a/src/main/java/com/solegendary/reignofnether/minimap/MinimapViewQuadRenderer.java b/src/main/java/com/solegendary/reignofnether/minimap/MinimapViewQuadRenderer.java
index c86e224a5..729002f1b 100644
--- a/src/main/java/com/solegendary/reignofnether/minimap/MinimapViewQuadRenderer.java
+++ b/src/main/java/com/solegendary/reignofnether/minimap/MinimapViewQuadRenderer.java
@@ -10,6 +10,8 @@ public class MinimapViewQuadRenderer {
     // Perpendicular half-width of the view-quad outline, in world blocks.
     // Must stay >= 0.5 or a near-horizontal edge can fall between integer rows and leave gaps.
     private static final double VIEW_QUAD_HALF_WIDTH = 1.5;
+    // gold camera box (overlay pixels are stored as ABGR)
+    private static final int VIEW_QUAD_COLOUR = MiscUtil.reverseHexRGB(0xFEF481) | 0xFF000000;
 
     private static final Minecraft MC = Minecraft.getInstance();
 
@@ -116,7 +118,7 @@ private static int[][] drawThickLineOnOverlay(int[][] mapColoursOverlays, double
             int x0End = Math.min(size - 1, (int) Math.floor(xExit) + xOff);
 
             for (int x0 = x0Start; x0 <= x0End; x0++) {
-                mapColoursOverlays[x0][z0] = -1;
+                mapColoursOverlays[x0][z0] = VIEW_QUAD_COLOUR;
             }
         }
         return mapColoursOverlays;
diff --git a/src/main/java/com/solegendary/reignofnether/minimap/StrategicMapClientEvents.java b/src/main/java/com/solegendary/reignofnether/minimap/StrategicMapClientEvents.java
new file mode 100644
index 000000000..4ab1e02dc
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/minimap/StrategicMapClientEvents.java
@@ -0,0 +1,196 @@
+package com.solegendary.reignofnether.minimap;
+
+import com.solegendary.reignofnether.ui.Easing;
+import com.mojang.math.Axis;
+import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.building.BuildingPlacement;
+import com.solegendary.reignofnether.fogofwar.FogOfWarClientEvents;
+import com.solegendary.reignofnether.guiscreen.TopdownGui;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
+import com.solegendary.reignofnether.items.ItemClientEvents;
+import com.solegendary.reignofnether.items.ItemUtil;
+import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
+import com.solegendary.reignofnether.player.PlayerColors;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.unit.UnitClientEvents;
+import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.util.MiscUtil;
+import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.util.WorldState;
+import com.solegendary.reignofnether.util.WorldToScreen;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.phys.Vec3;
+
+/**
+ * What zooming out past the camera's limit, or the satellite key, shows: the camera tilts to look straight down,
+ * keeping its orientation, and zooms out as far as the world is drawn, with unit icons and building rectangles over the
+ * real view. The camera stays a normal RTS camera, so selecting, turning it and giving orders work as usual.
+ */
+public final class StrategicMapClientEvents {
+
+    static {
+        WorldState.onClientReset(StrategicMapClientEvents::reset);
+    }
+
+    private StrategicMapClientEvents() { }
+
+    private static final Minecraft MC = Minecraft.getInstance();
+    private static final float TURN_MS = 650;
+    private static final float ICONS_FROM = 0.6f;
+    private static final int UNIT_ICON = 8;
+    // the furthest zoom is a wall: a scroll stops there, and only a separate push after a pause, or scrolling on for
+    // a while, opens this view. Counting scroll events isn't enough, one flick of a smooth wheel or trackpad sends dozens
+    private static final int PUSHES_TO_OPEN = 2;
+    private static final long PUSH_PAUSE_MS = 350;
+    private static final long KEEP_SCROLLING_MS = 500;
+
+    private static boolean open = false;
+    private static float blendFrom = 0;
+    private static long changedMs = 0;
+    private static int pushes = 0;
+    private static long lastScrollMs = 0;
+    private static long pushStartMs = 0;
+
+    public static boolean isOpen() {
+        return open;
+    }
+
+    /** A scroll out at the furthest zoom. */
+    public static void scrollPast() {
+        long now = System.currentTimeMillis();
+        boolean newPush = now - lastScrollMs > PUSH_PAUSE_MS;
+        lastScrollMs = now;
+        if (newPush) {
+            pushes++;
+            pushStartMs = now;
+        }
+        if (pushes >= PUSHES_TO_OPEN || now - pushStartMs >= KEEP_SCROLLING_MS)
+            open();
+    }
+
+    /** A scroll that zoomed the camera: whatever comes right after it is the same scroll running on. */
+    public static void cancelScroll() {
+        pushes = 0;
+        lastScrollMs = System.currentTimeMillis();
+        pushStartMs = lastScrollMs;
+    }
+
+    private static void set(boolean value) {
+        pushes = 0;
+        blendFrom = blend();
+        changedMs = System.currentTimeMillis();
+        open = value;
+    }
+
+    public static void open() {
+        if (MC.screen instanceof TopdownGui)
+            set(true);
+    }
+
+    public static void close() {
+        set(false);
+    }
+
+    public static void toggle() {
+        if (open)
+            close();
+        else
+            open();
+    }
+
+    public static void reset() {
+        open = false;
+        pushes = 0;
+        lastScrollMs = 0;
+        pushStartMs = 0;
+        blendFrom = 0;
+        changedMs = 0;
+    }
+
+    /**
+     * 0 is the normal camera, 1 is looking straight down. The camera turns like something heavy being pushed: a
+     * touch back, speeding up, then slowing to a stop. Kept within 0 to 1, past straight down the view would flip.
+     */
+    public static float blend() {
+        float t = Math.min(1, (System.currentTimeMillis() - changedMs) / TURN_MS);
+        return Mth.clamp(Mth.lerp(Easing.push(t), blendFrom, open ? 1 : 0), 0, 1);
+    }
+
+    /** Draws under the rest of the HUD, in HUD units. */
+    public static void render(HudFrame f) {
+        if (blend() < ICONS_FROM)
+            return;
+        for (BuildingPlacement b : BuildingClientEvents.getBuildings())
+            if (b.isExploredClientside)
+                footprint(f, b);
+        for (LivingEntity e : UnitClientEvents.getAllUnits())
+            if (FogOfWarClientEvents.isInBrightChunk(e))
+                icon(f, e);
+        if (ItemClientEvents.ENABLED)
+            for (ItemEntity e : ItemClientEvents.getRenderedItems())
+                if (ItemUtil.isUnitItem(e))
+                    itemIcon(f, e);
+    }
+
+    /** How far around a unit, in blocks, its icon reaches: units this zoomed out are clicked by their icons. */
+    public static float iconReach() {
+        return (UNIT_ICON / 2f + 1) * OrthoviewClientEvents.getZoom() / HudGeometry.layout().height();
+    }
+
+    /** A see-through rectangle of its owner's colour over the building's whole footprint. */
+    private static void footprint(HudFrame f, BuildingPlacement b) {
+        double y = b.minCorner.getY();
+        double x0 = b.minCorner.getX(), z0 = b.minCorner.getZ();
+        double x1 = b.maxCorner.getX() + 1, z1 = b.maxCorner.getZ() + 1;
+        Vec2 corner = WorldToScreen.project(new Vec3(x0, y, z0));
+        Vec2 alongX = WorldToScreen.project(new Vec3(x1, y, z0));
+        Vec2 alongZ = WorldToScreen.project(new Vec3(x0, y, z1));
+        Vec2 centre = WorldToScreen.project(new Vec3((x0 + x1) / 2, y, (z0 + z1) / 2));
+        if (corner == null || alongX == null || alongZ == null || centre == null)
+            return;
+        int w = f.scale.toUnits(Mth.sqrt(corner.distanceToSqr(alongX)));
+        int h = f.scale.toUnits(Mth.sqrt(corner.distanceToSqr(alongZ)));
+        // the camera can face any way, so the rectangle turns with the building
+        f.g.pose().pushPose();
+        f.g.pose().translate(f.scale.toUnits(centre.x), f.scale.toUnits(centre.y), 0);
+        f.g.pose().mulPose(Axis.ZP.rotation((float) Math.atan2(alongX.y - corner.y, alongX.x - corner.x)));
+        square(f, -w / 2, -h / 2, w, h, b.ownerName, BuildingClientEvents.getPreselectedBuilding() == b,
+                BuildingClientEvents.getSelectedBuildings().contains(b));
+        f.g.pose().popPose();
+    }
+
+    /** The unit's head on a see-through square of its owner's colour. */
+    private static void icon(HudFrame f, LivingEntity e) {
+        Vec2 gui = WorldToScreen.project(e.position());
+        if (gui == null)
+            return;
+        int x = f.scale.toUnits(gui.x) - UNIT_ICON / 2;
+        int y = f.scale.toUnits(gui.y) - UNIT_ICON / 2;
+        square(f, x, y, UNIT_ICON, UNIT_ICON, e instanceof Unit u ? u.getOwnerName() : null,
+                UnitClientEvents.getPreselectedUnits().contains(e), UnitClientEvents.getSelectedUnits().contains(e));
+        MyRenderer.renderIcon(f.g, MiscUtil.mobHeadIcon(e), x, y, UNIT_ICON);
+    }
+
+    /** A dropped unit item: from this far out the real one is only a few spinning dots. */
+    private static void itemIcon(HudFrame f, ItemEntity e) {
+        Vec2 gui = WorldToScreen.project(e.position());
+        if (gui == null)
+            return;
+        int x = f.scale.toUnits(gui.x) - UNIT_ICON / 2;
+        int y = f.scale.toUnits(gui.y) - UNIT_ICON / 2;
+        square(f, x, y, UNIT_ICON, UNIT_ICON, null, ItemClientEvents.getPreselectedItems().contains(e), false);
+        MyRenderer.renderItem(f.g, e.getItem(), x, y, UNIT_ICON / 16f);
+    }
+
+    /** Stronger on hover and when selected. */
+    private static void square(HudFrame f, int x, int y, int w, int h, String owner, boolean hovered, boolean selected) {
+        int rgb = PlayerColors.getPlayerDisplayColorHex(owner) & 0xFFFFFF;
+        f.g.fill(x, y, x + w, y + h, (hovered ? 0x50 : selected ? 0x30 : 0x18) << 24 | rgb);
+        Theme.outline(f.g, x, y, w, h, 1, hovered ? 0xFFFFFFFF : selected ? 0xFFFFFFFF : 0x60000000 | rgb);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/ChatComponentMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/ChatComponentMixin.java
index eeb439bb1..8ac229e4a 100644
--- a/src/main/java/com/solegendary/reignofnether/mixin/ChatComponentMixin.java
+++ b/src/main/java/com/solegendary/reignofnether/mixin/ChatComponentMixin.java
@@ -1,10 +1,16 @@
 package com.solegendary.reignofnether.mixin;
 
+import com.solegendary.reignofnether.chat.ChatLog;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
+import net.minecraft.client.GuiMessageTag;
 import net.minecraft.client.gui.components.ChatComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MessageSignature;
 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.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ChatComponent.class)
 public class ChatComponentMixin {
@@ -19,4 +25,13 @@ public class ChatComponentMixin {
     private double modifyMouseY(double pMouseY) {
         return OrthoviewClientEvents.isEnabled() ? pMouseY - OrthoviewClientEvents.CHAT_Y_OFFSET : pMouseY;
     }
-}
\ No newline at end of file
+
+    // every new chat line (not the re-adds when chat is resized) goes into RoN's own chat log
+    @Inject(
+            method = "addMessage(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/MessageSignature;Lnet/minecraft/client/GuiMessageTag;)V",
+            at = @At("HEAD")
+    )
+    private void logMessage(Component message, MessageSignature signature, GuiMessageTag tag, CallbackInfo ci) {
+        ChatLog.onAdded(message);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/CreateWorldScreenMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/CreateWorldScreenMixin.java
new file mode 100644
index 000000000..41322f2ae
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/mixin/CreateWorldScreenMixin.java
@@ -0,0 +1,37 @@
+package com.solegendary.reignofnether.mixin;
+
+import com.solegendary.reignofnether.ui.Backdrop;
+import com.solegendary.reignofnether.ui.Theme;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
+import net.minecraft.resources.ResourceLocation;
+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.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+// create world draws its own light dirt instead of calling Screen's, so ScreenBackgroundMixin never reaches it, and
+// no screen event lets the background be swapped; it gets the website's background like the other menus
+@Mixin(CreateWorldScreen.class)
+public abstract class CreateWorldScreenMixin {
+
+    // the tabs above and the buttons below it sit on the background; the options in between sit on a card
+    private static final int TABS_H = 24;
+    private static final int FOOTER_H = 38;
+
+    @Inject(method = "renderDirtBackground", at = @At("HEAD"), cancellable = true)
+    private void renderWebsiteInsteadOfDirt(GuiGraphics g, CallbackInfo ci) {
+        Screen self = (Screen) (Object) this;
+        Backdrop.website(g, self.width, self.height, 1);
+        int w = Math.min(self.width - 32, 360);
+        Theme.popup(g, (self.width - w) / 2, TABS_H + 8, w, self.height - TABS_H - FOOTER_H - 16, Theme.ORANGE);
+        ci.cancel();
+    }
+
+    // the light line over the buttons belonged with the dirt
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Lnet/minecraft/resources/ResourceLocation;IIFFIIII)V"))
+    private void skipFooterLine(GuiGraphics g, ResourceLocation texture, int x, int y, float u, float v, int w, int h, int texW, int texH) {
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/ForgeGuiMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/ForgeGuiMixin.java
index 43685d620..d16a470f4 100644
--- a/src/main/java/com/solegendary/reignofnether/mixin/ForgeGuiMixin.java
+++ b/src/main/java/com/solegendary/reignofnether/mixin/ForgeGuiMixin.java
@@ -1,6 +1,7 @@
 package com.solegendary.reignofnether.mixin;
 
 import com.mojang.blaze3d.platform.Window;
+import com.solegendary.reignofnether.chat.ChatPanel;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
@@ -30,10 +31,12 @@ public ForgeGuiMixin(Minecraft pMinecraft, ItemRenderer pItemRenderer) {
             remap=false
     )
     protected void renderChat(int width, int height, GuiGraphics guiGraphics, CallbackInfo ci) {
-        if (!OrthoviewClientEvents.isEnabled())
+        if (!OrthoviewClientEvents.isEnabled() && !ChatPanel.hidesVanillaChat())
             return;
 
         ci.cancel();
+        if (ChatPanel.hidesVanillaChat())
+            return; // the RTS view shows its own chat
 
         this.minecraft.getProfiler().push("chat");
         Window window = this.minecraft.getWindow();
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/MenuButtonMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/MenuButtonMixin.java
new file mode 100644
index 000000000..0522da66e
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/mixin/MenuButtonMixin.java
@@ -0,0 +1,44 @@
+package com.solegendary.reignofnether.mixin;
+
+import com.solegendary.reignofnether.ui.Theme;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.AbstractButton;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.network.chat.Component;
+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.CallbackInfo;
+
+// every vanilla text button (menus, options, world list...) uses the RTS UI's button style instead of stone
+@Mixin(AbstractButton.class)
+public abstract class MenuButtonMixin extends AbstractWidget {
+
+    public MenuButtonMixin(int x, int y, int width, int height, Component message) {
+        super(x, y, width, height, message);
+    }
+
+    @Inject(method = "renderWidget", at = @At("HEAD"), cancellable = true)
+    private void renderMenuButton(GuiGraphics g, int mouseX, int mouseY, float partialTick, CallbackInfo ci) {
+        ci.cancel();
+        int x = getX(), y = getY(), w = getWidth(), h = getHeight();
+        boolean hovered = active && isHoveredOrFocused();
+        Theme.outline(g, x, y, w, h, 1, Theme.withAlpha(Theme.INK, alpha));
+        g.fill(x, y, x + w, y + h, Theme.withAlpha(hovered ? Theme.RAISED_HOVER : active ? Theme.SECONDARY : Theme.LOCKED, alpha));
+        g.fill(x, y, x + w, y + 1, Theme.withAlpha(0x17FFFFFF, alpha));
+        g.fill(x, y + h - 1, x + w, y + h, Theme.withAlpha(0x8C000000, alpha));
+        if (hovered)
+            g.fill(x, y, x + 2, y + h, Theme.withAlpha(Theme.ORANGE, alpha));
+        int colour = !active ? Theme.DIM : hovered ? Theme.GOLD : Theme.BODY;
+        // keep a colour another mod set with setFGColor; labels too long to fit scroll like vanilla
+        if (packedFGColor != UNSET_FG_COLOR)
+            colour = packedFGColor | 0xFF000000;
+        colour = Theme.withAlpha(colour, alpha);
+        var font = Minecraft.getInstance().font;
+        if (font.width(getMessage()) > w - 4)
+            renderScrollingString(g, font, 2, colour);
+        else
+            g.drawString(font, getMessage(), x + (w - font.width(getMessage())) / 2, y + (h - 8) / 2, colour, false);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/MenuEditBoxMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/MenuEditBoxMixin.java
new file mode 100644
index 000000000..d10b0fa60
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/mixin/MenuEditBoxMixin.java
@@ -0,0 +1,24 @@
+package com.solegendary.reignofnether.mixin;
+
+import com.solegendary.reignofnether.ui.Theme;
+import net.minecraft.client.gui.components.EditBox;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+// text fields: dark inset with an orange edge when focused, like the RTS UI's inputs
+@Mixin(EditBox.class)
+public abstract class MenuEditBoxMixin {
+
+    @ModifyArg(method = "renderWidget", index = 4, require = 1, at = @At(value = "INVOKE", ordinal = 0,
+            target = "Lnet/minecraft/client/gui/GuiGraphics;fill(IIIII)V"))
+    private int borderColour(int colour) {
+        return ((EditBox) (Object) this).isFocused() ? Theme.ORANGE : Theme.FAINT;
+    }
+
+    @ModifyArg(method = "renderWidget", index = 4, require = 1, at = @At(value = "INVOKE", ordinal = 1,
+            target = "Lnet/minecraft/client/gui/GuiGraphics;fill(IIIII)V"))
+    private int fillColour(int colour) {
+        return Theme.INK;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/MenuImageButtonMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/MenuImageButtonMixin.java
new file mode 100644
index 000000000..4e820f8fb
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/mixin/MenuImageButtonMixin.java
@@ -0,0 +1,42 @@
+package com.solegendary.reignofnether.mixin;
+
+import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.ui.Theme;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+// vanilla's language and accessibility squares: their own icons on the dark button instead of stone
+@Mixin(ImageButton.class)
+public abstract class MenuImageButtonMixin extends Button {
+
+    @Shadow @Final protected ResourceLocation resourceLocation;
+    @Shadow @Final protected int yTexStart;
+
+    private static final ResourceLocation ACCESSIBILITY = ResourceLocation.withDefaultNamespace("textures/gui/accessibility.png");
+    private static final ResourceLocation LANGUAGE_ICON = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/gui/menu_language.png");
+    private static final ResourceLocation ACCESSIBILITY_ICON = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/gui/menu_accessibility.png");
+
+    protected MenuImageButtonMixin(int x, int y, int w, int h, Component message, OnPress onPress, CreateNarration narration) {
+        super(x, y, w, h, message, onPress, narration);
+    }
+
+    @Inject(method = "renderWidget", at = @At("HEAD"), cancellable = true)
+    private void renderMenuIcon(GuiGraphics g, int mouseX, int mouseY, float partialTick, CallbackInfo ci) {
+        ResourceLocation icon = resourceLocation.equals(WIDGETS_LOCATION) && yTexStart == 106 ? LANGUAGE_ICON
+                : resourceLocation.equals(ACCESSIBILITY) ? ACCESSIBILITY_ICON : null;
+        if (icon == null)
+            return;
+        ci.cancel();
+        Theme.secondaryButton(g, getX(), getY(), width, height, isHoveredOrFocused());
+        g.blit(icon, getX() + (width - 20) / 2, getY() + (height - 20) / 2, 0, 0, 20, 20, 20, 20);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/MenuListMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/MenuListMixin.java
new file mode 100644
index 000000000..620097074
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/mixin/MenuListMixin.java
@@ -0,0 +1,48 @@
+package com.solegendary.reignofnether.mixin;
+
+import com.solegendary.reignofnether.ui.Backdrop;
+import com.solegendary.reignofnether.ui.Theme;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.AbstractSelectionList;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+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;
+
+// lists (worlds, servers, options...) sit on a dark panel over the menu backdrop instead of dirt bands
+@Mixin(AbstractSelectionList.class)
+public abstract class MenuListMixin {
+
+    @Shadow private boolean renderBackground;
+    @Shadow private boolean renderTopAndBottom;
+    @Shadow protected int x0;
+    @Shadow protected int x1;
+    @Shadow protected int y0;
+    @Shadow protected int y1;
+
+    // lists that drew the dirt bands own the whole screen background (world select, servers...)
+    @Unique private Boolean reignofnether$ownsScreen;
+    // lists a screen or mod left without a background stay transparent
+    @Unique private Boolean reignofnether$hasBackground;
+
+    @Inject(method = "render", at = @At("HEAD"))
+    private void renderPanel(GuiGraphics g, int mouseX, int mouseY, float partialTick, CallbackInfo ci) {
+        if (reignofnether$ownsScreen == null) {
+            reignofnether$ownsScreen = renderTopAndBottom;
+            reignofnether$hasBackground = renderBackground;
+        }
+        renderBackground = false;
+        renderTopAndBottom = false;
+        Minecraft mc = Minecraft.getInstance();
+        if (reignofnether$ownsScreen && mc.level == null)
+            Backdrop.website(g, g.guiWidth(), g.guiHeight(), 1);
+        if (!reignofnether$hasBackground)
+            return;
+        g.fill(x0, y0, x1, y1, Theme.floating());
+        g.fill(x0, y0, x1, y0 + 1, Theme.INK);
+        g.fill(x0, y1 - 1, x1, y1, Theme.INK);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/MenuSliderMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/MenuSliderMixin.java
new file mode 100644
index 000000000..d1adb7a6d
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/mixin/MenuSliderMixin.java
@@ -0,0 +1,49 @@
+package com.solegendary.reignofnether.mixin;
+
+import com.solegendary.reignofnether.ui.Theme;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.AbstractSliderButton;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+// option sliders: sunken track with an orange handle, same look as the RTS UI
+@Mixin(AbstractSliderButton.class)
+public abstract class MenuSliderMixin extends AbstractWidget {
+
+    @Shadow protected double value;
+
+    public MenuSliderMixin(int x, int y, int width, int height, Component message) {
+        super(x, y, width, height, message);
+    }
+
+    @Inject(method = "renderWidget", at = @At("HEAD"), cancellable = true)
+    private void renderMenuSlider(GuiGraphics g, int mouseX, int mouseY, float partialTick, CallbackInfo ci) {
+        ci.cancel();
+        int x = getX(), y = getY(), w = getWidth(), h = getHeight();
+        boolean hovered = active && isHoveredOrFocused();
+        Theme.outline(g, x, y, w, h, 1, Theme.withAlpha(Theme.INK, alpha));
+        g.fill(x, y, x + w, y + h, Theme.withAlpha(Theme.SUNKEN, alpha));
+        g.fill(x, y, x + w, y + 1, Theme.withAlpha(0x66000000, alpha));
+        int handle = 8;
+        int hx = x + (int) (value * (w - handle));
+        g.fill(hx, y, hx + handle, y + h, Theme.withAlpha(hovered ? Theme.YELLOW : Theme.ORANGE, alpha));
+        g.fill(hx, y, hx + handle, y + 1, Theme.withAlpha(Theme.GOLD, alpha));
+        g.fill(hx, y + h - 1, hx + handle, y + h, Theme.withAlpha(Theme.ORANGE_DARK, alpha));
+        int colour = !active ? Theme.DIM : hovered ? Theme.GOLD : Theme.BODY;
+        // keep a colour another mod set with setFGColor; labels too long to fit scroll like vanilla
+        if (packedFGColor != UNSET_FG_COLOR)
+            colour = packedFGColor | 0xFF000000;
+        colour = Theme.withAlpha(colour, alpha);
+        var font = Minecraft.getInstance().font;
+        if (font.width(getMessage()) > w - 4)
+            renderScrollingString(g, font, 2, colour);
+        else
+            g.drawString(font, getMessage(), x + (w - font.width(getMessage())) / 2, y + (h - 8) / 2, colour, false);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/ScreenBackgroundMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/ScreenBackgroundMixin.java
new file mode 100644
index 000000000..fc8a6335b
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/mixin/ScreenBackgroundMixin.java
@@ -0,0 +1,42 @@
+package com.solegendary.reignofnether.mixin;
+
+import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.hud.panels.SettingsMenu;
+import com.solegendary.reignofnether.ui.Backdrop;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.PauseScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraftforge.client.event.ScreenEvent;
+import net.minecraftforge.common.MinecraftForge;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+// menus without a world show the website's background instead of dirt
+@Mixin(Screen.class)
+public abstract class ScreenBackgroundMixin {
+
+    @Shadow public int width;
+    @Shadow public int height;
+
+    @Inject(method = "renderDirtBackground", at = @At("HEAD"), cancellable = true)
+    private void renderNetherInsteadOfDirt(GuiGraphics g, CallbackInfo ci) {
+        Backdrop.website(g, width, height, 1);
+        ci.cancel();
+    }
+
+    // the pause menu and the menus opened from it: the website's background, with the world and the HUD showing
+    // dimly through it
+    @Inject(method = "renderBackground(Lnet/minecraft/client/gui/GuiGraphics;)V", at = @At("HEAD"), cancellable = true)
+    private void renderRedWashBehindPauseMenu(GuiGraphics g, CallbackInfo ci) {
+        if ((Object) this instanceof PauseScreen || SettingsMenu.isInPauseMenu()) {
+            HudClientEvents.renderUnder(g, true); // the HUD stays in view, greyed out under the menu's background
+            Backdrop.website(g, width, height, 0.7f);
+            // cancelling skips vanilla's post of this event, which other mods draw on
+            MinecraftForge.EVENT_BUS.post(new ScreenEvent.BackgroundRendered((Screen) (Object) this, g));
+            ci.cancel();
+        }
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/TabButtonMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/TabButtonMixin.java
new file mode 100644
index 000000000..d9b1b8637
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/mixin/TabButtonMixin.java
@@ -0,0 +1,33 @@
+package com.solegendary.reignofnether.mixin;
+
+import com.solegendary.reignofnether.ui.Theme;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.TabButton;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+// vanilla tabs (create world) are dirt-textured and not a button, so MenuButtonMixin misses them: they get the RTS
+// button look, the open one raised with an orange edge along its top. Vanilla still draws the label and underline
+@Mixin(TabButton.class)
+public abstract class TabButtonMixin extends AbstractWidget {
+
+    public TabButtonMixin(int x, int y, int width, int height, Component message) {
+        super(x, y, width, height, message);
+    }
+
+    @Redirect(method = "renderWidget", at = @At(value = "INVOKE",
+            target = "Lnet/minecraft/client/gui/GuiGraphics;blitNineSliced(Lnet/minecraft/resources/ResourceLocation;IIIIIIIIIIII)V"))
+    private void renderRtsTab(GuiGraphics g, ResourceLocation texture, int x, int y, int w, int h,
+                              int a, int b, int c, int d, int e, int f, int u, int v) {
+        boolean selected = ((TabButton) (Object) this).isSelected();
+        boolean hovered = isHoveredOrFocused();
+        Theme.outline(g, x, y, w, h, 1, Theme.INK);
+        g.fill(x, y, x + w, y + h, selected ? Theme.RAISED : hovered ? Theme.RAISED_HOVER : Theme.SECONDARY);
+        if (selected)
+            g.fill(x, y, x + w, y + 2, Theme.ORANGE);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/TabNavigationBarMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/TabNavigationBarMixin.java
new file mode 100644
index 000000000..d8523a416
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/mixin/TabNavigationBarMixin.java
@@ -0,0 +1,22 @@
+package com.solegendary.reignofnether.mixin;
+
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.tabs.TabNavigationBar;
+import net.minecraft.resources.ResourceLocation;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+// vanilla's tab bar (create world) paints a black strip and a dirt line behind its tabs; the menu background shows
+// through instead. Its tabs are drawn by TabButtonMixin
+@Mixin(TabNavigationBar.class)
+public abstract class TabNavigationBarMixin {
+
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;fill(IIIII)V"))
+    private void skipBlackStrip(GuiGraphics g, int x0, int y0, int x1, int y1, int colour) {
+    }
+
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Lnet/minecraft/resources/ResourceLocation;IIFFIIII)V"))
+    private void skipHeaderLine(GuiGraphics g, ResourceLocation texture, int x, int y, float u, float v, int w, int h, int texW, int texH) {
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/mixin/TitleScreenMixin.java b/src/main/java/com/solegendary/reignofnether/mixin/TitleScreenMixin.java
index 9002fadb2..6de1a2266 100644
--- a/src/main/java/com/solegendary/reignofnether/mixin/TitleScreenMixin.java
+++ b/src/main/java/com/solegendary/reignofnether/mixin/TitleScreenMixin.java
@@ -1,28 +1,43 @@
 package com.solegendary.reignofnether.mixin;
 
+
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
 import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.config.ReignOfNetherClientConfigs;
 import com.solegendary.reignofnether.hud.TitleClientEvents;
+import com.solegendary.reignofnether.ui.Backdrop;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.client.gui.components.Button;
+import com.solegendary.reignofnether.ui.Tooltip;
+import com.solegendary.reignofnether.util.MyRenderer;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratedElementType;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.client.gui.screens.ConfirmScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.PanoramaRenderer;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.contents.TranslatableContents;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.enchantment.Enchantments;
+import net.minecraft.world.Difficulty;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.LevelSettings;
+import net.minecraft.world.level.WorldDataConfiguration;
+import net.minecraft.world.level.levelgen.WorldOptions;
+import net.minecraft.world.level.levelgen.presets.WorldPresets;
+import com.solegendary.reignofnether.tutorial.TutorialServerEvents;
 import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.gui.TitleScreenModUpdateIndicator;
 import net.minecraftforge.fml.ModList;
@@ -31,12 +46,14 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+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;
 
 import javax.annotation.Nullable;
 import java.net.URI;
+import java.util.List;
 
 @Mixin(TitleScreen.class)
 public class TitleScreenMixin extends Screen {
@@ -45,15 +62,19 @@ public class TitleScreenMixin extends Screen {
             ResourceLocation.parse("textures/gui/title/minecraft.png");
     private static final ResourceLocation MINECRAFT_EDITION =
             ResourceLocation.parse("textures/gui/title/edition.png");
-    private static final ResourceLocation DISCORD_TEXTURE =
-            ResourceLocation.parse( "textures/gui/title/discord.png");
+    private static final ResourceLocation DISCORD_ICON =
+            ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/discord_icon.png");
 
-    @Shadow @Final private PanoramaRenderer panorama;
     @Shadow @Final private boolean fading;
     @Shadow private long fadeInStart;
     @Nullable @Shadow(remap = false) private TitleScreenModUpdateIndicator modUpdateNotification;
-    private AbstractWidget discordButton;
-    private AbstractWidget mapsButton;
+    @Unique private AbstractWidget discordButton;
+    @Unique private AbstractWidget mapsButton;
+    @Unique private AbstractWidget tutorialButton;
+    @Unique private ItemStack tutorialStack;
+    @Unique private static boolean tutorialLaunched = false;
+    @Unique private ItemStack mapStack;
+    private static final String NETWORK_URL = "https://reignofnether.net";
 
     protected TitleScreenMixin(Component pTitle) {
         super(pTitle);
@@ -61,52 +82,11 @@ protected TitleScreenMixin(Component pTitle) {
 
     @Inject(method = "init", at = @At("TAIL"))
     private void init(CallbackInfo ci) {
-        int discordX = this.width - 102;
-        int discordY = this.height - 57;
-
-        this.discordButton = new AbstractWidget(discordX, discordY, 114, 38, Component.empty()) {
-            @Override
-            public void onClick(double pMouseX, double pMouseY) {
-                openLink("https://discord.com/jJV5zK3hT9");
-            }
-
-            @Override
-            public void updateWidgetNarration(NarrationElementOutput output) {
-                output.add(NarratedElementType.TITLE, Component.literal("Join our Discord"));
-            }
-
-            @Override
-            public void renderWidget(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
-                PoseStack pPoseStack = guiGraphics.pose();
-                RenderSystem.setShader(GameRenderer::getPositionTexShader);
-                RenderSystem.setShaderTexture(0, DISCORD_TEXTURE);
-
-                RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);
-                RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
-
-                pPoseStack.pushPose();
-                float scaleX = 0.8f;
-                float scaleY = 0.8f;
-
-                pPoseStack.translate(this.getX(), this.getY(), 0);
-                pPoseStack.scale(scaleX, scaleY, 1.0f);
-
-                guiGraphics.blit(DISCORD_TEXTURE, 0, 0, 0, 0, this.width, this.height, this.width, this.height);
-
-                if (isHoveredOrFocused())
-                    guiGraphics.fill( // x1,y1, x2,y2,
-                            0,0,
-                            this.width,
-                            this.height,
-                            0x32FFFFFF); //ARGB(hex); note that alpha ranges between ~0-16, not 0-255
-
-                pPoseStack.popPose();
-            }
-        };
-
         // --- "Get RTS maps!" button ---
         // Styled like the vanilla language-select button, to the right of the singleplayer button
         int mapsButtonSize = 20;
+        this.mapStack = new ItemStack(Items.FILLED_MAP);
+        this.mapStack.enchant(Enchantments.UNBREAKING, 1);
         int mapsButtonX = (this.width / 2) + 104;
         int mapsButtonY = (this.height / 4) + 48;
 
@@ -122,11 +102,7 @@ protected void updateWidgetNarration(NarrationElementOutput narrationElementOutp
             @Override
             public void renderWidget(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
                 // Same background sprite vanilla uses for the language/accessibility square buttons
-                ResourceLocation buttonSprite = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID,
-                        this.isHoveredOrFocused() ? "textures/hud/title_button_highlighted.png" : "textures/hud/title_button.png");
-                guiGraphics.blit(buttonSprite, this.getX(), this.getY(), 0, 0, this.width, this.height, this.width, this.height);
-                ItemStack mapStack = new ItemStack(Items.FILLED_MAP);
-                mapStack.enchant(Enchantments.UNBREAKING, 1);
+                Theme.secondaryButton(guiGraphics, getX(), getY(), width, height, isHoveredOrFocused());
                 int itemX = this.getX() + (this.width - 16) / 2;
                 int itemY = this.getY() + (this.height - 16) / 2;
 
@@ -141,13 +117,118 @@ public void renderWidget(GuiGraphics guiGraphics, int pMouseX, int pMouseY, floa
                 RenderSystem.enableDepthTest();
             }
         };
-        this.mapsButton.setTooltip(Tooltip.create(Component.literal("Get RTS maps!")));
+
+        // --- "Join our Discord" button ---
+        // Same square style, two rows below the maps button (Essential's button sits in between)
+        this.discordButton = new AbstractWidget(mapsButtonX, mapsButtonY + 48, mapsButtonSize, mapsButtonSize, Component.empty()) {
+            @Override
+            public void onClick(double pMouseX, double pMouseY) {
+                openLink("https://discord.gg/jJV5zK3hT9");
+            }
+            @Override
+            protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
+                narrationElementOutput.add(NarratedElementType.TITLE, Component.translatable("menu.reignofnether.discord"));
+            }
+            @Override
+            public void renderWidget(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
+                // Same bevel and drop shadow as the maps button, in Discord's own colour, the logo drawn on it
+                Theme.colourButton(guiGraphics, getX(), getY(), width, height, isHoveredOrFocused() ? 0xFF7983F5 : 0xFF5865F2);
+                guiGraphics.blit(DISCORD_ICON, this.getX() + 2, this.getY() + 2, 0, 0, 16, 16, 16, 16);
+            }
+        };
+
+        // --- "Tutorial" button ---
+        // Mirrors the maps button on the left of the singleplayer button
+        this.tutorialStack = new ItemStack(Items.WRITABLE_BOOK);
+        this.tutorialButton = new AbstractWidget(this.width / 2 - 124, mapsButtonY, mapsButtonSize, mapsButtonSize, Component.empty()) {
+            @Override
+            public void onClick(double pMouseX, double pMouseY) {
+                openTutorial();
+            }
+            @Override
+            protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
+                narrationElementOutput.add(NarratedElementType.TITLE, Component.translatable("menu.reignofnether.tutorial"));
+            }
+            @Override
+            public void renderWidget(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
+                Theme.secondaryButton(guiGraphics, getX(), getY(), width, height, isHoveredOrFocused());
+                guiGraphics.renderItem(tutorialStack, this.getX() + (this.width - 16) / 2, this.getY() + (this.height - 16) / 2);
+                RenderSystem.enableDepthTest();
+            }
+        };
+
+        // RoN has no use for Realms: drop it and let the Mods button take the whole row.
+        // Multiplayer shows the network notice once before going on as normal.
+        for (GuiEventListener child : List.copyOf(this.children())) {
+            if (!(child instanceof Button button) || !(button.getMessage().getContents() instanceof TranslatableContents key))
+                continue;
+            switch (key.getKey()) {
+                case "menu.online" -> this.removeWidget(button);
+                case "fml.menu.mods" -> {
+                    button.setX(this.width / 2 - 100);
+                    button.setWidth(200);
+                }
+                case "menu.multiplayer" -> {
+                    Button multiplayer = Button.builder(button.getMessage(), b -> openMultiplayer(button))
+                            .bounds(button.getX(), button.getY(), button.getWidth(), button.getHeight()).build();
+                    multiplayer.active = button.active;
+                    multiplayer.setTooltip(button.getTooltip());
+                    this.removeWidget(button);
+                    this.addRenderableWidget(multiplayer);
+                }
+            }
+        }
 
         this.addRenderableWidget(this.discordButton);
         this.addRenderableWidget(this.mapsButton);
+        this.addRenderableWidget(this.tutorialButton);
+
+        // The launcher's Tutorial button starts the game with -Dreignofnether.tutorial=true: go straight in, once.
+        if (!tutorialLaunched && Boolean.getBoolean("reignofnether.tutorial")) {
+            tutorialLaunched = true;
+            Minecraft.getInstance().tell(this::openTutorial);
+        }
+    }
+
+    // Opens the tutorial world, generating it from the tutorial seed the first time.
+    // Settings match the original tutorial map; TutorialServerEvents sets the spawn in the tutorial area.
+    @Unique
+    private void openTutorial() {
+        Minecraft mc = Minecraft.getInstance();
+        String name = TutorialServerEvents.TUTORIAL_MAP_NAME;
+        if (mc.getLevelSource().levelExists(name)) {
+            mc.createWorldOpenFlows().loadLevel(this, name);
+            return;
+        }
+        GameRules rules = new GameRules();
+        rules.getRule(GameRules.RULE_DOMOBSPAWNING).set(false, null);
+        rules.getRule(GameRules.RULE_WEATHER_CYCLE).set(false, null);
+        rules.getRule(GameRules.RULE_DOINSOMNIA).set(false, null);
+        rules.getRule(GameRules.RULE_RANDOMTICKING).set(12, null);
+        mc.createWorldOpenFlows().createFreshLevel(name,
+                new LevelSettings(name, GameType.CREATIVE, false, Difficulty.NORMAL, true, rules, WorldDataConfiguration.DEFAULT),
+                new WorldOptions(TutorialServerEvents.TUTORIAL_MAP_SEED, true, false),
+                WorldPresets::createNormalWorldDimensions);
     }
 
 
+    private void openMultiplayer(Button vanillaButton) {
+        if (ReignOfNetherClientConfigs.SEEN_NETWORK_NOTICE.get()) {
+            vanillaButton.onPress();
+            return;
+        }
+        ReignOfNetherClientConfigs.SEEN_NETWORK_NOTICE.set(true);
+        ReignOfNetherClientConfigs.SEEN_NETWORK_NOTICE.save();
+        Minecraft.getInstance().setScreen(new ConfirmScreen(getWebsite -> {
+            if (getWebsite)
+                openLink(NETWORK_URL);
+            vanillaButton.onPress();
+        }, Component.translatable("title.reignofnether.network_notice.title"),
+                Component.translatable("title.reignofnether.network_notice.message"),
+                Component.translatable("title.reignofnether.network_notice.website"),
+                Component.translatable("title.reignofnether.network_notice.continue")));
+    }
+
     private void openLink(String url) {
         try {
             URI uri = new URI(url);
@@ -176,7 +257,20 @@ private void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY,
                 ? (float) (Util.getMillis() - this.fadeInStart) / 1000.0F
                 : 1.0F;
 
+        // the faction panorama, darkened, dark at the top and darker still at the bottom
         TitleClientEvents.getPanorama().render(pPartialTick, Mth.clamp(fadeProgress, 0.0F, 1.0F));
+        guiGraphics.fill(0, 0, this.width, this.height, 0x990D0305);
+        int h = this.height;
+        guiGraphics.fillGradient(0, 0, this.width, h * 24 / 100, 0xB30D0305, 0x000D0305);
+        guiGraphics.fillGradient(0, h * 24 / 100, this.width, h / 2, 0x000D0305, 0x330D0305);
+        guiGraphics.fillGradient(0, h / 2, this.width, h, 0x330D0305, 0xE60D0305);
+        // the website's glow and ash, the ash sliding with the panorama as it turns: the panorama's 85 degree
+        // vertical view gives how many pixels across one degree of its turn is
+        float spin = TitleClientEvents.turnPanorama(pPartialTick);
+        double hfov = 2 * Math.toDegrees(Math.atan(Math.tan(Math.toRadians(85 / 2.0)) * this.width / (double) h));
+        float fade = Mth.clamp(fadeProgress, 0.0F, 1.0F);
+        Backdrop.emberGlow(guiGraphics, this.width, h, fade);
+        Backdrop.ash(guiGraphics, this.width, h, fade, (float) (-spin * this.width / hfov));
         int logoX = this.width / 2 - 137;
 
         float alpha = this.fading ? Mth.clamp(fadeProgress - 1.0F, 0.0F, 1.0F) : 1.0F;
@@ -200,7 +294,7 @@ private void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY,
             guiGraphics.blit(MINECRAFT_EDITION, logoX + 44,  editionY, 0.0F, 0.0F, 186, 14, 186, 16);
 
             // Render main menu elements and splash text
-            ForgeHooksClient.renderMainMenu((TitleScreen) Minecraft.getInstance().screen,
+            ForgeHooksClient.renderMainMenu((TitleScreen) (Object) this,
                     guiGraphics, this.font, this.width, this.height, alphaMask);
 
             if (TitleClientEvents.splash != null) {
@@ -223,11 +317,6 @@ private void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY,
                 guiGraphics.drawString(this.font, text, 2, this.height - (10 + line * (9 + 1)), 16777215 | alphaMask);
             });
 
-            //BrandingControl.forEachAboveCopyrightLine((line, text) -> {
-            //    int xPos = this.width - this.font.width(text);
-            //    drawString(pPoseStack, this.font, text, xPos, this.height - (10 + (line + 1) * (9 + 1)), 16777215 | alphaMask);
-            //});
-
             // Adjust widget transparency
             for (GuiEventListener child : this.children()) {
                 if (child instanceof AbstractWidget widget) {
@@ -238,6 +327,13 @@ private void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY,
             // Call the superclass render
             super.render(guiGraphics, pMouseX, pMouseY, pPartialTick);
 
+            // icon buttons get the RTS tooltip rather than vanilla's
+            String tip = mapsButton.isHovered() ? "Get RTS maps!"
+                    : discordButton.isHovered() ? "Join our Discord"
+                    : tutorialButton.isHovered() ? "Tutorial" : null;
+            if (tip != null)
+                MyRenderer.renderTooltip(guiGraphics, Tooltip.of(tip), pMouseX, pMouseY);
+
             // Render mod update notification
             if (alpha >= 1.0F && this.modUpdateNotification != null) {
                 this.modUpdateNotification.render(guiGraphics, pMouseX, pMouseY, pPartialTick);
diff --git a/src/main/java/com/solegendary/reignofnether/orthoview/FaceCulling.java b/src/main/java/com/solegendary/reignofnether/orthoview/FaceCulling.java
new file mode 100644
index 000000000..6e6ef546a
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/orthoview/FaceCulling.java
@@ -0,0 +1,45 @@
+package com.solegendary.reignofnether.orthoview;
+
+import com.solegendary.reignofnether.ReignOfNether;
+import net.minecraft.client.Minecraft;
+import net.minecraftforge.fml.ModList;
+
+import java.lang.reflect.Field;
+
+/**
+ * Embeddium/Rubidium's block face culling hides faces based on where the camera is, which leaves holes
+ * in the map from the RTS camera. It is turned off while the RTS view is on and the player's own value
+ * is put back after. Reflection, so neither mod is a dependency.
+ */
+public final class FaceCulling {
+    private FaceCulling() { }
+
+    private static Boolean saved = null;
+
+    public static void setRtsView(boolean rts) {
+        if (!ModList.get().isLoaded("embeddium") && !ModList.get().isLoaded("rubidium"))
+            return;
+        try {
+            Object options = Class.forName("me.jellysquid.mods.sodium.client.SodiumClientMod").getMethod("options").invoke(null);
+            Object performance = options.getClass().getField("performance").get(options);
+            Field culling = performance.getClass().getField("useBlockFaceCulling");
+            boolean target;
+            if (rts) {
+                if (saved == null)
+                    saved = culling.getBoolean(performance);
+                target = false;
+            } else {
+                if (saved == null)
+                    return;
+                target = saved;
+                saved = null;
+            }
+            if (culling.getBoolean(performance) != target) {
+                culling.setBoolean(performance, target); // in memory only, the player's file is never changed
+                Minecraft.getInstance().levelRenderer.allChanged();
+            }
+        } catch (ReflectiveOperationException | RuntimeException e) {
+            ReignOfNether.LOGGER.warn("Couldn't toggle Embeddium block face culling: {}", e.toString());
+        }
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/orthoview/OrthoviewClientEvents.java b/src/main/java/com/solegendary/reignofnether/orthoview/OrthoviewClientEvents.java
index e142e231b..abde9b6ca 100644
--- a/src/main/java/com/solegendary/reignofnether/orthoview/OrthoviewClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/orthoview/OrthoviewClientEvents.java
@@ -1,7 +1,19 @@
 package com.solegendary.reignofnether.orthoview;
 
+import com.solegendary.reignofnether.minimap.StrategicMapClientEvents;
+import com.solegendary.reignofnether.chat.SystemMessage;
+import com.solegendary.reignofnether.chat.ChatLines;
+import com.solegendary.reignofnether.chat.ChatPanel;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.player.PlayerClientEvents;
+import com.solegendary.reignofnether.ui.HudScale;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.ChatScreen;
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.building.custombuilding.CustomBuildingClientEvents;
 import com.solegendary.reignofnether.building.BuildingPlacement;
 import com.solegendary.reignofnether.building.addon.RangeIndicatorAddon;
 import com.solegendary.reignofnether.config.ReignOfNetherClientConfigs;
@@ -11,6 +23,7 @@
 import com.solegendary.reignofnether.hud.buttons.Button;
 import com.solegendary.reignofnether.hud.HudClientEvents;
 import com.solegendary.reignofnether.hud.TextInputClientEvents;
+import com.solegendary.reignofnether.sandbox.SandboxPanel;
 import com.solegendary.reignofnether.keybinds.Keybinding;
 import com.solegendary.reignofnether.keybinds.Keybindings;
 import com.solegendary.reignofnether.minimap.MinimapClientEvents;
@@ -19,10 +32,12 @@
 import com.solegendary.reignofnether.startpos.StartPosServerboundPacket;
 import com.solegendary.reignofnether.tutorial.TutorialClientEvents;
 import com.solegendary.reignofnether.tutorial.TutorialStage;
+import com.solegendary.reignofnether.ui.Icon;
 import com.solegendary.reignofnether.unit.UnitClientEvents;
 import com.solegendary.reignofnether.faction.Factions;
 import com.solegendary.reignofnether.util.MiscUtil;
 import com.solegendary.reignofnether.util.MyMath;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.CameraType;
 import net.minecraft.client.CloudStatus;
 import net.minecraft.client.Minecraft;
@@ -63,6 +78,10 @@
  */
 public class OrthoviewClientEvents {
 
+    static {
+        WorldState.onClientReset(OrthoviewClientEvents::unlockCam);
+    }
+
     public static final int CHAT_Y_OFFSET = -55; // shift chat up by this much when in RTS cam to make room for the
 
     public enum LeafHideMethod {
@@ -192,7 +211,28 @@ public static boolean isCameraMovingByMouse() {
     }
 
     public static float getZoom() {
-        return zoom;
+        float top = StrategicMapClientEvents.blend();
+        return top <= 0 ? zoom : Mth.lerp(top, zoom, topDownZoom());
+    }
+
+    private static float screenAspect() {
+        return MC.getWindow().getWidth() / (float) Math.max(1, MC.getWindow().getHeight());
+    }
+
+    // the screen stays inside the circle of drawn chunks and inside the world border, so no edge is ever empty
+    private static float topDownZoom() {
+        float aspect = screenAspect();
+        float radius = (MC.options.getEffectiveRenderDistance() - 1) * 16;
+        float fit = radius * 2 / Mth.sqrt(1 + aspect * aspect);
+        if (MC.level != null) {
+            WorldBorder border = MC.level.getWorldBorder();
+            float cos = Math.abs(Mth.cos(getCamRotX() * Mth.DEG_TO_RAD));
+            float sin = Math.abs(Mth.sin(getCamRotX() * Mth.DEG_TO_RAD));
+            // how far the turned screen reaches along each axis of the border
+            fit = Math.min(fit, (float) Math.min((border.getMaxZ() - border.getMinZ()) / (cos + aspect * sin),
+                    (border.getMaxX() - border.getMinX()) / (aspect * cos + sin)));
+        }
+        return Mth.clamp(fit, ZOOM_DEFAULT, 400);
     }
 
     public static float getCamRotX() {
@@ -200,7 +240,7 @@ public static float getCamRotX() {
     }
 
     public static float getCamRotY() {
-        return -camRotY - camRotAdjY;
+        return Mth.lerp(StrategicMapClientEvents.blend(), -camRotY - camRotAdjY, 90);
     }
 
     public static boolean isCameraLocked() {
@@ -246,6 +286,17 @@ public static void zoomCam(float zoomAdj) {
         if (isCameraLocked()) {
             return;
         }
+        // past the furthest zoom the camera turns to look straight down
+        if (StrategicMapClientEvents.isOpen()) {
+            if (zoomAdj < 0)
+                StrategicMapClientEvents.close();
+            return;
+        }
+        if (zoomAdj > 0 && zoom >= ZOOM_MAX) {
+            StrategicMapClientEvents.scrollPast();
+            return;
+        }
+        StrategicMapClientEvents.cancelScroll();
         zoom += zoomAdj;
         if (zoom < ZOOM_MIN) {
             zoom = ZOOM_MIN;
@@ -257,7 +308,7 @@ public static void zoomCam(float zoomAdj) {
 
     public static void panCam(float x, float y, float z) { // pan camera relative to rotation
         if (MC.player != null) {
-            Vec2 XZRotated = MyMath.rotateCoords(x, z, -camRotX - camRotAdjX);
+            Vec2 XZRotated = MyMath.rotateCoords(x, z, getCamRotX());
             MC.player.move(MoverType.SELF, new Vec3(XZRotated.x, y, XZRotated.y));
             clampPlayerToWorldBorder();
         }
@@ -413,6 +464,7 @@ public static void toggleEnable() {
         }
 
         enabled = !enabled;
+        FaceCulling.setRtsView(enabled);
 
         if (enabled) {
             MC.options.tutorialStep = TutorialSteps.NONE;
@@ -496,6 +548,9 @@ public static void onInput(InputEvent.Key evt) {
                 tryToToggleEnable();
             } else if (evt.getKey() == Keybindings.reset.getKey()) {
                 reset();
+            } else if (enabled && Keybindings.altMod.isDown() && !TextInputClientEvents.isAnyInputFocused()
+                    && (evt.getKey() == Keybindings.rotCW.getKey() || evt.getKey() == Keybindings.rotCCW.getKey())) {
+                fixedRotateCam(evt.getKey() == Keybindings.rotCW.getKey()); // Alt + arrow, like the minimap's rotate buttons
             }
             int i = 1;
             for (Keybinding keybind : CAMERA_KEYBINDS) {
@@ -546,7 +601,7 @@ public static void tryToToggleEnable() {
                     MC.gameMode.getPlayerMode() == GameType.ADVENTURE
                             || MC.gameMode.getPlayerMode() == GameType.SURVIVAL
             )) {
-                MC.player.sendSystemMessage(Component.literal(I18n.get("hud.orthoview.reignofnether.ortho_error")));
+                MC.player.sendSystemMessage(SystemMessage.error(Component.literal(I18n.get("hud.orthoview.reignofnether.ortho_error"))));
             } else {
                 toggleEnable();
             }
@@ -557,13 +612,13 @@ public static Button getLeavesHidingButton() {
         return new Button("Hide Leaves Method",
                 14,
                 switch(hideLeavesMethod) {
-                    case NONE -> ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/leaves.png");
-                    case AROUND_UNITS_AND_CURSOR -> ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/lime_stained_glass.png");
-                    case ALL -> ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/glass.png");
+                    case NONE -> Icon.LEAF.texture;
+                    case AROUND_UNITS_AND_CURSOR -> Icon.LEAF.texture;
+                    case ALL -> Icon.EYE.texture;
                 },
                 ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/icon_frame.png"),
                 null,
-                () -> false,
+                () -> hideLeavesMethod != LeafHideMethod.NONE,
                 () -> !TutorialClientEvents.isAtOrPastStage(TutorialStage.MINIMAP_CLICK) || !MinimapClientEvents.isLargeMap(),
                 () -> true,
                 () -> {
@@ -576,6 +631,7 @@ public static Button getLeavesHidingButton() {
                     } else if (hideLeavesMethod == LeafHideMethod.ALL) {
                         hideLeavesMethod = LeafHideMethod.NONE;
                     }
+                    ReignOfNetherClientConfigs.HIDE_LEAVES.set(hideLeavesMethod);
                 },
                 null,
                 List.of(
@@ -608,7 +664,10 @@ public static void onMouseScroll(ScreenEvent.MouseScrolled.Pre evt) {
         if (!enabled || isCameraLocked()) {
             return;
         }
-        if (Keybindings.altMod.isDown()) {
+        // placing a bridge or scrolling the building editor or sandbox sheet uses the wheel too: Alt zooms during those
+        boolean wheelTaken = BuildingClientEvents.getBuildingToPlace() != null || CustomBuildingClientEvents.getCustomBuildingToEdit() != null
+                || SandboxPanel.takesWheel();
+        if (evt.getScreen() instanceof TopdownGui && (Keybindings.altMod.isDown() || !wheelTaken)) {
             zoomCam((float) sign(evt.getScrollDelta()) * -ZOOM_STEP_SCROLL);
         }
     }
@@ -663,8 +722,6 @@ public static void onDrawScreen(ScreenEvent.Render.Post evt) {
             GLFW.glfwSetCursorPos(glfwWindow, cursorX, 0);
         }
 
-        Player player = MC.player;
-
         // zoom in/out with keys
         if (Keybindings.zoomIn.isDown()) {
             zoomCam(-ZOOM_STEP_KEY);
@@ -688,11 +745,20 @@ public static void onDrawScreen(ScreenEvent.Render.Post evt) {
                 panCam(0, 0, -getEdgeCamPanSensitivity());
             }
         }
+    }
+
+    // every frame, not just while the RTS screen draws: between a menu closing and the RTS screen reopening there's
+    // no screen, the mouse is grabbed, and vanilla mouse look would turn the camera
+    @SubscribeEvent
+    public static void onRenderTick(TickEvent.RenderTickEvent evt) {
+        Player player = MC.player;
+        if (evt.phase != TickEvent.Phase.START || !enabled || player == null)
+            return;
         // note that we treat x and y rot as horizontal and vertical, but MC treats it the other way around...
-        if (player != null) {
-            player.setXRot(-camRotY - camRotAdjY);
-            player.setYRot(-camRotX - camRotAdjX);
-        }
+        player.setXRot(getCamRotY());
+        player.setYRot(getCamRotX());
+        player.xRotO = player.getXRot();
+        player.yRotO = player.getYRot();
     }
 
     // prevents stuff like fire and water effects being shown on your HUD
@@ -752,8 +818,8 @@ public static void onMouseDrag(ScreenEvent.MouseDragged.Pre evt) {
             float normalizedX = (float) evt.getDragX() / frameTimeNormalizer;
             float normalizedZ = (float) evt.getDragY() / frameTimeNormalizer;
 
-            float moveX = normalizedX * 0.20f * (zoom / ZOOM_MAX) * getPanSensitivityMult() * frameTimeNormalizer;
-            float moveZ = normalizedZ * 0.20f * (zoom / ZOOM_MAX) * getPanSensitivityMult() * frameTimeNormalizer;
+            float moveX = normalizedX * 0.20f * (getZoom() / ZOOM_MAX) * getPanSensitivityMult() * frameTimeNormalizer;
+            float moveZ = normalizedZ * 0.20f * (getZoom() / ZOOM_MAX) * getPanSensitivityMult() * frameTimeNormalizer;
             panCam(moveX, 0, moveZ);
         } else if (evt.getMouseButton() == GLFW.GLFW_MOUSE_BUTTON_2 && Keybindings.altMod.isDown()) {
             cameraMovingByMouse = true;
@@ -784,6 +850,41 @@ public static void onFovModifier(ViewportEvent.ComputeFov evt) {
         }
     }
 
+    /** A spectator in first person, outside the RTS view: gets the RTS chat and a hint to press F12. */
+    public static boolean spectatingOutside() {
+        return !enabled && MC.player != null && MC.player.isSpectator() && !MC.options.hideGui;
+    }
+
+    // above the spectator hotbar
+    public static int chatBottom(int h) {
+        return h - 10 - 32 - 4 - 11 - 6;
+    }
+
+    @SubscribeEvent
+    public static void onScreenOpening(ScreenEvent.Opening evt) {
+        if (spectatingOutside() && evt.getNewScreen() instanceof ChatScreen && !MC.options.keyCommand.isDown())
+            evt.setNewScreen(new ChatPanel());
+    }
+
+    @SubscribeEvent
+    public static void onRenderGui(RenderGuiEvent.Post evt) {
+        if (!spectatingOutside())
+            return;
+        GuiGraphics g = evt.getGuiGraphics();
+        HudScale scale = HudGeometry.scale();
+        g.pose().pushPose();
+        g.pose().scale(scale.poseScale(), scale.poseScale(), 1);
+        String key = Keybindings.getFnum(12).getCurrentLabel();
+        String hint = PlayerClientEvents.rtsLocked && !PlayerClientEvents.isRTSPlayer()
+                ? I18n.get("hud.reignofnether.join_rts_locked", key) : I18n.get("hud.reignofnether.join_rts", key);
+        int w = Theme.font().width(hint) + 20;
+        Theme.popup(g, (scale.width() - w) / 2, 10, w, 20, Theme.ORANGE);
+        Text.draw(g, hint, (scale.width() - w) / 2 + 10, 16, Theme.TEXT);
+        if (!(MC.screen instanceof ChatPanel))
+            ChatLines.renderRecent(g, 10, chatBottom(scale.height()), 300);
+        g.pose().popPose();
+    }
+
     /*
     @SubscribeEvent
     public static void onRenderOverLay(RenderGuiOverlayEvent.Pre evt) {
@@ -795,6 +896,10 @@ public static void onRenderOverLay(RenderGuiOverlayEvent.Pre evt) {
 
     // OrthoViewMixin uses this to generate a customisation orthographic view to replace the usual view
     // shamelessly copied from ImmersivePortals 1.16
+    private static float lastProjectedZoom = 0;
+    private static int lastProjectedWidth = 0;
+    private static int lastProjectedHeight = 0;
+
     public static Matrix4f getOrthographicProjection() {
         int width = MC.getWindow().getScreenWidth();
         int height = MC.getWindow().getScreenHeight();
@@ -802,7 +907,16 @@ public static Matrix4f getOrthographicProjection() {
         float near = -3000;
         float far = 3000;
 
-        float zoomFinal = zoom;
+        float zoomFinal = getZoom();
+
+        // vanilla only re-picks which chunks are in view when the camera moves or turns, so a wider view from
+        // zooming out would keep the narrower one's chunks until the camera next moved
+        if (zoomFinal != lastProjectedZoom || width != lastProjectedWidth || height != lastProjectedHeight) {
+            lastProjectedZoom = zoomFinal;
+            lastProjectedWidth = width;
+            lastProjectedHeight = height;
+            MC.levelRenderer.needsUpdate();
+        }
 
         float wView = (zoomFinal / height) * width;
         float left = -wView / 2;
diff --git a/src/main/java/com/solegendary/reignofnether/player/PlayerClientEvents.java b/src/main/java/com/solegendary/reignofnether/player/PlayerClientEvents.java
index 490a84bd2..c53e5feb2 100644
--- a/src/main/java/com/solegendary/reignofnether/player/PlayerClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/player/PlayerClientEvents.java
@@ -1,5 +1,7 @@
 package com.solegendary.reignofnether.player;
 
+import com.solegendary.reignofnether.minimap.StrategicMapClientEvents;
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.solegendary.reignofnether.ability.TradeAction;
 import com.solegendary.reignofnether.alliance.AlliancesClient;
 import com.solegendary.reignofnether.building.BuildingClientEvents;
@@ -17,6 +19,7 @@
 import com.solegendary.reignofnether.hero.HeroClientEvents;
 import com.solegendary.reignofnether.cursor.CursorClientEvents;
 import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
 import com.solegendary.reignofnether.items.ItemClientEvents;
 import com.solegendary.reignofnether.hud.playerdisplay.PlayerDisplayClientEvents;
 import com.solegendary.reignofnether.hud.buttons.HelperButtons;
@@ -25,9 +28,15 @@
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import com.solegendary.reignofnether.registrars.SoundRegistrar;
 import com.solegendary.reignofnether.research.ResearchClient;
+import com.solegendary.reignofnether.resources.IncomeTracker;
 import com.solegendary.reignofnether.resources.ResourcesClientEvents;
+import com.solegendary.reignofnether.ui.Toast;
+import com.solegendary.reignofnether.util.WorldState;
+import com.solegendary.reignofnether.hud.panels.CommandCard;
+import com.solegendary.reignofnether.hud.panels.SpectatorHud;
 import com.solegendary.reignofnether.rtsmap.RTSMapInfoClientEvents;
 import com.solegendary.reignofnether.sandbox.SandboxClientEvents;
+import com.solegendary.reignofnether.sandbox.SandboxPanel;
 import com.solegendary.reignofnether.scenario.ScenarioClientEvents;
 import com.solegendary.reignofnether.sounds.SoundClientEvents;
 import com.solegendary.reignofnether.startpos.StartPosClientEvents;
@@ -60,7 +69,7 @@ public class PlayerClientEvents {
     private static final Minecraft MC = Minecraft.getInstance();
     public static boolean rtsLocked = false;
     public static boolean canStartRTS = true;
-    public static final List<RTSPlayer> rtsPlayers = Collections.synchronizedList(new ArrayList<>());
+    public static final List<RTSPlayer> rtsPlayers = WorldState.client(Collections.synchronizedList(new ArrayList<>()));
     public static BlockState lastUsedBlockState = null;
 
     public static boolean isRTSPlayer() {
@@ -79,10 +88,7 @@ public static boolean isRTSPlayer(String playerName) {
 
     @Nullable
     public static RTSPlayer getRTSPlayer() {
-        for (RTSPlayer rtsPlayer : rtsPlayers)
-            if (MC.player != null && rtsPlayer.name.equals(MC.player.getName().getString()))
-                return rtsPlayer;
-        return null;
+        return MC.player == null ? null : getRTSPlayer(MC.player.getName().getString());
     }
 
     @Nullable
@@ -94,10 +100,8 @@ public static RTSPlayer getRTSPlayer(String playerName) {
     }
 
     public static Faction getFaction() {
-        for (RTSPlayer rtsPlayer : rtsPlayers)
-            if (MC.player != null && rtsPlayer.name.equals(MC.player.getName().getString()))
-                return rtsPlayer.faction;
-        return Factions.NONE;
+        RTSPlayer rtsPlayer = getRTSPlayer();
+        return rtsPlayer != null ? rtsPlayer.faction : Factions.NONE;
     }
 
     public static RTSPlayer getPlayer(String playerName) {
@@ -125,6 +129,15 @@ public static int getPlayerMapColorId(String playerName) {
         return player.startPosColorId; // corresponds to a MapColor.id
     }
 
+    public static Faction getPlayerFaction(String playerName) {
+        var player = getPlayer(playerName);
+        if (player == null) {
+            return Factions.NONE;
+        }
+
+        return player.faction;
+    }
+
     public static String getPlayerName() {
         return MC.player != null ? MC.player.getName().getString() : "";
     }
@@ -173,34 +186,32 @@ public static void onRegisterCommand(RegisterClientCommandsEvent evt) {
             })));
         evt.getDispatcher().register(Commands.literal("rts-help").executes((command) -> {
             if (MC.player != null) {
-                MC.player.sendSystemMessage(Component.literal(""));
-                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.toggle_fow","/rts-fog enable/disable"));
-                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.surrender","/rts-surrender"));
-                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.reset", "/rts-reset"));
-                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.hard_reset", "/rts-hard-reset"));
-                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.lock", "/rts-lock enable/disable"));
-                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.ally", "/ally"));
-                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.disband", "/disband"));
-                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.send_resources", "/sendfood | wood | ore <playername> <amount>"));
-                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.camera", "/rts-camera"));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("commands.reignofnether.toggle_fow","/rts-fog enable/disable")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("commands.reignofnether.surrender","/rts-surrender")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("commands.reignofnether.reset", "/rts-reset")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("commands.reignofnether.hard_reset", "/rts-hard-reset")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("commands.reignofnether.lock", "/rts-lock enable/disable")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("commands.reignofnether.ally", "/ally")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("commands.reignofnether.disband", "/disband")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("commands.reignofnether.send_resources", "/sendfood | wood | ore <playername> <amount>")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("commands.reignofnether.camera", "/rts-camera")));
             }
             return 1;
         }));
         evt.getDispatcher().register(Commands.literal("rts-controls").executes((command) -> {
             if (MC.player != null) {
-                MC.player.sendSystemMessage(Component.literal(""));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.toggle_cam"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.refresh_chunks"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.toggle_fps_tps"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.deselect"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.command"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.create_group"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.recenter_map"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.select_same"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.destroy"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.rotate_cam"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.zoom"));
-                MC.player.sendSystemMessage(Component.translatable("controls.reignofnether.rotate"));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.toggle_cam")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.refresh_chunks")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.toggle_fps_tps")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.deselect")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.command")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.create_group")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.recenter_map")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.select_same")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.destroy")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.rotate_cam")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.zoom")));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("controls.reignofnether.rotate")));
             }
             return 1;
         }));
@@ -226,7 +237,7 @@ public static void defeat(String playerName) {
             return;
 
         if (!SandboxClientEvents.isSandboxPlayer(playerName)) {
-            MC.gui.setTitle(Component.translatable("titles.reignofnether.defeated"));
+            com.solegendary.reignofnether.matchstart.ResultBanner.show(false);
             MC.player.playSound(SoundRegistrar.DEFEAT.get(), 0.5f, 1.0f);
         }
         ResearchClient.removeAllResearch();
@@ -238,7 +249,7 @@ public static void victory(String playerName) {
         if (MC.player == null || !MC.player.getName().getString().equals(playerName)) {
             return;
         }
-        MC.gui.setTitle(Component.translatable("titles.reignofnether.victorious"));
+        com.solegendary.reignofnether.matchstart.ResultBanner.show(true);
         MC.player.playSound(SoundRegistrar.VICTORY.get(), 0.5f, 1.0f);
     }
 
@@ -302,35 +313,8 @@ public static void onClientLogout(ClientPlayerNetworkEvent.LoggingOut evt) {
 
     private static void resetAll() {
         resetRTS(true);
-        UnitClientEvents.getAllUnits().clear();
-        BuildingClientEvents.getBuildings().clear();
-        FogOfWarClientEvents.movedToCapitol = false;
-        FogOfWarClientEvents.brightChunks.clear();
-        OrthoviewClientEvents.unlockCam();
-        HeroClientEvents.fallenHeroes.clear();
-        PlayerDisplayClientEvents.resetDisplay();
-        PlayerColors.reset();
-        CustomBuildingClientEvents.setCustomBuildingToEdit(null);
-        AlliancesClient.resetAllAlliances();
-        RTSMapInfoClientEvents.reset();
-        MinimapClientEvents.clearVirtualUnits();
-        PlayerDisplayClientEvents.clearAll();
-        rtsPlayers.clear();
-        synchronized (UnitClientEvents.mobEffectIcons) {
-            UnitClientEvents.mobEffectIcons.clear();
-        }
-        // nothing from the old world left selected, armed or open in the next one
-        HudClientEvents.hudSelectedEntity = null;
-        HudClientEvents.hudSelectedPlacement = null;
-        BuildingClientEvents.setBuildingToPlace(null);
-        CursorClientEvents.setLeftClickAction(null);
-        CursorClientEvents.setLeftClickSandboxAction(null);
-        ItemClientEvents.resetActions();
-        ItemClientEvents.hoveredInvItem = null;
-        ItemClientEvents.openItemShop = null;
-        AlliancesClient.inboundPendingAlliances.clear();
-        AlliancesClient.outboundPendingAlliances.clear();
-        MinimapClientEvents.mapMarkers.clear();
+        // everything declared through WorldState (each class registers its own world state)
+        WorldState.resetClient();
         // PlayerLoggedOutEvent fires on the integrated server thread in singleplayer
         MC.execute(() -> {
             ScenarioClientEvents.resetRoles();
@@ -392,7 +376,7 @@ public static void resetRTS(boolean hardReset) {
         SoundClientEvents.stopFadeableMusicInstance();
 
         HudClientEvents.controlGroups.clear();
-        UnitClientEvents.getSelectedUnits().clear();
+        UnitClientEvents.clearSelectedUnits();
         UnitClientEvents.getPreselectedUnits().clear();
         if (!isSandboxOrScenario)
             UnitClientEvents.getAllUnits().removeIf(u -> (hardReset || (u instanceof Unit unit && !Unit.hasAnchor(unit))));
@@ -420,6 +404,11 @@ public static void resetRTS(boolean hardReset) {
         PlayerDisplayClientEvents.resetDisplay();
         TimeClientEvents.resetBloodMoon();
         CustomBuildingClientEvents.setCustomBuildingToEdit(null);
+        IncomeTracker.reset();
+        CommandCard.reset();
+        SandboxPanel.reset();
+        SpectatorHud.reset();
+        Toast.clear();
     }
 
     public static void publishScenarioMap() {
@@ -428,7 +417,7 @@ public static void publishScenarioMap() {
         HelperButtons.updateButtons();
         SoundClientEvents.stopFadeableMusicInstance();
         HudClientEvents.controlGroups.clear();
-        UnitClientEvents.getSelectedUnits().clear();
+        UnitClientEvents.clearSelectedUnits();
         UnitClientEvents.getPreselectedUnits().clear();
         UnitClientEvents.idleWorkerIds.clear();
         ResearchClient.removeAllResearch();
diff --git a/src/main/java/com/solegendary/reignofnether/player/PlayerColors.java b/src/main/java/com/solegendary/reignofnether/player/PlayerColors.java
index 19b58aae2..1fe911449 100644
--- a/src/main/java/com/solegendary/reignofnether/player/PlayerColors.java
+++ b/src/main/java/com/solegendary/reignofnether/player/PlayerColors.java
@@ -7,6 +7,7 @@
 import com.solegendary.reignofnether.tutorial.TutorialClientEvents;
 import com.solegendary.reignofnether.tutorial.TutorialStage;
 import com.solegendary.reignofnether.unit.Relationship;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.material.MapColor;
@@ -18,6 +19,10 @@
 import static com.solegendary.reignofnether.util.MiscUtil.fcs;
 
 public class PlayerColors {
+
+    static {
+        WorldState.onClientReset(PlayerColors::reset);
+    }
     /**
      * Indicates which color mode is used. This affects unit/buildings outlines, as well as some UI elements.
      * @return true if using player colors, false if using relation colors
@@ -162,7 +167,7 @@ public static ResourceLocation getColorIcon(int colorIndex) {
 
     public static int getPlayerColorHex(String playerName) {
         if (playerName == null || playerName.isBlank()) {
-            return COLOR_WHITE.hexCode;
+            return COLOR_NEUTRAL.hexCode;
         }
 
         int colorId = getPlayerColorId(playerName);
diff --git a/src/main/java/com/solegendary/reignofnether/player/PlayerServerEvents.java b/src/main/java/com/solegendary/reignofnether/player/PlayerServerEvents.java
index c9016d8f1..6e4509b37 100644
--- a/src/main/java/com/solegendary/reignofnether/player/PlayerServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/player/PlayerServerEvents.java
@@ -2,6 +2,7 @@
 
 import com.solegendary.reignofnether.building.buildings.placements.ItemShopPlacement;
 import com.solegendary.reignofnether.taskscheduler.TaskSchedulerServerEvents;
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.ability.HeroAbility;
 import com.solegendary.reignofnether.ability.TradeAction;
@@ -35,6 +36,7 @@
 import com.solegendary.reignofnether.scenario.ScenarioRole;
 import com.solegendary.reignofnether.scenario.ScenarioServerEvents;
 import com.solegendary.reignofnether.scenario.ScenarioUtils;
+import com.solegendary.reignofnether.taskscheduler.TaskSchedulerServerEvents;
 import com.solegendary.reignofnether.startpos.StartPosServerEvents;
 import com.solegendary.reignofnether.survival.SurvivalServerEvents;
 import com.solegendary.reignofnether.time.TimeServerEvents;
@@ -47,12 +49,13 @@
 import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
 import com.solegendary.reignofnether.unit.packets.UnitSyncClientboundPacket;
 import com.solegendary.reignofnether.util.MiscUtil;
+import com.solegendary.reignofnether.util.WorldState;
 import com.solegendary.reignofnether.worldborder.WorldBorderServerEvents;
 import net.minecraft.commands.Commands;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Vec3i;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -72,7 +75,6 @@
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.server.ServerStartedEvent;
 import net.minecraftforge.event.server.ServerStoppingEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.network.NetworkHooks;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -93,15 +95,15 @@
 public class PlayerServerEvents {
 
     // list of what gamemode these players should be in when outside of RTS cam
-    private static final Map<String, GameType> playerDefaultGameModes = new HashMap<>();
-    private static final Map<String, Boolean> playerGuiOpenStatus = new HashMap<>();
+    private static final Map<String, GameType> playerDefaultGameModes = WorldState.server(new HashMap<>());
+    private static final Map<String, Boolean> playerGuiOpenStatus = WorldState.server(new HashMap<>());
 
-    public static final ArrayList<ServerPlayer> players = new ArrayList<>();
-    public static final ArrayList<ServerPlayer> orthoviewPlayers = new ArrayList<>();
+    public static final ArrayList<ServerPlayer> players = WorldState.server(new ArrayList<>());
+    public static final ArrayList<ServerPlayer> orthoviewPlayers = WorldState.server(new ArrayList<>());
     // players that are currently playing a match
-    public static final List<RTSPlayer> rtsPlayers = Collections.synchronizedList(new ArrayList<>());
+    public static final List<RTSPlayer> rtsPlayers = WorldState.server(Collections.synchronizedList(new ArrayList<>()));
     // list of players after a match ends
-    public static final List<RTSPlayer> postGameRtsPlayers = Collections.synchronizedList(new ArrayList<>());
+    public static final List<RTSPlayer> postGameRtsPlayers = WorldState.server(Collections.synchronizedList(new ArrayList<>()));
     public static boolean rtsLocked = false; // can players join as RTS players or not?
     public static boolean rtsSyncingEnabled = true; // will logging in players sync units and buildings?
 
@@ -110,6 +112,13 @@ public class PlayerServerEvents {
     public static final int TICKS_TO_REVEAL = 60 * ResourceCost.TICKS_PER_SECOND;
 
     public static long rtsGameTicks = 0; // ticks up as long as there is at least 1 rtsPlayer
+    static {
+        WorldState.onServerReset(() -> {
+            rtsLocked = false;
+            rtsSyncingEnabled = true;
+            rtsGameTicks = 0;
+        });
+    }
 
     public static ServerLevel serverLevel = null;
 
@@ -177,18 +186,6 @@ public static void onServerStopping(ServerStoppingEvent evt) {
     }
 
     // statics outlive the world: clear them so the next world opened in this game starts clean
-    @SubscribeEvent
-    public static void onServerStopped(ServerStoppedEvent evt) {
-        rtsPlayers.clear();
-        postGameRtsPlayers.clear();
-        players.clear();
-        orthoviewPlayers.clear();
-        playerDefaultGameModes.clear();
-        playerGuiOpenStatus.clear();
-        rtsLocked = false;
-        rtsSyncingEnabled = true;
-        rtsGameTicks = 0;
-    }
 
     // ops, or the singleplayer/LAN host (who has no permission level when cheats are off)
     public static boolean isOpOrHost(ServerPlayer player) {
@@ -352,36 +349,6 @@ public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent evt) {
         if (!inOrthoviewList)
             orthoviewPlayers.add((ServerPlayer) evt.getEntity());
 
-        if (!TutorialServerEvents.isEnabled()) {
-            if (!isRTSPlayer(serverPlayer.getId())) {
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.welcome")
-                    .withStyle(Style.EMPTY.withBold(true)));
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.join"));
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.help"));
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.controls"));
-                if (rtsLocked) {
-                    serverPlayer.sendSystemMessage(Component.literal(""));
-                    serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.locked"));
-                }
-            } else {
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.welcome_back")
-                    .withStyle(Style.EMPTY.withBold(true)));
-            }
-            if (serverPlayer.hasPermissions(4)) {
-                serverPlayer.sendSystemMessage(Component.literal(""));
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.op_commands"));
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.fog"));
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.lock"));;
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.reset"));
-                serverPlayer.sendSystemMessage(Component.literal(""));
-            }
-            if (!rtsSyncingEnabled) {
-                serverPlayer.sendSystemMessage(Component.literal(""));
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.sync_disabled1"));
-                serverPlayer.sendSystemMessage(Component.translatable("tutorial.reignofnether.sync_disabled2"));
-                serverPlayer.sendSystemMessage(Component.literal(""));
-            }
-        }
         if (getRTSPlayer(playerName) == null) {
             PlayerClientboundPacket.removeRTSPlayer(playerName);
         }
@@ -439,21 +406,15 @@ public static void startRTS(int playerId, Vec3 pos, Faction faction, int startPo
                 return;
             }
             if (rtsLocked) {
-                serverPlayer.sendSystemMessage(Component.literal(""));
-                serverPlayer.sendSystemMessage(Component.translatable("server.reignofnether.locked"));
-                serverPlayer.sendSystemMessage(Component.literal(""));
+                serverPlayer.sendSystemMessage(SystemMessage.error(Component.translatable("server.reignofnether.locked")));
                 return;
             }
             if (isRTSPlayer(serverPlayer.getId())) {
-                serverPlayer.sendSystemMessage(Component.literal(""));
-                serverPlayer.sendSystemMessage(Component.translatable("server.reignofnether.already_started"));
-                serverPlayer.sendSystemMessage(Component.literal(""));
+                serverPlayer.sendSystemMessage(SystemMessage.error(Component.translatable("server.reignofnether.already_started")));
                 return;
             }
             if (serverPlayer.level().getWorldBorder().getDistanceToBorder(pos.x, pos.z) < 1 && faction != Factions.NONE) {
-                serverPlayer.sendSystemMessage(Component.literal(""));
-                serverPlayer.sendSystemMessage(Component.translatable("server.reignofnether.outside_border"));
-                serverPlayer.sendSystemMessage(Component.literal(""));
+                serverPlayer.sendSystemMessage(SystemMessage.error(Component.translatable("server.reignofnether.outside_border")));
                 return;
             }
             boolean isDogPerson = random.nextBoolean();
@@ -580,7 +541,6 @@ public static void startRTS(int playerId, Vec3 pos, Faction faction, int startPo
             boolean coopMode = serverLevel.getGameRules().getRule(GameRuleRegistrar.COOP_MODE).get();
 
             if (!TutorialServerEvents.isEnabled() && !readiedStart) {
-                serverPlayer.sendSystemMessage(Component.literal(""));
                 if (faction.equals(Factions.NONE))
                     sendMessageToAllPlayers("server.reignofnether.started_sandbox", true, playerName);
                 else if (coopMode)
@@ -661,27 +621,19 @@ public static void startRTSScenario(int playerId, int roleIndex) {
                 return;
             }
             if (role.isNpc) {
-                serverPlayer.sendSystemMessage(Component.literal(""));
-                serverPlayer.sendSystemMessage(Component.translatable("sandbox.reignofnether.scenario.npc_role_error"));
-                serverPlayer.sendSystemMessage(Component.literal(""));
+                serverPlayer.sendSystemMessage(SystemMessage.error(Component.translatable("sandbox.reignofnether.scenario.npc_role_error")));
             }
             if (rtsLocked) {
-                serverPlayer.sendSystemMessage(Component.literal(""));
-                serverPlayer.sendSystemMessage(Component.translatable("server.reignofnether.locked"));
-                serverPlayer.sendSystemMessage(Component.literal(""));
+                serverPlayer.sendSystemMessage(SystemMessage.error(Component.translatable("server.reignofnether.locked")));
                 return;
             }
             if (isRTSPlayer(serverPlayer.getId())) {
-                serverPlayer.sendSystemMessage(Component.literal(""));
-                serverPlayer.sendSystemMessage(Component.translatable("server.reignofnether.already_started_scenario"));
-                serverPlayer.sendSystemMessage(Component.literal(""));
+                serverPlayer.sendSystemMessage(SystemMessage.error(Component.translatable("server.reignofnether.already_started_scenario")));
                 return;
             }
             for (RTSPlayer rtsPlayer : rtsPlayers) {
                 if (rtsPlayer.scenarioRoleIndex == roleIndex) {
-                    serverPlayer.sendSystemMessage(Component.literal(""));
-                    serverPlayer.sendSystemMessage(Component.translatable("server.reignofnether.scenario_role_taken"));
-                    serverPlayer.sendSystemMessage(Component.literal(""));
+                    serverPlayer.sendSystemMessage(SystemMessage.error(Component.translatable("server.reignofnether.scenario_role_taken")));
                     return;
                 }
             }
@@ -971,69 +923,29 @@ public static void sendMessageToAllPlayers(String msg) {
         sendMessageToAllPlayers(msg, false);
     }
 
-    public static void sendMessageToAllPlayers(String msg, int color, boolean bold, Object... formatArgs) {
-        for (ServerPlayer player : players) {
-            player.sendSystemMessage(Component.literal(""));
-            if (bold) {
-                player.sendSystemMessage(Component.translatable(msg, formatArgs)
-                        .withStyle(Style.EMPTY.withBold(true).withColor(color)));
-            } else {
-                player.sendSystemMessage(Component.translatable(msg, formatArgs)
-                        .withStyle(Style.EMPTY.withBold(false).withColor(color)));
-            }
-            player.sendSystemMessage(Component.literal(""));
-        }
-    }
-
-    public static void sendMessageToAllPlayers(String msg, boolean bold,  Object... formatArgs) {
-        sendMessageToAllPlayers(msg, 0xFFFFFF, bold, formatArgs);
+    // important lines get the ▲ marker (see SystemMessage); colour tints the text, 0xFFFFFF leaves the default
+    public static void sendMessageToAllPlayers(String msg, int color, boolean important, Object... formatArgs) {
+        MutableComponent text = Component.translatable(msg, formatArgs);
+        if (color != 0xFFFFFF)
+            text.withStyle(s -> s.withColor(color));
+        Component line = important ? SystemMessage.important(text) : SystemMessage.info(text);
+        for (ServerPlayer player : players)
+            player.sendSystemMessage(line);
     }
 
-    public static void sendMessageToAllPlayersNoNewlines(String msg) {
-        sendMessageToAllPlayersNoNewlines(msg, false);
-    }
-
-    public static void sendMessageToAllPlayersNoNewlines(String msg, boolean bold, Object... formatArgs) {
-        for (ServerPlayer player : players) {
-            if (bold) {
-                player.sendSystemMessage(Component.translatable(msg, formatArgs).withStyle(Style.EMPTY.withBold(true)));
-            } else {
-                player.sendSystemMessage(Component.translatable(msg, formatArgs));
-            }
-        }
-    }
-
-    public static void sendMessageToPlayerNoNewLines(String playerName, String msg) {
-        sendMessageToPlayerNoNewLines(playerName, msg, false);
+    public static void sendMessageToAllPlayers(String msg, boolean important, Object... formatArgs) {
+        sendMessageToAllPlayers(msg, 0xFFFFFF, important, formatArgs);
     }
 
     public static void sendMessageToPlayer(String playerName, String msg) {
         sendMessageToPlayer(playerName, msg, false);
     }
 
-    public static void sendMessageToPlayerNoNewLines(String playerName, String msg, boolean bold, Object... formatArgs) {
-        for (ServerPlayer player : players) {
-            if (player.getName().getString().equals(playerName)) {
-                if (bold) {
-                    player.sendSystemMessage(Component.translatable(msg, formatArgs).withStyle(Style.EMPTY.withBold(true)));
-                } else {
-                    player.sendSystemMessage(Component.translatable(msg, formatArgs));
-                }
-                return;
-            }
-        }
-    }
-
-    public static void sendMessageToPlayer(String playerName, String msg, boolean bold, Object... formatArgs) {
+    public static void sendMessageToPlayer(String playerName, String msg, boolean important, Object... formatArgs) {
+        Component text = Component.translatable(msg, formatArgs);
         for (ServerPlayer player : players) {
             if (player.getName().getString().equals(playerName)) {
-                player.sendSystemMessage(Component.literal(""));
-                if (bold) {
-                    player.sendSystemMessage(Component.translatable(msg, formatArgs).withStyle(Style.EMPTY.withBold(true)));
-                } else {
-                    player.sendSystemMessage(Component.translatable(msg, formatArgs));
-                }
-                player.sendSystemMessage(Component.literal(""));
+                player.sendSystemMessage(important ? SystemMessage.important(text) : SystemMessage.info(text));
                 return;
             }
         }
diff --git a/src/main/java/com/solegendary/reignofnether/player/PlayerServerboundPacket.java b/src/main/java/com/solegendary/reignofnether/player/PlayerServerboundPacket.java
index c81f986c0..e0ec2c626 100644
--- a/src/main/java/com/solegendary/reignofnether/player/PlayerServerboundPacket.java
+++ b/src/main/java/com/solegendary/reignofnether/player/PlayerServerboundPacket.java
@@ -1,5 +1,6 @@
 package com.solegendary.reignofnether.player;
 
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.building.BuildingUtils;
 import com.solegendary.reignofnether.building.buildings.placements.BeaconPlacement;
@@ -20,7 +21,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
@@ -92,49 +92,33 @@ public static void startRTS(Faction faction, Double x, Double y, Double z) {
                     String diffMsg = I18n.get("hud.gamemode.reignofnether.survival5",
                             diff, SurvivalClientEvents.getMinutesPerDay()).toLowerCase();
                     diffMsg = diffMsg.substring(0,1).toUpperCase() + diffMsg.substring(1);
-                    MC.player.sendSystemMessage(Component.literal(""));
-                    MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.survival1")
-                            .withStyle(Style.EMPTY.withBold(true)));
-                    MC.player.sendSystemMessage(Component.literal(diffMsg));
-                    MC.player.sendSystemMessage(Component.literal(new String(new char[diffMsg.length()]).replace("\0", "-")));
-                    MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.survival2"));
-                    MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.survival3"));
-                    MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.survival4"));
-                    MC.player.sendSystemMessage(Component.literal(""));
+                    MC.player.sendSystemMessage(SystemMessage.important(Component.translatable("hud.gamemode.reignofnether.survival1")));
+                    MC.player.sendSystemMessage(SystemMessage.info(Component.literal(diffMsg)));
+                    MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("hud.gamemode.reignofnether.survival2")));
+                    MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("hud.gamemode.reignofnether.survival3")));
+                    MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("hud.gamemode.reignofnether.survival4")));
                 });
             } else if (ClientGameModeHelper.gameMode == GameMode.CLASSIC) {
                 BeaconPlacement beacon = BuildingUtils.getBeacon(true);
                 boolean isKotB = beacon != null && beacon.getBuilding().capturable;
                 if (isKotB) {
                     CompletableFuture.delayedExecutor(2000, TimeUnit.MILLISECONDS).execute(() -> {
-                        MC.player.sendSystemMessage(Component.literal(""));
-                        MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.kotb1")
-                                .withStyle(Style.EMPTY.withBold(true)));
-                        MC.player.sendSystemMessage(Component.literal("--------"));
-                        MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.kotb2"));
-                        MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.kotb3"));
-                        MC.player.sendSystemMessage(Component.literal(""));
+                        MC.player.sendSystemMessage(SystemMessage.important(Component.translatable("hud.gamemode.reignofnether.kotb1")));
+                        MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("hud.gamemode.reignofnether.kotb2")));
+                        MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("hud.gamemode.reignofnether.kotb3")));
                     });
                 } else {
                     CompletableFuture.delayedExecutor(2000, TimeUnit.MILLISECONDS).execute(() -> {
-                        MC.player.sendSystemMessage(Component.literal(""));
-                        MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.classic1")
-                                .withStyle(Style.EMPTY.withBold(true)));
-                        MC.player.sendSystemMessage(Component.literal("--------"));
-                        MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.classic2"));
-                        MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.classic3"));
-                        MC.player.sendSystemMessage(Component.literal(""));
+                        MC.player.sendSystemMessage(SystemMessage.important(Component.translatable("hud.gamemode.reignofnether.classic1")));
+                        MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("hud.gamemode.reignofnether.classic2")));
+                        MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("hud.gamemode.reignofnether.classic3")));
                     });
                 }
             } else if (ClientGameModeHelper.gameMode == GameMode.SANDBOX) {
                 CompletableFuture.delayedExecutor(2000, TimeUnit.MILLISECONDS).execute(() -> {
-                    MC.player.sendSystemMessage(Component.literal(""));
-                    MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.sandbox1")
-                            .withStyle(Style.EMPTY.withBold(true)));
-                    MC.player.sendSystemMessage(Component.literal("--------"));
-                    MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.sandbox2"));
-                    MC.player.sendSystemMessage(Component.translatable("hud.gamemode.reignofnether.sandbox3"));
-                    MC.player.sendSystemMessage(Component.literal(""));
+                    MC.player.sendSystemMessage(SystemMessage.important(Component.translatable("hud.gamemode.reignofnether.sandbox1")));
+                    MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("hud.gamemode.reignofnether.sandbox2")));
+                    MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("hud.gamemode.reignofnether.sandbox3")));
                 });
             }
         }
diff --git a/src/main/java/com/solegendary/reignofnether/player/RTSPlayerScoresCommand.java b/src/main/java/com/solegendary/reignofnether/player/RTSPlayerScoresCommand.java
index 382e56777..743d4f33f 100644
--- a/src/main/java/com/solegendary/reignofnether/player/RTSPlayerScoresCommand.java
+++ b/src/main/java/com/solegendary/reignofnether/player/RTSPlayerScoresCommand.java
@@ -1,5 +1,6 @@
 package com.solegendary.reignofnether.player;
 
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.context.CommandContext;
@@ -29,11 +30,11 @@ public static int executeOnPlayer(CommandContext<CommandSourceStack> command, Pl
 
             for (RTSPlayer rtsPlayer : PlayerServerEvents.postGameRtsPlayers) {
                 if (Objects.equals(rtsPlayer.name, targetName)) {
-                    player.sendSystemMessage(Component.literal(displayScores(rtsPlayer)));
+                    player.sendSystemMessage(SystemMessage.info(Component.literal(displayScores(rtsPlayer))));
                     return Command.SINGLE_SUCCESS;
                 }
             }
-            player.sendSystemMessage(Component.translatable("message.reignofnether.commands.scores.player_not_available", targetName));
+            player.sendSystemMessage(SystemMessage.error(Component.translatable("message.reignofnether.commands.scores.player_not_available", targetName)));
         }
 
         return Command.SINGLE_SUCCESS;
@@ -43,9 +44,9 @@ public static int execute(CommandContext<CommandSourceStack> command) {
         if (command.getSource().getEntity() instanceof Player player) {
             List<RTSPlayer> rtsPlayers = PlayerServerEvents.postGameRtsPlayers;
             if (rtsPlayers.isEmpty())
-                player.sendSystemMessage(Component.translatable("message.reignofnether.commands.scores.none_defeated"));
+                player.sendSystemMessage(SystemMessage.info(Component.translatable("message.reignofnether.commands.scores.none_defeated")));
             else
-                player.sendSystemMessage(Component.literal(displayScores(rtsPlayers)));
+                player.sendSystemMessage(SystemMessage.info(Component.literal(displayScores(rtsPlayers))));
         }
 
         return Command.SINGLE_SUCCESS;
diff --git a/src/main/java/com/solegendary/reignofnether/registrars/ClientEventRegistrar.java b/src/main/java/com/solegendary/reignofnether/registrars/ClientEventRegistrar.java
index bba6081d5..2714b6fb6 100644
--- a/src/main/java/com/solegendary/reignofnether/registrars/ClientEventRegistrar.java
+++ b/src/main/java/com/solegendary/reignofnether/registrars/ClientEventRegistrar.java
@@ -1,5 +1,6 @@
 package com.solegendary.reignofnether.registrars;
 
+import com.solegendary.reignofnether.util.WorldToScreen;
 import com.solegendary.reignofnether.alliance.AlliancesServerEvents;
 import com.solegendary.reignofnether.attackwarnings.AttackWarningClientEvents;
 import com.solegendary.reignofnether.attackwarnings.AttackWarningServerEvents;
@@ -33,8 +34,11 @@
 import com.solegendary.reignofnether.items.ItemClientEvents;
 import com.solegendary.reignofnether.items.ItemServerEvents;
 import com.solegendary.reignofnether.matchstart.MatchEndClientEvents;
+import com.solegendary.reignofnether.chat.ChatLog;
+import com.solegendary.reignofnether.hud.panels.SettingsMenu;
 import com.solegendary.reignofnether.matchstart.MatchStartClientEvents;
 import com.solegendary.reignofnether.minimap.MinimapClientEvents;
+import com.solegendary.reignofnether.loading.LoadingScreenClientEvents;
 import com.solegendary.reignofnether.orthoview.CameraFadeClientEvents;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import com.solegendary.reignofnether.player.PlayerClientEvents;
@@ -44,7 +48,6 @@
 import com.solegendary.reignofnether.resources.ResourcesServerEvents;
 import com.solegendary.reignofnether.rtsmap.RTSMapInfoServerEvents;
 import com.solegendary.reignofnether.sandbox.SandboxClientEvents;
-import com.solegendary.reignofnether.scenario.ScenarioClientEvents;
 import com.solegendary.reignofnether.scenario.ScenarioServerEvents;
 import com.solegendary.reignofnether.sounds.SoundClientEvents;
 import com.solegendary.reignofnether.startpos.StartPosClientEvents;
@@ -63,6 +66,7 @@
 import com.solegendary.reignofnether.unit.UnitServerEvents;
 import com.solegendary.reignofnether.worldborder.WorldBorderClientEvents;
 import com.solegendary.reignofnether.worldborder.WorldBorderServerEvents;
+import com.solegendary.reignofnether.minimap.MapColourServerEvents;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.IEventBus;
 
@@ -88,6 +92,7 @@ public void registerClientEvents() {
         vanillaEventBus.register(AttackWarningClientEvents.class);
         vanillaEventBus.register(CursorClientEvents.class);
         vanillaEventBus.register(MinimapClientEvents.class);
+        vanillaEventBus.register(LoadingScreenClientEvents.class);
         vanillaEventBus.register(TimeClientEvents.class);
         vanillaEventBus.register(BlockClientEvents.class);
         vanillaEventBus.register(FogOfWarClientEvents.class);
@@ -99,14 +104,17 @@ public void registerClientEvents() {
         vanillaEventBus.register(SurvivalClientEvents.class);
         vanillaEventBus.register(StartPosClientEvents.class);
         vanillaEventBus.register(MatchStartClientEvents.class);
+        vanillaEventBus.register(SettingsMenu.class);
+        vanillaEventBus.register(com.solegendary.reignofnether.matchstart.ResultBanner.class);
+        vanillaEventBus.register(ChatLog.class);
         vanillaEventBus.register(MatchEndClientEvents.class);
         vanillaEventBus.register(NonUnitClientEvents.class);
         vanillaEventBus.register(HeroClientEvents.class);
         vanillaEventBus.register(CustomBuildingClientEvents.class);
         vanillaEventBus.register(SoundClientEvents.class);
         vanillaEventBus.register(PlayerDisplayClientEvents.class);
-        vanillaEventBus.register(ScenarioClientEvents.class);
         vanillaEventBus.register(TextInputClientEvents.class);
+        vanillaEventBus.register(WorldToScreen.class);
         vanillaEventBus.register(RtsDebugClientEvents.class);
         vanillaEventBus.register(RtsDebugNavmesh.class);
         vanillaEventBus.register(RtsDebugPathPreview.class);
@@ -139,8 +147,10 @@ public void registerClientEvents() {
         vanillaEventBus.register(CommandsServerEvents.class);
         vanillaEventBus.register(ScenarioServerEvents.class);
         vanillaEventBus.register(WorldBorderServerEvents.class);
+        vanillaEventBus.register(MapColourServerEvents.class);
         vanillaEventBus.register(CustomButtonServerEvents.class);
         vanillaEventBus.register(ItemServerEvents.class);
         vanillaEventBus.register(TaskSchedulerServerEvents.class);
+        vanillaEventBus.register(com.solegendary.reignofnether.util.WorldState.class);
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/registrars/PacketHandler.java b/src/main/java/com/solegendary/reignofnether/registrars/PacketHandler.java
index 2398a2cd1..55d46b512 100644
--- a/src/main/java/com/solegendary/reignofnether/registrars/PacketHandler.java
+++ b/src/main/java/com/solegendary/reignofnether/registrars/PacketHandler.java
@@ -26,6 +26,7 @@
 import com.solegendary.reignofnether.items.ItemClientboundPacket;
 import com.solegendary.reignofnether.items.ItemServerboundPacket;
 import com.solegendary.reignofnether.items.ItemShopClientboundPacket;
+import com.solegendary.reignofnether.minimap.MapColoursClientboundPacket;
 import com.solegendary.reignofnether.minimap.MapMarkerClientboundPacket;
 import com.solegendary.reignofnether.minimap.MapMarkerServerboundPacket;
 import com.solegendary.reignofnether.orthoview.CameraClientboundPacket;
@@ -341,6 +342,12 @@ public static void init() {
                 .consumerMainThread(MapMarkerClientboundPacket::handle)
                 .add();
 
+        INSTANCE.messageBuilder(MapColoursClientboundPacket.class, index++, NetworkDirection.PLAY_TO_CLIENT)
+                .encoder(MapColoursClientboundPacket::encode)
+                .decoder(MapColoursClientboundPacket::new)
+                .consumerMainThread(MapColoursClientboundPacket::handle)
+                .add();
+
         INSTANCE.messageBuilder(ScenarioServerboundPacket.class, index++, NetworkDirection.PLAY_TO_SERVER)
                 .encoder(ScenarioServerboundPacket::encode)
                 .decoder(ScenarioServerboundPacket::new)
diff --git a/src/main/java/com/solegendary/reignofnether/registrars/ServerEventRegistrar.java b/src/main/java/com/solegendary/reignofnether/registrars/ServerEventRegistrar.java
index a2d9bb823..d35740ec6 100644
--- a/src/main/java/com/solegendary/reignofnether/registrars/ServerEventRegistrar.java
+++ b/src/main/java/com/solegendary/reignofnether/registrars/ServerEventRegistrar.java
@@ -26,6 +26,7 @@
 import com.solegendary.reignofnether.unit.NonUnitServerEvents;
 import com.solegendary.reignofnether.unit.UnitServerEvents;
 import com.solegendary.reignofnether.worldborder.WorldBorderServerEvents;
+import com.solegendary.reignofnether.minimap.MapColourServerEvents;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.IEventBus;
 
@@ -68,8 +69,10 @@ public void registerServerEvents() {
         vanillaEventBus.register(CommandsServerEvents.class);
         vanillaEventBus.register(ScenarioServerEvents.class);
         vanillaEventBus.register(WorldBorderServerEvents.class);
+        vanillaEventBus.register(MapColourServerEvents.class);
         vanillaEventBus.register(CustomButtonServerEvents.class);
         vanillaEventBus.register(ItemServerEvents.class);
         vanillaEventBus.register(TaskSchedulerServerEvents.class);
+        vanillaEventBus.register(com.solegendary.reignofnether.util.WorldState.class);
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/research/ResearchClient.java b/src/main/java/com/solegendary/reignofnether/research/ResearchClient.java
index 96ac25622..65ab91d40 100644
--- a/src/main/java/com/solegendary/reignofnether/research/ResearchClient.java
+++ b/src/main/java/com/solegendary/reignofnether/research/ResearchClient.java
@@ -29,6 +29,8 @@ public static void addResearch(String ownerName, ProductionItem researchItem) {
     }
 
     public static void addResearch(String ownerName, ResourceLocation researchItemName) {
+        com.solegendary.reignofnether.chat.SpectatorFeed.researched(ownerName,
+                I18n.get("research." + researchItemName.getNamespace() + "." + researchItemName.getPath()));
         synchronized (researchItems) {
             if (MC.player != null && MC.player.getName().getString().equals(ownerName) && !researchItems.contains(researchItemName)) {
                 researchItems.add(researchItemName);
diff --git a/src/main/java/com/solegendary/reignofnether/resources/IncomeTracker.java b/src/main/java/com/solegendary/reignofnether/resources/IncomeTracker.java
new file mode 100644
index 000000000..9307325e7
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/resources/IncomeTracker.java
@@ -0,0 +1,64 @@
+package com.solegendary.reignofnether.resources;
+
+import java.util.ArrayDeque;
+import java.util.HashMap;
+import java.util.Map;
+
+/** Resources each player dropped off and spent in the last minute, for the "+N/MIN" lines and tooltips on the HUD. */
+public final class IncomeTracker {
+
+    private IncomeTracker() { }
+
+    private static final long WINDOW_MS = 60_000;
+
+    private record Deposit(long time, int food, int wood, int ore) { }
+
+    private static final Map<String, ArrayDeque<Deposit>> deposits = new HashMap<>();
+    // ponytail: refunds (cancelled production) aren't taken off, so spend can read a bit high
+    private static final Map<String, ArrayDeque<Deposit>> spends = new HashMap<>();
+
+    public static synchronized void record(String owner, int food, int wood, int ore) {
+        add(deposits, owner, food, wood, ore);
+    }
+
+    /** From a resource change: its negative parts are spending. */
+    public static synchronized void recordSpend(String owner, int food, int wood, int ore) {
+        if (food < 0 || wood < 0 || ore < 0)
+            add(spends, owner, -Math.min(0, food), -Math.min(0, wood), -Math.min(0, ore));
+    }
+
+    public static synchronized int perMinute(String owner, ResourceName resource) {
+        return sum(deposits, owner, resource);
+    }
+
+    public static synchronized int spentPerMinute(String owner, ResourceName resource) {
+        return sum(spends, owner, resource);
+    }
+
+    private static void add(Map<String, ArrayDeque<Deposit>> map, String owner, int food, int wood, int ore) {
+        map.computeIfAbsent(owner, k -> new ArrayDeque<>()).addLast(new Deposit(System.currentTimeMillis(), food, wood, ore));
+    }
+
+    private static int sum(Map<String, ArrayDeque<Deposit>> map, String owner, ResourceName resource) {
+        ArrayDeque<Deposit> list = map.get(owner);
+        if (list == null)
+            return 0;
+        long cutoff = System.currentTimeMillis() - WINDOW_MS;
+        while (!list.isEmpty() && list.peekFirst().time < cutoff)
+            list.removeFirst();
+        int total = 0;
+        for (Deposit d : list)
+            total += switch (resource) {
+                case FOOD -> d.food;
+                case WOOD -> d.wood;
+                case ORE -> d.ore;
+                default -> 0;
+            };
+        return total;
+    }
+
+    public static synchronized void reset() {
+        deposits.clear();
+        spends.clear();
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/resources/ResourcesClientEvents.java b/src/main/java/com/solegendary/reignofnether/resources/ResourcesClientEvents.java
index d411ba399..606256fae 100644
--- a/src/main/java/com/solegendary/reignofnether/resources/ResourcesClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/resources/ResourcesClientEvents.java
@@ -6,6 +6,7 @@
 import com.solegendary.reignofnether.cursor.CursorClientEvents;
 import com.solegendary.reignofnether.guiscreen.TopdownGui;
 import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.ui.Theme;
 import com.solegendary.reignofnether.items.ItemClientEvents;
 import com.solegendary.reignofnether.keybinds.Keybindings;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
@@ -78,17 +79,21 @@ public static void onClientTick(ScreenEvent.Render.Post evt) {
             boolean notInBuilding = !BuildingUtils.isPosInsideAnyBuilding(true, preSelBp);
 
             if (res != null && res.resourceValue > 0 && (isItem || (workerSelected && notInBuilding))) {
-                String str = switch (res.resourceName) {
-                    case FOOD -> "\uE000  " + (res.resourceValue * itemCount);
-                    case WOOD -> "\uE001  " + (res.resourceValue * itemCount);
-                    case ORE -> "\uE002  " + (res.resourceValue * itemCount);
-                    case EMERALD -> "\uE010  " + (res.resourceValue * itemCount);
-                    case NONE -> "";
+                var label = switch (res.resourceName) {
+                    case FOOD -> new FloatingLabel("\uE000", Theme.FOOD);
+                    case WOOD -> new FloatingLabel("\uE001", Theme.WOOD);
+                    case ORE -> new FloatingLabel("\uE002", Theme.ORE);
+                    default -> new FloatingLabel("\uE010", Theme.EMERALD);
                 };
-                MyRenderer.renderTooltip(evt.getGuiGraphics(),
-                        List.of(fcsIcons(str)),
-                        evt.getMouseX(), evt.getMouseY()
-                );
+                // no box: drawn like the floating text of a drop-off
+                var g = evt.getGuiGraphics();
+                var text = Component.literal((res.resourceValue * itemCount) + "  " + label.glyph).withStyle(MyRenderer.iconStyle).getVisualOrderText();
+                g.pose().pushPose();
+                g.pose().translate(0, 0, 400);
+                MC.font.drawInBatch8xOutline(text, evt.getMouseX() + 10, evt.getMouseY() - 8, label.colour | 0xFF000000, 0xFF000000,
+                        g.pose().last().pose(), g.bufferSource(), 255);
+                g.flush();
+                g.pose().popPose();
             }
         }
     }
@@ -100,6 +105,7 @@ public static void syncResources(Resources serverResources) {
 
     // should never be run from clientside except via packet
     public static void addSubtractResources(Resources serverResources) {
+        IncomeTracker.recordSpend(serverResources.ownerName, serverResources.food, serverResources.wood, serverResources.ore);
         for (Resources resources : resourcesList)
             if (resources.ownerName.equals(serverResources.ownerName)) {
                 resources.changeOverTime(serverResources.food, serverResources.wood, serverResources.ore, serverResources.emerald);
@@ -107,6 +113,7 @@ public static void addSubtractResources(Resources serverResources) {
     }
 
     public static void addSubtractResourcesInstantly(Resources serverResources) {
+        IncomeTracker.recordSpend(serverResources.ownerName, serverResources.food, serverResources.wood, serverResources.ore);
         for (Resources resources : resourcesList)
             if (resources.ownerName.equals(serverResources.ownerName)) {
                 resources.changeInstantly(serverResources.food, serverResources.wood, serverResources.ore, serverResources.emerald);
@@ -145,6 +152,8 @@ public static void showWarning(String ownerName, String msg) {
         }
     }
 
+    private record FloatingLabel(String glyph, int colour) { }
+
     // floating text for resource dropoffs
     public static final List<FloatingText> floatingTexts = new ArrayList<>();
     public static final int FLOATING_TEXT_MAX_AGE = 200;
@@ -153,37 +162,42 @@ private static class FloatingText {
         String text;
         BlockPos pos;
         int tickAge;
+        int colour;
 
-        public FloatingText(String text, BlockPos pos, int tickAge) {
+        public FloatingText(String text, BlockPos pos, int tickAge, int colour) {
             this.text = text;
             this.pos = pos;
             this.tickAge = tickAge;
+            this.colour = colour;
         }
     }
 
     public static void addFloatingTextsFromResources(Resources res, BlockPos pos) {
-        if (!OrthoviewClientEvents.isEnabled()) {
+        // every player's drop-offs reach every client, so spectators get everyone's income
+        IncomeTracker.record(res.ownerName, res.food, res.wood, res.ore);
+        Player player = Minecraft.getInstance().player;
+        if (player == null || !player.getName().getString().equals(res.ownerName)) {
             return;
         }
-        if (!Minecraft.getInstance().player.getName().getString().equals(res.ownerName)) {
+        if (!OrthoviewClientEvents.isEnabled()) {
             return;
         }
 
         int tickAge = 0;
         if (res.food > 0) {
-            floatingTexts.add(new FloatingText("+" + res.food + "  \uE000", pos, tickAge));
+            floatingTexts.add(new FloatingText("+" + res.food + "  \uE000", pos, tickAge, Theme.FOOD));
             tickAge -= 25;
         }
         if (res.wood > 0) {
-            floatingTexts.add(new FloatingText("+" + res.wood + "  \uE001", pos, tickAge));
+            floatingTexts.add(new FloatingText("+" + res.wood + "  \uE001", pos, tickAge, Theme.WOOD));
             tickAge -= 25;
         }
         if (res.ore > 0) {
-            floatingTexts.add(new FloatingText("+" + res.ore + "  \uE002", pos, tickAge));
+            floatingTexts.add(new FloatingText("+" + res.ore + "  \uE002", pos, tickAge, Theme.ORE));
             tickAge -= 25;
         }
         if (res.emerald > 0) {
-            floatingTexts.add(new FloatingText("+" + res.emerald + "  \uE010", pos, tickAge));
+            floatingTexts.add(new FloatingText("+" + res.emerald + "  \uE010", pos, tickAge, Theme.EMERALD));
         }
     }
 
@@ -219,7 +233,6 @@ public static void onRenderLevel(RenderLevelStageEvent evt) {
                 Font font = MC.font;
 
                 float f2 = (float) (-font.width(component) / 2);
-                float f1 = Minecraft.getInstance().options.getBackgroundOpacity(0.25F);
                 float alphaPercent =
                     ((FLOATING_TEXT_MAX_AGE - floatingText.tickAge) * 1.5f) / (float) FLOATING_TEXT_MAX_AGE;
                 if (alphaPercent < 0.05) {
@@ -228,18 +241,16 @@ public static void onRenderLevel(RenderLevelStageEvent evt) {
                 if (alphaPercent > 1) {
                     alphaPercent = 1f;
                 }
-                int textCol = 0x00FFFFFF + ((int) (0xFF * alphaPercent) << 24);
-                int bgCol = (int) (f1 * 255.0F * alphaPercent) << 24;
+                int alpha = (int) (0xFF * alphaPercent) << 24;
 
-                font.drawInBatch(component,
+                // no name-tag box: a black outline keeps it readable on any ground, like the HUD's text
+                font.drawInBatch8xOutline(component.getVisualOrderText(),
                     f2,
                     0,
-                    textCol,
-                    false,
+                    (floatingText.colour & 0x00FFFFFF) | alpha,
+                    alpha,
                     poseStack.last().pose(),
                     MC.renderBuffers().bufferSource(),
-                    Font.DisplayMode.NORMAL,
-                    bgCol,
                     255
                 );
 
diff --git a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfo.java b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfo.java
index 663a35176..7f91af069 100644
--- a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfo.java
+++ b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfo.java
@@ -62,6 +62,14 @@ public List<List<BlockPos>> getTeams() {
         return teams;
     }
 
+    // teams fixed by the map (1v1, 2v2...), not a free for all where everyone is their own team
+    public boolean isTeamMode() {
+        List<List<BlockPos>> teams = getTeams();
+        if (teams == null || teams.size() < 2)
+            return false;
+        return teams.size() == 2 || teams.stream().anyMatch(team -> team.size() > 1);
+    }
+
     public boolean supportsMode(String mode) {
         return mode.equalsIgnoreCase("none") ||  modes != null && modes.containsKey(mode);
     }
diff --git a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoAction.java b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoAction.java
index 53dad3073..f842a2bb9 100644
--- a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoAction.java
+++ b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoAction.java
@@ -6,5 +6,6 @@ public enum RTSMapInfoAction {
     SET_MAP_NAME,
     SET_DESCRIPTION,
     ADD_AUTHOR,
-    SET_VERSION
+    SET_VERSION,
+    SET_TEAM_MODE
 }
diff --git a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoClientEvents.java b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoClientEvents.java
index 70594055a..22d142dee 100644
--- a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoClientEvents.java
@@ -3,6 +3,7 @@
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.hud.buttons.Button;
 import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -14,8 +15,13 @@
 
 public class RTSMapInfoClientEvents {
 
+    static {
+        WorldState.onClientReset(RTSMapInfoClientEvents::reset);
+    }
+
     public static ArrayList<String> modeNames = new ArrayList<>();
     public static String selectedMode = "";
+    public static boolean teamMode = false;
     public static String mapName = "";
     public static String description = "";
     public static Set<String> authors = new HashSet<>();
@@ -54,6 +60,7 @@ public static Button getCycleModeButton() {
     public static void reset() {
         modeNames = new ArrayList<>();
         selectedMode = "";
+        teamMode = false;
         mapName = "";
         description = "";
         authors = new HashSet<>();
diff --git a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoClientboundPacket.java b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoClientboundPacket.java
index 481e4838b..a0cf43f78 100644
--- a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoClientboundPacket.java
+++ b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoClientboundPacket.java
@@ -47,6 +47,7 @@ public boolean handle(Supplier<NetworkEvent.Context> ctx) {
                     case SET_DESCRIPTION -> RTSMapInfoClientEvents.description = value;
                     case ADD_AUTHOR -> RTSMapInfoClientEvents.authors.add(value);
                     case SET_VERSION -> RTSMapInfoClientEvents.version = value;
+                    case SET_TEAM_MODE -> RTSMapInfoClientEvents.teamMode = Boolean.parseBoolean(value);
                 }
             });
         });
diff --git a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoLoader.java b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoLoader.java
index 3a17aa46c..6f55152f5 100644
--- a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoLoader.java
+++ b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoLoader.java
@@ -16,10 +16,12 @@ public class RTSMapInfoLoader {
     private static final String FILE_NAME = "rtsmap.json";
 
     public static RTSMapInfo load(ServerLevel level) {
-        Path worldFolder = level.getServer()
-                .getWorldPath(LevelResource.ROOT)
-                .toAbsolutePath();
+        return load(level.getServer().getWorldPath(LevelResource.ROOT));
+    }
 
+    /** From the world's folder; the loading screen reads it before the server has started. */
+    public static RTSMapInfo load(Path worldFolder) {
+        worldFolder = worldFolder.toAbsolutePath();
         Path jsonPath = worldFolder.resolve(FILE_NAME);
 
         if (!Files.exists(jsonPath)) {
diff --git a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoServerEvents.java b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoServerEvents.java
index 1874ee1cb..293a7344a 100644
--- a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoServerEvents.java
@@ -1,11 +1,14 @@
 package com.solegendary.reignofnether.rtsmap;
 
+import net.minecraftforge.server.ServerLifecycleHooks;
+import com.solegendary.reignofnether.gamerules.GameruleClientboundPacket;
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.registrars.GameRuleRegistrar;
+import com.solegendary.reignofnether.util.WorldState;
 import com.solegendary.reignofnether.worldborder.WorldBorderServerEvents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.Style;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
@@ -16,11 +19,33 @@
 public class RTSMapInfoServerEvents {
 
     public static RTSMapInfo rtsMapInfo = null;
+    private static boolean lockedByTeamMode = false;
+    static {
+        WorldState.onServerReset(() -> lockedByTeamMode = false);
+    }
 
     public static boolean usingMapInfoStartPositions() {
         return rtsMapInfo != null && rtsMapInfo.supportsMode(rtsMapInfo.getDefaultMode());
     }
 
+    public static boolean isTeamMode() {
+        return usingMapInfoStartPositions() && rtsMapInfo.isTeamMode();
+    }
+
+    // a team mode keeps its teams, so alliances stay locked, then unlock when it ends (the host can relock them);
+    // tells clients so they can show it
+    public static void syncTeamMode() {
+        boolean teamMode = isTeamMode();
+        RTSMapInfoClientboundPacket.sendValue(RTSMapInfoAction.SET_TEAM_MODE, String.valueOf(teamMode));
+        MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
+        if (server != null && (teamMode || lockedByTeamMode)) {
+            server.getGameRules().getRule(GameRuleRegistrar.LOCK_ALLIANCES).set(teamMode, server);
+            GameruleClientboundPacket.setLockAlliances(teamMode);
+        }
+        lockedByTeamMode = teamMode;
+    }
+
+
     @SubscribeEvent
     public static void loadInfo(ServerStartedEvent evt) {
         ServerLevel level = evt.getServer().getLevel(Level.OVERWORLD);
@@ -41,42 +66,16 @@ public static void loadInfo(ServerStartedEvent evt) {
     @SubscribeEvent
     public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent evt) {
         if (rtsMapInfo != null) {
-            evt.getEntity().sendSystemMessage(Component.literal(rtsMapInfo.getName() + " " + rtsMapInfo.getVersion()).withStyle(Style.EMPTY.withBold(true)));
-            MutableComponent authors = rtsMapInfo.getAuthor().size() > 1
-                    ? Component.translatable("message.reignofnether.rts_map_info_author.multiple")
-                    : Component.translatable("message.reignofnether.rts_map_info_author.singular");
-            for (String author : rtsMapInfo.getAuthor())
-                authors.append(" ").append(author);
-            evt.getEntity().sendSystemMessage(authors);
-            evt.getEntity().sendSystemMessage(Component.literal(""));
-            evt.getEntity().sendSystemMessage(Component.literal(rtsMapInfo.getDescription()));
-
-            StringBuilder modesStr = new StringBuilder();
-            for (String modeName : rtsMapInfo.getModes().keySet()) {
-                if (modeName.equals(rtsMapInfo.getDefaultMode()))
-                    modesStr.append("[").append(modeName).append("]").append(", ");
-                else
-                    modesStr.append(modeName).append(", ");
-            }
-            if (modesStr.length() > 0) {
-                modesStr.setLength(modesStr.length() - 2);
-                evt.getEntity().sendSystemMessage(Component.literal(""));
-                evt.getEntity().sendSystemMessage(Component.translatable("message.reignofnether.rts_map_info_modes", modesStr));
-            }
+            // the loading screen shows the name, authors, version and description, so chat stays clear
             RTSMapInfoClientboundPacket.sendValue(RTSMapInfoAction.SET_MAP_NAME, rtsMapInfo.getName());
             for (String author : rtsMapInfo.getAuthor())
                 RTSMapInfoClientboundPacket.sendValue(RTSMapInfoAction.ADD_AUTHOR, author);
             RTSMapInfoClientboundPacket.sendValue(RTSMapInfoAction.SET_DESCRIPTION, rtsMapInfo.getDescription());
             RTSMapInfoClientboundPacket.sendValue(RTSMapInfoAction.SET_MODE, rtsMapInfo.getDefaultMode());
             RTSMapInfoClientboundPacket.sendValue(RTSMapInfoAction.SET_VERSION, rtsMapInfo.getVersion());
+            syncTeamMode();
             for (String mode : rtsMapInfo.getModes().keySet())
                 RTSMapInfoClientboundPacket.sendValue(RTSMapInfoAction.ADD_MODE, mode);
-
-            MinecraftServer server = evt.getEntity().level().getServer();
-            if (server != null && server.getGameRules().getRule(GameRuleRegistrar.RTS_PATHFINDING).get() && WorldBorderServerEvents.prewarmedNavmesh) {
-                evt.getEntity().sendSystemMessage(Component.literal(""));
-                evt.getEntity().sendSystemMessage(Component.translatable("server.reignofnether.prewarmed_navmesh"));
-            }
         }
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoServerboundPacket.java b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoServerboundPacket.java
index deb893cad..23d90e163 100644
--- a/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoServerboundPacket.java
+++ b/src/main/java/com/solegendary/reignofnether/rtsmap/RTSMapInfoServerboundPacket.java
@@ -47,7 +47,7 @@ public boolean handle(Supplier<NetworkEvent.Context> ctx) {
                 ReignOfNether.LOGGER.warn("RTSMapInfoServerboundPacket: Sender was null");
                 success.set(false);
                 return;
-            } else if (!player.hasPermissions(2)) {
+            } else if (!StartPosServerEvents.isHost(player)) {
                 ReignOfNether.LOGGER.warn("RTSMapInfoServerboundPacket: Tried to process packet from " + player.getName() + " with insufficient permissions");
                 success.set(false);
                 return;
diff --git a/src/main/java/com/solegendary/reignofnether/sandbox/SandboxActionButtons.java b/src/main/java/com/solegendary/reignofnether/sandbox/SandboxActionButtons.java
index a2c34565c..c84e82ffb 100644
--- a/src/main/java/com/solegendary/reignofnether/sandbox/SandboxActionButtons.java
+++ b/src/main/java/com/solegendary/reignofnether/sandbox/SandboxActionButtons.java
@@ -15,7 +15,6 @@
 import com.solegendary.reignofnether.unit.UnitClientEvents;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.util.ArrayUtil;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
@@ -30,8 +29,6 @@
 
 public class SandboxActionButtons {
 
-    private static final Minecraft MC = Minecraft.getInstance();
-
     public static Button setAnchor;
     public static Button resetToAnchor;
     public static Button removeAnchor;
@@ -115,112 +112,29 @@ public static void updateButtons() {
         );
     }
 
-    public static Button getSetRelationshipButton() {
-        Relationship relationship = Relationship.OWNED;
+    public static Relationship getSelectionRelationship() {
         if (HudClientEvents.hudSelectedEntity != null)
-            relationship = UnitClientEvents.getPlayerToEntityRelationship(HudClientEvents.hudSelectedEntity);
-        else if (HudClientEvents.hudSelectedPlacement != null)
-            relationship = BuildingClientEvents.getPlayerToBuildingRelationship(HudClientEvents.hudSelectedPlacement);
-        final Relationship finalRelationship = relationship;
-
-        return new Button(
-                "Toggle Relationship",
-                Button.itemIconSize,
-                switch (finalRelationship) {
-                    case OWNED -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/lime_wool.png");
-                    case FRIENDLY -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/blue_wool.png");
-                    case NEUTRAL ->
-                            ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/yellow_wool.png");
-                    case HOSTILE -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/red_wool.png");
-                },
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> {
-                    if (MC.player != null) {
-                        for (LivingEntity entity : UnitClientEvents.getSelectedUnits()) {
-                            if (entity instanceof Unit unit) {
-                                switch (finalRelationship) {
-                                    case NEUTRAL -> unit.setOwnerName("Enemy");
-                                    case HOSTILE -> unit.setOwnerName(MC.player.getName().getString());
-                                    default -> unit.setOwnerName("");
-                                }
-                            }
-                        }
-                        if (HudClientEvents.hudSelectedEntity instanceof Unit unit) {
-                            SandboxServerboundPacket.setUnitOwner(ArrayUtil.livingEntityListToIdArray(UnitClientEvents.getSelectedUnits()), unit.getOwnerName());
-                            updateButtons();
-                        }
-                        for (BuildingPlacement bpl : BuildingClientEvents.getSelectedBuildings()) {
-                            switch (finalRelationship) {
-                                case NEUTRAL -> bpl.ownerName = "Enemy";
-                                case HOSTILE -> bpl.ownerName = MC.player.getName().getString();
-                                default -> bpl.ownerName = "";
-                            }
-                            SandboxServerboundPacket.setBuildingOwner(bpl.originPos, bpl.ownerName);
-                            updateButtons();
-                        }
-                    }
-                },
-                () -> {
-                    if (MC.player != null) {
-                        for (LivingEntity entity : UnitClientEvents.getSelectedUnits()) {
-                            if (entity instanceof Unit unit) {
-                                switch (finalRelationship) {
-                                    case NEUTRAL -> unit.setOwnerName(MC.player.getName().getString());
-                                    case HOSTILE -> unit.setOwnerName("");
-                                    default -> unit.setOwnerName("Enemy");
-                                }
-                            }
-                        }
-                        if (HudClientEvents.hudSelectedEntity instanceof Unit unit) {
-                            SandboxServerboundPacket.setUnitOwner(ArrayUtil.livingEntityListToIdArray(UnitClientEvents.getSelectedUnits()), unit.getOwnerName());
-                            updateButtons();
-                        }
-                        for (BuildingPlacement bpl : BuildingClientEvents.getSelectedBuildings()) {
-                            switch (finalRelationship) {
-                                case NEUTRAL -> bpl.ownerName = MC.player.getName().getString();
-                                case HOSTILE -> bpl.ownerName = "";
-                                default -> bpl.ownerName = "Enemy";
-                            }
-                            SandboxServerboundPacket.setBuildingOwner(bpl.originPos, bpl.ownerName);
-                            updateButtons();
-                        }
-                    }
-                },
-                List.of(
-                        fcs(I18n.get("hud.relationship.reignofnether.owned"), relationship == Relationship.OWNED),
-                        fcs(I18n.get("hud.relationship.reignofnether.neutral"), relationship == Relationship.NEUTRAL),
-                        fcs(I18n.get("hud.relationship.reignofnether.enemy"), relationship == Relationship.HOSTILE)
-                )
-        );
+            return UnitClientEvents.getPlayerToEntityRelationship(HudClientEvents.hudSelectedEntity);
+        if (HudClientEvents.hudSelectedPlacement != null)
+            return BuildingClientEvents.getPlayerToBuildingRelationship(HudClientEvents.hudSelectedPlacement);
+        return Relationship.OWNED;
     }
 
-    public static Button getCycleScenarioRoleButton() {
-        ScenarioRole role = getHudSelectedScenarioRole();
-        String roleName = I18n.get("sandbox.reignofnether.scenario_role_none");
-        if (role != null) {
-            roleName = role.name;
+    public static void setSelectionOwner(Relationship relationship) {
+        String ownerName = SandboxClientEvents.ownerName(relationship);
+        for (LivingEntity entity : UnitClientEvents.getSelectedUnits())
+            if (entity instanceof Unit unit)
+                unit.setOwnerName(ownerName);
+        if (HudClientEvents.hudSelectedEntity instanceof Unit)
+            SandboxServerboundPacket.setUnitOwner(ArrayUtil.livingEntityListToIdArray(UnitClientEvents.getSelectedUnits()), ownerName);
+        for (BuildingPlacement bpl : BuildingClientEvents.getSelectedBuildings()) {
+            bpl.ownerName = ownerName;
+            SandboxServerboundPacket.setBuildingOwner(bpl.originPos, ownerName);
         }
-        return new Button(
-                "Switch Building Scenario Role",
-                Button.itemIconSize,
-                role != null ? ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_conditional.png") :
-                                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_conditional_dark.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> cycleUnitOrBuildingRoleIndex(false),
-                () -> cycleUnitOrBuildingRoleIndex(true),
-                List.of(
-                        fcs(I18n.get("sandbox.reignofnether.cycle_scenario_role", roleName))
-                )
-        );
+        updateButtons();
     }
 
-    private static void cycleUnitOrBuildingRoleIndex(boolean reverse) {
+    public static void cycleUnitOrBuildingRoleIndex(boolean reverse) {
         int currentRoleIndex = 0;
         if (HudClientEvents.hudSelectedPlacement != null) {
             currentRoleIndex = HudClientEvents.hudSelectedPlacement.scenarioRoleIndex;
@@ -246,7 +160,7 @@ private static void cycleUnitOrBuildingRoleIndex(boolean reverse) {
     }
 
     @Nullable
-    private static ScenarioRole getHudSelectedScenarioRole() {
+    public static ScenarioRole getHudSelectedScenarioRole() {
         ScenarioRole role = null;
         if (HudClientEvents.hudSelectedEntity instanceof Unit unit) {
             role = ScenarioUtils.getScenarioRole(true, unit.getScenarioRoleIndex());
diff --git a/src/main/java/com/solegendary/reignofnether/sandbox/SandboxClientEvents.java b/src/main/java/com/solegendary/reignofnether/sandbox/SandboxClientEvents.java
index 507b852b6..0f55455d7 100644
--- a/src/main/java/com/solegendary/reignofnether/sandbox/SandboxClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/sandbox/SandboxClientEvents.java
@@ -4,7 +4,6 @@
 import com.solegendary.reignofnether.building.BuildingPlaceButton;
 import com.solegendary.reignofnether.building.custombuilding.CustomBuilding;
 import com.solegendary.reignofnether.building.custombuilding.CustomBuildingClientEvents;
-import com.solegendary.reignofnether.building.production.ProductionItems;
 import com.solegendary.reignofnether.cursor.CursorClientEvents;
 import com.solegendary.reignofnether.faction.Faction;
 import com.solegendary.reignofnether.faction.Factions;
@@ -21,18 +20,15 @@
 import com.solegendary.reignofnether.registrars.BlockRegistrar;
 import com.solegendary.reignofnether.research.ResearchClient;
 import com.solegendary.reignofnether.research.ResearchServerboundPacket;
-import com.solegendary.reignofnether.scenario.ScenarioClientEvents;
 import com.solegendary.reignofnether.unit.Relationship;
 import com.solegendary.reignofnether.unit.UnitClientEvents;
 import com.solegendary.reignofnether.unit.units.monsters.ZombieVillagerUnit;
 import com.solegendary.reignofnether.unit.units.piglins.GruntUnit;
 import com.solegendary.reignofnether.unit.units.villagers.VillagerUnit;
 import com.solegendary.reignofnether.util.ArrayUtil;
-import com.solegendary.reignofnether.util.MiscUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -46,16 +42,21 @@
 
 public class SandboxClientEvents {
 
-    // NONE == neutral
-    private static Faction faction = Factions.NONE;
+    private static Faction faction = Factions.VILLAGERS;
     public static Relationship relationship = Relationship.OWNED;
     public static SandboxMenuType sandboxMenuType = SandboxMenuType.UNITS;
     public static CustomBuildingSortOption customBuildingSortOption = CustomBuildingSortOption.NAME;
 
     private static final Minecraft MC = Minecraft.getInstance();
 
+    public static final List<String> UNIT_CHEATS = List.of("operationcwal", "medievalman", "foodforthought", "slipslopslap");
+    public static final List<String> BUILDING_CHEATS = List.of("warpten", "modifythephasevariance");
+    public static final List<String> CONTROL_CHEATS = List.of("wouldyoukindly");
+
     public static Faction getFaction() { return faction; }
 
+    public static void setFaction(Faction newFaction) { faction = newFaction; }
+
     public static String spawnUnitName = "";
 
     public static boolean isSandboxPlayer(String playerName) {
@@ -105,244 +106,38 @@ public static List<Button> getCustomBuildingButtons() {
     }
 
     public static List<UnitSpawnButton> getUnitButtons() {
-        return faction.equals(Factions.NONE) ? Factions.NEUTRAL.getEntityButtons() : faction.getEntityButtons();
-    }
-
-    public static Button getToggleFactionButton() {
-        return new Button(
-                "Toggle Faction",
-                Button.itemIconSize,
-                faction.icon,
-	        null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> faction = Factions.getFaction(MiscUtil.getNextItem(Factions.PLAYABLE_FACTIONS, faction.key)),
-                () -> faction = Factions.getFaction(MiscUtil.getLastItem(Factions.PLAYABLE_FACTIONS, faction.key)),
-                getRenderTooltipList()
-        );
-    }
-    
-    public static List<FormattedCharSequence> getRenderTooltipList() {
-        List<FormattedCharSequence> list = new ArrayList<>();
-        for (ResourceLocation rl : Factions.PLAYABLE_FACTIONS) {
-            if (faction == Factions.getFaction(rl))
-                list.add(fcs(I18n.get(String.format("hud.faction.%s.%s", rl.getNamespace(), rl.getPath())), true));
-            else
-                list.add(fcs(I18n.get(String.format("hud.faction.%s.%s", rl.getNamespace(), rl.getPath()))));
-        }
-        
-        return list;
-    }
-
-    public static Button getToggleRelationshipButton() {
-        return new Button(
-                "Toggle Relationship",
-                Button.itemIconSize,
-                switch (relationship) {
-                    case OWNED -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/lime_wool.png");
-                    case FRIENDLY -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/blue_wool.png");
-                    case NEUTRAL -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/yellow_wool.png");
-                    case HOSTILE -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/red_wool.png");
-                },
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> {
-                    switch (relationship) {
-                        default -> relationship = Relationship.NEUTRAL;
-                        case NEUTRAL -> relationship = Relationship.HOSTILE;
-                        case HOSTILE -> relationship = Relationship.OWNED;
-                    }
-                },
-                () -> {
-                    switch (relationship) {
-                        default -> relationship = Relationship.HOSTILE;
-                        case NEUTRAL -> relationship = Relationship.OWNED;
-                        case HOSTILE -> relationship = Relationship.NEUTRAL;
-                    }
-                },
-                List.of(
-                        fcs(I18n.get("hud.relationship.reignofnether.owned"), relationship == Relationship.OWNED),
-                        fcs(I18n.get("hud.relationship.reignofnether.neutral"), relationship == Relationship.NEUTRAL),
-                        fcs(I18n.get("hud.relationship.reignofnether.enemy"), relationship == Relationship.HOSTILE)
-                )
-        );
-    }
-
-    public static Button getCycleBuildingOrUnitsButton() {
-        return new Button(
-                "Toggle Building or Units",
-                Button.itemIconSize,
-                switch (sandboxMenuType) {
-                    case UNITS -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/item/spawn_egg.png");
-                    case BUILDINGS -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/crafting_table_front.png");
-                    case CUSTOM_BUILDINGS -> ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/smithing_table_front.png");
-                },
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> {
-                    switch (sandboxMenuType) {
-                        case UNITS -> sandboxMenuType = SandboxMenuType.BUILDINGS;
-                        case BUILDINGS -> sandboxMenuType = SandboxMenuType.CUSTOM_BUILDINGS;
-                        case CUSTOM_BUILDINGS -> sandboxMenuType = SandboxMenuType.UNITS;
-                    }
-                },
-                () -> {
-                    switch (sandboxMenuType) {
-                        case UNITS -> sandboxMenuType = SandboxMenuType.CUSTOM_BUILDINGS;
-                        case BUILDINGS -> sandboxMenuType = SandboxMenuType.UNITS;
-                        case CUSTOM_BUILDINGS -> sandboxMenuType = SandboxMenuType.BUILDINGS;
-                    }
-                },
-                List.of(
-                        fcs(I18n.get("sandbox.reignofnether.menu_type_button_units"), sandboxMenuType == SandboxMenuType.UNITS),
-                        fcs(I18n.get("sandbox.reignofnether.menu_type_button_buildings"), sandboxMenuType == SandboxMenuType.BUILDINGS),
-                        fcs(I18n.get("sandbox.reignofnether.menu_type_button_custom_buildings"), sandboxMenuType == SandboxMenuType.CUSTOM_BUILDINGS)
-                )
-        );
+        return faction.getEntityButtons();
     }
 
-    public static Button getToggleBuildingCheatsButton() {
-        Minecraft MC = Minecraft.getInstance();
-        if (MC.player == null)
-            return null;
-        boolean hasCheats = ResearchClient.hasCheat("warpten") &&
-                ResearchClient.hasCheat("modifythephasevariance");
-        String playerName = Minecraft.getInstance().player.getName().getString();
-        return new Button(
-                "Toggle Building Cheats",
-                Button.itemIconSize,
-                hasCheats ?
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_side.png") :
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_side_dark.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> {
-                    if (hasCheats) {
-                        ResearchServerboundPacket.removeCheat(playerName, "warpten");
-                        ResearchServerboundPacket.removeCheat(playerName, "modifythephasevariance");
-                    } else {
-                        ResearchServerboundPacket.addCheat(playerName, "warpten");
-                        ResearchServerboundPacket.addCheat(playerName, "modifythephasevariance");
-                    }
-                },
-                null,
-                List.of(hasCheats ? fcs(I18n.get("sandbox.reignofnether.building_cheats_on")) :
-                                fcs(I18n.get("sandbox.reignofnether.building_cheats_off")),
-                        fcs(I18n.get("sandbox.reignofnether.building_cheats1"))
-                )
-        );
+    public static boolean hasCheats(List<String> cheats) {
+        return cheats.stream().allMatch(ResearchClient::hasCheat);
     }
 
-    public static Button getToggleUnitCheatsButton() {
-        Minecraft MC = Minecraft.getInstance();
+    public static void toggleCheats(List<String> cheats) {
         if (MC.player == null)
-            return null;
-        boolean hasCheats = ResearchClient.hasCheat("operationcwal") &&
-                            ResearchClient.hasCheat("medievalman") &&
-                            ResearchClient.hasCheat("foodforthought") &&
-                            ResearchClient.hasCheat("slipslopslap");
-        String playerName = Minecraft.getInstance().player.getName().getString();
-        return new Button(
-                "Toggle Unit Cheats",
-                Button.itemIconSize,
-                hasCheats ?
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/chain_command_block_side.png") :
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/chain_command_block_side_dark.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> {
-                    if (hasCheats) {
-                        ResearchServerboundPacket.removeCheat(playerName, "operationcwal");
-                        ResearchServerboundPacket.removeCheat(playerName, "medievalman");
-                        ResearchServerboundPacket.removeCheat(playerName, "foodforthought");
-                        ResearchServerboundPacket.removeCheat(playerName, "slipslopslap");
-                    } else {
-                        ResearchServerboundPacket.addCheat(playerName, "operationcwal");
-                        ResearchServerboundPacket.addCheat(playerName, "medievalman");
-                        ResearchServerboundPacket.addCheat(playerName, "foodforthought");
-                        ResearchServerboundPacket.addCheat(playerName, "slipslopslap");
-                    }
-                },
-                null,
-                List.of(hasCheats ? fcs(I18n.get("sandbox.reignofnether.unit_cheats_on")) :
-                                    fcs(I18n.get("sandbox.reignofnether.unit_cheats_off")),
-                                    fcs(I18n.get("sandbox.reignofnether.unit_cheats1")),
-                                    fcs(I18n.get("sandbox.reignofnether.unit_cheats2"))
-                )
-        );
+            return;
+        boolean on = hasCheats(cheats);
+        String playerName = MC.player.getName().getString();
+        for (String cheat : cheats) {
+            if (on)
+                ResearchServerboundPacket.removeCheat(playerName, cheat);
+            else
+                ResearchServerboundPacket.addCheat(playerName, cheat);
+        }
     }
 
-    public static Button getToggleNonUnitControlButton() {
-        Minecraft MC = Minecraft.getInstance();
-        if (MC.player == null)
-            return null;
-        boolean hasCheat = ResearchClient.hasCheat("wouldyoukindly");
-        String playerName = Minecraft.getInstance().player.getName().getString();
-        return new Button(
-                "Toggle Full Unit Control",
-                Button.itemIconSize,
-                hasCheat ?
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/repeating_command_block_side.png") :
-                        ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/repeating_command_block_side_dark.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> {
-                    if (hasCheat) {
-                        ResearchServerboundPacket.removeCheat(playerName, "wouldyoukindly");
-                    } else {
-                        ResearchServerboundPacket.addCheat(playerName, "wouldyoukindly");
-                    }
-                },
-                null,
-                List.of(hasCheat ? fcs(I18n.get("sandbox.reignofnether.nonunit_control_cheat_on")) :
-                                fcs(I18n.get("sandbox.reignofnether.nonunit_control_cheat_off")),
-                        fcs(I18n.get("sandbox.reignofnether.nonunit_control_cheat1"))
-                )
-        );
+    public static void cycleCustomBuildingSort(boolean reverse) {
+        CustomBuildingSortOption[] options = CustomBuildingSortOption.values();
+        customBuildingSortOption = options[Math.floorMod(customBuildingSortOption.ordinal() + (reverse ? -1 : 1), options.length)];
+        sortCustomBuildings();
     }
 
-    public static Button getSortCustomBuildingsButton() {
-        return new Button(
-                "Sort Custom Buildings",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/hopper.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> sandboxMenuType != SandboxMenuType.CUSTOM_BUILDINGS,
-                () -> true,
-                () -> {
-                    switch (customBuildingSortOption) {
-                        case NAME -> customBuildingSortOption = CustomBuildingSortOption.SIZE;
-                        case SIZE -> customBuildingSortOption = CustomBuildingSortOption.FACTION;
-                        case FACTION -> customBuildingSortOption = CustomBuildingSortOption.NAME;
-                    }
-                    sortCustomBuildings();
-                },
-                () -> {
-                    switch (customBuildingSortOption) {
-                        case NAME -> customBuildingSortOption = CustomBuildingSortOption.FACTION;
-                        case SIZE -> customBuildingSortOption = CustomBuildingSortOption.NAME;
-                        case FACTION -> customBuildingSortOption = CustomBuildingSortOption.SIZE;
-                    }
-                    sortCustomBuildings();
-                },
-                List.of(
-                        fcs(I18n.get("sandbox.reignofnether.sort_custom_buildings.name"), customBuildingSortOption == CustomBuildingSortOption.NAME),
-                        fcs(I18n.get("sandbox.reignofnether.sort_custom_buildings.size"), customBuildingSortOption == CustomBuildingSortOption.SIZE),
-                        fcs(I18n.get("sandbox.reignofnether.sort_custom_buildings.faction"), customBuildingSortOption == CustomBuildingSortOption.FACTION)
-                )
-        );
+    public static String ownerName(Relationship relationship) {
+        return switch (relationship) {
+            case NEUTRAL -> "";
+            case HOSTILE -> "Enemy";
+            default -> MC.player != null ? MC.player.getName().getString() : "";
+        };
     }
 
     public static void sortCustomBuildings() {
@@ -373,56 +168,19 @@ public static Button getExitSandboxButton() {
         );
     }
 
-    public static Button getPublishScenarioButton() {
-        List<FormattedCharSequence> tooltips = ScenarioClientEvents.confirmPublishScenario ? List.of(
-                fcs(I18n.get("sandbox.reignofnether.publish_scenario_tooltip1"), true),
-                fcs(I18n.get("sandbox.reignofnether.publish_scenario_tooltip_confirm"))
-        ) : List.of(
-                fcs(I18n.get("sandbox.reignofnether.publish_scenario_tooltip1"), true),
-                fcs(I18n.get("sandbox.reignofnether.publish_scenario_tooltip2")),
-                fcs(I18n.get("sandbox.reignofnether.publish_scenario_tooltip3"))
-        );
-        return new Button(
-                "Publish Scenario Map",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/book.png"),
-                (Keybinding) null,
-                () -> ScenarioClientEvents.confirmPublishScenario,
-                () -> false,
-                () -> true,
-                ScenarioClientEvents::pressedPublishScenarioButton,
-                () -> ScenarioClientEvents.confirmPublishScenario = false,
-                tooltips
-        );
-    }
-
-    public static Button getConfigureScenarioButton() {
-        return new Button(
-                "Configure Scenario",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/blocks/command_block_conditional.png"),
-                (Keybinding) null,
-                ScenarioClientEvents::isMenuOpen,
-                () -> false,
-                () -> true,
-                () -> ScenarioClientEvents.setMenuOpen(!ScenarioClientEvents.isMenuOpen()),
-                null,
-                List.of(
-                        fcs(I18n.get("sandbox.reignofnether.configure_scenario"))
-                )
-        );
+    @SubscribeEvent
+    public static void onMouseScroll(ScreenEvent.MouseScrolled.Post evt) {
+        if (SandboxPanel.takesWheel())
+            SandboxPanel.scroll(evt.getScrollDelta() > 0 ? -1 : 1);
     }
 
-
-
-
-
     @SubscribeEvent
     public static void onMouseClick(ScreenEvent.MouseButtonPressed.Post evt) {
         if (!OrthoviewClientEvents.isEnabled()) return;
 
         // prevent clicking behind HUDs
         if (HudClientEvents.isMouseOverAnyButtonOrHud() || MC.player == null) {
+            spawnUnitName = "";
             CursorClientEvents.setLeftClickSandboxAction(null);
             return;
         }
@@ -430,11 +188,7 @@ public static void onMouseClick(ScreenEvent.MouseButtonPressed.Post evt) {
         SandboxAction sandboxAction = CursorClientEvents.getLeftClickSandboxAction();
         if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_1 && sandboxAction != null) {
 
-            String ownerName = switch (relationship) {
-               case NEUTRAL -> "";
-               case HOSTILE -> "Enemy";
-               default -> MC.player.getName().getString();
-            };
+            String ownerName = ownerName(relationship);
 
             switch (sandboxAction) {
                 case SPAWN_UNIT -> SandboxServerboundPacket.spawnUnit(CursorClientEvents.getLeftClickSandboxAction(), ownerName, spawnUnitName, CursorClientEvents.getPreselectedBlockPos());
diff --git a/src/main/java/com/solegendary/reignofnether/sandbox/SandboxPanel.java b/src/main/java/com/solegendary/reignofnether/sandbox/SandboxPanel.java
new file mode 100644
index 000000000..c902e4b1c
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/sandbox/SandboxPanel.java
@@ -0,0 +1,447 @@
+package com.solegendary.reignofnether.sandbox;
+
+import com.solegendary.reignofnether.building.BuildingClientEvents;
+import com.solegendary.reignofnether.building.BuildingPlacement;
+import com.solegendary.reignofnether.faction.Factions;
+import com.solegendary.reignofnether.gamerules.GameruleClient;
+import com.solegendary.reignofnether.hud.HudClientEvents;
+import com.solegendary.reignofnether.hud.MyEditBox;
+import com.solegendary.reignofnether.hud.TextInputClientEvents;
+import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.layout.HudLayout;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
+import com.solegendary.reignofnether.hud.panels.SettingRows;
+import com.solegendary.reignofnether.hud.panels.SettingsMenu;
+import com.solegendary.reignofnether.hud.panels.TopRightPanel;
+import com.solegendary.reignofnether.scenario.ScenarioClientEvents;
+import com.solegendary.reignofnether.scenario.ScenarioMenu;
+import com.solegendary.reignofnether.scenario.ScenarioRole;
+import com.solegendary.reignofnether.ui.EditorRows;
+import com.solegendary.reignofnether.ui.EditorRows.Group;
+import com.solegendary.reignofnether.ui.EditorRows.Row;
+import com.solegendary.reignofnether.ui.EditorRows.Style;
+import com.solegendary.reignofnether.ui.Icon;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.SettingRow;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
+import com.solegendary.reignofnether.unit.Relationship;
+import com.solegendary.reignofnether.unit.UnitClientEvents;
+import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.util.MyRenderer;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FormattedCharSequence;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * The sandbox tools: a rail of tabs on the right with a sheet beside it, so the command card stays what it is in a
+ * match. Nothing here has a hotkey, which leaves every play key free.
+ */
+public final class SandboxPanel {
+
+    private SandboxPanel() { }
+
+    private enum Tab {
+        SPAWN(Icon.USERS), SELECTION(Icon.CHECK), RULES(Icon.LIST), SCENARIO(Icon.BOOK_OPEN);
+
+        final Icon icon;
+
+        Tab(Icon icon) {
+            this.icon = icon;
+        }
+
+        String title() {
+            return I18n.get(KEY + "tab." + name().toLowerCase(Locale.ROOT));
+        }
+    }
+
+    private record Chip(String label, @Nullable ResourceLocation icon, boolean on, Runnable click) { }
+
+    private static final String KEY = "sandbox.reignofnether.";
+    private static final int PAD = 7;
+    private static final int RAIL_PAD = 3;
+    private static final int RAIL_EXIT_GAP = 8;
+    private static final int CHIP_H = 15;
+    private static final int CHIP_GAP = 3;
+    private static final int FIELD_H = 14;
+    private static final int TOOL_H = 14;
+    private static final int ICON = 9;
+    private static final int LIST_ICON = 11;
+    private static final int EDIT_W = 40;
+    // header, then owner, role and anchor, each under its label: the only tab too short to fill the dock
+    private static final int SELECTION_H = PAD * 2 + EditorRows.HEADER_H + EditorRows.GROUP_H + CHIP_H + 4
+            + EditorRows.GROUP_H + EditorRows.ROW_H + 4 + EditorRows.GROUP_H + TOOL_H;
+
+    @Nullable
+    private static Tab tab = Tab.SPAWN; // null: folded
+    private static int scroll = 0;
+    private static boolean overSheet = false;
+    private static String query = "";
+    private static MyEditBox searchBox = null;
+    private static List<Group> rules = null;
+    private static List<Row> spawnRows = null;
+    private static long spawnRowsTick = -1;
+
+    public static void reset() {
+        tab = Tab.SPAWN;
+        scroll = 0;
+        overSheet = false;
+        rules = null;
+        spawnRows = null;
+        if (searchBox != null)
+            searchBox.setValue("");
+        ScenarioClientEvents.setMenuOpen(false);
+    }
+
+    /** Opens a tab, or folds the sheet when null. Leaving the scenario tab saves the roles, as closing their editor did. */
+    private static void show(@Nullable Tab next) {
+        if (tab == Tab.SCENARIO && next != Tab.SCENARIO) {
+            ScenarioClientEvents.confirmPublishScenario = false;
+            ScenarioMenu.save();
+        }
+        tab = next;
+        scroll = 0;
+        rules = null;
+    }
+
+    public static void fold() {
+        show(null);
+    }
+
+    /** True when the wheel should scroll the sheet instead of zooming the camera. */
+    public static boolean takesWheel() {
+        return overSheet && HudClientEvents.isMouseOverAnyButtonOrHud();
+    }
+
+    public static void scroll(int lines) {
+        scroll = Math.max(0, scroll + lines);
+    }
+
+    public static void render(HudFrame f) {
+        if (!SandboxClientEvents.isSandboxPlayer())
+            return;
+        if ((tab == Tab.SCENARIO) != ScenarioClientEvents.isMenuOpen())
+            ScenarioClientEvents.setMenuOpen(tab == Tab.SCENARIO);
+        Rect dock = f.layout.sandboxDock(TopRightPanel.bottom);
+        renderRail(f, dock);
+        overSheet = false;
+        if (tab == null)
+            return;
+
+        Rect sheet = new Rect(dock.x(), dock.y(), HudLayout.DOCK_SHEET_W, tab == Tab.SELECTION ? SELECTION_H : dock.h());
+        Theme.popup(f.g, sheet.x(), sheet.y(), sheet.w(), sheet.h(), Theme.ORANGE);
+        f.zone(sheet);
+        overSheet = tab != Tab.SELECTION && f.hovered(sheet);
+        Rect content = new Rect(sheet.x() + PAD, sheet.y() + PAD, sheet.w() - PAD * 2, sheet.h() - PAD * 2);
+        switch (tab) {
+            case SPAWN -> renderSpawn(f, content);
+            case SELECTION -> renderSelection(f, content);
+            case RULES -> renderRules(f, content);
+            case SCENARIO -> {
+                ScenarioRole role = ScenarioClientEvents.getScenarioRoleToEdit();
+                if (role != null)
+                    scroll = ScenarioMenu.render(f, role, content, scroll);
+            }
+        }
+    }
+
+    private static void renderRail(HudFrame f, Rect dock) {
+        int cell = HudLayout.TILE_SMALL;
+        int count = Tab.values().length;
+        int w = HudLayout.DOCK_RAIL_W;
+        int h = RAIL_PAD * 2 + count * cell + (count - 1) * HudLayout.TOOL_GAP + RAIL_EXIT_GAP + cell;
+        int x = dock.right() - w;
+        Theme.panel(f.g, x, dock.y(), w, h, Theme.floating());
+        f.zone(x, dock.y(), w, h);
+
+        int cx = x + RAIL_PAD;
+        int y = dock.y() + RAIL_PAD;
+        int selectionY = y;
+        for (Tab t : Tab.values()) {
+            Rect r = new Rect(cx, y, cell, cell);
+            boolean open = t == tab;
+            Theme.cell(f.g, cx, y, cell, cell, open ? Theme.CellState.ACTIVE : Theme.CellState.READY, f.hovered(r));
+            t.icon.drawIn(f.g, cx + 3, y + 3, cell - 6, cell - 6, open ? Theme.GOLD : Theme.BODY);
+            f.register(new ButtonBuilder(t.title()).onLeftClick(() -> show(open ? null : t)).build(), r, null, () -> Tooltip.of(t.title()));
+            if (t == Tab.SELECTION)
+                selectionY = y;
+            y += cell + HudLayout.TOOL_GAP;
+        }
+        int selected = UnitClientEvents.getSelectedUnits().size() + BuildingClientEvents.getSelectedBuildings().size();
+        if (selected > 0)
+            Theme.badge(f.g, String.valueOf(selected), cx + cell + 3, selectionY - 3);
+
+        Rect exit = new Rect(cx, y - HudLayout.TOOL_GAP + RAIL_EXIT_GAP, cell, cell);
+        Theme.dangerButton(f.g, exit.x(), exit.y(), cell, cell, f.hovered(exit));
+        Theme.cross(f.g, exit, Theme.DANGER_TEXT);
+        f.register(SandboxClientEvents.getExitSandboxButton(), exit, null,
+                () -> Tooltip.of(I18n.get(KEY + "exit1")).danger().body(I18n.get(KEY + "exit2")));
+    }
+
+    // ------------------------------------------------------------------ shared pieces
+
+    private static int groupLabel(HudFrame f, String label, int x, int y) {
+        Text.small(f.g, label.toUpperCase(Locale.ROOT), x, y + 3, Theme.LABEL);
+        return y + EditorRows.GROUP_H;
+    }
+
+    private static int chips(HudFrame f, List<Chip> chips, int x, int y, int w) {
+        int chipW = (w - (chips.size() - 1) * CHIP_GAP) / chips.size();
+        for (int i = 0; i < chips.size(); i++) {
+            Chip c = chips.get(i);
+            Rect r = new Rect(x + i * (chipW + CHIP_GAP), y, chipW, CHIP_H);
+            Theme.chip(f.g, r.x(), r.y(), r.w(), r.h(), c.on(), f.hovered(r));
+            int iconW = c.icon() != null ? ICON + 3 : 0;
+            String label = Text.fit(c.label(), r.w() - iconW - 4);
+            int tx = r.centerX() - (iconW + Text.width(label)) / 2;
+            if (c.icon() != null)
+                MyRenderer.renderIcon(f.g, c.icon(), tx, r.y() + (CHIP_H - ICON) / 2, ICON);
+            Text.draw(f.g, label, tx + iconW, r.y() + 4, c.on() ? Theme.TEXT : Theme.BODY);
+            f.register(new ButtonBuilder(c.label()).onLeftClick(c.click()).build(), r, null, null);
+        }
+        return y + CHIP_H + 4;
+    }
+
+    private static ResourceLocation wool(Relationship owner) {
+        String colour = switch (owner) {
+            case NEUTRAL -> "yellow";
+            case HOSTILE -> "red";
+            default -> "lime";
+        };
+        return ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/" + colour + "_wool.png");
+    }
+
+    private static List<Chip> ownerChips(@Nullable Relationship current, java.util.function.Consumer<Relationship> set) {
+        return List.of(
+                new Chip(I18n.get("hud.relationship.reignofnether.owned"), wool(Relationship.OWNED), current == Relationship.OWNED, () -> set.accept(Relationship.OWNED)),
+                new Chip(I18n.get("hud.relationship.reignofnether.neutral"), wool(Relationship.NEUTRAL), current == Relationship.NEUTRAL, () -> set.accept(Relationship.NEUTRAL)),
+                new Chip(I18n.get("hud.relationship.reignofnether.enemy"), wool(Relationship.HOSTILE), current == Relationship.HOSTILE, () -> set.accept(Relationship.HOSTILE)));
+    }
+
+    // ------------------------------------------------------------------ spawn
+
+    private static void renderSpawn(HudFrame f, Rect r) {
+        int x = r.x();
+        int w = r.w();
+        int y = EditorRows.header(f, Tab.SPAWN.title(), x, r.y(), w, null, SandboxPanel::fold);
+
+        y = groupLabel(f, I18n.get(KEY + "group.owner"), x, y);
+        y = chips(f, ownerChips(SandboxClientEvents.relationship, owner -> SandboxClientEvents.relationship = owner), x, y, w);
+
+        y = groupLabel(f, I18n.get(KEY + "group.faction"), x, y);
+        List<Chip> factions = new ArrayList<>();
+        for (ResourceLocation rl : Factions.PLAYABLE_FACTIONS)
+            factions.add(new Chip(I18n.get(String.format("hud.faction.%s.%s", rl.getNamespace(), rl.getPath())), null,
+                    SandboxClientEvents.getFaction() == Factions.getFaction(rl), () -> {
+                        SandboxClientEvents.setFaction(Factions.getFaction(rl));
+                        listChanged();
+                    }));
+        y = chips(f, factions, x, y, w);
+
+        y = groupLabel(f, I18n.get(KEY + "group.type"), x, y);
+        y = chips(f, List.of(typeChip(SandboxMenuType.UNITS, "tab.units"), typeChip(SandboxMenuType.BUILDINGS, "tab.buildings"),
+                typeChip(SandboxMenuType.CUSTOM_BUILDINGS, "tab.custom")), x, y, w);
+
+        Rect field = new Rect(x, y, w, FIELD_H);
+        EditorRows.field(f, searchBox(), field);
+        if (query.isEmpty() && !searchBox.isFocused())
+            Text.draw(f.g, I18n.get(KEY + "search"), x + 3, field.centerY() - 4, Theme.DIM);
+        y += FIELD_H + 3;
+
+        if (SandboxClientEvents.sandboxMenuType == SandboxMenuType.CUSTOM_BUILDINGS) {
+            y = EditorRows.stepper(f, I18n.get(KEY + "sort_by"), null,
+                    I18n.get(KEY + "sort." + SandboxClientEvents.customBuildingSortOption.name().toLowerCase(Locale.ROOT)),
+                    () -> cycleSort(false), () -> cycleSort(true), x, y, w);
+        }
+
+        long tick = System.currentTimeMillis() / 50; // the custom building buttons are built anew each time
+        if (spawnRows == null || tick != spawnRowsTick) {
+            spawnRows = buildSpawnRows();
+            spawnRowsTick = tick;
+        }
+        scroll = EditorRows.renderScrolled(f, List.of(new Group(null, spawnRows)), new Rect(x, y, w, r.bottom() - y), scroll);
+    }
+
+    private static Chip typeChip(SandboxMenuType type, String key) {
+        return new Chip(I18n.get(KEY + key), null, SandboxClientEvents.sandboxMenuType == type, () -> {
+            SandboxClientEvents.sandboxMenuType = type;
+            listChanged();
+        });
+    }
+
+    private static void cycleSort(boolean reverse) {
+        SandboxClientEvents.cycleCustomBuildingSort(reverse);
+        spawnRows = null;
+    }
+
+    private static void listChanged() {
+        scroll = 0;
+        spawnRows = null;
+    }
+
+    private static MyEditBox searchBox() {
+        if (searchBox == null) {
+            // placed every frame by EditorRows.field
+            searchBox = new MyEditBox.Builder(0, 0, 120, 9)
+                    .bordered(false)
+                    .maxLength(32)
+                    .responder(value -> {
+                        query = value.toLowerCase(Locale.ROOT);
+                        listChanged();
+                    })
+                    .build();
+            TextInputClientEvents.registerEditBox(searchBox);
+        }
+        return searchBox;
+    }
+
+    private static List<Row> buildSpawnRows() {
+        boolean placing = SandboxClientEvents.sandboxMenuType != SandboxMenuType.UNITS;
+        List<? extends Button> buttons = switch (SandboxClientEvents.sandboxMenuType) {
+            case UNITS -> SandboxClientEvents.getUnitButtons();
+            case BUILDINGS -> SandboxClientEvents.getBuildingButtons();
+            case CUSTOM_BUILDINGS -> SandboxClientEvents.getCustomBuildingButtons();
+        };
+        List<Row> rows = new ArrayList<>();
+        for (Button b : buttons) {
+            String name = displayName(b);
+            if (!b.isHidden.get() && name.toLowerCase(Locale.ROOT).contains(query))
+                rows.add(spawnRow(b, name, placing));
+        }
+        return rows;
+    }
+
+    private static String displayName(Button b) {
+        if (b.tooltipLines == null || b.tooltipLines.isEmpty())
+            return b.name;
+        StringBuilder sb = new StringBuilder();
+        FormattedCharSequence title = b.tooltipLines.get(0);
+        title.accept((index, style, codePoint) -> {
+            sb.appendCodePoint(codePoint);
+            return true;
+        });
+        return sb.toString();
+    }
+
+    private static Row spawnRow(Button b, String name, boolean placing) {
+        // a placement goes to the selected unit's owner and workers, not the owner chip: start from an empty selection
+        Runnable click = !placing ? b.onLeftClick : () -> {
+            UnitClientEvents.clearSelectedUnits();
+            b.onLeftClick.run();
+        };
+        Button row = new ButtonBuilder(b.name).onLeftClick(click).onRightClick(b.onRightClick).isEnabled(b.isEnabled).build();
+        return (f, x, y, w) -> {
+            int h = EditorRows.ROW_H;
+            Rect r = new Rect(x, y, w, h);
+            boolean on = b.isSelected.get();
+            f.g.fill(x, y + h - 1, x + w, y + h, Theme.RAISED);
+            if (on) {
+                f.g.fill(x, y, x + w, y + h, Theme.ACTIVE);
+                Theme.ring(f.g, x, y, w, h, 1, Theme.ORANGE);
+            } else if (f.hovered(r)) {
+                f.g.fill(x, y, x + w, y + h, Theme.HOVER);
+            }
+            if (b.iconResource != null)
+                MyRenderer.renderIcon(f.g, b.iconResource, x + 1, y + (h - LIST_ICON) / 2, LIST_ICON);
+            Text.draw(f.g, Text.fit(name, w - LIST_ICON - EDIT_W - 8), x + LIST_ICON + 4, y + 4,
+                    !b.isEnabled.get() ? Theme.MUTED : on ? Theme.GOLD : Theme.TEXT);
+            f.register(row, r, null, () -> Tooltip.fromLines(b.tooltipLines));
+            if (b.onRightClick != null) // custom buildings open their editor with it
+                EditorRows.textButton(f, b.name + " edit", I18n.get(KEY + "custom_buildings.edit"),
+                        new Rect(x + w - EDIT_W, y + 2, EDIT_W, h - 4), Style.SECONDARY, b.onRightClick, null, null);
+        };
+    }
+
+    // ------------------------------------------------------------------ selection
+
+    private static void renderSelection(HudFrame f, Rect r) {
+        int x = r.x();
+        int w = r.w();
+        int y = EditorRows.header(f, Tab.SELECTION.title(), x, r.y(), w, null, SandboxPanel::fold);
+        BuildingPlacement building = HudClientEvents.hudSelectedPlacement;
+        boolean unit = HudClientEvents.hudSelectedEntity instanceof Unit;
+        if (building == null && !unit) {
+            for (FormattedCharSequence line : Text.wrap(I18n.get(KEY + "selection.empty"), w)) {
+                Text.draw(f.g, line, x, y, Theme.DESC);
+                y += Text.lineHeight();
+            }
+            return;
+        }
+        y = groupLabel(f, I18n.get(KEY + "group.owner"), x, y);
+        y = chips(f, ownerChips(SandboxActionButtons.getSelectionRelationship(), SandboxActionButtons::setSelectionOwner), x, y, w);
+
+        ScenarioRole role = SandboxActionButtons.getHudSelectedScenarioRole();
+        y = groupLabel(f, I18n.get(KEY + "scenario_role"), x, y);
+        y = EditorRows.wideStepper(f, I18n.get(KEY + "scenario_role"), null,
+                role != null ? role.name : I18n.get(KEY + "scenario_role_none"),
+                () -> SandboxActionButtons.cycleUnitOrBuildingRoleIndex(false),
+                () -> SandboxActionButtons.cycleUnitOrBuildingRoleIndex(true), x, y, w);
+        y += 4;
+
+        if (building != null) {
+            tool(f, SandboxActionButtons.removeBuildingPlacement, I18n.get(KEY + "anchor.remove"), new Rect(x, y, w, TOOL_H), true);
+            return;
+        }
+        y = groupLabel(f, I18n.get(KEY + "group.anchor"), x, y);
+        int toolW = (w - 2 * CHIP_GAP) / 3;
+        tool(f, SandboxActionButtons.setAnchor, I18n.get(KEY + "anchor.set"), new Rect(x, y, toolW, TOOL_H), false);
+        tool(f, SandboxActionButtons.resetToAnchor, I18n.get(KEY + "anchor.reset"), new Rect(x + toolW + CHIP_GAP, y, toolW, TOOL_H), false);
+        tool(f, SandboxActionButtons.removeAnchor, I18n.get(KEY + "anchor.remove"), new Rect(x + 2 * (toolW + CHIP_GAP), y, toolW, TOOL_H), false);
+    }
+
+    /** One of the sandbox action buttons as a labelled button; it keeps its own click, state and tooltip. */
+    private static void tool(HudFrame f, Button b, String label, Rect r, boolean danger) {
+        boolean enabled = b.isEnabled.get();
+        boolean hovered = enabled && f.hovered(r);
+        boolean on = b.isSelected.get();
+        if (danger)
+            Theme.dangerButton(f.g, r.x(), r.y(), r.w(), r.h(), hovered);
+        else if (on)
+            Theme.chip(f.g, r.x(), r.y(), r.w(), r.h(), true, hovered);
+        else
+            Theme.button(f.g, r.x(), r.y(), r.w(), r.h(), hovered);
+        int colour = !enabled ? Theme.FAINT : danger ? Theme.DANGER_TEXT : on || hovered ? Theme.GOLD : Theme.BODY;
+        Text.mediumCentered(f.g, Text.fit(label, r.w() - 4), r.centerX(), r.y() + (r.h() - 8) / 2, colour);
+        f.register(b, r, null, () -> Tooltip.fromLines(b.tooltipLines));
+    }
+
+    // ------------------------------------------------------------------ rules
+
+    private static void renderRules(HudFrame f, Rect r) {
+        int y = EditorRows.header(f, Tab.RULES.title(), r.x(), r.y(), r.w(), null, SandboxPanel::fold);
+        if (rules == null)
+            rules = ruleGroups(); // every value is a supplier, so the rows themselves never change
+        scroll = EditorRows.renderScrolled(f, rules, new Rect(r.x(), y, r.w(), r.bottom() - y), scroll);
+    }
+
+    private static List<Group> ruleGroups() {
+        List<Group> groups = new ArrayList<>();
+        groups.add(new Group(I18n.get(KEY + "group.cheats"), List.of(
+                cheat("unit_cheats", I18n.get(KEY + "unit_cheats1").trim() + " " + I18n.get(KEY + "unit_cheats2").trim(), SandboxClientEvents.UNIT_CHEATS),
+                cheat("building_cheats", I18n.get(KEY + "building_cheats1"), SandboxClientEvents.BUILDING_CHEATS),
+                cheat("control_cheat", I18n.get(KEY + "nonunit_control_cheat1"), SandboxClientEvents.CONTROL_CHEATS))));
+        if (SettingsMenu.canOpenGamerules())
+            groups.add(new Group(I18n.get("hud.gamerule.reignofnether.title"), ruleRows(GameruleClient.ruleRows())));
+        return groups;
+    }
+
+    private static Row cheat(String key, String description, List<String> cheats) {
+        String name = I18n.get(KEY + key);
+        return (f, x, y, w) -> EditorRows.toggle(f, name, EditorRows.tip(name, description), SandboxClientEvents.hasCheats(cheats),
+                () -> SandboxClientEvents.toggleCheats(cheats), x, y, w);
+    }
+
+    private static List<Row> ruleRows(List<SettingRow> rows) {
+        List<Row> list = new ArrayList<>();
+        for (SettingRow rule : rows)
+            list.add((f, x, y, w) -> SettingRows.renderRow(f, rule, x, y, w));
+        return list;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/scenario/ScenarioClientEvents.java b/src/main/java/com/solegendary/reignofnether/scenario/ScenarioClientEvents.java
index e9078debc..310b23d03 100644
--- a/src/main/java/com/solegendary/reignofnether/scenario/ScenarioClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/scenario/ScenarioClientEvents.java
@@ -3,7 +3,6 @@
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.building.BuildingClientEvents;
 import com.solegendary.reignofnether.building.BuildingPlacement;
-import com.solegendary.reignofnether.guiscreen.TopdownGui;
 import com.solegendary.reignofnether.hud.*;
 import com.solegendary.reignofnether.hud.buttons.Button;
 import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
@@ -16,15 +15,11 @@
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.util.MiscUtil;
 import com.solegendary.reignofnether.util.MyMath;
-import com.solegendary.reignofnether.util.MyRenderer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraftforge.client.event.ScreenEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import org.lwjgl.glfw.GLFW;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
@@ -65,8 +60,6 @@ public static void setMenuOpen(boolean value) {
     ));
     private static int roleIndexToEdit = 0; // list index, not role.index
     private static int roleIndexToPlay = 0; // list index, not role.index
-    private static final ArrayList<Button> renderedButtons = new ArrayList<>();
-    private static final ArrayList<RectZone> hudZones = new ArrayList<>();
 
     // statics outlive the world: back to the defaults, or the next world inherits these
     public static void resetRoles() {
@@ -330,14 +323,23 @@ public static int getNumPlayerRoles() {
         return count;
     }
 
+    /** Why the scenario can't be published yet, or null when it can. */
+    @Nullable
+    public static String getPublishError() {
+        if (getNumScenarioBuildings() == 0 && getNumScenarioUnits() == 0)
+            return I18n.get("sandbox.reignofnether.publish_scenario_tooltip_error1");
+        if (getNumPlayerRoles() <= 0)
+            return I18n.get("sandbox.reignofnether.publish_scenario_tooltip_error2");
+        return null;
+    }
+
     public static void pressedPublishScenarioButton() {
         if (!confirmPublishScenario) {
             confirmPublishScenario = true;
         } else {
-            if (getNumScenarioBuildings() == 0 && getNumScenarioUnits() == 0) {
-                HudClientEvents.showTemporaryMessage(I18n.get("sandbox.reignofnether.publish_scenario_tooltip_error1"));
-            } else if (getNumPlayerRoles() <= 0) {
-                HudClientEvents.showTemporaryMessage(I18n.get("sandbox.reignofnether.publish_scenario_tooltip_error2"));
+            String error = getPublishError();
+            if (error != null) {
+                HudClientEvents.showTemporaryMessage(error);
             } else {
                 PlayerServerboundPacket.publishScenario();
                 setMenuOpen(false);
@@ -345,46 +347,4 @@ public static void pressedPublishScenarioButton() {
             confirmPublishScenario = false;
         }
     }
-
-    @SubscribeEvent
-    public static void onDrawScreen(ScreenEvent.Render.Post evt) {
-        hudZones.clear();
-        renderedButtons.clear();
-        if (MC.screen instanceof TopdownGui && isMenuOpen()) {
-            int width = 254;
-            int height = 160;
-            int blitX = MC.screen.width - width - 120;
-            int blitY = 5;
-            MyRenderer.renderFrameWithBg(evt.getGuiGraphics(), blitX, blitY, width, height, 0xA0000000);
-
-            ScenarioRole role = getScenarioRoleToEdit();
-            if (role != null) {
-                renderedButtons.addAll(ScenarioMenu.renderRoleNameAndCycleButtons(evt, getScenarioRoleToEdit(), blitX + 14, blitY + 14));
-                renderedButtons.add(ScenarioMenu.renderHelpButton(evt, blitX + width - Button.itemIconSize - 32, blitY + 4));
-                renderedButtons.add(ScenarioMenu.renderCloseButton(evt, blitX + width - Button.itemIconSize - 12, blitY + 4));
-                renderedButtons.addAll(ScenarioMenu.renderCustomisationButtonsColumn1(evt, blitX + 16, blitY + 56));
-                renderedButtons.addAll(ScenarioMenu.renderCustomisationButtonsColumn2(evt, blitX + 140, blitY + 56));
-                renderedButtons.add(ScenarioMenu.renderResetRoleButton(evt, blitX + width - Button.itemIconSize - 12, blitY + height - 26));
-            }
-            hudZones.add(new RectZone(blitX, blitY, blitX + width, blitY + height));
-        }
-    }
-
-    public static boolean isMouseOverHud(int mouseX, int mouseY) {
-        for (RectZone hudZone : hudZones)
-            if (hudZone.isMouseOver(mouseX, mouseY))
-                return true;
-        return false;
-    }
-
-    @SubscribeEvent
-    public static void onMousePress(ScreenEvent.MouseButtonPressed.Post evt) {
-        for (Button button : renderedButtons) {
-            if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_1) {
-                button.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), true);
-            } else if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_2) {
-                button.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), false);
-            }
-        }
-    }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/scenario/ScenarioMenu.java b/src/main/java/com/solegendary/reignofnether/scenario/ScenarioMenu.java
index 4b5c46b73..d03e2aedc 100644
--- a/src/main/java/com/solegendary/reignofnether/scenario/ScenarioMenu.java
+++ b/src/main/java/com/solegendary/reignofnether/scenario/ScenarioMenu.java
@@ -1,33 +1,39 @@
 package com.solegendary.reignofnether.scenario;
 
-import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.building.BuildingClientEvents;
 import com.solegendary.reignofnether.faction.Factions;
-import com.solegendary.reignofnether.hud.buttons.Button;
 import com.solegendary.reignofnether.hud.HudClientEvents;
 import com.solegendary.reignofnether.hud.MyEditBox;
 import com.solegendary.reignofnether.hud.TextInputClientEvents;
-import com.solegendary.reignofnether.hud.buttons.BooleanButton;
-import com.solegendary.reignofnether.hud.buttons.IntegerButton;
-import com.solegendary.reignofnether.keybinds.Keybinding;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
 import com.solegendary.reignofnether.keybinds.Keybindings;
 import com.solegendary.reignofnether.resources.ResourceName;
+import com.solegendary.reignofnether.sandbox.SandboxPanel;
+import com.solegendary.reignofnether.ui.EditorRows;
+import com.solegendary.reignofnether.ui.EditorRows.Group;
+import com.solegendary.reignofnether.ui.EditorRows.Row;
+import com.solegendary.reignofnether.ui.EditorRows.Style;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Text;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
 import com.solegendary.reignofnether.unit.UnitClientEvents;
 import com.solegendary.reignofnether.util.MiscUtil;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.I18n;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.client.event.ScreenEvent;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.function.IntConsumer;
+import java.util.function.IntSupplier;
+import java.util.function.Supplier;
 
 import static com.solegendary.reignofnether.scenario.ScenarioClientEvents.getScenarioRoleToEdit;
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
 
+/** The scenario role editor, the sandbox dock's scenario tab: names and sets up each role in turn. */
 public class ScenarioMenu {
 
-    private static Minecraft MC = Minecraft.getInstance();
+    private static final String KEY = "sandbox.reignofnether.scenario.";
+    private static final int FOOTER_H = 14;
 
     private static MyEditBox roleNameInput = registerRoleNameInput();
 
@@ -40,7 +46,9 @@ public static MyEditBox registerRoleNameInput() {
         if (roleNameInput == null) {
             ScenarioRole role = ScenarioClientEvents.getScenarioRoleToEdit();
             if (role != null) {
-                MyEditBox box = new MyEditBox.Builder(0, 0, 120, 12)
+                // placed every frame by EditorRows.field
+                MyEditBox box = new MyEditBox.Builder(0, 0, 120, 9)
+                        .bordered(false)
                         .maxLength(32)
                         .value(role.name)
                         .responder(value -> role.name = value)
@@ -58,321 +66,181 @@ public static void unregisterRoleNameInput() {
         roleNameInput = null;
     }
 
-    public static List<Button> renderRoleNameAndCycleButtons(ScreenEvent.Render.Post evt, ScenarioRole role, int x, int y) {
-        int xr = x + 5;
-        int yr = y;
-        evt.getGuiGraphics().drawString(MC.font, fcs(I18n.get("sandbox.reignofnether.scenario.role_number", role.index + 1), true), xr, yr, 0xFFFFFF);
-        evt.getGuiGraphics().drawString(MC.font, fcs(I18n.get("sandbox.reignofnether.scenario.role_name"), true), xr, yr + 24, 0xFFFFFF);
-
-        roleNameInput.setX(xr + 2 + MC.font.width(fcs(I18n.get("sandbox.reignofnether.scenario.role_name"), true)));
-        roleNameInput.setY(yr + 22);
-
-        Button cycleButtonBackward = new Button("Cycle Role Backward",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/tutorial_arrow_left.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> ScenarioClientEvents.cycleRoleIndexToEdit(true),
-                null,
-                List.of()
-        );
-        Button cycleButtonForward = new Button("Cycle Role Forward",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/tutorial_arrow_right.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> ScenarioClientEvents.cycleRoleIndexToEdit(false),
-                null,
-                List.of()
-        );
-        xr += 110;
-        yr -= 7;
-        renderButton(cycleButtonBackward, xr, yr, evt);
-        xr += Button.DEFAULT_ICON_FRAME_SIZE;
-        renderButton(cycleButtonForward, xr, yr, evt);
-        return List.of(cycleButtonBackward, cycleButtonForward);
+    /** Draws the editor for this role in the dock's scenario tab. Returns the scroll actually used. */
+    public static int render(HudFrame f, ScenarioRole role, Rect r, int scroll) {
+        int x = r.x();
+        int y = r.y();
+        renderHeader(f, role, x, y, r.w());
+        y += EditorRows.HEADER_H;
+
+        // above the scrolled rows: an edit box can't be cut off
+        int nameH = Math.max(EditorRows.ROW_H, EditorRows.fieldHeight(f) + 4);
+        Rect field = EditorRows.label(f, I18n.get(KEY + "name"), null, x, y + (nameH - EditorRows.ROW_H) / 2, r.w(), 120);
+        if (roleNameInput != null)
+            EditorRows.field(f, roleNameInput, new Rect(field.x(), y + 2, field.w(), nameH - 4));
+        y += nameH + 4;
+
+        String error = ScenarioClientEvents.getPublishError();
+        int footerY = r.bottom() - FOOTER_H;
+        int bottom = footerY - 6;
+        if (error != null) {
+            bottom -= Theme.bannerHeight(error, r.w());
+            Theme.banner(f.g, x, bottom, r.w(), error, Theme.ORANGE_DARK);
+            bottom -= 4;
+        }
+        int shown = EditorRows.renderScrolled(f, groups(role), new Rect(x, y, r.w(), bottom - y), scroll);
+        renderFooter(f, x, footerY, r.w(), error == null);
+        return shown;
     }
 
-    public static List<Button> renderCustomisationButtonsColumn2(ScreenEvent.Render.Post evt, int x, int y) {
-        Button unitsButton = new Button("Role Units",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath("minecraft", "textures/item/spawn_egg.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> ScenarioClientEvents.cycleRoleUnits(false),
-                () -> {
-                    if (Keybindings.shiftMod.isDown() && Keybindings.ctrlMod.isDown()) {
-                        ScenarioClientEvents.clearRoleUnits();
-                        UnitClientEvents.clearSelectedUnits();
-                    } else {
-                        ScenarioClientEvents.cycleRoleUnits(true);
-                    }
-                },
-                List.of(
-                        fcs(I18n.get("sandbox.reignofnether.scenario.select_role_units")),
-                        fcs(I18n.get("sandbox.reignofnether.scenario.select_all_shift")),
-                        fcs(I18n.get("sandbox.reignofnether.scenario.clear_all"))
-                )
-        );
-        Button buildingsButton = new Button("Role Buildings",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath("minecraft", "textures/block/crafting_table_front.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> ScenarioClientEvents.cycleRoleBuildings(false),
-                () -> {
-                    if (Keybindings.shiftMod.isDown() && Keybindings.ctrlMod.isDown()) {
-                        ScenarioClientEvents.clearRoleBuildings();
-                        BuildingClientEvents.clearSelectedBuildings();
-                    } else {
-                        ScenarioClientEvents.cycleRoleBuildings(true);
-                    }
-                },
-                List.of(
-                        fcs(I18n.get("sandbox.reignofnether.scenario.select_role_buildings")),
-                        fcs(I18n.get("sandbox.reignofnether.scenario.select_all_shift")),
-                        fcs(I18n.get("sandbox.reignofnether.scenario.clear_all"))
-                )
-        );
-        int xr = x;
-        int yr = y;
-
-        ScenarioRole roleToEdit = getScenarioRoleToEdit();
+    /** ◀ Role N ▶ chips, help and close. */
+    private static void renderHeader(HudFrame f, ScenarioRole role, int x, int y, int w) {
+        EditorRows.header(f, "", x, y, w, ScenarioMenu::helpTooltip, SandboxPanel::fold);
+        String title = I18n.get(KEY + "role_label") + " " + (role.index + 1);
+        Rect back = new Rect(x, y, 12, 12);
+        int titleW = Text.headingWidth(title, Text.px(18));
+        Rect forward = new Rect(x + 18 + titleW + 6, y, 12, 12);
+        chip(f, "Cycle Role Backward", "◀", back, () -> ScenarioClientEvents.cycleRoleIndexToEdit(true));
+        Text.heading(f.g, title, x + 18, y + 2, Theme.GOLD, Text.px(18));
+        chip(f, "Cycle Role Forward", "▶", forward, () -> ScenarioClientEvents.cycleRoleIndexToEdit(false));
+    }
 
-        renderButton(unitsButton, xr, yr, evt);
-        String unitLabel = I18n.get("sandbox.reignofnether.scenario.role_units", ScenarioClientEvents.getNumScenarioUnits(roleToEdit));
-        evt.getGuiGraphics().drawString(MC.font, unitLabel, xr + 27, yr + 7, 0xFFFFFF);
+    private static void chip(HudFrame f, String id, String glyph, Rect r, Runnable run) {
+        boolean hovered = f.hovered(r);
+        Theme.chip(f.g, r.x(), r.y(), r.w(), r.h(), false, hovered);
+        Text.drawCentered(f.g, glyph, r.centerX() + 1, r.y() + 2, hovered ? Theme.GOLD : Theme.BODY);
+        f.register(new ButtonBuilder(id).onLeftClick(run).build(), r, null, null);
+    }
 
-        yr += Button.DEFAULT_ICON_FRAME_SIZE;
+    private static Tooltip helpTooltip() {
+        String body = String.join(" ", I18n.get(KEY + "help_tooltip1").trim(), I18n.get(KEY + "help_tooltip2").trim(),
+                I18n.get(KEY + "help_tooltip3").trim());
+        return Tooltip.of(I18n.get(KEY + "help_title")).body(body);
+    }
 
-        renderButton(buildingsButton, xr, yr, evt);
-        String buildingLabel = I18n.get("sandbox.reignofnether.scenario.role_buildings", ScenarioClientEvents.getNumScenarioBuildings(roleToEdit));
-        evt.getGuiGraphics().drawString(MC.font, buildingLabel, xr + 27, yr + 7, 0xFFFFFF);
+    public static void save() {
+        ScenarioServerboundPacket.saveScenario();
+        HudClientEvents.showTemporaryMessage(I18n.get(KEY + "saved_all_roles"));
+    }
 
-        yr += Button.DEFAULT_ICON_FRAME_SIZE;
+    /** Reset (shift+ctrl+right click, so it can't happen by accident) and Publish, which asks to confirm. */
+    private static void renderFooter(HudFrame f, int x, int y, int w, boolean canPublish) {
+        EditorRows.textButton(f, "Reset Scenario Role", I18n.get(KEY + "reset_role.label"), new Rect(x, y, 70, FOOTER_H), Style.DANGER,
+                null, ScenarioMenu::resetRole,
+                () -> Tooltip.of(I18n.get(KEY + "reset_role.tooltip1")).danger().body(I18n.get(KEY + "reset_role.tooltip2")));
+        boolean confirm = ScenarioClientEvents.confirmPublishScenario;
+        String publish = "sandbox.reignofnether.publish_scenario_tooltip";
+        EditorRows.textButton(f, "Publish Scenario Map", I18n.get(confirm ? publish + "_confirm" : "sandbox.reignofnether.publish"),
+                new Rect(x + w - 80, y, 80, FOOTER_H), canPublish ? Style.PRIMARY : Style.SECONDARY,
+                canPublish ? ScenarioClientEvents::pressedPublishScenarioButton : null,
+                () -> ScenarioClientEvents.confirmPublishScenario = false,
+                () -> confirm ? Tooltip.of(I18n.get(publish + "1")).body(I18n.get(publish + "_cancel"))
+                        : Tooltip.of(I18n.get(publish + "1")).body(I18n.get(publish + "2")).body(I18n.get(publish + "3")));
+    }
 
+    private static void resetRole() {
+        if (!Keybindings.shiftMod.isDown() || !Keybindings.ctrlMod.isDown())
+            return;
         ScenarioRole role = getScenarioRoleToEdit();
         if (role != null) {
-            Button npcRoleButton = new BooleanButton(
-                    role.isNpc ? I18n.get("sandbox.reignofnether.scenario.npc_role_true") :
-                                I18n.get("sandbox.reignofnether.scenario.npc_role_false"),
-                    role.isNpc,
-                    () -> {
-                        role.isNpc = !role.isNpc;
-                        ScenarioServerboundPacket.setRoleIsNpc(role.index, role.isNpc);
-                    },
-                    I18n.get("sandbox.reignofnether.scenario.npc_role_tooltip")
-            );
-            renderButton(npcRoleButton, xr, yr, evt);
-            return List.of(buildingsButton, unitsButton, npcRoleButton);
-        } else {
-            return List.of();
+            role.faction = Factions.NEUTRAL;
+            ScenarioServerboundPacket.setRoleFaction(role.index, Factions.NEUTRAL);
+            role.startingResources.food = 0;
+            ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.FOOD, 0);
+            role.startingResources.wood = 0;
+            ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.WOOD, 0);
+            role.startingResources.ore = 0;
+            ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.ORE, 0);
+            role.teamNumber = role.index + 1;
+            ScenarioServerboundPacket.setTeamNumber(role.index, role.teamNumber);
+            role.isNpc = false;
+            ScenarioServerboundPacket.setRoleIsNpc(role.index, false);
+            role.name = "Player " + (role.index + 1);
+            ScenarioServerboundPacket.setRoleName(role.index, role.name);
         }
     }
 
-    public static Button renderCloseButton(ScreenEvent.Render.Post evt, int x, int y) {
-        Button closeButton = new Button("Close & Save Scenario",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/cross_square.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                () -> {
-                    ScenarioClientEvents.setMenuOpen(false);
-                    ScenarioServerboundPacket.saveScenario();
-                    HudClientEvents.showTemporaryMessage(I18n.get("sandbox.reignofnether.scenario.saved_all_roles"));
-                },
-                null,
-                List.of(fcs(I18n.get("sandbox.reignofnether.scenario.close_and_save")))
-        );
-        closeButton.frameResource = null;
-        renderButton(closeButton, x, y, evt);
-        return closeButton;
-    }
-
-    public static Button renderHelpButton(ScreenEvent.Render.Post evt, int x, int y) {
-        Button closeButton = new Button("Scenario Help",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/help.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                null,
-                null,
-                List.of(
-                    fcs(I18n.get("sandbox.reignofnether.scenario.help_tooltip1")),
-                    fcs(I18n.get("sandbox.reignofnether.scenario.help_tooltip2")),
-                    fcs(I18n.get("sandbox.reignofnether.scenario.help_tooltip3"))
-                )
-        );
-        closeButton.frameResource = null;
-        renderButton(closeButton, x, y, evt);
-        return closeButton;
-    }
-
-    public static Button renderResetRoleButton(ScreenEvent.Render.Post evt, int x, int y) {
-        Button deregisterButton = new Button("Reset Scenario Role",
-                Button.itemIconSize,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/barrier.png"),
-                (Keybinding) null,
-                () -> false,
-                () -> false,
-                () -> true,
-                null,
-                () -> {
-                    if (!Keybindings.shiftMod.isDown() || !Keybindings.ctrlMod.isDown())
-                        return;
-                    ScenarioRole role = getScenarioRoleToEdit();
-                    if (role != null) {
-                        role.faction = Factions.NEUTRAL;
-                        ScenarioServerboundPacket.setRoleFaction(role.index, Factions.NEUTRAL);
-                        role.startingResources.food = 0;
-                        ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.FOOD, 0);
-                        role.startingResources.wood = 0;
-                        ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.WOOD, 0);
-                        role.startingResources.ore = 0;
-                        ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.ORE, 0);
-                        role.teamNumber = role.index + 1;
+    private static List<Group> groups(ScenarioRole role) {
+        return List.of(
+            new Group(null, List.of(
+                (f, x, y, w) -> EditorRows.stepper(f, null, I18n.get(KEY + "faction"), EditorRows.tip(role.faction.getName(), null), "", role.faction.icon,
+                    () -> {
+                        role.faction = Factions.getFaction(MiscUtil.getNextItem(Factions.PLAYABLE_FACTIONS, role.faction.key));
+                        ScenarioServerboundPacket.setRoleFaction(role.index, role.faction);
+                    },
+                    () -> {
+                        role.faction = Factions.getFaction(MiscUtil.getLastItem(Factions.PLAYABLE_FACTIONS, role.faction.key));
+                        ScenarioServerboundPacket.setRoleFaction(role.index, role.faction);
+                    }, x, y, w),
+                (f, x, y, w) -> EditorRows.stepper(f, I18n.get(KEY + "team"),
+                    EditorRows.tip(I18n.get(KEY + "team"), I18n.get(KEY + "team_number_tooltip")), String.valueOf(role.teamNumber),
+                    () -> {
+                        role.teamNumber += 1;
+                        if (role.teamNumber > ScenarioClientEvents.scenarioRoles.size())
+                            role.teamNumber = 1;
                         ScenarioServerboundPacket.setTeamNumber(role.index, role.teamNumber);
-                        role.isNpc = false;
-                        ScenarioServerboundPacket.setRoleIsNpc(role.index, false);
-                        role.name = "Player " + (role.index + 1);
-                        ScenarioServerboundPacket.setRoleName(role.index, role.name);
-                    }
-                },
-                List.of(
-                        fcs(I18n.get("sandbox.reignofnether.scenario.reset_role.tooltip1"), true),
-                        fcs(I18n.get("sandbox.reignofnether.scenario.reset_role.tooltip2"))
-                )
+                    },
+                    () -> {
+                        role.teamNumber -= 1;
+                        if (role.teamNumber < 1)
+                            role.teamNumber = ScenarioClientEvents.scenarioRoles.size();
+                        ScenarioServerboundPacket.setTeamNumber(role.index, role.teamNumber);
+                    }, x, y, w),
+                (f, x, y, w) -> EditorRows.toggle(f, I18n.get(KEY + "npc_only"),
+                    EditorRows.tip(I18n.get(KEY + "npc_only"), I18n.get(KEY + "npc_role_tooltip")), role.isNpc,
+                    () -> {
+                        role.isNpc = !role.isNpc;
+                        ScenarioServerboundPacket.setRoleIsNpc(role.index, role.isNpc);
+                    }, x, y, w)
+            )),
+            new Group(I18n.get(KEY + "group.starting_resources"), List.of(
+                resource(role, "starting_food", ResourceName.FOOD, () -> role.startingResources.food, v -> role.startingResources.food = v),
+                resource(role, "starting_wood", ResourceName.WOOD, () -> role.startingResources.wood, v -> role.startingResources.wood = v),
+                resource(role, "starting_ore", ResourceName.ORE, () -> role.startingResources.ore, v -> role.startingResources.ore = v)
+            )),
+            new Group(I18n.get(KEY + "group.assigned"), List.of(
+                (f, x, y, w) -> EditorRows.action(f, I18n.get(KEY + "units"), selectTip("select_role_units"),
+                    String.valueOf(ScenarioClientEvents.getNumScenarioUnits(role)), I18n.get(KEY + "select"),
+                    () -> ScenarioClientEvents.cycleRoleUnits(false),
+                    () -> {
+                        if (Keybindings.shiftMod.isDown() && Keybindings.ctrlMod.isDown()) {
+                            ScenarioClientEvents.clearRoleUnits();
+                            UnitClientEvents.clearSelectedUnits();
+                        } else {
+                            ScenarioClientEvents.cycleRoleUnits(true);
+                        }
+                    }, x, y, w),
+                (f, x, y, w) -> EditorRows.action(f, I18n.get(KEY + "buildings"), selectTip("select_role_buildings"),
+                    String.valueOf(ScenarioClientEvents.getNumScenarioBuildings(role)), I18n.get(KEY + "select"),
+                    () -> ScenarioClientEvents.cycleRoleBuildings(false),
+                    () -> {
+                        if (Keybindings.shiftMod.isDown() && Keybindings.ctrlMod.isDown()) {
+                            ScenarioClientEvents.clearRoleBuildings();
+                            BuildingClientEvents.clearSelectedBuildings();
+                        } else {
+                            ScenarioClientEvents.cycleRoleBuildings(true);
+                        }
+                    }, x, y, w)
+            ))
         );
-        deregisterButton.frameResource = null;
-        renderButton(deregisterButton, x, y, evt);
-        return deregisterButton;
     }
 
-    public static List<Button> renderCustomisationButtonsColumn1(ScreenEvent.Render.Post evt, int x, int y) {
-        int origX = x;
-        int origY = y;
-        ArrayList<Button> buttons = new ArrayList<>();
-        ScenarioRole role = getScenarioRoleToEdit();
-
-        if (role == null)
-            return List.of();
+    private static Supplier<Tooltip> selectTip(String key) {
+        return () -> Tooltip.of(I18n.get(KEY + key)).body(I18n.get(KEY + "select_all_shift")).body(I18n.get(KEY + "clear_all"));
+    }
 
-        Button factionButton = new Button(
-            "Toggle Faction",
-            Button.itemIconSize,
-            role.faction.icon,
-            (Keybinding) null,
-            () -> false,
-            () -> false,
-            () -> true,
+    /** Left click (or ▶) adds 5, or 100 with shift; right click (or ◀) takes it away. */
+    private static Row resource(ScenarioRole role, String key, ResourceName name, IntSupplier get, IntConsumer set) {
+        return (f, x, y, w) -> EditorRows.stepper(f, I18n.get(KEY + key), null, String.valueOf(get.getAsInt()),
             () -> {
-                role.faction = Factions.getFaction(MiscUtil.getNextItem(Factions.PLAYABLE_FACTIONS, role.faction.key));
-                ScenarioServerboundPacket.setRoleFaction(role.index, role.faction);
+                int value = Math.min(10000, get.getAsInt() + (Keybindings.shiftMod.isDown() ? 100 : 5));
+                ScenarioServerboundPacket.setStartingResources(role.index, name, value);
+                set.accept(value);
             },
             () -> {
-                role.faction = Factions.getFaction(MiscUtil.getLastItem(Factions.PLAYABLE_FACTIONS, role.faction.key));
-                ScenarioServerboundPacket.setRoleFaction(role.index, role.faction);
-            },
-            List.of()
-        );
-        String factionStr = role.faction.getName();
-        String label = I18n.get("sandbox.reignofnether.faction_button1", factionStr);
-        evt.getGuiGraphics().drawString(MC.font, label, x + 27, y + 7, 0xFFFFFF);
-        renderButton(factionButton, x, y, evt);
-
-        Button setStartingFoodButton = new IntegerButton(
-                I18n.get("sandbox.reignofnether.scenario.starting_food") + ": " + role.startingResources.food,
-                () -> {
-                    int value = Math.min(10000, role.startingResources.food + (Keybindings.shiftMod.isDown() ? 100 : 5));
-                    ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.FOOD, value);
-                    role.startingResources.food = value;
-                },
-                () -> {
-                    int value = Math.max(0, role.startingResources.food - (Keybindings.shiftMod.isDown() ? 100 : 5));
-                    ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.FOOD, value);
-                    role.startingResources.food = value;
-                }
-        );
-        setStartingFoodButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/wheat.png");
-        buttons.add(setStartingFoodButton);
-
-        Button setStartingWoodButton = new IntegerButton(
-                I18n.get("sandbox.reignofnether.scenario.starting_wood") + ": " + role.startingResources.wood,
-                () -> {
-                    int value = Math.min(10000, role.startingResources.wood + (Keybindings.shiftMod.isDown() ? 100 : 5));
-                    ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.WOOD, value);
-                    role.startingResources.wood = value;
-                },
-                () -> {
-                    int value = Math.max(0, role.startingResources.wood - (Keybindings.shiftMod.isDown() ? 100 : 5));
-                    ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.WOOD, value);
-                    role.startingResources.wood = value;
-                }
-        );
-        setStartingWoodButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/wood.png");
-        buttons.add(setStartingWoodButton);
-
-        Button setStartingOreButton = new IntegerButton(
-                I18n.get("sandbox.reignofnether.scenario.starting_ore") + ": " + role.startingResources.ore,
-                () -> {
-                    int value = Math.min(10000, role.startingResources.ore + (Keybindings.shiftMod.isDown() ? 100 : 5));
-                    ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.ORE, value);
-                    role.startingResources.ore = value;
-                },
-                () -> {
-                    int value = Math.max(0, role.startingResources.ore - (Keybindings.shiftMod.isDown() ? 100 : 5));
-                    ScenarioServerboundPacket.setStartingResources(role.index, ResourceName.ORE, value);
-                    role.startingResources.ore = value;
-                }
-        );
-        setStartingOreButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/iron_ore.png");
-        buttons.add(setStartingOreButton);
-
-        Button setTeamButton = new IntegerButton(
-                I18n.get("sandbox.reignofnether.scenario.team_number", role.teamNumber),
-                () -> {
-                    role.teamNumber += 1;
-                    if (role.teamNumber > ScenarioClientEvents.scenarioRoles.size())
-                        role.teamNumber = 1;
-                    ScenarioServerboundPacket.setTeamNumber(role.index, role.teamNumber);
-                },
-                () -> {
-                    role.teamNumber -= 1;
-                    if (role.teamNumber < 1)
-                        role.teamNumber = ScenarioClientEvents.scenarioRoles.size();
-                    ScenarioServerboundPacket.setTeamNumber(role.index, role.teamNumber);
-                },
-                I18n.get("sandbox.reignofnether.scenario.team_number_tooltip")
-        );
-        setTeamButton.iconResource = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/icons/items/sweet_berries.png");
-        buttons.add(setTeamButton);
-
-        y += 20;
-        for (Button button : buttons) {
-            renderButton(button, x, y, evt);
-            y += 18;
-        }
-        buttons.add(factionButton);
-        return buttons;
-    }
-
-    private static void renderButton(Button button, int x, int y, ScreenEvent.Render.Post evt) {
-        if (!button.isHidden.get()) {
-            button.render(evt.getGuiGraphics(), x, y, evt.getMouseX(), evt.getMouseY());
-            if (button.isMouseOver(evt.getMouseX(), evt.getMouseY()) && button.tooltipLines != null)
-                button.renderTooltip(evt.getGuiGraphics(), evt.getMouseX(), evt.getMouseY());
-        }
+                int value = Math.max(0, get.getAsInt() - (Keybindings.shiftMod.isDown() ? 100 : 5));
+                ScenarioServerboundPacket.setStartingResources(role.index, name, value);
+                set.accept(value);
+            }, x, y, w);
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/scenario/ScenarioServerEvents.java b/src/main/java/com/solegendary/reignofnether/scenario/ScenarioServerEvents.java
index b2bac28c5..84a8b5c98 100644
--- a/src/main/java/com/solegendary/reignofnether/scenario/ScenarioServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/scenario/ScenarioServerEvents.java
@@ -12,6 +12,7 @@
 import com.solegendary.reignofnether.unit.UnitClientEvents;
 import com.solegendary.reignofnether.unit.UnitServerEvents;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.LivingEntity;
@@ -19,7 +20,6 @@
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.server.ServerStartedEvent;
 import net.minecraftforge.event.server.ServerStoppingEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.network.PacketDistributor;
 
@@ -41,6 +41,13 @@ public class ScenarioServerEvents {
             new ScenarioRole(6),
             new ScenarioRole(7)
     ));
+    static {
+        WorldState.onServerReset(() -> {
+            scenarioRoles.clear();
+            for (int i = 0; i < 8; i++)
+                scenarioRoles.add(new ScenarioRole(i));
+        });
+    }
 
     @SubscribeEvent
     public static void onServerStopping(ServerStoppingEvent evt) {
@@ -51,12 +58,6 @@ public static void onServerStopping(ServerStoppingEvent evt) {
     }
 
     // statics outlive the world: back to the defaults, or a world without saved roles inherits these
-    @SubscribeEvent
-    public static void onServerStopped(ServerStoppedEvent evt) {
-        scenarioRoles.clear();
-        for (int i = 0; i < 8; i++)
-            scenarioRoles.add(new ScenarioRole(i));
-    }
 
     public static void saveScenarioRoles() {
         saveScenarioRoles(PlayerServerEvents.serverLevel);
diff --git a/src/main/java/com/solegendary/reignofnether/startpos/StartPosAction.java b/src/main/java/com/solegendary/reignofnether/startpos/StartPosAction.java
index 6a33a3644..683b7b0bf 100644
--- a/src/main/java/com/solegendary/reignofnether/startpos/StartPosAction.java
+++ b/src/main/java/com/solegendary/reignofnether/startpos/StartPosAction.java
@@ -13,6 +13,7 @@ public enum StartPosAction {
     PLAYER_UNREADY,
     ENABLE,
     DISABLE,
+    CLOSE_EMPTY,  // host: disable every enabled seat nobody is sitting in
     CLEAR,        // drop the seat list before a per-player resync (StartPosServerEvents.syncTo)
-    HIDDEN_PLAYER // a player on another team whose seat is hidden by hideEnemyPicks: name and ready only
+    HIDDEN_PLAYER  // a player on another team whose seat is hidden by hideEnemyPicks: name and ready only
 }
diff --git a/src/main/java/com/solegendary/reignofnether/startpos/StartPosClientEvents.java b/src/main/java/com/solegendary/reignofnether/startpos/StartPosClientEvents.java
index 7c7dd032e..78ff721b9 100644
--- a/src/main/java/com/solegendary/reignofnether/startpos/StartPosClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/startpos/StartPosClientEvents.java
@@ -1,6 +1,7 @@
 package com.solegendary.reignofnether.startpos;
 
-import com.solegendary.reignofnether.ReignOfNether;
+import javax.annotation.Nullable;
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.solegendary.reignofnether.building.*;
 import com.solegendary.reignofnether.faction.Faction;
 import com.solegendary.reignofnether.faction.Factions;
@@ -11,7 +12,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Vec3i;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
 import net.minecraftforge.client.event.RenderLevelStageEvent;
@@ -22,7 +22,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
 
 public class StartPosClientEvents {
 
@@ -52,10 +51,10 @@ public static void setPlayerReady(String playerName, boolean ready) {
         }
         if (changed && MC.player != null) {
             if (ready) {
-                MC.player.sendSystemMessage(Component.translatable("startpos.reignofnether.player_ready",
-                        playerName, getNumPlayersReady(), getNumEnabledPoses()));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("startpos.reignofnether.player_ready",
+                        playerName, getNumPlayersReady(), getNumEnabledPoses())));
             } else {
-                MC.player.sendSystemMessage(Component.translatable("startpos.reignofnether.player_not_ready", playerName));
+                MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("startpos.reignofnether.player_not_ready", playerName)));
             }
         }
     }
@@ -73,11 +72,16 @@ public static void setPosEnabled(BlockPos pos, boolean enable) {
         }
     }
 
+    // the singleplayer/Essential host or an op; the server checks this too
+    public static boolean isHost() {
+        return MC.hasSingleplayerServer() || (MC.player != null && MC.player.hasPermissions(2));
+    }
+
     public static boolean hasReservedPos() {
         return getPos() != null;
     }
 
-    private static int getNumPlayersReady() {
+    public static int getNumPlayersReady() {
         int readyPlayers = 0;
         for (StartPos startPose : startPoses)
             if (startPose.faction != Factions.NONE && startPose.ready && !startPose.playerName.isBlank())
@@ -87,8 +91,8 @@ private static int getNumPlayersReady() {
                 readyPlayers++;
         return readyPlayers;
     }
-    private static int getNumEnabledPoses() {
-        // hidden seats are sent without their player, who is counted in hiddenPlayers instead
+    public static int getNumEnabledPoses() {
+        // a hidden seat is counted through its hidden player instead
         int enabledPoses = hiddenPlayers.size();
         for (StartPos startPose : startPoses) {
             if (startPose.enabled)
@@ -99,7 +103,6 @@ private static int getNumEnabledPoses() {
         return enabledPoses;
     }
 
-
     public static StartPos getPos() {
         for (StartPos startPos : startPoses)
             if (MC.player != null && MC.player.getName().getString().equals(startPos.playerName))
@@ -107,13 +110,6 @@ public static StartPos getPos() {
         return null;
     }
 
-    private static ResourceLocation getIcon() {
-        if (getPos() == null)
-            return ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/block/rts_start_block_white.png");
-        else
-            return getPos().getIcon();
-    }
-
     @SubscribeEvent
     public static void onChangeGamemode(PlayerEvent.PlayerChangeGameModeEvent evt) {
         StartPos startPos = getPos();
diff --git a/src/main/java/com/solegendary/reignofnether/startpos/StartPosServerEvents.java b/src/main/java/com/solegendary/reignofnether/startpos/StartPosServerEvents.java
index ba64eceed..b76687723 100644
--- a/src/main/java/com/solegendary/reignofnether/startpos/StartPosServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/startpos/StartPosServerEvents.java
@@ -1,10 +1,16 @@
 package com.solegendary.reignofnether.startpos;
 
-import com.solegendary.reignofnether.ReignOfNether;
-import com.solegendary.reignofnether.fogofwar.FogOfWarServerEvents;
+import java.util.Comparator;
+import javax.annotation.Nullable;
+import net.minecraftforge.server.ServerLifecycleHooks;
+import net.minecraft.server.MinecraftServer;
 import com.solegendary.reignofnether.registrars.GameRuleRegistrar;
+import com.solegendary.reignofnether.fogofwar.FogOfWarServerEvents;
+import com.solegendary.reignofnether.chat.SystemMessage;
+import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.alliance.AlliancesServerEvents;
 import com.solegendary.reignofnether.blocks.RTSStartBlock;
+import com.solegendary.reignofnether.player.PlayerClientboundPacket;
 import com.solegendary.reignofnether.player.PlayerColors;
 import com.solegendary.reignofnether.player.PlayerServerEvents;
 import com.solegendary.reignofnether.player.RTSPlayer;
@@ -14,7 +20,6 @@
 import com.solegendary.reignofnether.faction.Factions;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
@@ -26,12 +31,8 @@
 import net.minecraftforge.event.server.ServerStartedEvent;
 import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.server.ServerLifecycleHooks;
-
-import javax.annotation.Nullable;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -102,10 +103,13 @@ public static void syncTo(ServerPlayer player, boolean hidePicks) {
         Map<String, Boolean> hiddenReady = new HashMap<>();
         for (StartPos sp : startPoses) {
             StartPosAction action = sp.enabled ? StartPosAction.ADD : StartPosAction.ADD_DISABLED;
-            StartPos sent = sp;
-            if (isHiddenFrom(sp, viewerSeat, viewerColor, hidePicks)) {
+            boolean isHidden = isHiddenFrom(sp, viewerSeat, viewerColor, hidePicks);
+            if (isHidden) {
                 hidden.add(sp.playerName);
                 hiddenReady.put(sp.playerName, sp.ready);
+            }
+            StartPos sent = sp;
+            if (isHidden) {
                 sent = new StartPos(sp.pos, sp.colorId);
                 sent.hidden = true;
             }
@@ -132,6 +136,11 @@ private static boolean hidePicks() {
         return server != null && server.getGameRules().getBoolean(GameRuleRegistrar.HIDE_ENEMY_PICKS);
     }
 
+    // the singleplayer/Essential host or an op
+    public static boolean isHost(ServerPlayer player) {
+        return player.hasPermissions(2) || player.server.isSingleplayerOwner(player.getGameProfile());
+    }
+
     public static void setPosEnabled(BlockPos pos, boolean enable) {
         if (startingGame)
             return;
@@ -166,7 +175,7 @@ public static void onBlockPlaced(BlockEvent.EntityPlaceEvent evt) {
                 evt.setCanceled(true);
                 for (Player player : PlayerServerEvents.players)
                     if (player.distanceToSqr(Vec3.atCenterOf(evt.getPos())) < 100)
-                        player.sendSystemMessage(Component.translatable("startpos.reignofnether.max_positions"));
+                        player.sendSystemMessage(SystemMessage.error(Component.translatable("startpos.reignofnether.max_positions")));
             }
             if (evt.getLevel() instanceof ServerLevel serverLevel)
                 savePositions(serverLevel);
@@ -231,7 +240,6 @@ public static void onServerTick(TickEvent.ServerTickEvent evt) {
             if (ticksToStart % 20 == 0) {
                 int secondsLeft = ticksToStart / 20;
                 if (secondsLeft > 0) {
-                    PlayerServerEvents.sendMessageToAllPlayersNoNewlines("startpos.reignofnether.starting_game", false, secondsLeft);
                     SoundClientboundPacket.playSoundForAllPlayers(SoundAction.CHAT);
                 } else {
                     PlayerServerEvents.sendMessageToAllPlayers("startpos.reignofnether.started_game", true);
@@ -256,6 +264,7 @@ public static void onServerTick(TickEvent.ServerTickEvent evt) {
                     } finally {
                         FogOfWarServerEvents.setStartingPlayers(List.of());
                     }
+                    RTSMapInfoServerEvents.syncTeamMode(); // catches a /gamerule during the lobby
                     // ally all players who start at the same color of start block
                     for (int i = 0; i < PlayerServerEvents.rtsPlayers.size(); i++) {
                         RTSPlayer p1 = PlayerServerEvents.rtsPlayers.get(i);
@@ -316,6 +325,7 @@ public static void loadPositions(ServerStartedEvent evt) {
     public static void loadPositionsFromMapInfo() {
         if (!RTSMapInfoServerEvents.usingMapInfoStartPositions())
             return;
+        RTSMapInfoServerEvents.syncTeamMode();
         int playerColorIndex = 0;
         List<StartPos> oldStartPoses = new ArrayList<>(startPoses);
         startPoses.clear();
diff --git a/src/main/java/com/solegendary/reignofnether/startpos/StartPosServerboundPacket.java b/src/main/java/com/solegendary/reignofnether/startpos/StartPosServerboundPacket.java
index a6ad3b5ce..1df44d01b 100644
--- a/src/main/java/com/solegendary/reignofnether/startpos/StartPosServerboundPacket.java
+++ b/src/main/java/com/solegendary/reignofnether/startpos/StartPosServerboundPacket.java
@@ -11,6 +11,7 @@
 import net.minecraftforge.network.NetworkEvent;
 
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.List;
 import java.util.function.Supplier;
 
 public class StartPosServerboundPacket {
@@ -43,6 +44,10 @@ public static void disablePos(BlockPos pos) {
         PacketHandler.INSTANCE.sendToServer(new StartPosServerboundPacket(StartPosAction.DISABLE, pos, Factions.NONE));
     }
 
+    public static void closeEmptyPositions() {
+        PacketHandler.INSTANCE.sendToServer(new StartPosServerboundPacket(StartPosAction.CLOSE_EMPTY, BlockPos.ZERO, Factions.NONE));
+    }
+
     public StartPosServerboundPacket(StartPosAction action, BlockPos pos, Faction faction) {
         this.action = action;
         this.blockPos = pos;
@@ -72,8 +77,8 @@ public boolean handle(Supplier<NetworkEvent.Context> ctx) {
                 success.set(false);
                 return;
             }
-            else if ((action == StartPosAction.ENABLE || action == StartPosAction.DISABLE) &&
-                    !player.hasPermissions(4)) {
+            else if ((action == StartPosAction.ENABLE || action == StartPosAction.DISABLE || action == StartPosAction.CLOSE_EMPTY) &&
+                    !StartPosServerEvents.isHost(player)) {
                 ReignOfNether.LOGGER.warn("StartPosServerboundPacket: Tried to process packet from " + player.getName() + " with insufficient permissions");
                 success.set(false);
                 return;
@@ -104,20 +109,28 @@ else if ((action == StartPosAction.ENABLE || action == StartPosAction.DISABLE) &
                 case UNRESERVE -> {
                     if (StartPosServerEvents.isStartingGame())
                         return;
-                    // only your own seat
+                    // the host can also clear someone else's seat (kick); unready whoever sat there
                     for (StartPos startPos : StartPosServerEvents.startPoses) {
-                        if (startPos.pos.equals(blockPos) && startPos.playerName.equals(playerName)) {
+                        if (startPos.pos.equals(blockPos) &&
+                                (startPos.playerName.equals(playerName) || StartPosServerEvents.isHost(player))) {
+                            String seated = startPos.playerName;
                             startPos.reset();
                             StartPosServerEvents.syncAll();
+                            if (!seated.isBlank())
+                                StartPosServerEvents.setPlayerReady(seated, false);
                             break;
                         }
                     }
-                    StartPosServerEvents.setPlayerReady(playerName, false);
                 }
                 case PLAYER_READY -> StartPosServerEvents.setPlayerReady(playerName, true);
                 case PLAYER_UNREADY -> StartPosServerEvents.setPlayerReady(playerName, false);
                 case ENABLE -> StartPosServerEvents.setPosEnabled(blockPos, true);
                 case DISABLE -> StartPosServerEvents.setPosEnabled(blockPos, false);
+                case CLOSE_EMPTY -> {
+                    for (StartPos startPos : List.copyOf(StartPosServerEvents.startPoses))
+                        if (startPos.enabled && startPos.playerName.isBlank())
+                            StartPosServerEvents.setPosEnabled(startPos.pos, false);
+                }
             }
             success.set(true);
         });
diff --git a/src/main/java/com/solegendary/reignofnether/survival/SurvivalServerEvents.java b/src/main/java/com/solegendary/reignofnether/survival/SurvivalServerEvents.java
index fa86828d3..f74e83480 100644
--- a/src/main/java/com/solegendary/reignofnether/survival/SurvivalServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/survival/SurvivalServerEvents.java
@@ -17,6 +17,7 @@
 import com.solegendary.reignofnether.time.TimeUtils;
 import com.solegendary.reignofnether.tutorial.TutorialServerEvents;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.util.WorldState;
 
 import net.minecraft.commands.Commands;
 import net.minecraft.server.level.ServerLevel;
@@ -29,7 +30,6 @@
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.server.ServerStartedEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import javax.annotation.Nullable;
@@ -45,19 +45,27 @@ public class SurvivalServerEvents {
     @Nullable public static Wave currentWave = null;
     public static Wave nextWave = Wave.getWave(1);
     private static WaveDifficulty difficulty = WaveDifficulty.BEGINNER;
-    private static final ArrayList<WaveEnemy> enemies = new ArrayList<>();
+    private static final ArrayList<WaveEnemy> enemies = WorldState.server(new ArrayList<>());
     public static final String ENEMY_OWNER_NAME = "Enemy";
     private static final Random random = new Random();
     public static Faction lastFaction = Factions.NONE;
 
-    public static final ArrayList<WavePortal> portals = new ArrayList<>();
+    public static final ArrayList<WavePortal> portals = WorldState.server(new ArrayList<>());
 
     public static final long TICK_INTERVAL = 10;
     private static long lastTime = -1;
     private static long lastEnemyCount = 0;
+    static {
+        WorldState.onServerReset(() -> {
+            currentWave = null;
+            lastKilledEnemy = null;
+            lastTime = -1;
+            lastEnemyCount = 0;
+        });
+    }
     private static long ticks = 0;
 
-    private static ArrayList<BuildingPlacement> lastPortals = new ArrayList<>();
+    private static ArrayList<BuildingPlacement> lastPortals = WorldState.server(new ArrayList<>());
 
     private static ServerLevel serverLevel = null;
 
@@ -78,16 +86,6 @@ public static void saveData(ServerLevel level) {
 
     // statics outlive the world: clear them so the next world opened in this game starts clean
     // (not reset(): that kills enemies and writes the save)
-    @SubscribeEvent
-    public static void onServerStopped(ServerStoppedEvent evt) {
-        enemies.clear();
-        portals.clear();
-        lastPortals.clear();
-        currentWave = null;
-        lastKilledEnemy = null;
-        lastTime = -1;
-        lastEnemyCount = 0;
-    }
 
     @SubscribeEvent
     public static void loadWaveData(ServerStartedEvent evt) {
diff --git a/src/main/java/com/solegendary/reignofnether/taskscheduler/TaskSchedulerServerEvents.java b/src/main/java/com/solegendary/reignofnether/taskscheduler/TaskSchedulerServerEvents.java
index 842d663b2..37eb7a42d 100644
--- a/src/main/java/com/solegendary/reignofnether/taskscheduler/TaskSchedulerServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/taskscheduler/TaskSchedulerServerEvents.java
@@ -1,7 +1,7 @@
 package com.solegendary.reignofnether.taskscheduler;
 
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import java.util.ArrayList;
@@ -10,7 +10,7 @@
 
 public class TaskSchedulerServerEvents {
 
-    private static final List<ScheduledTask> tasks = new ArrayList<>();
+    private static final List<ScheduledTask> tasks = WorldState.server(new ArrayList<>());
 
     private record ScheduledTask(int ticksRemaining, Runnable task) {}
 
@@ -19,10 +19,6 @@ public static void schedule(int delayTicks, Runnable task) {
     }
 
     // pending tasks hold the closed world's level/players: never run them in the next world
-    @SubscribeEvent
-    public static void onServerStopped(ServerStoppedEvent evt) {
-        tasks.clear();
-    }
 
     @SubscribeEvent
     public static void onServerTick(TickEvent.ServerTickEvent evt) {
diff --git a/src/main/java/com/solegendary/reignofnether/time/TimeClientEvents.java b/src/main/java/com/solegendary/reignofnether/time/TimeClientEvents.java
index 6ab30e8ce..76e283632 100644
--- a/src/main/java/com/solegendary/reignofnether/time/TimeClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/time/TimeClientEvents.java
@@ -1,47 +1,25 @@
 package com.solegendary.reignofnether.time;
 
-import com.solegendary.reignofnether.ReignOfNether;
-import com.solegendary.reignofnether.config.ReignOfNetherClientConfigs;
 import com.solegendary.reignofnether.debug.RtsDebugClientEvents;
-import com.solegendary.reignofnether.guiscreen.TopdownGui;
-import com.solegendary.reignofnether.hud.buttons.Button;
-import com.solegendary.reignofnether.hud.HudClientEvents;
-import com.solegendary.reignofnether.matchstart.MatchStartScreen;
-import com.solegendary.reignofnether.minimap.MinimapClientEvents;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import com.solegendary.reignofnether.player.PlayerClientEvents;
 import com.solegendary.reignofnether.registrars.SoundRegistrar;
 import com.solegendary.reignofnether.sounds.FadeableMusicInstance;
 import com.solegendary.reignofnether.sounds.SoundClientEvents;
 import com.solegendary.reignofnether.survival.SurvivalClientEvents;
-import com.solegendary.reignofnether.tutorial.TutorialClientEvents;
-import com.solegendary.reignofnether.tutorial.TutorialStage;
-import com.solegendary.reignofnether.util.MyRenderer;
+import com.solegendary.reignofnether.ui.Theme;
+import com.solegendary.reignofnether.ui.Tooltip;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Style;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.FormattedCharSequence;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraftforge.client.event.RenderGuiOverlayEvent;
-import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import org.lwjgl.glfw.GLFW;
-
-import java.util.ArrayList;
-import java.util.List;
 
 import static com.solegendary.reignofnether.time.TimeUtils.*;
-import static com.solegendary.reignofnether.util.MiscUtil.fcs;
 
+/** Client copy of the day/night time and blood moon state. The HUD clock panel draws it. */
 public class TimeClientEvents {
 
-    private static int xPos = 0;
-    private static int yPos = 0;
-
     private static final Minecraft MC = Minecraft.getInstance();
 
     // setting this value causes the time of day to smoothly move towards it regardless of the server time
@@ -51,21 +29,8 @@ public class TimeClientEvents {
     public static long serverGameTime = 0;
     public static double ticksSinceLastUpdate = 0; // for counting partial ticks since serverGameTime is only updated once per second
 
-    public static boolean showClockTooltip = false;
+    // clicking the clock keeps its tooltip open
 
-    private static final Button clockButton = new Button("Clock",
-            10,
-            null,
-            null,
-            null,
-            () -> false,
-            () -> !OrthoviewClientEvents.isEnabled(),
-            () -> true,
-            () -> showClockTooltip = !showClockTooltip,
-            null,
-            null
-    );
-    private static Button bloodMoonButton = getBloodMoonButton();
     private static int bloodMoonTicksLeft = 0;
     private static BlockPos bloodMoonPos = null;
 
@@ -78,26 +43,13 @@ public static boolean isBloodMoonActive() {
         return bloodMoonTicksLeft > 0;
     }
 
-    private static Button getBloodMoonButton() {
-        return new Button("Clock",
-                14,
-                ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/hud/blood_moon.png"),
-                null,
-                null,
-                () -> false,
-                () -> !OrthoviewClientEvents.isEnabled() || !isBloodMoonActive(),
-                () -> true,
-                null,
-                () -> {
-                    if (bloodMoonPos != null)
-                        OrthoviewClientEvents.centreCameraOnPos(bloodMoonPos);
-                },
-                List.of(
-                        fcs(I18n.get("abilities.reignofnether.blood_moon.clock_warning1"), Style.EMPTY.withColor(0xFF0000)),
-                        fcs(I18n.get("abilities.reignofnether.blood_moon.clock_warning2", getTimeStrFromTicks(bloodMoonTicksLeft))),
-                        fcs(I18n.get("abilities.reignofnether.blood_moon.clock_warning3"))
-                )
-        );
+    public static int getBloodMoonTicksLeft() {
+        return bloodMoonTicksLeft;
+    }
+
+    public static void centreOnBloodMoon() {
+        if (isBloodMoonActive() && bloodMoonPos != null)
+            OrthoviewClientEvents.centreCameraOnPos(bloodMoonPos);
     }
 
     public static void setBloodMoonTicks(int tickDuration, BlockPos pos) {
@@ -111,127 +63,45 @@ public static void setBloodMoonTicks(int tickDuration, BlockPos pos) {
         }
     }
 
-    // render directly above the minimap
-    @SubscribeEvent
-    public static void renderOverlay(RenderGuiOverlayEvent.Post evt) {
-        if (!OrthoviewClientEvents.isEnabled() || MC.isPaused() || !HudClientEvents.enabled
-                || !TutorialClientEvents.isAtOrPastStage(TutorialStage.MINIMAP_CLICK) || MC.screen instanceof MatchStartScreen) {
-            return;
+    public static Tooltip clockTooltip() {
+        if (isBloodMoonActive()) {
+            return Tooltip.of(I18n.get("abilities.reignofnether.blood_moon.clock_warning1")).titleColour(Theme.ERROR)
+                    .body(I18n.get("abilities.reignofnether.blood_moon.clock_warning2", getTimeStrFromTicks(bloodMoonTicksLeft)))
+                    .body(I18n.get("abilities.reignofnether.blood_moon.clock_warning3"));
         }
-
-        if (!isBloodMoonActive()) {
-            updateClockPos();
-            evt.getGuiGraphics().renderItem(new ItemStack(Items.CLOCK), xPos, yPos);
-            evt.getGuiGraphics().renderItemDecorations(MC.font, new ItemStack(Items.CLOCK), xPos, yPos);
+        boolean isDay = isDay(serverNormDayTime);
+        String timeStr = get12HourTimeStr(serverNormDayTime);
+
+        Tooltip t;
+        if (targetClientTime != serverNormDayTime)
+            t = Tooltip.of(I18n.get("time.reignofnether.time_is_distorted"))
+                    .body(I18n.get("time.reignofnether.real_time", timeStr));
+        else
+            t = Tooltip.of(I18n.get(isDay ? "hud.reignofnether.clock.day_n" : "hud.reignofnether.clock.night_n", dayNumber()))
+                    .status(I18n.get("time.reignofnether.time", timeStr), Theme.BODY);
+
+        t.body(I18n.get(isDay ? "hud.reignofnether.clock.desc_day" : "hud.reignofnether.clock.desc_night"));
+        t.status(isDay ? I18n.get("time.reignofnether.time_until_night", getTimeUntilStr(serverNormDayTime, DUSK))
+                : I18n.get("time.reignofnether.time_until_day", getTimeUntilStr(serverNormDayTime, DAWN)), Theme.BODY);
+
+        if (SurvivalClientEvents.isEnabled) {
+            long timeOffset = -getWaveSurvivalTimeModifier(SurvivalClientEvents.difficulty);
+            t.status(I18n.get("time.reignofnether.time_until_next_wave",
+                    getTimeUntilStrWithOffset(serverNormDayTime, DUSK, isDay ? 0 : timeOffset)), Theme.ORANGE);
+        } else if (PlayerClientEvents.isRTSPlayer()) {
+            t.status(I18n.get("time.reignofnether.game_time", getTimeStrFromTicks(PlayerClientEvents.rtsGameTicks)), Theme.BODY);
         }
+        return t;
     }
 
-    private static void updateClockPos() {
-        int screenWidth = MC.getWindow().getGuiScaledWidth();
-        int screenHeight = MC.getWindow().getGuiScaledHeight();
-        int radius = MinimapClientEvents.getMapGuiRadius();
-        int co = MinimapClientEvents.CORNER_OFFSET;
-        if (ReignOfNetherClientConfigs.SQUARE_MINIMAP.get()) {
-            // clock centred ON the top-left corner of the visible square (half in / half out)
-            float baseHalf = (float) (radius / Math.sqrt(2));
-            float half = baseHalf * MinimapClientEvents.SQUARE_SCALE;
-            float brX = screenWidth - co;
-            float brY = screenHeight - co;
-            float tlX = brX - 2 * half;  // top-left corner X
-            float tlY = brY - 2 * half;  // top-left corner Y
-            // 16x16 clock nudged a few px up-left from the corner
-            xPos = (int) (tlX - 12);
-            yPos = (int) (tlY - 12);
-        } else {
-            xPos = screenWidth - radius - (co * 2) + 2;
-            yPos = screenHeight - (radius * 2) - (co * 2) - 6;
-        }
-    }
-
-    @SubscribeEvent
-    public static void onDrawScreen(ScreenEvent.Render.Post evt) {
-        if (!OrthoviewClientEvents.isEnabled() || MC.isPaused() || !HudClientEvents.enabled
-                || !TutorialClientEvents.isAtOrPastStage(TutorialStage.MINIMAP_CLICK) || MC.screen instanceof MatchStartScreen) {
-            return;
-        }
-
-        updateClockPos();
-
-        bloodMoonButton = getBloodMoonButton();
-        if (!bloodMoonButton.isHidden.get() && evt.getScreen() instanceof TopdownGui) {
-            bloodMoonButton.render(evt.getGuiGraphics(), xPos - 3, yPos - 3, evt.getMouseX(), evt.getMouseY());
-            if (bloodMoonButton.isMouseOver(evt.getMouseX(), evt.getMouseY()))
-                bloodMoonButton.renderTooltip(evt.getGuiGraphics(), evt.getMouseX(), evt.getMouseY());
-        } else if (!clockButton.isHidden.get() && evt.getScreen() instanceof TopdownGui)
-            clockButton.render(evt.getGuiGraphics(), xPos - 3, yPos - 3, evt.getMouseX(), evt.getMouseY());
-    }
-
-    @SubscribeEvent
-    public static void onMousePress(ScreenEvent.MouseButtonPressed.Post evt) {
-        if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_1) {
-            clockButton.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), true);
-            bloodMoonButton.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), true);
-        } else if (evt.getButton() == GLFW.GLFW_MOUSE_BUTTON_2) {
-            clockButton.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), false);
-            bloodMoonButton.checkClicked((int) evt.getMouseX(), (int) evt.getMouseY(), false);
-        }
-    }
-
-    @SubscribeEvent
-    public static void onDrawTooltip(ScreenEvent.Render.Post evt) {
-        if (!TutorialClientEvents.isAtOrPastStage(TutorialStage.MINIMAP_CLICK) ||
-                !(MC.screen instanceof TopdownGui) || !HudClientEvents.enabled) {
-            return;
-        }
-
-        final int GUI_LENGTH = 16;
-
-        boolean isMouseOver = evt.getMouseX() > xPos &&
-                evt.getMouseX() <= xPos + GUI_LENGTH &&
-                evt.getMouseY() > yPos &&
-                evt.getMouseY() <= yPos + GUI_LENGTH;
-
-        if (!isBloodMoonActive() && (isMouseOver || showClockTooltip)) {
-
-            // 'day' is when undead start burning, ~500
-            // 'night' is when undead stop burning, ~12500
-            boolean isDay = isDay(serverNormDayTime);
-            String timeStr = get12HourTimeStr(serverNormDayTime);
-
-            FormattedCharSequence timeUntilStr =
-                    fcs(isDay ? I18n.get("time.reignofnether.time_until_night",
-                                    getTimeUntilStr(serverNormDayTime, DUSK)) :
-                                    I18n.get("time.reignofnether.time_until_day",
-                                            getTimeUntilStr(serverNormDayTime, DAWN)));
-
-            ArrayList<FormattedCharSequence> tooltip = new ArrayList<>();
-
-            if (!showClockTooltip) {
-                if (targetClientTime != serverNormDayTime) {
-                    tooltip.add(fcs(I18n.get("time.reignofnether.time_is_distorted"), true));
-                    tooltip.add(fcs(I18n.get("time.reignofnether.real_time", timeStr)));
-                } else {
-                    tooltip.add(fcs(I18n.get("time.reignofnether" + ".time", timeStr)));
-                }
-            }
-            tooltip.add(timeUntilStr);
-
-            if (SurvivalClientEvents.isEnabled) {
-                long timeOffset = -getWaveSurvivalTimeModifier(SurvivalClientEvents.difficulty);
-                tooltip.add(fcs(I18n.get("time.reignofnether.time_until_next_wave",
-                        getTimeUntilStrWithOffset(serverNormDayTime, DUSK, isDay ? 0 : timeOffset))));
-            }
-
-            if (PlayerClientEvents.isRTSPlayer() && !SurvivalClientEvents.isEnabled) {
-                FormattedCharSequence gameLengthStr = fcs(I18n.get("time.reignofnether.game_time", getTimeStrFromTicks(PlayerClientEvents.rtsGameTicks)));
-                tooltip.add(gameLengthStr);
-            }
-            if (showClockTooltip) {
-                MyRenderer.renderTooltip(evt.getGuiGraphics(), tooltip, xPos + 57, yPos - 4);
-            } else {
-                MyRenderer.renderTooltip(evt.getGuiGraphics(), tooltip, evt.getMouseX(), evt.getMouseY());
-            }
-        }
+    /**
+     * Which day of the match it is: 1 + the dawns since the match started, so a night is numbered after
+     * the day before it. ponytail: assumes the clock ran at normal speed since the start, distortion skews it.
+     */
+    public static int dayNumber() {
+        long now = normaliseTime(serverNormDayTime);
+        long start = now - PlayerClientEvents.rtsGameTicks;
+        return 1 + (int) (Math.floorDiv(now - DAWN, 24000L) - Math.floorDiv(start - DAWN, 24000L));
     }
 
     @SubscribeEvent
@@ -244,17 +114,3 @@ public static Long getClientTime() {
         return TimeClientEvents.serverGameTime + (long) TimeClientEvents.ticksSinceLastUpdate;
     }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/java/com/solegendary/reignofnether/time/TimeServerEvents.java b/src/main/java/com/solegendary/reignofnether/time/TimeServerEvents.java
index ce332714a..f7e610acf 100644
--- a/src/main/java/com/solegendary/reignofnether/time/TimeServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/time/TimeServerEvents.java
@@ -15,6 +15,7 @@
 import com.solegendary.reignofnether.unit.UnitAction;
 import com.solegendary.reignofnether.unit.UnitServerEvents;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
@@ -23,7 +24,6 @@
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.level.Level;
 import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import java.util.ArrayList;
@@ -43,6 +43,13 @@ public class TimeServerEvents {
     private static boolean zombieOrSkeleton = true;
 
     private static long lastTime = -1;
+    static {
+        WorldState.onServerReset(() -> {
+            resetBloodMoon();
+            serverStartTime = 0;
+            lastTime = -1;
+        });
+    }
 
     public static void resetBloodMoon() {
         bloodMoonTicksLeft = 0;
@@ -51,12 +58,6 @@ public static void resetBloodMoon() {
     }
 
     // statics outlive the world: clear them so the next world opened in this game starts clean
-    @SubscribeEvent
-    public static void onServerStopped(ServerStoppedEvent evt) {
-        resetBloodMoon();
-        serverStartTime = 0;
-        lastTime = -1;
-    }
 
     public static boolean isBloodMoonActive() {
         return bloodMoonTicksLeft > 0;
diff --git a/src/main/java/com/solegendary/reignofnether/time/TimeUtils.java b/src/main/java/com/solegendary/reignofnether/time/TimeUtils.java
index 12461a25f..0d903a7f1 100644
--- a/src/main/java/com/solegendary/reignofnether/time/TimeUtils.java
+++ b/src/main/java/com/solegendary/reignofnether/time/TimeUtils.java
@@ -63,12 +63,17 @@ public static boolean isDay(Level level) {
         return isDay(level.getDayTime());
     }
 
+    // eg. 75 -> 1:15, for countdowns on the HUD
+    public static String formatSeconds(int seconds) {
+        return (seconds / 60) + ":" + String.format("%02d", seconds % 60);
+    }
+
     // Helper to format ticks into min/sec string
     private static String formatTimeFromTicks(long ticks) {
         int sec = (int) (ticks / 20);
         int min = sec / 60;
         sec %= 60;
 
-        return min == 0 ? sec + "s" : min + "m" + sec + "s";
+        return String.format("%02d:%02d", min, sec);
     }
 }
diff --git a/src/main/java/com/solegendary/reignofnether/tutorial/TutorialClientEvents.java b/src/main/java/com/solegendary/reignofnether/tutorial/TutorialClientEvents.java
index a54c8570c..a6419b9b6 100644
--- a/src/main/java/com/solegendary/reignofnether/tutorial/TutorialClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/tutorial/TutorialClientEvents.java
@@ -1,5 +1,8 @@
 package com.solegendary.reignofnether.tutorial;
 
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+
+import com.solegendary.reignofnether.chat.SystemMessage;
 import com.solegendary.reignofnether.ReignOfNether;
 import com.solegendary.reignofnether.building.Building;
 import com.solegendary.reignofnether.building.BuildingClientEvents;
@@ -41,6 +44,7 @@
 import net.minecraftforge.registries.RegistryObject;
 import org.lwjgl.glfw.GLFW;
 
+import com.solegendary.reignofnether.hud.panels.HudFrame;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
@@ -144,11 +148,8 @@ public static boolean isEnabled() {
 
     public static void setEnabled(boolean value) {
         if (value && !enabled && MC.player != null) {
-            MC.player.sendSystemMessage(Component.literal(""));
-            MC.player.sendSystemMessage(Component.translatable("tutorial.reignofnether.welcome2")
-                .withStyle(Style.EMPTY.withBold(true)));
-            MC.player.sendSystemMessage(Component.translatable("tutorial.reignofnether.get_started"));
-            MC.player.sendSystemMessage(Component.literal(""));
+            MC.player.sendSystemMessage(SystemMessage.important(Component.translatable("tutorial.reignofnether.welcome2")));
+            MC.player.sendSystemMessage(SystemMessage.info(Component.translatable("tutorial.reignofnether.get_started")));
         }
         enabled = value;
     }
@@ -170,22 +171,22 @@ private static void nextStage() {
     }
 
     // check if we need to render an arrow to point at the next button
-    public static void checkAndRenderNextAction(GuiGraphics poseStack, ArrayList<Button> buttons) {
+    public static void checkAndRenderNextAction(GuiGraphics poseStack, List<HudFrame.Placed> placed) {
         if (tutorialStage == PAN_CAMERA && MC.screen != null) {
             if (!pannedUp) {
-                TutorialRendering.pointAtWithArrow(poseStack, MC.screen.width / 2, -Button.DEFAULT_ICON_FRAME_SIZE, true);
+                TutorialRendering.pointAtWithArrow(poseStack, HudGeometry.layout().width() / 2, -Button.DEFAULT_ICON_FRAME_SIZE, true);
             }
             if (!pannedDown) {
-                TutorialRendering.pointAtWithArrow(poseStack, MC.screen.width / 2, MC.screen.height, true);
+                TutorialRendering.pointAtWithArrow(poseStack, HudGeometry.layout().width() / 2, HudGeometry.layout().height(), true);
             }
             if (!pannedLeft) {
-                TutorialRendering.pointAtWithArrow(poseStack, -Button.DEFAULT_ICON_FRAME_SIZE, MC.screen.height / 2, false);
+                TutorialRendering.pointAtWithArrow(poseStack, -Button.DEFAULT_ICON_FRAME_SIZE, HudGeometry.layout().height() / 2, false);
             }
             if (!pannedRight) {
-                TutorialRendering.pointAtWithArrow(poseStack, MC.screen.width, MC.screen.height / 2, false);
+                TutorialRendering.pointAtWithArrow(poseStack, HudGeometry.layout().width(), HudGeometry.layout().height() / 2, false);
             }
         } else {
-            TutorialRendering.highlightNextButton(poseStack, buttons);
+            TutorialRendering.highlightNextButton(poseStack, placed);
         }
     }
 
@@ -259,13 +260,11 @@ private static void msg(String msg, boolean bold, RegistryObject<SoundEvent> sou
             return;
         }
         MC.player.playSound(soundEvt.get(), 1.2f, 1.0f);
-        MC.player.sendSystemMessage(Component.literal(""));
         if (bold) {
-            MC.player.sendSystemMessage(Component.translatable(msg, params).withStyle(Style.EMPTY.withBold(true)));
+            MC.player.sendSystemMessage(SystemMessage.important(Component.translatable(msg, params)));
         } else {
-            MC.player.sendSystemMessage(Component.translatable(msg, params));
+            MC.player.sendSystemMessage(SystemMessage.info(Component.translatable(msg, params)));
         }
-        MC.player.sendSystemMessage(Component.literal(""));
     }
 
     private static void msg(String msg) {
diff --git a/src/main/java/com/solegendary/reignofnether/tutorial/TutorialRendering.java b/src/main/java/com/solegendary/reignofnether/tutorial/TutorialRendering.java
index 180fd9994..b52143dcc 100644
--- a/src/main/java/com/solegendary/reignofnether/tutorial/TutorialRendering.java
+++ b/src/main/java/com/solegendary/reignofnether/tutorial/TutorialRendering.java
@@ -1,14 +1,19 @@
 package com.solegendary.reignofnether.tutorial;
 
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.solegendary.reignofnether.hud.buttons.Button;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
+import com.solegendary.reignofnether.ui.Rect;
+import com.solegendary.reignofnether.ui.Theme;
 import com.solegendary.reignofnether.util.MiscUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.resources.ResourceLocation;
 
-import java.util.ArrayList;
+import java.util.List;
 
 public class TutorialRendering {
 
@@ -46,39 +51,32 @@ public static void clearButtonName() {
         buttonNameToHighlight = "";
     }
 
-    public static void highlightNextButton(GuiGraphics guiGraphics, ArrayList<Button> buttons) {
+    /** Rings the button the current stage wants clicked, at the rect it was drawn at this frame (HUD units). */
+    public static void highlightNextButton(GuiGraphics guiGraphics, List<HudFrame.Placed> placed) {
         if (!TutorialClientEvents.isEnabled() || buttonNameToHighlight.isEmpty()) {
             return;
         }
 
-        TutorialStage stage = TutorialClientEvents.getStage();
-
-        Button activeButton = null;
-        for (Button button : buttons) {
+        Rect r = null;
+        for (HudFrame.Placed p : placed) {
+            Button button = p.button();
             if (button.name.equals(buttonNameToHighlight) && !button.isHidden.get() && button.isEnabled.get()
                 && !button.isSelected.get() && (
                 button.hotkey != null || button.name.equals(TutorialClientEvents.helpButton.name)
                     || TutorialClientEvents.getStage() == TutorialStage.PLACE_WORKERS_B
             )) {
-                activeButton = button;
+                r = p.rect();
                 break;
             }
         }
-        if (activeButton == null) {
+        if (r == null) {
             return;
         }
 
-        if ((System.currentTimeMillis() / 500) % 2 == 0) {
-            guiGraphics.fill(
-                // x1,y1, x2,y2,
-                activeButton.x,
-                activeButton.y,
-                activeButton.x + Button.DEFAULT_ICON_FRAME_SIZE,
-                activeButton.y + Button.DEFAULT_ICON_FRAME_SIZE,
-                0x32FFFFFF
-            ); //ARGB(hex); note that alpha ranges between ~0-16, not 0-255
-        }
-        pointAtWithArrow(guiGraphics, activeButton.x, activeButton.y, true);
+        // pulsing gold ring hugging the cell, with a faint halo outside it
+        float pulse = MiscUtil.getOscillatingFloat(0.45, 1);
+        Theme.outline(guiGraphics, r.x(), r.y(), r.w(), r.h(), 2, Theme.withAlpha(Theme.GOLD, pulse));
+        Theme.outline(guiGraphics, r.x() - 2, r.y() - 2, r.w() + 4, r.h() + 4, 1, Theme.withAlpha(Theme.GOLD, pulse * 0.35f));
     }
 
     public static void pointAtWithArrow(GuiGraphics guiGraphics, int x, int y, boolean vertical) {
@@ -90,7 +88,7 @@ public static void pointAtWithArrow(GuiGraphics guiGraphics, int x, int y, boole
         int yOffset = 0;
 
         ResourceLocation texture;
-        if (vertical && y < MC.screen.height / 2) {
+        if (vertical && y < HudGeometry.layout().height() / 2) {
             xOffset = -5;
             RenderSystem.setShaderTexture(0, TEXTURE_ARROW_UP);
             yOffset = (int) MiscUtil.getOscillatingFloat(20, 36);
@@ -100,7 +98,7 @@ public static void pointAtWithArrow(GuiGraphics guiGraphics, int x, int y, boole
             RenderSystem.setShaderTexture(0, TEXTURE_ARROW_DOWN);
             yOffset = (int) MiscUtil.getOscillatingFloat(-46, -30, 500);
             texture = TEXTURE_ARROW_DOWN;
-        } else if (x < MC.screen.width / 2) {
+        } else if (x < HudGeometry.layout().width() / 2) {
             yOffset = -5;
             RenderSystem.setShaderTexture(0, TEXTURE_ARROW_LEFT);
             xOffset = (int) MiscUtil.getOscillatingFloat(20, 36);
diff --git a/src/main/java/com/solegendary/reignofnether/ui/Backdrop.java b/src/main/java/com/solegendary/reignofnether/ui/Backdrop.java
new file mode 100644
index 000000000..76538a63e
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/Backdrop.java
@@ -0,0 +1,76 @@
+package com.solegendary.reignofnether.ui;
+
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.util.Mth;
+
+/** The website's background used behind menus (pause, options and match setup; the title keeps its panorama). */
+public final class Backdrop {
+
+    private Backdrop() { }
+
+    // the website's colours: the page, the warmer band behind its sections, and the ember glow
+    private static final int VOID = 0x0D0305;
+    private static final int VOID_DEEP = 0x14060A;
+    private static final int EMBER = 0xDD6003;
+    private static final int FLAME = 0xF19A0F;
+    private static final int ASH = 60;
+
+    /**
+     * The website's background: the dark red void, warming toward the bottom, a faint ember glow from below and ash
+     * drifting up through it.
+     *
+     * @param opacity 1 hides what is behind; less lets the world show through (the pause menu)
+     */
+    public static void website(GuiGraphics g, int width, int height, float opacity) {
+        int a = Math.round(opacity * 255);
+        g.fill(0, 0, width, height, a << 24 | VOID);
+        g.fillGradient(0, height / 3, width, height, VOID_DEEP, Math.round(opacity * 0.7f * 255) << 24 | VOID_DEEP);
+        emberGlow(g, width, height, opacity);
+        ash(g, width, height, opacity, 0);
+    }
+
+    /**
+     * Ash drifting up, dying out on the way. Each speck has its own speed, size and sway from its index, so nothing
+     * needs storing; shiftX slides them all sideways, wrapping round (the title screen moves them with its panorama).
+     */
+    public static void ash(GuiGraphics g, int width, int height, float opacity, float shiftX) {
+        long now = System.currentTimeMillis();
+        for (int i = 0; i < ASH; i++) {
+            float seed = (i * 0.6180339f) % 1f;
+            float speed = 0.012f + 0.02f * ((i * 0.37f) % 1f); // gui px per ms
+            int span = height + 20;
+            float y = height + 10 - ((now * speed + seed * span * 7) % span);
+            float x = Mth.positiveModulo(seed * width + (float) Math.sin(now / 1400.0 + i) * 6 + shiftX, width);
+            int size = i % 3 == 0 ? 2 : 1;
+            float fade = Math.min(1, y / (height * 0.35f));
+            int colour = i % 4 == 0 ? FLAME : EMBER;
+            g.fill((int) x, (int) y, (int) x + size, (int) y + size, Math.round(opacity * fade * 0.55f * 255) << 24 | colour);
+        }
+    }
+
+    /** The website's ember glow rising from the bottom edge. */
+    public static void emberGlow(GuiGraphics g, int width, int height, float opacity) {
+        g.fillGradient(0, height * 3 / 5, width, height, EMBER, Math.round(opacity * 0.10f * 255) << 24 | EMBER);
+    }
+
+    /**
+     * The website's frame for a showcased panel: a flame border and an ember glow spreading out
+     * around it (its 80px blur, drawn as fading rings).
+     */
+    public static void glow(GuiGraphics g, int x, int y, int w, int h, float opacity) {
+        int rings = 24;
+        for (int i = rings; i >= 1; i--) {
+            float f = 1 - i / (float) rings;
+            int a = Math.round(opacity * 0.3f * f * f * 0.25f * 255);
+            if (a <= 0)
+                continue;
+            int c = a << 24 | EMBER;
+            int d = i * 2;
+            g.fill(x - d, y - d, x + w + d, y - d + 2, c);
+            g.fill(x - d, y + h + d - 2, x + w + d, y + h + d, c);
+            g.fill(x - d, y - d + 2, x - d + 2, y + h + d - 2, c);
+            g.fill(x + w + d - 2, y - d + 2, x + w + d, y + h + d - 2, c);
+        }
+        Theme.outline(g, x - 1, y - 1, w + 2, h + 2, 1, Math.round(opacity * 255) << 24 | FLAME);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/Clip.java b/src/main/java/com/solegendary/reignofnether/ui/Clip.java
new file mode 100644
index 000000000..8bbecfc83
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/Clip.java
@@ -0,0 +1,21 @@
+package com.solegendary.reignofnether.ui;
+
+import net.minecraft.client.gui.GuiGraphics;
+import org.joml.Vector4f;
+
+/** Scissor clipping in the current pose's coordinates (the GUI scissor itself ignores the pose). */
+public final class Clip {
+
+    private Clip() { }
+
+    public static void push(GuiGraphics g, int x, int y, int w, int h) {
+        var m = g.pose().last().pose();
+        Vector4f a = m.transform(new Vector4f(x, y, 0, 1));
+        Vector4f b = m.transform(new Vector4f(x + w, y + h, 0, 1));
+        g.enableScissor(Math.round(a.x), Math.round(a.y), Math.round(b.x), Math.round(b.y));
+    }
+
+    public static void pop(GuiGraphics g) {
+        g.disableScissor();
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/Easing.java b/src/main/java/com/solegendary/reignofnether/ui/Easing.java
new file mode 100644
index 000000000..6367981ad
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/Easing.java
@@ -0,0 +1,34 @@
+package com.solegendary.reignofnether.ui;
+
+import net.minecraft.util.Mth;
+
+/** Motion curves for things that should feel heavy rather than slide at one speed. All take and give 0 to 1. */
+public final class Easing {
+
+    private Easing() { }
+
+    private static final float BACK = 0.9f * 1.525f; // how far it leans back and overshoots: 0 for none
+
+    /**
+     * A heavy block given a shove: it leans back a touch, gathers speed, then slows and settles a little past where
+     * it stops before coming back. Goes slightly outside 0 to 1.
+     */
+    public static float heavy(float t) {
+        t = Mth.clamp(t, 0, 1);
+        return t < 0.5f
+                ? 4 * t * t * ((BACK + 1) * 2 * t - BACK) / 2
+                : ((2 * t - 2) * (2 * t - 2) * ((BACK + 1) * (2 * t - 2) + BACK) + 2) / 2;
+    }
+
+    /** The same lean back and build-up, then it slows to a stop without passing it, for what mustn't overshoot. */
+    public static float push(float t) {
+        t = Mth.clamp(t, 0, 1);
+        return t < 0.5f ? heavy(t) : 1 - (float) Math.pow(-2 * t + 2, 3) / 2;
+    }
+
+    /** Slow to start, then rushing in. */
+    public static float dive(float t) {
+        t = Mth.clamp(t, 0, 1);
+        return t < 0.5f ? 4 * t * t * t : 1 - (float) Math.pow(-2 * t + 2, 3) / 2;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/EditorRows.java b/src/main/java/com/solegendary/reignofnether/ui/EditorRows.java
new file mode 100644
index 000000000..1ea76ab1e
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/EditorRows.java
@@ -0,0 +1,309 @@
+package com.solegendary.reignofnether.ui;
+
+import com.solegendary.reignofnether.hud.MyEditBox;
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
+import com.solegendary.reignofnether.hud.panels.SettingRows;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import com.solegendary.reignofnether.util.MyRenderer;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.resources.ResourceLocation;
+import org.lwjgl.glfw.GLFW;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.function.Supplier;
+
+/**
+ * Rows of the sandbox editors (custom building, scenario role), drawn like the settings menu rows:
+ * name on the left, and on the right a checkbox, a ◀ value ▶ stepper or a value with a small button.
+ * Every method draws one row at (x, y), registers its clickable parts on the frame and returns the next y.
+ */
+public final class EditorRows {
+
+    private EditorRows() { }
+
+    public static final int ROW_H = SettingRows.ROW_H;
+    public static final int GROUP_H = 13;
+    public static final int HEADER_H = 22;
+    private static final int VALUE_W = 40;
+    private static final int STEP = 13;
+    private static final int BUTTON_W = 40;
+    private static final int ICON = 11;
+
+    /** Starts a frame in HUD units for a popup drawn on a screen render event; pair with {@link #end}. */
+    public static HudFrame begin(GuiGraphics g, double mouseX, double mouseY) {
+        HudScale scale = HudGeometry.scale();
+        HudFrame f = new HudFrame(g, scale, HudGeometry.layout(), scale.toUnits(mouseX), scale.toUnits(mouseY));
+        g.pose().pushPose();
+        g.pose().scale(scale.poseScale(), scale.poseScale(), 1);
+        return f;
+    }
+
+    public static void end(HudFrame f) {
+        f.showHoveredTooltip();
+        Tooltip.renderPending(f.g, f.layout.width(), f.layout.height());
+        f.g.pose().popPose();
+    }
+
+    /** Mouse press in GUI coordinates (left or right button) on last frame's popup. */
+    public static void click(@Nullable HudFrame f, double mouseX, double mouseY, int button) {
+        if (f != null && (button == GLFW.GLFW_MOUSE_BUTTON_1 || button == GLFW.GLFW_MOUSE_BUTTON_2))
+            f.click(f.scale.toUnits(mouseX), f.scale.toUnits(mouseY), button == GLFW.GLFW_MOUSE_BUTTON_1);
+    }
+
+    public static boolean isOver(@Nullable HudFrame f, double mouseX, double mouseY) {
+        return f != null && f.isOverHud(f.scale.toUnits(mouseX), f.scale.toUnits(mouseY));
+    }
+
+    /** Height in units of a field that holds an unbordered vanilla edit box (drawn in GUI pixels). */
+    public static int fieldHeight(HudFrame f) {
+        return 12;
+    }
+
+    /**
+     * Draws a sunken field and moves the edit box into it, in HUD units: TextInputClientEvents draws and
+     * clicks it under the HUD scale, so its text is the same size as the rest of the HUD.
+     */
+    public static void field(HudFrame f, EditBox box, Rect r) {
+        Theme.outline(f.g, r.x(), r.y(), r.w(), r.h(), 1, Theme.INK);
+        f.g.fill(r.x(), r.y(), r.right(), r.bottom(), Theme.SUNKEN);
+        f.zone(r);
+        if (box instanceof MyEditBox my) {
+            my.hudUnits = true;
+            my.placed = true;
+        }
+        box.setX(r.x() + 3);
+        box.setY(r.centerY() - 4);
+        box.setWidth(r.w() - 6);
+    }
+
+    public static Supplier<Tooltip> tip(String title, @Nullable String body) {
+        return () -> body == null || body.isEmpty() ? Tooltip.of(title) : Tooltip.of(title).body(body);
+    }
+
+    /** Title row: heading on the left, then an optional help "?" and the close cross at the right end. */
+    public static int header(HudFrame f, String title, int x, int y, int w, @Nullable Supplier<Tooltip> help, Runnable close) {
+        float scale = Text.px(18);
+        int room = w - (help != null ? 31 : 16);
+        String shown = title;
+        for (int cut = title.length(); cut > 0 && Text.headingWidth(shown, scale) > room; )
+            shown = title.substring(0, --cut) + "…";
+        Text.heading(f.g, shown, x, y + 2, Theme.GOLD, scale);
+        Rect cross = new Rect(x + w - 12, y, 12, 12);
+        Theme.secondaryButton(f.g, cross.x(), cross.y(), cross.w(), cross.h(), f.hovered(cross));
+        Theme.cross(f.g, cross, f.hovered(cross) ? Theme.GOLD : Theme.BODY);
+        f.register(new ButtonBuilder(title + " close").onLeftClick(close).build(), cross, null, null);
+        if (help != null) {
+            Rect q = new Rect(cross.x() - 15, y, 12, 12);
+            Theme.secondaryButton(f.g, q.x(), q.y(), q.w(), q.h(), f.hovered(q));
+            Text.drawCentered(f.g, "?", q.centerX() + 1, q.y() + 2, f.hovered(q) ? Theme.GOLD : Theme.BODY);
+            f.register(new ButtonBuilder(title + " help").build(), q, null, help);
+        }
+        return y + HEADER_H;
+    }
+
+    /** One row of a group, drawn at (x, y) with the column width. */
+    @FunctionalInterface
+    public interface Row {
+        void draw(HudFrame f, int x, int y, int w);
+    }
+
+    /** Rows under a small-caps label (null: no label). */
+    public record Group(@Nullable String label, List<Row> rows) {
+        int height() {
+            return (label != null ? GROUP_H : 0) + rows.size() * ROW_H;
+        }
+    }
+
+    private static final int GROUP_GAP = 4;
+    private static final int COL_GAP = 10;
+
+    /** Size of the groups in one column, or more when they don't fit maxH (a group never splits). */
+    public static Rect measure(List<Group> groups, int colW, int maxH) {
+        return layout(null, groups, 0, 0, colW, maxH);
+    }
+
+    public static Rect render(HudFrame f, List<Group> groups, int x, int y, int colW, int maxH) {
+        return layout(f, groups, x, y, colW, maxH);
+    }
+
+    private static Rect layout(@Nullable HudFrame f, List<Group> groups, int x, int y, int colW, int maxH) {
+        int col = 0, cy = 0, h = 0;
+        for (Group group : groups) {
+            if (cy > 0 && cy + group.height() > maxH) {
+                col++;
+                cy = 0;
+            }
+            int gx = x + col * (colW + COL_GAP);
+            int ry = y + cy;
+            if (group.label() != null) {
+                if (f != null)
+                    Text.small(f.g, group.label().toUpperCase(Locale.ROOT), gx, ry + 3, Theme.LABEL);
+                ry += GROUP_H;
+            }
+            if (f != null)
+                for (Row row : group.rows()) {
+                    row.draw(f, gx, ry, colW);
+                    ry += ROW_H;
+                }
+            h = Math.max(h, cy + group.height());
+            cy += group.height() + GROUP_GAP;
+        }
+        return new Rect(x, y, (col + 1) * colW + col * COL_GAP, h);
+    }
+
+    private record Line(int h, Row row) { }
+
+    /**
+     * The groups in one column, from line `first` on. It scrolls by whole lines, so no row is ever cut in half or
+     * left clickable outside the area. Returns the first line actually shown.
+     */
+    public static int renderScrolled(HudFrame f, List<Group> groups, Rect area, int first) {
+        List<Line> lines = new ArrayList<>();
+        for (Group group : groups) {
+            if (!lines.isEmpty())
+                lines.add(new Line(GROUP_GAP, (frame, x, y, w) -> { }));
+            if (group.label() != null)
+                lines.add(new Line(GROUP_H, (frame, x, y, w) -> Text.small(frame.g, group.label().toUpperCase(Locale.ROOT), x, y + 3, Theme.LABEL)));
+            for (Row row : group.rows())
+                lines.add(new Line(ROW_H, row));
+        }
+        int last = lines.size(); // the lowest first line that still fills the area
+        int room = area.h();
+        while (last > 0 && lines.get(last - 1).h() <= room)
+            room -= lines.get(--last).h();
+        int top = Math.max(0, Math.min(first, last));
+        int w = last > 0 ? area.w() - 4 : area.w();
+        int y = area.y();
+        for (int i = top; i < lines.size() && y + lines.get(i).h() <= area.bottom(); i++) {
+            lines.get(i).row().draw(f, area.x(), y, w);
+            y += lines.get(i).h();
+        }
+        if (last > 0) {
+            int total = lines.stream().mapToInt(Line::h).sum();
+            int thumb = Math.max(8, area.h() * area.h() / total);
+            int thumbY = area.y() + (area.h() - thumb) * top / last;
+            f.g.fill(area.right() - 2, area.y(), area.right(), area.bottom(), Theme.INK);
+            f.g.fill(area.right() - 2, thumbY, area.right(), thumbY + thumb, Theme.FAINT);
+        }
+        return top;
+    }
+
+    /** Name on the left with its tooltip; returns the rectangle left for the row's control. */
+    public static Rect label(HudFrame f, String name, @Nullable Supplier<Tooltip> tip, int x, int y, int w, int controlW) {
+        return label(f, null, name, tip, x, y, w, controlW);
+    }
+
+    /** Same with an icon in front of the name. */
+    public static Rect label(HudFrame f, @Nullable ResourceLocation icon, String name, @Nullable Supplier<Tooltip> tip, int x, int y, int w, int controlW) {
+        f.g.fill(x, y + ROW_H - 1, x + w, y + ROW_H, Theme.RAISED);
+        Rect label = new Rect(x, y, w - controlW - 6, ROW_H);
+        int textX = x;
+        if (icon != null) {
+            MyRenderer.renderIcon(f.g, icon, x, y + (ROW_H - ICON) / 2, ICON);
+            textX += ICON + 3;
+        }
+        Text.draw(f.g, Text.fit(name, label.right() - textX), textX, y + 4, Theme.TEXT);
+        f.register(new ButtonBuilder(name).build(), label, null, tip);
+        return new Rect(x + w - controlW, y + 2, controlW, ROW_H - 4);
+    }
+
+    /** Checkbox at the right end of the row; the whole row toggles it. */
+    public static int toggle(HudFrame f, String name, @Nullable Supplier<Tooltip> tip, boolean on, Runnable toggle, int x, int y, int w) {
+        Rect box = label(f, name, tip, x, y, w, ROW_H - 4);
+        boolean hovered = f.hovered(x, y, w, ROW_H);
+        Theme.bevel(f.g, box.x(), box.y(), box.w(), box.h(), on ? Theme.TOGGLE_ON : Theme.INK, 0, 0, 1, Theme.INK);
+        Theme.ring(f.g, box.x(), box.y(), box.w(), box.h(), 1, on ? Theme.OK : hovered ? Theme.LABEL : Theme.FAINT);
+        if (on)
+            Icon.CHECK.drawIn(f.g, box.x(), box.y(), box.w(), box.h(), Theme.OK_TEXT);
+        f.register(new ButtonBuilder(name + " toggle").onLeftClick(toggle).build(), new Rect(x, y, w, ROW_H), null, tip);
+        return y + ROW_H;
+    }
+
+    /**
+     * ◀ value ▶. Like the old icon buttons, a left click on the value or ▶ increases and a right click
+     * decreases (◀ the other way round), so shift/ctrl read inside the handlers keep working.
+     */
+    public static int stepper(HudFrame f, String name, @Nullable Supplier<Tooltip> tip, String value,
+                              Runnable increase, @Nullable Runnable decrease, int x, int y, int w) {
+        return stepper(f, null, name, tip, value, null, increase, decrease, x, y, w);
+    }
+
+    /** Same with an icon in front of the name; valueIcon, when given, replaces the value text. */
+    public static int stepper(HudFrame f, @Nullable ResourceLocation icon, String name, @Nullable Supplier<Tooltip> tip, String value,
+                              @Nullable ResourceLocation valueIcon, Runnable increase, @Nullable Runnable decrease, int x, int y, int w) {
+        Rect c = label(f, icon, name, tip, x, y, w, VALUE_W + 2 * (STEP + 2));
+        stepperControl(f, c, name, tip, value, valueIcon, increase, decrease);
+        return y + ROW_H;
+    }
+
+    /** A row with only the control, for values too long to share it with a name. */
+    public static int wideStepper(HudFrame f, String name, @Nullable Supplier<Tooltip> tip, String value,
+                                  Runnable increase, @Nullable Runnable decrease, int x, int y, int w) {
+        stepperControl(f, new Rect(x, y + 2, w, ROW_H - 4), name, tip, value, null, increase, decrease);
+        return y + ROW_H;
+    }
+
+    private static void stepperControl(HudFrame f, Rect c, String name, @Nullable Supplier<Tooltip> tip, String value,
+                                       @Nullable ResourceLocation valueIcon, Runnable increase, @Nullable Runnable decrease) {
+        Rect val = new Rect(c.x() + STEP + 2, c.y(), c.w() - 2 * (STEP + 2), c.h());
+        Theme.outline(f.g, val.x(), val.y(), val.w(), val.h(), 1, Theme.INK);
+        f.g.fill(val.x(), val.y(), val.right(), val.bottom(), Theme.INK);
+        if (valueIcon != null)
+            MyRenderer.renderIcon(f.g, valueIcon, val.centerX() - ICON / 2, val.y() + (val.h() - ICON) / 2, ICON);
+        else
+            Text.drawCentered(f.g, Text.fit(value, val.w() - 4), val.centerX(), val.y() + 3, Theme.GOLD);
+        f.register(new ButtonBuilder(name + " value").onLeftClick(increase).onRightClick(decrease).build(), val, null, tip);
+        arrow(f, name + " <", "◀", new Rect(c.x(), c.y(), STEP, c.h()), decrease != null ? decrease : increase, decrease != null ? increase : null, tip);
+        arrow(f, name + " >", "▶", new Rect(val.right() + 2, c.y(), STEP, c.h()), increase, decrease, tip);
+    }
+
+    private static void arrow(HudFrame f, String id, String glyph, Rect r, Runnable left, @Nullable Runnable right, @Nullable Supplier<Tooltip> tip) {
+        Theme.secondaryButton(f.g, r.x(), r.y(), r.w(), r.h(), f.hovered(r));
+        Text.drawCentered(f.g, glyph, r.centerX() + 1, r.y() + 2, f.hovered(r) ? Theme.GOLD : Theme.BODY);
+        f.register(new ButtonBuilder(id).onLeftClick(left).onRightClick(right).build(), r, null, tip);
+    }
+
+    /** A value with a small secondary button after it ("Edit", "Select"). */
+    public static int action(HudFrame f, String name, @Nullable Supplier<Tooltip> tip, String value, String button,
+                             Runnable left, @Nullable Runnable right, int x, int y, int w) {
+        return action(f, null, name, tip, value, button, BUTTON_W, left, right, x, y, w);
+    }
+
+    /** Same with an icon in front of the name and a button of the given width. */
+    public static int action(HudFrame f, @Nullable ResourceLocation icon, String name, @Nullable Supplier<Tooltip> tip, String value, String button,
+                             int buttonW, Runnable left, @Nullable Runnable right, int x, int y, int w) {
+        Rect c = label(f, icon, name, tip, x, y, w, VALUE_W + buttonW + 4);
+        Text.drawCentered(f.g, Text.fit(value, VALUE_W - 4), c.x() + VALUE_W / 2, c.y() + 3, Theme.GOLD);
+        textButton(f, name + " action", button, new Rect(c.right() - buttonW, c.y(), buttonW, c.h()), Style.SECONDARY, left, right, tip);
+        return y + ROW_H;
+    }
+
+    public enum Style { PRIMARY, SECONDARY, DANGER }
+
+    /** A labelled button in one of the theme's button styles. */
+    public static void textButton(HudFrame f, String id, String label, Rect r, Style style,
+                                  @Nullable Runnable left, @Nullable Runnable right, @Nullable Supplier<Tooltip> tip) {
+        boolean hovered = f.hovered(r);
+        int colour = switch (style) {
+            case PRIMARY -> {
+                Theme.primaryButton(f.g, r.x(), r.y(), r.w(), r.h(), hovered);
+                yield Theme.ON_ORANGE;
+            }
+            case DANGER -> {
+                Theme.dangerButton(f.g, r.x(), r.y(), r.w(), r.h(), hovered);
+                yield Theme.DANGER_TEXT;
+            }
+            default -> {
+                Theme.button(f.g, r.x(), r.y(), r.w(), r.h(), hovered);
+                yield hovered ? Theme.GOLD : Theme.BODY;
+            }
+        };
+        Text.mediumCentered(f.g, Text.fit(label, r.w() - 4), r.centerX(), r.y() + (r.h() - 8) / 2, colour);
+        f.register(new ButtonBuilder(id).onLeftClick(left).onRightClick(right).build(), r, null, tip);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/HudScale.java b/src/main/java/com/solegendary/reignofnether/ui/HudScale.java
new file mode 100644
index 000000000..9ee42c6da
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/HudScale.java
@@ -0,0 +1,44 @@
+package com.solegendary.reignofnether.ui;
+
+/**
+ * Size of the RTS HUD, independent of Minecraft's GUI scale.
+ *
+ * The HUD is drawn in "units" of {@link #pixelsPerUnit} physical pixels. It follows Minecraft's GUI Scale
+ * setting: one unit is half a GUI pixel (Auto at 1080p is GUI scale 4, so 2 pixels per unit: the 1920x1080
+ * design at half size), and is lowered when needed so the layout keeps at least 640x360 units. Odd GUI scales
+ * give half pixels: a size in between, a little blurred.
+ *
+ * @param pixelsPerUnit physical pixels per HUD unit (always >= 1)
+ * @param width         HUD width in units
+ * @param height        HUD height in units
+ * @param guiScale      Minecraft's current GUI scale, used to convert from GUI coordinates
+ */
+public record HudScale(double pixelsPerUnit, int width, int height, double guiScale) {
+
+    // a bigger user scale is never allowed to shrink the HUD below this
+    public static final int HARD_MIN_WIDTH = 640;
+    public static final int HARD_MIN_HEIGHT = 360;
+
+    /**
+     * @param guiScale     the GUI scale in use now (the RTS view caps it, so it can differ from the setting)
+     * @param chosenScale  the GUI scale the player's setting resolves to, Auto included
+     */
+    public static HudScale of(int windowWidth, int windowHeight, double guiScale, int chosenScale) {
+        double maxFit = Math.min(windowHeight / (double) HARD_MIN_HEIGHT, windowWidth / (double) HARD_MIN_WIDTH);
+        double p = Math.max(1, Math.min(chosenScale / 2.0, maxFit));
+        return new HudScale(p, (int) (windowWidth / p), (int) (windowHeight / p), guiScale);
+    }
+
+    /** Factor to apply to the pose stack so HUD units are drawn in GUI coordinates. */
+    public float poseScale() {
+        return (float) (pixelsPerUnit / guiScale);
+    }
+
+    public int toUnits(double guiCoord) {
+        return (int) Math.floor(guiCoord * guiScale / pixelsPerUnit);
+    }
+
+    public double toGui(double units) {
+        return units * pixelsPerUnit / guiScale;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/Icon.java b/src/main/java/com/solegendary/reignofnether/ui/Icon.java
new file mode 100644
index 000000000..80692cb0c
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/Icon.java
@@ -0,0 +1,47 @@
+package com.solegendary.reignofnether.ui;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.solegendary.reignofnether.ReignOfNether;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.resources.ResourceLocation;
+
+/**
+ * Pixelarticons (MIT, the launcher's icon set), stored white and tinted when drawn. The art is 12x12 pixels
+ * on a 24x24 texture, so sizes that are a multiple of 6 units stay pixel-exact. PAW to SATELLITE were drawn for
+ * the map tools in the same grid.
+ */
+public enum Icon {
+    CHECK, CLOSE, PLUS, MINUS, LOCK, UNLOCK, SETTINGS("settings-cog"), MESSAGE, USERS, EYE, SHUFFLE,
+    ZOOM_IN("zoom-in"), ZOOM_OUT("zoom-out"), UNDO, REDO, LIST("bulletlist"), MAP, BOOK_OPEN("book-open"), GLOBE,
+    PAW, LEAF, SLIDERS, EXPAND, SHRINK, SATELLITE;
+
+    public final ResourceLocation texture;
+
+    Icon() {
+        this(null);
+    }
+
+    Icon(String file) {
+        String name = file != null ? file : name().toLowerCase();
+        this.texture = ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/gui/icons/" + name + ".png");
+    }
+
+    public void draw(GuiGraphics g, int x, int y, int size, int colour) {
+        drawTexture(g, texture, x, y, size, colour);
+    }
+
+    /** Any 24x24 icon texture drawn tinted, e.g. a button's pixelarticon. */
+    public static void drawTexture(GuiGraphics g, ResourceLocation texture, int x, int y, int size, int colour) {
+        RenderSystem.enableBlend();
+        RenderSystem.setShaderColor(((colour >> 16) & 0xFF) / 255f, ((colour >> 8) & 0xFF) / 255f, (colour & 0xFF) / 255f,
+                ((colour >>> 24) & 0xFF) / 255f);
+        g.blit(texture, x, y, size, size, 0, 0, 24, 24, 24, 24);
+        RenderSystem.setShaderColor(1, 1, 1, 1);
+    }
+
+    /** Centred in a box, at the largest pixel-exact size that fits (multiples of 6, at least 6). */
+    public void drawIn(GuiGraphics g, int x, int y, int w, int h, int colour) {
+        int size = Math.max(6, Math.min(w, h) / 6 * 6);
+        draw(g, x + (w - size) / 2, y + (h - size) / 2, size, colour);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/Rect.java b/src/main/java/com/solegendary/reignofnether/ui/Rect.java
new file mode 100644
index 000000000..34c2de231
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/Rect.java
@@ -0,0 +1,27 @@
+package com.solegendary.reignofnether.ui;
+
+/** Axis-aligned rectangle in HUD units. */
+public record Rect(int x, int y, int w, int h) {
+
+    public static final Rect EMPTY = new Rect(0, 0, 0, 0);
+
+    public int right() { return x + w; }
+
+    public int bottom() { return y + h; }
+
+    public int centerX() { return x + w / 2; }
+
+    public int centerY() { return y + h / 2; }
+
+    public boolean contains(int px, int py) {
+        return px >= x && py >= y && px < x + w && py < y + h;
+    }
+
+    public boolean intersects(Rect o) {
+        return x < o.right() && o.x < right() && y < o.bottom() && o.y < bottom();
+    }
+
+    public boolean isEmpty() {
+        return w <= 0 || h <= 0;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/SettingRow.java b/src/main/java/com/solegendary/reignofnether/ui/SettingRow.java
new file mode 100644
index 000000000..f99e78c87
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/SettingRow.java
@@ -0,0 +1,26 @@
+package com.solegendary.reignofnether.ui;
+
+import javax.annotation.Nullable;
+import java.util.function.Supplier;
+
+/**
+ * One line of a settings list: a name with an ON/OFF toggle (decrease == null) or a value with − and +.
+ *
+ * @param tag      small label shown in the tooltip (e.g. MATCH / SERVER), or null
+ * @param lockedHint why the row can't be changed right now, shown when editable is false
+ * @param swatch   RGB colour drawn beside the value (colour pickers), or null
+ */
+public record SettingRow(String name, String description, @Nullable String tag,
+                         Supplier<String> value, Supplier<Boolean> on,
+                         Runnable increase, @Nullable Runnable decrease,
+                         Supplier<Boolean> editable, String lockedHint, @Nullable Supplier<Integer> swatch) {
+
+    public SettingRow(String name, String description, @Nullable String tag, Supplier<String> value, Supplier<Boolean> on,
+                      Runnable increase, @Nullable Runnable decrease, Supplier<Boolean> editable, String lockedHint) {
+        this(name, description, tag, value, on, increase, decrease, editable, lockedHint, null);
+    }
+
+    public boolean isToggle() {
+        return decrease == null;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/Text.java b/src/main/java/com/solegendary/reignofnether/ui/Text.java
new file mode 100644
index 000000000..9c754f7b9
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/Text.java
@@ -0,0 +1,344 @@
+package com.solegendary.reignofnether.ui;
+
+import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.config.ReignOfNetherClientConfigs;
+import com.solegendary.reignofnether.hud.layout.HudGeometry;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FormattedCharSequence;
+import org.joml.Vector4f;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Text drawing for the RTS UI, in the design's three sizes:
+ * <ul>
+ *   <li>{@link #small}: Silkscreen caps labels, tags, hints, key chips and counts (the design's 8-10px); {@link #medium}: its 11-12px ones</li>
+ *   <li>{@link #draw}: the vanilla font for body text, like chat; {@link #medium} is it in capitals</li>
+ *   <li>{@link #big}: the vanilla font for values, names and numbers; {@link #heading} and {@link #title} (gold) are Pixelify Sans, for titles only</li>
+ * </ul>
+ * Small and vanilla text share a baseline when drawn at the same y.
+ */
+public final class Text {
+
+    private Text() { }
+
+    // Pixelify Sans baked at 2x and shown at half size: caps are 7.5 units tall at scale 1, top at y
+    public static final Style BIG_STYLE = Style.EMPTY.withFont(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "big"));
+    public static final Style SMALL_STYLE = Style.EMPTY.withFont(ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "small"));
+    /** GUI coordinates per HUD unit: text sizes here are in HUD units, about half a GUI pixel. */
+    public static float guiPerUnit() {
+        return HudGeometry.scale().poseScale();
+    }
+
+    /**
+     * For menus laid out in GUI coordinates (vanilla widgets): runs draw with the pose in HUD units, origin at
+     * (guiX, guiY), so the text keeps its size and crispness at any GUI scale.
+     */
+    public static void atGui(GuiGraphics g, double guiX, double guiY, Runnable draw) {
+        float k = guiPerUnit();
+        g.pose().pushPose();
+        g.pose().translate(guiX, guiY, 0);
+        g.pose().scale(k, k, 1);
+        draw.run();
+        g.pose().popPose();
+    }
+
+    /** Scale for big text so it matches a font size of the 1920x1080 design (scale 1 = 20 px there). */
+    public static float px(int designPx) {
+        return designPx / 20f;
+    }
+    // gold gradient, top to bottom
+    private static final int[] TITLE_BANDS = { Theme.GOLD, Theme.YELLOW, Theme.ORANGE, Theme.ORANGE_DARK };
+    private static final float[] TITLE_STOPS = { 0f, 0.3f, 0.6f, 0.85f, 1f };
+
+    /**
+     * Medium and body text are the vanilla font at 2 screen pixels per font pixel (like chat), small
+     * is Silkscreen at 1, big is the vanilla font at 3.
+     * Every size sits on whole screen pixels, so nothing is soft.
+     */
+    public static float bodyScale() {
+        return 1f; // the vanilla font at 1 font pixel per unit: 2 screen pixels at GUI scale 3-4, like chat
+    }
+
+    /** Distance between two lines of body text. */
+    public static int lineHeight() {
+        return Math.max(5, Math.round(10 * bodyScale()));
+    }
+
+    /** Width of body text. */
+    public static int width(String s) {
+        return Theme.font().width(s);
+    }
+
+    public static int width(FormattedCharSequence s) {
+        return Theme.font().width(s);
+    }
+
+    // ---- small: Silkscreen capitals (labels, tags, hints, key chips and counts in cells) ----
+
+    /**
+     * Silkscreen on whole screen pixels, one step below body text: 1 screen pixel per font pixel up to GUI scale 4,
+     * then 2 at 5-6 and 3 at 7-8.
+     * The "larger small text" setting takes it one whole step up, as it can't grow by less and stay crisp.
+     */
+    public static float smallScale() {
+        float p = (float) HudGeometry.scale().pixelsPerUnit();
+        int n = Math.max(1, (int) Math.ceil(p) - 1); // one screen pixel per font pixel less than body text, so it grows with every HUD step
+        if (ReignOfNetherClientConfigs.LARGER_SMALL_TEXT.get())
+            n++;
+        return Math.min(n, p) / (float) p; // never bigger than medium (the body font at 1x)
+    }
+
+    // labels are always capitals, like the design, whatever case the caller passes
+    private static FormattedCharSequence caps(String s) {
+        return Component.literal(s.toUpperCase(java.util.Locale.ROOT)).withStyle(SMALL_STYLE).getVisualOrderText();
+    }
+
+    // medium: the vanilla font in capitals
+    private static FormattedCharSequence label(String s) {
+        return Component.literal(s.toUpperCase(java.util.Locale.ROOT)).getVisualOrderText();
+    }
+
+    public static int smallWidth(String s) {
+        return (int) Math.ceil(Theme.font().width(caps(s)) * smallScale());
+    }
+
+    /** Small caps text, vertically centred where an 8-unit vanilla line at y would sit. */
+    public static void small(GuiGraphics g, String s, int x, int y, int colour) {
+        // Silkscreen's caps sit on rows 2..6 of the glyph: their centre is 4.5 font pixels down
+        draw(g, caps(s), smallScale(), 4.5f, x, y, colour, false);
+    }
+
+    public static void smallShadowed(GuiGraphics g, String s, int x, int y, int colour) {
+        draw(g, caps(s), smallScale(), 4.5f, x, y, colour, true);
+    }
+
+    private static final int[][] OUTLINE = {{-1, 0}, {1, 0}, {0, -1}, {0, 1}};
+
+    /** Keeps the caps' centre (capsCentre font units down the line) at y + 4.5, on a whole screen pixel. */
+    private static void draw(GuiGraphics g, FormattedCharSequence text, float k, float capsCentre, int x, int y, int colour, boolean outline) {
+        float p = (float) HudGeometry.scale().pixelsPerUnit();
+        g.pose().pushPose();
+        g.pose().translate(x, y + Math.round((4.5f - capsCentre * k) * p) / (float) p, 0);
+        g.pose().scale(k, k, 1);
+        // a black outline exactly one screen pixel wide, whatever the scale, so it never eats the letters
+        if (outline) {
+            float px = 1f / (k * p);
+            for (int[] d : OUTLINE) {
+                g.pose().pushPose();
+                g.pose().translate(d[0] * px, d[1] * px, 0);
+                g.drawString(Theme.font(), text, 0, 0, 0xFF000000, false);
+                g.pose().popPose();
+            }
+        }
+        g.drawString(Theme.font(), text, 0, 0, colour, false);
+        g.pose().popPose();
+    }
+
+    public static void smallRight(GuiGraphics g, String s, int rightX, int y, int colour) {
+        small(g, s, rightX - smallWidth(s), y, colour);
+    }
+
+    public static void smallCentered(GuiGraphics g, String s, int cx, int y, int colour) {
+        small(g, s, cx - smallWidth(s) / 2, y, colour);
+    }
+
+    /** Small text split on spaces so each line fits maxW. */
+    public static List<String> wrapSmall(String text, int maxW) {
+        List<String> lines = new ArrayList<>();
+        String current = "";
+        for (String word : text.split(" ")) {
+            String next = current.isEmpty() ? word : current + " " + word;
+            if (!current.isEmpty() && Text.smallWidth(next) > maxW) {
+                lines.add(current);
+                current = word;
+            } else {
+                current = next;
+            }
+        }
+        if (!current.isEmpty())
+            lines.add(current);
+        return lines;
+    }
+
+    public static String fitSmall(String s, int maxWidth) {
+        return fit(s, maxWidth, Text::smallWidth);
+    }
+
+    /** The longest start of s that fits with an ellipsis; binary search, as these run every frame. */
+    private static String fit(String s, int maxWidth, java.util.function.ToIntFunction<String> width) {
+        if (width.applyAsInt(s) <= maxWidth)
+            return s;
+        int lo = 0, hi = s.length() - 1;
+        while (lo < hi) {
+            int mid = (lo + hi + 1) / 2;
+            if (width.applyAsInt(s.substring(0, mid) + "…") <= maxWidth)
+                lo = mid;
+            else
+                hi = mid - 1;
+        }
+        return s.substring(0, lo) + "…";
+    }
+
+    // ---- medium: statuses and headers, bigger than small ----
+
+    public static int mediumWidth(String s) {
+        return Theme.font().width(label(s));
+    }
+
+    /** Medium text (body font capitals), centred where an 8-unit vanilla line at y would sit. */
+    public static void medium(GuiGraphics g, String s, int x, int y, int colour) {
+        // the vanilla font's caps sit on rows 0..6: their centre is 3.5 font pixels down
+        draw(g, label(s), 1f, 3.5f, x, y, colour, false);
+    }
+
+    public static void mediumRight(GuiGraphics g, String s, int rightX, int y, int colour) {
+        medium(g, s, rightX - mediumWidth(s), y, colour);
+    }
+
+    public static void mediumCentered(GuiGraphics g, String s, int cx, int y, int colour) {
+        medium(g, s, cx - mediumWidth(s) / 2, y, colour);
+    }
+
+    // ---- big: values, names and numbers, the vanilla font scaled up (Pixelify is for titles only) ----
+
+    /** Snaps a scale so each font pixel is a whole number of screen pixels. */
+    private static float crisp(float scale) {
+        float p = (float) HudGeometry.scale().pixelsPerUnit();
+        return Math.max(1, Math.round(scale * p)) / (float) p;
+    }
+
+    /** Pixelify is baked at 2x, so one texel is half a font unit: snap to whole screen pixels per texel. */
+    private static float crispBig(float scale) {
+        float p = (float) HudGeometry.scale().pixelsPerUnit();
+        int n = Math.round(scale * p / 2f);
+        return n >= 1 ? 2f * n / p : 1f / p;
+    }
+
+    private static FormattedCharSequence bigText(String s) {
+        return Component.literal(s).withStyle(BIG_STYLE).getVisualOrderText();
+    }
+
+    private static float bigK(float scale) {
+        return crisp(scale);
+    }
+
+    /** Height of a line of big text, top to baseline plus descender. */
+    public static int bigHeight(float scale) {
+        return Math.round(8 * bigK(scale));
+    }
+
+    public static int bigWidth(String s, float scale) {
+        return Math.round(Theme.font().width(s) * bigK(scale));
+    }
+
+    /** Big value or name with a black drop shadow; y is the top of the text. */
+    public static void big(GuiGraphics g, String s, int x, int y, int colour, float scale) {
+        float k = bigK(scale);
+        g.pose().pushPose();
+        g.pose().translate(x, y, 0);
+        g.pose().scale(k, k, 1);
+        g.drawString(Theme.font(), s, 1, 1, 0xFF000000, false);
+        g.drawString(Theme.font(), s, 0, 0, colour, false);
+        g.pose().popPose();
+    }
+
+    public static String fitBig(String s, int maxWidth, float scale) {
+        return fit(s, maxWidth, t -> bigWidth(t, scale));
+    }
+
+    public static void bigRight(GuiGraphics g, String s, int rightX, int y, int colour, float scale) {
+        big(g, s, rightX - bigWidth(s, scale), y, colour, scale);
+    }
+
+    public static void bigCentered(GuiGraphics g, String s, int cx, int y, int colour, float scale) {
+        big(g, s, cx - bigWidth(s, scale) / 2, y, colour, scale);
+    }
+
+    // ---- heading: Pixelify Sans, decorative panel titles only (never numbers) ----
+
+    public static int headingWidth(String s, float scale) {
+        return titleWidth(s, scale);
+    }
+
+    public static void heading(GuiGraphics g, String s, int x, int y, int colour, float scale) {
+        FormattedCharSequence text = bigText(s);
+        g.pose().pushPose();
+        g.pose().translate(x, y, 0);
+        float k = crispBig(scale);
+        g.pose().scale(k, k, 1);
+        g.drawString(Theme.font(), text, 1, 1, 0xFF000000, false);
+        g.drawString(Theme.font(), text, 0, 0, colour, false);
+        g.pose().popPose();
+    }
+
+    // ---- body: the vanilla font, as in chat ----
+
+    public static void draw(GuiGraphics g, String s, int x, int y, int colour) {
+        draw(g, Component.literal(s).getVisualOrderText(), x, y, colour);
+    }
+
+    /** Body text with Minecraft's drop shadow, like chat, but none under dark text (on orange buttons). */
+    public static void draw(GuiGraphics g, FormattedCharSequence s, int x, int y, int colour) {
+        int lum = ((colour >> 16) & 0xFF) * 3 + ((colour >> 8) & 0xFF) * 6 + (colour & 0xFF);
+        g.drawString(Theme.font(), s, x, y, colour, lum > 128 * 10);
+    }
+
+    public static void drawCentered(GuiGraphics g, String s, int cx, int y, int colour) {
+        draw(g, s, cx - width(s) / 2, y, colour);
+    }
+
+    /** Cuts the string with an ellipsis so it fits in maxWidth. */
+    public static String fit(String s, int maxWidth) {
+        return fit(s, maxWidth, (String t) -> width(t));
+    }
+
+    public static List<FormattedCharSequence> wrap(String s, int maxWidth) {
+        return wrap(Component.literal(s), maxWidth);
+    }
+
+    /** Splits styled text so each line fits maxWidth units at the body size. */
+    public static List<FormattedCharSequence> wrap(Component c, int maxWidth) {
+        return Theme.font().split(c, maxWidth);
+    }
+
+    public static int titleWidth(String s, float scale) {
+        return Math.round(Theme.font().width(bigText(s)) * crispBig(scale));
+    }
+
+    /**
+     * Big gold title. Scale 1 is about 8 units tall. The gradient is drawn as horizontal bands clipped
+     * with the scissor, which works in screen space, so band edges are taken from the current pose.
+     */
+    public static void title(GuiGraphics g, String s, int x, int y, float scale) {
+        title(g, s, x, y, scale, TITLE_BANDS, Theme.ON_ORANGE);
+    }
+
+    /** {@link #title} with its own gradient (4 bands, top to bottom) and drop shadow colour. */
+    public static void title(GuiGraphics g, String s, int x, int y, float scale, int[] bands, int shadow) {
+        FormattedCharSequence text = Component.literal(s).withStyle(BIG_STYLE).getVisualOrderText();
+        int w = Theme.font().width(text);
+        int h = 8;
+
+        g.pose().pushPose();
+        g.pose().translate(x, y, 0);
+        float k = crispBig(scale);
+        g.pose().scale(k, k, 1);
+        g.drawString(Theme.font(), text, 1, 1, shadow, false);
+
+        var matrix = g.pose().last().pose();
+        for (int i = 0; i < bands.length; i++) {
+            Vector4f top = matrix.transform(new Vector4f(0, h * TITLE_STOPS[i], 0, 1));
+            Vector4f bottom = matrix.transform(new Vector4f(w + 1, h * TITLE_STOPS[i + 1], 0, 1));
+            int y2 = i == bands.length - 1 ? (int) Math.ceil(bottom.y) + 4 : Math.round(bottom.y);
+            g.enableScissor((int) Math.floor(top.x), Math.round(top.y), (int) Math.ceil(bottom.x) + 1, y2);
+            g.drawString(Theme.font(), text, 0, 0, bands[i], false);
+            g.disableScissor();
+        }
+        g.pose().popPose();
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/Theme.java b/src/main/java/com/solegendary/reignofnether/ui/Theme.java
new file mode 100644
index 000000000..e59fe2ba4
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/Theme.java
@@ -0,0 +1,317 @@
+package com.solegendary.reignofnether.ui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.util.FormattedCharSequence;
+
+import java.util.List;
+
+/**
+ * Colours and bevelled shapes shared by the RTS HUD and the match setup screen.
+ * All sizes are in HUD units (see {@link HudScale}).
+ */
+public final class Theme {
+
+    private Theme() { }
+
+    // surfaces
+    public static final int INK = 0xFF0B0A0F;          // outlines, bar tracks, dividers
+    public static final int PANEL = 0xFF16151B;
+    public static final int RAISED = 0xFF1E1D26;       // cells and buttons
+    public static final int RAISED_HOVER = 0xFF2A2933;
+    public static final int SECONDARY = 0xFF26252E;
+    public static final int SUNKEN = 0xFF121118;       // footers, input rows
+    public static final int EMPTY = 0xFF0F0E13;
+    public static final int LOCKED = 0xFF17161C;
+    public static final int POOR = 0xFF251619;
+    public static final int ACTIVE = 0xFF2F2418;
+    public static final int CANCEL_HOVER = 0xFF3A1A14;
+    public static final int TOGGLE_ON = 0xFF1D3A1D;
+    public static final int DANGER_BG = 0xFF2A1A1A;
+    public static final int CONSOLE_RIM = 0xFF2C2A33;
+
+    // text
+    public static final int TEXT = 0xFFE7E9F5;
+    public static final int BODY = 0xFFCFD3E8;
+    public static final int DESC = 0xFFB7BCD6;
+    public static final int MUTED = 0xFFA9AECF;
+    public static final int LABEL = 0xFF9498B5;
+    public static final int DIM = 0xFF6C709A;
+    public static final int FAINT = 0xFF3C3E5A;
+
+    // accents
+    public static final int ORANGE = 0xFFF19A0F;
+    public static final int GOLD = 0xFFFEF481;
+    public static final int ORANGE_DARK = 0xFFDD6003;
+    public static final int ON_ORANGE = 0xFF380000;
+    public static final int YELLOW = 0xFFFBEB3C;
+
+    // status
+    public static final int OK = 0xFF55FF55;
+    public static final int OK_DARK = 0xFF1D5A1D;
+    public static final int OK_TEXT = 0xFFB9FFB9;
+    public static final int ERROR = 0xFFFF6A4D;
+    public static final int DANGER_TEXT = 0xFFFF8A6D;
+    public static final int BUFF = 0xFF55FFFF;
+    public static final int MANA = 0xFF4D6BFF;
+    public static final int MANA_TEXT = 0xFF8FB8FF;
+    public static final int XP = 0xFF8FE03C;
+    public static final int EMERALD = 0xFF5DCAA5;
+    // resources, for numbers that need telling apart at a glance
+    public static final int FOOD = 0xFFF2C94C;
+    public static final int WOOD = 0xFFC8915A;
+    public static final int ORE = 0xFFC9CCDB;
+
+    // translucent overlays
+    private static final int HIGHLIGHT = 0x12FFFFFF;
+    private static final int HIGHLIGHT_SOFT = 0x0DFFFFFF;
+    private static final int SHADE = 0x8C000000;
+    private static final int SHADE_SOFT = 0x66000000;
+    private static final int SHADE_EMPTY = 0x73000000;
+    private static final int POOR_GLOW = 0x38FF6A4D;
+    public static final int ALARM_TINT = 0x1AFF6A4D;   // a resource or housing cell that needs attention
+    public static final int ALARM_GLOW = 0x73FF6A4D;   // flashing outline of the under-attack alert
+    public static final int HOVER = 0x1FFFFFFF;
+    private static final int BTN_HIGHLIGHT = 0x17FFFFFF;
+    private static final int RING_DARK = 0xFF14131A;
+    public static final int CHIP_ON = 0xFF3A2A14;
+    public static final int BUTTON_HOVER = 0xFF33323D;
+
+    /** Bevel thickness: the design's 3-4 px edges at half scale, rounded up. */
+    public static final int BEVEL = 2;
+
+    public enum CellState { READY, ACTIVE, POOR, COOLDOWN, LOCKED, EMPTY }
+
+    public static Font font() {
+        return Minecraft.getInstance().font;
+    }
+
+    public static int hpColor(float fraction) {
+        if (fraction > 0.5f)
+            return OK;
+        return fraction > 0.25f ? YELLOW : ERROR;
+    }
+
+    public static int withAlpha(int argb, float alpha) {
+        int a = Math.round(((argb >>> 24) & 0xFF) * Math.max(0, Math.min(1, alpha)));
+        return (a << 24) | (argb & 0xFFFFFF);
+    }
+
+    public static void outline(GuiGraphics g, int x, int y, int w, int h, int t, int colour) {
+        g.fill(x - t, y - t, x + w + t, y, colour);
+        g.fill(x - t, y + h, x + w + t, y + h + t, colour);
+        g.fill(x - t, y, x, y + h, colour);
+        g.fill(x + w, y, x + w + t, y + h, colour);
+    }
+
+    /** Inner ring drawn just inside the rectangle. */
+    public static void ring(GuiGraphics g, int x, int y, int w, int h, int t, int colour) {
+        outline(g, x + t, y + t, w - 2 * t, h - 2 * t, t, colour);
+    }
+
+    /** Main surface: dark fill, soft top highlight, bottom shade and an ink outline. */
+    public static void panel(GuiGraphics g, int x, int y, int w, int h) {
+        panel(g, x, y, w, h, PANEL);
+    }
+
+    /** See-through panel for the HUD's floating bottom cards, so the world shows behind them. */
+    public static final int FLOATING = 0xB316151B; // 70% solid
+
+    /** FLOATING, or fully solid when the player turned see-through panels off. */
+    public static int floating() {
+        return com.solegendary.reignofnether.config.ReignOfNetherClientConfigs.SOLID_PANELS.get() ? PANEL : FLOATING;
+    }
+
+    public static void panel(GuiGraphics g, int x, int y, int w, int h, int fill) {
+        bevel(g, x, y, w, h, fill, HIGHLIGHT_SOFT, SHADE, 1, INK);
+    }
+
+    /**
+     * The one bevel recipe: fill, a top highlight and bottom shade BEVEL units thick (0 colour = none),
+     * and an outer ring.
+     */
+    public static void bevel(GuiGraphics g, int x, int y, int w, int h, int fill, int top, int bottom, int ringW, int ring) {
+        if (ringW > 0)
+            outline(g, x, y, w, h, ringW, ring);
+        g.fill(x, y, x + w, y + h, fill);
+        int t = Math.min(BEVEL, h / 4);
+        if (top != 0)
+            g.fill(x, y, x + w, y + t, top);
+        if (bottom != 0)
+            g.fill(x, y + h - t, x + w, y + h, bottom);
+    }
+
+    /**
+     * A notice strip like the world list's "not RTS" warning: a faint tint of `edge`, a coloured left edge and
+     * the text wrapped to fit. ERROR for errors, ORANGE_DARK for warnings. Returns its height.
+     */
+    public static int banner(GuiGraphics g, int x, int y, int w, String text, int edge) {
+        List<FormattedCharSequence> lines = Text.wrap(text, w - 14);
+        int h = bannerHeight(text, w);
+        g.fill(x, y, x + w, y + h, (edge & 0x00FFFFFF) | 0x1A000000);
+        g.fill(x, y, x + 2, y + h, edge);
+        for (int i = 0; i < lines.size(); i++)
+            Text.draw(g, lines.get(i), x + 7, y + 4 + i * Text.lineHeight(), DESC);
+        return h;
+    }
+
+    public static int bannerHeight(String text, int w) {
+        return Text.wrap(text, w - 14).size() * Text.lineHeight() + 8;
+    }
+
+    /** Popup surface (tooltip, toast, chat, menu) with a coloured top edge. */
+    public static void popup(GuiGraphics g, int x, int y, int w, int h, int accent) {
+        bevel(g, x, y, w, h, 0xF516151B, accent, 0, 1, INK);
+    }
+
+    /** Small card inside a panel (stat cards, sub-panels). */
+    public static void card(GuiGraphics g, int x, int y, int w, int h) {
+        bevel(g, x, y, w, h, PANEL, 0x0AFFFFFF, 0, 1, INK);
+    }
+
+    public static void cell(GuiGraphics g, int x, int y, int w, int h, CellState state, boolean hovered) {
+        switch (state) {
+            case EMPTY -> {
+                bevel(g, x, y, w, h, EMPTY, SHADE_EMPTY, 0, 1, INK);
+                return;
+            }
+            case LOCKED -> bevel(g, x, y, w, h, LOCKED, 0, 0, 1, INK);
+            case POOR -> bevel(g, x, y, w, h, POOR, POOR_GLOW, SHADE, 1, INK);
+            case ACTIVE -> {
+                bevel(g, x, y, w, h, ACTIVE, 0, SHADE_SOFT, 1, INK);
+                ring(g, x, y, w, h, 1, ORANGE);
+            }
+            default -> bevel(g, x, y, w, h, RAISED, HIGHLIGHT, SHADE, 1, INK);
+        }
+        if (hovered && state != CellState.LOCKED)
+            g.fill(x, y, x + w, y + h, HOVER);
+    }
+
+    public static void divider(GuiGraphics g, int x, int y, int w, int h) {
+        g.fill(x, y, x + w, y + h, INK);
+    }
+
+    /** Progress or health bar with a sunken track. */
+    public static void bar(GuiGraphics g, int x, int y, int w, int h, float fraction, int colour) {
+        g.fill(x, y, x + w, y + h, INK);
+        int filled = Math.round(w * Math.max(0, Math.min(1, fraction)));
+        if (filled > 0) {
+            g.fill(x, y, x + filled, y + h, colour);
+            if (h >= 3) {
+                g.fill(x, y, x + filled, y + 1, 0x59FFFFFF);
+                g.fill(x, y + h - 1, x + filled, y + h, 0x40000000);
+            }
+        }
+    }
+
+    public static void primaryButton(GuiGraphics g, int x, int y, int w, int h, boolean hovered) {
+        bevel(g, x, y, w, h, ORANGE, GOLD, ORANGE_DARK, 1, ON_ORANGE);
+        if (hovered)
+            g.fill(x, y, x + w, y + h, HOVER);
+    }
+
+    /** Big header-style button (GAME RULES, LEAVE): highlight, shade and a dark ring. */
+    public static void secondaryButton(GuiGraphics g, int x, int y, int w, int h, boolean hovered) {
+        bevel(g, x, y, w, h, hovered ? BUTTON_HOVER : SECONDARY, BTN_HIGHLIGHT, SHADE, 1, RING_DARK);
+    }
+
+    /** {@link #secondaryButton} in another fill colour (the title screen's Discord button). */
+    public static void colourButton(GuiGraphics g, int x, int y, int w, int h, int fill) {
+        bevel(g, x, y, w, h, fill, BTN_HIGHLIGHT, SHADE, 1, RING_DARK);
+    }
+
+    /** Small row button (ADD AI, CLOSE, SEND): highlight only. */
+    public static void button(GuiGraphics g, int x, int y, int w, int h, boolean hovered) {
+        bevel(g, x, y, w, h, hovered ? BUTTON_HOVER : SECONDARY, BTN_HIGHLIGHT, 0, 1, INK);
+    }
+
+    /** Red-text variant of {@link #button} (KICK). */
+    public static void dangerButton(GuiGraphics g, int x, int y, int w, int h, boolean hovered) {
+        bevel(g, x, y, w, h, DANGER_BG, BTN_HIGHLIGHT, 0, 1, INK);
+        if (hovered)
+            g.fill(x, y, x + w, y + h, HOVER);
+    }
+
+    /** Flat chip (mode, rule toggle, faction pick): ring only when off, orange inner ring when on. */
+    public static void chip(GuiGraphics g, int x, int y, int w, int h, boolean on, boolean hovered) {
+        bevel(g, x, y, w, h, on ? CHIP_ON : hovered ? SECONDARY : RAISED, 0, 0, 1, INK);
+        if (on)
+            ring(g, x, y, w, h, 1, ORANGE);
+    }
+
+    public enum ReadyState { CAN_READY, READY, DISABLED }
+
+    /** The big READY button: orange with a drop shadow, green once ready, grey when it can't be used. */
+    public static void readyButton(GuiGraphics g, int x, int y, int w, int h, ReadyState state, boolean hovered) {
+        switch (state) {
+            case CAN_READY -> {
+                g.fill(x, y + h, x + w, y + h + 3, 0xFF7A2C06);
+                bevel(g, x, y, w, h, ORANGE, GOLD, ORANGE_DARK, 1, ON_ORANGE);
+            }
+            case READY -> bevel(g, x, y, w, h, OK_DARK, OK, 0xFF0B2A0B, 1, 0xFF0B2A0B);
+            case DISABLED -> bevel(g, x, y, w, h, 0xFF2A2930, 0x0DFFFFFF, 0x80000000, 1, RING_DARK);
+        }
+        if (hovered && state != ReadyState.DISABLED)
+            g.fill(x, y, x + w, y + h, HOVER);
+    }
+
+    /** Hotkey chip in the top-left corner of a cell, in the small font. Returns its width. */
+    public static int keyCap(GuiGraphics g, String key, int x, int y, int textColour) {
+        if (key == null || key.isEmpty())
+            return 0;
+        int w = Text.smallWidth(key) + 3;
+        g.fill(x, y, x + w, y + 7, 0xD90B0A0F);
+        Text.small(g, key, x + 2, y - 1, textColour);
+        return w;
+    }
+
+    /** Orange count badge, e.g. idle workers. */
+    public static void badge(GuiGraphics g, String text, int rightX, int topY) {
+        int w = Math.max(9, Text.smallWidth(text) + 5);
+        int x = rightX - w;
+        outline(g, x, topY, w, 9, 1, ON_ORANGE);
+        orangeChip(g, x, topY, w, 9);
+        Text.small(g, text, x + (w - Text.smallWidth(text) + 1) / 2, topY, ON_ORANGE);
+    }
+
+    /** Orange chip with a gold top edge (badges, hero level, skill points); text goes on top in ON_ORANGE. */
+    public static void orangeChip(GuiGraphics g, int x, int y, int w, int h) {
+        g.fill(x, y, x + w, y + h, ORANGE);
+        g.fill(x, y, x + w, y + 1, GOLD);
+    }
+
+    /** Padlock icon centred in the box (x, y, size), used on locked cells and seats. */
+    public static void lock(GuiGraphics g, int x, int y, int size, int colour) {
+        Icon.LOCK.drawIn(g, x - 2, y - 2, size + 4, size + 4, colour);
+    }
+
+    /** Close cross centred in the box (x, y, size). */
+    public static void cross(GuiGraphics g, int x, int y, int size, int colour) {
+        pixelCross(g, x + size / 2f, y + size / 2f, colour);
+    }
+
+    /** Close cross exactly centred on a button, half units included. */
+    public static void cross(GuiGraphics g, com.solegendary.reignofnether.ui.Rect r, int colour) {
+        pixelCross(g, r.x() + r.w() / 2f, r.y() + r.h() / 2f, colour);
+    }
+
+    /** Icon.CLOSE's 7x7 art redrawn on whole screen pixels: scaled to fractional ones, its diagonals lose pixels. */
+    private static void pixelCross(GuiGraphics g, float cx, float cy, int colour) {
+        var m = g.pose().last().pose();
+        float guiScale = (float) Minecraft.getInstance().getWindow().getGuiScale();
+        int k = Math.max(1, Math.round(m.m00() * guiScale / 2)); // an art pixel is half a unit
+        int x = Math.round((m.m30() + cx * m.m00()) * guiScale - 7 * k / 2f);
+        int y = Math.round((m.m31() + cy * m.m11()) * guiScale - 7 * k / 2f);
+        g.pose().pushPose();
+        g.pose().setIdentity();
+        g.pose().translate(0, 0, m.m32());
+        g.pose().scale(1 / guiScale, 1 / guiScale, 1);
+        for (int i = 0; i < 7; i++) {
+            g.fill(x + i * k, y + i * k, x + (i + 1) * k, y + (i + 1) * k, colour);
+            if (i != 3)
+                g.fill(x + (6 - i) * k, y + i * k, x + (7 - i) * k, y + (i + 1) * k, colour);
+        }
+        g.pose().popPose();
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/Toast.java b/src/main/java/com/solegendary/reignofnether/ui/Toast.java
new file mode 100644
index 000000000..69c72d4f9
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/Toast.java
@@ -0,0 +1,61 @@
+package com.solegendary.reignofnether.ui;
+
+import net.minecraft.client.gui.GuiGraphics;
+
+/**
+ * Single short message shown above the HUD console (replaces the old floating temp message).
+ * One at a time: a new message replaces the current one.
+ */
+public final class Toast {
+
+    private Toast() { }
+
+    public static final int DEFAULT_TICKS = 150;
+    private static final int FADE_TICKS = 20;
+
+    private static String message = "";
+    private static int colour = Theme.ORANGE;
+    private static int ticksLeft = 0;
+
+    public static void show(String msg, int ticks) {
+        show(msg, ticks, Theme.ORANGE);
+    }
+
+    public static void show(String msg, int ticks, int accent) {
+        message = msg == null ? "" : msg;
+        ticksLeft = ticks;
+        colour = accent;
+    }
+
+    public static void clear() {
+        ticksLeft = 0;
+    }
+
+    public static void tick() {
+        if (ticksLeft > 0)
+            ticksLeft--;
+    }
+
+    public static boolean isVisible() {
+        return ticksLeft > 0 && !message.isEmpty();
+    }
+
+    /** Draws the toast centred on cx with its bottom edge at bottomY. Returns its height (0 if hidden). */
+    public static int render(GuiGraphics g, int cx, int bottomY) {
+        if (!isVisible())
+            return 0;
+        float alpha = Math.min(1f, ticksLeft / (float) FADE_TICKS);
+        int w = Text.width(message) + 22;
+        int h = 16;
+        int x = cx - w / 2;
+        int y = bottomY - h;
+
+        Theme.outline(g, x, y, w, h, 1, Theme.withAlpha(Theme.INK, alpha));
+        g.fill(x, y, x + w, y + h, Theme.withAlpha(0xF516151B, alpha));
+        g.fill(x, y, x + w, y + 1, Theme.withAlpha(colour, alpha));
+        g.fill(x + 6, y + 6, x + 11, y + 11, Theme.withAlpha(colour, alpha));
+        if (alpha > 0.1f)
+            Text.draw(g, message, x + 15, y + 4, Theme.withAlpha(Theme.TEXT, alpha));
+        return h;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/ui/Tooltip.java b/src/main/java/com/solegendary/reignofnether/ui/Tooltip.java
new file mode 100644
index 000000000..ac3eb8180
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/ui/Tooltip.java
@@ -0,0 +1,296 @@
+package com.solegendary.reignofnether.ui;
+
+import com.solegendary.reignofnether.util.MyRenderer;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FormattedCharSequence;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The one tooltip of the RTS UI: title with an optional tag, body lines, coloured status lines and a
+ * footer with costs and the hotkey. Built fluently and shown with {@link #show}; the HUD draws the
+ * pending tooltip last so it is always on top.
+ */
+public final class Tooltip {
+
+    public static final int WIDTH = 170;
+    private static final int PAD = 7;
+
+    private String title;
+    private static final float TITLE_SCALE = Text.px(20);
+    private int titleColour = Theme.TEXT;
+    private String tag;
+    private int tagColour = Theme.ORANGE;
+    private int accent = Theme.ORANGE;
+    private final List<FormattedCharSequence> body = new ArrayList<>();
+    private final List<Line> status = new ArrayList<>();
+    private final List<FooterEntry> footer = new ArrayList<>();
+    private final List<FormattedCharSequence> footerLines = new ArrayList<>(); // legacy cost lines, icon glyphs kept
+    private final List<String> flavour = new ArrayList<>(); // lore: last, small and dim, so the effect reads first
+    private String key;
+
+    private record Line(String text, int colour) { }
+
+    public record FooterEntry(@Nullable ResourceLocation icon, String text, int colour) { }
+
+    public static Tooltip of(String title) {
+        Tooltip t = new Tooltip();
+        t.title = title;
+        return t;
+    }
+
+    public static Tooltip of(FormattedCharSequence title) {
+        StringBuilder sb = new StringBuilder();
+        title.accept((index, style, codePoint) -> {
+            sb.appendCodePoint(codePoint);
+            return true;
+        });
+        return of(sb.toString());
+    }
+
+    /**
+     * Wraps the legacy tooltip lines of a Button: first line becomes the title, lines that start with a resource
+     * icon glyph (costs, pop, time, cooldown, range) go to the footer, the rest is the body.
+     * Legacy lines keep their styles, including the resource icon glyphs.
+     */
+    public static Tooltip fromLines(List<FormattedCharSequence> lines) {
+        if (lines == null || lines.isEmpty())
+            return null;
+        Tooltip t = of(lines.get(0));
+        for (int i = 1; i < lines.size(); i++) {
+            if (startsWithIcon(lines.get(i)))
+                t.footerLines.add(lines.get(i));
+            else if (isItalic(lines.get(i))) // lang strings starting with §o are flavour
+                t.flavour.add(plain(lines.get(i)).replaceFirst("^\\s*§o", "").trim());
+            else
+                t.body.add(lines.get(i));
+        }
+        // legacy tooltips put blank spacer lines around the costs
+        while (!t.body.isEmpty() && Text.width(t.body.get(0)) == 0)
+            t.body.remove(0);
+        while (!t.body.isEmpty() && Text.width(t.body.get(t.body.size() - 1)) == 0)
+            t.body.remove(t.body.size() - 1);
+        return t;
+    }
+
+    // italic style (§o parsed), or a raw "§o" when the line was built without parsing codes (MiscUtil.fcs)
+    private static boolean isItalic(FormattedCharSequence line) {
+        String text = plain(line).stripLeading();
+        boolean[] italic = { false };
+        line.accept((index, style, codePoint) -> {
+            if (Character.isWhitespace(codePoint))
+                return true;
+            italic[0] = style.isItalic();
+            return false;
+        });
+        return italic[0] || text.startsWith("§o");
+    }
+
+    public Tooltip flavour(String text) {
+        if (text != null && !text.isBlank())
+            flavour.add(text);
+        return this;
+    }
+
+    private static boolean startsWithIcon(FormattedCharSequence line) {
+        boolean[] icon = { false };
+        line.accept((index, style, codePoint) -> {
+            if (Character.isWhitespace(codePoint))
+                return true;
+            icon[0] = MyRenderer.iconStyle.getFont().equals(style.getFont());
+            return false;
+        });
+        return icon[0];
+    }
+
+    public Tooltip titleColour(int colour) { this.titleColour = colour; return this; }
+
+    public Tooltip tag(String tag, int colour) { this.tag = tag; this.tagColour = colour; return this; }
+
+    public Tooltip danger() { this.accent = Theme.ERROR; return this; }
+
+    public Tooltip body(String text) {
+        if (text != null && text.startsWith("§o"))
+            return flavour(text.substring(2));
+        body.addAll(Text.wrap(text, WIDTH - PAD * 2));
+        return this;
+    }
+
+    public Tooltip body(FormattedCharSequence line) { body.add(line); return this; }
+
+    public Tooltip status(String text, int colour) {
+        if (text != null && !text.isEmpty())
+            status.add(new Line(text, colour));
+        return this;
+    }
+
+    public Tooltip cost(@Nullable ResourceLocation icon, String text, int colour) {
+        footer.add(new FooterEntry(icon, text, colour));
+        return this;
+    }
+
+    public Tooltip key(String key) { this.key = key; return this; }
+
+    private static final int MAX_WIDTH = 230;
+
+    private static String plain(FormattedCharSequence s) {
+        StringBuilder sb = new StringBuilder();
+        s.accept((index, style, codePoint) -> {
+            sb.appendCodePoint(codePoint);
+            return true;
+        });
+        return sb.toString();
+    }
+
+    /** A legacy line wider than maxW, split keeping its styles (colours, icon glyphs). */
+    private static List<FormattedCharSequence> wrapLine(FormattedCharSequence line, int maxW) {
+        if (Text.width(line) <= maxW)
+            return List.of(line);
+        MutableComponent c = Component.empty();
+        line.accept((index, style, codePoint) -> {
+            c.append(Component.literal(Character.toString(codePoint)).withStyle(style));
+            return true;
+        });
+        return Text.wrap(c, maxW);
+    }
+
+    /**
+     * Draws the tooltip next to an anchor rectangle: above it when the anchor is in the lower half of
+     * the screen, below it otherwise, clamped to the screen. Lines wider than the tooltip are wrapped.
+     */
+    public void render(GuiGraphics g, int anchorX, int anchorY, int anchorW, int anchorH, int screenW, int screenH) {
+        int maxW = Math.min(MAX_WIDTH, screenW - 8) - PAD * 2;
+        List<FormattedCharSequence> lines = new ArrayList<>();
+        for (FormattedCharSequence line : body)
+            lines.addAll(wrapLine(line, maxW));
+        // what stops you using the button comes first, at body size: it's the one thing to read
+        List<Line> statusLines = new ArrayList<>();
+        for (Line line : status)
+            for (FormattedCharSequence part : Text.wrap(line.text, maxW))
+                statusLines.add(new Line(plain(part), line.colour));
+
+        List<String> flavourLines = new ArrayList<>();
+        for (String f : flavour)
+            for (FormattedCharSequence part : Text.wrap(f, maxW))
+                flavourLines.add(plain(part));
+
+        int tagW = tag != null ? Text.smallWidth(tag) + 10 : 0;
+        String shownTitle = Text.fitBig(title, maxW - tagW, TITLE_SCALE);
+        int cw = Text.bigWidth(shownTitle, TITLE_SCALE) + tagW;
+        for (FormattedCharSequence line : lines)
+            cw = Math.max(cw, Text.width(line));
+        for (Line line : statusLines)
+            cw = Math.max(cw, Text.width(line.text));
+        for (String line : flavourLines)
+            cw = Math.max(cw, Text.width(line));
+        int fw = 0;
+        for (FormattedCharSequence line : footerLines)
+            fw += Text.width(line) + 8;
+        for (FooterEntry e : footer)
+            fw += Text.width(e.text) + (e.icon != null ? 10 : 0) + 6;
+        if (key != null)
+            fw += Text.smallWidth(key) + 8;
+        cw = Math.min(maxW, Math.max(cw, fw));
+
+        int titleH = Text.bigHeight(TITLE_SCALE) + 2;
+        int h = PAD + titleH;
+        if (!statusLines.isEmpty())
+            h += 2 + statusLines.size() * Text.lineHeight();
+        if (!lines.isEmpty())
+            h += 2 + lines.size() * Text.lineHeight();
+        if (!flavourLines.isEmpty())
+            h += 3 + flavourLines.size() * Text.lineHeight();
+        h += PAD - 2;
+        boolean hasFooter = !footer.isEmpty() || !footerLines.isEmpty() || key != null;
+        if (hasFooter)
+            h += 15;
+
+        int w = cw + PAD * 2;
+        int x = Math.max(4, Math.min(anchorX + anchorW / 2 - w / 2, screenW - w - 4));
+        int y = anchorY > screenH / 2 ? anchorY - h - 6 : anchorY + anchorH + 6;
+        y = Math.max(4, Math.min(y, screenH - h - 4));
+
+        g.pose().pushPose();
+        g.pose().translate(0, 0, 400);
+        Theme.popup(g, x, y, w, h, accent);
+
+        int cy = y + PAD;
+        Text.big(g, shownTitle, x + PAD, cy, titleColour, TITLE_SCALE);
+        if (tag != null)
+            Text.smallRight(g, tag, x + w - PAD, cy, tagColour);
+        cy += titleH;
+
+        if (!statusLines.isEmpty()) {
+            cy += 2;
+            for (Line line : statusLines) {
+                Text.draw(g, line.text, x + PAD, cy, line.colour);
+                cy += Text.lineHeight();
+            }
+        }
+        if (!lines.isEmpty()) {
+            cy += 2;
+            for (FormattedCharSequence line : lines) {
+                Text.draw(g, line, x + PAD, cy, Theme.BODY);
+                cy += Text.lineHeight();
+            }
+        }
+        if (!flavourLines.isEmpty()) {
+            cy += 3;
+            for (String line : flavourLines) {
+                Text.draw(g, line, x + PAD, cy, Theme.DIM);
+                cy += Text.lineHeight();
+            }
+        }
+        if (hasFooter) {
+            int fy = y + h - 15;
+            g.fill(x, fy, x + w, y + h, Theme.SUNKEN);
+            g.fill(x, fy, x + w, fy + 1, Theme.INK);
+            int fx = x + PAD;
+            for (FooterEntry e : footer) {
+                if (e.icon != null) {
+                    g.blit(e.icon, fx, fy + 4, 0, 0, 8, 8, 8, 8);
+                    fx += 10;
+                }
+                Text.draw(g, e.text, fx, fy + 4, e.colour);
+                fx += Text.width(e.text) + 6;
+            }
+            for (FormattedCharSequence line : footerLines) {
+                Text.draw(g, line, fx, fy + 4, Theme.BODY);
+                fx += Text.width(line) + 8;
+            }
+            if (key != null) {
+                int kw = Text.smallWidth(key) + 5;
+                int kx = x + w - PAD - kw;
+                g.fill(kx, fy + 3, kx + kw, fy + 12, Theme.INK);
+                Theme.ring(g, kx, fy + 3, kw, 9, 1, Theme.FAINT);
+                Text.small(g, key, kx + 3, fy + 3, Theme.GOLD);
+            }
+        }
+        g.pose().popPose();
+    }
+
+    // ---- pending tooltip for the current frame ----
+
+    private static Tooltip pending;
+    private static int pendingX, pendingY, pendingW, pendingH;
+
+    /** Queues this tooltip to be drawn at the end of the frame. Later calls win. */
+    public void show(int anchorX, int anchorY, int anchorW, int anchorH) {
+        pending = this;
+        pendingX = anchorX;
+        pendingY = anchorY;
+        pendingW = anchorW;
+        pendingH = anchorH;
+    }
+
+    public static void renderPending(GuiGraphics g, int screenW, int screenH) {
+        if (pending != null)
+            pending.render(g, pendingX, pendingY, pendingW, pendingH, screenW, screenH);
+        pending = null;
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/unit/UnitChunkTickets.java b/src/main/java/com/solegendary/reignofnether/unit/UnitChunkTickets.java
index 2706b69ce..c73119f8e 100644
--- a/src/main/java/com/solegendary/reignofnether/unit/UnitChunkTickets.java
+++ b/src/main/java/com/solegendary/reignofnether/unit/UnitChunkTickets.java
@@ -2,6 +2,7 @@
 
 import com.mojang.datafixers.util.Pair;
 import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.util.WorldState;
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import it.unimi.dsi.fastutil.longs.LongSet;
@@ -27,6 +28,9 @@ public final class UnitChunkTickets {
             "reignofnether_unit", (first, second) -> Long.compare(first.toLong(), second.toLong()));
     private static final Map<ServerLevel, LevelTickets> LEVELS = new IdentityHashMap<>();
     private static final Map<ServerLevel, RestoredTickets> RESTORED_TICKETS = new IdentityHashMap<>();
+    static {
+        WorldState.onServerReset(UnitChunkTickets::clear);
+    }
 
     private record RestoredTickets(int checkTick, Map<UUID, Pair<LongSet, LongSet>> owners) {}
 
diff --git a/src/main/java/com/solegendary/reignofnether/unit/UnitClientEvents.java b/src/main/java/com/solegendary/reignofnether/unit/UnitClientEvents.java
index ec7ec7162..8183b3ea7 100644
--- a/src/main/java/com/solegendary/reignofnether/unit/UnitClientEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/unit/UnitClientEvents.java
@@ -72,6 +72,9 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
+import com.solegendary.reignofnether.chat.SpectatorFeed;
+import com.solegendary.reignofnether.hud.panels.SelectionPanel;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.animal.Chicken;
 import net.minecraft.world.entity.item.ItemEntity;
@@ -128,9 +131,16 @@ public class UnitClientEvents {
     private static ArrayList<LivingEntity> sortedSelectedUnits = new ArrayList<>();
     private static boolean sortedSelectedUnitsChanged = true;
     // tracking of all existing units
-    private static final ArrayList<LivingEntity> allUnits = new ArrayList<>();
+    private static final ArrayList<LivingEntity> allUnits = WorldState.client(new ArrayList<>());
 
     public static final Map<Integer, HashMap<MobEffect, MobEffectIcon>> mobEffectIcons = new ConcurrentHashMap<>();
+    static {
+        WorldState.onClientReset(() -> {
+            synchronized (mobEffectIcons) {
+                mobEffectIcons.clear();
+            }
+        });
+    }
 
     @Nullable
     private static UnitActionItem lastClientUAIActioned = null;
@@ -224,6 +234,11 @@ public static void clearPreselectedUnits() {
     public static void clearSelectedUnits() {
         selectedUnits.clear();
         NonUnitClientEvents.isMoveCheckpointGreen = true;
+        markSelectedUnitsChanged();
+    }
+    public static void removeSelectedUnits(Collection<? extends LivingEntity> units) {
+        selectedUnits.removeAll(units);
+        markSelectedUnitsChanged();
     }
 
     private static long lastLeftClickTime = 0; // to track double clicks
@@ -568,6 +583,12 @@ public static void syncWorkerUnit(int entityId, boolean isBuilding, boolean isGa
         }
     }
 
+    public static void syncVillagerExp(int entityId, int[] exp) {
+        for (LivingEntity entity : allUnits)
+            if (entity.getId() == entityId && entity instanceof VillagerUnit vUnit)
+                vUnit.syncExp(exp);
+    }
+
     public static void syncUnitResources(int entityId, Resources res) {
         for(LivingEntity entity : allUnits) {
             if (entity.getId() == entityId && MC.level != null) {
@@ -673,6 +694,9 @@ public static void onEntityLeaveEvent(EntityLeaveLevelEvent evt) {
      * Therefore, only remove entities if they leave serverside via UnitClientboundPacket.
      */
     public static void onEntityLeave(int entityId) {
+        for (LivingEntity e : allUnits)
+            if (e.getId() == entityId && e instanceof Unit u && e.isDeadOrDying())
+                SpectatorFeed.unitLost(u.getOwnerName(), SelectionPanel.displayName(e));
         selectedUnits.removeIf(e -> e.getId() == entityId);
         //System.out.println("selectedUnits removed entity: " + entityId);
         preselectedUnits.removeIf(e -> e.getId() == entityId);
@@ -1050,13 +1074,13 @@ public static void onRenderLevel(RenderLevelStageEvent evt) {
             unitsToDraw.addAll(selectedUnits);
             unitsToDraw.addAll(preselectedUnits);
 
-            var vcNoDepthTest = MC.renderBuffers().bufferSource().getBuffer(MyRenderer.LINES_NO_DEPTH_TEST);
-
-            if (evt.getStage() == AFTER_ENTITIES) {
+            if (evt.getStage() == AFTER_CUTOUT_BLOCKS) {
                 // draw outlines on all (pre)selected units but only draw once per unit based on conditions
                 // don't render preselection outlines if mousing over HUD
 
                 if (OrthoviewClientEvents.isEnabled()) {
+                    // drawn before the entities: still visible through terrain, but models cover it
+                    var vcOutline = MyRenderer.IMMEDIATE_BUFFER.getBuffer(MyRenderer.LINES_UNDER_ENTITIES);
                     // evaluate conditions that will remain constant during the rendering stage
                     boolean isMouseOverAnyButtonOrHud = HudClientEvents.isMouseOverAnyButtonOrHud();
                     boolean isLeftClickAttack = isLeftClickAttack();
@@ -1079,14 +1103,14 @@ public static void onRenderLevel(RenderLevelStageEvent evt) {
                         boolean isSelected = selectedUnits.contains(entity);
 
                         if (isPreselected && isLeftClickAttack && !targetingSelf && !isMouseOverAnyButtonOrHud)
-                            MyRenderer.drawLineBoxOutlineOnly(evt.getPoseStack(), vcNoDepthTest, entityAABB, 1.0f, 0.3f, 0.3f, 1.0f, false);
+                            MyRenderer.drawLineBoxOutlineOnly(evt.getPoseStack(), vcOutline, entityAABB, 1.0f, 0.3f, 0.3f, 1.0f, false);
                         else if (isSelected)
-                            MyRenderer.drawLineBoxOutlineOnly(evt.getPoseStack(), vcNoDepthTest, entityAABB, 1.0f, 1.0f, 1.0f, 1.0f, false);
+                            MyRenderer.drawLineBoxOutlineOnly(evt.getPoseStack(), vcOutline, entityAABB, 1.0f, 1.0f, 1.0f, 1.0f, false);
                         else if (isPreselected && !isMouseOverAnyButtonOrHud)
-                            MyRenderer.drawLineBoxOutlineOnly(evt.getPoseStack(), vcNoDepthTest, entityAABB, 1.0f, 1.0f, 1.0f, isRightClickDown ? 1.0f : 0.5f, false);
+                            MyRenderer.drawLineBoxOutlineOnly(evt.getPoseStack(), vcOutline, entityAABB, 1.0f, 1.0f, 1.0f, isRightClickDown ? 1.0f : 0.5f, false);
                     }
+                    MyRenderer.IMMEDIATE_BUFFER.endBatch(MyRenderer.LINES_UNDER_ENTITIES);
                 }
-            } else if (evt.getStage() == AFTER_CUTOUT_BLOCKS) {
                 if (MinimapClientEvents.shouldUnderline()) {
                     var selectedEntityIds = new HashSet<>();
                     for (LivingEntity selectedUnit : selectedUnits) {
@@ -1129,7 +1153,7 @@ else if (isPreselected && !isMouseOverAnyButtonOrHud)
 
                         // always-shown highlights to indicate unit relationships
                         if (OrthoviewClientEvents.isEnabled()) {
-                            MyRenderer.drawLineBoxOutlineOnly(evt.getPoseStack(), vcNoDepthTest, entityAABB, 1.0f, 1.0f, 1.0f, alpha, excludeMaxY);
+                            MyRenderer.drawLineBoxOutlineOnly(evt.getPoseStack(), vc, entityAABB, 1.0f, 1.0f, 1.0f, alpha, excludeMaxY);
                         }
 
                         MyRenderer.drawBoxBottom(evt.getPoseStack(), entityAABB, vc, r, g, b, 0.5f);
diff --git a/src/main/java/com/solegendary/reignofnether/unit/UnitServerEvents.java b/src/main/java/com/solegendary/reignofnether/unit/UnitServerEvents.java
index 02dbe3afb..dae0ddf65 100644
--- a/src/main/java/com/solegendary/reignofnether/unit/UnitServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/unit/UnitServerEvents.java
@@ -42,6 +42,7 @@
 import com.solegendary.reignofnether.util.EnchantmentUtil;
 import com.solegendary.reignofnether.util.MiscUtil;
 import com.solegendary.reignofnether.util.ParticleUtil;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Vec3i;
 import net.minecraft.core.particles.ParticleTypes;
@@ -83,7 +84,6 @@
 import net.minecraftforge.event.level.LevelEvent;
 import net.minecraftforge.event.server.ServerStartedEvent;
 import net.minecraftforge.event.server.ServerStoppingEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import org.joml.Vector3d;
@@ -108,10 +108,13 @@ public class UnitServerEvents {
     // grid A* pathfinder (with walkability caching + worker pool); when false they use vanilla
     // pathfinding and the caching/worker work is skipped. Kept in sync by GameruleServerEvents.
     public static boolean rtsPathfinding = false;
+    static {
+        WorldState.onServerReset(() -> rtsPathfinding = false);
+    }
 
     // actioned only when the associated unit is idle, one at a time
     private static final int MAX_QUEUED_ACTIONS_PER_OWNER = 4096;
-    private static final List<UnitActionItem> unitActionSlowQueue = Collections.synchronizedList(new ArrayList<>());
+    private static final List<UnitActionItem> unitActionSlowQueue = WorldState.server(Collections.synchronizedList(new ArrayList<>()));
     // actioned ASAP regardless of what the unit was doing
     private static final List<UnitActionItem> unitActionFastQueue = Collections.synchronizedList(new ArrayList<>());
 
@@ -130,7 +133,7 @@ public class UnitServerEvents {
     // unit -> formation slot. Queued so a large vanilla selection's moves dispatch time-sliced across ticks
     // instead of running N concurrent synchronous A* searches in one tick.
     private record FormationOrder(LivingEntity unit, BlockPos target) {}
-    private static final LinkedHashMap<Integer, FormationOrder> formationDispatchQueue = new LinkedHashMap<>();
+    private static final LinkedHashMap<Integer, FormationOrder> formationDispatchQueue = WorldState.server(new LinkedHashMap<>());
 
     public static void queueFormationMove(List<Pair<LivingEntity, BlockPos>> pairs) {
         synchronized (formationDispatchQueue) {
@@ -144,7 +147,7 @@ public static ArrayList<LivingEntity> getAllUnits() {
         return allUnits;
     }
 
-    public static final ArrayList<TargetResourcesSave> savedTargetResources = new ArrayList<>();
+    public static final ArrayList<TargetResourcesSave> savedTargetResources = WorldState.server(new ArrayList<>());
 
     private static boolean isServerStopping = false;
 
@@ -178,16 +181,6 @@ public static void onServerStopping(ServerStoppingEvent evt) {
     }
 
     // statics outlive the world: clear them so the next world opened in this game starts clean
-    @SubscribeEvent
-    public static void onServerStopped(ServerStoppedEvent evt) {
-        UnitChunkTickets.clear();
-        HeroServerEvents.fallenHeroes.clear();
-        savedTargetResources.clear();
-        unitActionSlowQueue.clear();
-        formationDispatchQueue.clear();
-        knockbackIgnoreIds.clear();
-        rtsPathfinding = false;
-    }
 
     @SubscribeEvent
     public static void onLevelUnload(LevelEvent.Unload evt) {
@@ -1270,7 +1263,7 @@ public static void onMobEffectApplicable(MobEffectEvent.Applicable evt) {
         }
     }
 
-    public static ArrayList<Integer> knockbackIgnoreIds = new ArrayList<>();
+    public static ArrayList<Integer> knockbackIgnoreIds = WorldState.server(new ArrayList<>());
 
     @SubscribeEvent
     public static void onLivingKnockBack(LivingKnockBackEvent evt) {
diff --git a/src/main/java/com/solegendary/reignofnether/unit/interfaces/Unit.java b/src/main/java/com/solegendary/reignofnether/unit/interfaces/Unit.java
index de8d3a529..1cfc4ea63 100644
--- a/src/main/java/com/solegendary/reignofnether/unit/interfaces/Unit.java
+++ b/src/main/java/com/solegendary/reignofnether/unit/interfaces/Unit.java
@@ -531,7 +531,8 @@ static void tick(Unit unit) {
 
     private static void checkAndPickupResources(Unit unit, List<ItemEntity> nearbyItems) {
         Mob unitMob = (Mob) unit;
-        if (unitMob.canPickUpLoot() && (!(unit instanceof UnitInventory inv) || inv.isEmpty())) {
+        // resources and unit items are carried side by side; the HUD shows both
+        if (unitMob.canPickUpLoot()) {
             for (ItemEntity itementity : nearbyItems) {
                 if (!itementity.isRemoved() && !itementity.getItem().isEmpty() && !itementity.hasPickUpDelay() && unitMob.isAlive()) {
                     if (!Unit.atMaxResources(unit)) {
diff --git a/src/main/java/com/solegendary/reignofnether/unit/packets/UnitSyncWorkerClientBoundPacket.java b/src/main/java/com/solegendary/reignofnether/unit/packets/UnitSyncWorkerClientBoundPacket.java
index e0393c91f..f5071c768 100644
--- a/src/main/java/com/solegendary/reignofnether/unit/packets/UnitSyncWorkerClientBoundPacket.java
+++ b/src/main/java/com/solegendary/reignofnether/unit/packets/UnitSyncWorkerClientBoundPacket.java
@@ -4,6 +4,7 @@
 import com.solegendary.reignofnether.resources.ResourceName;
 import com.solegendary.reignofnether.unit.UnitClientEvents;
 import com.solegendary.reignofnether.unit.interfaces.WorkerUnit;
+import com.solegendary.reignofnether.unit.units.villagers.VillagerUnit;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.entity.LivingEntity;
@@ -11,6 +12,7 @@
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.network.NetworkEvent;
 
+import javax.annotation.Nullable;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
@@ -22,6 +24,7 @@ public class UnitSyncWorkerClientBoundPacket {
     private final ResourceName gatherName; // for workers to show arms swinging and have the right tool
     private final BlockPos gatherPos;
     private final int gatherTicks;
+    @Nullable private final int[] villagerExp; // farmer, lumberjack, miner, mason, hunter; null for other workers
 
     public static void sendSyncWorkerPacket(LivingEntity entity) {
         if (entity instanceof WorkerUnit workerUnit) {
@@ -33,7 +36,8 @@ public static void sendSyncWorkerPacket(LivingEntity entity) {
                     workerUnit.getGatherResourceGoal().isGathering(),
                     workerUnit.getGatherResourceGoal().getTargetResourceName(),
                     bp == null ? new BlockPos(0,0,0) : bp,
-                    workerUnit.getGatherResourceGoal().getGatherTicksLeft())
+                    workerUnit.getGatherResourceGoal().getGatherTicksLeft(),
+                    entity instanceof VillagerUnit v ? new int[] { v.farmerExp, v.lumberjackExp, v.minerExp, v.masonExp, v.hunterExp } : null)
             );
         }
     }
@@ -45,7 +49,8 @@ public UnitSyncWorkerClientBoundPacket(
         boolean isGathering,
         ResourceName gatherName,
         BlockPos gatherPos,
-        int gatherTicks
+        int gatherTicks,
+        @Nullable int[] villagerExp
     ) {
         // filter out non-owned entities so we can't control them
         this.entityId = unitId;
@@ -54,6 +59,7 @@ public UnitSyncWorkerClientBoundPacket(
         this.gatherName = gatherName;
         this.gatherPos = gatherPos;
         this.gatherTicks = gatherTicks;
+        this.villagerExp = villagerExp;
     }
 
     public UnitSyncWorkerClientBoundPacket(FriendlyByteBuf buffer) {
@@ -63,6 +69,14 @@ public UnitSyncWorkerClientBoundPacket(FriendlyByteBuf buffer) {
         this.gatherName = buffer.readEnum(ResourceName.class);
         this.gatherPos = buffer.readBlockPos();
         this.gatherTicks = buffer.readInt();
+        // appended last and optional, so jars from before this field still read each other's packets
+        if (buffer.readableBytes() >= 5 * 4) {
+            this.villagerExp = new int[5];
+            for (int i = 0; i < 5; i++)
+                this.villagerExp[i] = buffer.readInt();
+        } else {
+            this.villagerExp = null;
+        }
     }
 
     public void encode(FriendlyByteBuf buffer) {
@@ -72,6 +86,9 @@ public void encode(FriendlyByteBuf buffer) {
         buffer.writeEnum(this.gatherName);
         buffer.writeBlockPos(this.gatherPos);
         buffer.writeInt(this.gatherTicks);
+        if (this.villagerExp != null)
+            for (int exp : this.villagerExp)
+                buffer.writeInt(exp);
     }
 
     // client-side packet-consuming functions
@@ -88,6 +105,8 @@ public boolean handle(Supplier<NetworkEvent.Context> ctx) {
                         this.gatherName,
                         this.gatherPos.equals(new BlockPos(0,0,0)) ? null : this.gatherPos,
                         this.gatherTicks);
+                    if (this.villagerExp != null)
+                        UnitClientEvents.syncVillagerExp(this.entityId, this.villagerExp);
                 });
         });
         ctx.get().setPacketHandled(true);
diff --git a/src/main/java/com/solegendary/reignofnether/unit/targeting/EntityTargetIndex.java b/src/main/java/com/solegendary/reignofnether/unit/targeting/EntityTargetIndex.java
index e7757bb1c..25c4ae526 100644
--- a/src/main/java/com/solegendary/reignofnether/unit/targeting/EntityTargetIndex.java
+++ b/src/main/java/com/solegendary/reignofnether/unit/targeting/EntityTargetIndex.java
@@ -8,6 +8,7 @@
 import com.solegendary.reignofnether.unit.Relationship;
 import com.solegendary.reignofnether.unit.interfaces.Unit;
 import com.solegendary.reignofnether.unit.units.monsters.PhantomSummon;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
@@ -21,7 +22,6 @@
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.event.level.LevelEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
@@ -33,6 +33,12 @@
 @Mod.EventBusSubscriber(modid = ReignOfNether.MOD_ID)
 public final class EntityTargetIndex {
     private static final Map<ServerLevel, EntityTargetIndex> LEVELS = new IdentityHashMap<>();
+    static {
+        WorldState.onServerReset(() -> {
+            for (EntityTargetIndex index : LEVELS.values()) index.clear();
+            LEVELS.clear();
+        });
+    }
     private final Map<Entity, Entry> entities = new IdentityHashMap<>();
     private final Map<TargetGroup, DynamicTargetTree<Entry>> trees = new HashMap<>();
     private final ServerLevel level;
@@ -120,11 +126,6 @@ public static void onLevelUnload(LevelEvent.Unload event) {
         }
     }
 
-    @SubscribeEvent
-    public static void onServerStop(ServerStoppedEvent event) {
-        for (EntityTargetIndex index : LEVELS.values()) index.clear();
-        LEVELS.clear();
-    }
 
     private void clear() {
         entities.clear();
diff --git a/src/main/java/com/solegendary/reignofnether/unit/units/villagers/VillagerUnit.java b/src/main/java/com/solegendary/reignofnether/unit/units/villagers/VillagerUnit.java
index 0b5924185..c257a5af3 100644
--- a/src/main/java/com/solegendary/reignofnether/unit/units/villagers/VillagerUnit.java
+++ b/src/main/java/com/solegendary/reignofnether/unit/units/villagers/VillagerUnit.java
@@ -312,6 +312,38 @@ else if (hunterExp >= HUNTER_EXP_REQ && !isVeteran && getUnitProfession() == HUN
             makeVeteran();
     }
 
+    // experience in a profession; half of the requirement teaches it, all of it makes a veteran
+    public int getExp(VillagerUnitProfession p) {
+        return switch (p) {
+            case FARMER -> farmerExp;
+            case LUMBERJACK -> lumberjackExp;
+            case MINER -> minerExp;
+            case MASON -> masonExp;
+            case HUNTER -> hunterExp;
+            default -> 0;
+        };
+    }
+
+    public static int getExpReq(VillagerUnitProfession p) {
+        return switch (p) {
+            case FARMER -> FARMER_EXP_REQ;
+            case LUMBERJACK -> LUMBERJACK_EXP_REQ;
+            case MINER -> MINER_EXP_REQ;
+            case MASON -> MASON_EXP_REQ;
+            case HUNTER -> HUNTER_EXP_REQ;
+            default -> 1;
+        };
+    }
+
+    // clientside, from the worker sync packet
+    public void syncExp(int[] exp) {
+        farmerExp = exp[0];
+        lumberjackExp = exp[1];
+        minerExp = exp[2];
+        masonExp = exp[3];
+        hunterExp = exp[4];
+    }
+
     public Item chestplate = Items.AIR;
     public boolean chestplateEnchanted = false;
     public boolean swordEnchanted = false;
diff --git a/src/main/java/com/solegendary/reignofnether/util/MiscUtil.java b/src/main/java/com/solegendary/reignofnether/util/MiscUtil.java
index 4e481433b..76e38d2a7 100644
--- a/src/main/java/com/solegendary/reignofnether/util/MiscUtil.java
+++ b/src/main/java/com/solegendary/reignofnether/util/MiscUtil.java
@@ -817,6 +817,17 @@ public static String getEntityIconName(Entity entity) {
                 .toLowerCase();
     }
 
+    private static final Map<String, ResourceLocation> MOB_HEAD_ICONS = new java.util.concurrent.ConcurrentHashMap<>();
+
+    // eg. zombie -> reignofnether:textures/mobheads/zombie.png, cached since the HUD asks every frame
+    public static ResourceLocation mobHeadIcon(String iconName) {
+        return MOB_HEAD_ICONS.computeIfAbsent(iconName, n -> ResourceLocation.fromNamespaceAndPath(ReignOfNether.MOD_ID, "textures/mobheads/" + n + ".png"));
+    }
+
+    public static ResourceLocation mobHeadIcon(Entity entity) {
+        return mobHeadIcon(getEntityIconName(entity));
+    }
+
     // eg. Zombie
     public static String getSimpleEntityName(Entity entity) {
         if (entity instanceof PhantomSummon)
diff --git a/src/main/java/com/solegendary/reignofnether/util/MyRenderer.java b/src/main/java/com/solegendary/reignofnether/util/MyRenderer.java
index b9843966a..b6476caee 100644
--- a/src/main/java/com/solegendary/reignofnether/util/MyRenderer.java
+++ b/src/main/java/com/solegendary/reignofnether/util/MyRenderer.java
@@ -2,13 +2,13 @@
 
 import com.mojang.blaze3d.platform.Lighting;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.math.Axis;
 import com.solegendary.reignofnether.ReignOfNether;
-import com.solegendary.reignofnether.hud.RectZone;
 import com.solegendary.reignofnether.items.UnitItem;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import net.minecraft.CrashReport;
@@ -21,6 +21,7 @@
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.LightTexture;
+import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderStateShard;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.ItemRenderer;
@@ -49,7 +50,6 @@
 import org.joml.Matrix4f;
 
 import javax.annotation.Nullable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.OptionalDouble;
 import java.util.regex.Matcher;
@@ -61,6 +61,9 @@ public class MyRenderer {
 
     private static final Minecraft MC = Minecraft.getInstance();
 
+    // draws on endBatch even with Oculus/Iris, whose level bufferSource() defers everything until after the entities
+    public static final MultiBufferSource.BufferSource IMMEDIATE_BUFFER = MultiBufferSource.immediate(new BufferBuilder(256));
+
     public static final RenderType LINES_NO_DEPTH_TEST = RenderType.create(
             "lines", DefaultVertexFormat.POSITION_COLOR_NORMAL, VertexFormat.Mode.LINES, 256, false, false,
             RenderType.CompositeState.builder().setShaderState(RENDERTYPE_LINES_SHADER)
@@ -88,6 +91,18 @@ public class MyRenderer {
                     .createCompositeState(false)
     );
 
+    // hidden by terrain, and occluded by entities too since it writes no depth for them to fail against
+    public static final RenderType LINES_DEPTH_TESTED_UNDER_ENTITIES = RenderType.create(
+            ReignOfNether.MOD_ID + ":lines_depth_tested_under_entities",
+            DefaultVertexFormat.POSITION_COLOR_NORMAL, VertexFormat.Mode.LINES, 256, false, false,
+            RenderType.CompositeState.builder().setShaderState(RENDERTYPE_LINES_SHADER)
+                    .setLineState(new RenderStateShard.LineStateShard(OptionalDouble.empty()))
+                    .setLayeringState(VIEW_OFFSET_Z_LAYERING)
+                    .setTransparencyState(TRANSLUCENT_TRANSPARENCY)
+                    .setWriteMaskState(COLOR_WRITE)
+                    .setCullState(NO_CULL)
+                    .createCompositeState(false)
+    );
 
     public static final ResourceLocation WHITE_TEXTURE = ResourceLocation.parse("forge:textures/white.png");
 
@@ -484,8 +499,8 @@ public static void drawLine(
         matrixStack.popPose();
     }
 
-    // render a HUD frame and return the RectZone that it represents
-    public static RectZone renderFrameWithBg(GuiGraphics guiGraphics, int x, int y, int width, int height, int bgCol) {
+    // render a HUD frame
+    public static void renderFrameWithBg(GuiGraphics guiGraphics, int x, int y, int width, int height, int bgCol) {
         // draw icon frame with dark transparent bg
         guiGraphics.fill(// x1,y1, x2,y2,
                 x + 2, y + 2,
@@ -529,26 +544,6 @@ public static RectZone renderFrameWithBg(GuiGraphics guiGraphics, int x, int y,
                 width - thickness * 2, thickness, // dimensions of blit texture
                 width, thickness // size of texture itself (if < dimensions, texture is repeated)
         );
-        return RectZone.getZoneByLW(x, y, width, height);
-    }
-
-    public static RectZone renderIconFrameWithBg(GuiGraphics guiGraphics, ResourceLocation frameRl, int x, int y, int size, int bg) {
-        //transparent background
-        guiGraphics.fill(// x1,y1, x2,y2,
-                x, y,
-                x + size,
-                y + size,
-                bg); //ARGB(hex); note that alpha ranges between ~0-16, not 0-255
-
-        // icon frame
-        RenderSystem.setShaderTexture(0, frameRl);
-        guiGraphics.blit(frameRl,
-                x, y, 0,
-                0, 0, // where on texture to start drawing from
-                size, size, // dimensions of blit texture
-                size, size // size of texture itself (if < dimensions, texture is repeated)
-        );
-        return RectZone.getZoneByLW(x, y, size, size);
     }
 
     public static void renderIcon(GuiGraphics guiGraphics, ResourceLocation resourceLocation, int x, int y, int size) {
@@ -561,49 +556,40 @@ public static void renderIcon(GuiGraphics guiGraphics, ResourceLocation resource
         );
     }
 
+    /** Legacy tooltip lines, drawn now in the HUD's tooltip style next to the cursor (GUI coordinates). */
     public static void renderTooltip(GuiGraphics guiGraphics, List<FormattedCharSequence> tooltipLines, int mouseX, int mouseY) {
-        if (MC.screen != null && tooltipLines != null && tooltipLines.size() > 0) {
-            if (mouseY < MC.screen.height / 2)
-                mouseY += (tooltipLines.size() * 10);
+        if (tooltipLines != null && tooltipLines.size() > 0)
+            renderTooltip(guiGraphics, com.solegendary.reignofnether.ui.Tooltip.fromLines(tooltipLines), mouseX, mouseY);
+    }
+
+    public static void renderTooltip(GuiGraphics guiGraphics, com.solegendary.reignofnether.ui.Tooltip tooltip, int mouseX, int mouseY) {
+        if (MC.screen != null) {
+            var scale = com.solegendary.reignofnether.hud.layout.HudGeometry.scale();
+            float k = scale.poseScale();
+            guiGraphics.pose().pushPose();
             guiGraphics.pose().translate(0, 0, 3000);
-            guiGraphics.renderTooltip(MC.font, tooltipLines, mouseX, mouseY - (9 * (tooltipLines.size() - 1)));
-            guiGraphics.pose().translate(0, 0, -3000);
+            guiGraphics.pose().scale(k, k, 1);
+            tooltip.render(guiGraphics, scale.toUnits(mouseX), scale.toUnits(mouseY), 12, 12, scale.width(), scale.height());
+            guiGraphics.pose().popPose();
         }
     }
 
     public static void renderItemEntityTooltip(GuiGraphics guiGraphics, UnitItem unitItem, ItemStack itemStack, int mouseX, int mouseY) {
         if (unitItem == null || MC.screen == null || !unitItem.enableTooltip)
             return;
-
-        final int iconSize = 16;
-        int spaceWidth = MC.font.width(" ");
-        int paddingChars = iconSize / Math.max(spaceWidth, 1);
-        String pad = " ".repeat(paddingChars);
-        String qty = itemStack.getCount() > 1 ? " (" + itemStack.getCount() + ")" : "";
-        MutableComponent name = unitItem.iconRl != null ?
-                Component.literal(pad + unitItem.getName().getString() + qty) :
-                Component.literal(unitItem.getName().getString() + qty);
-
-        List<FormattedCharSequence> lore = unitItem.getEntityTooltip(itemStack);
-
-        List<FormattedCharSequence> lines = new ArrayList<>();
-        lines.add(name.getVisualOrderText());
-        if (lore != null)
-            lines.addAll(lore);
-
-        if (mouseY < MC.screen.height / 2)
-            mouseY += (lines.size() * 10);
-
-        int textY = mouseY - (9 * (lines.size() - 1));
-
-        guiGraphics.pose().pushPose();
-        guiGraphics.pose().translate(0, 0, 3000);
-        if (unitItem.iconRl != null)
-            guiGraphics.blit(unitItem.iconRl, mouseX + 19, textY - 15, 0, 0, iconSize-2, iconSize-2, iconSize-2, iconSize-2);
-        guiGraphics.pose().translate(0, 0, -1500);
-        guiGraphics.renderTooltip(MC.font, lines, mouseX + 8, textY);
-        guiGraphics.pose().translate(0, 0, -1500);
-        guiGraphics.pose().popPose();
+        String name = unitItem.getName().getString();
+        if (itemStack.getCount() > 1)
+            name += " (" + itemStack.getCount() + ")";
+        var rarity = unitItem.rarity.getStyleModifier().apply(Style.EMPTY).getColor();
+        var t = com.solegendary.reignofnether.ui.Tooltip.of(name)
+                .titleColour(rarity != null ? 0xFF000000 | rarity.getValue() : com.solegendary.reignofnether.ui.Theme.TEXT)
+                .tag("Item", com.solegendary.reignofnether.ui.Theme.ORANGE);
+        String desc = unitItem.getDescription();
+        if (!desc.isBlank())
+            t.body(desc);
+        for (FormattedCharSequence line : unitItem.getEntityTooltip(itemStack))
+            t.body(line);
+        renderTooltip(guiGraphics, t, mouseX, mouseY);
     }
 
     public static void renderItemInFrontOfEntityFace(PoseStack poseStack, LivingEntity entity, float partialTicks, ItemStack itemStack) {
@@ -707,15 +693,6 @@ public static void drawScaledString(GuiGraphics guiGraphics, Font font, String t
         poseStack.popPose();
     }
 
-    public static void drawScaledCenteredString(GuiGraphics guiGraphics, Font font, String text, int x, int y, int color, float scale) {
-        PoseStack poseStack = guiGraphics.pose();
-        poseStack.pushPose();
-        poseStack.translate(x, y, 0);
-        poseStack.scale(scale, scale, 1.0f);
-        guiGraphics.drawCenteredString(font, text, 0, 0, color);
-        poseStack.popPose();
-    }
-
     public static void renderPlayerHead(GuiGraphics g, String playerName, int x, int y, int iconSize, ResourceLocation fallbackRl) {
         if (playerName == null || playerName.isBlank() && fallbackRl != null) {
             MyRenderer.renderIcon(g, fallbackRl, x, y, iconSize);
diff --git a/src/main/java/com/solegendary/reignofnether/util/WorldState.java b/src/main/java/com/solegendary/reignofnether/util/WorldState.java
new file mode 100644
index 000000000..8d37a96ca
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/util/WorldState.java
@@ -0,0 +1,61 @@
+package com.solegendary.reignofnether.util;
+
+import net.minecraftforge.event.server.ServerStoppedEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+// Statics that belong to one world. Every world opened in a game launch shares the same statics, so wrap a world's
+// collections here where they're declared (and register a reset next to any other field) and they clear when that
+// world closes: client side on logout (PlayerClientEvents.resetAll), server side on ServerStoppedEvent.
+// Client and server are kept apart because singleplayer runs both in one JVM.
+public final class WorldState {
+    private static final List<Runnable> CLIENT = new CopyOnWriteArrayList<>();
+    private static final List<Runnable> SERVER = new CopyOnWriteArrayList<>();
+
+    private WorldState() { }
+
+    public static <T extends Collection<?>> T client(T c) {
+        CLIENT.add(c::clear);
+        return c;
+    }
+
+    public static <T extends Map<?, ?>> T client(T m) {
+        CLIENT.add(m::clear);
+        return m;
+    }
+
+    public static void onClientReset(Runnable reset) {
+        CLIENT.add(reset);
+    }
+
+    public static <T extends Collection<?>> T server(T c) {
+        SERVER.add(c::clear);
+        return c;
+    }
+
+    public static <T extends Map<?, ?>> T server(T m) {
+        SERVER.add(m::clear);
+        return m;
+    }
+
+    public static void onServerReset(Runnable reset) {
+        SERVER.add(reset);
+    }
+
+    public static void resetClient() {
+        CLIENT.forEach(Runnable::run);
+    }
+
+    public static void resetServer() {
+        SERVER.forEach(Runnable::run);
+    }
+
+    @SubscribeEvent
+    public static void onServerStopped(ServerStoppedEvent evt) {
+        resetServer();
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/util/WorldToScreen.java b/src/main/java/com/solegendary/reignofnether/util/WorldToScreen.java
new file mode 100644
index 000000000..2129d2f07
--- /dev/null
+++ b/src/main/java/com/solegendary/reignofnether/util/WorldToScreen.java
@@ -0,0 +1,42 @@
+package com.solegendary.reignofnether.util;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.client.event.RenderLevelStageEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import org.joml.Matrix4f;
+import org.joml.Vector4f;
+
+import javax.annotation.Nullable;
+
+// projects world positions onto the GUI, using the matrices of the last rendered frame
+public class WorldToScreen {
+
+    private static final Minecraft MC = Minecraft.getInstance();
+    private static final Matrix4f projection = new Matrix4f();
+    private static final Matrix4f view = new Matrix4f();
+    private static Vec3 camera = Vec3.ZERO;
+
+    @SubscribeEvent
+    public static void onRenderLevel(RenderLevelStageEvent evt) {
+        if (evt.getStage() != RenderLevelStageEvent.Stage.AFTER_TRANSLUCENT_BLOCKS)
+            return;
+        projection.set(evt.getProjectionMatrix());
+        view.set(evt.getPoseStack().last().pose());
+        camera = evt.getCamera().getPosition();
+    }
+
+    // GUI-scaled screen position, or null when behind the camera
+    @Nullable
+    public static Vec2 project(Vec3 world) {
+        Vector4f v = new Vector4f((float) (world.x - camera.x), (float) (world.y - camera.y), (float) (world.z - camera.z), 1);
+        view.transform(v);
+        projection.transform(v);
+        if (v.w <= 0.01f)
+            return null;
+        float x = (v.x / v.w * 0.5f + 0.5f) * MC.getWindow().getGuiScaledWidth();
+        float y = (1 - (v.y / v.w * 0.5f + 0.5f)) * MC.getWindow().getGuiScaledHeight();
+        return new Vec2(x, y);
+    }
+}
diff --git a/src/main/java/com/solegendary/reignofnether/worldborder/WorldBorderServerEvents.java b/src/main/java/com/solegendary/reignofnether/worldborder/WorldBorderServerEvents.java
index e285ce0e8..cb58efa6a 100644
--- a/src/main/java/com/solegendary/reignofnether/worldborder/WorldBorderServerEvents.java
+++ b/src/main/java/com/solegendary/reignofnether/worldborder/WorldBorderServerEvents.java
@@ -1,6 +1,9 @@
 package com.solegendary.reignofnether.worldborder;
 
 import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.fogofwar.FogChunkSnapshot;
+import com.solegendary.reignofnether.loading.LoadProgress;
+import com.solegendary.reignofnether.minimap.MapColourServerEvents;
 import com.solegendary.reignofnether.gamerules.GameruleClientboundPacket;
 import com.solegendary.reignofnether.registrars.GameRuleRegistrar;
 import com.solegendary.reignofnether.unit.UnitServerEvents;
@@ -8,13 +11,16 @@
 import com.solegendary.reignofnether.unit.pathfinding.WalkabilityGrid;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.GameType;
+import net.minecraftforge.event.entity.player.PlayerEvent;
+import com.solegendary.reignofnether.util.WorldState;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.border.WorldBorder;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraftforge.event.server.ServerStartedEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 public class WorldBorderServerEvents {
@@ -27,6 +33,9 @@ public class WorldBorderServerEvents {
     public static final int RTS_OPTIMIZED_BORDER = 1280;
 
     public static boolean prewarmedNavmesh = false;
+    static {
+        WorldState.onServerReset(() -> prewarmedNavmesh = false);
+    }
 
     // A small world border is the signal that a map was purpose-built for RoN RTS. Fog of war and the
     // improved pathfinding/navmesh precompute both key off this: the whole play area is bounded, so it
@@ -35,12 +44,18 @@ public static boolean isRtsOptimisedMap(ServerLevel level) {
         return level != null && level.getWorldBorder().getSize() <= RTS_OPTIMIZED_BORDER;
     }
 
-    // statics outlive the world: clear them so the next world opened in this game starts clean
+    // an RTS map is played from the RTS view, which needs spectator; the loading screen then turns that view on
     @SubscribeEvent
-    public static void onServerStopped(ServerStoppedEvent evt) {
-        prewarmedNavmesh = false;
+    public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent evt) {
+        if (!(evt.getEntity() instanceof ServerPlayer sp) || !isRtsOptimisedMap(sp.serverLevel()))
+            return;
+        GameType mode = sp.gameMode.getGameModeForPlayer();
+        if (mode == GameType.SURVIVAL || mode == GameType.ADVENTURE)
+            sp.setGameMode(GameType.SPECTATOR);
     }
 
+    // statics outlive the world: clear them so the next world opened in this game starts clean
+
     @SubscribeEvent
     public static void onServerStarted(ServerStartedEvent evt) {
         MinecraftServer server = evt.getServer();
@@ -67,6 +82,8 @@ public static void onServerStarted(ServerStartedEvent evt) {
         // Elevate the per-tick warm budget across the prewarm load window, restoring the configured value
         // after. (The synchronous prewarm loop below bypasses this budget; this only affects any runtime
         // warming that occurs during loading.)
+        // the map first: it loads every chunk in the border, which the navmesh and fog snapshot then reuse
+        MapColourServerEvents.build(level);
         int configuredBudget = PathfinderConfig.maxChunkBuildsPerTick;
         PathfinderConfig.maxChunkBuildsPerTick = PathfinderConfig.CHUNK_BUILDS_PER_TICK_PREWARM;
         try {
@@ -74,6 +91,12 @@ public static void onServerStarted(ServerStartedEvent evt) {
         } finally {
             PathfinderConfig.maxChunkBuildsPerTick = configuredBudget;
         }
+        // taken here rather than at the first RTS join, so it's part of loading; a snapshot left on disk by a match
+        // still in progress is kept, as FogOfWarServerEvents does
+        FogChunkSnapshot.rebuildIndex(level);
+        if (!FogChunkSnapshot.hasAny())
+            FogChunkSnapshot.captureFogChunks(level);
+        LoadProgress.finished = true;
     }
 
     // Force-load and classify every chunk inside the world border so the navmesh is fully warm before play.
@@ -91,6 +114,7 @@ private static void prewarmNavmesh(ServerLevel level, WorldBorder border) {
         ReignOfNether.LOGGER.info("Prewarming RTS navmesh: {} chunks within world border ({}..{}, {}..{})...",
                 total, cxMin, cxMax, czMin, czMax);
 
+        LoadProgress.begin(LoadProgress.Step.NAVMESH, total);
         long startMs = System.currentTimeMillis();
         int done = 0;
         int nextProgress = 10; // log at ~every 10%
@@ -107,6 +131,7 @@ private static void prewarmNavmesh(ServerLevel level, WorldBorder border) {
                     ReignOfNether.LOGGER.error("Navmesh prewarm failed for chunk ({}, {})", cx, cz, t);
                 }
                 done++;
+                LoadProgress.done = done;
                 int pct = (int) (100L * done / total);
                 if (pct >= nextProgress) {
                     ReignOfNether.LOGGER.info("Prewarming RTS navmesh: {}% ({}/{} chunks)", pct, done, total);
diff --git a/src/main/resources/assets/minecraft/textures/gui/title/discord.png b/src/main/resources/assets/minecraft/textures/gui/title/discord.png
deleted file mode 100644
index c1efa001e..000000000
Binary files a/src/main/resources/assets/minecraft/textures/gui/title/discord.png and /dev/null differ
diff --git a/src/main/resources/assets/reignofnether/font/big.json b/src/main/resources/assets/reignofnether/font/big.json
new file mode 100644
index 000000000..0c1f78e1c
--- /dev/null
+++ b/src/main/resources/assets/reignofnether/font/big.json
@@ -0,0 +1,35 @@
+{
+  "providers": [
+    {
+      "type": "space",
+      "advances": {
+        " ": 4,
+        "\u00a0": 4
+      }
+    },
+    {
+      "type": "bitmap",
+      "file": "reignofnether:font/pixelify.png",
+      "height": 12,
+      "ascent": 9,
+      "chars": [
+        "!\"#$%&'()*+,-./0",
+        "123456789:;<=>?@",
+        "ABCDEFGHIJKLMNOP",
+        "QRSTUVWXYZ[\\]^_`",
+        "abcdefghijklmnop",
+        "qrstuvwxyz{|}~¡¢",
+        "£¤¥§¨©ª«¬®¯°±²³´",
+        "µ¶·¸¹º»¼½¾¿ÀÁÂÃÄ",
+        "ÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔ",
+        "ÕÖ×ØÙÚÛÜÝÞßàáâãä",
+        "åæçèéêëìíîïðñòóô",
+        "õö÷øùúûüýþÿ…\u0000\u0000\u0000\u0000"
+      ]
+    },
+    {
+      "type": "reference",
+      "id": "minecraft:default"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/reignofnether/font/pixelify_sans_OFL.txt b/src/main/resources/assets/reignofnether/font/pixelify_sans_OFL.txt
new file mode 100644
index 000000000..6aa5bfbae
--- /dev/null
+++ b/src/main/resources/assets/reignofnether/font/pixelify_sans_OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2021 The Pixelify Sans Project Authors (https://github.com/eifetx/Pixelify-Sans)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/main/resources/assets/reignofnether/font/silkscreen_OFL.txt b/src/main/resources/assets/reignofnether/font/silkscreen_OFL.txt
new file mode 100644
index 000000000..3dd7cfb72
--- /dev/null
+++ b/src/main/resources/assets/reignofnether/font/silkscreen_OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2001 The Silkscreen Project Authors (https://github.com/googlefonts/silkscreen)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/main/resources/assets/reignofnether/font/small.json b/src/main/resources/assets/reignofnether/font/small.json
new file mode 100644
index 000000000..3edf1b356
--- /dev/null
+++ b/src/main/resources/assets/reignofnether/font/small.json
@@ -0,0 +1,35 @@
+{
+  "providers": [
+    {
+      "type": "space",
+      "advances": {
+        " ": 4,
+        "\u00a0": 4
+      }
+    },
+    {
+      "type": "bitmap",
+      "file": "reignofnether:font/silkscreen.png",
+      "height": 8,
+      "ascent": 7,
+      "chars": [
+        "!\"#$%&'()*+,-./0",
+        "123456789:;<=>?@",
+        "ABCDEFGHIJKLMNOP",
+        "QRSTUVWXYZ[\\]^_`",
+        "abcdefghijklmnop",
+        "qrstuvwxyz{|}~¡¢",
+        "£¤¥¦§¨©ª«¬®¯°±²³",
+        "´µ¶·¸¹º»¼½¾¿ÀÁÂÃ",
+        "ÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓ",
+        "ÔÕÖ×ØÙÚÛÜÝÞßàáâã",
+        "äåæçèéêëìíîïðñòó",
+        "ôõö÷øùúûüýþÿ…\u0000\u0000\u0000"
+      ]
+    },
+    {
+      "type": "reference",
+      "id": "minecraft:default"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/reignofnether/lang/da_dk.json b/src/main/resources/assets/reignofnether/lang/da_dk.json
index fc7426a87..c4cf6b96d 100644
--- a/src/main/resources/assets/reignofnether/lang/da_dk.json
+++ b/src/main/resources/assets/reignofnether/lang/da_dk.json
@@ -329,8 +329,6 @@
   "hud.helperbuttons.reignofnether.select_all_military_units": "Vælg alle militære enheder",
   "hud.helperbuttons.reignofnether.cancel": "Annuller",
 
-  "hud.map.reignofnether.open": "Åbn stort kort",
-  "hud.map.reignofnether.close": "Luk",
 
   "hud.startbuttons.villagers.reignofnether.first": "Deltag i spillet som Villager Fraktionen.",
   "hud.startbuttons.villagers.reignofnether.second": "Spawnt %d villagers på målområdet.",
@@ -346,9 +344,7 @@
   "hud.reignofnether.drop_off_resources": "Aflæg ressourcer",
   "hud.reignofnether.gather_resources": "Indsaml ressourcer (%s)",
   "hud.reignofnether.change_target_resource": "Klik for at ændre målressource",
-  "hud.reignofnether.total_workers": "Samlet Arbejdere: %d",
   "hud.reignofnether.workers_on": "Arbejdere på %s",
-  "hud.reignofnether.max_resources": "%s (Max: %d)",
   "hud.reignofnether.players_resources": "%s's ressourcer",
   "hud.reignofnether.you_are_spectator": "Du er tilskuer",
   "hud.reignofnether.placed_capitol": "%s har placeret deres hovedbygning!",
@@ -488,21 +484,10 @@
   "time.reignofnether.night_circle_mode_off": "Fra",
 
   "tutorial.reignofnether.tutorial_help": "Tutorial Hjælp",
-  "tutorial.reignofnether.welcome": "Velkommen til Reign of Nether",
   "tutorial.reignofnether.welcome2": "Velkommen til Reign of Nether Tutorial!",
   "tutorial.reignofnether.get_started": "Tryk på F12 for at komme i gang.",
-  "tutorial.reignofnether.join": "Tryk på F12 for at skifte til RTS-kamera og deltage i spillet",
-  "tutorial.reignofnether.help": "Brug '/rts-help' for at se listen over alle kommandoer",
-  "tutorial.reignofnether.controls": "Brug '/rts-controls' for at se listen over kontroller",
-  "tutorial.reignofnether.locked": "Denne RTS-kamp er låst. Vent på et nyt spil før du deltager.",
-  "tutorial.reignofnether.welcome_back": "Velkommen tilbage til Reign of Nether",
-  "tutorial.reignofnether.op_commands": "Som server op kan du bruge:",
-  "tutorial.reignofnether.fog": "/rts-fog aktiver | deaktiver",
-  "tutorial.reignofnether.lock": "/rts-lock aktiver | deaktiver",
   "tutorial.reignofnether.syncing": "/rts-syncing aktiver | deaktiver (eksperimentelt)",
   "tutorial.reignofnether.reset": "/rts-reset",
-  "tutorial.reignofnether.sync_disabled1": "RTS-synkronisering er blevet deaktiveret, så du kan ikke vælge bygninger eller se enhedsejere, undskyld!",
-  "tutorial.reignofnether.sync_disabled2": "For at løse dette, bed venligst værten om at genaktivere det og relog.",
   "tutorial.reignofnether.server_not_found": "Kunne ikke indlæse tutorial, serveren kunne ikke findes.",
   "tutorial.reignofnether.resuming": "Velkommen tilbage... fortsætter på trin: %s",
   "tutorial.reignofnether.skipping": "Springer tutorialtrin over... du er nu på: %s",
diff --git a/src/main/resources/assets/reignofnether/lang/en_us.json b/src/main/resources/assets/reignofnether/lang/en_us.json
index d99820f19..64f96e26d 100644
--- a/src/main/resources/assets/reignofnether/lang/en_us.json
+++ b/src/main/resources/assets/reignofnether/lang/en_us.json
@@ -61,13 +61,13 @@
 
     "item.reignofnether.totem_of_undying": "Totem of Undying",
     "item.reignofnether.throwable_tnt": "Throwable TNT",
-    "item.reignofnether.throwable_tnt.desc": "KABOOM, baby!",
+    "item.reignofnether.throwable_tnt.desc": "§oKABOOM, baby!",
     "item.reignofnether.throwable_tnt.point1": "Throws a TNT with a delayed fuse at the target location",
     "item.reignofnether.thrown_hero_experience_bottle": "Bottle O'Hero Experience",
-    "item.reignofnether.hero_experience_bottle.desc": "Filled to the brim with pure knowledge",
+    "item.reignofnether.hero_experience_bottle.desc": "§oFilled to the brim with pure knowledge",
     "item.reignofnether.hero_experience_bottle.point1": "Grants %s experience",
     "item.reignofnether.hero_experience_bottle.error": "Already max level!",
-    "item.reignofnether.totem_of_undying.desc": "A mystical totem that protects its bearer from death",
+    "item.reignofnether.totem_of_undying.desc": "§oA mystical totem that protects its bearer from death",
     "item.reignofnether.totem_of_undying.point1": "Restores 50%% of life and grants %ss of invincibility on death",
     "item.reignofnether.merchant_trident": "Netherite Trident",
     "item.reignofnether.merchant_sword": "Netherite Sword",
@@ -82,124 +82,124 @@
     "item.reignofnether.edible_food_item_absorb.error1": "Already full health!",
     "item.reignofnether.edible_food_item_absorb.error2": "You already have absorption!",
     "item.reignofnether.staff_of_lightning": "Staff of Lightning",
-    "item.reignofnether.staff_of_lightning.desc": "Harness the power of a storming sky",
+    "item.reignofnether.staff_of_lightning.desc": "§oHarness the power of a storming sky",
     "item.reignofnether.staff_of_lightning.point1": "Calls down lightning at the target location",
     "item.reignofnether.heart_medallion": "Heart Medallion",
-    "item.reignofnether.heart_medallion.desc": "A lovely trinket that strengthens the hearts of heroes",
+    "item.reignofnether.heart_medallion.desc": "§oA lovely trinket that strengthens the hearts of heroes",
     "item.reignofnether.azure_medallion": "Azure Medallion",
-    "item.reignofnether.azure_medallion.desc": "An arcane trinket that fuels spellcasting",
+    "item.reignofnether.azure_medallion.desc": "§oAn arcane trinket that fuels spellcasting",
     "item.reignofnether.soul_collector": "Soul Collector",
-    "item.reignofnether.soul_collector.desc": "A ghastly lantern to gather souls",
+    "item.reignofnether.soul_collector.desc": "§oA ghastly lantern to gather souls",
     "item.reignofnether.soul_collector.point1": "Restores mana as nearby enemies die",
     "item.reignofnether.broadsword": "Broadsword",
-    "item.reignofnether.broadsword.desc": "A finely forged blade fit for a hero",
+    "item.reignofnether.broadsword.desc": "§oA finely forged blade fit for a hero",
     "item.reignofnether.katana": "Katana",
-    "item.reignofnether.katana.desc": "A masterfully crafted blade fit for a hero",
+    "item.reignofnether.katana.desc": "§oA masterfully crafted blade fit for a hero",
     "item.reignofnether.heartstealer": "Heartstealer",
-    "item.reignofnether.heartstealer.desc": "A cursed blade that thirsts for blood",
+    "item.reignofnether.heartstealer.desc": "§oA cursed blade that thirsts for blood",
     "item.reignofnether.ritual_dagger": "Ritual Dagger",
     "item.reignofnether.ritual_dagger.desc": "Channels the blood of your enemies into mana",
     "item.reignofnether.powershaker": "Powershaker",
-    "item.reignofnether.powershaker.desc": "Swing it for a smashing good time",
+    "item.reignofnether.powershaker.desc": "§oSwing it for a smashing good time",
     "item.reignofnether.great_hammer": "Great Hammer",
-    "item.reignofnether.great_hammer.desc": "Foundations quake before its might",
+    "item.reignofnether.great_hammer.desc": "§oFoundations quake before its might",
     "item.reignofnether.great_hammer.point1": "(+100%% for summons & abilities)",
     "item.reignofnether.boots_of_swiftness": "Boots of Swiftness",
-    "item.reignofnether.boots_of_swiftness.desc": "A blessing for slow weary feet",
+    "item.reignofnether.boots_of_swiftness.desc": "§oA blessing for slow weary feet",
     "item.reignofnether.boots_of_swiftness.point1": "(Does not stack)",
     "item.reignofnether.sparkler": "Sparkler",
-    "item.reignofnether.sparkler.desc": "The quicker the swing, the brighter the spark",
+    "item.reignofnether.sparkler.desc": "§oThe quicker the swing, the brighter the spark",
     "item.reignofnether.iron_hide_amulet": "Iron Hide Amulet",
-    "item.reignofnether.iron_hide_amulet.desc": "Hardens your hide to make you harder to hurt",
+    "item.reignofnether.iron_hide_amulet.desc": "§oHardens your hide to make you harder to hurt",
     "item.reignofnether.light_feather": "Light Feather",
-    "item.reignofnether.light_feather.desc": "Breeze past attacks like the wind itself",
+    "item.reignofnether.light_feather.desc": "§oBreeze past attacks like the wind itself",
     "item.reignofnether.light_feather.point1": "(Does not stack)",
     "item.reignofnether.spyglass": "Spyglass",
     "item.reignofnether.spyglass.desc": "Sharpens your sight in the fog of war",
     "item.reignofnether.frost_walker_boots": "Boots of Frost",
-    "item.reignofnether.frost_walker_boots.desc": "Water transforms into frosty ice beneath you",
+    "item.reignofnether.frost_walker_boots.desc": "§oWater transforms into frosty ice beneath you",
     "item.reignofnether.frost_walker_boots.point1": "Grants Frostwalker",
     "item.reignofnether.magma_walker_boots": "Boots of Magma",
-    "item.reignofnether.magma_walker_boots.desc": "Lava transforms into toasty magma beneath you",
+    "item.reignofnether.magma_walker_boots.desc": "§oLava transforms into toasty magma beneath you",
     "item.reignofnether.magma_walker_boots.point1": "Grants Magmawalker",
     "item.reignofnether.bell_of_arms": "Bell of Arms",
-    "item.reignofnether.bell_of_arms.desc": "Inspire the humble might of villagers",
+    "item.reignofnether.bell_of_arms.desc": "§oInspire the humble might of villagers",
     "item.reignofnether.bell_of_arms.point1": "Converts all nearby villagers into militia",
     "item.reignofnether.bell_of_arms.point2": "Nearby militia do not revert into villagers",
     "item.reignofnether.satchel_of_snacks": "Satchel of Snacks",
-    "item.reignofnether.satchel_of_snacks.desc": "An endless basket of cookies to munch on",
+    "item.reignofnether.satchel_of_snacks.desc": "§oAn endless basket of cookies to munch on",
     "item.reignofnether.satchel_of_snacks.point1": "Automatically spawns food when hurt",
     "item.reignofnether.buzzy_nest": "Buzzy Nest",
-    "item.reignofnether.buzzy_nest.desc": "A home buzzing with excitement",
+    "item.reignofnether.buzzy_nest.desc": "§oA home buzzing with excitement",
     "item.reignofnether.buzzy_nest.point1": "Summons a bee with every spell cast",
     "item.reignofnether.beenest_armour": "Beenest Armour",
-    "item.reignofnether.beenest_armour.desc": "Just buzzing with excitement!",
+    "item.reignofnether.beenest_armour.desc": "§oJust buzzing with excitement!",
     "item.reignofnether.beenest_armour.point1": "Summons a bee for every %s damage taken",
     "item.reignofnether.health_potion": "Health Potion",
-    "item.reignofnether.health_potion.desc": "A refreshing healing brew",
+    "item.reignofnether.health_potion.desc": "§oA refreshing healing brew",
     "item.reignofnether.health_potion.point1": "+%s \uE007",
     "item.reignofnether.health_potion.error": "Already full health!",
     "item.reignofnether.mana_potion": "Mana Potion",
-    "item.reignofnether.mana_potion.desc": "A satisfying relaxing brew",
+    "item.reignofnether.mana_potion.desc": "§oA satisfying relaxing brew",
     "item.reignofnether.mana_potion.point1": "+%s \uE008",
     "item.reignofnether.mana_potion.error": "Already full mana!",
     "item.reignofnether.potion.error2": "Already eating or drinking!",
     "item.reignofnether.ghost_cloak": "Ghost Cloak",
-    "item.reignofnether.ghost_cloak.desc": "A mysterious shadowy cloak of unknown origin",
+    "item.reignofnether.ghost_cloak.desc": "§oA mysterious shadowy cloak of unknown origin",
     "item.reignofnether.ghost_cloak.point1": "Grants phasing and speed for %ss",
     "item.reignofnether.gong_of_weakening": "Gong of Weakening",
-    "item.reignofnether.gong_of_weakening.desc": "Enemies shudder beneath its menacing boom",
+    "item.reignofnether.gong_of_weakening.desc": "§oEnemies shudder beneath its menacing boom",
     "item.reignofnether.gong_of_weakening.point1": "Causes Weakness and armour loss in nearby enemies for %ss",
     "item.reignofnether.ice_wand": "Ice Wand",
-    "item.reignofnether.ice_wand.desc": "Harness the power of a bitter blizzard",
+    "item.reignofnether.ice_wand.desc": "§oHarness the power of a bitter blizzard",
     "item.reignofnether.ice_wand.point1": "Freezes and damages an enemy in a block of ice for %ss",
     "item.reignofnether.ice_wand.point2": "(Half duration on heroes)",
     "item.reignofnether.updraft_tome": "Updraft Tome",
-    "item.reignofnether.updraft_tome.desc": "Harness the power of a horrible hurricane",
+    "item.reignofnether.updraft_tome.desc": "§oHarness the power of a horrible hurricane",
     "item.reignofnether.updraft_tome.point1": "Levitates up to 5 enemies in the target area for %ss",
     "item.reignofnether.updraft_tome.point2": "(Half duration on heroes)",
     "item.reignofnether.tome_of_duplication": "Tome of Duplication",
-    "item.reignofnether.tome_of_duplication.desc": "A sense of déjà vu overwhelms its readers",
+    "item.reignofnether.tome_of_duplication.desc": "§oA sense of déjà vu overwhelms its readers",
     "item.reignofnether.tome_of_duplication.point1": "Resets cooldowns on all spells",
     "item.reignofnether.tome_of_duplication.error": "No spells are on cooldown",
     "item.reignofnether.shadow_shifter": "Shadow Shifter",
-    "item.reignofnether.shadow_shifter.desc": "An artifact infused with an unnatural darkness",
+    "item.reignofnether.shadow_shifter.desc": "§oAn artifact infused with an unnatural darkness",
     "item.reignofnether.shadow_shifter.point1": "Creates a night zone around your hero for %ss",
     "item.reignofnether.pocket_portal": "Pocket Portal",
-    "item.reignofnether.pocket_portal.desc": "A tiny marvel of piglin engineering",
+    "item.reignofnether.pocket_portal.desc": "§oA tiny marvel of piglin engineering",
     "item.reignofnether.pocket_portal.point1": "Creates a mini portal at the target location",
     "item.reignofnether.war_horn": "War Horn",
-    "item.reignofnether.war_horn.desc": "Emboldens the might of your army in battle",
+    "item.reignofnether.war_horn.desc": "§oEmboldens the might of your army in battle",
     "item.reignofnether.war_horn.point1": "Grants Strength to nearby allies for %ss",
     "item.reignofnether.totem_of_regeneration": "Totem of Regeneration",
-    "item.reignofnether.totem_of_regeneration.desc": "A warming totem to heal the masses",
+    "item.reignofnether.totem_of_regeneration.desc": "§oA warming totem to heal the masses",
     "item.reignofnether.totem_of_regeneration.point1": "Creates a totem granting Regeneration for %ss",
     "item.reignofnether.totem_of_shielding": "Totem of Shielding",
-    "item.reignofnether.totem_of_shielding.desc": "A protective effigy to shield the masses",
+    "item.reignofnether.totem_of_shielding.desc": "§oA protective effigy to shield the masses",
     "item.reignofnether.totem_of_shielding.point1": "Creates a totem that deflects enemy projectiles for %ss",
     "item.reignofnether.totem_of_protection": "Totem of Protection",
-    "item.reignofnether.totem_of_protection.desc": "A sheltering effigy to bolster the masses",
+    "item.reignofnether.totem_of_protection.desc": "§oA sheltering effigy to bolster the masses",
     "item.reignofnether.totem_of_protection.point1": "Creates a totem granting Resistance for %ss",
     "item.reignofnether.totem_of_casting": "Totem of Casting",
-    "item.reignofnether.totem_of_casting.desc": "An arcane effigy to empower spellcasters",
+    "item.reignofnether.totem_of_casting.desc": "§oAn arcane effigy to empower spellcasters",
     "item.reignofnether.totem_of_casting.point1": "Creates a totem granting Vigor for %ss",
     "item.reignofnether.scroll_of_recall": "Scroll of Recall",
-    "item.reignofnether.scroll_of_recall.desc": "Reading the parchment makes one homesick",
+    "item.reignofnether.scroll_of_recall.desc": "§oReading the parchment makes one homesick",
     "item.reignofnether.scroll_of_recall.point1": "Channel to teleport your hero and all nearby friendly units to the targeted capitol",
     "item.reignofnether.scroll_of_recall.error": "Must target a friendly capitol",
     "item.reignofnether.ender_pearl": "Ender Pearl",
-    "item.reignofnether.ender_pearl.desc": "Holds unstable teleportation energies",
+    "item.reignofnether.ender_pearl.desc": "§oHolds unstable teleportation energies",
     "item.reignofnether.ender_pearl.point1": "Throws an enderpearl at the target, teleporting to it on impact",
     "item.reignofnether.evocation_robes": "Evocation Robes",
-    "item.reignofnether.evocation_robes.desc": "Cloth weaved of potent magical runes",
+    "item.reignofnether.evocation_robes.desc": "§oCloth weaved of potent magical runes",
     "item.reignofnether.heros_armour": "Hero's Armour",
-    "item.reignofnether.heros_armour.desc": "True heroes protect those who cannot protect themselves",
+    "item.reignofnether.heros_armour.desc": "§oTrue heroes protect those who cannot protect themselves",
     "item.reignofnether.heros_armour.point1": "Heals up to %d nearby allies for %d when drinking a health potion",
     "item.reignofnether.hungry_horror_armour": "Hungry Horror Armour",
-    "item.reignofnether.hungry_horror_armour.desc": "With great power comes an insatiable hunger",
+    "item.reignofnether.hungry_horror_armour.desc": "§oWith great power comes an insatiable hunger",
     "item.reignofnether.hungry_horror_armour.point1": "Nearby allies gain %d%% lifesteal under night zones",
     "item.reignofnether.golden_piglin_armour": "Golden Piglin Armour",
-    "item.reignofnether.golden_piglin_armour.desc": "Gleaming armour worn by leaders of Piglin tribes",
+    "item.reignofnether.golden_piglin_armour.desc": "§oGleaming armour worn by leaders of Piglin tribes",
     "item.reignofnether.golden_piglin_armour.point1": "Nearby allies gain %d%% attack damage and 2x natural regen on nether terrain",
 
     "item.reignofnether.error.use": "Can't use that item right now",
@@ -225,7 +225,6 @@
     "item.reignofnether.hud.give_to_unit": "Gave %s to %s",
     "item.reignofnether.hud.item_deleted": "Item deleted!",
 
-    "itemshop.reignofnether.toggle_menu": "Open Shop",
     "itemshop.reignofnether.error.out_of_stock": "Out of stock (restock in %ds)",
     "itemshop.reignofnether.error.full_inventory": "Inventory is full",
     "itemshop.reignofnether.error.cant_afford": "Can't afford that item",
@@ -631,12 +630,12 @@
     "abilities.reignofnether.trade_ore_food": "Trade   %d   \uE002   for   %d   \uE000",
     "abilities.reignofnether.trade_ore_wood": "Trade   %d   \uE002   for   %d   \uE001",
 
-    "abilities.reignofnether.sell_food": "Sell   %d   \uE000   for  %d   \uE010",
-    "abilities.reignofnether.sell_wood": "Sell   %d   \uE001   for   %d   \uE010",
-    "abilities.reignofnether.sell_ore": "Sell   %d   \uE002   for   %d   \uE010",
-    "abilities.reignofnether.buy_food": "Buy   %d   \uE000   for  %d   \uE010",
-    "abilities.reignofnether.buy_wood": "Buy   %d   \uE001   for   %d   \uE010",
-    "abilities.reignofnether.buy_ore": "Buy   %d   \uE002   for   %d   \uE010",
+    "abilities.reignofnether.sell_food": "Sell %d food for %d emeralds",
+    "abilities.reignofnether.sell_wood": "Sell %d wood for %d emeralds",
+    "abilities.reignofnether.sell_ore": "Sell %d ore for %d emeralds",
+    "abilities.reignofnether.buy_food": "Buy %d food for %d emeralds",
+    "abilities.reignofnether.buy_wood": "Buy %d wood for %d emeralds",
+    "abilities.reignofnether.buy_ore": "Buy %d ore for %d emeralds",
 
     "ability.reignofnether.enchant.error1": "Can only enchant your own units",
     "ability.reignofnether.enchant.error2": "Unit is out of range",
@@ -748,7 +747,7 @@
     "buildings.reignofnether.sculk_catalyst.tooltip2": "Distorts time to midnight within a %d block radius.",
     "buildings.reignofnether.sculk_catalyst.tooltip3": "Provides 12 population supply. ",
     "buildings.reignofnether.altar_of_darkness": "Altar of Darkness",
-    "buildings.reignofnether.altar_of_darkness.tooltip1": "A font of dark energy to manifest horrors of the dark.",
+    "buildings.reignofnether.altar_of_darkness.tooltip1": "§oA font of dark energy to manifest horrors of the dark.",
     "buildings.reignofnether.altar_of_darkness.tooltip2": "Trains new and revives fallen Monster heroes.",
     "buildings.reignofnether.monster_market": "Conversion Pit",
     "buildings.reignofnether.monster_market_upgraded": "Conversion Crucible",
@@ -798,11 +797,11 @@
     "buildings.reignofnether.portal_pocket.tooltip1": "A tiny portal that can fit in your pocket.",
     "buildings.reignofnether.portal_pocket.tooltip2": "used to quickly spread nether terrain.",
     "buildings.reignofnether.wither_shrine": "Wither Shrine",
-    "buildings.reignofnether.wither_shrine.tooltip1": "A dark shrine dedicated to the power of Withers.",
+    "buildings.reignofnether.wither_shrine.tooltip1": "§oA dark shrine dedicated to the power of Withers.",
     "buildings.reignofnether.wither_shrine.tooltip2": "Enables wither skeletons production at military portals.",
     "buildings.reignofnether.wither_shrine.tooltip3": "Requires a Bastion.",
     "buildings.reignofnether.infernal_portal": "Infernal Portal",
-    "buildings.reignofnether.infernal_portal.tooltip1": "A decorated portal reserved for champions of the Nether.",
+    "buildings.reignofnether.infernal_portal.tooltip1": "§oA decorated portal reserved for champions of the Nether.",
     "buildings.reignofnether.infernal_portal.tooltip2": "Trains new and revives fallen Piglin heroes.",
     "buildings.reignofnether.piglin_market": "Trade Portal",
     "buildings.reignofnether.piglin_market_upgraded": "Commercial Portal",
@@ -832,7 +831,7 @@
     "buildings.reignofnether.iron_golem_building.tooltip2": "Requires research and an active Blacksmith",
     "buildings.reignofnether.library.upgraded": "Grand Library",
     "buildings.reignofnether.library": "Library",
-    "buildings.reignofnether.library.tooltip1": "An enchanting table surrounded by pillars of books.",
+    "buildings.reignofnether.library.tooltip1": "§oAn enchanting table surrounded by pillars of books.",
     "buildings.reignofnether.library.tooltip2": "Used to research magic upgrades and enchant weapons.",
     "buildings.reignofnether.library.tooltip3": "Requires a Barracks.",
     "buildings.reignofnether.oak_bridge": "Oak Bridge",
@@ -856,7 +855,7 @@
     "buildings.reignofnether.wheat_farm.tooltip2": "A wheat field that be can tilled to collect food.",
     "buildings.reignofnether.wheat_farm.tooltip3": "Workers automatically use wood to replant seeds while working.",
     "buildings.reignofnether.shrine_of_prosperity": "Shrine of Prosperity",
-    "buildings.reignofnether.shrine_of_prosperity.tooltip1": "A symbol of the alliance of Villagers and Pillagers.",
+    "buildings.reignofnether.shrine_of_prosperity.tooltip1": "§oA symbol of the alliance of Villagers and Pillagers.",
     "buildings.reignofnether.shrine_of_prosperity.tooltip2": "Trains new and revives fallen Villager heroes.",
     "buildings.reignofnether.villager_market": "Town Market",
     "buildings.reignofnether.villager_market_upgraded": "Grand Market",
@@ -916,8 +915,6 @@
     "commands.reignofnether.gamerule.beacon_win_minutes": "Time needed to win with beacon control",
     "commands.reignofnether.gamerule.slanted_buildings": "Allow building on non-flat terrain",
     "commands.reignofnether.gamerule.lock_alliances": "Disallow changing allies during a match",
-    "commands.reignofnether.gamerule.hide_enemy_picks": "Players only see the factions picked by their own team before the match.",
-    "gamerule.hideEnemyPicks": "Hide other teams' factions and start positions in the match lobby",
     "commands.reignofnether.gamerule.allowed_heroes": "How many heroes players can train",
     "commands.reignofnether.gamerule.coop_mode": "All human players are allied; victory only via commands or beacon",
     "commands.reignofnether.gamerule.animal_spawn_y_diff": "Y level difference that animals can spawn at near capitols",
@@ -1051,6 +1048,8 @@
     "argument.player.not_allowed_all": "'All players' not allowed, there must be one specific player name",
 
     "controls.reignofnether.toggle_cam": "F12 - Toggle RTS camera",
+    "hud.reignofnether.join_rts": "Press %s to toggle the RTS camera and join the game",
+    "hud.reignofnether.join_rts_locked": "Press %s to watch in the RTS camera. This match is locked to new players.",
     "controls.reignofnether.refresh_chunks": "F8 - Refresh chunks",
     "controls.reignofnether.toggle_fps_tps": "F7 - Toggle FPS/TPS counters",
     "controls.reignofnether.deselect": "~ - Deselect all units and buildings",
@@ -1065,14 +1064,13 @@
 
     "titles.reignofnether.defeated": "You have been defeated",
     "titles.reignofnether.victorious": "You are victorious!",
+    "titles.reignofnether.victory": "VICTORY",
+    "titles.reignofnether.defeat": "DEFEAT",
 
     "matchend.reignofnether.title": "Match Results",
     "matchend.reignofnether.winner": "WINNER",
     "matchend.reignofnether.loser": "LOSER",
-    "matchend.reignofnether.party_total": "Party total",
-    "matchend.reignofnether.resources": "Resources harvested: %s",
     "matchend.reignofnether.col_units": "Units",
-    "matchend.reignofnether.col_military": "Military",
     "matchend.reignofnether.col_buildings": "Buildings",
 
     "fogofwar.reignofnether.warning": "[WARNING]",
@@ -1088,16 +1086,23 @@
     "hud.control_group.reignofnether.control_group": "Control Group %s (Shift + right click to remove)",
 
     "hud.actionbuttons.reignofnether.build_repair": "Build/Repair",
+    "hud.actionbuttons.reignofnether.build_repair.tooltip1": "Click a building to help construct or repair it.",
     "hud.actionbuttons.reignofnether.build_repair_autocast": "(Right-click to auto-repair)",
     "hud.actionbuttons.reignofnether.cannot_repair": "That building is not repairable",
     "hud.actionbuttons.reignofnether.cannot_attack": "You can't attack that building",
     "hud.actionbuttons.reignofnether.gather": "Gather",
+    "hud.actionbuttons.reignofnether.gather.tooltip1": "Collect nearby food, wood or ore. Food includes farms.",
     "hud.actionbuttons.reignofnether.attack": "Attack",
+    "hud.actionbuttons.reignofnether.attack.tooltip1": "Attack a target, or fight anything met on the way.",
     "hud.actionbuttons.reignofnether.stop": "Stop",
+    "hud.actionbuttons.reignofnether.stop.tooltip1": "Cancel the current order.",
     "hud.actionbuttons.reignofnether.hold_position": "Hold Position",
+    "hud.actionbuttons.reignofnether.hold_position.tooltip1": "Stay in place and only attack enemies in range.",
     "hud.actionbuttons.reignofnether.move": "Move",
     "hud.actionbuttons.reignofnether.garrison": "Garrison",
+    "hud.actionbuttons.reignofnether.garrison.tooltip1": "Enter a tower or fortified building. Ranged units inside get more range.",
     "hud.actionbuttons.reignofnether.ungarrison": "Ungarrison",
+    "hud.actionbuttons.reignofnether.ungarrison.tooltip1": "Leave the building.",
 
     "hud.actionbuttons.reignofnether.toggle_sandbox_buttons": "Toggle Sandbox Buttons",
     "hud.actionbuttons.reignofnether.set_anchor": "Set Anchor",
@@ -1122,8 +1127,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s wins in: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Click to go to beacon)",
 
-    "hud.map.reignofnether.open": "Open large map/options",
-    "hud.map.reignofnether.close": "Close",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Camera sensitivity: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Left/right click to adjust)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Map centre lock: ON",
@@ -1137,8 +1140,6 @@
     "hud.map.reignofnether.rotate_cw.tooltip2": "(Alt + right-arrow)",
     "hud.map.reignofnether.rotate_ccw.tooltip1": "Rotate camera counter-clockwise",
     "hud.map.reignofnether.rotate_ccw.tooltip2": "(Alt + left-arrow)",
-    "hud.map.reignofnether.marker_mode_enabled": "Marker mode enabled",
-    "hud.map.reignofnether.marker_mode_disabled": "Marker mode disabled",
 
     "hud.startbuttons.villagers.reignofnether.first": "Join the game as Villagers",
     "hud.startbuttons.villagers.reignofnether.second": "Spawns %d villagers at the target location.",
@@ -1164,15 +1165,14 @@
     "hud.orthoview.reignofnether.locked_for_observers": "(Locked for observers)",
 
     "hud.reignofnether.drop_off_resources": "Drop off resources",
+    "hud.reignofnether.drop_off_nothing": "Not carrying any resources.",
     "hud.reignofnether.gather_resources": "Gather Resources (%s)",
     "hud.reignofnether.change_target_resource": "Click to change target resource",
-    "hud.reignofnether.total_workers": "Total Workers: %d",
     "hud.reignofnether.workers_on_food": "Workers on food",
     "hud.reignofnether.workers_on_wood": "Workers on wood",
     "hud.reignofnether.workers_on_ore": "Workers on ore",
-    "hud.reignofnether.items_found": "Items found: %d",
-    "hud.reignofnether.items_hint": "Kill neutral enemies for emeralds and items",
-    "hud.reignofnether.max_resources": "%s (Max: %d)",
+    "hud.reignofnether.items_hint": "From killing neutrals. For market items and resources.",
+    "hud.reignofnether.items_found_desc": "Kill neutral enemies to find items",
     "hud.reignofnether.players_resources": "%s's resources",
     "hud.reignofnether.you_are_spectator": "You are a spectator",
     "hud.reignofnether.placed_capitol": "%s has placed their capitol building!",
@@ -1237,8 +1237,6 @@
     "hud.relationship.reignofnether.enemy": "Enemy",
     "hud.relationship.reignofnether.neutral": "Neutral",
 
-    "hud.hero.reignofnether.level": "Lvl %d",
-    "hud.hero.reignofnether.level.short": "Lv %d",
     "hud.hero.reignofnether.experience": "Experience: %d/%d",
     "hud.hero.reignofnether.experience_warning": "No exp from neutrals from lvl 5",
     "hud.hero.reignofnether.max_level": "Max Level!",
@@ -1292,7 +1290,6 @@
     "server.reignofnether.disabled_cheat": "%s disabled cheat %s",
     "server.reignofnether.all_cheats": "%s enabled all cheats",
     "server.reignofnether.revealed": "%s has not rebuilt their capitol and is being revealed!",
-    "server.reignofnether.prewarmed_navmesh": "RTS-optimised map, improved pathfinding enabled",
     "server.reignofnether.cannot_delete_capturable": "Cannot delete a capturable building",
 
     "server.resources.reignofnether.not_enough_food": "You don't have enough food",
@@ -1488,8 +1485,8 @@
     "time.reignofnether.time": "Time: %s",
     "time.reignofnether.time_is_distorted": "Time is distorted to midnight",
     "time.reignofnether.real_time": "Real time: %s",
-    "time.reignofnether.time_until_day": "Night: %s left",
-    "time.reignofnether.time_until_night": "Day: %s left",
+    "time.reignofnether.time_until_day": "Day in %s",
+    "time.reignofnether.time_until_night": "Night in %s",
     "time.reignofnether.day": "day",
     "time.reignofnether.night": "night",
     "time.reignofnether.night_circles": "",
@@ -1500,21 +1497,10 @@
     "time.reignofnether.time_until_next_wave": "%s until next wave",
 
     "tutorial.reignofnether.tutorial_help": "Tutorial Help",
-    "tutorial.reignofnether.welcome": "Welcome to Reign of Nether",
     "tutorial.reignofnether.welcome2": "Welcome to the Reign of Nether Tutorial!",
     "tutorial.reignofnether.get_started": "Press F12 or use /rts-camera to get started.",
-    "tutorial.reignofnether.join": "Press F12 to toggle RTS camera and join the game",
-    "tutorial.reignofnether.help": "Use '/rts-help' to see the list of all commands",
-    "tutorial.reignofnether.controls": "Use '/rts-controls' to see the list of controls",
-    "tutorial.reignofnether.locked": "This RTS match has been locked. Please wait for a new game before joining.",
-    "tutorial.reignofnether.welcome_back": "Welcome back to Reign of Nether",
-    "tutorial.reignofnether.op_commands": "As a server op you may use:",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable (experimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "RTS Syncing has been disabled, so you cannot select buildings or see unit owners, sorry!",
-    "tutorial.reignofnether.sync_disabled2": "To resolve this, please ask the host to re-enable it, then relog.",
     "tutorial.reignofnether.server_not_found": "Failed to load tutorial, server couldn't be found.",
     "tutorial.reignofnether.resuming": "Welcome back... resuming at stage: %s",
     "tutorial.reignofnether.skipping": "Skipping tutorial stage... you are now on: %s",
@@ -1872,28 +1858,26 @@
     "units.reignofnether.hero_production.allowed_heroes_2": "You may have two different heroes per game",
     "units.reignofnether.hero_production.unlock_hero_2": "Unlock a 2nd hero with a Castle, Stronghold or Fortress",
 
-    "alliance.reignofnether.sent_request": "\nAlliance request sent to %s.\n",
-    "alliance.reignofnether.ally_self": "\nYou can't ally with yourself!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s wants to ally with you. Accept in the Diplomacy menu or with /allyconfirm %s.\n",
+    "alliance.reignofnether.sent_request": "Alliance request sent to %s.",
+    "alliance.reignofnether.ally_self": "You can't ally with yourself!",
+    "alliance.reignofnether.ally_confirm": "%s wants to ally with you. Accept in the Diplomacy menu or with /allyconfirm %s.",
     "alliance.reignofnether.accept": "[Click to accept]",
     "alliance.reignofnether.cancel": "[Click to cancel]",
-    "alliance.reignofnether.now_allied": "\nYou are now allied with %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s has accepted your alliance request.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\nRetracted alliance request to %s.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s has retracted their alliance request.\n",
-    "alliance.reignofnether.no_request": "\nNo pending alliance request from %s.\n",
-    "alliance.reignofnether.alliances_lock": "\nYou may not change alliances during a match (gamerule lockAlliances is on).\n",
-    "alliance.reignofnether.alliances_lock_coop": "\nYou may not change alliances during a match (gamerule coopMode is on).\n",
-    "alliance.reignofnether.disbanded": "\nYour alliance with %s has been disbanded.\n",
-    "alliance.reignofnether.disbanding": "\nDisbanding alliance with %s in 30 seconds...\n",
-    "alliance.reignofnether.disband_self": "\nYou cannot disband yourself.\n",
-    "alliance.reignofnether.disband_pending": "\nA disband request for this player is already pending.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s is now allied with %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s disbanded their alliance with %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nYou are sharing unit control with allies.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nYou are NOT sharing unit control with allies.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s is now sharing unit control with allies.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s is no longer sharing unit control with allies.\n",
+    "alliance.reignofnether.now_allied": "You are now allied with %s.",
+    "alliance.reignofnether.ally_accepted": "%s has accepted your alliance request.",
+    "alliance.reignofnether.ally_request_cancelled_self": "Retracted alliance request to %s.",
+    "alliance.reignofnether.ally_request_cancelled": "%s has retracted their alliance request.",
+    "alliance.reignofnether.no_request": "No pending alliance request from %s.",
+    "alliance.reignofnether.alliances_lock": "You may not change alliances during a match (gamerule lockAlliances is on).",
+    "alliance.reignofnether.alliances_lock_coop": "You may not change alliances during a match (gamerule coopMode is on).",
+    "alliance.reignofnether.disbanded": "Your alliance with %s has been disbanded.",
+    "alliance.reignofnether.disband_self": "You cannot disband yourself.",
+    "alliance.reignofnether.now_allied_third_party": "%s is now allied with %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s disbanded their alliance with %s.",
+    "alliance.reignofnether.ally_control_enabled": "You are sharing unit control with allies.",
+    "alliance.reignofnether.ally_control_disabled": "You are NOT sharing unit control with allies.",
+    "alliance.reignofnether.ally_control_enable": "%s is now sharing unit control with allies.",
+    "alliance.reignofnether.ally_control_disable": "%s is no longer sharing unit control with allies.",
 
     "survival.reignofnether.dawn": "Dawn breaks",
     "survival.reignofnether.dusk": "Night falls...",
@@ -2003,10 +1987,6 @@
     "hud.gamemode.reignofnether.npc_scenario_role": "(NPC only)",
     "hud.gamemode.reignofnether.cycle_scenario_role": "(Click to change)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Hold shift to adjust faster)",
-    "hud.gamerule.reignofnether.click": "(Left/right click to adjust)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Only ops can modify)",
-    "hud.gamerule.reignofnether.menu": "Game Rules Menu",
 
     "config.reignofnether.warn_config_change": "Server host has changed configs",
     "config.reignofnether.hide_config_change": "(Click to hide)",
@@ -2035,6 +2015,32 @@
     "sandbox.reignofnether.sort_custom_buildings.name": "Sort by: Name",
     "sandbox.reignofnether.sort_custom_buildings.size": "Sort by: Size",
     "sandbox.reignofnether.sort_custom_buildings.faction": "Sort by: Faction",
+    "sandbox.reignofnether.tab.spawn": "Spawn",
+    "sandbox.reignofnether.tab.selection": "Edit Units/Buildings",
+    "sandbox.reignofnether.tab.rules": "Rules",
+    "sandbox.reignofnether.tab.scenario": "Scenario",
+    "sandbox.reignofnether.tab.units": "Units",
+    "sandbox.reignofnether.tab.buildings": "Buildings",
+    "sandbox.reignofnether.tab.custom": "Custom",
+    "sandbox.reignofnether.group.owner": "Owner",
+    "sandbox.reignofnether.group.faction": "Faction",
+    "sandbox.reignofnether.group.type": "Type",
+    "sandbox.reignofnether.group.anchor": "Anchor",
+    "sandbox.reignofnether.group.cheats": "Cheats",
+    "sandbox.reignofnether.search": "Search",
+    "sandbox.reignofnether.sort_by": "Sort by",
+    "sandbox.reignofnether.sort.name": "Name",
+    "sandbox.reignofnether.sort.size": "Size",
+    "sandbox.reignofnether.sort.faction": "Faction",
+    "sandbox.reignofnether.scenario_role": "Scenario role",
+    "sandbox.reignofnether.selection.empty": "Click a unit or building on the map.",
+    "sandbox.reignofnether.anchor.set": "Set",
+    "sandbox.reignofnether.anchor.reset": "Reset",
+    "sandbox.reignofnether.anchor.remove": "Remove",
+    "sandbox.reignofnether.unit_cheats": "Unit cheats",
+    "sandbox.reignofnether.building_cheats": "Building cheats",
+    "sandbox.reignofnether.control_cheat": "Full unit control",
+    "sandbox.reignofnether.publish": "Publish",
     "sandbox.reignofnether.exit1": "Exit Sandbox Mode",
     "sandbox.reignofnether.exit2": "(Sets all units and buildings neutral)",
     "sandbox.reignofnether.publish_scenario_tooltip1": "Publish Scenario Map",
@@ -2057,9 +2063,9 @@
     "sandbox.reignofnether.scenario.role_units": "Units: %d",
     "sandbox.reignofnether.scenario.select_all_shift": "(Shift to select all)",
     "sandbox.reignofnether.scenario.clear_all": "(Ctrl + shift + right-click to clear all)",
-    "sandbox.reignofnether.scenario.starting_food": "Starting Food",
-    "sandbox.reignofnether.scenario.starting_wood": "Starting Wood",
-    "sandbox.reignofnether.scenario.starting_ore": "Starting Ore",
+    "sandbox.reignofnether.scenario.starting_food": "Food",
+    "sandbox.reignofnether.scenario.starting_wood": "Wood",
+    "sandbox.reignofnether.scenario.starting_ore": "Ore",
     "sandbox.reignofnether.scenario.bonus_population": "Bonus Population",
     "sandbox.reignofnether.scenario.team_number": "Team Number: %d",
     "sandbox.reignofnether.scenario.team_number_tooltip": "Roles with the same number are allied",
@@ -2072,6 +2078,27 @@
     "sandbox.reignofnether.scenario.help_tooltip3": "and buildings with this role are assigned to the player.",
     "sandbox.reignofnether.scenario.npc_role_error": "This role is only for NPCs!",
     "sandbox.reignofnether.scenario.saved_all_roles": "Saved all scenario roles!",
+    "sandbox.reignofnether.scenario.name": "Name",
+    "sandbox.reignofnether.scenario.role_label": "Role",
+    "sandbox.reignofnether.scenario.help_title": "Scenario roles",
+    "sandbox.reignofnether.scenario.reset_role.label": "Reset role",
+    "sandbox.reignofnether.scenario.faction": "Faction",
+    "sandbox.reignofnether.scenario.team": "Team",
+    "sandbox.reignofnether.scenario.npc_only": "NPC only",
+    "sandbox.reignofnether.scenario.group.starting_resources": "Starting resources",
+    "sandbox.reignofnether.scenario.group.assigned": "Assigned to this role",
+    "sandbox.reignofnether.scenario.units": "Units",
+    "sandbox.reignofnether.scenario.select": "Select",
+    "sandbox.reignofnether.scenario.buildings": "Buildings",
+    "sandbox.reignofnether.custom_buildings.general_tab": "General",
+    "sandbox.reignofnether.custom_buildings.commands_tab": "Commands",
+    "sandbox.reignofnether.custom_buildings.commands.add_label": "Add",
+    "sandbox.reignofnether.custom_buildings.deregister.label": "Deregister",
+    "sandbox.reignofnether.custom_buildings.group.buildable_by": "Who can build it",
+    "sandbox.reignofnether.custom_buildings.group.cost": "Cost",
+    "sandbox.reignofnether.custom_buildings.group.building": "Building",
+    "sandbox.reignofnether.custom_buildings.group.contents": "Contents",
+    "sandbox.reignofnether.custom_buildings.edit": "Edit",
 
     "sandbox.reignofnether.custom_buildings_info.tooltip1": "Custom buildings saved with RTS",
     "sandbox.reignofnether.custom_buildings_info.tooltip2": "structure blocks are shown here",
@@ -2124,14 +2151,12 @@
     "sandbox.reignofnether.custom_buildings.garrison_warning.multiple_exits": "\uE009   Multiple    garrison    exit    blocks    detected!",
     "sandbox.reignofnether.custom_buildings.garrison_warning.multiple_entries": "\uE009   Multiple    garrison    entry    blocks    detected!",
     "sandbox.reignofnether.custom_buildings.trainable_units.label": "Trainable Units",
-    "sandbox.reignofnether.custom_buildings.trainable_units.tooltip1": "Click for a guide on training units at this building",
     "sandbox.reignofnether.custom_buildings.trainable_units.save_success": "Discovered %d trainable unit(s)!",
     "sandbox.reignofnether.custom_buildings.trainable_units.hint1": "To train units from this building, save its structure with a unit spawn egg in a chest or other container",
     "sandbox.reignofnether.custom_buildings.trainable_units.hint2": "You can add these NBTs to spawn eggs for customisation: foodCost, woodCost, oreCost, popCost, ticksToTrain, tooltipTitle, tooltipLine(0-9), and any mob NBTs",
     "sandbox.reignofnether.custom_buildings.trainable_units.no_spawn_block": "\uE009   No    production    spawn    blocks    detected!",
     "sandbox.reignofnether.custom_buildings.trainable_units.multiple_spawn_blocks": "\uE009   Multiple    production    spawn    blocks    detected!",
     "sandbox.reignofnether.custom_buildings.buyable_items.label": "Buyable Items",
-    "sandbox.reignofnether.custom_buildings.buyable_items.tooltip1": "Click for a guide on stocking hero items at this building",
     "sandbox.reignofnether.custom_buildings.buyable_items.save_success": "Discovered %d shop item(s)!",
     "sandbox.reignofnether.custom_buildings.buyable_items.hint1": "To buy/sell hero items with this building, save its structure, with a hero item in a chest or other container",
     "sandbox.reignofnether.custom_buildings.buyable_items.hint2": "You can add these NBTs to hero items for customisation: buyCost, maxStock, startingStock, restockTicks",
@@ -2158,7 +2183,6 @@
     "startpos.reignofnether.start_button.no_faction": "You have not chosen a faction!",
     "startpos.reignofnether.cancel_start_button": "Cancel game start",
     "startpos.reignofnether.cancelled_start_game": "Game start cancelled",
-    "startpos.reignofnether.starting_game": "Game starting in %d seconds",
     "startpos.reignofnether.started_game": "Game started!",
     "startpos.reignofnether.max_positions": "Max starting positions reached (16)",
     "startpos.reignofnether.rts_map_info_used": "This map uses rtsmap.json start positions (start blocks are ignored)",
@@ -2176,11 +2200,8 @@
     "startpos.reignofnether.enable": "Right-click to enable",
     "startpos.reignofnether.disable": "Right-click to disable",
 
-    "message.reignofnether.rts_map_info_author.singular": "Author:",
-    "message.reignofnether.rts_map_info_author.multiple": "Authors:",
     "message.reignofnether.commands.scores.player_not_available": "Player '%s' is either currently in a match but is a spectator, or doesn't exist.",
     "message.reignofnether.commands.scores.none_defeated": "No players have been defeated yet.",
-    "message.reignofnether.rts_map_info_modes": "Modes: %s",
     "message.reignofnether.rts_map_info_modes_command": "Change modes with /rtsapi-teams-mode",
     "message.reignofnether.rts_map_info_mode": "Map Mode: %s",
     "disconnect.reignofnether.illegal_packet": "Illegal packet received, terminating connection",
@@ -2220,8 +2241,8 @@
     "alliances.reignofnether.tooltip.status.allied": "Allied",
     "alliances.reignofnether.tooltip.status.allied.plural": " (s)",
 
-    "alliances.reignofnether.tooltip.toggle_observer_player_displays": "Observer Menu (Z)",
-    "alliances.reignofnether.tooltip.toggle_diplomacy_player_displays": "Diplomacy Menu (Z)",
+    "alliances.reignofnether.tooltip.toggle_observer_player_displays": "Diplomacy",
+    "alliances.reignofnether.tooltip.toggle_diplomacy_player_displays": "Diplomacy",
     "alliances.reignofnether.tooltip.toggle_shared_unit_control": "Toggle whether allies can control your units",
     "alliances.reignofnether.tooltip.shared_unit_control": "Shared Control: ",
     "alliances.reignofnether.tooltip.shared_unit_control.enable": "ON",
@@ -2313,6 +2334,7 @@
     "key.categories.reignofnether.camera": "Reign of Nether: Camera",
     "key.categories.reignofnether.rts":    "Reign of Nether: RTS Controls",
 
+    "key.reignofnether.diplomacy": "Diplomacy",
     "key.reignofnether.zoom_in":      "Zoom In",
     "key.reignofnether.zoom_out":     "Zoom Out",
     "key.reignofnether.pan_plus_x":   "Pan Camera East",
@@ -2353,7 +2375,6 @@
     "key.reignofnether.item5": "Item Slot 5",
     "key.reignofnether.item6": "Item Slot 6",
 
-    "key.reignofnether.minimap_toggle": "Minimap Toggle",
     "key.reignofnether.hotkey_1":       "Hotkey 1",
     "key.reignofnether.hotkey_2":       "Hotkey 2",
     "key.reignofnether.hotkey_3":       "Hotkey 3",
@@ -2361,7 +2382,6 @@
     "key.reignofnether.hotkey_5":       "Hotkey 5",
     "key.reignofnether.hotkey_6":       "Hotkey 6",
     "key.reignofnether.hotkey_7":       "Hotkey 7",
-    "key.reignofnether.hotkey_8":       "Hotkey 8",
     "key.reignofnether.hotkey_9":       "Hotkey 9",
     "key.reignofnether.hotkey_10":      "Hotkey 10",
 
@@ -2390,9 +2410,13 @@
     "key.reignofnether.fn_12": "Function Key 12 (Toggle RTS Camera)",
 
     "matchstart.reignofnether.mode": "Mode: %s",
-    "matchstart.reignofnether.map_preview": "MAP",
     "matchstart.reignofnether.roster": "ROSTER",
     "matchstart.reignofnether.team": "Team %d",
+    "matchstart.reignofnether.seats": "Seats",
+    "matchstart.reignofnether.team_allied": "Everyone on the same team starts allied.",
+    "matchstart.reignofnether.team_change": "Click: next team · Right-click: previous",
+    "matchstart.reignofnether.team_pick": "Click to move this seat to this team",
+    "matchstart.reignofnether.team_locked": "Only the host or the player on this seat can change it",
     "matchstart.reignofnether.no_positions": "No start positions available yet.",
     "matchstart.reignofnether.faction.villagers": "VILLAGERS",
     "matchstart.reignofnether.faction.monsters": "MONSTERS",
@@ -2401,20 +2425,380 @@
     "matchstart.reignofnether.ready_count": "%d / %d ready",
     "matchstart.reignofnether.map_loading": "Map loading…",
     "matchstart.reignofnether.place_blocks_hint": "Place RTS start blocks to add positions.",
-    "matchstart.reignofnether.empty_slot": "(empty — click to join)",
     "matchstart.reignofnether.spectators": "SPECTATORS",
-    "matchstart.reignofnether.spectator_tag": "spectating",
-    "matchstart.reignofnether.join_spectators": "+ Leave my team and spectate",
     "matchstart.reignofnether.no_spectators": "(no spectators yet)",
     "matchstart.reignofnether.chat": "CHAT",
     "matchstart.reignofnether.chat.placeholder": "Type a message…",
     "matchstart.reignofnether.chat.click_to_type": "Press T or click here to type — Enter to send",
-    "matchstart.reignofnether.hint.pick_pos": "Click the map to pick a start position.",
-    "matchstart.reignofnether.hint.pick_faction": "Pick your faction.",
-    "matchstart.reignofnether.hint.ready_up": "Click the cross in your row to ready up.",
-    "matchstart.reignofnether.hint.waiting": "Waiting for other players to ready up.",
-    "matchstart.reignofnether.hint.close": "Click Back to leave · F12 off + on to reopen.",
     "matchstart.reignofnether.settings.title": "GAME SETTINGS",
     "matchstart.reignofnether.settings.mode": "Mode",
-    "matchstart.reignofnether.settings.op_only": "Gamerule settings require op."
+    "matchstart.reignofnether.other_teams": "OPPONENTS",
+    "matchstart.reignofnether.faction_hidden": "FACTION HIDDEN",
+    "gamerule.hideEnemyPicks": "Hide other teams' factions and start positions in the match lobby",
+    "title.reignofnether.network_notice.title": "Play on the Reign of Nether Network",
+    "title.reignofnether.network_notice.message": "The best way to play online is on the official RoN Network: ranked and casual matches, always-on servers and players to fight. It can only be reached through the official RoN launcher, available on reignofnether.net.",
+    "title.reignofnether.network_notice.website": "Get the launcher",
+    "title.reignofnether.network_notice.continue": "Continue",
+    "hud.control_group.reignofnether.title": "Control Group %s",
+    "hud.control_group.reignofnether.keys": "CTRL+%1$s SET · SHIFT+%1$s ADD · ALT+%1$s STEAL",
+    "hud.control_group.reignofnether.mouse": "Press twice to centre the camera · Right-click clears",
+    "hud.reignofnether.hotkeys": "Hotkeys",
+    "hud.reignofnether.army_hint": "TAB cycle · CTRL+click only this type · SHIFT+click remove",
+    "hud.reignofnether.buildings_count": "%s BUILDINGS",
+    "hud.reignofnether.cancel_item": "Cancel %s",
+    "hud.reignofnether.card.basic": "Basic buildings",
+    "hud.reignofnether.card.basic.tooltip1": "Open the list of core buildings.",
+    "hud.reignofnether.card.advanced": "Advanced buildings",
+    "hud.reignofnether.card.advanced.tooltip1": "Open the list of late-game buildings.",
+    "hud.reignofnether.card.shop": "Shop",
+    "hud.reignofnether.card.shop.tooltip1": "Show the items this shop sells.",
+    "hud.reignofnether.card.sandbox": "Sandbox",
+    "hud.reignofnether.carry_full": "FULL",
+    "hud.reignofnether.cell.locked": "LOCKED · requirements not met",
+    "hud.reignofnether.cell.need_more": "NEED %s MORE %s",
+    "hud.reignofnether.cell.ready_in": "READY IN %ss",
+    "hud.reignofnether.clock.blood_moon": "BLOOD MOON",
+    "hud.reignofnether.clock.dawn_in": "DAWN IN %s",
+    "hud.reignofnether.clock.day": "DAY",
+    "hud.reignofnether.clock.desc_day": "Monsters burn or slow down unless in shade.",
+    "hud.reignofnether.clock.desc_night": "Monsters don't burn or slow down.",
+    "hud.reignofnether.clock.dusk_in": "DUSK IN %s",
+    "hud.reignofnether.clock.game_time": "GAME TIME",
+    "hud.reignofnether.surrender": "Surrender",
+    "hud.reignofnether.surrender_confirm": "Click again to surrender",
+    "hud.reignofnether.capital_lost_tip": "Your capital has fallen. If you can't come back, you can surrender from the pause menu (Esc).",
+    "hud.reignofnether.resource_desc.food": "From farms and hunting. For most units.",
+    "hud.reignofnether.resource_desc.wood": "From logs. For buildings and ranged units.",
+    "hud.reignofnether.resource_desc.ore": "From ore veins. For advanced units, research and buildings.",
+    "hud.reignofnether.resource_desc.population": "Build housing to raise the limit",
+    "hud.reignofnether.resource_desc.population.villagers": "Build houses to raise the limit",
+    "hud.reignofnether.resource_desc.population.monsters": "Build haunted houses or sculk catalysts to raise the limit",
+    "hud.reignofnether.resource_desc.population.piglins": "Upgrade portals to raise the limit",
+    "hud.reignofnether.clock.day_n": "Day %s",
+    "hud.reignofnether.clock.night_n": "Night %s",
+    "hud.reignofnether.clock.night": "NIGHT",
+    "hud.reignofnether.spectator.click_follow": "Click to follow their camera",
+    "hud.reignofnether.spectator.ffa": "FFA · %s PLAYERS",
+    "hud.reignofnether.spectator.army": "ARMY",
+    "hud.reignofnether.spectator.no_army": "NO ARMY",
+    "hud.reignofnether.spectator.hero_level": "HERO LV %s",
+    "hud.reignofnether.spectator.no_hero": "NO HERO",
+    "hud.reignofnether.spectator.feed.lost": "lost %s× %s",
+    "hud.reignofnether.spectator.feed.lost_one": "lost a %s",
+    "hud.reignofnether.spectator.feed.built": "built a %s",
+    "hud.reignofnether.spectator.feed.researched": "researched %s",
+    "hud.reignofnether.housing_full": "HOUSING FULL",
+    "hud.reignofnether.housing_full_hint": "PRODUCTION PAUSED · BUILD MORE HOUSING",
+    "hud.reignofnether.hud_hidden": "HUD HIDDEN · %s TO SHOW",
+    "hud.reignofnether.in_production": "IN PRODUCTION · click to cancel and refund",
+    "hud.reignofnether.income_per_minute": "+%s PER MINUTE",
+    "hud.reignofnether.items_found_short": "%s FOUND",
+    "hud.reignofnether.level_short": "LV %s",
+    "hud.reignofnether.max_population": "MAX POPULATION %s",
+    "hud.reignofnether.max_short": "MAX %s",
+    "hud.reignofnether.next_page": "More",
+    "hud.reignofnether.next_ready_in": "NEXT READY IN %s",
+    "hud.reignofnether.nothing_in_production": "Nothing in production.",
+    "hud.reignofnether.page": "PAGE %s / %s",
+    "hud.reignofnether.paused_population": "POPULATION CAP REACHED · BUILD MORE HOUSING",
+    "hud.reignofnether.gain_per_minute": "+%s gathered/min",
+    "hud.reignofnether.spend_per_minute": "-%s spent/min",
+    "hud.reignofnether.workers_on": "%s workers",
+    "hud.reignofnether.gain_spend_short": "+%s/-%s",
+    "hud.reignofnether.pop_count": "%s POP",
+    "hud.reignofnether.pop_short": "POP",
+    "hud.reignofnether.queue": "QUEUE",
+    "hud.reignofnether.queue_hint": "Click selects the building · right-click cancels one",
+    "hud.reignofnether.queue_hint_view": "Click selects the building",
+    "hud.reignofnether.queued": "QUEUED · click to cancel and refund",
+    "hud.reignofnether.rank_up": "Learn ability",
+    "hud.reignofnether.rank_up_hint": "ALT+%s also learns it",
+    "hud.reignofnether.skill_points": "%s SKILL POINT(S)",
+    "hud.reignofnether.stack_hint": "Click: show this type · Ctrl+click: keep only this type · Shift or right-click: remove",
+    "hud.reignofnether.stat.attack_damage": "ATTACK",
+    "hud.reignofnether.stat.attack_speed": "SPEED",
+    "hud.reignofnether.stat.range": "RANGE",
+    "hud.reignofnether.stat.armour": "ARMOR",
+    "hud.reignofnether.stat.movement_speed": "MOVE",
+    "hud.reignofnether.stat.sub.blocks": "blocks",
+    "hud.reignofnether.stat.sub.per_hit": "per hit",
+    "hud.reignofnether.tag.passive": "PASSIVE",
+    "hud.reignofnether.profession.none": "NO PROFESSION YET",
+    "hud.reignofnether.profession.learning": "%s %s / %s XP",
+    "hud.reignofnether.profession.to_veteran": "VETERAN %2$s / %3$s XP",
+    "hud.reignofnether.profession.veteran": "VETERAN",
+    "hud.reignofnether.profession.none_title": "No profession",
+    "hud.reignofnether.profession.none_desc": "Villagers learn a profession by farming, chopping, mining, building or hunting, then become veterans with more of the same work.",
+    "hud.reignofnether.profession.learn_at": "Becomes a %s at %s XP",
+    "hud.reignofnether.profession.veteran_at": "Veteran at %s XP",
+    "hud.reignofnether.profession.is_veteran": "Veteran",
+    "hud.reignofnether.profession.progress": "%s: %s / %s XP",
+    "hud.reignofnether.profession.farmer.bonus": "Replants farms with carrots: +25%% food.",
+    "hud.reignofnether.profession.farmer.veteran": "Veteran: replants with potatoes instead: +50%% food.",
+    "hud.reignofnether.profession.farmer.xp": "1 XP per crop harvested",
+    "hud.reignofnether.profession.lumberjack.bonus": "Chops wood 25%% faster.",
+    "hud.reignofnether.profession.lumberjack.veteran": "Veteran: chops wood 50%% faster.",
+    "hud.reignofnether.profession.lumberjack.xp": "1 XP per log chopped",
+    "hud.reignofnether.profession.miner.bonus": "Mines ore 25%% faster.",
+    "hud.reignofnether.profession.miner.veteran": "Veteran: mines ore 50%% faster.",
+    "hud.reignofnether.profession.miner.xp": "1 XP per ore block mined",
+    "hud.reignofnether.profession.mason.bonus": "Counts as one extra builder when building or repairing.",
+    "hud.reignofnether.profession.mason.veteran": "Veteran: counts as two extra builders.",
+    "hud.reignofnether.profession.mason.xp": "1 XP per block built or repaired",
+    "hud.reignofnether.profession.hunter.bonus": "Hunts animals for food with a wooden sword.",
+    "hud.reignofnether.profession.hunter.veteran": "Veteran: fights with a stone sword instead.",
+    "hud.reignofnether.profession.hunter.xp": "1 XP per chicken, 2 per other animal",
+    "hud.reignofnether.tag.in_production": "IN PRODUCTION",
+    "hud.reignofnether.tag.resource": "RESOURCE",
+    "hud.reignofnether.tile_hint": "Click: select only this · Shift or right-click: remove",
+    "hud.reignofnether.time_left": "%s LEFT",
+    "hud.reignofnether.under_attack": "UNDER ATTACK",
+    "hud.reignofnether.under_attack_hint": "Click to go there · right-click ignores",
+    "hud.reignofnether.units_count": "%s UNITS",
+    "hud.reignofnether.bar.health": "Health",
+    "hud.reignofnether.bar.mana": "Mana",
+    "hud.reignofnether.per_second": "%s/s",
+    "loading.reignofnether.prepare": "Loading the world",
+    "loading.reignofnether.map": "Drawing the map",
+    "loading.reignofnether.navmesh": "Building the navmesh",
+    "loading.reignofnether.fog": "Taking the fog snapshot",
+    "loading.reignofnether.connect": "Connecting",
+    "loading.reignofnether.receive": "Receiving the map",
+    "loading.reignofnether.join": "Joining the world",
+    "loading.reignofnether.save": "Saving the world",
+    "loading.reignofnether.replay": "Reading the replay",
+    "loading.reignofnether.replay_title": "Replay",
+    "loading.reignofnether.replay_by": "Replay · %s",
+    "loading.reignofnether.count": "%s / %s",
+    "loading.reignofnether.by": "by %s",
+    "loading.reignofnether.version": "v%s",
+    "hud.reignofnether.regen.none": "No regeneration",
+    "hud.reignofnether.regen.night": "Night time",
+    "hud.reignofnether.regen.night_source": "Night zone",
+    "hud.reignofnether.regen.nether": "Nether terrain",
+    "hud.reignofnether.regen.fervor": "Piglin Fervor",
+    "hud.reignofnether.regen.effect": "Regeneration",
+    "hud.reignofnether.regen.fountain": "Healing Fountain",
+    "hud.reignofnether.regen.battle_rage": "Battle Rage",
+    "hud.reignofnether.regen.wraith_snow": "Wraith snow",
+    "hud.reignofnether.regen.base": "Base",
+    "hud.reignofnether.regen.bonus": "Bonus",
+    "hud.reignofnether.regen.march": "March of Progress",
+    "hud.reignofnether.more_units": "%s more units",
+    "itemshop.reignofnether.close": "Close the shop",
+    "itemshop.reignofnether.serving": "Serving: %s",
+    "itemshop.reignofnether.serving_hint": "Click to switch to the next hero in range",
+    "itemshop.reignofnether.title": "ITEM SHOP",
+    "key.reignofnether.jump_to_alert": "Jump to attack alert",
+    "key.reignofnether.grid_q": "Command card: Q slot",
+    "key.reignofnether.grid_w": "Command card: W slot",
+    "key.reignofnether.grid_e": "Command card: E slot",
+    "key.reignofnether.grid_r": "Command card: R slot",
+    "key.reignofnether.grid_t": "Command card: T slot",
+    "key.reignofnether.grid_a": "Command card: A slot",
+    "key.reignofnether.grid_s": "Command card: S slot",
+    "key.reignofnether.grid_d": "Command card: D slot",
+    "key.reignofnether.grid_f": "Command card: F slot",
+    "key.reignofnether.grid_g": "Command card: G slot",
+    "key.reignofnether.grid_z": "Command card: Z slot",
+    "key.reignofnether.grid_x": "Command card: X slot",
+    "key.reignofnether.grid_c": "Command card: C slot",
+    "key.reignofnether.grid_v": "Command card: V slot",
+    "key.reignofnether.grid_b": "Command card: B slot",
+    "matchstart.reignofnether.header": "MATCH SETUP%s",
+    "matchstart.reignofnether.unnamed_map": "Custom map",
+    "matchstart.reignofnether.close": "CLOSE",
+    "matchstart.reignofnether.game_rules": "GAME RULES",
+    "matchstart.reignofnether.rules_host": "YOU ARE THE HOST",
+    "matchstart.reignofnether.rules_view": "ONLY THE HOST CAN CHANGE THESE",
+    "matchstart.reignofnether.players": "PLAYERS",
+    "matchstart.reignofnether.meta": "Version %s · %s seats",
+    "matchstart.reignofnether.host_only": "Only the host can change this",
+    "matchstart.reignofnether.seat.closed": "CLOSED",
+    "matchstart.reignofnether.seat.open": "OPEN",
+    "matchstart.reignofnether.seat.you": "YOU",
+    "matchstart.reignofnether.seat.open_title": "Open seat",
+    "matchstart.reignofnether.seat.closed_title": "Closed seat",
+    "matchstart.reignofnether.seat.take_hint": "Click to take this seat",
+    "matchstart.reignofnether.seat.move_hint": "Click to move here",
+    "matchstart.reignofnether.seat.close_hint": "Right-click to close this seat",
+    "matchstart.reignofnether.seat.open_hint": "Right-click to open this seat",
+    "matchstart.reignofnether.step.seat": "Take a seat",
+    "matchstart.reignofnether.step.faction": "Pick a faction",
+    "matchstart.reignofnether.step.ready": "Ready up",
+    "matchstart.reignofnether.team_sub": "%s / %s seats",
+    "matchstart.reignofnether.your_team": "your team",
+    "matchstart.reignofnether.picks_hidden": "seats hidden",
+    "matchstart.reignofnether.status.waiting": "WAITING",
+    "matchstart.reignofnether.status.ready": "READY",
+    "matchstart.reignofnether.status.not_ready": "NOT READY",
+    "matchstart.reignofnether.choosing": "CHOOSING…",
+    "matchstart.reignofnether.pick_hidden": "Taken",
+    "matchstart.reignofnether.you_name": "%s (you)",
+    "matchstart.reignofnether.action.open": "OPEN",
+    "matchstart.reignofnether.action.close": "CLOSE",
+    "matchstart.reignofnether.action.take": "TAKE SEAT",
+    "matchstart.reignofnether.action.move": "MOVE HERE",
+    "matchstart.reignofnether.action.leave": "LEAVE SEAT",
+    "matchstart.reignofnether.action.kick": "KICK",
+    "matchstart.reignofnether.faction_desc.villagers": "Start with a Town Centre and villagers as workers.",
+    "matchstart.reignofnether.faction_desc.monsters": "Start with a Mausoleum and zombie villagers as workers.",
+    "matchstart.reignofnether.faction_desc.piglins": "Start with a Central Portal and piglin grunts as workers.",
+    "matchstart.reignofnether.faction_desc.random": "One of the three factions, picked when the match starts.",
+    "matchstart.reignofnether.spectate": "LEAVE SEAT AND SPECTATE",
+    "matchstart.reignofnether.close_empty": "CLOSE EMPTY SEATS",
+    "matchstart.reignofnether.blocker": "%s open seat(s). The match starts when every open seat has a ready player.",
+    "matchstart.reignofnether.send": "SEND",
+    "matchstart.reignofnether.pick.spectating": "SPECTATING",
+    "matchstart.reignofnether.pick.no_seat": "No seat yet",
+    "matchstart.reignofnether.pick.no_seat_desc": "Take a seat on the map or in the roster to play. Spectators watch the match from any angle.",
+    "matchstart.reignofnether.pick.seated": "SEATED",
+    "matchstart.reignofnether.pick.pick_faction": "Pick a faction",
+    "matchstart.reignofnether.pick.pick_faction_desc": "Choose Villagers, Monsters, Piglins or Random in your roster row.",
+    "matchstart.reignofnether.pick.your_faction": "YOUR FACTION",
+    "matchstart.reignofnether.ready.take_seat": "TAKE A SEAT FIRST",
+    "matchstart.reignofnether.ready.pick_faction": "PICK A FACTION FIRST",
+    "matchstart.reignofnether.ready.unready": "READY ✓ · CLICK TO UNREADY",
+    "matchstart.reignofnether.ready.ready": "READY",
+    "matchstart.reignofnether.ready.ready_up": "READY UP",
+    "matchstart.reignofnether.ready.unready_short": "UNREADY",
+    "matchstart.reignofnether.all_ready": "ALL READY",
+    "matchstart.reignofnether.starting_in": "STARTING IN %s",
+    "hud.gamerule.reignofnether.title": "Game Rules",
+    "hud.gamerule.reignofnether.mapmaker_title": "Mapmaker Rules",
+    "hud.gamerule.reignofnether.tag.match": "MATCH",
+    "hud.gamerule.reignofnether.tag.server": "MAPMAKER",
+    "hud.gamerule.reignofnether.host_only": "Only the host can change this",
+    "hud.gamerule.reignofnether.op_only": "Needs operator rights to change",
+    "hud.gamerule.reignofnether.team_locked": "Always on in team modes",
+    "gamerule.reignofnether.name.max_population": "Max population",
+    "gamerule.reignofnether.name.allowed_heroes": "Heroes per player",
+    "gamerule.reignofnether.name.random_item_drops": "Item drops",
+    "gamerule.reignofnether.name.neutral_aggro": "Aggressive neutrals",
+    "gamerule.reignofnether.name.lock_alliances": "Lock alliances",
+    "gamerule.reignofnether.name.allow_beacons": "Beacons",
+    "gamerule.reignofnether.name.beacon_win_minutes": "Beacon win time (min)",
+    "gamerule.reignofnether.name.coop_mode": "Co-op mode",
+    "gamerule.reignofnether.name.pvp_modes_only": "PvP modes only",
+    "gamerule.reignofnether.name.do_log_falling": "Falling logs",
+    "gamerule.reignofnether.name.unit_griefing": "Unit griefing",
+    "gamerule.reignofnether.name.player_griefing": "Player griefing",
+    "gamerule.reignofnether.name.slanted_buildings": "Slanted buildings",
+    "gamerule.reignofnether.name.rts_pathfinding": "RTS pathfinding",
+    "gamerule.reignofnether.name.ground_y_level": "Ground Y level",
+    "gamerule.reignofnether.name.flying_max_y_level": "Flying max Y level",
+    "gamerule.reignofnether.name.animal_spawn_y_diff": "Animal spawn Y range",
+    "gamerule.reignofnether.random_item_drops.0": "OFF",
+    "gamerule.reignofnether.random_item_drops.1": "RANDOM",
+    "gamerule.reignofnether.random_item_drops.2": "SAME RARITY",
+    "gamerule.reignofnether.random_item_drops.3": "SAME ITEMS",
+    "hud.reignofnether.settings": "Settings",
+    "hud.reignofnether.settings.pan_speed": "Camera pan speed",
+    "hud.reignofnether.settings.pan_speed.desc": "How fast the camera moves when panning with the keys or the screen edge.",
+    "hud.reignofnether.settings.night_circles": "Night circles",
+    "hud.reignofnether.settings.night_circles.desc": "Show the night ranges of buildings that create darkness.",
+    "hud.reignofnether.settings.night_circles.all": "ALL",
+    "hud.reignofnether.settings.night_circles.no_overlaps": "NO OVERLAPS",
+    "hud.reignofnether.settings.night_circles.off": "OFF",
+    "hud.reignofnether.settings.underlines": "Underlines",
+    "hud.reignofnether.settings.underlines.desc": "Draw a coloured outline under units and buildings.",
+    "hud.reignofnether.settings.animals": "Highlight animals",
+    "hud.reignofnether.settings.animals.desc": "Make huntable animals glow so they are easy to find.",
+    "hud.reignofnether.settings.leaves": "Hide leaves",
+    "hud.reignofnether.settings.leaves.desc": "Hide tree leaves so you can see units underneath.",
+    "hud.reignofnether.settings.leaves.none": "OFF",
+    "hud.reignofnether.settings.leaves.around_units_and_cursor": "NEAR UNITS",
+    "hud.reignofnether.settings.leaves.all": "ALL",
+    "hud.reignofnether.settings.colours": "Unit colours",
+    "hud.reignofnether.settings.colours.desc": "Colour units by player or by relation (you, allies, enemies).",
+    "hud.reignofnether.settings.colours.players": "PLAYERS",
+    "hud.reignofnether.settings.colours.relations": "RELATIONS",
+    "hud.reignofnether.settings.square_map": "Square minimap",
+    "hud.reignofnether.settings.square_map.desc": "Show the minimap in a square frame instead of a diamond. The square cuts off the map's corners.",
+    "hud.reignofnether.settings.larger_small_text": "Larger small text",
+    "hud.reignofnether.settings.larger_small_text.desc": "Draw labels, hotkeys and counts one size bigger, for small screens.",
+    "hud.reignofnether.settings.solid_panels": "Solid panels",
+    "hud.reignofnether.settings.solid_panels.desc": "Turn off see-through HUD panels, so text stays readable over busy terrain.",
+    "hud.reignofnether.autocast_hint": "Ctrl + %s or right-click: toggle autocast",
+    "hud.reignofnether.settings.queue_own_row": "Queue on its own row",
+    "hud.reignofnether.settings.queue_own_row.desc": "Always show the production queue on a row under the control groups instead of next to them.",
+    "hud.reignofnether.settings.colour_self": "Your colour",
+    "hud.reignofnether.settings.colour_self.desc": "Colour of your units when colouring by relation.",
+    "hud.reignofnether.settings.colour_ally": "Ally colour",
+    "hud.reignofnether.settings.colour_ally.desc": "Colour of allied units when colouring by relation.",
+    "hud.reignofnether.settings.colour_neutral": "Neutral colour",
+    "hud.reignofnether.settings.colour_neutral.desc": "Colour of neutral units when colouring by relation.",
+    "hud.reignofnether.settings.colour_enemy": "Enemy colour",
+    "hud.reignofnether.settings.colour_enemy.desc": "Colour of enemy units when colouring by relation.",
+    "hud.reignofnether.settings.colour_name.red": "Red",
+    "hud.reignofnether.settings.colour_name.blue": "Blue",
+    "hud.reignofnether.settings.colour_name.cyan": "Cyan",
+    "hud.reignofnether.settings.colour_name.purple": "Purple",
+    "hud.reignofnether.settings.colour_name.yellow": "Yellow",
+    "hud.reignofnether.settings.colour_name.orange": "Orange",
+    "hud.reignofnether.settings.colour_name.lime": "Lime",
+    "hud.reignofnether.settings.colour_name.pink": "Pink",
+    "hud.reignofnether.settings.colour_name.magenta": "Magenta",
+    "hud.reignofnether.settings.colour_name.light_blue": "Light blue",
+    "hud.reignofnether.settings.colour_name.green": "Green",
+    "hud.reignofnether.settings.colour_name.brown": "Brown",
+    "hud.reignofnether.settings.colour_name.light_gray": "Light gray",
+    "hud.reignofnether.settings.colour_name.gray": "Gray",
+    "hud.reignofnether.settings.colour_name.black": "Black",
+    "hud.reignofnether.settings.colour_name.white": "White",
+    "hud.reignofnether.settings.colour_name.owned": "Bright green",
+    "hud.reignofnether.settings.colour_name.friendly": "Bright blue",
+    "hud.reignofnether.settings.colour_name.neutral": "Bright yellow",
+    "hud.reignofnether.settings.colour_name.hostile": "Bright red",
+    "hud.reignofnether.map.locked": "LOCKED",
+    "hud.reignofnether.map.follow": "FOLLOW",
+    "hud.reignofnether.diplomacy.title": "DIPLOMACY",
+    "hud.reignofnether.diplomacy.share_control": "Allies can control my units",
+    "hud.reignofnether.diplomacy.col_player": "PLAYER",
+    "hud.reignofnether.diplomacy.col_send": "SEND RESOURCES",
+    "hud.reignofnether.diplomacy.col_alliance": "ALLIANCE",
+    "hud.reignofnether.diplomacy.ally": "ALLY",
+    "hud.reignofnether.diplomacy.enemy": "ENEMY",
+    "hud.reignofnether.diplomacy.request_sent": "REQUEST SENT",
+    "hud.reignofnether.diplomacy.wants_alliance": "WANTS ALLIANCE",
+    "hud.reignofnether.diplomacy.offline": "OFFLINE",
+    "hud.reignofnether.diplomacy.first_person": "FIRST-PERSON",
+    "hud.reignofnether.diplomacy.shares_control": "SHARES CONTROL",
+    "hud.reignofnether.diplomacy.send": "SEND",
+    "hud.reignofnether.diplomacy.go_to_player": "GO TO PLAYER",
+    "hud.reignofnether.diplomacy.first_person_hint": "Fights in first person. Can't receive resources.",
+    "hud.reignofnether.diplomacy.disband": "DISBAND",
+    "hud.reignofnether.diplomacy.request": "REQUEST ALLIANCE",
+    "hud.reignofnether.diplomacy.cancel_request": "CANCEL REQUEST",
+    "hud.reignofnether.diplomacy.accept": "ACCEPT",
+    "hud.reignofnether.observer.title": "DIPLOMACY",
+    "hud.reignofnether.observer.col_resources": "RESOURCES",
+    "hud.reignofnether.observer.col_population": "POPULATION",
+    "hud.reignofnether.observer.allies": "ALLIES: %s",
+    "hud.reignofnether.observer.worker_pop": "Worker population",
+    "hud.reignofnether.observer.army_pop": "Army population",
+    "chat.reignofnether.channel.all": "ALL",
+    "chat.reignofnether.channel.info": "INFO",
+    "chat.reignofnether.panel.title": "CHAT",
+    "chat.reignofnether.panel.hints": "ENTER SEND · ESC CLOSE",
+    "chat.reignofnether.panel.placeholder": "Message",
+    "chat.reignofnether.panel.send": "SEND",
+    "chat.reignofnether.panel.channel.title": "Chat channel",
+    "chat.reignofnether.panel.channel.tooltip": "Click or press TAB to switch between team chat and all chat.",
+    "chat.reignofnether.panel.channel.locked": "Only works for players in a match.",
+    "matchstart.reignofnether.seat_number": "SEAT %s",
+    "gamerule.reignofnether.name.fog_of_war": "Fog of war",
+    "commands.reignofnether.gamerule.fog_of_war": "Players only see what their units and buildings can see. Also hides enemy picks and economy.",
+    "gamerule.reignofnether.name.hide_enemy_picks": "Hide enemy picks",
+    "commands.reignofnether.gamerule.hide_enemy_picks": "Players only see the factions picked by their own team before the match.",
+    "hud.reignofnether.observer.fog_hidden": "Hidden by fog of war",
+    "hud.reignofnether.you": "YOU",
+    "hud.reignofnether.ping": "%d MS",
+    "hud.reignofnether.rally_set": "RALLY SET",
+    "hud.reignofnether.no_rally": "NO RALLY",
+    "hud.reignofnether.map.zoom_in": "Zoom in",
+    "hud.reignofnether.map.zoom_out": "Zoom out",
+    "matchstart.reignofnether.title": "Match Setup",
+    "menu.reignofnether.discord": "Join our Discord",
+    "menu.reignofnether.tutorial": "Tutorial"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/es_ar.json b/src/main/resources/assets/reignofnether/lang/es_ar.json
index eb66c298d..734a93d11 100644
--- a/src/main/resources/assets/reignofnether/lang/es_ar.json
+++ b/src/main/resources/assets/reignofnether/lang/es_ar.json
@@ -906,8 +906,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s gana en: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Clic para ir al faro)",
 
-    "hud.map.reignofnether.open": "Abrir mapa grande/opciones",
-    "hud.map.reignofnether.close": "Cerrar",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Sensibilidad de cámara: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Clic izquierdo/derecho para ajustar)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Bloqueo de centro de mapa: Activado",
@@ -919,8 +917,6 @@
     "hud.map.reignofnether.rotate_cw.tooltip2": "(Alt + flecha-der.)",
     "hud.map.reignofnether.rotate_ccw.tooltip1": "Gire la cámara en sentido antihorario.",
     "hud.map.reignofnether.rotate_ccw.tooltip2": "(Alt + flecha-izq.)",
-    "hud.map.reignofnether.marker_mode_enabled": "Modo Marcador: ON",
-    "hud.map.reignofnether.marker_mode_disabled": "Modo Marcador: OFF",
 
     "hud.startbuttons.villagers.reignofnether.first": "Unirse al juego como Aldeanos",
     "hud.startbuttons.villagers.reignofnether.second": "Genera %d aldeanos en la ubicación objetivo.",
@@ -948,11 +944,9 @@
     "hud.reignofnether.drop_off_resources": "Depositar recursos",
     "hud.reignofnether.gather_resources": "Recolectar recursos (%s)",
     "hud.reignofnether.change_target_resource": "Clic para cambiar recurso objetivo",
-    "hud.reignofnether.total_workers": "Trabajadores totales: %d",
     "hud.reignofnether.workers_on_food": "Trabajadores en comida",
     "hud.reignofnether.workers_on_wood": "Trabajadores en madera",
     "hud.reignofnether.workers_on_ore": "Trabajadores en mineral",
-    "hud.reignofnether.max_resources": "%s (Máx: %d)",
     "hud.reignofnether.players_resources": "Recursos de %s",
     "hud.reignofnether.you_are_spectator": "Eres un espectador",
     "hud.reignofnether.placed_capitol": "¡%s ha colocado su edificio capital!",
@@ -1019,8 +1013,6 @@
     "hud.relationship.reignofnether.enemy": "Enemigo",
     "hud.relationship.reignofnether.neutral": "Neutral",
 
-    "hud.hero.reignofnether.level": " (Nivel %d)",
-    "hud.hero.reignofnether.level.short": "Nv %d",
     "hud.hero.reignofnether.experience": "Experiencia: %d/%d",
     "hud.hero.reignofnether.experience_warning": "No exp de neutrales de nivel 5",
     "hud.hero.reignofnether.max_level": "¡Nivel Máximo!",
@@ -1263,21 +1255,10 @@
     "time.reignofnether.time_until_next_wave": "%s hasta la próxima oleada",
 
     "tutorial.reignofnether.tutorial_help": "Ayuda del Tutorial",
-    "tutorial.reignofnether.welcome": "Bienvenido a Reign of Nether",
     "tutorial.reignofnether.welcome2": "¡Bienvenido al tutorial de Reign of Nether!",
     "tutorial.reignofnether.get_started": "Presiona F12 o usa /rts-camera para comenzar.",
-    "tutorial.reignofnether.join": "Presiona F12 para alternar la cámara RTS y unirte al juego",
-    "tutorial.reignofnether.help": "Usa '/rts-help' para ver la lista de todos los comandos",
-    "tutorial.reignofnether.controls": "Usa '/rts-controls' para ver los controles",
-    "tutorial.reignofnether.locked": "Esta partida RTS está bloqueada. Espera a una nueva partida para unirte.",
-    "tutorial.reignofnether.welcome_back": "¡Bienvenido de nuevo a Reign of Nether!",
-    "tutorial.reignofnether.op_commands": "Como operador del servidor puedes usar:",
-    "tutorial.reignofnether.fog": "/rts-fog activar | desactivar",
-    "tutorial.reignofnether.lock": "/rts-lock activar | desactivar",
     "tutorial.reignofnether.syncing": "/rts-syncing activar | desactivar (experimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "La sincronización RTS está desactivada, no puedes seleccionar edificios ni ver dueños de unidades.",
-    "tutorial.reignofnether.sync_disabled2": "Pide al anfitrión que la reactive y vuelve a entrar.",
     "tutorial.reignofnether.server_not_found": "Error al cargar el tutorial: servidor no encontrado.",
     "tutorial.reignofnether.resuming": "Bienvenido... Continuando en la etapa: %s",
     "tutorial.reignofnether.skipping": "Saltando etapa... Ahora estás en: %s",
@@ -1600,26 +1581,24 @@
     "units.reignofnether.hero_production.allowed_heroes_2": "You may have two different heroes per game",
     "units.reignofnether.hero_production.unlock_hero_2": "Unlock a 2nd hero with a Castle, Stronghold or Fortress",
 
-    "alliance.reignofnether.sent_request": "\nSolicitud de alianza enviada a %s.\n",
-    "alliance.reignofnether.ally_self": "\n¡No puedes aliarte contigo mismo!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.\n",
-    "alliance.reignofnether.now_allied": "\nAhora estás aliado con %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s ha aceptado tu solicitud de alianza.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\nRetracted alliance request to %s.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s has retracted their alliance request.\n",
-    "alliance.reignofnether.no_request": "\nNo hay solicitudes pendientes de %s.\n",
-    "alliance.reignofnether.alliances_lock": "\nYou may not change alliances during a match (gamerule lockAlliances is on).\n",
-    "alliance.reignofnether.alliances_lock_coop": "\nYou may not change alliances during a match (gamerule coopMode is on).\n",
-    "alliance.reignofnether.disbanded": "\nTu alianza con %s ha sido disuelta.\n",
-    "alliance.reignofnether.disbanding": "\nDisolviendo alianza con %s en 30 segundos...\n",
-    "alliance.reignofnether.disband_self": "\nNo puedes disolver tu propia alianza.\n",
-    "alliance.reignofnether.disband_pending": "\nYa hay una solicitud de disolución pendiente para este jugador.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s ahora está aliado con %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s disolvió su alianza con %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nEstás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nNO estás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s ahora comparte el control de la unidad con sus aliados.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s ahora no comparte el control de la unidad con sus aliados.\n",
+    "alliance.reignofnether.sent_request": "Solicitud de alianza enviada a %s.",
+    "alliance.reignofnether.ally_self": "¡No puedes aliarte contigo mismo!",
+    "alliance.reignofnether.ally_confirm": "%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.",
+    "alliance.reignofnether.now_allied": "Ahora estás aliado con %s.",
+    "alliance.reignofnether.ally_accepted": "%s ha aceptado tu solicitud de alianza.",
+    "alliance.reignofnether.ally_request_cancelled_self": "Retracted alliance request to %s.",
+    "alliance.reignofnether.ally_request_cancelled": "%s has retracted their alliance request.",
+    "alliance.reignofnether.no_request": "No hay solicitudes pendientes de %s.",
+    "alliance.reignofnether.alliances_lock": "You may not change alliances during a match (gamerule lockAlliances is on).",
+    "alliance.reignofnether.alliances_lock_coop": "You may not change alliances during a match (gamerule coopMode is on).",
+    "alliance.reignofnether.disbanded": "Tu alianza con %s ha sido disuelta.",
+    "alliance.reignofnether.disband_self": "No puedes disolver tu propia alianza.",
+    "alliance.reignofnether.now_allied_third_party": "%s ahora está aliado con %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s disolvió su alianza con %s.",
+    "alliance.reignofnether.ally_control_enabled": "Estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_disabled": "NO estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_enable": "%s ahora comparte el control de la unidad con sus aliados.",
+    "alliance.reignofnether.ally_control_disable": "%s ahora no comparte el control de la unidad con sus aliados.",
 
     "survival.reignofnether.dawn": "El amanecer llega",
     "survival.reignofnether.dusk": "La noche cae...",
@@ -1718,10 +1697,6 @@
     "hud.gamemode.reignofnether.npc_scenario_role": "(Solo NPC)",
     "hud.gamemode.reignofnether.cycle_scenario_role": "(Haz clic para cambiar)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Mantén shift para ajustar más rápido)",
-    "hud.gamerule.reignofnether.click": "(Haz clic izquierdo/derecho para ajustar)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Solo operadores pueden modificar)",
-    "hud.gamerule.reignofnether.menu": "Menú de Reglas del Juego",
 
     "config.reignofnether.warn_config_change": "El anfitrión ha cambiado configuraciones",
     "config.reignofnether.hide_config_change": "(Haz clic para ocultar)",
@@ -1860,7 +1835,6 @@
     "startpos.reignofnether.start_button.no_faction": "¡No has elegido una facción!",
     "startpos.reignofnether.cancel_start_button": "Cancelar inicio del juego",
     "startpos.reignofnether.cancelled_start_game": "Inicio del juego cancelado",
-    "startpos.reignofnether.starting_game": "El juego comenzará en %d segundos",
     "startpos.reignofnether.started_game": "¡Juego iniciado!",
     "startpos.reignofnether.max_positions": "Límite de ubicaciones iniciales alcanzado (16)",
     "startpos.reignofnether.rts_map_info_used": "This map uses rtsmap.json start positions (start blocks are ignored)",
@@ -1977,7 +1951,6 @@
     "key.reignofnether.ability_9": "Slot de Habilidad 9",
     "key.reignofnether.ability_10": "Slot de Habilidad 10",
 
-    "key.reignofnether.minimap_toggle": "Alternar minimapa",
     "key.reignofnether.hotkey_1": "Tecla de Acceso Rápido 1",
     "key.reignofnether.hotkey_2": "Tecla de Acceso Rápido 2",
     "key.reignofnether.hotkey_3": "Tecla de Acceso Rápido 3",
@@ -1985,7 +1958,6 @@
     "key.reignofnether.hotkey_5": "Tecla de Acceso Rápido 5",
     "key.reignofnether.hotkey_6": "Tecla de Acceso Rápido 6",
     "key.reignofnether.hotkey_7": "Tecla de Acceso Rápido 7",
-    "key.reignofnether.hotkey_8": "Tecla de Acceso Rápido 8",
     "key.reignofnether.hotkey_9": "Tecla de Acceso Rápido 9",
 
     "key.reignofnether.control_group_0": "Grupo de Control 0",
@@ -2013,7 +1985,6 @@
     "key.reignofnether.fn_12": "Tecla de Función 12 (Alternar Cámara RTS)",
 
     "matchstart.reignofnether.mode": "Modo: %s",
-    "matchstart.reignofnether.map_preview": "MAPA",
     "matchstart.reignofnether.roster": "PLANTILLA",
     "matchstart.reignofnether.team": "Equipo %d",
     "matchstart.reignofnether.no_positions": "Sin posiciones de inicio disponibles todavía.",
@@ -2024,20 +1995,11 @@
     "matchstart.reignofnether.ready_count": "%d / %d listo",
     "matchstart.reignofnether.map_loading": "Cargando mapa…",
     "matchstart.reignofnether.place_blocks_hint": "Coloca bloques de inicio de RTS para agregar posiciones.",
-    "matchstart.reignofnether.empty_slot": "(vacío — haz clic para unirte)",
     "matchstart.reignofnether.spectators": "ESPECTADORES",
-    "matchstart.reignofnether.spectator_tag": "espectando",
-    "matchstart.reignofnether.join_spectators": "+ Deja mi equipo y especta",
     "matchstart.reignofnether.no_spectators": "(no spectators yet)",
     "matchstart.reignofnether.chat": "CHAT",
     "matchstart.reignofnether.chat.placeholder": "Escribe un mensaje…",
     "matchstart.reignofnether.chat.click_to_type": "Presiona T o haz click aquí para escribir — Intro para enviar",
-    "matchstart.reignofnether.hint.pick_pos": "Haz click en el mapa para elegir una posición de inicio.",
-    "matchstart.reignofnether.hint.pick_faction": "Elige tu facción.",
-    "matchstart.reignofnether.hint.ready_up": "Haz click en la cruz en tu fila para estar listo.",
-    "matchstart.reignofnether.hint.waiting": "Esperando a que otros jugadores estén listos.",
-    "matchstart.reignofnether.hint.close": "Haz click en Atrás para salir · F12 off + on para reabrir.",
     "matchstart.reignofnether.settings.title": "CONFIGURACIÓN DEL JUEGO",
-    "matchstart.reignofnether.settings.mode": "Modo",
-    "matchstart.reignofnether.settings.op_only": "Configuraciones de Gamerule requieren operador."
+    "matchstart.reignofnether.settings.mode": "Modo"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/es_cl.json b/src/main/resources/assets/reignofnether/lang/es_cl.json
index eb66c298d..734a93d11 100644
--- a/src/main/resources/assets/reignofnether/lang/es_cl.json
+++ b/src/main/resources/assets/reignofnether/lang/es_cl.json
@@ -906,8 +906,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s gana en: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Clic para ir al faro)",
 
-    "hud.map.reignofnether.open": "Abrir mapa grande/opciones",
-    "hud.map.reignofnether.close": "Cerrar",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Sensibilidad de cámara: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Clic izquierdo/derecho para ajustar)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Bloqueo de centro de mapa: Activado",
@@ -919,8 +917,6 @@
     "hud.map.reignofnether.rotate_cw.tooltip2": "(Alt + flecha-der.)",
     "hud.map.reignofnether.rotate_ccw.tooltip1": "Gire la cámara en sentido antihorario.",
     "hud.map.reignofnether.rotate_ccw.tooltip2": "(Alt + flecha-izq.)",
-    "hud.map.reignofnether.marker_mode_enabled": "Modo Marcador: ON",
-    "hud.map.reignofnether.marker_mode_disabled": "Modo Marcador: OFF",
 
     "hud.startbuttons.villagers.reignofnether.first": "Unirse al juego como Aldeanos",
     "hud.startbuttons.villagers.reignofnether.second": "Genera %d aldeanos en la ubicación objetivo.",
@@ -948,11 +944,9 @@
     "hud.reignofnether.drop_off_resources": "Depositar recursos",
     "hud.reignofnether.gather_resources": "Recolectar recursos (%s)",
     "hud.reignofnether.change_target_resource": "Clic para cambiar recurso objetivo",
-    "hud.reignofnether.total_workers": "Trabajadores totales: %d",
     "hud.reignofnether.workers_on_food": "Trabajadores en comida",
     "hud.reignofnether.workers_on_wood": "Trabajadores en madera",
     "hud.reignofnether.workers_on_ore": "Trabajadores en mineral",
-    "hud.reignofnether.max_resources": "%s (Máx: %d)",
     "hud.reignofnether.players_resources": "Recursos de %s",
     "hud.reignofnether.you_are_spectator": "Eres un espectador",
     "hud.reignofnether.placed_capitol": "¡%s ha colocado su edificio capital!",
@@ -1019,8 +1013,6 @@
     "hud.relationship.reignofnether.enemy": "Enemigo",
     "hud.relationship.reignofnether.neutral": "Neutral",
 
-    "hud.hero.reignofnether.level": " (Nivel %d)",
-    "hud.hero.reignofnether.level.short": "Nv %d",
     "hud.hero.reignofnether.experience": "Experiencia: %d/%d",
     "hud.hero.reignofnether.experience_warning": "No exp de neutrales de nivel 5",
     "hud.hero.reignofnether.max_level": "¡Nivel Máximo!",
@@ -1263,21 +1255,10 @@
     "time.reignofnether.time_until_next_wave": "%s hasta la próxima oleada",
 
     "tutorial.reignofnether.tutorial_help": "Ayuda del Tutorial",
-    "tutorial.reignofnether.welcome": "Bienvenido a Reign of Nether",
     "tutorial.reignofnether.welcome2": "¡Bienvenido al tutorial de Reign of Nether!",
     "tutorial.reignofnether.get_started": "Presiona F12 o usa /rts-camera para comenzar.",
-    "tutorial.reignofnether.join": "Presiona F12 para alternar la cámara RTS y unirte al juego",
-    "tutorial.reignofnether.help": "Usa '/rts-help' para ver la lista de todos los comandos",
-    "tutorial.reignofnether.controls": "Usa '/rts-controls' para ver los controles",
-    "tutorial.reignofnether.locked": "Esta partida RTS está bloqueada. Espera a una nueva partida para unirte.",
-    "tutorial.reignofnether.welcome_back": "¡Bienvenido de nuevo a Reign of Nether!",
-    "tutorial.reignofnether.op_commands": "Como operador del servidor puedes usar:",
-    "tutorial.reignofnether.fog": "/rts-fog activar | desactivar",
-    "tutorial.reignofnether.lock": "/rts-lock activar | desactivar",
     "tutorial.reignofnether.syncing": "/rts-syncing activar | desactivar (experimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "La sincronización RTS está desactivada, no puedes seleccionar edificios ni ver dueños de unidades.",
-    "tutorial.reignofnether.sync_disabled2": "Pide al anfitrión que la reactive y vuelve a entrar.",
     "tutorial.reignofnether.server_not_found": "Error al cargar el tutorial: servidor no encontrado.",
     "tutorial.reignofnether.resuming": "Bienvenido... Continuando en la etapa: %s",
     "tutorial.reignofnether.skipping": "Saltando etapa... Ahora estás en: %s",
@@ -1600,26 +1581,24 @@
     "units.reignofnether.hero_production.allowed_heroes_2": "You may have two different heroes per game",
     "units.reignofnether.hero_production.unlock_hero_2": "Unlock a 2nd hero with a Castle, Stronghold or Fortress",
 
-    "alliance.reignofnether.sent_request": "\nSolicitud de alianza enviada a %s.\n",
-    "alliance.reignofnether.ally_self": "\n¡No puedes aliarte contigo mismo!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.\n",
-    "alliance.reignofnether.now_allied": "\nAhora estás aliado con %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s ha aceptado tu solicitud de alianza.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\nRetracted alliance request to %s.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s has retracted their alliance request.\n",
-    "alliance.reignofnether.no_request": "\nNo hay solicitudes pendientes de %s.\n",
-    "alliance.reignofnether.alliances_lock": "\nYou may not change alliances during a match (gamerule lockAlliances is on).\n",
-    "alliance.reignofnether.alliances_lock_coop": "\nYou may not change alliances during a match (gamerule coopMode is on).\n",
-    "alliance.reignofnether.disbanded": "\nTu alianza con %s ha sido disuelta.\n",
-    "alliance.reignofnether.disbanding": "\nDisolviendo alianza con %s en 30 segundos...\n",
-    "alliance.reignofnether.disband_self": "\nNo puedes disolver tu propia alianza.\n",
-    "alliance.reignofnether.disband_pending": "\nYa hay una solicitud de disolución pendiente para este jugador.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s ahora está aliado con %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s disolvió su alianza con %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nEstás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nNO estás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s ahora comparte el control de la unidad con sus aliados.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s ahora no comparte el control de la unidad con sus aliados.\n",
+    "alliance.reignofnether.sent_request": "Solicitud de alianza enviada a %s.",
+    "alliance.reignofnether.ally_self": "¡No puedes aliarte contigo mismo!",
+    "alliance.reignofnether.ally_confirm": "%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.",
+    "alliance.reignofnether.now_allied": "Ahora estás aliado con %s.",
+    "alliance.reignofnether.ally_accepted": "%s ha aceptado tu solicitud de alianza.",
+    "alliance.reignofnether.ally_request_cancelled_self": "Retracted alliance request to %s.",
+    "alliance.reignofnether.ally_request_cancelled": "%s has retracted their alliance request.",
+    "alliance.reignofnether.no_request": "No hay solicitudes pendientes de %s.",
+    "alliance.reignofnether.alliances_lock": "You may not change alliances during a match (gamerule lockAlliances is on).",
+    "alliance.reignofnether.alliances_lock_coop": "You may not change alliances during a match (gamerule coopMode is on).",
+    "alliance.reignofnether.disbanded": "Tu alianza con %s ha sido disuelta.",
+    "alliance.reignofnether.disband_self": "No puedes disolver tu propia alianza.",
+    "alliance.reignofnether.now_allied_third_party": "%s ahora está aliado con %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s disolvió su alianza con %s.",
+    "alliance.reignofnether.ally_control_enabled": "Estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_disabled": "NO estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_enable": "%s ahora comparte el control de la unidad con sus aliados.",
+    "alliance.reignofnether.ally_control_disable": "%s ahora no comparte el control de la unidad con sus aliados.",
 
     "survival.reignofnether.dawn": "El amanecer llega",
     "survival.reignofnether.dusk": "La noche cae...",
@@ -1718,10 +1697,6 @@
     "hud.gamemode.reignofnether.npc_scenario_role": "(Solo NPC)",
     "hud.gamemode.reignofnether.cycle_scenario_role": "(Haz clic para cambiar)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Mantén shift para ajustar más rápido)",
-    "hud.gamerule.reignofnether.click": "(Haz clic izquierdo/derecho para ajustar)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Solo operadores pueden modificar)",
-    "hud.gamerule.reignofnether.menu": "Menú de Reglas del Juego",
 
     "config.reignofnether.warn_config_change": "El anfitrión ha cambiado configuraciones",
     "config.reignofnether.hide_config_change": "(Haz clic para ocultar)",
@@ -1860,7 +1835,6 @@
     "startpos.reignofnether.start_button.no_faction": "¡No has elegido una facción!",
     "startpos.reignofnether.cancel_start_button": "Cancelar inicio del juego",
     "startpos.reignofnether.cancelled_start_game": "Inicio del juego cancelado",
-    "startpos.reignofnether.starting_game": "El juego comenzará en %d segundos",
     "startpos.reignofnether.started_game": "¡Juego iniciado!",
     "startpos.reignofnether.max_positions": "Límite de ubicaciones iniciales alcanzado (16)",
     "startpos.reignofnether.rts_map_info_used": "This map uses rtsmap.json start positions (start blocks are ignored)",
@@ -1977,7 +1951,6 @@
     "key.reignofnether.ability_9": "Slot de Habilidad 9",
     "key.reignofnether.ability_10": "Slot de Habilidad 10",
 
-    "key.reignofnether.minimap_toggle": "Alternar minimapa",
     "key.reignofnether.hotkey_1": "Tecla de Acceso Rápido 1",
     "key.reignofnether.hotkey_2": "Tecla de Acceso Rápido 2",
     "key.reignofnether.hotkey_3": "Tecla de Acceso Rápido 3",
@@ -1985,7 +1958,6 @@
     "key.reignofnether.hotkey_5": "Tecla de Acceso Rápido 5",
     "key.reignofnether.hotkey_6": "Tecla de Acceso Rápido 6",
     "key.reignofnether.hotkey_7": "Tecla de Acceso Rápido 7",
-    "key.reignofnether.hotkey_8": "Tecla de Acceso Rápido 8",
     "key.reignofnether.hotkey_9": "Tecla de Acceso Rápido 9",
 
     "key.reignofnether.control_group_0": "Grupo de Control 0",
@@ -2013,7 +1985,6 @@
     "key.reignofnether.fn_12": "Tecla de Función 12 (Alternar Cámara RTS)",
 
     "matchstart.reignofnether.mode": "Modo: %s",
-    "matchstart.reignofnether.map_preview": "MAPA",
     "matchstart.reignofnether.roster": "PLANTILLA",
     "matchstart.reignofnether.team": "Equipo %d",
     "matchstart.reignofnether.no_positions": "Sin posiciones de inicio disponibles todavía.",
@@ -2024,20 +1995,11 @@
     "matchstart.reignofnether.ready_count": "%d / %d listo",
     "matchstart.reignofnether.map_loading": "Cargando mapa…",
     "matchstart.reignofnether.place_blocks_hint": "Coloca bloques de inicio de RTS para agregar posiciones.",
-    "matchstart.reignofnether.empty_slot": "(vacío — haz clic para unirte)",
     "matchstart.reignofnether.spectators": "ESPECTADORES",
-    "matchstart.reignofnether.spectator_tag": "espectando",
-    "matchstart.reignofnether.join_spectators": "+ Deja mi equipo y especta",
     "matchstart.reignofnether.no_spectators": "(no spectators yet)",
     "matchstart.reignofnether.chat": "CHAT",
     "matchstart.reignofnether.chat.placeholder": "Escribe un mensaje…",
     "matchstart.reignofnether.chat.click_to_type": "Presiona T o haz click aquí para escribir — Intro para enviar",
-    "matchstart.reignofnether.hint.pick_pos": "Haz click en el mapa para elegir una posición de inicio.",
-    "matchstart.reignofnether.hint.pick_faction": "Elige tu facción.",
-    "matchstart.reignofnether.hint.ready_up": "Haz click en la cruz en tu fila para estar listo.",
-    "matchstart.reignofnether.hint.waiting": "Esperando a que otros jugadores estén listos.",
-    "matchstart.reignofnether.hint.close": "Haz click en Atrás para salir · F12 off + on para reabrir.",
     "matchstart.reignofnether.settings.title": "CONFIGURACIÓN DEL JUEGO",
-    "matchstart.reignofnether.settings.mode": "Modo",
-    "matchstart.reignofnether.settings.op_only": "Configuraciones de Gamerule requieren operador."
+    "matchstart.reignofnether.settings.mode": "Modo"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/es_ec.json b/src/main/resources/assets/reignofnether/lang/es_ec.json
index eb66c298d..734a93d11 100644
--- a/src/main/resources/assets/reignofnether/lang/es_ec.json
+++ b/src/main/resources/assets/reignofnether/lang/es_ec.json
@@ -906,8 +906,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s gana en: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Clic para ir al faro)",
 
-    "hud.map.reignofnether.open": "Abrir mapa grande/opciones",
-    "hud.map.reignofnether.close": "Cerrar",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Sensibilidad de cámara: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Clic izquierdo/derecho para ajustar)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Bloqueo de centro de mapa: Activado",
@@ -919,8 +917,6 @@
     "hud.map.reignofnether.rotate_cw.tooltip2": "(Alt + flecha-der.)",
     "hud.map.reignofnether.rotate_ccw.tooltip1": "Gire la cámara en sentido antihorario.",
     "hud.map.reignofnether.rotate_ccw.tooltip2": "(Alt + flecha-izq.)",
-    "hud.map.reignofnether.marker_mode_enabled": "Modo Marcador: ON",
-    "hud.map.reignofnether.marker_mode_disabled": "Modo Marcador: OFF",
 
     "hud.startbuttons.villagers.reignofnether.first": "Unirse al juego como Aldeanos",
     "hud.startbuttons.villagers.reignofnether.second": "Genera %d aldeanos en la ubicación objetivo.",
@@ -948,11 +944,9 @@
     "hud.reignofnether.drop_off_resources": "Depositar recursos",
     "hud.reignofnether.gather_resources": "Recolectar recursos (%s)",
     "hud.reignofnether.change_target_resource": "Clic para cambiar recurso objetivo",
-    "hud.reignofnether.total_workers": "Trabajadores totales: %d",
     "hud.reignofnether.workers_on_food": "Trabajadores en comida",
     "hud.reignofnether.workers_on_wood": "Trabajadores en madera",
     "hud.reignofnether.workers_on_ore": "Trabajadores en mineral",
-    "hud.reignofnether.max_resources": "%s (Máx: %d)",
     "hud.reignofnether.players_resources": "Recursos de %s",
     "hud.reignofnether.you_are_spectator": "Eres un espectador",
     "hud.reignofnether.placed_capitol": "¡%s ha colocado su edificio capital!",
@@ -1019,8 +1013,6 @@
     "hud.relationship.reignofnether.enemy": "Enemigo",
     "hud.relationship.reignofnether.neutral": "Neutral",
 
-    "hud.hero.reignofnether.level": " (Nivel %d)",
-    "hud.hero.reignofnether.level.short": "Nv %d",
     "hud.hero.reignofnether.experience": "Experiencia: %d/%d",
     "hud.hero.reignofnether.experience_warning": "No exp de neutrales de nivel 5",
     "hud.hero.reignofnether.max_level": "¡Nivel Máximo!",
@@ -1263,21 +1255,10 @@
     "time.reignofnether.time_until_next_wave": "%s hasta la próxima oleada",
 
     "tutorial.reignofnether.tutorial_help": "Ayuda del Tutorial",
-    "tutorial.reignofnether.welcome": "Bienvenido a Reign of Nether",
     "tutorial.reignofnether.welcome2": "¡Bienvenido al tutorial de Reign of Nether!",
     "tutorial.reignofnether.get_started": "Presiona F12 o usa /rts-camera para comenzar.",
-    "tutorial.reignofnether.join": "Presiona F12 para alternar la cámara RTS y unirte al juego",
-    "tutorial.reignofnether.help": "Usa '/rts-help' para ver la lista de todos los comandos",
-    "tutorial.reignofnether.controls": "Usa '/rts-controls' para ver los controles",
-    "tutorial.reignofnether.locked": "Esta partida RTS está bloqueada. Espera a una nueva partida para unirte.",
-    "tutorial.reignofnether.welcome_back": "¡Bienvenido de nuevo a Reign of Nether!",
-    "tutorial.reignofnether.op_commands": "Como operador del servidor puedes usar:",
-    "tutorial.reignofnether.fog": "/rts-fog activar | desactivar",
-    "tutorial.reignofnether.lock": "/rts-lock activar | desactivar",
     "tutorial.reignofnether.syncing": "/rts-syncing activar | desactivar (experimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "La sincronización RTS está desactivada, no puedes seleccionar edificios ni ver dueños de unidades.",
-    "tutorial.reignofnether.sync_disabled2": "Pide al anfitrión que la reactive y vuelve a entrar.",
     "tutorial.reignofnether.server_not_found": "Error al cargar el tutorial: servidor no encontrado.",
     "tutorial.reignofnether.resuming": "Bienvenido... Continuando en la etapa: %s",
     "tutorial.reignofnether.skipping": "Saltando etapa... Ahora estás en: %s",
@@ -1600,26 +1581,24 @@
     "units.reignofnether.hero_production.allowed_heroes_2": "You may have two different heroes per game",
     "units.reignofnether.hero_production.unlock_hero_2": "Unlock a 2nd hero with a Castle, Stronghold or Fortress",
 
-    "alliance.reignofnether.sent_request": "\nSolicitud de alianza enviada a %s.\n",
-    "alliance.reignofnether.ally_self": "\n¡No puedes aliarte contigo mismo!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.\n",
-    "alliance.reignofnether.now_allied": "\nAhora estás aliado con %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s ha aceptado tu solicitud de alianza.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\nRetracted alliance request to %s.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s has retracted their alliance request.\n",
-    "alliance.reignofnether.no_request": "\nNo hay solicitudes pendientes de %s.\n",
-    "alliance.reignofnether.alliances_lock": "\nYou may not change alliances during a match (gamerule lockAlliances is on).\n",
-    "alliance.reignofnether.alliances_lock_coop": "\nYou may not change alliances during a match (gamerule coopMode is on).\n",
-    "alliance.reignofnether.disbanded": "\nTu alianza con %s ha sido disuelta.\n",
-    "alliance.reignofnether.disbanding": "\nDisolviendo alianza con %s en 30 segundos...\n",
-    "alliance.reignofnether.disband_self": "\nNo puedes disolver tu propia alianza.\n",
-    "alliance.reignofnether.disband_pending": "\nYa hay una solicitud de disolución pendiente para este jugador.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s ahora está aliado con %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s disolvió su alianza con %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nEstás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nNO estás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s ahora comparte el control de la unidad con sus aliados.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s ahora no comparte el control de la unidad con sus aliados.\n",
+    "alliance.reignofnether.sent_request": "Solicitud de alianza enviada a %s.",
+    "alliance.reignofnether.ally_self": "¡No puedes aliarte contigo mismo!",
+    "alliance.reignofnether.ally_confirm": "%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.",
+    "alliance.reignofnether.now_allied": "Ahora estás aliado con %s.",
+    "alliance.reignofnether.ally_accepted": "%s ha aceptado tu solicitud de alianza.",
+    "alliance.reignofnether.ally_request_cancelled_self": "Retracted alliance request to %s.",
+    "alliance.reignofnether.ally_request_cancelled": "%s has retracted their alliance request.",
+    "alliance.reignofnether.no_request": "No hay solicitudes pendientes de %s.",
+    "alliance.reignofnether.alliances_lock": "You may not change alliances during a match (gamerule lockAlliances is on).",
+    "alliance.reignofnether.alliances_lock_coop": "You may not change alliances during a match (gamerule coopMode is on).",
+    "alliance.reignofnether.disbanded": "Tu alianza con %s ha sido disuelta.",
+    "alliance.reignofnether.disband_self": "No puedes disolver tu propia alianza.",
+    "alliance.reignofnether.now_allied_third_party": "%s ahora está aliado con %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s disolvió su alianza con %s.",
+    "alliance.reignofnether.ally_control_enabled": "Estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_disabled": "NO estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_enable": "%s ahora comparte el control de la unidad con sus aliados.",
+    "alliance.reignofnether.ally_control_disable": "%s ahora no comparte el control de la unidad con sus aliados.",
 
     "survival.reignofnether.dawn": "El amanecer llega",
     "survival.reignofnether.dusk": "La noche cae...",
@@ -1718,10 +1697,6 @@
     "hud.gamemode.reignofnether.npc_scenario_role": "(Solo NPC)",
     "hud.gamemode.reignofnether.cycle_scenario_role": "(Haz clic para cambiar)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Mantén shift para ajustar más rápido)",
-    "hud.gamerule.reignofnether.click": "(Haz clic izquierdo/derecho para ajustar)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Solo operadores pueden modificar)",
-    "hud.gamerule.reignofnether.menu": "Menú de Reglas del Juego",
 
     "config.reignofnether.warn_config_change": "El anfitrión ha cambiado configuraciones",
     "config.reignofnether.hide_config_change": "(Haz clic para ocultar)",
@@ -1860,7 +1835,6 @@
     "startpos.reignofnether.start_button.no_faction": "¡No has elegido una facción!",
     "startpos.reignofnether.cancel_start_button": "Cancelar inicio del juego",
     "startpos.reignofnether.cancelled_start_game": "Inicio del juego cancelado",
-    "startpos.reignofnether.starting_game": "El juego comenzará en %d segundos",
     "startpos.reignofnether.started_game": "¡Juego iniciado!",
     "startpos.reignofnether.max_positions": "Límite de ubicaciones iniciales alcanzado (16)",
     "startpos.reignofnether.rts_map_info_used": "This map uses rtsmap.json start positions (start blocks are ignored)",
@@ -1977,7 +1951,6 @@
     "key.reignofnether.ability_9": "Slot de Habilidad 9",
     "key.reignofnether.ability_10": "Slot de Habilidad 10",
 
-    "key.reignofnether.minimap_toggle": "Alternar minimapa",
     "key.reignofnether.hotkey_1": "Tecla de Acceso Rápido 1",
     "key.reignofnether.hotkey_2": "Tecla de Acceso Rápido 2",
     "key.reignofnether.hotkey_3": "Tecla de Acceso Rápido 3",
@@ -1985,7 +1958,6 @@
     "key.reignofnether.hotkey_5": "Tecla de Acceso Rápido 5",
     "key.reignofnether.hotkey_6": "Tecla de Acceso Rápido 6",
     "key.reignofnether.hotkey_7": "Tecla de Acceso Rápido 7",
-    "key.reignofnether.hotkey_8": "Tecla de Acceso Rápido 8",
     "key.reignofnether.hotkey_9": "Tecla de Acceso Rápido 9",
 
     "key.reignofnether.control_group_0": "Grupo de Control 0",
@@ -2013,7 +1985,6 @@
     "key.reignofnether.fn_12": "Tecla de Función 12 (Alternar Cámara RTS)",
 
     "matchstart.reignofnether.mode": "Modo: %s",
-    "matchstart.reignofnether.map_preview": "MAPA",
     "matchstart.reignofnether.roster": "PLANTILLA",
     "matchstart.reignofnether.team": "Equipo %d",
     "matchstart.reignofnether.no_positions": "Sin posiciones de inicio disponibles todavía.",
@@ -2024,20 +1995,11 @@
     "matchstart.reignofnether.ready_count": "%d / %d listo",
     "matchstart.reignofnether.map_loading": "Cargando mapa…",
     "matchstart.reignofnether.place_blocks_hint": "Coloca bloques de inicio de RTS para agregar posiciones.",
-    "matchstart.reignofnether.empty_slot": "(vacío — haz clic para unirte)",
     "matchstart.reignofnether.spectators": "ESPECTADORES",
-    "matchstart.reignofnether.spectator_tag": "espectando",
-    "matchstart.reignofnether.join_spectators": "+ Deja mi equipo y especta",
     "matchstart.reignofnether.no_spectators": "(no spectators yet)",
     "matchstart.reignofnether.chat": "CHAT",
     "matchstart.reignofnether.chat.placeholder": "Escribe un mensaje…",
     "matchstart.reignofnether.chat.click_to_type": "Presiona T o haz click aquí para escribir — Intro para enviar",
-    "matchstart.reignofnether.hint.pick_pos": "Haz click en el mapa para elegir una posición de inicio.",
-    "matchstart.reignofnether.hint.pick_faction": "Elige tu facción.",
-    "matchstart.reignofnether.hint.ready_up": "Haz click en la cruz en tu fila para estar listo.",
-    "matchstart.reignofnether.hint.waiting": "Esperando a que otros jugadores estén listos.",
-    "matchstart.reignofnether.hint.close": "Haz click en Atrás para salir · F12 off + on para reabrir.",
     "matchstart.reignofnether.settings.title": "CONFIGURACIÓN DEL JUEGO",
-    "matchstart.reignofnether.settings.mode": "Modo",
-    "matchstart.reignofnether.settings.op_only": "Configuraciones de Gamerule requieren operador."
+    "matchstart.reignofnether.settings.mode": "Modo"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/es_es.json b/src/main/resources/assets/reignofnether/lang/es_es.json
index eb66c298d..734a93d11 100644
--- a/src/main/resources/assets/reignofnether/lang/es_es.json
+++ b/src/main/resources/assets/reignofnether/lang/es_es.json
@@ -906,8 +906,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s gana en: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Clic para ir al faro)",
 
-    "hud.map.reignofnether.open": "Abrir mapa grande/opciones",
-    "hud.map.reignofnether.close": "Cerrar",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Sensibilidad de cámara: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Clic izquierdo/derecho para ajustar)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Bloqueo de centro de mapa: Activado",
@@ -919,8 +917,6 @@
     "hud.map.reignofnether.rotate_cw.tooltip2": "(Alt + flecha-der.)",
     "hud.map.reignofnether.rotate_ccw.tooltip1": "Gire la cámara en sentido antihorario.",
     "hud.map.reignofnether.rotate_ccw.tooltip2": "(Alt + flecha-izq.)",
-    "hud.map.reignofnether.marker_mode_enabled": "Modo Marcador: ON",
-    "hud.map.reignofnether.marker_mode_disabled": "Modo Marcador: OFF",
 
     "hud.startbuttons.villagers.reignofnether.first": "Unirse al juego como Aldeanos",
     "hud.startbuttons.villagers.reignofnether.second": "Genera %d aldeanos en la ubicación objetivo.",
@@ -948,11 +944,9 @@
     "hud.reignofnether.drop_off_resources": "Depositar recursos",
     "hud.reignofnether.gather_resources": "Recolectar recursos (%s)",
     "hud.reignofnether.change_target_resource": "Clic para cambiar recurso objetivo",
-    "hud.reignofnether.total_workers": "Trabajadores totales: %d",
     "hud.reignofnether.workers_on_food": "Trabajadores en comida",
     "hud.reignofnether.workers_on_wood": "Trabajadores en madera",
     "hud.reignofnether.workers_on_ore": "Trabajadores en mineral",
-    "hud.reignofnether.max_resources": "%s (Máx: %d)",
     "hud.reignofnether.players_resources": "Recursos de %s",
     "hud.reignofnether.you_are_spectator": "Eres un espectador",
     "hud.reignofnether.placed_capitol": "¡%s ha colocado su edificio capital!",
@@ -1019,8 +1013,6 @@
     "hud.relationship.reignofnether.enemy": "Enemigo",
     "hud.relationship.reignofnether.neutral": "Neutral",
 
-    "hud.hero.reignofnether.level": " (Nivel %d)",
-    "hud.hero.reignofnether.level.short": "Nv %d",
     "hud.hero.reignofnether.experience": "Experiencia: %d/%d",
     "hud.hero.reignofnether.experience_warning": "No exp de neutrales de nivel 5",
     "hud.hero.reignofnether.max_level": "¡Nivel Máximo!",
@@ -1263,21 +1255,10 @@
     "time.reignofnether.time_until_next_wave": "%s hasta la próxima oleada",
 
     "tutorial.reignofnether.tutorial_help": "Ayuda del Tutorial",
-    "tutorial.reignofnether.welcome": "Bienvenido a Reign of Nether",
     "tutorial.reignofnether.welcome2": "¡Bienvenido al tutorial de Reign of Nether!",
     "tutorial.reignofnether.get_started": "Presiona F12 o usa /rts-camera para comenzar.",
-    "tutorial.reignofnether.join": "Presiona F12 para alternar la cámara RTS y unirte al juego",
-    "tutorial.reignofnether.help": "Usa '/rts-help' para ver la lista de todos los comandos",
-    "tutorial.reignofnether.controls": "Usa '/rts-controls' para ver los controles",
-    "tutorial.reignofnether.locked": "Esta partida RTS está bloqueada. Espera a una nueva partida para unirte.",
-    "tutorial.reignofnether.welcome_back": "¡Bienvenido de nuevo a Reign of Nether!",
-    "tutorial.reignofnether.op_commands": "Como operador del servidor puedes usar:",
-    "tutorial.reignofnether.fog": "/rts-fog activar | desactivar",
-    "tutorial.reignofnether.lock": "/rts-lock activar | desactivar",
     "tutorial.reignofnether.syncing": "/rts-syncing activar | desactivar (experimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "La sincronización RTS está desactivada, no puedes seleccionar edificios ni ver dueños de unidades.",
-    "tutorial.reignofnether.sync_disabled2": "Pide al anfitrión que la reactive y vuelve a entrar.",
     "tutorial.reignofnether.server_not_found": "Error al cargar el tutorial: servidor no encontrado.",
     "tutorial.reignofnether.resuming": "Bienvenido... Continuando en la etapa: %s",
     "tutorial.reignofnether.skipping": "Saltando etapa... Ahora estás en: %s",
@@ -1600,26 +1581,24 @@
     "units.reignofnether.hero_production.allowed_heroes_2": "You may have two different heroes per game",
     "units.reignofnether.hero_production.unlock_hero_2": "Unlock a 2nd hero with a Castle, Stronghold or Fortress",
 
-    "alliance.reignofnether.sent_request": "\nSolicitud de alianza enviada a %s.\n",
-    "alliance.reignofnether.ally_self": "\n¡No puedes aliarte contigo mismo!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.\n",
-    "alliance.reignofnether.now_allied": "\nAhora estás aliado con %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s ha aceptado tu solicitud de alianza.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\nRetracted alliance request to %s.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s has retracted their alliance request.\n",
-    "alliance.reignofnether.no_request": "\nNo hay solicitudes pendientes de %s.\n",
-    "alliance.reignofnether.alliances_lock": "\nYou may not change alliances during a match (gamerule lockAlliances is on).\n",
-    "alliance.reignofnether.alliances_lock_coop": "\nYou may not change alliances during a match (gamerule coopMode is on).\n",
-    "alliance.reignofnether.disbanded": "\nTu alianza con %s ha sido disuelta.\n",
-    "alliance.reignofnether.disbanding": "\nDisolviendo alianza con %s en 30 segundos...\n",
-    "alliance.reignofnether.disband_self": "\nNo puedes disolver tu propia alianza.\n",
-    "alliance.reignofnether.disband_pending": "\nYa hay una solicitud de disolución pendiente para este jugador.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s ahora está aliado con %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s disolvió su alianza con %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nEstás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nNO estás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s ahora comparte el control de la unidad con sus aliados.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s ahora no comparte el control de la unidad con sus aliados.\n",
+    "alliance.reignofnether.sent_request": "Solicitud de alianza enviada a %s.",
+    "alliance.reignofnether.ally_self": "¡No puedes aliarte contigo mismo!",
+    "alliance.reignofnether.ally_confirm": "%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.",
+    "alliance.reignofnether.now_allied": "Ahora estás aliado con %s.",
+    "alliance.reignofnether.ally_accepted": "%s ha aceptado tu solicitud de alianza.",
+    "alliance.reignofnether.ally_request_cancelled_self": "Retracted alliance request to %s.",
+    "alliance.reignofnether.ally_request_cancelled": "%s has retracted their alliance request.",
+    "alliance.reignofnether.no_request": "No hay solicitudes pendientes de %s.",
+    "alliance.reignofnether.alliances_lock": "You may not change alliances during a match (gamerule lockAlliances is on).",
+    "alliance.reignofnether.alliances_lock_coop": "You may not change alliances during a match (gamerule coopMode is on).",
+    "alliance.reignofnether.disbanded": "Tu alianza con %s ha sido disuelta.",
+    "alliance.reignofnether.disband_self": "No puedes disolver tu propia alianza.",
+    "alliance.reignofnether.now_allied_third_party": "%s ahora está aliado con %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s disolvió su alianza con %s.",
+    "alliance.reignofnether.ally_control_enabled": "Estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_disabled": "NO estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_enable": "%s ahora comparte el control de la unidad con sus aliados.",
+    "alliance.reignofnether.ally_control_disable": "%s ahora no comparte el control de la unidad con sus aliados.",
 
     "survival.reignofnether.dawn": "El amanecer llega",
     "survival.reignofnether.dusk": "La noche cae...",
@@ -1718,10 +1697,6 @@
     "hud.gamemode.reignofnether.npc_scenario_role": "(Solo NPC)",
     "hud.gamemode.reignofnether.cycle_scenario_role": "(Haz clic para cambiar)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Mantén shift para ajustar más rápido)",
-    "hud.gamerule.reignofnether.click": "(Haz clic izquierdo/derecho para ajustar)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Solo operadores pueden modificar)",
-    "hud.gamerule.reignofnether.menu": "Menú de Reglas del Juego",
 
     "config.reignofnether.warn_config_change": "El anfitrión ha cambiado configuraciones",
     "config.reignofnether.hide_config_change": "(Haz clic para ocultar)",
@@ -1860,7 +1835,6 @@
     "startpos.reignofnether.start_button.no_faction": "¡No has elegido una facción!",
     "startpos.reignofnether.cancel_start_button": "Cancelar inicio del juego",
     "startpos.reignofnether.cancelled_start_game": "Inicio del juego cancelado",
-    "startpos.reignofnether.starting_game": "El juego comenzará en %d segundos",
     "startpos.reignofnether.started_game": "¡Juego iniciado!",
     "startpos.reignofnether.max_positions": "Límite de ubicaciones iniciales alcanzado (16)",
     "startpos.reignofnether.rts_map_info_used": "This map uses rtsmap.json start positions (start blocks are ignored)",
@@ -1977,7 +1951,6 @@
     "key.reignofnether.ability_9": "Slot de Habilidad 9",
     "key.reignofnether.ability_10": "Slot de Habilidad 10",
 
-    "key.reignofnether.minimap_toggle": "Alternar minimapa",
     "key.reignofnether.hotkey_1": "Tecla de Acceso Rápido 1",
     "key.reignofnether.hotkey_2": "Tecla de Acceso Rápido 2",
     "key.reignofnether.hotkey_3": "Tecla de Acceso Rápido 3",
@@ -1985,7 +1958,6 @@
     "key.reignofnether.hotkey_5": "Tecla de Acceso Rápido 5",
     "key.reignofnether.hotkey_6": "Tecla de Acceso Rápido 6",
     "key.reignofnether.hotkey_7": "Tecla de Acceso Rápido 7",
-    "key.reignofnether.hotkey_8": "Tecla de Acceso Rápido 8",
     "key.reignofnether.hotkey_9": "Tecla de Acceso Rápido 9",
 
     "key.reignofnether.control_group_0": "Grupo de Control 0",
@@ -2013,7 +1985,6 @@
     "key.reignofnether.fn_12": "Tecla de Función 12 (Alternar Cámara RTS)",
 
     "matchstart.reignofnether.mode": "Modo: %s",
-    "matchstart.reignofnether.map_preview": "MAPA",
     "matchstart.reignofnether.roster": "PLANTILLA",
     "matchstart.reignofnether.team": "Equipo %d",
     "matchstart.reignofnether.no_positions": "Sin posiciones de inicio disponibles todavía.",
@@ -2024,20 +1995,11 @@
     "matchstart.reignofnether.ready_count": "%d / %d listo",
     "matchstart.reignofnether.map_loading": "Cargando mapa…",
     "matchstart.reignofnether.place_blocks_hint": "Coloca bloques de inicio de RTS para agregar posiciones.",
-    "matchstart.reignofnether.empty_slot": "(vacío — haz clic para unirte)",
     "matchstart.reignofnether.spectators": "ESPECTADORES",
-    "matchstart.reignofnether.spectator_tag": "espectando",
-    "matchstart.reignofnether.join_spectators": "+ Deja mi equipo y especta",
     "matchstart.reignofnether.no_spectators": "(no spectators yet)",
     "matchstart.reignofnether.chat": "CHAT",
     "matchstart.reignofnether.chat.placeholder": "Escribe un mensaje…",
     "matchstart.reignofnether.chat.click_to_type": "Presiona T o haz click aquí para escribir — Intro para enviar",
-    "matchstart.reignofnether.hint.pick_pos": "Haz click en el mapa para elegir una posición de inicio.",
-    "matchstart.reignofnether.hint.pick_faction": "Elige tu facción.",
-    "matchstart.reignofnether.hint.ready_up": "Haz click en la cruz en tu fila para estar listo.",
-    "matchstart.reignofnether.hint.waiting": "Esperando a que otros jugadores estén listos.",
-    "matchstart.reignofnether.hint.close": "Haz click en Atrás para salir · F12 off + on para reabrir.",
     "matchstart.reignofnether.settings.title": "CONFIGURACIÓN DEL JUEGO",
-    "matchstart.reignofnether.settings.mode": "Modo",
-    "matchstart.reignofnether.settings.op_only": "Configuraciones de Gamerule requieren operador."
+    "matchstart.reignofnether.settings.mode": "Modo"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/es_mx.json b/src/main/resources/assets/reignofnether/lang/es_mx.json
index eb66c298d..734a93d11 100644
--- a/src/main/resources/assets/reignofnether/lang/es_mx.json
+++ b/src/main/resources/assets/reignofnether/lang/es_mx.json
@@ -906,8 +906,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s gana en: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Clic para ir al faro)",
 
-    "hud.map.reignofnether.open": "Abrir mapa grande/opciones",
-    "hud.map.reignofnether.close": "Cerrar",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Sensibilidad de cámara: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Clic izquierdo/derecho para ajustar)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Bloqueo de centro de mapa: Activado",
@@ -919,8 +917,6 @@
     "hud.map.reignofnether.rotate_cw.tooltip2": "(Alt + flecha-der.)",
     "hud.map.reignofnether.rotate_ccw.tooltip1": "Gire la cámara en sentido antihorario.",
     "hud.map.reignofnether.rotate_ccw.tooltip2": "(Alt + flecha-izq.)",
-    "hud.map.reignofnether.marker_mode_enabled": "Modo Marcador: ON",
-    "hud.map.reignofnether.marker_mode_disabled": "Modo Marcador: OFF",
 
     "hud.startbuttons.villagers.reignofnether.first": "Unirse al juego como Aldeanos",
     "hud.startbuttons.villagers.reignofnether.second": "Genera %d aldeanos en la ubicación objetivo.",
@@ -948,11 +944,9 @@
     "hud.reignofnether.drop_off_resources": "Depositar recursos",
     "hud.reignofnether.gather_resources": "Recolectar recursos (%s)",
     "hud.reignofnether.change_target_resource": "Clic para cambiar recurso objetivo",
-    "hud.reignofnether.total_workers": "Trabajadores totales: %d",
     "hud.reignofnether.workers_on_food": "Trabajadores en comida",
     "hud.reignofnether.workers_on_wood": "Trabajadores en madera",
     "hud.reignofnether.workers_on_ore": "Trabajadores en mineral",
-    "hud.reignofnether.max_resources": "%s (Máx: %d)",
     "hud.reignofnether.players_resources": "Recursos de %s",
     "hud.reignofnether.you_are_spectator": "Eres un espectador",
     "hud.reignofnether.placed_capitol": "¡%s ha colocado su edificio capital!",
@@ -1019,8 +1013,6 @@
     "hud.relationship.reignofnether.enemy": "Enemigo",
     "hud.relationship.reignofnether.neutral": "Neutral",
 
-    "hud.hero.reignofnether.level": " (Nivel %d)",
-    "hud.hero.reignofnether.level.short": "Nv %d",
     "hud.hero.reignofnether.experience": "Experiencia: %d/%d",
     "hud.hero.reignofnether.experience_warning": "No exp de neutrales de nivel 5",
     "hud.hero.reignofnether.max_level": "¡Nivel Máximo!",
@@ -1263,21 +1255,10 @@
     "time.reignofnether.time_until_next_wave": "%s hasta la próxima oleada",
 
     "tutorial.reignofnether.tutorial_help": "Ayuda del Tutorial",
-    "tutorial.reignofnether.welcome": "Bienvenido a Reign of Nether",
     "tutorial.reignofnether.welcome2": "¡Bienvenido al tutorial de Reign of Nether!",
     "tutorial.reignofnether.get_started": "Presiona F12 o usa /rts-camera para comenzar.",
-    "tutorial.reignofnether.join": "Presiona F12 para alternar la cámara RTS y unirte al juego",
-    "tutorial.reignofnether.help": "Usa '/rts-help' para ver la lista de todos los comandos",
-    "tutorial.reignofnether.controls": "Usa '/rts-controls' para ver los controles",
-    "tutorial.reignofnether.locked": "Esta partida RTS está bloqueada. Espera a una nueva partida para unirte.",
-    "tutorial.reignofnether.welcome_back": "¡Bienvenido de nuevo a Reign of Nether!",
-    "tutorial.reignofnether.op_commands": "Como operador del servidor puedes usar:",
-    "tutorial.reignofnether.fog": "/rts-fog activar | desactivar",
-    "tutorial.reignofnether.lock": "/rts-lock activar | desactivar",
     "tutorial.reignofnether.syncing": "/rts-syncing activar | desactivar (experimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "La sincronización RTS está desactivada, no puedes seleccionar edificios ni ver dueños de unidades.",
-    "tutorial.reignofnether.sync_disabled2": "Pide al anfitrión que la reactive y vuelve a entrar.",
     "tutorial.reignofnether.server_not_found": "Error al cargar el tutorial: servidor no encontrado.",
     "tutorial.reignofnether.resuming": "Bienvenido... Continuando en la etapa: %s",
     "tutorial.reignofnether.skipping": "Saltando etapa... Ahora estás en: %s",
@@ -1600,26 +1581,24 @@
     "units.reignofnether.hero_production.allowed_heroes_2": "You may have two different heroes per game",
     "units.reignofnether.hero_production.unlock_hero_2": "Unlock a 2nd hero with a Castle, Stronghold or Fortress",
 
-    "alliance.reignofnether.sent_request": "\nSolicitud de alianza enviada a %s.\n",
-    "alliance.reignofnether.ally_self": "\n¡No puedes aliarte contigo mismo!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.\n",
-    "alliance.reignofnether.now_allied": "\nAhora estás aliado con %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s ha aceptado tu solicitud de alianza.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\nRetracted alliance request to %s.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s has retracted their alliance request.\n",
-    "alliance.reignofnether.no_request": "\nNo hay solicitudes pendientes de %s.\n",
-    "alliance.reignofnether.alliances_lock": "\nYou may not change alliances during a match (gamerule lockAlliances is on).\n",
-    "alliance.reignofnether.alliances_lock_coop": "\nYou may not change alliances during a match (gamerule coopMode is on).\n",
-    "alliance.reignofnether.disbanded": "\nTu alianza con %s ha sido disuelta.\n",
-    "alliance.reignofnether.disbanding": "\nDisolviendo alianza con %s en 30 segundos...\n",
-    "alliance.reignofnether.disband_self": "\nNo puedes disolver tu propia alianza.\n",
-    "alliance.reignofnether.disband_pending": "\nYa hay una solicitud de disolución pendiente para este jugador.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s ahora está aliado con %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s disolvió su alianza con %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nEstás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nNO estás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s ahora comparte el control de la unidad con sus aliados.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s ahora no comparte el control de la unidad con sus aliados.\n",
+    "alliance.reignofnether.sent_request": "Solicitud de alianza enviada a %s.",
+    "alliance.reignofnether.ally_self": "¡No puedes aliarte contigo mismo!",
+    "alliance.reignofnether.ally_confirm": "%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.",
+    "alliance.reignofnether.now_allied": "Ahora estás aliado con %s.",
+    "alliance.reignofnether.ally_accepted": "%s ha aceptado tu solicitud de alianza.",
+    "alliance.reignofnether.ally_request_cancelled_self": "Retracted alliance request to %s.",
+    "alliance.reignofnether.ally_request_cancelled": "%s has retracted their alliance request.",
+    "alliance.reignofnether.no_request": "No hay solicitudes pendientes de %s.",
+    "alliance.reignofnether.alliances_lock": "You may not change alliances during a match (gamerule lockAlliances is on).",
+    "alliance.reignofnether.alliances_lock_coop": "You may not change alliances during a match (gamerule coopMode is on).",
+    "alliance.reignofnether.disbanded": "Tu alianza con %s ha sido disuelta.",
+    "alliance.reignofnether.disband_self": "No puedes disolver tu propia alianza.",
+    "alliance.reignofnether.now_allied_third_party": "%s ahora está aliado con %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s disolvió su alianza con %s.",
+    "alliance.reignofnether.ally_control_enabled": "Estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_disabled": "NO estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_enable": "%s ahora comparte el control de la unidad con sus aliados.",
+    "alliance.reignofnether.ally_control_disable": "%s ahora no comparte el control de la unidad con sus aliados.",
 
     "survival.reignofnether.dawn": "El amanecer llega",
     "survival.reignofnether.dusk": "La noche cae...",
@@ -1718,10 +1697,6 @@
     "hud.gamemode.reignofnether.npc_scenario_role": "(Solo NPC)",
     "hud.gamemode.reignofnether.cycle_scenario_role": "(Haz clic para cambiar)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Mantén shift para ajustar más rápido)",
-    "hud.gamerule.reignofnether.click": "(Haz clic izquierdo/derecho para ajustar)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Solo operadores pueden modificar)",
-    "hud.gamerule.reignofnether.menu": "Menú de Reglas del Juego",
 
     "config.reignofnether.warn_config_change": "El anfitrión ha cambiado configuraciones",
     "config.reignofnether.hide_config_change": "(Haz clic para ocultar)",
@@ -1860,7 +1835,6 @@
     "startpos.reignofnether.start_button.no_faction": "¡No has elegido una facción!",
     "startpos.reignofnether.cancel_start_button": "Cancelar inicio del juego",
     "startpos.reignofnether.cancelled_start_game": "Inicio del juego cancelado",
-    "startpos.reignofnether.starting_game": "El juego comenzará en %d segundos",
     "startpos.reignofnether.started_game": "¡Juego iniciado!",
     "startpos.reignofnether.max_positions": "Límite de ubicaciones iniciales alcanzado (16)",
     "startpos.reignofnether.rts_map_info_used": "This map uses rtsmap.json start positions (start blocks are ignored)",
@@ -1977,7 +1951,6 @@
     "key.reignofnether.ability_9": "Slot de Habilidad 9",
     "key.reignofnether.ability_10": "Slot de Habilidad 10",
 
-    "key.reignofnether.minimap_toggle": "Alternar minimapa",
     "key.reignofnether.hotkey_1": "Tecla de Acceso Rápido 1",
     "key.reignofnether.hotkey_2": "Tecla de Acceso Rápido 2",
     "key.reignofnether.hotkey_3": "Tecla de Acceso Rápido 3",
@@ -1985,7 +1958,6 @@
     "key.reignofnether.hotkey_5": "Tecla de Acceso Rápido 5",
     "key.reignofnether.hotkey_6": "Tecla de Acceso Rápido 6",
     "key.reignofnether.hotkey_7": "Tecla de Acceso Rápido 7",
-    "key.reignofnether.hotkey_8": "Tecla de Acceso Rápido 8",
     "key.reignofnether.hotkey_9": "Tecla de Acceso Rápido 9",
 
     "key.reignofnether.control_group_0": "Grupo de Control 0",
@@ -2013,7 +1985,6 @@
     "key.reignofnether.fn_12": "Tecla de Función 12 (Alternar Cámara RTS)",
 
     "matchstart.reignofnether.mode": "Modo: %s",
-    "matchstart.reignofnether.map_preview": "MAPA",
     "matchstart.reignofnether.roster": "PLANTILLA",
     "matchstart.reignofnether.team": "Equipo %d",
     "matchstart.reignofnether.no_positions": "Sin posiciones de inicio disponibles todavía.",
@@ -2024,20 +1995,11 @@
     "matchstart.reignofnether.ready_count": "%d / %d listo",
     "matchstart.reignofnether.map_loading": "Cargando mapa…",
     "matchstart.reignofnether.place_blocks_hint": "Coloca bloques de inicio de RTS para agregar posiciones.",
-    "matchstart.reignofnether.empty_slot": "(vacío — haz clic para unirte)",
     "matchstart.reignofnether.spectators": "ESPECTADORES",
-    "matchstart.reignofnether.spectator_tag": "espectando",
-    "matchstart.reignofnether.join_spectators": "+ Deja mi equipo y especta",
     "matchstart.reignofnether.no_spectators": "(no spectators yet)",
     "matchstart.reignofnether.chat": "CHAT",
     "matchstart.reignofnether.chat.placeholder": "Escribe un mensaje…",
     "matchstart.reignofnether.chat.click_to_type": "Presiona T o haz click aquí para escribir — Intro para enviar",
-    "matchstart.reignofnether.hint.pick_pos": "Haz click en el mapa para elegir una posición de inicio.",
-    "matchstart.reignofnether.hint.pick_faction": "Elige tu facción.",
-    "matchstart.reignofnether.hint.ready_up": "Haz click en la cruz en tu fila para estar listo.",
-    "matchstart.reignofnether.hint.waiting": "Esperando a que otros jugadores estén listos.",
-    "matchstart.reignofnether.hint.close": "Haz click en Atrás para salir · F12 off + on para reabrir.",
     "matchstart.reignofnether.settings.title": "CONFIGURACIÓN DEL JUEGO",
-    "matchstart.reignofnether.settings.mode": "Modo",
-    "matchstart.reignofnether.settings.op_only": "Configuraciones de Gamerule requieren operador."
+    "matchstart.reignofnether.settings.mode": "Modo"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/es_uy.json b/src/main/resources/assets/reignofnether/lang/es_uy.json
index eb66c298d..734a93d11 100644
--- a/src/main/resources/assets/reignofnether/lang/es_uy.json
+++ b/src/main/resources/assets/reignofnether/lang/es_uy.json
@@ -906,8 +906,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s gana en: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Clic para ir al faro)",
 
-    "hud.map.reignofnether.open": "Abrir mapa grande/opciones",
-    "hud.map.reignofnether.close": "Cerrar",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Sensibilidad de cámara: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Clic izquierdo/derecho para ajustar)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Bloqueo de centro de mapa: Activado",
@@ -919,8 +917,6 @@
     "hud.map.reignofnether.rotate_cw.tooltip2": "(Alt + flecha-der.)",
     "hud.map.reignofnether.rotate_ccw.tooltip1": "Gire la cámara en sentido antihorario.",
     "hud.map.reignofnether.rotate_ccw.tooltip2": "(Alt + flecha-izq.)",
-    "hud.map.reignofnether.marker_mode_enabled": "Modo Marcador: ON",
-    "hud.map.reignofnether.marker_mode_disabled": "Modo Marcador: OFF",
 
     "hud.startbuttons.villagers.reignofnether.first": "Unirse al juego como Aldeanos",
     "hud.startbuttons.villagers.reignofnether.second": "Genera %d aldeanos en la ubicación objetivo.",
@@ -948,11 +944,9 @@
     "hud.reignofnether.drop_off_resources": "Depositar recursos",
     "hud.reignofnether.gather_resources": "Recolectar recursos (%s)",
     "hud.reignofnether.change_target_resource": "Clic para cambiar recurso objetivo",
-    "hud.reignofnether.total_workers": "Trabajadores totales: %d",
     "hud.reignofnether.workers_on_food": "Trabajadores en comida",
     "hud.reignofnether.workers_on_wood": "Trabajadores en madera",
     "hud.reignofnether.workers_on_ore": "Trabajadores en mineral",
-    "hud.reignofnether.max_resources": "%s (Máx: %d)",
     "hud.reignofnether.players_resources": "Recursos de %s",
     "hud.reignofnether.you_are_spectator": "Eres un espectador",
     "hud.reignofnether.placed_capitol": "¡%s ha colocado su edificio capital!",
@@ -1019,8 +1013,6 @@
     "hud.relationship.reignofnether.enemy": "Enemigo",
     "hud.relationship.reignofnether.neutral": "Neutral",
 
-    "hud.hero.reignofnether.level": " (Nivel %d)",
-    "hud.hero.reignofnether.level.short": "Nv %d",
     "hud.hero.reignofnether.experience": "Experiencia: %d/%d",
     "hud.hero.reignofnether.experience_warning": "No exp de neutrales de nivel 5",
     "hud.hero.reignofnether.max_level": "¡Nivel Máximo!",
@@ -1263,21 +1255,10 @@
     "time.reignofnether.time_until_next_wave": "%s hasta la próxima oleada",
 
     "tutorial.reignofnether.tutorial_help": "Ayuda del Tutorial",
-    "tutorial.reignofnether.welcome": "Bienvenido a Reign of Nether",
     "tutorial.reignofnether.welcome2": "¡Bienvenido al tutorial de Reign of Nether!",
     "tutorial.reignofnether.get_started": "Presiona F12 o usa /rts-camera para comenzar.",
-    "tutorial.reignofnether.join": "Presiona F12 para alternar la cámara RTS y unirte al juego",
-    "tutorial.reignofnether.help": "Usa '/rts-help' para ver la lista de todos los comandos",
-    "tutorial.reignofnether.controls": "Usa '/rts-controls' para ver los controles",
-    "tutorial.reignofnether.locked": "Esta partida RTS está bloqueada. Espera a una nueva partida para unirte.",
-    "tutorial.reignofnether.welcome_back": "¡Bienvenido de nuevo a Reign of Nether!",
-    "tutorial.reignofnether.op_commands": "Como operador del servidor puedes usar:",
-    "tutorial.reignofnether.fog": "/rts-fog activar | desactivar",
-    "tutorial.reignofnether.lock": "/rts-lock activar | desactivar",
     "tutorial.reignofnether.syncing": "/rts-syncing activar | desactivar (experimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "La sincronización RTS está desactivada, no puedes seleccionar edificios ni ver dueños de unidades.",
-    "tutorial.reignofnether.sync_disabled2": "Pide al anfitrión que la reactive y vuelve a entrar.",
     "tutorial.reignofnether.server_not_found": "Error al cargar el tutorial: servidor no encontrado.",
     "tutorial.reignofnether.resuming": "Bienvenido... Continuando en la etapa: %s",
     "tutorial.reignofnether.skipping": "Saltando etapa... Ahora estás en: %s",
@@ -1600,26 +1581,24 @@
     "units.reignofnether.hero_production.allowed_heroes_2": "You may have two different heroes per game",
     "units.reignofnether.hero_production.unlock_hero_2": "Unlock a 2nd hero with a Castle, Stronghold or Fortress",
 
-    "alliance.reignofnether.sent_request": "\nSolicitud de alianza enviada a %s.\n",
-    "alliance.reignofnether.ally_self": "\n¡No puedes aliarte contigo mismo!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.\n",
-    "alliance.reignofnether.now_allied": "\nAhora estás aliado con %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s ha aceptado tu solicitud de alianza.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\nRetracted alliance request to %s.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s has retracted their alliance request.\n",
-    "alliance.reignofnether.no_request": "\nNo hay solicitudes pendientes de %s.\n",
-    "alliance.reignofnether.alliances_lock": "\nYou may not change alliances during a match (gamerule lockAlliances is on).\n",
-    "alliance.reignofnether.alliances_lock_coop": "\nYou may not change alliances during a match (gamerule coopMode is on).\n",
-    "alliance.reignofnether.disbanded": "\nTu alianza con %s ha sido disuelta.\n",
-    "alliance.reignofnether.disbanding": "\nDisolviendo alianza con %s en 30 segundos...\n",
-    "alliance.reignofnether.disband_self": "\nNo puedes disolver tu propia alianza.\n",
-    "alliance.reignofnether.disband_pending": "\nYa hay una solicitud de disolución pendiente para este jugador.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s ahora está aliado con %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s disolvió su alianza con %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nEstás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nNO estás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s ahora comparte el control de la unidad con sus aliados.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s ahora no comparte el control de la unidad con sus aliados.\n",
+    "alliance.reignofnether.sent_request": "Solicitud de alianza enviada a %s.",
+    "alliance.reignofnether.ally_self": "¡No puedes aliarte contigo mismo!",
+    "alliance.reignofnether.ally_confirm": "%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.",
+    "alliance.reignofnether.now_allied": "Ahora estás aliado con %s.",
+    "alliance.reignofnether.ally_accepted": "%s ha aceptado tu solicitud de alianza.",
+    "alliance.reignofnether.ally_request_cancelled_self": "Retracted alliance request to %s.",
+    "alliance.reignofnether.ally_request_cancelled": "%s has retracted their alliance request.",
+    "alliance.reignofnether.no_request": "No hay solicitudes pendientes de %s.",
+    "alliance.reignofnether.alliances_lock": "You may not change alliances during a match (gamerule lockAlliances is on).",
+    "alliance.reignofnether.alliances_lock_coop": "You may not change alliances during a match (gamerule coopMode is on).",
+    "alliance.reignofnether.disbanded": "Tu alianza con %s ha sido disuelta.",
+    "alliance.reignofnether.disband_self": "No puedes disolver tu propia alianza.",
+    "alliance.reignofnether.now_allied_third_party": "%s ahora está aliado con %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s disolvió su alianza con %s.",
+    "alliance.reignofnether.ally_control_enabled": "Estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_disabled": "NO estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_enable": "%s ahora comparte el control de la unidad con sus aliados.",
+    "alliance.reignofnether.ally_control_disable": "%s ahora no comparte el control de la unidad con sus aliados.",
 
     "survival.reignofnether.dawn": "El amanecer llega",
     "survival.reignofnether.dusk": "La noche cae...",
@@ -1718,10 +1697,6 @@
     "hud.gamemode.reignofnether.npc_scenario_role": "(Solo NPC)",
     "hud.gamemode.reignofnether.cycle_scenario_role": "(Haz clic para cambiar)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Mantén shift para ajustar más rápido)",
-    "hud.gamerule.reignofnether.click": "(Haz clic izquierdo/derecho para ajustar)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Solo operadores pueden modificar)",
-    "hud.gamerule.reignofnether.menu": "Menú de Reglas del Juego",
 
     "config.reignofnether.warn_config_change": "El anfitrión ha cambiado configuraciones",
     "config.reignofnether.hide_config_change": "(Haz clic para ocultar)",
@@ -1860,7 +1835,6 @@
     "startpos.reignofnether.start_button.no_faction": "¡No has elegido una facción!",
     "startpos.reignofnether.cancel_start_button": "Cancelar inicio del juego",
     "startpos.reignofnether.cancelled_start_game": "Inicio del juego cancelado",
-    "startpos.reignofnether.starting_game": "El juego comenzará en %d segundos",
     "startpos.reignofnether.started_game": "¡Juego iniciado!",
     "startpos.reignofnether.max_positions": "Límite de ubicaciones iniciales alcanzado (16)",
     "startpos.reignofnether.rts_map_info_used": "This map uses rtsmap.json start positions (start blocks are ignored)",
@@ -1977,7 +1951,6 @@
     "key.reignofnether.ability_9": "Slot de Habilidad 9",
     "key.reignofnether.ability_10": "Slot de Habilidad 10",
 
-    "key.reignofnether.minimap_toggle": "Alternar minimapa",
     "key.reignofnether.hotkey_1": "Tecla de Acceso Rápido 1",
     "key.reignofnether.hotkey_2": "Tecla de Acceso Rápido 2",
     "key.reignofnether.hotkey_3": "Tecla de Acceso Rápido 3",
@@ -1985,7 +1958,6 @@
     "key.reignofnether.hotkey_5": "Tecla de Acceso Rápido 5",
     "key.reignofnether.hotkey_6": "Tecla de Acceso Rápido 6",
     "key.reignofnether.hotkey_7": "Tecla de Acceso Rápido 7",
-    "key.reignofnether.hotkey_8": "Tecla de Acceso Rápido 8",
     "key.reignofnether.hotkey_9": "Tecla de Acceso Rápido 9",
 
     "key.reignofnether.control_group_0": "Grupo de Control 0",
@@ -2013,7 +1985,6 @@
     "key.reignofnether.fn_12": "Tecla de Función 12 (Alternar Cámara RTS)",
 
     "matchstart.reignofnether.mode": "Modo: %s",
-    "matchstart.reignofnether.map_preview": "MAPA",
     "matchstart.reignofnether.roster": "PLANTILLA",
     "matchstart.reignofnether.team": "Equipo %d",
     "matchstart.reignofnether.no_positions": "Sin posiciones de inicio disponibles todavía.",
@@ -2024,20 +1995,11 @@
     "matchstart.reignofnether.ready_count": "%d / %d listo",
     "matchstart.reignofnether.map_loading": "Cargando mapa…",
     "matchstart.reignofnether.place_blocks_hint": "Coloca bloques de inicio de RTS para agregar posiciones.",
-    "matchstart.reignofnether.empty_slot": "(vacío — haz clic para unirte)",
     "matchstart.reignofnether.spectators": "ESPECTADORES",
-    "matchstart.reignofnether.spectator_tag": "espectando",
-    "matchstart.reignofnether.join_spectators": "+ Deja mi equipo y especta",
     "matchstart.reignofnether.no_spectators": "(no spectators yet)",
     "matchstart.reignofnether.chat": "CHAT",
     "matchstart.reignofnether.chat.placeholder": "Escribe un mensaje…",
     "matchstart.reignofnether.chat.click_to_type": "Presiona T o haz click aquí para escribir — Intro para enviar",
-    "matchstart.reignofnether.hint.pick_pos": "Haz click en el mapa para elegir una posición de inicio.",
-    "matchstart.reignofnether.hint.pick_faction": "Elige tu facción.",
-    "matchstart.reignofnether.hint.ready_up": "Haz click en la cruz en tu fila para estar listo.",
-    "matchstart.reignofnether.hint.waiting": "Esperando a que otros jugadores estén listos.",
-    "matchstart.reignofnether.hint.close": "Haz click en Atrás para salir · F12 off + on para reabrir.",
     "matchstart.reignofnether.settings.title": "CONFIGURACIÓN DEL JUEGO",
-    "matchstart.reignofnether.settings.mode": "Modo",
-    "matchstart.reignofnether.settings.op_only": "Configuraciones de Gamerule requieren operador."
+    "matchstart.reignofnether.settings.mode": "Modo"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/es_ve.json b/src/main/resources/assets/reignofnether/lang/es_ve.json
index eb66c298d..734a93d11 100644
--- a/src/main/resources/assets/reignofnether/lang/es_ve.json
+++ b/src/main/resources/assets/reignofnether/lang/es_ve.json
@@ -906,8 +906,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s gana en: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Clic para ir al faro)",
 
-    "hud.map.reignofnether.open": "Abrir mapa grande/opciones",
-    "hud.map.reignofnether.close": "Cerrar",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Sensibilidad de cámara: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Clic izquierdo/derecho para ajustar)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Bloqueo de centro de mapa: Activado",
@@ -919,8 +917,6 @@
     "hud.map.reignofnether.rotate_cw.tooltip2": "(Alt + flecha-der.)",
     "hud.map.reignofnether.rotate_ccw.tooltip1": "Gire la cámara en sentido antihorario.",
     "hud.map.reignofnether.rotate_ccw.tooltip2": "(Alt + flecha-izq.)",
-    "hud.map.reignofnether.marker_mode_enabled": "Modo Marcador: ON",
-    "hud.map.reignofnether.marker_mode_disabled": "Modo Marcador: OFF",
 
     "hud.startbuttons.villagers.reignofnether.first": "Unirse al juego como Aldeanos",
     "hud.startbuttons.villagers.reignofnether.second": "Genera %d aldeanos en la ubicación objetivo.",
@@ -948,11 +944,9 @@
     "hud.reignofnether.drop_off_resources": "Depositar recursos",
     "hud.reignofnether.gather_resources": "Recolectar recursos (%s)",
     "hud.reignofnether.change_target_resource": "Clic para cambiar recurso objetivo",
-    "hud.reignofnether.total_workers": "Trabajadores totales: %d",
     "hud.reignofnether.workers_on_food": "Trabajadores en comida",
     "hud.reignofnether.workers_on_wood": "Trabajadores en madera",
     "hud.reignofnether.workers_on_ore": "Trabajadores en mineral",
-    "hud.reignofnether.max_resources": "%s (Máx: %d)",
     "hud.reignofnether.players_resources": "Recursos de %s",
     "hud.reignofnether.you_are_spectator": "Eres un espectador",
     "hud.reignofnether.placed_capitol": "¡%s ha colocado su edificio capital!",
@@ -1019,8 +1013,6 @@
     "hud.relationship.reignofnether.enemy": "Enemigo",
     "hud.relationship.reignofnether.neutral": "Neutral",
 
-    "hud.hero.reignofnether.level": " (Nivel %d)",
-    "hud.hero.reignofnether.level.short": "Nv %d",
     "hud.hero.reignofnether.experience": "Experiencia: %d/%d",
     "hud.hero.reignofnether.experience_warning": "No exp de neutrales de nivel 5",
     "hud.hero.reignofnether.max_level": "¡Nivel Máximo!",
@@ -1263,21 +1255,10 @@
     "time.reignofnether.time_until_next_wave": "%s hasta la próxima oleada",
 
     "tutorial.reignofnether.tutorial_help": "Ayuda del Tutorial",
-    "tutorial.reignofnether.welcome": "Bienvenido a Reign of Nether",
     "tutorial.reignofnether.welcome2": "¡Bienvenido al tutorial de Reign of Nether!",
     "tutorial.reignofnether.get_started": "Presiona F12 o usa /rts-camera para comenzar.",
-    "tutorial.reignofnether.join": "Presiona F12 para alternar la cámara RTS y unirte al juego",
-    "tutorial.reignofnether.help": "Usa '/rts-help' para ver la lista de todos los comandos",
-    "tutorial.reignofnether.controls": "Usa '/rts-controls' para ver los controles",
-    "tutorial.reignofnether.locked": "Esta partida RTS está bloqueada. Espera a una nueva partida para unirte.",
-    "tutorial.reignofnether.welcome_back": "¡Bienvenido de nuevo a Reign of Nether!",
-    "tutorial.reignofnether.op_commands": "Como operador del servidor puedes usar:",
-    "tutorial.reignofnether.fog": "/rts-fog activar | desactivar",
-    "tutorial.reignofnether.lock": "/rts-lock activar | desactivar",
     "tutorial.reignofnether.syncing": "/rts-syncing activar | desactivar (experimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "La sincronización RTS está desactivada, no puedes seleccionar edificios ni ver dueños de unidades.",
-    "tutorial.reignofnether.sync_disabled2": "Pide al anfitrión que la reactive y vuelve a entrar.",
     "tutorial.reignofnether.server_not_found": "Error al cargar el tutorial: servidor no encontrado.",
     "tutorial.reignofnether.resuming": "Bienvenido... Continuando en la etapa: %s",
     "tutorial.reignofnether.skipping": "Saltando etapa... Ahora estás en: %s",
@@ -1600,26 +1581,24 @@
     "units.reignofnether.hero_production.allowed_heroes_2": "You may have two different heroes per game",
     "units.reignofnether.hero_production.unlock_hero_2": "Unlock a 2nd hero with a Castle, Stronghold or Fortress",
 
-    "alliance.reignofnether.sent_request": "\nSolicitud de alianza enviada a %s.\n",
-    "alliance.reignofnether.ally_self": "\n¡No puedes aliarte contigo mismo!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.\n",
-    "alliance.reignofnether.now_allied": "\nAhora estás aliado con %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s ha aceptado tu solicitud de alianza.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\nRetracted alliance request to %s.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s has retracted their alliance request.\n",
-    "alliance.reignofnether.no_request": "\nNo hay solicitudes pendientes de %s.\n",
-    "alliance.reignofnether.alliances_lock": "\nYou may not change alliances during a match (gamerule lockAlliances is on).\n",
-    "alliance.reignofnether.alliances_lock_coop": "\nYou may not change alliances during a match (gamerule coopMode is on).\n",
-    "alliance.reignofnether.disbanded": "\nTu alianza con %s ha sido disuelta.\n",
-    "alliance.reignofnether.disbanding": "\nDisolviendo alianza con %s en 30 segundos...\n",
-    "alliance.reignofnether.disband_self": "\nNo puedes disolver tu propia alianza.\n",
-    "alliance.reignofnether.disband_pending": "\nYa hay una solicitud de disolución pendiente para este jugador.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s ahora está aliado con %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s disolvió su alianza con %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nEstás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nNO estás compartiendo el control de la unidad con tus aliados.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s ahora comparte el control de la unidad con sus aliados.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s ahora no comparte el control de la unidad con sus aliados.\n",
+    "alliance.reignofnether.sent_request": "Solicitud de alianza enviada a %s.",
+    "alliance.reignofnether.ally_self": "¡No puedes aliarte contigo mismo!",
+    "alliance.reignofnether.ally_confirm": "%s quiere aliarse contigo. Escribe /allyconfirm %s para confirmar.",
+    "alliance.reignofnether.now_allied": "Ahora estás aliado con %s.",
+    "alliance.reignofnether.ally_accepted": "%s ha aceptado tu solicitud de alianza.",
+    "alliance.reignofnether.ally_request_cancelled_self": "Retracted alliance request to %s.",
+    "alliance.reignofnether.ally_request_cancelled": "%s has retracted their alliance request.",
+    "alliance.reignofnether.no_request": "No hay solicitudes pendientes de %s.",
+    "alliance.reignofnether.alliances_lock": "You may not change alliances during a match (gamerule lockAlliances is on).",
+    "alliance.reignofnether.alliances_lock_coop": "You may not change alliances during a match (gamerule coopMode is on).",
+    "alliance.reignofnether.disbanded": "Tu alianza con %s ha sido disuelta.",
+    "alliance.reignofnether.disband_self": "No puedes disolver tu propia alianza.",
+    "alliance.reignofnether.now_allied_third_party": "%s ahora está aliado con %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s disolvió su alianza con %s.",
+    "alliance.reignofnether.ally_control_enabled": "Estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_disabled": "NO estás compartiendo el control de la unidad con tus aliados.",
+    "alliance.reignofnether.ally_control_enable": "%s ahora comparte el control de la unidad con sus aliados.",
+    "alliance.reignofnether.ally_control_disable": "%s ahora no comparte el control de la unidad con sus aliados.",
 
     "survival.reignofnether.dawn": "El amanecer llega",
     "survival.reignofnether.dusk": "La noche cae...",
@@ -1718,10 +1697,6 @@
     "hud.gamemode.reignofnether.npc_scenario_role": "(Solo NPC)",
     "hud.gamemode.reignofnether.cycle_scenario_role": "(Haz clic para cambiar)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Mantén shift para ajustar más rápido)",
-    "hud.gamerule.reignofnether.click": "(Haz clic izquierdo/derecho para ajustar)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Solo operadores pueden modificar)",
-    "hud.gamerule.reignofnether.menu": "Menú de Reglas del Juego",
 
     "config.reignofnether.warn_config_change": "El anfitrión ha cambiado configuraciones",
     "config.reignofnether.hide_config_change": "(Haz clic para ocultar)",
@@ -1860,7 +1835,6 @@
     "startpos.reignofnether.start_button.no_faction": "¡No has elegido una facción!",
     "startpos.reignofnether.cancel_start_button": "Cancelar inicio del juego",
     "startpos.reignofnether.cancelled_start_game": "Inicio del juego cancelado",
-    "startpos.reignofnether.starting_game": "El juego comenzará en %d segundos",
     "startpos.reignofnether.started_game": "¡Juego iniciado!",
     "startpos.reignofnether.max_positions": "Límite de ubicaciones iniciales alcanzado (16)",
     "startpos.reignofnether.rts_map_info_used": "This map uses rtsmap.json start positions (start blocks are ignored)",
@@ -1977,7 +1951,6 @@
     "key.reignofnether.ability_9": "Slot de Habilidad 9",
     "key.reignofnether.ability_10": "Slot de Habilidad 10",
 
-    "key.reignofnether.minimap_toggle": "Alternar minimapa",
     "key.reignofnether.hotkey_1": "Tecla de Acceso Rápido 1",
     "key.reignofnether.hotkey_2": "Tecla de Acceso Rápido 2",
     "key.reignofnether.hotkey_3": "Tecla de Acceso Rápido 3",
@@ -1985,7 +1958,6 @@
     "key.reignofnether.hotkey_5": "Tecla de Acceso Rápido 5",
     "key.reignofnether.hotkey_6": "Tecla de Acceso Rápido 6",
     "key.reignofnether.hotkey_7": "Tecla de Acceso Rápido 7",
-    "key.reignofnether.hotkey_8": "Tecla de Acceso Rápido 8",
     "key.reignofnether.hotkey_9": "Tecla de Acceso Rápido 9",
 
     "key.reignofnether.control_group_0": "Grupo de Control 0",
@@ -2013,7 +1985,6 @@
     "key.reignofnether.fn_12": "Tecla de Función 12 (Alternar Cámara RTS)",
 
     "matchstart.reignofnether.mode": "Modo: %s",
-    "matchstart.reignofnether.map_preview": "MAPA",
     "matchstart.reignofnether.roster": "PLANTILLA",
     "matchstart.reignofnether.team": "Equipo %d",
     "matchstart.reignofnether.no_positions": "Sin posiciones de inicio disponibles todavía.",
@@ -2024,20 +1995,11 @@
     "matchstart.reignofnether.ready_count": "%d / %d listo",
     "matchstart.reignofnether.map_loading": "Cargando mapa…",
     "matchstart.reignofnether.place_blocks_hint": "Coloca bloques de inicio de RTS para agregar posiciones.",
-    "matchstart.reignofnether.empty_slot": "(vacío — haz clic para unirte)",
     "matchstart.reignofnether.spectators": "ESPECTADORES",
-    "matchstart.reignofnether.spectator_tag": "espectando",
-    "matchstart.reignofnether.join_spectators": "+ Deja mi equipo y especta",
     "matchstart.reignofnether.no_spectators": "(no spectators yet)",
     "matchstart.reignofnether.chat": "CHAT",
     "matchstart.reignofnether.chat.placeholder": "Escribe un mensaje…",
     "matchstart.reignofnether.chat.click_to_type": "Presiona T o haz click aquí para escribir — Intro para enviar",
-    "matchstart.reignofnether.hint.pick_pos": "Haz click en el mapa para elegir una posición de inicio.",
-    "matchstart.reignofnether.hint.pick_faction": "Elige tu facción.",
-    "matchstart.reignofnether.hint.ready_up": "Haz click en la cruz en tu fila para estar listo.",
-    "matchstart.reignofnether.hint.waiting": "Esperando a que otros jugadores estén listos.",
-    "matchstart.reignofnether.hint.close": "Haz click en Atrás para salir · F12 off + on para reabrir.",
     "matchstart.reignofnether.settings.title": "CONFIGURACIÓN DEL JUEGO",
-    "matchstart.reignofnether.settings.mode": "Modo",
-    "matchstart.reignofnether.settings.op_only": "Configuraciones de Gamerule requieren operador."
+    "matchstart.reignofnether.settings.mode": "Modo"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/fa_ir.json b/src/main/resources/assets/reignofnether/lang/fa_ir.json
index 31b244e5d..21223690d 100644
--- a/src/main/resources/assets/reignofnether/lang/fa_ir.json
+++ b/src/main/resources/assets/reignofnether/lang/fa_ir.json
@@ -661,8 +661,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "بازیکن %s در %s ثانیه پیروز میشود",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(کلیک برای رفتن به بیکن)",
 
-    "hud.map.reignofnether.open": "نقشه بزرگ و گزینه ها را باز میکند",
-    "hud.map.reignofnether.close": "بستن",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "سرعت چرخش دوربین: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(برای تنظیم چپ/راست کلیک کنید)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "قفل وسط نقشه: فعال",
@@ -695,11 +693,9 @@
     "hud.reignofnether.drop_off_resources": "تحویل منابع",
     "hud.reignofnether.gather_resources": "جمع آوری منابع (%s)",
     "hud.reignofnether.change_target_resource": "برای تغییر منبع هدف کلیک کنید",
-    "hud.reignofnether.total_workers": "مجموع کارکنان: %d",
     "hud.reignofnether.workers_on_food": "کارگران غذا",
     "hud.reignofnether.workers_on_wood": "کارگران چوب",
     "hud.reignofnether.workers_on_ore": "کارگران سنگ معدن",
-    "hud.reignofnether.max_resources": "%s (حداکثر: %d)",
     "hud.reignofnether.players_resources": "منابع %s",
     "hud.reignofnether.you_are_spectator": "شما تماشاگر هستید",
     "hud.reignofnether.placed_capitol": "بازیکن %s کپیتول خود را بنا کرد!",
@@ -727,7 +723,6 @@
     "hud.relationship.reignofnether.enemy": "متعلق به دشمن",
     "hud.relationship.reignofnether.neutral": "بی طرف",
 
-    "hud.hero.reignofnether.level": " (سطح 1 %d)",
     "hud.hero.reignofnether.experience": "تجربه: %d/%d",
     "hud.hero.reignofnether.experience_warning": "از سطح 5 به بعد نیروهای بی طرف تجربه نمیدهند",
     "hud.hero.reignofnether.max_level": "سطح نهایی",
@@ -942,21 +937,10 @@
     "time.reignofnether.time_until_next_wave": "%s تا موج بعدی",
 
     "tutorial.reignofnether.tutorial_help": "آموزشی",
-    "tutorial.reignofnether.welcome": "به سلطنت ندر خوش امدی",
     "tutorial.reignofnether.welcome2": "به بخش آموزشی سلطنت ندر خوش آمدی!",
     "tutorial.reignofnether.get_started": "برای شروع دکمه اف12 یا دستور /rts-camera را اجرا کنید.",
-    "tutorial.reignofnether.join": "برای فعال کردن حالت استراتژی دکمه اف12 را فشار دهید",
-    "tutorial.reignofnether.help": "از دستور /rts-help برای دیدن لیست دستور ها استفاده کنید",
-    "tutorial.reignofnether.controls": "از دستور /rts-controls برای دیدن لیست دکمه ها استفاده کنید",
-    "tutorial.reignofnether.locked": "این بازی قفل شده, لطفا برای ملحق شدن به بازی منتظر بازی بعدی باشید.",
-    "tutorial.reignofnether.welcome_back": "به سلطنت ندر خوش برگشتی!",
-    "tutorial.reignofnether.op_commands": "به عنوان یک صاحب سرور شما میتوانید:",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable (experimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "همگام سازی حالت استراتژی غیرفعال شده بنابرین نمیتوانی ساختمان ها را انتخاب کنی یا مالک نیرو ها را ببینی, متاسفم!",
-    "tutorial.reignofnether.sync_disabled2": "برای حل این مشکل, از میزبان درخواست کنید تا آن را فعال کن و سپس دوباره به بازی ملحق شوید.",
     "tutorial.reignofnether.server_not_found": "در بارگذاری آموزش مشکلی پیش امد, سرور پیدا نشد.",
     "tutorial.reignofnether.resuming": "خوش برگشتی... در مرحله %s ادامه میدیم",
     "tutorial.reignofnether.skipping": "درحال رد کردن مرحله آموزشی... شما درحال حاضر در مرحله %s هستید",
@@ -1258,22 +1242,20 @@
     "entity.reignofnether.panda_unit": "پاندا",
     "entity.reignofnether.llama_unit": "لاما",
 
-    "alliance.reignofnether.sent_request": "\nدرخواست اتحاد ارسال شد به بازیکن %s.\n",
-    "alliance.reignofnether.ally_self": "\nشما نمیتوانید به خودتان درخواست اتحاد بدهید!\n",
-    "alliance.reignofnether.ally_confirm": "\nبازیکن %s میخواهد با شما متحد شود. برای قبول کردن دستور /allyconfirm %s.\n",
-    "alliance.reignofnether.now_allied": "\nحالا شما با بازیکن %s متحد هستید!.\n",
-    "alliance.reignofnether.ally_accepted": "\nبازیکن %s درخواست اتحاد شما را قبول کرد.\n",
-    "alliance.reignofnether.no_request": "\nهیچ درخواست اتحادی از طرف %s نیست.\n",
-    "alliance.reignofnether.disbanded": "\nاتحاد شما با بازیکن %s فسخ شد.\n",
-    "alliance.reignofnether.disbanding": "\nدرحال فسخ اتحاد با %s در 30 ثانیه...\n",
-    "alliance.reignofnether.disband_self": "\nYou cannot disband yourself.\n",
-    "alliance.reignofnether.disband_pending": "\nA درخواست فسخ اتحاد با این بازیکن درحال ارسال است.\n",
-    "alliance.reignofnether.now_allied_third_party": "\nبازیکن %s با بازیکن %s متحد شدند.\n",
-    "alliance.reignofnether.disbanded_third_party": "\nبازیکن %s اتحاد خود را با بازیکن %s فسخ کرد.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nشما نیرو های خود را با متحدان به اشتراک میگذارید.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nشما دیگر نیرو های خود را با متحدان به اشتراک نمی گذارید.\n",
-    "alliance.reignofnether.ally_control_enable": "\nبازیکن %s حالا با متحدان نیرو هایش را به اشتراک میگذارد.\n",
-    "alliance.reignofnether.ally_control_disable": "\nبازیکن %s دیگر نیرو های خود را با متحدان به اشتراک نمی گذارد.\n",
+    "alliance.reignofnether.sent_request": "درخواست اتحاد ارسال شد به بازیکن %s.",
+    "alliance.reignofnether.ally_self": "شما نمیتوانید به خودتان درخواست اتحاد بدهید!",
+    "alliance.reignofnether.ally_confirm": "بازیکن %s میخواهد با شما متحد شود. برای قبول کردن دستور /allyconfirm %s.",
+    "alliance.reignofnether.now_allied": "حالا شما با بازیکن %s متحد هستید!.",
+    "alliance.reignofnether.ally_accepted": "بازیکن %s درخواست اتحاد شما را قبول کرد.",
+    "alliance.reignofnether.no_request": "هیچ درخواست اتحادی از طرف %s نیست.",
+    "alliance.reignofnether.disbanded": "اتحاد شما با بازیکن %s فسخ شد.",
+    "alliance.reignofnether.disband_self": "You cannot disband yourself.",
+    "alliance.reignofnether.now_allied_third_party": "بازیکن %s با بازیکن %s متحد شدند.",
+    "alliance.reignofnether.disbanded_third_party": "بازیکن %s اتحاد خود را با بازیکن %s فسخ کرد.",
+    "alliance.reignofnether.ally_control_enabled": "شما نیرو های خود را با متحدان به اشتراک میگذارید.",
+    "alliance.reignofnether.ally_control_disabled": "شما دیگر نیرو های خود را با متحدان به اشتراک نمی گذارید.",
+    "alliance.reignofnether.ally_control_enable": "بازیکن %s حالا با متحدان نیرو هایش را به اشتراک میگذارد.",
+    "alliance.reignofnether.ally_control_disable": "بازیکن %s دیگر نیرو های خود را با متحدان به اشتراک نمی گذارد.",
 
     "survival.reignofnether.dawn": "سپیده دمید",
     "survival.reignofnether.dusk": "شب فرا می رسد...",
@@ -1348,10 +1330,6 @@
     "hud.gamemode.reignofnether.changemode": "راست کلیک برای تغییر حالت بازی",
     "hud.gamemode.reignofnether.locked": "(قفل شده)",
 
-    "hud.gamerule.reignofnether.shift_click": "(شیفت را فشار دهید برای تنظیم سریع تر)",
-    "hud.gamerule.reignofnether.click": "(چپ یا راست کلیک برای تنظیم)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(فقط مدیران میتوانند تنظیم کنند)",
-    "hud.gamerule.reignofnether.menu": "بخش قوانین بازی",
 
     "config.reignofnether.warn_config_change": "میزبان سرور قوانین را تغییر داد",
     "config.reignofnether.hide_config_change": "(کلیک برای مخفی کردن)",
@@ -1396,7 +1374,6 @@
     "startpos.reignofnether.start_button.no_reserved_pos": "شما یک مکان را رزرو نکردید!",
     "startpos.reignofnether.cancel_start_button": "لغو شروع بازی",
     "startpos.reignofnether.cancelled_start_game": "شروع بازی لغو شد",
-    "startpos.reignofnether.starting_game": "بازی شروع میشود در %d ثانیه",
     "startpos.reignofnether.started_game": "بازی شروع شد!",
     "startpos.reignofnether.max_positions": "به حداکثر جای شروع رسیدید! (16)",
     "startpos.reignofnether.player_ready": "%s آماده است!",
diff --git a/src/main/resources/assets/reignofnether/lang/fr_fr.json b/src/main/resources/assets/reignofnether/lang/fr_fr.json
index fe70497a1..ee59f4611 100644
--- a/src/main/resources/assets/reignofnether/lang/fr_fr.json
+++ b/src/main/resources/assets/reignofnether/lang/fr_fr.json
@@ -1000,6 +1000,8 @@
     "argument.reignofnether.building.selector.not_allowed.error": "Sélecteurs non autorisés",
     "argument.player.not_allowed_all": "« Tous les joueurs » n'est pas autorisé, il faut indiquer un nom de joueur précis",
     "controls.reignofnether.toggle_cam": "F12 - Activer ou désactiver la caméra RTS",
+    "hud.reignofnether.join_rts": "Appuyez sur %s pour basculer la caméra RTS et rejoindre la partie",
+    "hud.reignofnether.join_rts_locked": "Appuyez sur %s pour regarder avec la caméra RTS. Ce match est verrouillé aux nouveaux joueurs.",
     "controls.reignofnether.refresh_chunks": "F8 - Rafraîchir les chunks",
     "controls.reignofnether.toggle_fps_tps": "F7 - Afficher ou masquer les compteurs FPS/TPS",
     "controls.reignofnether.deselect": "~ - Désélectionner toutes les unités et tous les bâtiments",
@@ -1060,8 +1062,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_controls": "%s contrôle la balise",
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s gagne dans : %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Cliquez pour aller à la balise)",
-    "hud.map.reignofnether.open": "Ouvrir la grande carte / les options",
-    "hud.map.reignofnether.close": "Fermer",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Sensibilité de la caméra : %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Clic gauche ou droit pour ajuster)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Verrouillage du centre de la carte : ACTIVÉ",
@@ -1075,8 +1075,6 @@
     "hud.map.reignofnether.rotate_cw.tooltip2": "(Alt + flèche droite)",
     "hud.map.reignofnether.rotate_ccw.tooltip1": "Faire pivoter la caméra dans le sens antihoraire",
     "hud.map.reignofnether.rotate_ccw.tooltip2": "(Alt + flèche gauche)",
-    "hud.map.reignofnether.marker_mode_enabled": "Mode marqueur activé",
-    "hud.map.reignofnether.marker_mode_disabled": "Mode marqueur désactivé",
     "hud.startbuttons.villagers.reignofnether.first": "Rejoindre la partie avec les Villageois",
     "hud.startbuttons.villagers.reignofnether.second": "Fait apparaître %d villageois à l'endroit ciblé.",
     "hud.startbuttons.monsters.reignofnether.first": "Rejoindre la partie avec les Monstres",
@@ -1100,13 +1098,11 @@
     "hud.reignofnether.drop_off_resources": "Déposer les ressources",
     "hud.reignofnether.gather_resources": "Récolter des ressources (%s)",
     "hud.reignofnether.change_target_resource": "Cliquez pour changer de ressource cible",
-    "hud.reignofnether.total_workers": "Total des ouvriers : %d",
     "hud.reignofnether.workers_on_food": "Ouvriers à la nourriture",
     "hud.reignofnether.workers_on_wood": "Ouvriers au bois",
     "hud.reignofnether.workers_on_ore": "Ouvriers au minerai",
     "hud.reignofnether.items_found": "Objets trouvés : %d",
     "hud.reignofnether.items_hint": "Tuez des ennemis neutres pour obtenir émeraudes et objets",
-    "hud.reignofnether.max_resources": "%s (max : %d)",
     "hud.reignofnether.players_resources": "Ressources de %s",
     "hud.reignofnether.you_are_spectator": "Vous êtes spectateur",
     "hud.reignofnether.placed_capitol": "%s a placé sa capitale !",
@@ -1165,7 +1161,6 @@
     "hud.relationship.reignofnether.allied": "Allié",
     "hud.relationship.reignofnether.enemy": "Ennemi",
     "hud.relationship.reignofnether.neutral": "Neutre",
-    "hud.hero.reignofnether.level": "Niv %d",
     "hud.hero.reignofnether.level.short": "Nv %d",
     "hud.hero.reignofnether.experience": "Expérience : %d/%d",
     "hud.hero.reignofnether.experience_warning": "Plus d'XP sur les neutres à partir du niveau 5",
@@ -1418,21 +1413,10 @@
     "time.reignofnether.night_circle_change": "(Cliquez pour changer)",
     "time.reignofnether.time_until_next_wave": "%s avant la prochaine vague",
     "tutorial.reignofnether.tutorial_help": "Aide du tutoriel",
-    "tutorial.reignofnether.welcome": "Bienvenue dans Reign of Nether",
     "tutorial.reignofnether.welcome2": "Bienvenue dans le tutoriel de Reign of Nether !",
     "tutorial.reignofnether.get_started": "Appuyez sur F12 ou utilisez /rts-camera pour commencer.",
-    "tutorial.reignofnether.join": "Appuyez sur F12 pour activer la caméra RTS et rejoindre la partie",
-    "tutorial.reignofnether.help": "Utilisez « /rts-help » pour voir la liste de toutes les commandes",
-    "tutorial.reignofnether.controls": "Utilisez « /rts-controls » pour voir la liste des contrôles",
-    "tutorial.reignofnether.locked": "Cette partie RTS a été verrouillée. Attendez une nouvelle partie pour rejoindre.",
-    "tutorial.reignofnether.welcome_back": "Bon retour dans Reign of Nether",
-    "tutorial.reignofnether.op_commands": "En tant qu'opérateur du serveur, vous pouvez utiliser :",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable (expérimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "La synchronisation RTS est désactivée : vous ne pouvez ni sélectionner de bâtiments ni voir les propriétaires des unités, désolé !",
-    "tutorial.reignofnether.sync_disabled2": "Pour corriger cela, demandez à l'hôte de la réactiver, puis reconnectez-vous.",
     "tutorial.reignofnether.server_not_found": "Échec du chargement du tutoriel, serveur introuvable.",
     "tutorial.reignofnether.resuming": "Bon retour... reprise à l'étape : %s",
     "tutorial.reignofnether.skipping": "Étape du tutoriel passée... vous en êtes maintenant à : %s",
@@ -1775,28 +1759,27 @@
     "units.reignofnether.hero_production.allowed_heroes_1": "Vous ne pouvez avoir qu'un seul héros par partie",
     "units.reignofnether.hero_production.allowed_heroes_2": "Vous pouvez avoir deux héros différents par partie",
     "units.reignofnether.hero_production.unlock_hero_2": "Débloquez un 2e héros avec un Château, une Forteresse ou une Forteresse du Nether",
-    "alliance.reignofnether.sent_request": "\nDemande d'alliance envoyée à %s.\n",
-    "alliance.reignofnether.ally_self": "\nVous ne pouvez pas vous allier avec vous-même !\n",
-    "alliance.reignofnether.ally_confirm": "\n%s veut s'allier avec vous. Acceptez dans le menu Diplomatie ou avec /allyconfirm %s.\n",
+    "alliance.reignofnether.sent_request": "Demande d'alliance envoyée à %s.",
+    "alliance.reignofnether.ally_self": "Vous ne pouvez pas vous allier avec vous-même !",
+    "alliance.reignofnether.ally_confirm": "%s veut s'allier avec vous. Acceptez dans le menu Diplomatie.",
+    "alliance.reignofnether.ally_confirm_survival": "%s veut s'allier avec vous. Acceptez avec /allyconfirm %s.",
     "alliance.reignofnether.accept": "[Cliquez pour accepter]",
     "alliance.reignofnether.cancel": "[Cliquez pour annuler]",
-    "alliance.reignofnether.now_allied": "\nVous êtes maintenant allié avec %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s a accepté votre demande d'alliance.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\nDemande d'alliance à %s retirée.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s a retiré sa demande d'alliance.\n",
-    "alliance.reignofnether.no_request": "\nAucune demande d'alliance en attente de la part de %s.\n",
+    "alliance.reignofnether.now_allied": "Vous êtes maintenant allié avec %s.",
+    "alliance.reignofnether.ally_accepted": "%s a accepté votre demande d'alliance.",
+    "alliance.reignofnether.ally_request_cancelled_self": "Demande d'alliance à %s annulée.",
+    "alliance.reignofnether.ally_request_cancelled": "%s a annulé sa demande d'alliance.",
+    "alliance.reignofnether.no_request": "Pas de demande d'alliance en attente de %s.",
     "alliance.reignofnether.alliances_lock": "\nVous ne pouvez pas changer d'alliance pendant une partie (la règle lockAlliances est activée).\n",
     "alliance.reignofnether.alliances_lock_coop": "\nVous ne pouvez pas changer d'alliance pendant une partie (la règle coopMode est activée).\n",
-    "alliance.reignofnether.disbanded": "\nVotre alliance avec %s a été rompue.\n",
-    "alliance.reignofnether.disbanding": "\nRupture de l'alliance avec %s dans 30 secondes...\n",
-    "alliance.reignofnether.disband_self": "\nVous ne pouvez pas rompre une alliance avec vous-même.\n",
-    "alliance.reignofnether.disband_pending": "\nUne demande de rupture est déjà en attente pour ce joueur.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s est maintenant allié avec %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s a rompu son alliance avec %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nVous partagez le contrôle de vos unités avec vos alliés.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nVous ne partagez PAS le contrôle de vos unités avec vos alliés.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s partage maintenant le contrôle de ses unités avec ses alliés.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s ne partage plus le contrôle de ses unités avec ses alliés.\n",
+    "alliance.reignofnether.disbanded": "Votre alliance avec %s a été dissoute.",
+    "alliance.reignofnether.disband_self": "Vous ne pouvez pas vous dissoudre vous-même.",
+    "alliance.reignofnether.now_allied_third_party": "%s est maintenant allié avec %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s a dissous son alliance avec %s.",
+    "alliance.reignofnether.ally_control_enabled": "Vous partagez le contrôle des unités avec vos alliés.",
+    "alliance.reignofnether.ally_control_disabled": "Vous ne partagez PAS le contrôle des unités avec vos alliés.",
+    "alliance.reignofnether.ally_control_enable": "%s partage maintenant le contrôle des unités avec ses alliés.",
+    "alliance.reignofnether.ally_control_disable": "%s ne partage plus le contrôle des unités avec ses alliés.",
     "survival.reignofnether.dawn": "L'aube se lève",
     "survival.reignofnether.dusk": "La nuit tombe...",
     "survival.reignofnether.dusksoon": "La lumière du soleil décline.",
@@ -1898,10 +1881,6 @@
     "hud.gamemode.reignofnether.taken_scenario_role": "(Pris par %s)",
     "hud.gamemode.reignofnether.npc_scenario_role": "(PNJ uniquement)",
     "hud.gamemode.reignofnether.cycle_scenario_role": "(Cliquez pour changer)",
-    "hud.gamerule.reignofnether.shift_click": "(Maintenez Maj pour ajuster plus vite)",
-    "hud.gamerule.reignofnether.click": "(Clic gauche ou droit pour ajuster)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Seuls les opérateurs peuvent modifier)",
-    "hud.gamerule.reignofnether.menu": "Menu des règles du jeu",
     "config.reignofnether.warn_config_change": "L'hôte du serveur a modifié la configuration",
     "config.reignofnether.hide_config_change": "(Cliquez pour masquer)",
     "sandbox.reignofnether.relationship_button1": "Relation : %s",
@@ -2049,7 +2028,6 @@
     "startpos.reignofnether.start_button.no_faction": "Vous n'avez pas choisi de faction !",
     "startpos.reignofnether.cancel_start_button": "Annuler le démarrage de la partie",
     "startpos.reignofnether.cancelled_start_game": "Démarrage de la partie annulé",
-    "startpos.reignofnether.starting_game": "La partie commence dans %d secondes",
     "startpos.reignofnether.started_game": "La partie a commencé !",
     "startpos.reignofnether.max_positions": "Nombre maximal de positions de départ atteint (16)",
     "startpos.reignofnether.rts_map_info_used": "Cette carte utilise les positions de départ de rtsmap.json (les blocs de départ sont ignorés)",
diff --git a/src/main/resources/assets/reignofnether/lang/ko_kr.json b/src/main/resources/assets/reignofnether/lang/ko_kr.json
index 7b54b170f..b57de55c8 100644
--- a/src/main/resources/assets/reignofnether/lang/ko_kr.json
+++ b/src/main/resources/assets/reignofnether/lang/ko_kr.json
@@ -582,8 +582,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s이(가) %s 후에 승리합니다",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(클릭하여 신호기로 이동)",
 
-    "hud.map.reignofnether.open": "큰 맵/옵션 열기",
-    "hud.map.reignofnether.close": "닫기",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "카메라 감도: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(좌/우클릭으로 조정)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "맵 중심 고정: 켜짐",
@@ -620,11 +618,9 @@
     "hud.reignofnether.drop_off_resources": "자원 맡기기",
     "hud.reignofnether.gather_resources": "자원 채집 (%s)",
     "hud.reignofnether.change_target_resource": "클릭하여 목표 자원 변경",
-    "hud.reignofnether.total_workers": "총 일꾼: %d",
     "hud.reignofnether.workers_on_food": "음식 채집 일꾼",
     "hud.reignofnether.workers_on_wood": "나무 채집 일꾼",
     "hud.reignofnether.workers_on_ore": "광석 채집 일꾼",
-    "hud.reignofnether.max_resources": "%s (최대: %d)",
     "hud.reignofnether.players_resources": "%s의 자원",
     "hud.reignofnether.you_are_spectator": "당신은 관전자입니다",
     "hud.reignofnether.placed_capitol": "%s이(가) 거점 건물을 배치했습니다!",
@@ -652,7 +648,6 @@
     "hud.relationship.reignofnether.enemy": "적",
     "hud.relationship.reignofnether.neutral": "중립",
 
-    "hud.hero.reignofnether.level": " (레벨 %d)",
     "hud.hero.reignofnether.experience": "경험치: %d/%d",
     "hud.hero.reignofnether.experience_warning": "레벨 5부터 중립에게서 경험치 없음",
     "hud.hero.reignofnether.max_level": "최대 레벨!",
@@ -852,21 +847,10 @@
     "time.reignofnether.time_until_next_wave": "다음 웨이브까지 %s",
 
     "tutorial.reignofnether.tutorial_help": "튜토리얼 도움말",
-    "tutorial.reignofnether.welcome": "Reign of Nether에 오신 것을 환영합니다",
     "tutorial.reignofnether.welcome2": "Reign of Nether 튜토리얼에 오신 것을 환영합니다!",
     "tutorial.reignofnether.get_started": "F12를 누르거나 /rts-camera를 사용하여 시작하세요.",
-    "tutorial.reignofnether.join": "F12를 눌러 RTS 카메라를 토글하고 게임에 참가하세요",
-    "tutorial.reignofnether.help": "모든 명령어 목록을 보려면 '/rts-help'를 사용하세요",
-    "tutorial.reignofnether.controls": "조작법 목록을 보려면 '/rts-controls'를 사용하세요",
-    "tutorial.reignofnether.locked": "이 RTS 경기는 잠겼습니다. 참가하기 전에 새 게임을 기다려 주세요.",
-    "tutorial.reignofnether.welcome_back": "Reign of Nether에 다시 오신 것을 환영합니다",
-    "tutorial.reignofnether.op_commands": "서버 운영자로서 다음을 사용할 수 있습니다:",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable (실험적)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "RTS 동기화가 비활성화되어 건물을 선택하거나 유닛 소유자를 볼 수 없습니다. 죄송합니다!",
-    "tutorial.reignofnether.sync_disabled2": "이 문제를 해결하려면 호스트에게 다시 활성화하도록 요청한 다음 재로그인하세요.",
     "tutorial.reignofnether.server_not_found": "튜토리얼 로드 실패, 서버를 찾을 수 없습니다.",
     "tutorial.reignofnether.resuming": "다시 오신 것을 환영합니다... %s 단계에서 재개합니다",
     "tutorial.reignofnether.skipping": "튜토리얼 단계 건너뛰기... 현재 단계: %s",
@@ -1139,25 +1123,23 @@
     "entity.reignofnether.panda_unit": "판다",
     "entity.reignofnether.llama_unit": "라마",
 
-    "alliance.reignofnether.sent_request": "\n%s에게 동맹 요청을 보냈습니다.\n",
-    "alliance.reignofnether.ally_self": "\n자기 자신과 동맹을 맺을 수 없습니다!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s이(가) 당신과 동맹을 맺고 싶어합니다. 외교 메뉴에서 수락하세요.\n",
-    "alliance.reignofnether.ally_confirm_survival": "\n%s이(가) 당신과 동맹을 맺고 싶어합니다. /allyconfirm %s로 수락하세요.\n",
-    "alliance.reignofnether.now_allied": "\n이제 %s와(과) 동맹입니다.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s이(가) 당신의 동맹 요청을 수락했습니다.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\n%s에게 보낸 동맹 요청을 철회했습니다.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s이(가) 동맹 요청을 철회했습니다.\n",
-    "alliance.reignofnether.no_request": "\n%s로부터 대기 중인 동맹 요청이 없습니다.\n",
-    "alliance.reignofnether.disbanded": "\n%s와(과)의 동맹이 해체되었습니다.\n",
-    "alliance.reignofnether.disbanding": "\n30초 후 %s와(과)의 동맹을 해체합니다...\n",
-    "alliance.reignofnether.disband_self": "\n자기 자신을 해체할 수 없습니다.\n",
-    "alliance.reignofnether.disband_pending": "\n이 플레이어에 대한 해체 요청이 이미 대기 중입니다.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s이(가) 이제 %s와(과) 동맹입니다.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s이(가) %s와(과)의 동맹을 해체했습니다.\n",
-    "alliance.reignofnether.ally_control_enabled": "\n동맹과 유닛 제어를 공유하고 있습니다.\n",
-    "alliance.reignofnether.ally_control_disabled": "\n동맹과 유닛 제어를 공유하지 않습니다.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s이(가) 이제 동맹과 유닛 제어를 공유합니다.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s이(가) 더 이상 동맹과 유닛 제어를 공유하지 않습니다.\n",
+    "alliance.reignofnether.sent_request": "%s에게 동맹 요청을 보냈습니다.",
+    "alliance.reignofnether.ally_self": "자기 자신과 동맹을 맺을 수 없습니다!",
+    "alliance.reignofnether.ally_confirm": "%s이(가) 당신과 동맹을 맺고 싶어합니다. 외교 메뉴에서 수락하세요.",
+    "alliance.reignofnether.ally_confirm_survival": "%s이(가) 당신과 동맹을 맺고 싶어합니다. /allyconfirm %s로 수락하세요.",
+    "alliance.reignofnether.now_allied": "이제 %s와(과) 동맹입니다.",
+    "alliance.reignofnether.ally_accepted": "%s이(가) 당신의 동맹 요청을 수락했습니다.",
+    "alliance.reignofnether.ally_request_cancelled_self": "%s에게 보낸 동맹 요청을 철회했습니다.",
+    "alliance.reignofnether.ally_request_cancelled": "%s이(가) 동맹 요청을 철회했습니다.",
+    "alliance.reignofnether.no_request": "%s로부터 대기 중인 동맹 요청이 없습니다.",
+    "alliance.reignofnether.disbanded": "%s와(과)의 동맹이 해체되었습니다.",
+    "alliance.reignofnether.disband_self": "자기 자신을 해체할 수 없습니다.",
+    "alliance.reignofnether.now_allied_third_party": "%s이(가) 이제 %s와(과) 동맹입니다.",
+    "alliance.reignofnether.disbanded_third_party": "%s이(가) %s와(과)의 동맹을 해체했습니다.",
+    "alliance.reignofnether.ally_control_enabled": "동맹과 유닛 제어를 공유하고 있습니다.",
+    "alliance.reignofnether.ally_control_disabled": "동맹과 유닛 제어를 공유하지 않습니다.",
+    "alliance.reignofnether.ally_control_enable": "%s이(가) 이제 동맹과 유닛 제어를 공유합니다.",
+    "alliance.reignofnether.ally_control_disable": "%s이(가) 더 이상 동맹과 유닛 제어를 공유하지 않습니다.",
 
     "survival.reignofnether.dawn": "새벽이 밝았습니다",
     "survival.reignofnether.dusk": "밤이 찾아옵니다...",
@@ -1219,10 +1201,6 @@
     "hud.gamemode.reignofnether.changemode": "우클릭으로 게임 모드 변경",
     "hud.gamemode.reignofnether.locked": "(잠김)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Shift를 눌러 더 빠르게 조정)",
-    "hud.gamerule.reignofnether.click": "(좌/우 클릭으로 조정)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(운영자만 수정 가능)",
-    "hud.gamerule.reignofnether.menu": "게임 규칙 메뉴",
 
     "config.reignofnether.warn_config_change": "서버 호스트가 설정을 변경했습니다",
     "config.reignofnether.hide_config_change": "(클릭하여 숨기기)",
@@ -1258,7 +1236,6 @@
     "startpos.reignofnether.start_button.no_reserved_pos": "자리를 예약하지 않았습니다!",
     "startpos.reignofnether.cancel_start_button": "게임 시작 취소",
     "startpos.reignofnether.cancelled_start_game": "게임 시작 취소됨",
-    "startpos.reignofnether.starting_game": "%d초 후 게임 시작",
     "startpos.reignofnether.started_game": "게임 시작됨!",
     "startpos.reignofnether.max_positions": "최대 시작 위치 도달 (16개)",
 
diff --git a/src/main/resources/assets/reignofnether/lang/pl_pl.json b/src/main/resources/assets/reignofnether/lang/pl_pl.json
index 1314f2113..82e5e760c 100644
--- a/src/main/resources/assets/reignofnether/lang/pl_pl.json
+++ b/src/main/resources/assets/reignofnether/lang/pl_pl.json
@@ -370,8 +370,6 @@
     "hud.helperbuttons.reignofnether.select_all_military_units": "Wybierz wszystkie jednostki wojskowe",
     "hud.helperbuttons.reignofnether.cancel": "Anuluj",
 
-    "hud.map.reignofnether.open": "Otwórz dużą mapę",
-    "hud.map.reignofnether.close": "Zamknij",
 
     "hud.startbuttons.villagers.reignofnether.first": "Dołącz do gry jako frakcja osadników.",
     "hud.startbuttons.villagers.reignofnether.second": "Przywołuje %d osadników w miejscu docelowym.",
@@ -388,11 +386,9 @@
     "hud.reignofnether.drop_off_resources": "Odstaw zasoby",
     "hud.reignofnether.gather_resources": "Zbieraj zasoby (%s)",
     "hud.reignofnether.change_target_resource": "kliknij aby zmienić docelowe zasoby",
-    "hud.reignofnether.total_workers": "Wszyscy pracownicy: %d",
     "hud.reignofnether.workers_on_food": "Robotnicy zbierający żywność",
     "hud.reignofnether.workers_on_wood": "Robotnicy zbierający drewno",
     "hud.reignofnether.workers_on_ore": "Robotnicy zbierający rudę",
-    "hud.reignofnether.max_resources": "%s (Maks: %d)",
     "hud.reignofnether.players_resources": "Zasoby gracza %s",
     "hud.reignofnether.you_are_spectator": "Jesteś widzem",
     "hud.reignofnether.placed_capitol": "%s postawił swój kapitol!",
@@ -558,21 +554,10 @@
     "time.reignofnether.survival_wave": "Fala przetrwania: %s",
 
     "tutorial.reignofnether.tutorial_help": "Pomoc samouczka",
-    "tutorial.reignofnether.welcome": "Witaj w Reign of Nether",
     "tutorial.reignofnether.welcome2": "Witaj w samouczku!",
     "tutorial.reignofnether.get_started": "Wciśnij F12, by rozpocząć.",
-    "tutorial.reignofnether.join": "Wciśnij F12, by przełączyć kamerę RTS i dołączyć do gry",
-    "tutorial.reignofnether.help": "Użyj '/rts-help', aby zobaczyć listę wszystkich poleceń",
-    "tutorial.reignofnether.controls": "Użyj '/rts-controls', aby wyświetlić sterowanie",
-    "tutorial.reignofnether.locked": "Ten mecz RTS został zablokowany. Zanim dołączysz, poczekaj na nową grę.",
-    "tutorial.reignofnether.welcome_back": "Witaj ponownie w Reign of Nether",
-    "tutorial.reignofnether.op_commands": "Jako operator serwera możesz użyć:",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "Synchronizacja RTS została wyłączona, więc nie możesz wybierać budynków ani sprawdzić właścicieli jednostek, przepraszamy!",
-    "tutorial.reignofnether.sync_disabled2": "Aby rozwiązać ten problem, poproś hosta o ponowne włączenie, a następnie zaloguj się ponownie.",
     "tutorial.reignofnether.server_not_found": "Nie udało się załadować samouczka, nie można znaleźć serwera.",
     "tutorial.reignofnether.resuming": "Witamy ponownie... wznawianie na etapie: %s",
     "tutorial.reignofnether.skipping": "Pomijam etap samouczka... jesteś teraz na: %s",
@@ -797,16 +782,14 @@
     "entity.reignofnether.witch_unit": "Wiedźma",
     "entity.reignofnether.witch_unit.tooltip1": "Przebiegła wiedźma, która potrafi leczyć i zadawać obrażenia za pomocą mikstur.",
 
-    "alliance.reignofnether.sent_request": "\nZapytanie o sojusz wysłana do %s.\n",
-    "alliance.reignofnether.ally_self": "\nNie możesz sprzymierzyć się z samym sobą!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s chce się z tobą sprzymierzyć. Wpisz /allyconfirm %s aby potwierdzić.\n",
-    "alliance.reignofnether.now_allied": "\nJesteś teraz sprzymierzony z %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s zaakceptował twoje zapytanie o sojusz.\n",
-    "alliance.reignofnether.no_request": "\nBrak oczekujących żądań sojuszu od %s.\n",
-    "alliance.reignofnether.disbanded": "\nTwój sojusz z %s został rozwiązany.\n",
-    "alliance.reignofnether.disbanding": "\nRozwiązanie sojuszu z %s za 30 sekund...\n",
-    "alliance.reignofnether.disband_self": "\nNie możesz rozwiązać sojuszu z samym sobą.\n",
-    "alliance.reignofnether.disband_pending": "\nProśba o rozwiązanie do tego gracza jest już w toku.\n",
+    "alliance.reignofnether.sent_request": "Zapytanie o sojusz wysłana do %s.",
+    "alliance.reignofnether.ally_self": "Nie możesz sprzymierzyć się z samym sobą!",
+    "alliance.reignofnether.ally_confirm": "%s chce się z tobą sprzymierzyć. Wpisz /allyconfirm %s aby potwierdzić.",
+    "alliance.reignofnether.now_allied": "Jesteś teraz sprzymierzony z %s.",
+    "alliance.reignofnether.ally_accepted": "%s zaakceptował twoje zapytanie o sojusz.",
+    "alliance.reignofnether.no_request": "Brak oczekujących żądań sojuszu od %s.",
+    "alliance.reignofnether.disbanded": "Twój sojusz z %s został rozwiązany.",
+    "alliance.reignofnether.disband_self": "Nie możesz rozwiązać sojuszu z samym sobą.",
 
     "survival.reignofnether.dawn": "Nastaje świt",
     "survival.reignofnether.dusk": "Zapada noc...",
diff --git a/src/main/resources/assets/reignofnether/lang/pt_br.json b/src/main/resources/assets/reignofnether/lang/pt_br.json
index 1c4eb43cc..28bc38314 100644
--- a/src/main/resources/assets/reignofnether/lang/pt_br.json
+++ b/src/main/resources/assets/reignofnether/lang/pt_br.json
@@ -328,8 +328,6 @@
     "hud.helperbuttons.reignofnether.select_all_military_units": "Selecionar todas as unidades militares",
     "hud.helperbuttons.reignofnether.cancel": "Cancelar",
 
-    "hud.map.reignofnether.open": "Abrir mapa grande",
-    "hud.map.reignofnether.close": "Fechar",
 
     "hud.startbuttons.villagers.reignofnether.first": "Entrar no jogo como a Facção dos Aldeões.",
     "hud.startbuttons.villagers.reignofnether.second": "Cria %d aldeões no local alvo.",
@@ -345,9 +343,7 @@
     "hud.reignofnether.drop_off_resources": "Deixar recursos",
     "hud.reignofnether.gather_resources": "Coletar recursos (%s)",
     "hud.reignofnether.change_target_resource": "Clique para mudar o recurso alvo",
-    "hud.reignofnether.total_workers": "Total de Trabalhadores: %d",
     "hud.reignofnether.workers_on": "Trabalhadores em %s",
-    "hud.reignofnether.max_resources": "%s (Máx: %d)",
     "hud.reignofnether.players_resources": "Recursos de %s",
     "hud.reignofnether.you_are_spectator": "Você é um espectador",
     "hud.reignofnether.placed_capitol": "%s colocou seu edifício de capitólio!",
@@ -487,21 +483,10 @@
     "time.reignofnether.night_circle_mode_off": "Desligado",
 
     "tutorial.reignofnether.tutorial_help": "Ajuda do Tutorial",
-    "tutorial.reignofnether.welcome": "Bem-vindo ao Reign of Nether",
     "tutorial.reignofnether.welcome2": "Bem-vindo ao Tutorial do Reign of Nether!",
     "tutorial.reignofnether.get_started": "Pressione F12 para começar.",
-    "tutorial.reignofnether.join": "Pressione F12 para alternar a câmera RTS e entrar no jogo",
-    "tutorial.reignofnether.help": "Use '/rts-help' para ver a lista de todos os comandos",
-    "tutorial.reignofnether.controls": "Use '/rts-controls' para ver a lista de controles",
-    "tutorial.reignofnether.locked": "Esta partida RTS foi bloqueada. Aguarde por um novo jogo antes de entrar.",
-    "tutorial.reignofnether.welcome_back": "Bem-vindo de volta ao Reign of Nether",
-    "tutorial.reignofnether.op_commands": "Como administrador do servidor, você pode usar:",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable (experimental)",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable (experimental)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "A sincronização RTS foi desativada, então você não pode selecionar edifícios ou ver os donos das unidades, desculpe!",
-    "tutorial.reignofnether.sync_disabled2": "Para resolver isso, peça ao anfitrião para reabilitar a sincronização, e depois entre novamente.",
     "tutorial.reignofnether.server_not_found": "Falha ao carregar o tutorial, o servidor não foi encontrado.",
     "tutorial.reignofnether.resuming": "Bem-vindo de volta... retomando do estágio: %s",
     "tutorial.reignofnether.skipping": "Pulando o estágio do tutorial... você agora está no estágio: %s",
diff --git a/src/main/resources/assets/reignofnether/lang/ru_ru.json b/src/main/resources/assets/reignofnether/lang/ru_ru.json
index 3448eece9..90007a3f2 100644
--- a/src/main/resources/assets/reignofnether/lang/ru_ru.json
+++ b/src/main/resources/assets/reignofnether/lang/ru_ru.json
@@ -217,7 +217,6 @@
     "item.reignofnether.hud.sell": "Продать: %d",
     "item.reignofnether.hud.give_to_unit": "%s был выдан юниту %s",
     "item.reignofnether.hud.item_deleted": "Предмет удален!",
-    "itemshop.reignofnether.toggle_menu": "Открыть магазин",
     "itemshop.reignofnether.error.out_of_stock": "Нет в наличии (пополнение через %dс)",
     "itemshop.reignofnether.error.full_inventory": "Инвентарь полон",
     "itemshop.reignofnether.error.cant_afford": "Недостаточно средств",
@@ -1036,8 +1035,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_controls": "%s контролирует маяк",
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s победит через: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Нажмите чтобы перейти к маяку)",
-    "hud.map.reignofnether.open": "Открыть большую карту/настройки",
-    "hud.map.reignofnether.close": "Закрыть",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Чувствительность камеры: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(ЛКМ/ПКМ для настройки)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Фиксация центра карты: Включена",
@@ -1051,8 +1048,6 @@
     "hud.map.reignofnether.rotate_cw.tooltip2": "(Alt + стрелка вправо)",
     "hud.map.reignofnether.rotate_ccw.tooltip1": "Повернуть камеру против часовой стрелки",
     "hud.map.reignofnether.rotate_ccw.tooltip2": "(Alt + стрелка влево)",
-    "hud.map.reignofnether.marker_mode_enabled": "Режим метки включён",
-    "hud.map.reignofnether.marker_mode_disabled": "Режим метки выключен",
     "hud.startbuttons.villagers.reignofnether.first": "Присоединиться к игре за Деревенских",
     "hud.startbuttons.villagers.reignofnether.second": "Создает %d деревенских жителей в указанном месте.",
     "hud.startbuttons.monsters.reignofnether.first": "Присоединиться к игре за Монстров",
@@ -1076,13 +1071,10 @@
     "hud.reignofnether.drop_off_resources": "Сдать ресурсы",
     "hud.reignofnether.gather_resources": "Собирать ресурсы (%s)",
     "hud.reignofnether.change_target_resource": "Нажмите, чтобы изменить целевой ресурс",
-    "hud.reignofnether.total_workers": "Всего рабочих: %d",
     "hud.reignofnether.workers_on_food": "Рабочих на еде",
     "hud.reignofnether.workers_on_wood": "Рабочих на древесине",
     "hud.reignofnether.workers_on_ore": "Рабочих на руде",
-    "hud.reignofnether.items_found": "Предметов найдено: %d",
     "hud.reignofnether.items_hint": "Убивайте нейтральных врагов для изумрудов и предметов",
-    "hud.reignofnether.max_resources": "%s (Макс: %d)",
     "hud.reignofnether.players_resources": "Ресурсы игрока %s",
     "hud.reignofnether.you_are_spectator": "Вы наблюдатель",
     "hud.reignofnether.placed_capitol": "%s построил(а) свою столицу!",
@@ -1139,8 +1131,6 @@
     "hud.relationship.reignofnether.allied": "Союзник",
     "hud.relationship.reignofnether.enemy": "Враг",
     "hud.relationship.reignofnether.neutral": "Нейтральный",
-    "hud.hero.reignofnether.level": " (Ур. %d)",
-    "hud.hero.reignofnether.level.short": " Ур. %d",
     "hud.hero.reignofnether.experience": "Опыт: %d/%d",
     "hud.hero.reignofnether.experience_warning": "Опыт за нейтралов не начисляется с 5-го уровня",
     "hud.hero.reignofnether.max_level": "Макс. уровень!",
@@ -1391,21 +1381,10 @@
     "time.reignofnether.night_circle_change": "(Нажмите, чтобы изменить)",
     "time.reignofnether.time_until_next_wave": "%s до следующей волны",
     "tutorial.reignofnether.tutorial_help": "Помощь по обучению",
-    "tutorial.reignofnether.welcome": "Добро пожаловать в Reign of Nether",
     "tutorial.reignofnether.welcome2": "Добро пожаловать в обучение Reign of Nether!",
     "tutorial.reignofnether.get_started": "Нажмите F12 или используйте /rts-camera, чтобы начать.",
-    "tutorial.reignofnether.join": "Нажмите F12, чтобы переключить камеру RTS и присоединиться к игре",
-    "tutorial.reignofnether.help": "Используйте '/rts-help', чтобы увидеть список всех команд",
-    "tutorial.reignofnether.controls": "Используйте '/rts-controls', чтобы увидеть список управления",
-    "tutorial.reignofnether.locked": "Этот RTS-матч заблокирован. Пожалуйста, дождитесь новой игры, чтобы присоединиться.",
-    "tutorial.reignofnether.welcome_back": "С возвращением в Reign of Nether",
-    "tutorial.reignofnether.op_commands": "Как оператор сервера вы можете использовать:",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable (экспериментально)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "RTS-синхронизация отключена, поэтому вы не можете выбирать здания или видеть владельцев юнитов, извините!",
-    "tutorial.reignofnether.sync_disabled2": "Чтобы решить эту проблему, попросите хостера включить её снова, затем перезайдите.",
     "tutorial.reignofnether.server_not_found": "Не удалось загрузить обучение, сервер не найден.",
     "tutorial.reignofnether.resuming": "С возвращением... продолжение на этапе: %s",
     "tutorial.reignofnether.skipping": "Пропуск этапа обучения... теперь вы на: %s",
@@ -1738,28 +1717,26 @@
     "units.reignofnether.hero_production.allowed_heroes_1": "Вы можете иметь только одного героя за игру",
     "units.reignofnether.hero_production.allowed_heroes_2": "Вы можете иметь двух разных героев за игру",
     "units.reignofnether.hero_production.unlock_hero_2": "Разблокируйте 2-го героя при наличии Замка, Цитадели или Крепости",
-    "alliance.reignofnether.sent_request": "\nЗапрос на союз отправлен %s.\n",
-    "alliance.reignofnether.ally_self": "\nНельзя вступить в союз с самим собой!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s хочет вступить с вами в союз. Введите /allyconfirm %s для подтверждения.\n",
+    "alliance.reignofnether.sent_request": "Запрос на союз отправлен %s.",
+    "alliance.reignofnether.ally_self": "Нельзя вступить в союз с самим собой!",
+    "alliance.reignofnether.ally_confirm": "%s хочет вступить с вами в союз. Введите /allyconfirm %s для подтверждения.",
     "alliance.reignofnether.accept": "[Нажмите, чтобы принять]",
     "alliance.reignofnether.cancel": "[Нажмите, чтобы отклонить]",
-    "alliance.reignofnether.now_allied": "\nТеперь вы в союзе с %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s принял ваш запрос на союз.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\nЗапрос на союз с %s отозван.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\nИгрок %s отозвал свой запрос на союз.\n",
-    "alliance.reignofnether.no_request": "\nНет ожидающих запросов на союз от %s.\n",
-    "alliance.reignofnether.alliances_lock": "\nВы не можете менять союзы во время матча (игровое правило lockAlliances включено).\n",
-    "alliance.reignofnether.alliances_lock_coop": "\nВы не можете менять союзы во время матча (игровое правило coopMode включено).\n",
-    "alliance.reignofnether.disbanded": "\nВаш союз с %s распущен.\n",
-    "alliance.reignofnether.disbanding": "\nРоспуск союза с %s через 30 секунд...\n",
-    "alliance.reignofnether.disband_self": "\nНельзя распустить самого себя.\n",
-    "alliance.reignofnether.disband_pending": "\nЗапрос на роспуск для этого игрока уже ожидает.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s теперь в союзе с %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s распустил союз с %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nВы делитесь управлением юнитами с союзниками.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nВы НЕ делитесь управлением юнитами с союзниками.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s теперь делится управлением юнитами с союзниками.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s больше не делится управлением юнитами с союзниками.\n",
+    "alliance.reignofnether.now_allied": "Теперь вы в союзе с %s.",
+    "alliance.reignofnether.ally_accepted": "%s принял ваш запрос на союз.",
+    "alliance.reignofnether.ally_request_cancelled_self": "Запрос на союз с %s отозван.",
+    "alliance.reignofnether.ally_request_cancelled": "Игрок %s отозвал свой запрос на союз.",
+    "alliance.reignofnether.no_request": "Нет ожидающих запросов на союз от %s.",
+    "alliance.reignofnether.alliances_lock": "Вы не можете менять союзы во время матча (игровое правило lockAlliances включено).",
+    "alliance.reignofnether.alliances_lock_coop": "Вы не можете менять союзы во время матча (игровое правило coopMode включено).",
+    "alliance.reignofnether.disbanded": "Ваш союз с %s распущен.",
+    "alliance.reignofnether.disband_self": "Нельзя распустить самого себя.",
+    "alliance.reignofnether.now_allied_third_party": "%s теперь в союзе с %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s распустил союз с %s.",
+    "alliance.reignofnether.ally_control_enabled": "Вы делитесь управлением юнитами с союзниками.",
+    "alliance.reignofnether.ally_control_disabled": "Вы НЕ делитесь управлением юнитами с союзниками.",
+    "alliance.reignofnether.ally_control_enable": "%s теперь делится управлением юнитами с союзниками.",
+    "alliance.reignofnether.ally_control_disable": "%s больше не делится управлением юнитами с союзниками.",
     "survival.reignofnether.dawn": "Наступает рассвет",
     "survival.reignofnether.dusk": "Наступает ночь...",
     "survival.reignofnether.dusksoon": "Солнечный свет угасает.",
@@ -1855,10 +1832,6 @@
     "hud.gamemode.reignofnether.taken_scenario_role": "(взята %s)",
     "hud.gamemode.reignofnether.npc_scenario_role": "(только для NPC)",
     "hud.gamemode.reignofnether.cycle_scenario_role": "(ЛКМ для смены)",
-    "hud.gamerule.reignofnether.shift_click": "(Удерживайте Shift для быстрой настройки)",
-    "hud.gamerule.reignofnether.click": "(ЛКМ/ПКМ для настройки)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Только операторы могут изменять)",
-    "hud.gamerule.reignofnether.menu": "Меню правил игры",
     "config.reignofnether.warn_config_change": "Хост сервера изменил настройки",
     "config.reignofnether.hide_config_change": "(Нажмите, чтобы скрыть)",
     "sandbox.reignofnether.relationship_button1": "Отношения: %s",
@@ -2004,7 +1977,6 @@
     "startpos.reignofnether.start_button.no_faction": "Вы не выбрали фракцию!",
     "startpos.reignofnether.cancel_start_button": "Отменить старт игры",
     "startpos.reignofnether.cancelled_start_game": "Старт игры отменён",
-    "startpos.reignofnether.starting_game": "Игра начнётся через %d секунд",
     "startpos.reignofnether.started_game": "Игра начата!",
     "startpos.reignofnether.max_positions": "Достигнуто максимальное число стартовых позиций (16)",
     "startpos.reignofnether.rts_map_info_used": "Эта карта использует стартовые позиции rtsmap.json (структурные блоки игнорируются)",
@@ -2179,7 +2151,6 @@
     "key.reignofnether.item4": "Слот предмета 4",
     "key.reignofnether.item5": "Слот предмета 5",
     "key.reignofnether.item6": "Слот предмета 6",
-    "key.reignofnether.minimap_toggle": "Переключить миникарту",
     "key.reignofnether.hotkey_1": "Горячая клавиша 1",
     "key.reignofnether.hotkey_2": "Горячая клавиша 2",
     "key.reignofnether.hotkey_3": "Горячая клавиша 3",
@@ -2187,7 +2158,6 @@
     "key.reignofnether.hotkey_5": "Горячая клавиша 5",
     "key.reignofnether.hotkey_6": "Горячая клавиша 6",
     "key.reignofnether.hotkey_7": "Горячая клавиша 7",
-    "key.reignofnether.hotkey_8": "Горячая клавиша 8",
     "key.reignofnether.hotkey_9": "Горячая клавиша 9",
     "key.reignofnether.hotkey_10": "Горячая клавиша 10",
     "key.reignofnether.control_group_0": "Контрольная группа 0",
@@ -2213,7 +2183,6 @@
     "key.reignofnether.fn_11": "Функциональная клавиша 11",
     "key.reignofnether.fn_12": "Функциональная клавиша 12 (Переключить RTS-камеру)",
     "matchstart.reignofnether.mode": "Режим: %s",
-    "matchstart.reignofnether.map_preview": "КАРТА",
     "matchstart.reignofnether.roster": "РОСТЕР",
     "matchstart.reignofnether.team": "Команда: %d",
     "matchstart.reignofnether.no_positions": "Нет доступных начальных позиций.",
@@ -2224,20 +2193,11 @@
     "matchstart.reignofnether.ready_count": "%d / %d готовы",
     "matchstart.reignofnether.map_loading": "Загрузка карты…",
     "matchstart.reignofnether.place_blocks_hint": "Поставьте стартовые блоки RTS, чтобы добавить позиции.",
-    "matchstart.reignofnether.empty_slot": "(пусто — нажмите, чтобы присоединиться)",
     "matchstart.reignofnether.spectators": "НАБЛЮДАТЕЛИ",
-    "matchstart.reignofnether.spectator_tag": "наблюдает",
-    "matchstart.reignofnether.join_spectators": "+ Покинуть мою команду и наблюдать",
     "matchstart.reignofnether.no_spectators": "(пока нет наблюдателей)",
     "matchstart.reignofnether.chat": "ЧАТ",
     "matchstart.reignofnether.chat.placeholder": "Введите сообщение…",
     "matchstart.reignofnether.chat.click_to_type": "Нажмите T или нажмите здесь для ввода — Enter для отправки",
-    "matchstart.reignofnether.hint.pick_pos": "Нажмите на карту, чтобы выбрать стартовую позицию.",
-    "matchstart.reignofnether.hint.pick_faction": "Выберите вашу фракцию.",
-    "matchstart.reignofnether.hint.ready_up": "Нажмите на крестик в своей строке, чтобы подтвердить готовность.",
-    "matchstart.reignofnether.hint.waiting": "Ожидание готовности других игроков.",
-    "matchstart.reignofnether.hint.close": "Нажмите \"Назад\", чтобы выйти · F12 (выкл + вкл), чтобы открыть снова.",
     "matchstart.reignofnether.settings.title": "НАСТРОЙКИ ИГРЫ",
-    "matchstart.reignofnether.settings.mode": "Режим",
-    "matchstart.reignofnether.settings.op_only": "Настройки игры требуют права оператора"
+    "matchstart.reignofnether.settings.mode": "Режим"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/tr_tr.json b/src/main/resources/assets/reignofnether/lang/tr_tr.json
index fa4da6760..a3ecf04c3 100644
--- a/src/main/resources/assets/reignofnether/lang/tr_tr.json
+++ b/src/main/resources/assets/reignofnether/lang/tr_tr.json
@@ -577,8 +577,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s kazanacak: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Tapınağa gitmek için tıkla)",
 
-    "hud.map.reignofnether.open": "Büyük haritayı/ayarları aç",
-    "hud.map.reignofnether.close": "Kapat",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Kamera hassasiyeti: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Sol/Sağ tıkla, ayarlamak için)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Harita merkezi kilidi: Etkin",
@@ -615,11 +613,9 @@
     "hud.reignofnether.drop_off_resources": "Kaynakları bırak",
     "hud.reignofnether.gather_resources": "Kaynak Topla (%s)",
     "hud.reignofnether.change_target_resource": "Hedef kaynağı değiştirmek için tıkla",
-    "hud.reignofnether.total_workers": "Toplam İşçi: %d",
     "hud.reignofnether.workers_on_food": "Yiyecek toplayan işçiler",
     "hud.reignofnether.workers_on_wood": "Odun toplayan işçiler",
     "hud.reignofnether.workers_on_ore": "Maden toplayan işçiler",
-    "hud.reignofnether.max_resources": "%s (Maks: %d)",
     "hud.reignofnether.players_resources": "%s'in kaynakları",
     "hud.reignofnether.you_are_spectator": "Bir izleyicisin",
     "hud.reignofnether.placed_capitol": "%s, ana binasını inşa etti!",
@@ -647,7 +643,6 @@
     "hud.relationship.reignofnether.enemy": "Düşman",
     "hud.relationship.reignofnether.neutral": "Tarafsız",
 
-    "hud.hero.reignofnether.level": " (Seviye %d)",
     "hud.hero.reignofnether.experience": "Deneyim: %d/%d",
     "hud.hero.reignofnether.experience_warning": "Seviye 5’ten sonra tarafsız birimlerden XP alınmaz",
     "hud.hero.reignofnether.max_level": "Maksimum Seviye!",
@@ -847,21 +842,10 @@
     "time.reignofnether.time_until_next_wave": "Sonraki dalgaya %s",
 
     "tutorial.reignofnether.tutorial_help": "Eğitim Yardımı",
-    "tutorial.reignofnether.welcome": "Reign of Nether’a Hoş Geldin",
     "tutorial.reignofnether.welcome2": "Reign of Nether Eğitimine Hoş Geldin!",
     "tutorial.reignofnether.get_started": "Başlamak için F12’ye bas veya /rts-camera komutunu kullan.",
-    "tutorial.reignofnether.join": "RTS kamerasını açmak ve oyuna katılmak için F12’ye bas",
-    "tutorial.reignofnether.help": "Tüm komut listesini görmek için '/rts-help' kullan",
-    "tutorial.reignofnether.controls": "Tüm kontrolleri görmek için '/rts-controls' kullan",
-    "tutorial.reignofnether.locked": "Bu RTS maçı kilitlendi. Katılmadan önce yeni bir oyunu bekle.",
-    "tutorial.reignofnether.welcome_back": "Reign of Nether’a Tekrar Hoş Geldin",
-    "tutorial.reignofnether.op_commands": "Bir sunucu yöneticisi olarak şunları kullanabilirsin:",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable (deneysel)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "RTS Eşitlemesi devre dışı, bu yüzden binaları seçemez veya birim sahiplerini göremezsin!",
-    "tutorial.reignofnether.sync_disabled2": "Bunu düzeltmek için ev sahibinden yeniden etkinleştirmesini iste ve tekrar giriş yap.",
     "tutorial.reignofnether.server_not_found": "Eğitim yüklenemedi, sunucu bulunamadı.",
     "tutorial.reignofnether.resuming": "Tekrar hoş geldin... aşama: %s devam ediyor",
     "tutorial.reignofnether.skipping": "Eğitim aşaması atlanıyor... şu anda aşama: %s",
@@ -1132,24 +1116,22 @@
     "entity.reignofnether.panda_unit": "Panda",
     "entity.reignofnether.llama_unit": "Lama",
 
-    "alliance.reignofnether.sent_request": "\nİttifak isteği %s oyuncusuna gönderildi.\n",
-    "alliance.reignofnether.ally_self": "\nKendinle ittifak kuramazsın!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s seninle ittifak kurmak istiyor. Diplomasi menüsünden kabul et.\n",
-    "alliance.reignofnether.now_allied": "\nArtık %s ile müttefiksin.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s ittifak isteğini kabul etti.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\n%s oyuncusuna gönderilen ittifak isteği geri çekildi.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s ittifak isteğini geri çekti.\n",
-    "alliance.reignofnether.no_request": "\n%s'den bekleyen bir ittifak isteği yok.\n",
-    "alliance.reignofnether.disbanded": "\n%s ile olan ittifakın sona erdi.\n",
-    "alliance.reignofnether.disbanding": "\n%s ile olan ittifak 30 saniye içinde feshediliyor...\n",
-    "alliance.reignofnether.disband_self": "\nKendinle olan ittifakı feshedemezsin.\n",
-    "alliance.reignofnether.disband_pending": "\nBu oyuncu için bir fesih isteği zaten beklemede.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s artık %s ile müttefik.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s, %s ile olan ittifakını sona erdirdi.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nBirlik kontrolünü müttefiklerle paylaşıyorsun.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nBirlik kontrolünü müttefiklerle paylaşmıyorsun.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s artık birlik kontrolünü müttefiklerle paylaşıyor.\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s artık birlik kontrolünü müttefiklerle paylaşmıyor.\n",
+    "alliance.reignofnether.sent_request": "İttifak isteği %s oyuncusuna gönderildi.",
+    "alliance.reignofnether.ally_self": "Kendinle ittifak kuramazsın!",
+    "alliance.reignofnether.ally_confirm": "%s seninle ittifak kurmak istiyor. Diplomasi menüsünden kabul et.",
+    "alliance.reignofnether.now_allied": "Artık %s ile müttefiksin.",
+    "alliance.reignofnether.ally_accepted": "%s ittifak isteğini kabul etti.",
+    "alliance.reignofnether.ally_request_cancelled_self": "%s oyuncusuna gönderilen ittifak isteği geri çekildi.",
+    "alliance.reignofnether.ally_request_cancelled": "%s ittifak isteğini geri çekti.",
+    "alliance.reignofnether.no_request": "%s'den bekleyen bir ittifak isteği yok.",
+    "alliance.reignofnether.disbanded": "%s ile olan ittifakın sona erdi.",
+    "alliance.reignofnether.disband_self": "Kendinle olan ittifakı feshedemezsin.",
+    "alliance.reignofnether.now_allied_third_party": "%s artık %s ile müttefik.",
+    "alliance.reignofnether.disbanded_third_party": "%s, %s ile olan ittifakını sona erdirdi.",
+    "alliance.reignofnether.ally_control_enabled": "Birlik kontrolünü müttefiklerle paylaşıyorsun.",
+    "alliance.reignofnether.ally_control_disabled": "Birlik kontrolünü müttefiklerle paylaşmıyorsun.",
+    "alliance.reignofnether.ally_control_enable": "%s artık birlik kontrolünü müttefiklerle paylaşıyor.",
+    "alliance.reignofnether.ally_control_disable": "%s artık birlik kontrolünü müttefiklerle paylaşmıyor.",
 
     "survival.reignofnether.dawn": "Şafak söküyor",
     "survival.reignofnether.dusk": "Gece çöküyor...",
@@ -1211,10 +1193,6 @@
     "hud.gamemode.reignofnether.changemode": "Oyun modunu değiştirmek için sağ tıkla",
     "hud.gamemode.reignofnether.locked": "(kilitli)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Daha hızlı ayarlamak için Shift’e basılı tut)",
-    "hud.gamerule.reignofnether.click": "(Ayarlamak için sol/sağ tıkla)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Yalnızca yöneticiler değiştirebilir)",
-    "hud.gamerule.reignofnether.menu": "Oyun Kuralları Menüsü",
 
     "config.reignofnether.warn_config_change": "Sunucu sahibi yapılandırmayı değiştirdi",
     "config.reignofnether.hide_config_change": "(Gizlemek için tıkla)",
@@ -1247,7 +1225,6 @@
     "startpos.reignofnether.start_button.no_reserved_pos": "Henüz bir yer ayırmadın!",
     "startpos.reignofnether.cancel_start_button": "Oyunun başlamasını iptal et",
     "startpos.reignofnether.cancelled_start_game": "Oyunun başlaması iptal edildi",
-    "startpos.reignofnether.starting_game": "Oyun %d saniye içinde başlıyor",
     "startpos.reignofnether.started_game": "Oyun başladı!",
     "startpos.reignofnether.max_positions": "Maksimum başlangıç konumu sayısına ulaşıldı (16)",
 
diff --git a/src/main/resources/assets/reignofnether/lang/uk_ua.json b/src/main/resources/assets/reignofnether/lang/uk_ua.json
index 210179ba8..d30fb3255 100644
--- a/src/main/resources/assets/reignofnether/lang/uk_ua.json
+++ b/src/main/resources/assets/reignofnether/lang/uk_ua.json
@@ -556,8 +556,6 @@
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Натисніть, щоб перейти до маяка)",
     "hud.helperbuttons.reignofnether.select_all_military_units_shift": "(Shift+клік для вибору лише на екрані)",
 
-    "hud.map.reignofnether.close": "Закрити",
-    "hud.map.reignofnether.open": "Відкрити велику карту",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Чутливість камери: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(Лівий/правий клік для налаштування)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Фіксація центру мапи: Увімкнено",
@@ -586,11 +584,9 @@
     "hud.reignofnether.drop_off_resources": "Скиньте ресурси",
     "hud.reignofnether.gather_resources": "Збирати ресурси (%s)",
     "hud.reignofnether.change_target_resource": "Натисніть, щоб змінити обраний ресурс",
-    "hud.reignofnether.total_workers": "Усього робітників: %d",
     "hud.reignofnether.workers_on_food": "Збір їжі",
     "hud.reignofnether.workers_on_wood": "Добування дерева",
     "hud.reignofnether.workers_on_ore": "Добування руди",
-    "hud.reignofnether.max_resources": "%s (Максимум: %d)",
     "hud.reignofnether.players_resources": "%s ресурсів",
     "hud.reignofnether.you_are_spectator": "Ти глядач",
     "hud.reignofnether.placed_capitol": "%s поставив свою ратушу!",
@@ -618,7 +614,6 @@
     "hud.relationship.reignofnether.enemy": "Ворог",
     "hud.relationship.reignofnether.neutral": "Нейтральний",
 
-    "hud.hero.reignofnether.level": " (Рівень %d)",
     "hud.hero.reignofnether.experience": "Досвід: %d/%d",
     "hud.hero.reignofnether.max_level": "Макс. рівень!",
 
@@ -812,21 +807,10 @@
     "time.reignofnether.time_until_next_wave": "До наступної хвилі: %s",
 
     "tutorial.reignofnether.tutorial_help": "Посібник по навчанню",
-    "tutorial.reignofnether.welcome": "Ласкаво просимо до Reign of Nether",
     "tutorial.reignofnether.welcome2": "Ласкаво просимо до посібника по Reign of Nether!",
     "tutorial.reignofnether.get_started": "Натисніть F12 чи /rts-camera щоб почати.",
-    "tutorial.reignofnether.join": "Натисніть F12, щоб увімкнути камеру RTS і приєднатися до гри",
-    "tutorial.reignofnether.help": "Використовуйте '/rts-help', щоб переглянути список усіх команд",
-    "tutorial.reignofnether.controls": "Використовуйте '/rts-controls', щоб переглянути список елементів керування",
-    "tutorial.reignofnether.locked": "Цей RTS матч було заблоковано. Будь ласка, дочекайтеся нової гри, перш ніж приєднатися.",
-    "tutorial.reignofnether.welcome_back": "Ласкаво просимо знову до Reign of Nether",
-    "tutorial.reignofnether.op_commands": "Як адмінистатор сервера ви можете використовувати:",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable Включити/виключити туман війни",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable Щоб заборонити/дозволити новим гравцям заходити в гру",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable Увімкнути/вимкнути синхронізацію",
     "tutorial.reignofnether.reset": "/rts-reset Закінчити гру",
-    "tutorial.reignofnether.sync_disabled1": "Синхронізація RTS вимкнена, тому ви не можете вибирати будівлі або бачити власників будинків, вибачте!",
-    "tutorial.reignofnether.sync_disabled2": "Щоб вирішити цю проблему, попросіть хост повторно увімкнути його, а потім перезалогіньтесь.",
     "tutorial.reignofnether.server_not_found": "Не вдалося завантажити посібник, сервер не знайдено.",
     "tutorial.reignofnether.resuming": "Ласкаво просимо назад... продовження на етапі: %s",
     "tutorial.reignofnether.skipping": "Пропустити етап навчання... ви вже на: %s",
@@ -1105,11 +1089,9 @@
     "alliance.reignofnether.ally_accepted": "%s приняв союз с тобой.",
     "alliance.reignofnether.no_request": "Немає приглошень на вступ до союзу від %s.",
     "alliance.reignofnether.disbanded": "Твій союз з %s був скасован.",
-    "alliance.reignofnether.disbanding": "Скасування союзу с %s через 30 секунд...",
     "alliance.reignofnether.disband_self": "Ти не можешь себе скасувати.",
-    "alliance.reignofnether.disband_pending": "Запит на скасування союзу з цим гравцем вже надіслан.",
-    "alliance.reignofnether.now_allied_third_party": "\n%s тепер у союзі з %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s розірвав(ла) союз із %s.\n",
+    "alliance.reignofnether.now_allied_third_party": "%s тепер у союзі з %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s розірвав(ла) союз із %s.",
 
     "survival.reignofnether.dawn": "Світанок розгортається",
     "survival.reignofnether.dusk": "Настає ніч...",
@@ -1170,10 +1152,6 @@
     "hud.gamemode.reignofnether.changemode": "ПКМ щоб змінити режим гри",
     "hud.gamemode.reignofnether.locked": "(закрито)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Утримуйте Shift для швидшої зміни)",
-    "hud.gamerule.reignofnether.click": "(Лівий/правий клік для зміни)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Змінювати можуть лише адміністратори)",
-    "hud.gamerule.reignofnether.menu": "Меню правил гри",
 
     "config.reignofnether.warn_config_change": "Хост сервера змінив налаштування",
     "config.reignofnether.hide_config_change": "(Натисніть, щоб сховати)",
@@ -1206,7 +1184,6 @@
     "startpos.reignofnether.start_button.no_reserved_pos": "Ви не зарезервували місце!",
     "startpos.reignofnether.cancel_start_button": "Скасувати початок гри",
     "startpos.reignofnether.cancelled_start_game": "Початок гри скасовано",
-    "startpos.reignofnether.starting_game": "Гра почнеться через %d секунд",
     "startpos.reignofnether.started_game": "Гра почалася!",
     "startpos.reignofnether.max_positions": "Досягнуто максимум початкових позицій (16)"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/vi_vn.json b/src/main/resources/assets/reignofnether/lang/vi_vn.json
index 98689ed3c..cf6796bbe 100644
--- a/src/main/resources/assets/reignofnether/lang/vi_vn.json
+++ b/src/main/resources/assets/reignofnether/lang/vi_vn.json
@@ -579,8 +579,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s thắng trong vòng: %s",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "(Nhấp để tới Đèn Hiệu)",
 
-    "hud.map.reignofnether.open": "Mở bản đồ lớn",
-    "hud.map.reignofnether.close": "Đóng",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "Độ nhạy camera: %d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "(nhấp chuột trái/phải để điều chỉnh)",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "Khóa trung tâm bản đồ: Đã bật",
@@ -617,11 +615,9 @@
     "hud.reignofnether.drop_off_resources": "Giao nộp tài nguyên",
     "hud.reignofnether.gather_resources": "Thu thập tài nguyên (%s)",
     "hud.reignofnether.change_target_resource": "Nhấp để thay đổi tài nguyên đã chọn",
-    "hud.reignofnether.total_workers": "Tổng nhân công: %d",
     "hud.reignofnether.workers_on_food": "Nhân công làm nông",
     "hud.reignofnether.workers_on_wood": "Nhân công chặt cây",
     "hud.reignofnether.workers_on_ore": "Nhân công khai mỏ",
-    "hud.reignofnether.max_resources": "%s (Tối đa: %d)",
     "hud.reignofnether.players_resources": "Tài nguyên của %s",
     "hud.reignofnether.you_are_spectator": "Bạn đang là người quan sát",
     "hud.reignofnether.placed_capitol": "%s đã đặt nhà chính!",
@@ -649,7 +645,6 @@
     "hud.relationship.reignofnether.enemy": "Kẻ thù",
     "hud.relationship.reignofnether.neutral": "Trung lập",
 
-    "hud.hero.reignofnether.level": "(Cấp %d)",
     "hud.hero.reignofnether.experience": "Kinh nghiệm: %d/%d",
     "hud.hero.reignofnether.experience_warning": "Không nhận được kinh nghiệm từ quái Trung lập từ cấp 5",
     "hud.hero.reignofnether.max_level": "Cấp tối đa",
@@ -849,21 +844,10 @@
     "time.reignofnether.time_until_next_wave": "%s đến đợt tiếp theo",
 
     "tutorial.reignofnether.tutorial_help": "Hướng dẫn",
-    "tutorial.reignofnether.welcome": "Chào mừng đến với Reign of Nether",
     "tutorial.reignofnether.welcome2": "Chào mừng đến với hướng dẫn của Reign of Nether!",
     "tutorial.reignofnether.get_started": "Nhấn 'F12' để bắt đầu.",
-    "tutorial.reignofnether.join": "Nhấn 'F12' để chuyển đổi camera RTS và tham gia trận đấu",
-    "tutorial.reignofnether.help": "Sử dụng '/rts-help' để xem danh sách tất cả các câu lệnh",
-    "tutorial.reignofnether.controls": "Sử dụng '/rts-controls' để xem danh sách điều khiển",
-    "tutorial.reignofnether.locked": "Trận RTS này đã bị khóa. Vui lòng chờ một trận đấu mới trước khi tham gia.",
-    "tutorial.reignofnether.welcome_back": "Chào mừng quay lại với Reign of Nether",
-    "tutorial.reignofnether.op_commands": "Với tư cách là chủ phòng, bạn có thể sử dụng:",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable (thử nghiệm)",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "RTS Syncing đã bị vô hiệu hóa, vì vậy bạn không thể chọn công trình hoặc xem chủ sở hữu đơn vị, xin lỗi!",
-    "tutorial.reignofnether.sync_disabled2": "Để khắc phục điều này, vui lòng yêu cầu chủ phòng bật lại và sau đó đăng nhập lại.",
     "tutorial.reignofnether.server_not_found": "Không thể tải hướng dẫn, không thể tìm thấy máy chủ.",
     "tutorial.reignofnether.resuming": "Chào mừng quay lại... tiếp tục ở giai đoạn: %s",
     "tutorial.reignofnether.skipping": "Bỏ qua giai đoạn hướng dẫn... bạn hiện đang ở: %s",
@@ -1136,25 +1120,23 @@
     "entity.reignofnether.panda_unit": "Gấu Trúc",
     "entity.reignofnether.llama_unit": "Lạc Đà Không Bướu",
 
-    "alliance.reignofnether.sent_request": "\nĐã gửi yêu cầu liên minh tới %s.\n",
-    "alliance.reignofnether.ally_self": "\nBạn không thể liên minh với chính mình!\n",
-    "alliance.reignofnether.ally_confirm": "\n%s muốn liên minh với bạn. Vào Menu ngoại giao để xác nhận.\n",
-    "alliance.reignofnether.ally_confirm_survival": "\n%s muốn liên minh với bạn. Xác nhận bằng lệnh /allyconfirm %s.\n",
-    "alliance.reignofnether.now_allied": "\nBạn đã liên minh với %s.\n",
-    "alliance.reignofnether.ally_accepted": "\n%s đã chấp nhận yêu cầu liên minh của bạn.\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\n%s Rút lại yêu cầu liên minh gửi tới %s.\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s đã rút lại yêu cầu liên minh của họ. \n",
-    "alliance.reignofnether.no_request": "\nKhông có yêu cầu liên minh chờ từ %s.\n",
-    "alliance.reignofnether.disbanded": "\nLiên minh của bạn với %s đã bị giải tán.\n",
-    "alliance.reignofnether.disbanding": "\nĐang giải tán liên minh với %s trong 30 giây...\n",
-    "alliance.reignofnether.disband_self": "\nBạn không thể giải tán chính mình.\n",
-    "alliance.reignofnether.disband_pending": "\nYêu cầu giải tán liên minh với người chơi này đã được gửi.\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s giờ đã liên minh với %s.\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s đã giải tán liên minh với %s.\n",
-    "alliance.reignofnether.ally_control_enabled": "\nBạn đang chia sẻ quyền điều khiển đơn vị với đồng minh.\n",
-    "alliance.reignofnether.ally_control_disabled": "\nBạn đang KHÔNG chia sẻ quyền điều khiển đơn vị với đồng minh.\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s đang chia sẻ quyền điều khiển đơn vị với đồng minh\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s đã ngừng chia sẻ quyền điều khiển đơn vị với đồng minh\n",
+    "alliance.reignofnether.sent_request": "Đã gửi yêu cầu liên minh tới %s.",
+    "alliance.reignofnether.ally_self": "Bạn không thể liên minh với chính mình!",
+    "alliance.reignofnether.ally_confirm": "%s muốn liên minh với bạn. Vào Menu ngoại giao để xác nhận.",
+    "alliance.reignofnether.ally_confirm_survival": "%s muốn liên minh với bạn. Xác nhận bằng lệnh /allyconfirm %s.",
+    "alliance.reignofnether.now_allied": "Bạn đã liên minh với %s.",
+    "alliance.reignofnether.ally_accepted": "%s đã chấp nhận yêu cầu liên minh của bạn.",
+    "alliance.reignofnether.ally_request_cancelled_self": "%s Rút lại yêu cầu liên minh gửi tới %s.",
+    "alliance.reignofnether.ally_request_cancelled": "%s đã rút lại yêu cầu liên minh của họ. ",
+    "alliance.reignofnether.no_request": "Không có yêu cầu liên minh chờ từ %s.",
+    "alliance.reignofnether.disbanded": "Liên minh của bạn với %s đã bị giải tán.",
+    "alliance.reignofnether.disband_self": "Bạn không thể giải tán chính mình.",
+    "alliance.reignofnether.now_allied_third_party": "%s giờ đã liên minh với %s.",
+    "alliance.reignofnether.disbanded_third_party": "%s đã giải tán liên minh với %s.",
+    "alliance.reignofnether.ally_control_enabled": "Bạn đang chia sẻ quyền điều khiển đơn vị với đồng minh.",
+    "alliance.reignofnether.ally_control_disabled": "Bạn đang KHÔNG chia sẻ quyền điều khiển đơn vị với đồng minh.",
+    "alliance.reignofnether.ally_control_enable": "%s đang chia sẻ quyền điều khiển đơn vị với đồng minh",
+    "alliance.reignofnether.ally_control_disable": "%s đã ngừng chia sẻ quyền điều khiển đơn vị với đồng minh",
 
     "survival.reignofnether.dawn": "Bình minh đã ló dạng",
     "survival.reignofnether.dusk": "Đêm buông xuống...",
@@ -1216,10 +1198,6 @@
     "hud.gamemode.reignofnether.changemode": "Nhấn chuột phải để thay đổi chế độ trò chơi",
     "hud.gamemode.reignofnether.locked": "(đã khóa)",
 
-    "hud.gamerule.reignofnether.shift_click": "(Đè Shift để thay đổi nhanh hơn)",
-    "hud.gamerule.reignofnether.click": "(Nhấp chuột trái/phải để thay đổi)",
-    "hud.gamerule.reignofnether.warn_not_opped": "(Chỉ có ops mới có thể điểu chỉnh)",
-    "hud.gamerule.reignofnether.menu": "Menu luật chơi",
 
     "config.reignofnether.warn_config_change": "Chủ máy chủ đã thay đổi cấu hình",
     "config.reignofnether.hide_config_change": "(Nhấp để ẩn)",
@@ -1252,7 +1230,6 @@
     "startpos.reignofnether.start_button.no_reserved_pos": "Bạn chưa có chỗ",
     "startpos.reignofnether.cancel_start_button": "Hủy bắt đầu trò chơi",
     "startpos.reignofnether.cancelled_start_game": "Trò chơi chưa được bắt đầu",
-    "startpos.reignofnether.starting_game": "Trò chơi bắt đầu trong %d giây nữa",
     "startpos.reignofnether.started_game": "Trò chơi đã bắt đầu!",
     "startpos.reignofnether.max_positions": "Đạt tối đa số lượng điểm bắt đầu (16)",
     "startpos.reignofnether.player_ready": "%s đã sẵn sàng!",
diff --git a/src/main/resources/assets/reignofnether/lang/zh_cn.json b/src/main/resources/assets/reignofnether/lang/zh_cn.json
index ce75cd965..dd3765382 100644
--- a/src/main/resources/assets/reignofnether/lang/zh_cn.json
+++ b/src/main/resources/assets/reignofnether/lang/zh_cn.json
@@ -225,7 +225,6 @@
   "item.reignofnether.hud.give_to_unit": "将%1$s给予%2$s",
   "item.reignofnether.hud.item_deleted": "物品已删除！",
 
-  "itemshop.reignofnether.toggle_menu": "打开商店",
   "itemshop.reignofnether.error.out_of_stock": "已售罄（%ds后补货）",
   "itemshop.reignofnether.error.full_inventory": "背包已满",
   "itemshop.reignofnether.error.cant_afford": "资源不足以购买",
@@ -1122,8 +1121,6 @@
   "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s将在 %s 后获胜",
   "hud.helperbuttons.reignofnether.beacon.click_to_centre": "（鼠标左击以跳转到信标）",
 
-  "hud.map.reignofnether.open": "展开大地图/选项",
-  "hud.map.reignofnether.close": "收起大地图/选项",
   "hud.map.reignofnether.pan_sensitivity.tooltip1": "视角移动灵敏度：%d/%d",
   "hud.map.reignofnether.pan_sensitivity.tooltip2": "（鼠标左/右击以调整灵敏度）",
   "hud.map.reignofnether.lock_map.tooltip1.enabled": "地图中心锁定：已启用",
@@ -1137,8 +1134,6 @@
   "hud.map.reignofnether.rotate_cw.tooltip2": "（Alt + 右箭头）",
   "hud.map.reignofnether.rotate_ccw.tooltip1": "逆时针旋转视角",
   "hud.map.reignofnether.rotate_ccw.tooltip2": "（Alt + 左箭头）",
-  "hud.map.reignofnether.marker_mode_enabled": "标记模式已启用",
-  "hud.map.reignofnether.marker_mode_disabled": "标记模式已禁用",
 
   "hud.startbuttons.villagers.reignofnether.first": "以村民身份加入游戏",
   "hud.startbuttons.villagers.reignofnether.second": "在目标位置生成 %d 名村民。",
@@ -1166,13 +1161,10 @@
   "hud.reignofnether.drop_off_resources": "交付资源",
   "hud.reignofnether.gather_resources": "采集资源（%s）",
   "hud.reignofnether.change_target_resource": "点击以切换目标资源",
-  "hud.reignofnether.total_workers": "工人总数：%d",
   "hud.reignofnether.workers_on_food": "采集食物的工人",
   "hud.reignofnether.workers_on_wood": "采集木材的工人",
   "hud.reignofnether.workers_on_ore": "采集矿物的工人",
-  "hud.reignofnether.items_found": "已找到的物品：%d",
   "hud.reignofnether.items_hint": "击杀中立生物以获取绿宝石和掉落物品",
-  "hud.reignofnether.max_resources": "%s（最高：%d）",
   "hud.reignofnether.players_resources": "%s的资源",
   "hud.reignofnether.you_are_spectator": "你正处于旁观模式",
   "hud.reignofnether.placed_capitol": "%s已放置主城建筑！",
@@ -1237,8 +1229,6 @@
   "hud.relationship.reignofnether.enemy": "敌对",
   "hud.relationship.reignofnether.neutral": "中立",
 
-  "hud.hero.reignofnether.level": "%d级",
-  "hud.hero.reignofnether.level.short": "%d级",
   "hud.hero.reignofnether.experience": "经验：%d/%d",
   "hud.hero.reignofnether.experience_warning": "5级后无法再从中立单位获得经验",
   "hud.hero.reignofnether.max_level": "已达最大等级！",
@@ -1498,21 +1488,10 @@
   "time.reignofnether.time_until_next_wave": "距下一波次还有 %s",
 
   "tutorial.reignofnether.tutorial_help": "教程帮助",
-  "tutorial.reignofnether.welcome": "欢迎来到《下界之治》",
   "tutorial.reignofnether.welcome2": "欢迎来到《下界之治》模组的教程地图！",
   "tutorial.reignofnether.get_started": "请按下 F12 键或输入命令 '/rts-camera' 开始游玩。",
-  "tutorial.reignofnether.join": "请按下 F12 键切换 RTS 视角并加入游戏",
-  "tutorial.reignofnether.help": "请使用 '/rts-help' 命令查看所有可用的命令",
-  "tutorial.reignofnether.controls": "请使用 '/rts-controls' 命令查看所有的控制方法",
-  "tutorial.reignofnether.locked": "此RTS比赛已锁定，请等待新游戏开始后再加入。",
-  "tutorial.reignofnether.welcome_back": "欢迎回到《下界之治》",
-  "tutorial.reignofnether.op_commands": "作为服务器管理员，你可以使用以下命令：",
-  "tutorial.reignofnether.fog": "/rts-fog enable | disable",
-  "tutorial.reignofnether.lock": "/rts-lock enable | disable",
   "tutorial.reignofnether.syncing": "/rts-syncing enable | disable（实验性功能）",
   "tutorial.reignofnether.reset": "/rts-reset",
-  "tutorial.reignofnether.sync_disabled1": "已禁用 RTS 同步，你无法选中任何建筑或查看单位所属。",
-  "tutorial.reignofnether.sync_disabled2": "请联系服主启用 RTS 同步后重新登录，以解决此问题。",
   "tutorial.reignofnether.server_not_found": "加载教程失败，未找到服务端。",
   "tutorial.reignofnether.resuming": "欢迎回来……正在载入教程 %s 阶段",
   "tutorial.reignofnether.skipping": "正在跳过当前阶段……你目前处于 %s 阶段",
@@ -1870,28 +1849,26 @@
   "units.reignofnether.hero_production.allowed_heroes_2": "每场对局中，你只能拥有两名不同的英雄",
   "units.reignofnether.hero_production.unlock_hero_2": "通过一座城堡、幽匿要塞或下界堡垒解锁你的第二位英雄",
 
-  "alliance.reignofnether.sent_request": "\n已向%s发送结盟请求。\n",
-  "alliance.reignofnether.ally_self": "\n你无法与自己结盟！\n",
-  "alliance.reignofnether.ally_confirm": "\n%s想要同你结盟。请在外交菜单中确认，或在聊天框输入 '/allyconfirm %s' 以确认。\n",
+  "alliance.reignofnether.sent_request": "已向%s发送结盟请求。",
+  "alliance.reignofnether.ally_self": "你无法与自己结盟！",
+  "alliance.reignofnether.ally_confirm": "%s想要同你结盟。请在外交菜单中确认，或在聊天框输入 '/allyconfirm %s' 以确认。",
   "alliance.reignofnether.accept": "[点击接受]",
   "alliance.reignofnether.cancel": "[点击取消]",
-  "alliance.reignofnether.now_allied": "\n你现在已经同%s结盟了。\n",
-  "alliance.reignofnether.ally_accepted": "\n%s已经同意了你的结盟请求。\n",
-  "alliance.reignofnether.ally_request_cancelled_self": "\n你已经撤销了向%s发送的结盟请求。\n",
-  "alliance.reignofnether.ally_request_cancelled": "\n%s已经撤销了其发送的结盟请求。\n",
-  "alliance.reignofnether.no_request": "\n目前尚无来自%s的结盟请求。\n",
-  "alliance.reignofnether.alliances_lock": "\n你无法在对局中途修改同盟关系（游戏规则 lockAlliances 项已启用）\n",
-  "alliance.reignofnether.alliances_lock_coop": "\n你无法在对局中途修改同盟关系 (游戏规则 coopMode 项已启用)\n",
-  "alliance.reignofnether.disbanded": "\n你与%s的同盟已经解散了。\n",
-  "alliance.reignofnether.disbanding": "\n将在 30 秒内解散与%s的同盟……\n",
-  "alliance.reignofnether.disband_self": "\n你无法解除与自己的同盟。\n",
-  "alliance.reignofnether.disband_pending": "\n你已经向该玩家发送了解散同盟请求。\n",
-  "alliance.reignofnether.now_allied_third_party": "\n%s现在与%s结盟了。\n",
-  "alliance.reignofnether.disbanded_third_party": "\n%s解除了与%s的联盟。\n",
-  "alliance.reignofnether.ally_control_enabled": "\n你当前正与盟友共享单位控制。\n",
-  "alliance.reignofnether.ally_control_disabled": "\n你现在并未与盟友共享单位控制。\n",
-  "alliance.reignofnether.ally_control_enable": "\n%s当前正与其盟友共享单位控制。\n",
-  "alliance.reignofnether.ally_control_disable": "\n%s不再与其盟友共享单位控制。\n",
+  "alliance.reignofnether.now_allied": "你现在已经同%s结盟了。",
+  "alliance.reignofnether.ally_accepted": "%s已经同意了你的结盟请求。",
+  "alliance.reignofnether.ally_request_cancelled_self": "你已经撤销了向%s发送的结盟请求。",
+  "alliance.reignofnether.ally_request_cancelled": "%s已经撤销了其发送的结盟请求。",
+  "alliance.reignofnether.no_request": "目前尚无来自%s的结盟请求。",
+  "alliance.reignofnether.alliances_lock": "你无法在对局中途修改同盟关系（游戏规则 lockAlliances 项已启用）",
+  "alliance.reignofnether.alliances_lock_coop": "你无法在对局中途修改同盟关系 (游戏规则 coopMode 项已启用)",
+  "alliance.reignofnether.disbanded": "你与%s的同盟已经解散了。",
+  "alliance.reignofnether.disband_self": "你无法解除与自己的同盟。",
+  "alliance.reignofnether.now_allied_third_party": "%s现在与%s结盟了。",
+  "alliance.reignofnether.disbanded_third_party": "%s解除了与%s的联盟。",
+  "alliance.reignofnether.ally_control_enabled": "你当前正与盟友共享单位控制。",
+  "alliance.reignofnether.ally_control_disabled": "你现在并未与盟友共享单位控制。",
+  "alliance.reignofnether.ally_control_enable": "%s当前正与其盟友共享单位控制。",
+  "alliance.reignofnether.ally_control_disable": "%s不再与其盟友共享单位控制。",
 
   "survival.reignofnether.dawn": "破晓已至",
   "survival.reignofnether.dusk": "夜幕降临...",
@@ -1995,10 +1972,6 @@
   "hud.gamemode.reignofnether.npc_scenario_role": "（NPC 专用）",
   "hud.gamemode.reignofnether.cycle_scenario_role": "（鼠标左击以切换）",
 
-  "hud.gamerule.reignofnether.shift_click": "（按住 Shift 键以更快调整）",
-  "hud.gamerule.reignofnether.click": "（鼠标左/右击以调整）",
-  "hud.gamerule.reignofnether.warn_not_opped": "（仅管理员可修改）",
-  "hud.gamerule.reignofnether.menu": "游戏规则菜单",
 
   "config.reignofnether.warn_config_change": "服务器设置已更改",
   "config.reignofnether.hide_config_change": "（点击以隐藏）",
@@ -2150,7 +2123,6 @@
   "startpos.reignofnether.start_button.no_faction": "你还没有选择派系！",
   "startpos.reignofnether.cancel_start_button": "中止开始游戏",
   "startpos.reignofnether.cancelled_start_game": "游戏已中止",
-  "startpos.reignofnether.starting_game": "游戏将在 %d 秒后开始",
   "startpos.reignofnether.started_game": "游戏已开始！",
   "startpos.reignofnether.max_positions": "起始位置已达上限（16）",
   "startpos.reignofnether.rts_map_info_used": "所选地图使用了 rtsmap.json 文件的起始位置（起始方块已忽略）",
@@ -2339,7 +2311,6 @@
   "key.reignofnether.item5": "道具槽 5",
   "key.reignofnether.item6": "道具槽 6",
 
-  "key.reignofnether.minimap_toggle": "展开/收起大地图",
   "key.reignofnether.hotkey_1":       "快捷键 1",
   "key.reignofnether.hotkey_2":       "快捷键 2",
   "key.reignofnether.hotkey_3":       "快捷键 3",
@@ -2347,7 +2318,6 @@
   "key.reignofnether.hotkey_5":       "快捷键 5",
   "key.reignofnether.hotkey_6":       "快捷键 6",
   "key.reignofnether.hotkey_7":       "快捷键 7",
-  "key.reignofnether.hotkey_8":       "快捷键 8",
   "key.reignofnether.hotkey_9":       "快捷键 9",
   "key.reignofnether.hotkey_10":      "快捷键 10",
 
@@ -2376,7 +2346,6 @@
   "key.reignofnether.fn_12": "功能键 12 (启用/禁用 RTS 视角)",
 
   "matchstart.reignofnether.mode": "模式：%s",
-  "matchstart.reignofnether.map_preview": "地图",
   "matchstart.reignofnether.roster": "玩家名单",
   "matchstart.reignofnether.team": "队伍%d",
   "matchstart.reignofnether.no_positions": "目前没有可用的起始位置",
@@ -2387,20 +2356,11 @@
   "matchstart.reignofnether.ready_count": "%d / %d 已准备",
   "matchstart.reignofnether.map_loading": "地图加载中……",
   "matchstart.reignofnether.place_blocks_hint": "放置RTS起始方块以添加起始位置",
-  "matchstart.reignofnether.empty_slot": "（可用 - 点击以加入）",
   "matchstart.reignofnether.spectators": "观察者",
-  "matchstart.reignofnether.spectator_tag": "观察中",
-  "matchstart.reignofnether.join_spectators": "+ 退出当前队伍并成为观察者",
   "matchstart.reignofnether.no_spectators": "（目前没有观察者）",
   "matchstart.reignofnether.chat": "聊天",
   "matchstart.reignofnether.chat.placeholder": "输入聊天信息……",
   "matchstart.reignofnether.chat.click_to_type": "按 T 键或点击此处以输入，按回车键以发送",
-  "matchstart.reignofnether.hint.pick_pos": "点击小地图以选择一处起始位置。",
-  "matchstart.reignofnether.hint.pick_faction": "选择你的派系。",
-  "matchstart.reignofnether.hint.ready_up": "点击你所在行的叉号以准备。",
-  "matchstart.reignofnether.hint.waiting": "正在等待其他玩家做好准备。",
-  "matchstart.reignofnether.hint.close": "点击返回以离开 · 按 F12 键以重新进入。",
   "matchstart.reignofnether.settings.title": "游戏设置",
-  "matchstart.reignofnether.settings.mode": "模式",
-  "matchstart.reignofnether.settings.op_only": "修改游戏规则需要管理员权限。"
+  "matchstart.reignofnether.settings.mode": "模式"
 }
diff --git a/src/main/resources/assets/reignofnether/lang/zh_tw.json b/src/main/resources/assets/reignofnether/lang/zh_tw.json
index 54ff03a49..bade27282 100644
--- a/src/main/resources/assets/reignofnether/lang/zh_tw.json
+++ b/src/main/resources/assets/reignofnether/lang/zh_tw.json
@@ -588,8 +588,6 @@
     "hud.helperbuttons.reignofnether.beacon.player_wins_in": "%s將在 %s 內獲勝",
     "hud.helperbuttons.reignofnether.beacon.click_to_centre": "（滑鼠點擊前往烽火臺）",
 
-    "hud.map.reignofnether.open": "打開大地圖/選項",
-    "hud.map.reignofnether.close": "關閉大地圖/選項",
     "hud.map.reignofnether.pan_sensitivity.tooltip1": "視角靈敏度：%d/%d",
     "hud.map.reignofnether.pan_sensitivity.tooltip2": "（滑鼠左/右鍵調整靈敏度）",
     "hud.map.reignofnether.lock_map.tooltip1.enabled": "地圖中心鎖定：已啓用",
@@ -626,11 +624,9 @@
     "hud.reignofnether.drop_off_resources": "存放資源",
     "hud.reignofnether.gather_resources": "採集資源（%s）",
     "hud.reignofnether.change_target_resource": "點擊更改目標資源",
-    "hud.reignofnether.total_workers": "總工人數：%d",
     "hud.reignofnether.workers_on_food": "採集食物的工人",
     "hud.reignofnether.workers_on_wood": "採集木材的工人",
     "hud.reignofnether.workers_on_ore": "採集礦物的工人",
-    "hud.reignofnether.max_resources": "%s（最高：%d）",
     "hud.reignofnether.players_resources": "%s的資源",
     "hud.reignofnether.you_are_spectator": "你現在是觀察者",
     "hud.reignofnether.placed_capitol": "%s已放置其首都建築！",
@@ -662,8 +658,6 @@
     "hud.relationship.reignofnether.enemy": "敵人",
     "hud.relationship.reignofnether.neutral": "中立",
 
-    "hud.hero.reignofnether.level": "等級 %d",
-    "hud.hero.reignofnether.level.short": "等級 %d",
     "hud.hero.reignofnether.experience": "經驗值：%d/%d",
     "hud.hero.reignofnether.experience_warning": "等級 5 後無法從中立單位獲得經驗",
     "hud.hero.reignofnether.max_level": "已達最高等級！",
@@ -863,21 +857,10 @@
     "time.reignofnether.time_until_next_wave": "%s 後爲下一波",
 
     "tutorial.reignofnether.tutorial_help": "教學協助",
-    "tutorial.reignofnether.welcome": "歡迎體驗《地獄統治》",
     "tutorial.reignofnether.welcome2": "歡迎體驗《地獄統治》模組的教學地圖！",
     "tutorial.reignofnether.get_started": "按 F12 或使用指令 '/rts-camera' 開始。",
-    "tutorial.reignofnether.join": "按 F12 切換 RTS 視角幷加入遊戲",
-    "tutorial.reignofnether.help": "使用 '/rts-help' 查看所有命令列表",
-    "tutorial.reignofnether.controls": "使用 '/rts-controls'  查看控制鍵列表",
-    "tutorial.reignofnether.locked": "此 RTS 比賽已鎖定，請等待新遊戲開始後加入。",
-    "tutorial.reignofnether.welcome_back": "歡迎回到《地獄統治》",
-    "tutorial.reignofnether.op_commands": "作爲伺服器管理員，你可以使用：",
-    "tutorial.reignofnether.fog": "/rts-fog enable | disable",
-    "tutorial.reignofnether.lock": "/rts-lock enable | disable",
     "tutorial.reignofnether.syncing": "/rts-syncing enable | disable（實驗性）",
     "tutorial.reignofnether.reset": "/rts-reset",
-    "tutorial.reignofnether.sync_disabled1": "RTS 同步已禁用，因此你無法選擇建築或查看單位擁有者，抱歉！",
-    "tutorial.reignofnether.sync_disabled2": "要解決此問題，請要求主機重新啓用，然後重新登入。",
     "tutorial.reignofnether.server_not_found": "無法載入教學，找不到伺服器。",
     "tutorial.reignofnether.resuming": "歡迎回來… 從 %s 教學階段繼續",
     "tutorial.reignofnether.skipping": "跳過教學階段… 你現在位於 %s 教學階段",
@@ -1150,25 +1133,23 @@
     "entity.reignofnether.panda_unit": "貓熊",
     "entity.reignofnether.llama_unit": "駱馬",
 
-    "alliance.reignofnether.sent_request": "\n已嚮%s發送聯盟請求。\n",
-    "alliance.reignofnether.ally_self": "\n你無法與自己結盟！\n",
-    "alliance.reignofnether.ally_confirm": "\n%s想與你結盟。輸入 /allyconfirm %s 以確認。\n",
-    "alliance.reignofnether.ally_confirm_survival": "\n%s想與你結盟。輸入 /allyconfirm %s 以接受。\n",
-    "alliance.reignofnether.now_allied": "\n你現在與%s結盟。\n",
-    "alliance.reignofnether.ally_accepted": "\n%s已接受你的聯盟請求。\n",
-    "alliance.reignofnether.ally_request_cancelled_self": "\n已撤回對%s的聯盟請求。\n",
-    "alliance.reignofnether.ally_request_cancelled": "\n%s已撤回其聯盟請求。\n",
-    "alliance.reignofnether.no_request": "\n無來自%s的待處理聯盟請求。\n",
-    "alliance.reignofnether.disbanded": "\n你與%s的聯盟已解除。\n",
-    "alliance.reignofnether.disbanding": "\n將在 30 秒內與%s解除聯盟…\n",
-    "alliance.reignofnether.disband_self": "\n你無法解除自己的聯盟。\n",
-    "alliance.reignofnether.disband_pending": "\n此玩家的解除聯盟請求已在處理中。\n",
-    "alliance.reignofnether.now_allied_third_party": "\n%s現在與%s結盟。\n",
-    "alliance.reignofnether.disbanded_third_party": "\n%s與%s解除聯盟。\n",
-    "alliance.reignofnether.ally_control_enabled": "\n你正與盟友共享單位控制。\n",
-    "alliance.reignofnether.ally_control_disabled": "\n你未與盟友共享單位控制。\n",
-    "alliance.reignofnether.ally_control_enable": "\n%s現在與盟友共享單位控制。\n",
-    "alliance.reignofnether.ally_control_disable": "\n%s不再與盟友共享單位控制。\n",
+    "alliance.reignofnether.sent_request": "已嚮%s發送聯盟請求。",
+    "alliance.reignofnether.ally_self": "你無法與自己結盟！",
+    "alliance.reignofnether.ally_confirm": "%s想與你結盟。輸入 /allyconfirm %s 以確認。",
+    "alliance.reignofnether.ally_confirm_survival": "%s想與你結盟。輸入 /allyconfirm %s 以接受。",
+    "alliance.reignofnether.now_allied": "你現在與%s結盟。",
+    "alliance.reignofnether.ally_accepted": "%s已接受你的聯盟請求。",
+    "alliance.reignofnether.ally_request_cancelled_self": "已撤回對%s的聯盟請求。",
+    "alliance.reignofnether.ally_request_cancelled": "%s已撤回其聯盟請求。",
+    "alliance.reignofnether.no_request": "無來自%s的待處理聯盟請求。",
+    "alliance.reignofnether.disbanded": "你與%s的聯盟已解除。",
+    "alliance.reignofnether.disband_self": "你無法解除自己的聯盟。",
+    "alliance.reignofnether.now_allied_third_party": "%s現在與%s結盟。",
+    "alliance.reignofnether.disbanded_third_party": "%s與%s解除聯盟。",
+    "alliance.reignofnether.ally_control_enabled": "你正與盟友共享單位控制。",
+    "alliance.reignofnether.ally_control_disabled": "你未與盟友共享單位控制。",
+    "alliance.reignofnether.ally_control_enable": "%s現在與盟友共享單位控制。",
+    "alliance.reignofnether.ally_control_disable": "%s不再與盟友共享單位控制。",
 
     "survival.reignofnether.dawn": "黎明破曉",
     "survival.reignofnether.dusk": "夜幕降臨…",
@@ -1230,10 +1211,6 @@
     "hud.gamemode.reignofnether.changemode": "滑鼠右鍵更改遊戲模式",
     "hud.gamemode.reignofnether.locked": "（已鎖定）",
 
-    "hud.gamerule.reignofnether.shift_click": "（按住 Shift 鍵快速調整）",
-    "hud.gamerule.reignofnether.click": "（滑鼠左/右鍵調整）",
-    "hud.gamerule.reignofnether.warn_not_opped": "（僅管理員可修改）",
-    "hud.gamerule.reignofnether.menu": "遊戲規則選單",
 
     "config.reignofnether.warn_config_change": "伺服器主機已更改配置",
     "config.reignofnether.hide_config_change": "（點擊隱藏）",
@@ -1278,7 +1255,6 @@
     "startpos.reignofnether.start_button.no_reserved_pos": "你尚未選定起始位置！",
     "startpos.reignofnether.cancel_start_button": "取消遊戲開始",
     "startpos.reignofnether.cancelled_start_game": "遊戲已取消",
-    "startpos.reignofnether.starting_game": "遊戲將在 %d 秒內開始",
     "startpos.reignofnether.started_game": "遊戲開始！",
     "startpos.reignofnether.max_positions": "已達到最大起始位置（16）",
     "startpos.reignofnether.player_ready": "%s 已準備！",
diff --git a/src/main/resources/assets/reignofnether/textures/font/pixelify.png b/src/main/resources/assets/reignofnether/textures/font/pixelify.png
new file mode 100644
index 000000000..ef56b541d
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/font/pixelify.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/font/silkscreen.png b/src/main/resources/assets/reignofnether/textures/font/silkscreen.png
new file mode 100644
index 000000000..d34fc385b
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/font/silkscreen.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/factions/monsters_blur.png b/src/main/resources/assets/reignofnether/textures/gui/factions/monsters_blur.png
new file mode 100644
index 000000000..428384b12
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/factions/monsters_blur.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/factions/piglins_blur.png b/src/main/resources/assets/reignofnether/textures/gui/factions/piglins_blur.png
new file mode 100644
index 000000000..d6b6bae0a
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/factions/piglins_blur.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/factions/villagers_blur.png b/src/main/resources/assets/reignofnether/textures/gui/factions/villagers_blur.png
new file mode 100644
index 000000000..e5dff653b
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/factions/villagers_blur.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/LICENSE-pixelarticons.txt b/src/main/resources/assets/reignofnether/textures/gui/icons/LICENSE-pixelarticons.txt
new file mode 100644
index 000000000..4be35e8f2
--- /dev/null
+++ b/src/main/resources/assets/reignofnether/textures/gui/icons/LICENSE-pixelarticons.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Gerrit Halfmann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/book-open.png b/src/main/resources/assets/reignofnether/textures/gui/icons/book-open.png
new file mode 100644
index 000000000..2b0c71ec7
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/book-open.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/bulletlist.png b/src/main/resources/assets/reignofnether/textures/gui/icons/bulletlist.png
new file mode 100644
index 000000000..90d790da3
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/bulletlist.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/check.png b/src/main/resources/assets/reignofnether/textures/gui/icons/check.png
new file mode 100644
index 000000000..b97dfdd25
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/check.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/close.png b/src/main/resources/assets/reignofnether/textures/gui/icons/close.png
new file mode 100644
index 000000000..bc681fdee
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/close.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/expand.png b/src/main/resources/assets/reignofnether/textures/gui/icons/expand.png
new file mode 100644
index 000000000..5e8143441
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/expand.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/eye.png b/src/main/resources/assets/reignofnether/textures/gui/icons/eye.png
new file mode 100644
index 000000000..bd93bb979
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/eye.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/globe.png b/src/main/resources/assets/reignofnether/textures/gui/icons/globe.png
new file mode 100644
index 000000000..c03fd0126
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/globe.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/leaf.png b/src/main/resources/assets/reignofnether/textures/gui/icons/leaf.png
new file mode 100644
index 000000000..dc2c32fa8
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/leaf.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/lock.png b/src/main/resources/assets/reignofnether/textures/gui/icons/lock.png
new file mode 100644
index 000000000..ad9ca7244
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/lock.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/map.png b/src/main/resources/assets/reignofnether/textures/gui/icons/map.png
new file mode 100644
index 000000000..eef0909db
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/map.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/message.png b/src/main/resources/assets/reignofnether/textures/gui/icons/message.png
new file mode 100644
index 000000000..73e91a1c7
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/message.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/minus.png b/src/main/resources/assets/reignofnether/textures/gui/icons/minus.png
new file mode 100644
index 000000000..1d79a0296
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/minus.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/moon.png b/src/main/resources/assets/reignofnether/textures/gui/icons/moon.png
new file mode 100644
index 000000000..c34195dca
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/moon.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/paw.png b/src/main/resources/assets/reignofnether/textures/gui/icons/paw.png
new file mode 100644
index 000000000..1a75f097e
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/paw.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/plus.png b/src/main/resources/assets/reignofnether/textures/gui/icons/plus.png
new file mode 100644
index 000000000..daa496113
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/plus.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/redo.png b/src/main/resources/assets/reignofnether/textures/gui/icons/redo.png
new file mode 100644
index 000000000..ebeccbf32
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/redo.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/satellite.png b/src/main/resources/assets/reignofnether/textures/gui/icons/satellite.png
new file mode 100644
index 000000000..eb7e88682
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/satellite.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/settings-cog.png b/src/main/resources/assets/reignofnether/textures/gui/icons/settings-cog.png
new file mode 100644
index 000000000..0fd2aef01
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/settings-cog.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/shrink.png b/src/main/resources/assets/reignofnether/textures/gui/icons/shrink.png
new file mode 100644
index 000000000..e5b4c79a0
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/shrink.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/shuffle.png b/src/main/resources/assets/reignofnether/textures/gui/icons/shuffle.png
new file mode 100644
index 000000000..0ed049bb1
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/shuffle.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/sliders.png b/src/main/resources/assets/reignofnether/textures/gui/icons/sliders.png
new file mode 100644
index 000000000..9207a9eba
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/sliders.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/undo.png b/src/main/resources/assets/reignofnether/textures/gui/icons/undo.png
new file mode 100644
index 000000000..636a6455a
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/undo.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/unlock.png b/src/main/resources/assets/reignofnether/textures/gui/icons/unlock.png
new file mode 100644
index 000000000..e21fdc7d1
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/unlock.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/users.png b/src/main/resources/assets/reignofnether/textures/gui/icons/users.png
new file mode 100644
index 000000000..fe5a535c5
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/users.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/zoom-in.png b/src/main/resources/assets/reignofnether/textures/gui/icons/zoom-in.png
new file mode 100644
index 000000000..7d3e0568e
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/zoom-in.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/icons/zoom-out.png b/src/main/resources/assets/reignofnether/textures/gui/icons/zoom-out.png
new file mode 100644
index 000000000..4354cf3d7
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/icons/zoom-out.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/menu_accessibility.png b/src/main/resources/assets/reignofnether/textures/gui/menu_accessibility.png
new file mode 100644
index 000000000..6fcc6dc3b
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/menu_accessibility.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/gui/menu_language.png b/src/main/resources/assets/reignofnether/textures/gui/menu_language.png
new file mode 100644
index 000000000..e0f1f06c1
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/gui/menu_language.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/hud/cross_square.png b/src/main/resources/assets/reignofnether/textures/hud/cross_square.png
deleted file mode 100644
index 65b0750e3..000000000
Binary files a/src/main/resources/assets/reignofnether/textures/hud/cross_square.png and /dev/null differ
diff --git a/src/main/resources/assets/reignofnether/textures/hud/discord_icon.png b/src/main/resources/assets/reignofnether/textures/hud/discord_icon.png
new file mode 100644
index 000000000..951d1fc31
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/hud/discord_icon.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/hud/experience_bar_empty.png b/src/main/resources/assets/reignofnether/textures/hud/experience_bar_empty.png
deleted file mode 100644
index 8f00add9c..000000000
Binary files a/src/main/resources/assets/reignofnether/textures/hud/experience_bar_empty.png and /dev/null differ
diff --git a/src/main/resources/assets/reignofnether/textures/hud/experience_bar_full.png b/src/main/resources/assets/reignofnether/textures/hud/experience_bar_full.png
deleted file mode 100644
index 5f85fb81d..000000000
Binary files a/src/main/resources/assets/reignofnether/textures/hud/experience_bar_full.png and /dev/null differ
diff --git a/src/main/resources/assets/reignofnether/textures/hud/map_background.png b/src/main/resources/assets/reignofnether/textures/hud/map_background.png
deleted file mode 100644
index cfa74b98e..000000000
Binary files a/src/main/resources/assets/reignofnether/textures/hud/map_background.png and /dev/null differ
diff --git a/src/main/resources/assets/reignofnether/textures/hud/speech_bubble.png b/src/main/resources/assets/reignofnether/textures/hud/speech_bubble.png
deleted file mode 100644
index 5a18d885f..000000000
Binary files a/src/main/resources/assets/reignofnether/textures/hud/speech_bubble.png and /dev/null differ
diff --git a/src/main/resources/assets/reignofnether/textures/hud/title_button.png b/src/main/resources/assets/reignofnether/textures/hud/title_button.png
deleted file mode 100644
index 78f268420..000000000
Binary files a/src/main/resources/assets/reignofnether/textures/hud/title_button.png and /dev/null differ
diff --git a/src/main/resources/assets/reignofnether/textures/hud/title_button_highlighted.png b/src/main/resources/assets/reignofnether/textures/hud/title_button_highlighted.png
deleted file mode 100644
index 0ab82cf29..000000000
Binary files a/src/main/resources/assets/reignofnether/textures/hud/title_button_highlighted.png and /dev/null differ
diff --git a/src/main/resources/assets/reignofnether/textures/mobheads/villager_farmer.png b/src/main/resources/assets/reignofnether/textures/mobheads/villager_farmer.png
new file mode 100644
index 000000000..bf480b1ea
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/mobheads/villager_farmer.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/mobheads/villager_hunter.png b/src/main/resources/assets/reignofnether/textures/mobheads/villager_hunter.png
new file mode 100644
index 000000000..25e9b3ef3
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/mobheads/villager_hunter.png differ
diff --git a/src/main/resources/assets/reignofnether/textures/mobheads/villager_lumberjack.png b/src/main/resources/assets/reignofnether/textures/mobheads/villager_lumberjack.png
new file mode 100644
index 000000000..f9f2e5623
Binary files /dev/null and b/src/main/resources/assets/reignofnether/textures/mobheads/villager_lumberjack.png differ
diff --git a/src/main/resources/reignofnether.mixins.json b/src/main/resources/reignofnether.mixins.json
index d582f1476..74cf77c61 100644
--- a/src/main/resources/reignofnether.mixins.json
+++ b/src/main/resources/reignofnether.mixins.json
@@ -33,6 +33,7 @@
         "SculkCatalystBlockEntityMixin",
         "ServerGamePacketListenerImplMixin",
         "ServerLevelMixin",
+        "MinecraftServerMixin",
         "ServerLevelEntityCallbacksMixin",
         "ThrownEnderpearlMixin",
         "ThrownPotionMixin",
@@ -71,12 +72,21 @@
         "FrustumMixin",
         "ItemInHandLayerMixin",
         "LivingEntityRendererMixin",
+        "MenuButtonMixin",
+        "MenuImageButtonMixin",
+        "MenuEditBoxMixin",
+        "MenuListMixin",
+        "MenuSliderMixin",
         "MixinMinecraft",
         "MobRendererMixin",
         "MusicManagerMixin",
         "OrthoViewMixin",
         "RenderChunkRegionMixin",
         "ResourceLoadStateTrackerMixin",
+        "ScreenBackgroundMixin",
+        "CreateWorldScreenMixin",
+        "TabNavigationBarMixin",
+        "TabButtonMixin",
         "SplashRendererAccessor",
         "TitleScreenMixin",
         "TopdownGuiMixin",
diff --git a/src/test/java/com/solegendary/reignofnether/chat/ChatLogTest.java b/src/test/java/com/solegendary/reignofnether/chat/ChatLogTest.java
new file mode 100644
index 000000000..e427c9acc
--- /dev/null
+++ b/src/test/java/com/solegendary/reignofnether/chat/ChatLogTest.java
@@ -0,0 +1,30 @@
+package com.solegendary.reignofnether.chat;
+
+import com.solegendary.reignofnether.chat.ChatLog.Channel;
+import net.minecraft.network.chat.Component;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ChatLogTest {
+
+    @Test
+    void tagsOnlyTheExpectedLineAndKeepsMessagesUnchanged() {
+        ChatLog.onLogout(null);
+        Component line = Component.literal("Bob ➜ hi");
+        ChatLog.expect(Channel.ALL, "Bob", Component.literal("hi"), line);
+        ChatLog.onAdded(Component.literal("◆ Alice is ready"));
+        ChatLog.expect(Channel.ALL, "Bob", Component.literal("hi"), line);
+        ChatLog.onAdded(line);
+        ChatLog.onAdded(Component.literal("plain"));
+
+        var e = ChatLog.entries();
+        assertEquals(Channel.INFO, e.get(0).channel());
+        assertEquals("◆ Alice is ready", e.get(0).line().getString());
+        assertEquals(Channel.ALL, e.get(1).channel());
+        assertEquals("Bob", e.get(1).sender());
+        assertEquals(Channel.INFO, e.get(2).channel()); // expectation is used up
+        assertEquals(2, ChatLog.recent(2, 10_000).size());
+        assertEquals("plain", ChatLog.recent(2, 10_000).get(1).text().getString());
+    }
+}
diff --git a/src/test/java/com/solegendary/reignofnether/hud/layout/CommandGridTest.java b/src/test/java/com/solegendary/reignofnether/hud/layout/CommandGridTest.java
new file mode 100644
index 000000000..7d1170b4b
--- /dev/null
+++ b/src/test/java/com/solegendary/reignofnether/hud/layout/CommandGridTest.java
@@ -0,0 +1,84 @@
+package com.solegendary.reignofnether.hud.layout;
+
+import com.solegendary.reignofnether.hud.layout.CommandGrid.Command;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+
+import static com.solegendary.reignofnether.hud.layout.CommandGrid.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+class CommandGridTest {
+
+    private static List<String> abilities(int n) {
+        List<String> list = new ArrayList<>();
+        for (int i = 0; i < n; i++)
+            list.add("a" + i);
+        return list;
+    }
+
+    @Test
+    void commandsTakeTheirPreferredSlots() {
+        var layout = assign(List.of(
+                new Command<>("attack", SLOT_A),
+                new Command<>("stop", SLOT_S),
+                new Command<>("hold", SLOT_D),
+                new Command<>("garrison", SLOT_F)), abilities(2), 0);
+        assertEquals("attack", layout.slots().get(SLOT_A));
+        assertEquals("stop", layout.slots().get(SLOT_S));
+        assertEquals("hold", layout.slots().get(SLOT_D));
+        assertEquals("garrison", layout.slots().get(SLOT_F));
+        assertEquals("a0", layout.slots().get(0));
+        assertEquals("a1", layout.slots().get(1));
+        assertEquals(-1, layout.pageSlot());
+    }
+
+    @Test
+    void clashingCommandsMoveToTheNextFreeCommandSlot() {
+        var layout = assign(List.of(
+                new Command<>("build", SLOT_F),
+                new Command<>("garrison", SLOT_F),
+                new Command<>("callToArms", NO_PREFERENCE)), List.of(), 0);
+        assertEquals("build", layout.slots().get(SLOT_F));
+        assertEquals("garrison", layout.slots().get(SLOT_A));
+        assertEquals("callToArms", layout.slots().get(SLOT_S));
+    }
+
+    @Test
+    void abilitiesFillTopRowThenBottomRow() {
+        var layout = assign(List.of(new Command<>("stop", SLOT_S)), abilities(7), 0);
+        for (int i = 0; i < 5; i++)
+            assertEquals("a" + i, layout.slots().get(i));
+        assertEquals("a5", layout.slots().get(10));
+        assertEquals("a6", layout.slots().get(11));
+    }
+
+    @Test
+    void overflowPagesWithoutDuplicatesOrLosses() {
+        List<Command<String>> commands = List.of(new Command<>("stop", SLOT_S), new Command<>("gather", SLOT_G));
+        List<String> abs = abilities(20);
+        var first = assign(commands, abs, 0);
+        assertEquals(SLOT_B, first.pageSlot());
+        assertTrue(first.pageCount() >= 2);
+        assertNull(first.slots().get(SLOT_B));
+
+        var seen = new HashSet<String>();
+        for (int p = 0; p < first.pageCount(); p++) {
+            var page = assign(commands, abs, p);
+            assertEquals("stop", page.slots().get(SLOT_S));
+            assertEquals("gather", page.slots().get(SLOT_G));
+            page.slots().stream().filter(Objects::nonNull).filter(s -> s.startsWith("a")).forEach(s -> assertTrue(seen.add(s), s));
+        }
+        assertEquals(20, seen.size());
+    }
+
+    @Test
+    void pageWrapsAround() {
+        var a = assign(List.of(), abilities(30), 0);
+        var b = assign(List.of(), abilities(30), a.pageCount());
+        assertEquals(a.slots(), b.slots());
+    }
+}
diff --git a/src/test/java/com/solegendary/reignofnether/hud/layout/HudLayoutTest.java b/src/test/java/com/solegendary/reignofnether/hud/layout/HudLayoutTest.java
new file mode 100644
index 000000000..8b6ef6a97
--- /dev/null
+++ b/src/test/java/com/solegendary/reignofnether/hud/layout/HudLayoutTest.java
@@ -0,0 +1,126 @@
+package com.solegendary.reignofnether.hud.layout;
+
+import com.solegendary.reignofnether.hud.buttons.ButtonBuilder;
+import com.solegendary.reignofnether.hud.panels.HudFrame;
+import com.solegendary.reignofnether.ui.HudScale;
+import com.solegendary.reignofnether.ui.Rect;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class HudLayoutTest {
+
+    private static final int[][] WINDOWS = {
+        { 800, 600 }, { 1280, 720 }, { 1366, 768 }, { 1920, 1080 }, { 2560, 1440 }, { 3440, 1440 }, { 3840, 2160 }
+    };
+
+    @Test
+    void scaleFollowsGuiScaleAndKeepsTheDesignSize() {
+        // GUI Scale Auto values from Minecraft for each window
+        assertEquals(new HudScale(2, 960, 540, 3.0), HudScale.of(1920, 1080, 3.0, 4));
+        assertEquals(4.5, HudScale.of(3840, 2160, 3.0, 9).pixelsPerUnit());
+        assertEquals(1.5, HudScale.of(1280, 720, 3.0, 3).pixelsPerUnit());
+        assertEquals(3, HudScale.of(2560, 1440, 3.0, 6).pixelsPerUnit());
+        assertEquals(2, HudScale.of(2000, 960, 3.0, 4).pixelsPerUnit());
+        // a smaller GUI Scale setting gives a smaller HUD
+        assertEquals(1, HudScale.of(1920, 1080, 2.0, 2).pixelsPerUnit());
+        for (int[] win : WINDOWS)
+            for (int chosen = 1; chosen <= 8; chosen++) {
+                HudScale s = HudScale.of(win[0], win[1], 2.0, chosen);
+                assertTrue(s.pixelsPerUnit() >= 1);
+                assertTrue(s.width() >= HudScale.HARD_MIN_WIDTH || s.pixelsPerUnit() == 1, Arrays.toString(win));
+            }
+    }
+
+    @Test
+    void sandboxDockFitsBetweenTheTopBarAndTheMinimap() {
+        for (int[] win : WINDOWS)
+            for (int chosen = 1; chosen <= 8; chosen++) {
+                HudScale s = HudScale.of(win[0], win[1], 2.0, chosen);
+                HudLayout l = HudLayout.compute(s.width(), s.height());
+                Rect dock = l.sandboxDock(HudLayout.MARGIN + HudLayout.TOP_CARD_H + HudLayout.GAP);
+                assertTrue(dock.x() >= 0 && dock.right() <= l.width() && dock.h() > 0, Arrays.toString(win));
+                assertTrue(dock.bottom() <= l.minimap().y() && dock.bottom() <= l.tools().y(), Arrays.toString(win));
+            }
+    }
+
+    @Test
+    void bigGuiScaleCannotShrinkTheHudBelowTheMinimum() {
+        HudScale big = HudScale.of(1920, 1080, 3.0, 6);
+        assertEquals(3, big.pixelsPerUnit());
+        assertTrue(big.width() >= HudScale.HARD_MIN_WIDTH && big.height() >= HudScale.HARD_MIN_HEIGHT);
+        assertEquals(2, HudScale.of(1280, 720, 3.0, 6).pixelsPerUnit()); // 640x360 is the floor
+        assertEquals(768 / 360.0, HudScale.of(1366, 768, 3.0, 6).pixelsPerUnit()); // shrinks exactly to the height floor
+    }
+
+    @Test
+    void zoneCoversOnlyWhatWasRegisteredBeforeIt() {
+        HudFrame f = new HudFrame(null, null, null, 0, 0);
+        Rect r = new Rect(0, 0, 10, 10);
+        f.register(new ButtonBuilder("under").build(), r, null, null);
+        f.zone(r);
+        assertNull(f.buttonAt(5, 5));
+        assertTrue(f.isOverHud(5, 5));
+        f.register(new ButtonBuilder("over").build(), r, null, null);
+        assertEquals("over", f.buttonAt(5, 5).button().name);
+    }
+
+    @Test
+    void mouseConversionRoundTrips() {
+        HudScale s = HudScale.of(1920, 1080, 3.0, 4); // 640x360 GUI px, 960x540 units
+        assertEquals(480, s.toUnits(320));
+        assertEquals(320.0, s.toGui(480), 1e-9);
+        assertEquals(2f / 3f, s.poseScale(), 1e-6);
+    }
+
+    @Test
+    void regionsFitOnScreenAndDoNotOverlap() {
+        for (int[] win : WINDOWS)
+            for (int chosen = 1; chosen <= 8; chosen++) {
+                HudScale s = HudScale.of(win[0], win[1], 2.0, chosen);
+                HudLayout l = HudLayout.compute(s.width(), s.height());
+                String ctx = Arrays.toString(win) + " gui scale " + chosen;
+
+                List<Rect> regions = new ArrayList<>(List.of(l.commandCard(), l.selection(), l.tools(), l.minimap()));
+                for (Rect r : regions) {
+                    assertTrue(r.x() >= 0 && r.y() >= 0 && r.right() <= s.width() && r.bottom() <= s.height(), ctx + " " + r);
+                    assertTrue(r.y() >= l.console().y(), ctx + " inside console " + r);
+                }
+                for (int i = 0; i < regions.size(); i++)
+                    for (int j = i + 1; j < regions.size(); j++)
+                        assertFalse(regions.get(i).intersects(regions.get(j)), ctx + " " + regions.get(i) + " vs " + regions.get(j));
+
+                assertTrue(l.selection().w() >= 180, ctx + " selection too narrow: " + l.selection().w());
+            }
+    }
+
+    @Test
+    void barSplitsOnlyAboveItsMaximumWidth() {
+        assertFalse(HudLayout.compute(HudLayout.MAX_BAR, 540).split());
+        assertTrue(HudLayout.compute(HudLayout.MAX_BAR + 1, 540).split());
+    }
+
+    @Test
+    void commandCardFitsTheConsole() {
+        HudLayout l = HudLayout.compute(960, 540);
+        assertEquals(HudLayout.CONSOLE_HEIGHT - HudLayout.CONSOLE_PAD * 2, HudLayout.cardHeight());
+        int last = CommandGrid.SLOTS - 1;
+        assertTrue(l.slotX(last) + HudLayout.CELL <= l.commandCard().right());
+        assertTrue(l.slotY(last) + HudLayout.CELL <= l.commandCard().bottom());
+    }
+
+    @Test
+    void bigMapGrowsUpwardsWithItsToolsInARowBelow() {
+        HudLayout small = HudLayout.compute(960, 540);
+        HudLayout big = HudLayout.compute(960, 540, true);
+        assertTrue(big.minimap().w() > small.minimap().w());
+        assertTrue(big.minimap().bottom() <= big.tools().y());
+        assertTrue(big.tools().bottom() <= 540);
+        assertTrue(big.toolX(9) + HudLayout.TOOL <= big.tools().right());
+        assertTrue(big.toolY(9) == big.tools().y());
+    }
+}
diff --git a/src/test/java/com/solegendary/reignofnether/util/WorldStateTest.java b/src/test/java/com/solegendary/reignofnether/util/WorldStateTest.java
new file mode 100644
index 000000000..097be19a3
--- /dev/null
+++ b/src/test/java/com/solegendary/reignofnether/util/WorldStateTest.java
@@ -0,0 +1,30 @@
+package com.solegendary.reignofnether.util;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class WorldStateTest {
+
+    @Test
+    void eachSideOnlyClearsItsOwnState() {
+        List<String> clientList = WorldState.client(new ArrayList<>(List.of("a")));
+        Map<String, Integer> serverMap = WorldState.server(new HashMap<>(Map.of("b", 1)));
+        boolean[] flag = { true };
+        WorldState.onClientReset(() -> flag[0] = false);
+
+        WorldState.resetServer();
+        assertTrue(serverMap.isEmpty());
+        assertEquals(List.of("a"), clientList);
+        assertTrue(flag[0]);
+
+        WorldState.resetClient();
+        assertTrue(clientList.isEmpty());
+        assertFalse(flag[0]);
+    }
+}