diff --git a/CHANGELOG.md b/CHANGELOG.md
index 365fdbd3..3b2702f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [26.1.2.7]
+
+### Added
+* Added `Vec2d` utility class
+* Added `EditableConfigValue#setCanEdit` variant taking a `BooleanSupplier`
+  * Allows for more dynamic control of can-edit visual appearance for entries in config editor screen
+* Added "undo" and "redo" icons
+* Added `DocsMod` abstraction layer
+* `ImageComponent` now has a "click_action" field
+
+### Changed
+* Default width of string editor overlays is a bit wider now
+* Update panel scrolling to handle both X and Y axes, since this is well-supported by vanilla
+  * `Panel#scrollPanel` signature has changed
+  * Soft-breaking change; mods need to update to new API. They won't crash if not but panel scrolling may not function well
+
+### Fixed
+* Fixed execClientCommand() incorrectly stripping all forward slashes from commands (thanks @FalAut)
+* Fixed pose stack leak which could happen under some circumstances in sidebar rendering
+
 ## [26.1.2.6-beta]
 
 ### Fixed
diff --git a/build.gradle b/build.gradle
index 6649d1cd..60e23be5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
     id 'net.fabricmc.fabric-loom' version '1.15.2' apply(false)
     id 'net.neoforged.moddev' version '2.0.140' apply(false)
-    id "me.modmuss50.mod-publish-plugin" version "1.1.0"
+    id "me.modmuss50.mod-publish-plugin" version "2.1.1"
 }
 
 tasks.named('wrapper', Wrapper).configure {
@@ -124,6 +124,8 @@ publishMods {
             minecraftVersions.add(it.trim())
         }
         javaVersions.add(JavaVersion.VERSION_25)
+        client = true
+        server = true
     }
 
     curseforge("curseforgeFabric") {
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/FTBLibraryCommands.java b/common/src/main/java/dev/ftb/mods/ftblibrary/FTBLibraryCommands.java
index 3cea43f5..c7b6344e 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/FTBLibraryCommands.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/FTBLibraryCommands.java
@@ -9,7 +9,6 @@
 import dev.ftb.mods.ftblibrary.config.FTBLibraryServerConfig;
 import dev.ftb.mods.ftblibrary.nbtedit.NBTEditResponseHandlers;
 import dev.ftb.mods.ftblibrary.net.EditConfigPacket;
-import dev.ftb.mods.ftblibrary.net.EditNBTPacket;
 import dev.ftb.mods.ftblibrary.net.OpenTestScreenPacket;
 import dev.ftb.mods.ftblibrary.platform.Mod;
 import dev.ftb.mods.ftblibrary.platform.Platform;
@@ -32,6 +31,7 @@
 import net.minecraft.nbt.StringTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.permissions.Permissions;
 import net.minecraft.util.ProblemReporter;
@@ -43,15 +43,9 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.storage.TagValueOutput;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
 import static net.minecraft.commands.Commands.literal;
 
 public class FTBLibraryCommands {
-    public static final Map<UUID, CompoundTag> EDITING_NBT = new HashMap<>();
-
     public static void registerCommands(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext ignoredCtx, Commands.CommandSelection ignoredType) {
         var command = literal(FTBLibrary.MOD_ID)
                 .then(literal("gamemode")
@@ -128,39 +122,32 @@ private static int editNBT(CommandContext<CommandSourceStack> context, NBTEditCa
         var tag = new CompoundTag();
         data.accept(info, tag);
 
-        if (!info.isEmpty()) {
-            EDITING_NBT.put(player.getUUID(), info);
-            Server2PlayNetworking.send(player, new EditNBTPacket(info, tag));
-            return Command.SINGLE_SUCCESS;
-        }
-
-        return 0;
+        return NBTEditResponseHandlers.INSTANCE.sendRequestPacket(player, info, tag);
     }
 
     private static void editItemNBT(CommandContext<CommandSourceStack> context, CompoundTag info, CompoundTag tag) throws CommandSyntaxException {
         var player = context.getSource().getPlayerOrException();
 
         ItemStack stack = player.getMainHandItem();
-        if (stack.isEmpty()) {
-            return;
+        if (!stack.isEmpty()) {
+            info.store("type", Identifier.CODEC, NBTEditResponseHandlers.ITEM);
+            ItemStack.CODEC.encodeStart(player.level().registryAccess().createSerializationContext(NbtOps.INSTANCE), stack)
+                    .ifSuccess(res -> {
+                        if (res instanceof CompoundTag t) tag.merge(t);
+                    });
+            var key = RegistryHelper.getIdentifier(stack.getItem(), Registries.ITEM);
+            info.put("text", InfoBuilder.create(context)
+                    .add("Class", Component.literal(stack.getItem().getClass().getName()))
+                    .add("ID", Component.literal(key == null ? "null" : key.toString()))
+                    .add("Mod", Component.literal(key == null ? "null" : Platform.get().getMod(key.getNamespace()).map(Mod::name).orElse("Unknown")))
+                    .build());
         }
-        info.putString("type", "item");
-        ItemStack.CODEC.encodeStart(player.level().registryAccess().createSerializationContext(NbtOps.INSTANCE), stack)
-                .ifSuccess(res -> {
-                    if (res instanceof CompoundTag t) tag.merge(t);
-                });
-        var key = RegistryHelper.getIdentifier(stack.getItem(), Registries.ITEM);
-        info.put("text", InfoBuilder.create(context)
-                .add("Class", Component.literal(stack.getItem().getClass().getName()))
-                .add("ID", Component.literal(key == null ? "null" : key.toString()))
-                .add("Mod", Component.literal(key == null ? "null" : Platform.get().getMod(key.getNamespace()).map(Mod::name).orElse("Unknown")))
-                .build());
     }
 
     private static void editPlayerNBT(CommandContext<CommandSourceStack> context, CompoundTag info, CompoundTag tag) throws CommandSyntaxException {
         var player = EntityArgument.getPlayer(context, "player");
 
-        info.putString("type", NBTEditResponseHandlers.PLAYER.toString());
+        info.store("type", Identifier.CODEC, NBTEditResponseHandlers.PLAYER);
         info.store("id", UUIDUtil.CODEC, player.getUUID());
 
         TagValueOutput output = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, player.level().registryAccess());
@@ -183,7 +170,7 @@ private static void editEntityNBT(CommandContext<CommandSourceStack> context, Co
             return;
         }
 
-        info.putString("type", NBTEditResponseHandlers.ENTITY.toString());
+        info.store("type", Identifier.CODEC, NBTEditResponseHandlers.ENTITY);
         info.putInt("id", entity.getId());
 
         TagValueOutput output = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, entity.registryAccess());
@@ -197,8 +184,7 @@ private static void editEntityNBT(CommandContext<CommandSourceStack> context, Co
                 .add("Mod", Component.literal(key == null ? "null" : Platform.get().getMod(key.getNamespace()).map(Mod::name).orElse("Unknown")))
                 .build());
 
-        String name = entity.getDisplayName() == null ? "?" : entity.getDisplayName().getString();
-        info.putString("title", name);
+        info.putString("title", entity.getDisplayName().getString());
     }
 
     private static void editBlockNBT(CommandContext<CommandSourceStack> context, CompoundTag info, CompoundTag tag) throws CommandSyntaxException {
@@ -211,7 +197,7 @@ private static void editBlockNBT(CommandContext<CommandSourceStack> context, Com
             return;
         }
 
-        info.putString("type", NBTEditResponseHandlers.BLOCK.toString());
+        info.store("type", Identifier.CODEC, NBTEditResponseHandlers.BLOCK);
         BlockPos.CODEC.encodeStart(NbtOps.INSTANCE, pos).ifSuccess(nbt -> info.put("pos", nbt));
         tag.merge(blockEntity.saveWithFullMetadata(context.getSource().getLevel().registryAccess()));
         tag.remove("x");
@@ -228,7 +214,7 @@ private static void editBlockNBT(CommandContext<CommandSourceStack> context, Com
                 .add("Block Class", Component.literal(blockEntity.getBlockState().getBlock().getClass().getName()))
                 .add("Position", Component.literal("[" + pos.getX() + ", " + pos.getY() + ", " + pos.getZ() + "]"))
                 .add("Mod", Component.literal(key == null ? "null" : Platform.get().getMod(key.getNamespace()).map(Mod::name).orElse("Unknown")))
-                .add("Ticking", Component.literal(isTicking(blockEntity) ? "true" : "false"))
+                .add("Ticking", Component.literal(Boolean.toString(isTicking(blockEntity))))
                 .build());
 
         var title = blockEntity instanceof Nameable n ? n.getDisplayName() : null;
@@ -239,7 +225,9 @@ private static void editBlockNBT(CommandContext<CommandSourceStack> context, Com
     }
 
     private static boolean isTicking(BlockEntity be) {
-        return be.getBlockState().getBlock() instanceof EntityBlock eb && eb.getTicker(be.getLevel(), be.getBlockState(), be.getType()) != null;
+        return be.getLevel() != null
+                && be.getBlockState().getBlock() instanceof EntityBlock eb
+                && eb.getTicker(be.getLevel(), be.getBlockState(), be.getType()) != null;
     }
 
     private interface NBTEditCallback {
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableConfigValue.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableConfigValue.java
index 20eb48bb..5c8e8016 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableConfigValue.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableConfigValue.java
@@ -16,6 +16,7 @@
 import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 
 /**
@@ -40,7 +41,7 @@ public abstract class EditableConfigValue<T> implements Comparable<EditableConfi
     private int order = 0;
     private String nameKey = "";
     private Icon<?> icon = Icons.SETTINGS;
-    private boolean canEdit = true;
+    private BooleanSupplier canEdit = () -> true;
 
     protected static Component info(String key) {
         return Component.literal(key + ":").withStyle(ChatFormatting.AQUA);
@@ -225,10 +226,15 @@ public EditableConfigValue<T> setOrder(int o) {
     }
 
     public boolean getCanEdit() {
-        return canEdit;
+        return canEdit.getAsBoolean();
     }
 
     public EditableConfigValue<T> setCanEdit(boolean e) {
+        canEdit = () -> e;
+        return this;
+    }
+
+    public EditableConfigValue<T> setCanEdit(BooleanSupplier e) {
         canEdit = e;
         return this;
     }
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableFluid.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableFluid.java
index 0955e2cb..c51303f9 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableFluid.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableFluid.java
@@ -50,9 +50,7 @@ public Component getStringForGUI(FluidStack value) {
 
     @Override
     public void onClicked(Widget clickedWidget, MouseButton button, ConfigCallback callback) {
-        if (getCanEdit()) {
-            new SelectFluidScreen(this, callback).openGui();
-        }
+        new SelectFluidScreen(this, callback).openGui();
     }
 
     @Override
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableItemStack.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableItemStack.java
index fb72c336..783f4932 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableItemStack.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableItemStack.java
@@ -52,9 +52,7 @@ public Component getStringForGUI(@Nullable ItemStack value) {
 
     @Override
     public void onClicked(Widget clickedWidget, MouseButton button, ConfigCallback callback) {
-        if (getCanEdit()) {
-            new SelectItemStackScreen(this, callback).openGui();
-        }
+        new SelectItemStackScreen(this, callback).openGui();
     }
 
     @Override
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableVariantConfig.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableVariantConfig.java
index 1bb6b3c3..a8f305a8 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableVariantConfig.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/editable/EditableVariantConfig.java
@@ -18,9 +18,7 @@ public abstract class EditableVariantConfig<T> extends EditableConfigValue<T> {
 
     @Override
     public void onClicked(Widget clickedWidget, MouseButton button, ConfigCallback callback) {
-        if (getCanEdit()) {
-            boolean changed = updateValue(getIteration(value, button.isLeft()));
-            callback.save(changed);
-        }
+        boolean changed = updateValue(getIteration(value, button.isLeft()));
+        callback.save(changed);
     }
 }
\ No newline at end of file
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditConfigListScreen.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditConfigListScreen.java
index e1934f91..ed2b3d0d 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditConfigListScreen.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditConfigListScreen.java
@@ -159,17 +159,19 @@ public void addMouseOverText(TooltipList list) {
 
         @Override
         public void onClicked(MouseButton button) {
-            playClickSound();
-            CV listType = listConfig.getType();
-            listType.setValue(listType.copy(listType.getDefaultValue()));
-            listType.onClicked(this, button, accepted -> {
-                if (accepted) {
-                    localValues.add(listType.getValue());
-                    changed = true;
-                }
+            if (listConfig.getCanEdit()) {
+                playClickSound();
+                CV listType = listConfig.getType();
+                listType.setValue(listType.copy(listType.getDefaultValue()));
+                listType.onClicked(this, button, accepted -> {
+                    if (accepted) {
+                        localValues.add(listType.getValue());
+                        changed = true;
+                    }
 
-                openGui();
-            });
+                    openGui();
+                });
+            }
         }
 
         @Override
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditConfigScreen.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditConfigScreen.java
index 5dea4259..745472dc 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditConfigScreen.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditConfigScreen.java
@@ -27,6 +27,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 
 import static dev.ftb.mods.ftblibrary.util.TextComponentUtils.hotkeyTooltip;
 
@@ -81,9 +82,9 @@ public EditConfigScreen(EditableConfigGroup configGroup, boolean readOnly) {
         }
 
         buttonExpandAll = new SimpleButton(topPanel, List.of(Component.translatable("gui.expand_all"), hotkeyTooltip("="), hotkeyTooltip("+")), Icons.EXPAND,
-                (widget, button) -> toggleAll(false));
+                (_, _) -> toggleAll(false));
         buttonCollapseAll = new SimpleButton(topPanel, List.of(Component.translatable("gui.collapse_all"), hotkeyTooltip("-")), Icons.COLLAPSE,
-                (widget, button) -> toggleAll(true));
+                (_, _) -> toggleAll(true));
     }
 
     private void toggleAll(boolean collapsed) {
@@ -113,7 +114,7 @@ public boolean onInit() {
 
         allConfigButtons.forEach(w -> {
             if (w instanceof ConfigEntryButton<?> eb) {
-                widestKey = Math.max(widestKey, getTheme().getFont().width(eb.keyText));
+                widestKey = Math.max(widestKey, getTheme().getFont().width(eb.keyText.get()));
                 widestValue = Math.max(widestValue, getTheme().getFont().width(eb.getValueStr()));
             } else if (w instanceof ConfigGroupButton gb) {
                 widestGroup.setValue(Math.max(widestGroup.intValue(), getTheme().getStringWidth(gb.title)));
@@ -269,7 +270,7 @@ public void onClicked(MouseButton button) {
     private class ConfigEntryButton<T> extends Button implements EditStringConfigOverlay.PosProvider {
         private final ConfigGroupButton groupButton;
         private final EditableConfigValue<T> configValue;
-        private final Component keyText;
+        private final Supplier<Component> keyText;
 
         public ConfigEntryButton(Panel panel, ConfigGroupButton groupButton, EditableConfigValue<T> configValue) {
             super(panel);
@@ -277,9 +278,9 @@ public ConfigEntryButton(Panel panel, ConfigGroupButton groupButton, EditableCon
             this.groupButton = groupButton;
             this.configValue = configValue;
 
-            keyText = this.configValue.getCanEdit() ?
+            keyText = () -> this.configValue.getCanEdit() ?
                     Component.literal(this.configValue.getName()) :
-                    Component.literal(this.configValue.getName()).withStyle(ChatFormatting.GRAY);
+                    Component.literal(this.configValue.getName()).withStyle(getTheme().hasDarkBackground() ? ChatFormatting.DARK_GRAY : ChatFormatting.GRAY);
         }
 
         @Override
@@ -287,7 +288,7 @@ public void draw(GuiGraphicsExtractor graphics, Theme theme, int x, int y, int w
             IconHelper.renderIcon(Icons.COLOR_BLANK.withColor(Color4I.GRAY), graphics, x, y + 1, 10, 10);
             IconHelper.renderIcon(Icons.INFO, graphics, x + 1, y + 2, 8, 8);
 
-            theme.drawStringOnBackground(graphics, keyText, x + 13, y + 2);//Bits.setFlag(0, Theme.SHADOW, isMouseOver()));
+            theme.drawStringOnBackground(graphics, keyText.get(), x + 13, y + 2);
 
             Component valueText = configValue.getStringForGUI(configValue.getValue());
 
@@ -297,7 +298,7 @@ public void draw(GuiGraphicsExtractor graphics, Theme theme, int x, int y, int w
             }
 
             var textCol = configValue.getColor(theme).mutable();
-            textCol.setAlpha(255);
+            textCol.setAlpha(configValue.getCanEdit() ? 255 : 128);
 
             if (isMouseOver()) {
                 textCol.addBrightness(60);
@@ -311,7 +312,7 @@ public void draw(GuiGraphicsExtractor graphics, Theme theme, int x, int y, int w
 
         @Override
         public void onClicked(MouseButton button) {
-            if (!readOnly && getMouseY() >= 20) {
+            if (configValue.getCanEdit() && !readOnly && getMouseY() >= 20) {
                 playClickSound();
                 configValue.onClicked(this, button, accepted -> {
                     if (accepted) changed = true;
@@ -325,7 +326,7 @@ public void addMouseOverText(TooltipList list) {
             if (getMouseY() > 18) {
                 int x = getMouseX() - getX();
                 if (x < 16) {
-                    list.add(keyText.copy().withStyle(ChatFormatting.UNDERLINE));
+                    list.add(keyText.get().copy().withStyle(ChatFormatting.UNDERLINE));
                     var tooltip = configValue.getTooltip();
 
                     if (!tooltip.isEmpty()) {
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditStringConfigOverlay.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditStringConfigOverlay.java
index 0b824848..fb0f836f 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditStringConfigOverlay.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/EditStringConfigOverlay.java
@@ -36,8 +36,8 @@ public EditStringConfigOverlay(Panel panel, EditableStringifiedConfig<T> config,
         this.currentValue = config.copy(config.getValue());
         this.title = title;
 
-        int stringWidth = getGui().getTheme().getStringWidth(config.getStringFromValue(currentValue));
-        width = Math.min(getWindow().getGuiScaledWidth() / 2, stringWidth + config.getExtraEditorWidth());
+        width = Math.clamp(currentValue == null ? 0 : getGui().getTheme().getStringWidth(config.getStringFromValue(currentValue)) + 86,
+                150, getWindow().getGuiScaledWidth() * 3 / 4);
 
         titleField = new TextField(this).addFlags(Theme.SHADOW).setText(Objects.requireNonNullElse(title, Component.empty()));
         titleField.setSize(0, 0);
@@ -165,12 +165,13 @@ public void onEnterPressed() {
         }
 
         @Override
-        public boolean mouseScrolled(double scroll) {
-            return config.scrollValue(currentValue, scroll > 0).map(v -> {
+        public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
+            var directionlessDelta = scrollX != 0 ? scrollX : scrollY;
+            return config.scrollValue(currentValue, directionlessDelta > 0).map(v -> {
                 textBox.setText(config.getStringFromValue(v));
                 textBox.setSelectionPos(textBox.getCursorPos());
                 return true;
-            }).orElse(super.mouseScrolled(scroll));
+            }).orElse(super.mouseScrolled(mouseX, mouseY, scrollX, scrollY));
         }
     }
 }
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/resource/ResourceSelectorScreen.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/resource/ResourceSelectorScreen.java
index dc72ae04..71410749 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/resource/ResourceSelectorScreen.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/config/gui/resource/ResourceSelectorScreen.java
@@ -345,13 +345,15 @@ public CountTextBox() {
         }
 
         @Override
-        public boolean mouseScrolled(double scroll) {
+        public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
             if (!isMouseOver) return false;
+
+            var directionlessDelta = scrollX != 0 ? scrollX : scrollY;
             if (isShiftKeyDown()) {
-                int adj = scroll > 0 ? getCount() : -getCount() / 2;
+                int adj = directionlessDelta > 0 ? getCount() : -getCount() / 2;
                 adjust(adj);
             } else {
-                adjust((int) Math.signum(scroll));
+                adjust((int) Math.signum(directionlessDelta));
             }
             return true;
         }
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/MenuScreenWrapper.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/MenuScreenWrapper.java
index 5f307a38..48e0f507 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/MenuScreenWrapper.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/MenuScreenWrapper.java
@@ -69,7 +69,7 @@ public boolean mouseReleased(MouseButtonEvent event) {
 
     @Override
     public boolean mouseScrolled(double x, double y, double dirX, double dirY) {
-        return wrappedGui.mouseScrolled(dirY) || super.mouseScrolled(x, y, dirX, dirY);
+        return wrappedGui.mouseScrolled(x, y, dirX, dirY) || super.mouseScrolled(x, y, dirX, dirY);
     }
 
     @Override
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/theme/Theme.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/theme/Theme.java
index b4f7a153..d777d0d0 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/theme/Theme.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/theme/Theme.java
@@ -64,8 +64,8 @@ public class Theme {
     private static final Icon<?> SCROLL_BAR_BG_DISABLED = SCROLL_BAR_BG.withTint(Color4I.BLACK.withAlpha(100));
     private static final Icon<?> TEXT_BOX = PartIcon.wholeTexture("textures/gui/sprites/container/enchanting_table/enchantment_slot_disabled.png",
             108, 19, 4);
-    private static final Icon<?> TAB_H_UNSELECTED = TEXTURE_RECIPE_BOOK.withUV(150, 2, 35, 26, 256, 256);
-    private static final Icon<?> TAB_H_SELECTED = TEXTURE_RECIPE_BOOK.withUV(188, 2, 35, 26, 256, 256);
+    private static final Icon<?> TAB_H_UNSELECTED = PartIcon.wholeTexture("textures/gui/sprites/widget/tab.png", 130, 24, 2);
+    private static final Icon<?> TAB_H_SELECTED = PartIcon.wholeTexture("textures/gui/sprites/widget/tab_selected.png", 130, 24, 2);
     public static boolean renderDebugBoxes = false;
     private final BooleanStack fontUnicode = new BooleanArrayList();
 
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/BaseScreen.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/BaseScreen.java
index 423e8a2b..9b8a3088 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/BaseScreen.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/BaseScreen.java
@@ -460,11 +460,11 @@ public void mouseReleased(MouseButton button) {
     }
 
     @Override
-    public boolean mouseScrolled(double scroll) {
-        if (focusedWidget != null && focusedWidget.mouseScrolled(scroll)) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
+        if (focusedWidget != null && focusedWidget.mouseScrolled(mouseX, mouseY, scrollX, scrollY)) {
             return true;
         }
-        return modalPanels.isEmpty() ? super.mouseScrolled(scroll) : modalPanels.peekFirst().mouseScrolled(scroll);
+        return modalPanels.isEmpty() ? super.mouseScrolled(mouseX, mouseY, scrollX, scrollY) : modalPanels.peekFirst().mouseScrolled(mouseX, mouseY, scrollX, scrollY);
     }
 
     @Override
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/DropDownMenu.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/DropDownMenu.java
index 84cfa74e..ea64c380 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/DropDownMenu.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/DropDownMenu.java
@@ -33,11 +33,6 @@ public void onTextChanged() {
         this.scrollBar = new PanelScrollBar(this, ScrollBar.Plane.VERTICAL, mainPanel);
     }
 
-    @Override
-    public boolean scrollPanel(double scroll) {
-        return super.scrollPanel(scroll);
-    }
-
     @Override
     public void addWidgets() {
         add(textBox);
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/IntTextBox.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/IntTextBox.java
index b22cbc7a..70ca4ced 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/IntTextBox.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/IntTextBox.java
@@ -43,9 +43,10 @@ public void setMinMax(int min, int max) {
     }
 
     @Override
-    public boolean mouseScrolled(double scroll) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
         if (allowInput()) {
-            setAmount(getIntValue() + (int) scroll);
+            var directionlessDelta = scrollX != 0 ? scrollX : scrollY;
+            setAmount(getIntValue() + (int) directionlessDelta);
             return true;
         }
         return false;
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/MultilineTextBox.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/MultilineTextBox.java
index 8c774d27..991ea129 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/MultilineTextBox.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/MultilineTextBox.java
@@ -311,6 +311,8 @@ private void scrollToCursor() {
             }
         }
 
+        d0 = Mth.clamp(d0, 0, Math.max(0, parent.getContentHeight() - parent.height));
+
         parent.setScrollY(d0);
     }
 
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/Panel.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/Panel.java
index 5a7eec5d..c5be9719 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/Panel.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/Panel.java
@@ -342,16 +342,16 @@ public void mouseReleased(MouseButton button) {
     }
 
     @Override
-    public boolean mouseScrolled(double scroll) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
         return getWithScrollOffset(() -> {
             for (var i = widgets.size() - 1; i >= 0; i--) {
                 var widget = widgets.get(i);
-                if (widget.isEnabled() && widget.mouseScrolled(scroll)) {
+                if (widget.isEnabled() && widget.mouseScrolled(mouseX, mouseY, scrollX, scrollY)) {
                     return true;
                 }
             }
 
-            return scrollPanel(scroll);
+            return scrollPanel(scrollX, scrollY);
         });
     }
 
@@ -370,15 +370,23 @@ public boolean mouseDragged(int button, double dragX, double dragY) {
 
     }
 
-    public boolean scrollPanel(double scroll) {
+    public boolean scrollPanel(double xDelta, double yDelta) {
         if (attachedScrollbar != null || !isMouseOver()) {
             return false;
         }
 
-        if (isDefaultScrollVertical() != isShiftKeyDown()) {
-            return movePanelScroll(0, -getScrollStep() * scroll);
+        // No scroll direction was given?
+        var directionlessDelta = yDelta != 0 ? yDelta : xDelta;
+        if (directionlessDelta == 0) {
+            return false;
+        }
+
+        // If the user is pressing shift, we'll always attempt to scroll horizontally, otherwise we'll just blindly apply both directions
+        if (isShiftKeyDown()) {
+            var scrollAmount = -getScrollStep() * directionlessDelta;
+            return movePanelScroll(scrollAmount, 0);
         } else {
-            return movePanelScroll(-getScrollStep() * scroll, 0);
+            return movePanelScroll(-getScrollStep() * xDelta, -getScrollStep() * yDelta);
         }
     }
 
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/ScreenWrapper.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/ScreenWrapper.java
index 7aa15170..20f3e343 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/ScreenWrapper.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/ScreenWrapper.java
@@ -57,8 +57,8 @@ public boolean mouseReleased(MouseButtonEvent event) {
     }
 
     @Override
-    public boolean mouseScrolled(double x, double y, double dirX, double dirY) {
-        return wrappedGui.mouseScrolled(dirY) || super.mouseScrolled(x, y, dirX, dirY);
+    public boolean mouseScrolled(double x, double y, double scrollX, double scrollY) {
+        return wrappedGui.mouseScrolled(x, y, scrollX, scrollY) || super.mouseScrolled(x, y, scrollX, scrollY);
     }
 
     @Override
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/ScrollBar.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/ScrollBar.java
index 02c69db2..d8a52f2b 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/ScrollBar.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/ScrollBar.java
@@ -73,9 +73,10 @@ public boolean mousePressed(MouseButton button) {
     }
 
     @Override
-    public boolean mouseScrolled(double scroll) {
-        if (scroll != 0 && canMouseScrollPlane() && canMouseScroll()) {
-            setValue(getValue() - getScrollStep() * scroll);
+    public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
+        var scrollDelta = scrollY == 0  ? scrollX : scrollY;
+        if (scrollDelta != 0 && canMouseScrollPlane() && canMouseScroll()) {
+            setValue(getValue() - getScrollStep() * scrollDelta);
             return true;
         }
 
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/TextField.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/TextField.java
index ac962fdc..cf9182e9 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/TextField.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/TextField.java
@@ -7,13 +7,20 @@
 import dev.ftb.mods.ftblibrary.math.Bits;
 import dev.ftb.mods.ftblibrary.util.TooltipList;
 import net.minecraft.client.gui.ActiveTextCollector;
+import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.TextAlignment;
+import net.minecraft.client.renderer.state.gui.GuiTextRenderState;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
+import net.minecraft.util.ARGB;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.util.Mth;
+import org.joml.Matrix3x2f;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Optional;
+import java.util.function.Consumer;
 
 
 public class TextField extends Widget {
@@ -161,11 +168,64 @@ public Optional<Style> getClickableStyleAt(Theme theme, int mouseX, int mouseY)
             int xStart = centered ? getX() + (width - textWidth) / 2 : getX();
 
             if (mouseX >= xStart && mouseX <= xStart + textWidth) {
-                var finder = new ActiveTextCollector.ClickableStyleFinder(theme.getFont(), mouseX, mouseY);
+                var finder = new StyleFinder(theme.getFont(), mouseX, mouseY);
                 finder.accept(xStart, getY() + line * textSpacing, formattedText[line]);
                 return Optional.ofNullable(finder.result());
             }
         }
         return Optional.empty();
     }
+
+    // like ActiveTextCollector.ClickableStyleFinder but finds both click and hover events
+    private static class StyleFinder implements ActiveTextCollector {
+        private static final Parameters INITIAL = new Parameters(new Matrix3x2f());
+        private final Font font;
+        private final int testX;
+        private final int testY;
+        private Parameters defaultParameters;
+        private @Nullable Style result;
+        private final Consumer<Style> styleScanner;
+
+        StyleFinder(final Font font, final int testX, final int testY) {
+            this.defaultParameters = INITIAL;
+            this.styleScanner = style -> {
+                if (style.getHoverEvent() != null || style.getClickEvent() != null) {
+                    this.result = style;
+                }
+
+            };
+            this.font = font;
+            this.testX = testX;
+            this.testY = testY;
+        }
+
+        @Override
+        public Parameters defaultParameters() {
+            return defaultParameters;
+        }
+
+        @Override
+        public void defaultParameters(final Parameters newParameters) {
+            this.defaultParameters = newParameters;
+        }
+
+        @Override
+        public void accept(final TextAlignment alignment, final int anchorX, final int y, final Parameters parameters, final FormattedCharSequence text) {
+            int leftX = alignment.calculateLeft(anchorX, font, text);
+            GuiTextRenderState renderState = new GuiTextRenderState(font, text, parameters.pose(), leftX, y, ARGB.white(parameters.opacity()), 0, true, true, parameters.scissor());
+            ActiveTextCollector.findElementUnderCursor(renderState, (float)testX, (float)testY, styleScanner);
+        }
+
+        @Override
+        public void acceptScrolling(final Component message, final int centerX, final int left, final int right, final int top, final int bottom, final Parameters parameters) {
+            int lineWidth = font.width(message);
+            int lineHeight = 9;
+            defaultScrollingHelper(message, centerX, left, right, top, bottom, lineWidth, lineHeight, parameters);
+        }
+
+        public @Nullable Style result() {
+            return result;
+        }
+    }
+
 }
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/Widget.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/Widget.java
index aac93e7b..37e58651 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/Widget.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/gui/widget/Widget.java
@@ -196,10 +196,18 @@ public boolean mouseDoubleClicked(MouseButton button) {
     public void mouseReleased(MouseButton button) {
     }
 
+    /**
+     * @deprecated use {@link #mouseScrolled(double, double, double, double)} instead
+     */
+    @Deprecated
     public boolean mouseScrolled(double scroll) {
         return false;
     }
 
+    public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
+        return false;
+    }
+
     public boolean mouseDragged(int button, double dragX, double dragY) {
         return false;
     }
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/EntityImageIconRenderer.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/EntityImageIconRenderer.java
index 74a6ff3e..8d460815 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/EntityImageIconRenderer.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/EntityImageIconRenderer.java
@@ -1,5 +1,6 @@
 package dev.ftb.mods.ftblibrary.client.icon;
 
+import dev.ftb.mods.ftblibrary.icon.Color4I;
 import dev.ftb.mods.ftblibrary.icon.EntityImageIcon;
 import dev.ftb.mods.ftblibrary.icon.Icon;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
@@ -21,10 +22,10 @@ public void render(EntityImageIcon icon, GuiGraphicsExtractor graphics, int x, i
         pose.translate(x, y);
         pose.scale(scaleX, scaleY);
 
-        IconHelper.renderIcon(icon.getMainIcon(), graphics, 0, 0, (int) drawWidth, (int) drawHeight);
+        IconHelper.renderIcon(colorize(icon, icon.getMainIcon()), graphics, 0, 0, (int) drawWidth, (int) drawHeight);
 
         icon.children().forEach(pair -> {
-            Icon<?> subIcon = pair.getLeft();
+            Icon<?> subIcon = colorize(icon, pair.getLeft());
             EntityImageIcon.ChildIconData child = pair.getRight();
             pose.pushMatrix();
             child.offset().ifPresent(offset -> pose.translate(offset.x(), offset.y()));
@@ -34,4 +35,8 @@ public void render(EntityImageIcon icon, GuiGraphicsExtractor graphics, int x, i
 
         pose.popMatrix();
     }
+
+    private Icon<?> colorize(EntityImageIcon imgIcon, Icon<?> icon) {
+        return imgIcon.getColor() == Color4I.WHITE ? icon : icon.withColor(imgIcon.getColor());
+    }
 }
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/IconRenderer.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/IconRenderer.java
index c29e1951..3d2172a0 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/IconRenderer.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/IconRenderer.java
@@ -20,7 +20,7 @@ public interface IconRenderer<T extends Icon<T>> {
     void render(T icon, GuiGraphicsExtractor graphics, int x, int y, int w, int h);
 
     /**
-     * In most cases, this can just default to {@link #render(Icon, GuiGraphics, int, int, int, int)}, but some icon types
+     * In most cases, this can just default to {@link #render(Icon, GuiGraphicsExtractor, int, int, int, int)}, but some icon types
      * can have dynamic textures which change over time. This method can be overridden for those types to draw a
      * static, unchanging image, where needed.
      *
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/ImageIconRenderer.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/ImageIconRenderer.java
index d2a69812..9dcb6144 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/ImageIconRenderer.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/icon/ImageIconRenderer.java
@@ -22,7 +22,7 @@ public void render(ImageIcon icon, GuiGraphicsExtractor graphics, int x, int y,
         AbstractTexture texture = Minecraft.getInstance().getTextureManager().getTexture(icon.texture);
 
         if (icon.tileSize <= 0D) {
-            graphics.guiRenderState.addBlitToCurrentLayer(new BlitRenderState(
+            graphics.guiRenderState.addGuiElement(new BlitRenderState(
                     RenderPipelines.GUI_TEXTURED,
                     TextureSetup.singleTexture(texture.getTextureView(), texture.getSampler()),
                     new Matrix3x2f(graphics.pose()),
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ClientTextComponentUtils.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ClientTextComponentUtils.java
index d94a14c0..fafb9329 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ClientTextComponentUtils.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ClientTextComponentUtils.java
@@ -47,7 +47,8 @@ private static Component defaultStringToComponent(String s) {
                         Integer.parseInt(map.getOrDefault("width", "100")),
                         Integer.parseInt(map.getOrDefault("height", "100")),
                         ImageComponent.ImageAlign.byName(map.getOrDefault("align", "center")),
-                        map.getOrDefault("fit", "false").equals("true")
+                        map.getOrDefault("fit", "false").equals("true"),
+                        map.getOrDefault("click_action", "")
                 );
                 var output = MutableComponent.create(c);
                 if (map.containsKey("text")) {
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ClientUtils.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ClientUtils.java
index e4fe8ae4..b091251f 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ClientUtils.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ClientUtils.java
@@ -42,7 +42,7 @@ public static void execClientCommand(String command, boolean printChat) {
                 if (printChat) {
                     Minecraft.getInstance().gui.getChat().addRecentChat(command);
                 }
-                Minecraft.getInstance().player.connection.sendCommand(command.replace("/", ""));
+                Minecraft.getInstance().player.connection.sendCommand(command.replaceFirst("/", ""));
             }
         }
     }
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ImageComponent.java b/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ImageComponent.java
index bb689bfa..d11b1cfd 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ImageComponent.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/client/util/ImageComponent.java
@@ -15,7 +15,8 @@ public class ImageComponent implements ComponentContents {
             Codec.INT.optionalFieldOf("width", 100).forGetter(ImageComponent::getWidth),
             Codec.INT.optionalFieldOf("height", 100).forGetter(ImageComponent::getHeight),
             ImageAlign.CODEC.optionalFieldOf("align", ImageAlign.CENTER).forGetter(ImageComponent::getAlign),
-            Codec.BOOL.optionalFieldOf("fit", false).forGetter(ImageComponent::isFit)
+            Codec.BOOL.optionalFieldOf("fit", false).forGetter(ImageComponent::isFit),
+            Codec.STRING.optionalFieldOf("click_action", "").forGetter(ImageComponent::getClickAction)
     ).apply(instance, ImageComponent::create));
 
     private Icon<?> image = Icon.empty();
@@ -23,18 +24,20 @@ public class ImageComponent implements ComponentContents {
     private int height = 100;
     private ImageAlign align = ImageAlign.CENTER;
     private boolean fit = false;
+    private String clickAction = "";
 
     public ImageComponent() {
         super();
     }
 
-    public static ImageComponent create(String id, int width, int height, ImageAlign align, boolean fit) {
+    public static ImageComponent create(String id, int width, int height, ImageAlign align, boolean fit, String clickAction) {
         ImageComponent c = new ImageComponent();
         c.image = Icon.getIcon(id);
         c.width = width;
         c.height = height;
         c.align = align;
         c.fit = fit;
+        c.clickAction = clickAction;
         return c;
     }
 
@@ -46,7 +49,7 @@ public Icon<?> getImage() {
         return image;
     }
 
-    public void setImage(Icon image) {
+    public void setImage(Icon<?> image) {
         this.image = image;
     }
 
@@ -82,6 +85,14 @@ public void setFit(boolean fit) {
         this.fit = fit;
     }
 
+    public String getClickAction() {
+        return clickAction;
+    }
+
+    public void setClickAction(String clickAction) {
+        this.clickAction = clickAction;
+    }
+
     @Override
     public String toString() {
         var sb = new StringBuilder("{image:");
@@ -95,6 +106,10 @@ public String toString() {
             sb.append(" fit:true");
         }
 
+        if (!clickAction.isEmpty()) {
+            sb.append(" click_action:").append(clickAction.replace(" ", "%20"));
+        }
+
         sb.append('}');
         return sb.toString();
     }
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/icon/EntityImageIcon.java b/common/src/main/java/dev/ftb/mods/ftblibrary/icon/EntityImageIcon.java
index 7aa46325..e2217af3 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/icon/EntityImageIcon.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/icon/EntityImageIcon.java
@@ -18,20 +18,32 @@
 import java.util.stream.Stream;
 
 public class EntityImageIcon extends Icon<EntityImageIcon> {
+    private final Icon<?> mainIcon;
+    private final List<Icon<?>> childIcons;
     @Nullable
     private final Slice mainSlice;
     private final List<ChildIconData> children;
-    private final Icon<?> mainIcon;
-    private final List<Icon<?>> childIcons;
-    private final EntityIconLoader.@Nullable WidthHeight defaultImageSize;
+    private final Color4I color;
 
-    public EntityImageIcon(Identifier mainTexture, @Nullable Slice mainSlice, List<ChildIconData> children, EntityIconLoader.@Nullable WidthHeight defaultImageSize) {
+    public EntityImageIcon(Identifier mainTexture, @Nullable Slice mainSlice, List<ChildIconData> children, EntityIconLoader.@Nullable WidthHeight defaultImageSize, Color4I color) {
         this.mainSlice = mainSlice;
         this.children = children;
-        this.defaultImageSize = defaultImageSize;
+        this.color = color;
+
+        mainIcon = createIcon(mainTexture, mainSlice, defaultImageSize);
+        childIcons = children.stream().map(c -> createIcon(c.texture.orElse(mainTexture), c.slice, defaultImageSize)).collect(Collectors.toList());
+    }
+
+    public EntityImageIcon(Identifier mainTexture, @Nullable Slice mainSlice, List<ChildIconData> children, EntityIconLoader.@Nullable WidthHeight defaultImageSize) {
+        this(mainTexture, mainSlice, children, defaultImageSize, Color4I.WHITE);
+    }
 
-        mainIcon = createIcon(mainTexture, mainSlice);
-        childIcons = children.stream().map(c -> createIcon(c.texture.orElse(mainTexture), c.slice)).collect(Collectors.toList());
+    private EntityImageIcon(Icon<?> mainIcon, List<Icon<?>> childIcons, @Nullable Slice mainSlice, List<ChildIconData> children, Color4I color) {
+        this.mainSlice = mainSlice;
+        this.children = children;
+        this.color = color;
+        this.mainIcon = mainIcon;
+        this.childIcons = childIcons;
     }
 
     public int getDrawWidth(int defWidth) {
@@ -54,6 +66,20 @@ public Stream<Pair<Icon<?>, ChildIconData>> children() {
         return Streams.zip(childIcons.stream(), children.stream(), Pair::of);
     }
 
+    public Color4I getColor() {
+        return color;
+    }
+
+    @Override
+    public Icon<EntityImageIcon> copy() {
+        return new EntityImageIcon(mainIcon, childIcons, mainSlice, children, color);
+    }
+
+    @Override
+    public Icon<EntityImageIcon> withColor(Color4I newColor) {
+        return new EntityImageIcon(mainIcon, childIcons, mainSlice, children, newColor);
+    }
+
     @Override
     public IconRenderer<EntityImageIcon> getRenderer() {
         return EntityImageIconRenderer.INSTANCE;
@@ -83,7 +109,7 @@ public record ChildIconData(Optional<Identifier> texture, Slice slice, Optional<
         ).apply(instance, ChildIconData::new));
     }
 
-    private Icon<?> createIcon(Identifier texture, @Nullable Slice slice) {
+    private Icon<?> createIcon(Identifier texture, @Nullable Slice slice, EntityIconLoader.@Nullable WidthHeight defaultImageSize) {
         try (SimpleTexture tex = new SimpleTexture(texture)) {
             TextureContents load = tex.loadContents(Minecraft.getInstance().getResourceManager());
             ImageIcon imageIcon = new ImageIcon(texture);
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/icon/Icons.java b/common/src/main/java/dev/ftb/mods/ftblibrary/icon/Icons.java
index 4a072f8e..2bab10b5 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/icon/Icons.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/icon/Icons.java
@@ -84,6 +84,8 @@ public interface Icons {
     Icon<?> COLLAPSE = get("collapse");
     Icon<?> EXPAND = get("expand");
     Icon<?> KEYBOARD = get("keyboard");
+    Icon<?> UNDO = get("undo");
+    Icon<?> REDO = get("redo");
 
     static Icon<?> get(String id) {
         return Icon.getIcon(FTBLibrary.MOD_ID + ":icons/" + id);
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/icon/ItemIcon.java b/common/src/main/java/dev/ftb/mods/ftblibrary/icon/ItemIcon.java
index dec5a0c3..21967ecb 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/icon/ItemIcon.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/icon/ItemIcon.java
@@ -21,7 +21,7 @@
 import org.jspecify.annotations.Nullable;
 
 public class ItemIcon extends Icon<ItemIcon> implements IResourceIcon {
-    // important to an ItemStackTemplate here; a full ItemStack will cause problems for early-loading
+    // important to use an ItemStackTemplate here; a full ItemStack will cause problems for early-loading
     // e.g. sidebar Json loading
     private final ItemStackTemplate stack;
 
@@ -29,6 +29,10 @@ private ItemIcon(ItemStackTemplate is) {
         stack = is;
     }
 
+    public static ItemIcon ofTemplate(ItemStackTemplate stack) {
+        return new ItemIcon(stack);
+    }
+
     public static Icon<?> ofItemStack(ItemStack stack) {
         if (stack.isEmpty()) {
             return empty();
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/integration/docsmod/DocsMod.java b/common/src/main/java/dev/ftb/mods/ftblibrary/integration/docsmod/DocsMod.java
new file mode 100644
index 00000000..8fcf1ac7
--- /dev/null
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/integration/docsmod/DocsMod.java
@@ -0,0 +1,17 @@
+package dev.ftb.mods.ftblibrary.integration.docsmod;
+
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.entity.player.Player;
+import org.jetbrains.annotations.Nullable;
+
+public interface DocsMod {
+    void openDocsPage(Player player, Identifier bookId, @Nullable Identifier pageId, String anchor);
+
+    enum None implements DocsMod {
+        INSTANCE;
+
+        @Override
+        public void openDocsPage(Player player, Identifier bookId, @Nullable Identifier pageId, String anchor) {
+        }
+    }
+}
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/integration/docsmod/DocsModRegistry.java b/common/src/main/java/dev/ftb/mods/ftblibrary/integration/docsmod/DocsModRegistry.java
new file mode 100644
index 00000000..6f55ea4b
--- /dev/null
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/integration/docsmod/DocsModRegistry.java
@@ -0,0 +1,24 @@
+package dev.ftb.mods.ftblibrary.integration.docsmod;
+
+import dev.ftb.mods.ftblibrary.FTBLibrary;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+
+public enum DocsModRegistry {
+    INSTANCE;
+
+    private static final Map<String, DocsMod> registry = new ConcurrentHashMap<>();
+
+    public void registerDocsMod(String id, DocsMod mod) {
+        // typically called from FTB XMod Compat
+        registry.put(id, mod);
+
+        FTBLibrary.LOGGER.info("registered docs provider mod: {}", id);
+    }
+
+    public Optional<DocsMod> getDocsMod(String id) {
+        return Optional.ofNullable(registry.get(id));
+    }
+}
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/json5/Json5Util.java b/common/src/main/java/dev/ftb/mods/ftblibrary/json5/Json5Util.java
index 8a148191..41dffe20 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/json5/Json5Util.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/json5/Json5Util.java
@@ -2,12 +2,18 @@
 
 import com.mojang.serialization.Codec;
 import de.marhali.json5.*;
+import de.marhali.json5.exception.Json5Exception;
 import net.minecraft.core.HolderLookup;
+import org.apache.commons.io.Charsets;
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.AtomicMoveNotSupportedException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -73,18 +79,30 @@ public static Json5Object load(Path inputFile) throws IOException {
 
     public static <T extends Json5Element> T load(Path inputFile, Class<T> jsonCls) throws IOException {
         try (FileInputStream stream = new FileInputStream(inputFile.toFile())) {
-            var json = new Json5().parse(stream);
-            if (jsonCls.isAssignableFrom(json.getClass())) {
-                return jsonCls.cast(json);
-            } else {
-                throw new IOException("expected object of type " + jsonCls.getName());
+            InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8);
+            try {
+                var json = new Json5().parse(reader);
+                if (jsonCls.isAssignableFrom(json.getClass())) {
+                    return jsonCls.cast(json);
+                } else {
+                    throw new IOException("expected object of type " + jsonCls.getName());
+                }
+            } catch (Json5Exception ex) {
+                throw new IOException("caught Json5Exception while parsing " + inputFile + ": " + ex.getMessage());
             }
         }
     }
 
-    public static void save(Path outputFile, Json5Element json) throws IOException {
-        Files.createDirectories(outputFile.getParent());
-        Files.writeString(outputFile, new Json5().serialize(json));
+    public static void save(Path path, Json5Element json) throws IOException {
+        Path parent = path.getParent();
+        Files.createDirectories(parent);
+        Path tmp = parent.resolve(path.getFileName().toString() + ".tmp");
+        Files.writeString(tmp, new Json5().serialize(json), StandardCharsets.UTF_8);
+        try {
+            Files.move(tmp, path, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
+        } catch (AtomicMoveNotSupportedException ex) {
+            Files.move(tmp, path, StandardCopyOption.REPLACE_EXISTING);
+        }
     }
 
     /// Use [#load(Path)]
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/nbtedit/NBTEditResponseHandlers.java b/common/src/main/java/dev/ftb/mods/ftblibrary/nbtedit/NBTEditResponseHandlers.java
index 4cca8473..b83bf8a2 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/nbtedit/NBTEditResponseHandlers.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/nbtedit/NBTEditResponseHandlers.java
@@ -1,6 +1,9 @@
 package dev.ftb.mods.ftblibrary.nbtedit;
 
+import com.mojang.brigadier.Command;
 import dev.ftb.mods.ftblibrary.FTBLibrary;
+import dev.ftb.mods.ftblibrary.net.EditNBTPacket;
+import dev.ftb.mods.ftblibrary.platform.network.Server2PlayNetworking;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.UUIDUtil;
@@ -15,6 +18,7 @@
 import net.minecraft.world.level.storage.TagValueInput;
 import net.minecraft.world.phys.Vec3;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -28,6 +32,7 @@ public enum NBTEditResponseHandlers {
     public static final Identifier ENTITY = FTBLibrary.id("entity");
 
     private final Map<Identifier, NBTResponseHandler> MAP = new ConcurrentHashMap<>();
+    private final Map<UUID, CompoundTag> currentlyEditing = new HashMap<>();  // players who are currently editing
 
     public static void registerBuiltinHandlers(HolderLookup.Provider registryAccess) {
         INSTANCE.registerHandler(ITEM, (player, info, data) ->
@@ -53,15 +58,15 @@ public static void registerBuiltinHandlers(HolderLookup.Provider registryAccess)
         });
 
         INSTANCE.registerHandler(PLAYER, (player, info, data) -> {
-            if (player.level().getServer() != null) {
-                var targetPlayer = player.level().getServer().getPlayerList().getPlayer(info.read("id", UUIDUtil.CODEC).orElse(null));
+            info.read("id", UUIDUtil.CODEC).ifPresent(playerId -> {
+                var targetPlayer = player.level().getServer().getPlayerList().getPlayer(playerId);
                 if (targetPlayer != null) {
                     UUID uuid = targetPlayer.getUUID();
                     targetPlayer.load(TagValueInput.create(ProblemReporter.DISCARDING, targetPlayer.registryAccess(), data));
                     targetPlayer.setUUID(uuid);
                     targetPlayer.setPos(new Vec3(targetPlayer.getX(), targetPlayer.getY(), targetPlayer.getZ()));
                 }
-            }
+            });
         });
 
         INSTANCE.registerHandler(ENTITY, (player, info, data) -> {
@@ -78,8 +83,19 @@ public void registerHandler(Identifier name, NBTResponseHandler handler) {
         MAP.put(name, handler);
     }
 
+    public int sendRequestPacket(ServerPlayer player, CompoundTag info, CompoundTag data) {
+        if (!info.isEmpty()) {
+            currentlyEditing.put(player.getUUID(), info);
+            Server2PlayNetworking.send(player, new EditNBTPacket(info, data));
+            return Command.SINGLE_SUCCESS;
+        }
+        return 0;
+    }
+
     public void handleResponse(Identifier name, ServerPlayer player, CompoundTag info, CompoundTag data) {
-        MAP.getOrDefault(name, NBTResponseHandler.NONE).handleResponse(player, info, data);
+        if (info.equals(currentlyEditing.remove(player.getUUID()))) {
+            MAP.getOrDefault(name, NBTResponseHandler.NONE).handleResponse(player, info, data);
+        }
     }
 
     @FunctionalInterface
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/net/EditNBTResponsePacket.java b/common/src/main/java/dev/ftb/mods/ftblibrary/net/EditNBTResponsePacket.java
index 67251a9b..13738814 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/net/EditNBTResponsePacket.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/net/EditNBTResponsePacket.java
@@ -23,13 +23,9 @@ public record EditNBTResponsePacket(CompoundTag info, CompoundTag tag) implement
     );
 
     public static void handle(EditNBTResponsePacket packet, PacketContext context) {
-        if (context.player() instanceof ServerPlayer serverPlayer && serverPlayer.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER)) {
-            packet.info.getString("type").ifPresent(idStr -> {
-                try {
-                    context.enqueue(() -> NBTEditResponseHandlers.INSTANCE.handleResponse(Identifier.parse(idStr), serverPlayer, packet.info, packet.tag));
-                } catch (IdentifierException ignored) {
-                }
-            });
+        if (context.player() instanceof ServerPlayer serverPlayer) {
+            packet.info.read("type", Identifier.CODEC).ifPresent(id ->
+                    context.enqueue(() -> NBTEditResponseHandlers.INSTANCE.handleResponse(id, serverPlayer, packet.info, packet.tag)));
         }
     }
 
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/sidebar/SidebarGroupGuiButton.java b/common/src/main/java/dev/ftb/mods/ftblibrary/sidebar/SidebarGroupGuiButton.java
index 64c1fbbb..0e4c8554 100644
--- a/common/src/main/java/dev/ftb/mods/ftblibrary/sidebar/SidebarGroupGuiButton.java
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/sidebar/SidebarGroupGuiButton.java
@@ -7,6 +7,7 @@
 import dev.ftb.mods.ftblibrary.icon.Color4I;
 import dev.ftb.mods.ftblibrary.icon.Icons;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
@@ -136,51 +137,53 @@ private void extractSidebarButtons(GuiGraphicsExtractor graphics, int mx, int my
         } else {
             for (SidebarGuiButton button : SidebarButtonManager.INSTANCE.getButtonList()) {
                 pose.pushMatrix();
-                GridLocation realGridLocation = realLocationMap.get(button);
-                if (isEditMode || (button.equals(selectedButton) || button.isEnabled())) {
-                    if (isEditMode && button == selectedButton) {
-                        button.x = mx - mouseOffsetX;
-                        button.y = my - mouseOffsetY;
-                    } else {
-                        if (realGridLocation == null) {
-                            // Make sure we pop the matric if the button is not enabled and not selected
-                            pose.popMatrix();
-                            continue;
-                        }
-
-                        int adjustedX = gridStartRight ? xRenderStart + (currentGirdWidth - realGridLocation.x() - 1) * BUTTON_SPACING : xRenderStart + realGridLocation.x() * BUTTON_SPACING;
-                        int adjustedY = gridStartBottom ? yRenderStart + (currentGridHeight - realGridLocation.y() - 1) * BUTTON_SPACING : yRenderStart + realGridLocation.y() * BUTTON_SPACING;
-                        button.x = adjustedX + 1;
-                        button.y = adjustedY + 1;
-                    }
-                    IconHelper.renderIcon(button.getSidebarButton().getData().icon(), graphics, button.x, button.y, 16, 16);
-
-                    if (isEditMode) {
-                        if (mx >= button.x + 12 && my <= button.y + 4 && mx < button.x + 16 && my >= button.y) {
-                            IconHelper.renderIcon(Icons.CANCEL, graphics, button.x + 11, button.y - 1, 6, 6);
-                        } else {
-                            IconHelper.renderIcon(Icons.CANCEL, graphics, button.x + 12, button.y, 4, 4);
-                        }
-                    } else {
-                        pose.pushMatrix();
-                        pose.translate(button.x, button.y);
-                        for (ButtonOverlayRender buttonOverlayRender : button.getSidebarButton().getExtraRenderers()) {
-                            buttonOverlayRender.render(graphics, font, 16);
-                        }
-                        pose.popMatrix();
-                    }
+                renderSidebarButton(graphics, mx, my, button, pose, font);
+                pose.popMatrix();
+            }
+        }
+    }
 
-                    if (button == mouseOver) {
-                        IconHelper.renderIcon(Color4I.WHITE.withAlpha(33), graphics, button.x, button.y, 16, 16);
-                    }
+    private void renderSidebarButton(GuiGraphicsExtractor graphics, int mx, int my, SidebarGuiButton button, Matrix3x2fStack pose, Font font) {
+        GridLocation realGridLocation = realLocationMap.get(button);
+        if (isEditMode || (button.equals(selectedButton) || button.isEnabled())) {
+            if (isEditMode && button == selectedButton) {
+                button.x = mx - mouseOffsetX;
+                button.y = my - mouseOffsetY;
+            } else {
+                if (realGridLocation == null) {
+                    return;
+                }
 
+                int adjustedX = gridStartRight ? xRenderStart + (currentGirdWidth - realGridLocation.x() - 1) * BUTTON_SPACING : xRenderStart + realGridLocation.x() * BUTTON_SPACING;
+                int adjustedY = gridStartBottom ? yRenderStart + (currentGridHeight - realGridLocation.y() - 1) * BUTTON_SPACING : yRenderStart + realGridLocation.y() * BUTTON_SPACING;
+                button.x = adjustedX + 1;
+                button.y = adjustedY + 1;
+            }
+            IconHelper.renderIcon(button.getSidebarButton().getData().icon(), graphics, button.x, button.y, 16, 16);
+
+            if (isEditMode) {
+                if (mx >= button.x + 12 && my <= button.y + 4 && mx < button.x + 16 && my >= button.y) {
+                    IconHelper.renderIcon(Icons.CANCEL, graphics, button.x + 11, button.y - 1, 6, 6);
+                } else {
+                    IconHelper.renderIcon(Icons.CANCEL, graphics, button.x + 12, button.y, 4, 4);
                 }
-                if (!isEditMode && mouseOver == button) {
-                    graphics.setTooltipForNextFrame(font, button.getSidebarButton().getTooltip(Minecraft.getInstance().hasShiftDown()),
-                            Optional.empty(), mx, Math.max(7, my - 9) + 10);
+            } else {
+                pose.pushMatrix();
+                pose.translate(button.x, button.y);
+                for (ButtonOverlayRender buttonOverlayRender : button.getSidebarButton().getExtraRenderers()) {
+                    buttonOverlayRender.render(graphics, font, 16);
                 }
                 pose.popMatrix();
             }
+
+            if (button == mouseOver) {
+                IconHelper.renderIcon(Color4I.WHITE.withAlpha(33), graphics, button.x, button.y, 16, 16);
+            }
+
+        }
+        if (!isEditMode && mouseOver == button) {
+            graphics.setTooltipForNextFrame(font, button.getSidebarButton().getTooltip(Minecraft.getInstance().hasShiftDown()),
+                    Optional.empty(), mx, Math.max(7, my - 9) + 10);
         }
     }
 
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/util/Vec2d.java b/common/src/main/java/dev/ftb/mods/ftblibrary/util/Vec2d.java
new file mode 100644
index 00000000..7f9f99b2
--- /dev/null
+++ b/common/src/main/java/dev/ftb/mods/ftblibrary/util/Vec2d.java
@@ -0,0 +1,86 @@
+package dev.ftb.mods.ftblibrary.util;
+
+import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.Codec;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.util.Util;
+
+import java.util.List;
+
+public record Vec2d(double x, double y) {
+    public static final Vec2d ZERO = new Vec2d(0.0, 0.0);
+    public static final Vec2d ONE = new Vec2d(1.0F, 1.0);
+    public static final Vec2d UNIT_X = new Vec2d(1.0, 0.0);
+    public static final Vec2d NEG_UNIT_X = new Vec2d(-1.0, 0.0);
+    public static final Vec2d UNIT_Y = new Vec2d(0.0, 1.0);
+    public static final Vec2d NEG_UNIT_Y = new Vec2d(0.0, -1.0);
+    public static final Vec2d MAX = new Vec2d(Double.MAX_VALUE, Double.MAX_VALUE);
+    public static final Vec2d MIN = new Vec2d(Double.MIN_VALUE, Double.MIN_VALUE);
+
+    public static final Codec<Vec2d> CODEC = Codec.DOUBLE.listOf()
+            .comapFlatMap(
+                    input -> Util.fixedSize(input, 2)
+                            .map(doubles -> new Vec2d(doubles.getFirst(), doubles.getLast())),
+                    vec -> List.of(vec.x, vec.y)
+            );
+    public static final Codec<Pair<Vec2d,Vec2d>> PAIR_CODEC = Codec.DOUBLE.listOf()
+            .comapFlatMap(
+                    input -> Util.fixedSize(input, 4)
+                            .map(doubles -> Pair.of(new Vec2d(doubles.get(0), doubles.get(1)), new Vec2d(doubles.get(2), doubles.get(3)))),
+                    pair -> List.of(pair.getFirst().x, pair.getFirst().y, pair.getSecond().x, pair.getSecond().y)
+            );
+    public static final StreamCodec<FriendlyByteBuf, Vec2d> STREAM_CODEC = StreamCodec.composite(
+            ByteBufCodecs.DOUBLE, v -> v.x,
+            ByteBufCodecs.DOUBLE, v -> v.y,
+            Vec2d::new
+    );
+
+    public Vec2d scale(final double s) {
+        return new Vec2d(this.x * s, this.y * s);
+    }
+
+    public double dot(final Vec2d v) {
+        return this.x * v.x + this.y * v.y;
+    }
+
+    public Vec2d add(final Vec2d rhs) {
+        return new Vec2d(this.x + rhs.x, this.y + rhs.y);
+    }
+
+    public Vec2d sub(final Vec2d rhs) {
+        return new Vec2d(this.x - rhs.x, this.y - rhs.y);
+    }
+
+    public Vec2d add(final double v) {
+        return new Vec2d(this.x + v, this.y + v);
+    }
+
+    public boolean equals(final Vec2d rhs) {
+        return this.x == rhs.x && this.y == rhs.y;
+    }
+
+    public Vec2d normalized() {
+        double dist = Math.sqrt(this.x * this.x + this.y * this.y);
+        return dist < 1.0E-4F ? ZERO : new Vec2d(this.x / dist, this.y / dist);
+    }
+
+    public double length() {
+        return Math.sqrt(this.x * this.x + this.y * this.y);
+    }
+
+    public double lengthSquared() {
+        return this.x * this.x + this.y * this.y;
+    }
+
+    public double distanceToSqr(final Vec2d p) {
+        double xd = p.x - this.x;
+        double yd = p.y - this.y;
+        return xd * xd + yd * yd;
+    }
+
+    public Vec2d negated() {
+        return new Vec2d(-this.x, -this.y);
+    }
+}
diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/redo.png b/common/src/main/resources/assets/ftblibrary/textures/icons/redo.png
new file mode 100644
index 00000000..b4fc4150
Binary files /dev/null and b/common/src/main/resources/assets/ftblibrary/textures/icons/redo.png differ
diff --git a/common/src/main/resources/assets/ftblibrary/textures/icons/undo.png b/common/src/main/resources/assets/ftblibrary/textures/icons/undo.png
new file mode 100644
index 00000000..1993811a
Binary files /dev/null and b/common/src/main/resources/assets/ftblibrary/textures/icons/undo.png differ
diff --git a/gradle.properties b/gradle.properties
index c533a478..e2157531 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.daemon=false
 # Mod
 mod_id=ftblibrary
 readable_name=FTB Library
-mod_version=6
+mod_version=7
 mod_author=FTB Team
 
 # Maven
@@ -18,8 +18,8 @@ minecraft_version_range_maven=[26.1,27)
 minecraft_version_range_semver=>=26.1.0
 
 # Deps
-neoforge_version=26.1.2.7-beta
-neoforge_version_range=[26.1.0.0-beta,27)
+neoforge_version=26.1.2.71
+neoforge_version_range=[26.1.2.71,27)
 neoforge_loader_version=4
 
 fabric_loader_version=0.18.6
diff --git a/neoforge/src/main/java/dev/ftb/mods/ftblibrary/neoforge/gametest/FTBGameTest.java b/neoforge/src/main/java/dev/ftb/mods/ftblibrary/neoforge/gametest/FTBGameTest.java
new file mode 100644
index 00000000..6d5a82b4
--- /dev/null
+++ b/neoforge/src/main/java/dev/ftb/mods/ftblibrary/neoforge/gametest/FTBGameTest.java
@@ -0,0 +1,48 @@
+package dev.ftb.mods.ftblibrary.neoforge.gametest;
+
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.core.Holder;
+import net.minecraft.gametest.framework.*;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.resources.Identifier;
+
+import java.util.function.Consumer;
+
+public class FTBGameTest extends GameTestInstance {
+    public static final MapCodec<FTBGameTest> CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
+            TestData.CODEC.forGetter(test -> test.info()),
+            Identifier.CODEC.fieldOf("test_id").forGetter(FTBGameTest::testId)
+    ).apply(builder, FTBGameTest::new));
+
+    private final Identifier testId;
+
+    public FTBGameTest(TestData<Holder<TestEnvironmentDefinition<?>>> info, Identifier testId) {
+        super(info);
+        this.testId = testId;
+    }
+
+    @Override
+    public void run(GameTestHelper helper) {
+        Consumer<GameTestHelper> consumer = FTBTestRegistrar.getGameTest(testId);
+        if (consumer == null) {
+            throw new GameTestAssertException(Component.literal("unknown test " + testId), 0);
+        }
+        consumer.accept(helper);
+    }
+
+    public Identifier testId() {
+        return testId;
+    }
+
+    @Override
+    public MapCodec<? extends GameTestInstance> codec() {
+        return CODEC;
+    }
+
+    @Override
+    protected MutableComponent typeDescription() {
+        return Component.literal("FTB Gametest: " + testId);
+    }
+}
diff --git a/neoforge/src/main/java/dev/ftb/mods/ftblibrary/neoforge/gametest/FTBTestRegistrar.java b/neoforge/src/main/java/dev/ftb/mods/ftblibrary/neoforge/gametest/FTBTestRegistrar.java
new file mode 100644
index 00000000..c2cbe5a5
--- /dev/null
+++ b/neoforge/src/main/java/dev/ftb/mods/ftblibrary/neoforge/gametest/FTBTestRegistrar.java
@@ -0,0 +1,57 @@
+package dev.ftb.mods.ftblibrary.neoforge.gametest;
+
+import dev.ftb.mods.ftblibrary.FTBLibrary;
+import net.minecraft.core.Holder;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.gametest.framework.TestData;
+import net.minecraft.gametest.framework.TestEnvironmentDefinition;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.level.block.Rotation;
+import net.neoforged.neoforge.event.RegisterGameTestsEvent;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+
+public class FTBTestRegistrar {
+    private static final Identifier STRUCTURE = FTBLibrary.id("empty_5x5x7");
+
+    private static final Map<Identifier, Consumer<GameTestHelper>> TEST_BODIES = new ConcurrentHashMap<>();
+
+    private final RegisterGameTestsEvent event;
+    private final Holder<TestEnvironmentDefinition<?>> environment;
+    private final String modId;
+
+    public FTBTestRegistrar(RegisterGameTestsEvent event, String modId) {
+        this.event = event;
+        this.environment = event.registerEnvironment(Identifier.fromNamespaceAndPath(modId, "default"), new TestEnvironmentDefinition.AllOf(List.of()));
+        this.modId = modId;
+    }
+
+    public void add(String name, int maxTicks, Consumer<GameTestHelper> body) {
+        add(name, maxTicks, 0, body);
+    }
+
+    public void add(String name, int maxTicks, int setupTicks, Consumer<GameTestHelper> body) {
+        TestData<Holder<TestEnvironmentDefinition<?>>> info = new TestData<>(
+                environment,
+                STRUCTURE,
+                maxTicks,
+                setupTicks,
+                true,
+                Rotation.NONE
+        );
+        try {
+            Identifier id = Identifier.fromNamespaceAndPath(modId, name);
+            event.registerTest(id, new FTBGameTest(info, id));
+            TEST_BODIES.put(id, body);
+        } catch (Throwable t) {
+            FTBLibrary.LOGGER.error("Failed to register game test {}: {}", modId, name, t);
+        }
+    }
+
+    public static Consumer<GameTestHelper> getGameTest(Identifier testId) {
+        return TEST_BODIES.get(testId);
+    }
+}