fix: bundle correct version of SpruceUI

fix: resourcepacks appearing as outdated
port: Mounts of Mayham (1.21.11)
2025-12-16 00:25:10 +01:00 · 2025-12-15 21:23:28 +01:00 · 2025-12-11 16:28:57 +01:00 · 2025-12-11 16:27:12 +01:00 · 2025-10-30 22:12:45 +01:00 · 2025-10-29 15:16:27 +01:00
66 changed files with 1017 additions and 514 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
    id "me.shedaniel.unified-publishing" version "0.1.+" apply false
    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
@@ -24,6 +24,10 @@ subprojects {
        maven {
            url = "https://api.modrinth.com/maven"
        }
+        maven {
+            name 'Gegy'
+            url 'https://maven.gegy.dev'
+        }
        maven { url 'https://jitpack.io' }
        flatDir {
            dirs("../localMaven")
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -29,7 +29,7 @@ dependencies {
    // Using the Fabric version of midnightlib here to create a common config and get useful utilities
    // Just make sure NOT to use classes from the .fabric classpath
    modCompileOnlyApi "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric"
-    modCompileOnlyApi "maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric"
+    modCompileOnlyApi "dev.lambdaurora:spruceui:${project.spruceui_version}"
    modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") {
        exclude(group: "net.fabricmc.fabric-api")
    }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/ControlsMode.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/ControlsMode.java
@@ -9,12 +9,17 @@

 package eu.midnightdust.midnightcontrols;

+import net.minecraft.text.Text;
+import net.minecraft.text.object.AtlasTextObjectContents;
+import net.minecraft.util.Atlases;
+import net.minecraft.util.StringIdentifiable;
 import org.jetbrains.annotations.NotNull;
-import org.thinkingstudio.obsidianui.util.Nameable;

 import java.util.Arrays;
 import java.util.Optional;

+import static eu.midnightdust.midnightcontrols.MidnightControls.id;
+
 /**
 * Represents the controls mode.
 *
@@ -22,10 +27,15 @@ import java.util.Optional;
 * @version 1.7.0
 * @since 1.0.0
 */
-public enum ControlsMode {
-    DEFAULT,
-    CONTROLLER,
-    TOUCHSCREEN;
+public enum ControlsMode implements StringIdentifiable {
+    DEFAULT("icon/keyboard_mouse"),
+    CONTROLLER("icon/controller"),
+    TOUCHSCREEN("icon/touchscreen");
+    final String emoji;
+
+    ControlsMode(String emoji) {
+        this.emoji = emoji;
+    }

    /**
     * Returns the next controls mode available.
@@ -39,6 +49,11 @@ public enum ControlsMode {
        return v[this.ordinal() + 1];
    }

+//    @Override
+//    public Text getText() {
+//        return Text.object(new AtlasTextObjectContents(Atlases.GUI, id(emoji))).append(" ").append(Text.translatable(getTranslationKey()));
+//    }
+
    /**
     * Gets the translation key of this controls mode.
     *
@@ -49,6 +64,7 @@ public enum ControlsMode {
        return "midnightcontrols.controls_mode." + this.getName();
    }

+
    public @NotNull String getName() {
        return this.name().toLowerCase();
    }
@@ -62,4 +78,9 @@ public enum ControlsMode {
    public static Optional<ControlsMode> byId(@NotNull String id) {
        return Arrays.stream(values()).filter(mode -> mode.getName().equalsIgnoreCase(id)).findFirst();
    }
+
+    @Override
+    public String asString() {
+        return getTranslationKey();
+    }
 }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/MidnightControlsFeature.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/MidnightControlsFeature.java
@@ -9,8 +9,8 @@

 package eu.midnightdust.midnightcontrols;

-import org.thinkingstudio.obsidianui.util.Nameable;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import org.aperlambda.lambdacommon.utils.Nameable;
 import org.jetbrains.annotations.NotNull;

 import java.util.ArrayList;
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java
@@ -28,7 +28,6 @@ import eu.midnightdust.midnightcontrols.client.ring.MidnightRing;
 import eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil;
 import eu.midnightdust.midnightcontrols.client.virtualkeyboard.MouseClickInterceptor;
 import net.minecraft.client.gui.screen.Screen;
-import org.thinkingstudio.obsidianui.hud.HudManager;
 import eu.midnightdust.midnightcontrols.client.touch.TouchInput;
 import eu.midnightdust.midnightcontrols.client.util.RainbowColor;
 import eu.midnightdust.midnightcontrols.packet.ControlsModePayload;
@@ -56,21 +55,20 @@ import java.util.concurrent.atomic.AtomicReference;
 */
 public class MidnightControlsClient extends MidnightControls {
    public static boolean lateInitDone = false;
+    public static final KeyBinding.Category MIDNIGHTCONTROLS_CATEGORY = KeyBinding.Category.create(Identifier.of("midnightcontrols", "keybinds"));
    public static final KeyBinding BINDING_LOOK_UP = InputManager.makeKeyBinding(id("look_up"),
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_8, "key.categories.midnightcontrols");
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_8, MIDNIGHTCONTROLS_CATEGORY);
    public static final KeyBinding BINDING_LOOK_RIGHT = InputManager.makeKeyBinding(id("look_right"),
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_6, "key.categories.midnightcontrols");
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_6, MIDNIGHTCONTROLS_CATEGORY);
    public static final KeyBinding BINDING_LOOK_DOWN = InputManager.makeKeyBinding(id("look_down"),
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_2, "key.categories.midnightcontrols");
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_2, MIDNIGHTCONTROLS_CATEGORY);
    public static final KeyBinding BINDING_LOOK_LEFT = InputManager.makeKeyBinding(id("look_left"),
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_4, "key.categories.midnightcontrols");
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_4, MIDNIGHTCONTROLS_CATEGORY);
    public static final KeyBinding BINDING_RING = InputManager.makeKeyBinding(id("ring"),
-            InputUtil.Type.KEYSYM, InputUtil.UNKNOWN_KEY.getCode(), "key.categories.midnightcontrols");
+            InputUtil.Type.KEYSYM, InputUtil.UNKNOWN_KEY.getCode(), MIDNIGHTCONTROLS_CATEGORY);
    public static final Identifier CONTROLLER_BUTTONS = id("textures/gui/controller_buttons.png");
    public static final Identifier CONTROLLER_EXPANDED = id("textures/gui/controller_expanded.png");
    public static final Identifier CONTROLLER_AXIS = id("textures/gui/controller_axis.png");
-    public static final Identifier WAYLAND_CURSOR_TEXTURE_LIGHT = id("cursor/light/mouse_pointer");
-    public static final Identifier WAYLAND_CURSOR_TEXTURE_DARK = id("cursor/dark/mouse_pointer");
    public static final File MAPPINGS_FILE = new File("config/gamecontrollercustommappings.txt");
    public static MinecraftClient client = MinecraftClient.getInstance();
    public static final MidnightInput input = new MidnightInput();
@@ -103,7 +101,6 @@ public class MidnightControlsClient extends MidnightControls {
            }
        }, delay, period);

-        HudManager.register(hud = new MidnightControlsHud());
        isWayland = GLFW.glfwGetVersionString().contains("Wayland");
    }

@@ -121,7 +118,7 @@ public class MidnightControlsClient extends MidnightControls {
            MidnightControlsConfig.configVersion = 2;
            MidnightControlsConfig.write(MidnightControlsConstants.NAMESPACE);
        }
-        hud.setVisible(MidnightControlsConfig.hudEnable);
+        MidnightControlsHud.isVisible = MidnightControlsConfig.hudEnable;
        Controller.updateMappings();
        try {
            GLFW.glfwSetJoystickCallback((jid, event) -> {
@@ -207,7 +204,7 @@ public class MidnightControlsClient extends MidnightControls {
        client = MinecraftClient.getInstance();
        if (screen == null && MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN) {
            screen = new TouchscreenOverlay();
-            screen.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
+            screen.init(client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
            client.skipGameRender = false;
            client.currentScreen = screen;
        } else if (screen != null) {
@@ -248,7 +245,7 @@ public class MidnightControlsClient extends MidnightControls {
     */
    public static void setHudEnabled(boolean enabled) {
        MidnightControlsConfig.hudEnable = enabled;
-        hud.setVisible(enabled);
+        MidnightControlsHud.isVisible = enabled;
    }

    private static final MidnightControlsClient INSTANCE = new MidnightControlsClient();
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java
@@ -21,6 +21,7 @@ import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
 import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
@@ -28,19 +29,29 @@ import eu.midnightdust.midnightcontrols.client.enums.CameraMode;
 import eu.midnightdust.midnightcontrols.client.enums.ControllerType;
 import eu.midnightdust.midnightcontrols.client.enums.HudSide;
 import eu.midnightdust.midnightcontrols.client.enums.VirtualMouseSkin;
+import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen;
 import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import eu.midnightdust.midnightcontrols.client.enums.TouchMode;
+import eu.midnightdust.midnightcontrols.client.gui.config.ControllerBindingButton;
+import eu.midnightdust.midnightcontrols.client.gui.config.ControllerSelectionButton;
+import eu.midnightdust.midnightcontrols.client.gui.config.MappingsStringInputWidget;
+import eu.midnightdust.midnightcontrols.client.virtualkeyboard.KeyboardLayoutManager;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.TextIconButtonWidget;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;

+import java.lang.annotation.Annotation;
 import java.util.*;
 import java.util.regex.Pattern;

+import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
 import static org.lwjgl.glfw.GLFW.*;

 /**
@@ -53,22 +64,64 @@ public class MidnightControlsConfig extends MidnightConfig {
    public static final String SCREENS = "screens";
    public static final String VISUAL = "visual";
    public static final String MISC = "misc";
+    public static final String BUTTONS = "buttons";
+    //public static final String MAPPING = "mapping";
    public static boolean isEditing = false;
    @Hidden @Entry public static int configVersion = 2;
-    // General
-    @Comment(category = CONTROLLER, centered = true, name="\uD83C\uDFAE General") public static Comment _general;
+
+    // Controller
+    @Entry(category = CONTROLLER, name = "Controller ID") @Hidden public static Object controllerID = 0;
+    @Entry(category = CONTROLLER, name = "2nd Controller ID") @Hidden public static Object secondControllerID = -1;
+
+    @Comment(category = CONTROLLER, centered = true, name="\uD83D\uDD90 Input Mode") public static Comment _input_mode;
    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.controls_mode") public static ControlsMode controlsMode = ControlsMode.DEFAULT;
    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.auto_switch_mode") public static boolean autoSwitchMode = true;
-    // HUD
+
+    @Comment(category = CONTROLLER, centered = true, name="\uD83D\uDCF7 Camera Settings") public static Comment _cameraSettings;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.invert_right_y_axis") public static boolean invertRightYAxis = false;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.invert_right_x_axis") public static boolean invertRightXAxis = false;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double rotationSpeed = 35.0; //used for x-axis, name kept for compatibility
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.y_axis_rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double yAxisRotationSpeed = rotationSpeed;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.camera_mode") public static CameraMode cameraMode = CameraMode.FLAT;
+
+    @Comment(category = CONTROLLER, centered = true, name="\uD83D\uDC40 Eye Tracking") public static Comment _eyeTracker;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.eye_tracker_as_mouse") public static boolean eyeTrackerAsMouse = false;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.eye_tracker_deadzone", isSlider = true, min = 0, max = 0.4) public static double eyeTrackerDeadzone = 0.05;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false;
+
+    @Comment(category = CONTROLLER, centered = true, name="\uD83D\uDD79 Max Analog Stick Values") public static Comment _maxAnalogValues;
+    @Entry(category = CONTROLLER, name = "Max analog value: Left X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftX = 1;
+    @Entry(category = CONTROLLER, name = "Max analog value: Left Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftY = 1;
+    @Entry(category = CONTROLLER, name = "Max analog value: Right X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightX = 1;
+    @Entry(category = CONTROLLER, name = "Max analog value: Right Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightY = 1;
+    @Comment(category = CONTROLLER, centered = true, name="☠ Dead Zones") public static Comment _deadZones;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.right_dead_zone", isSlider = true, min = 0.05, max = 1) public static double rightDeadZone = 0.15;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.left_dead_zone", isSlider = true, min = 0.05, max = 1) public static double leftDeadZone = 0.15;
+    @Entry(category = CONTROLLER, name = "Trigger Dead-Zone", isSlider = true, min = 0.05, max = 1) public static double triggerDeadZone = 0.1;
+
+    // Init button binding tab (see #onTabInit())
+    @Comment(category = BUTTONS) @Condition(requiredModId = "thisModDoesNotExist") public static Comment this_spacer_will_never_be_visible;
+    @Entry @Hidden public static Map<String, String> BINDING = new HashMap<>();
+    private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?");
+
+    // Visual
    @Comment(category = VISUAL, centered = true, name="\uD83D\uDDB9 Hud") public static Comment _hud;
    @Entry(category = VISUAL, name = "midnightcontrols.menu.hud_enable") public static boolean hudEnable = true;
    @Entry(category = VISUAL, name = "midnightcontrols.menu.hud_side") public static HudSide hudSide = HudSide.LEFT;
    @Entry(category = VISUAL, name = "midnightcontrols.menu.controller_type") public static ControllerType controllerType = ControllerType.DEFAULT;
+
+    @Comment(category = VISUAL, centered = true, name="⊽ Reacharound") public static Comment _reacharoundOutline;
+    @Condition(requiredModId = "midnightcontrols-extra")
+    @Entry(category = VISUAL, name = "Reacharound Outline") public static boolean shouldRenderReacharoundOutline = true;
+    @Condition(requiredModId = "midnightcontrols-extra", requiredOption = "shouldRenderReacharoundOutline")
+    @Entry(category = VISUAL, name = "Reacharound Outline Color", isColor = true) public static String reacharoundOutlineColorHex = "#ffffff";
+    @Condition(requiredModId = "midnightcontrols-extra", requiredOption = "shouldRenderReacharoundOutline")
+    @Entry(category = VISUAL, name = "Reacharound Outline Alpha", isSlider = true, min = 0, max = 255) public static int reacharoundOutlineColorAlpha = 102;
+
    // Gameplay
    @Comment(category = GAMEPLAY, centered = true, name="\uD83D\uDECB Comfort") public static Comment _comfort;
    @Entry(category = GAMEPLAY, name = "Enable Hints") public static boolean enableHints = true;
    @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.analog_movement") public static boolean analogMovement = true;
-    @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.double_tap_to_sprint") public static boolean doubleTapToSprint = true;
    @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.controller_toggle_sneak") public static boolean controllerToggleSneak = MinecraftClient.getInstance().options.getSneakToggled().getValue();
    @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.controller_toggle_sprint") public static boolean controllerToggleSprint = MinecraftClient.getInstance().options.getSprintToggled().getValue();

@@ -85,19 +138,8 @@ public class MidnightControlsConfig extends MidnightConfig {
    @Condition(requiredModId = "midnightcontrols-extra")
    @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.reacharound.vertical") public static boolean verticalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
    @Condition(requiredModId = "midnightcontrols-extra")
-    @Comment(category = VISUAL, centered = true, name="⊽ Reacharound") public static Comment _reacharoundOutline;
-    @Condition(requiredModId = "midnightcontrols-extra")
-    @Entry(category = VISUAL, name = "Reacharound Outline") public static boolean shouldRenderReacharoundOutline = true;
-    @Condition(requiredModId = "midnightcontrols-extra", requiredOption = "shouldRenderReacharoundOutline")
-    @Entry(category = VISUAL, name = "Reacharound Outline Color", isColor = true) public static String reacharoundOutlineColorHex = "#ffffff";
-    @Condition(requiredModId = "midnightcontrols-extra", requiredOption = "shouldRenderReacharoundOutline")
-    @Entry(category = VISUAL, name = "Reacharound Outline Alpha", isSlider = true, min = 0, max = 255) public static int reacharoundOutlineColorAlpha = 102;
-    @Comment(category = CONTROLLER, centered = true, name="\uD83D\uDCF7 Camera Settings") public static Comment _cameraSettings;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.invert_right_y_axis") public static boolean invertRightYAxis = false;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.invert_right_x_axis") public static boolean invertRightXAxis = false;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double rotationSpeed = 35.0; //used for x-axis, name kept for compatibility
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.y_axis_rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double yAxisRotationSpeed = rotationSpeed;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.camera_mode") public static CameraMode cameraMode = CameraMode.FLAT;
+
+    // Screens
    @Comment(category = SCREENS, centered = true, name="\uD83D\uDDB1 Mouse Behaviour") public static Comment _mouseBehaviour;
    @Entry(category = SCREENS, name = "midnightcontrols.menu.mouse_speed", isSlider = true, min = 0, max = 150, precision = 10) public static double mouseSpeed = 25.0;
    @Entry(category = SCREENS, name = "midnightcontrols.menu.joystick_as_mouse") public static boolean joystickAsMouse = false;
@@ -107,62 +149,114 @@ public class MidnightControlsConfig extends MidnightConfig {
            "me.shedaniel.clothconfig2.gui.ClothConfigScreen", "com.mamiyaotaru.voxelmap.gui.GuiWaypoints", "com.mamiyaotaru.voxelmap.gui.GuiPersistentMap");
    @Entry(category = SCREENS, name = "Arrow screens") public static List<String> arrowScreens = Lists.newArrayList(ChatScreen.class.getCanonicalName());
    @Entry(category = SCREENS, name = "WASD screens") public static List<String> wasdScreens = Lists.newArrayList("com.ultreon.devices.core.Laptop");
-    @Comment(category = CONTROLLER, centered = true, name="\uD83D\uDC40 Eye Tracking") public static Comment _eyeTracker;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.eye_tracker_as_mouse") public static boolean eyeTrackerAsMouse = false;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.eye_tracker_deadzone", isSlider = true, min = 0, max = 0.4) public static double eyeTrackerDeadzone = 0.05;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false;
+
    @Comment(category = SCREENS, centered = true, name="\uD83D\uDC46 Virtual Mouse") public static Comment _virtualMouse;
    @Entry(category = SCREENS, name = "midnightcontrols.menu.virtual_mouse") public static boolean virtualMouse = false;
    @Condition(requiredOption = "virtualMouse", visibleButLocked = true)
    @Entry(category = SCREENS, name = "midnightcontrols.menu.virtual_mouse.skin") public static VirtualMouseSkin virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
    @Entry(category = SCREENS, name = "midnightcontrols.menu.hide_cursor") public static boolean hideNormalMouse = false;
    @Entry(category = SCREENS, name = "midnightcontrols.menu.virtual_keyboard") public static boolean virtualKeyboard = false;
-    @Entry(category = CONTROLLER, name = "Controller ID") @Hidden public static Object controllerID = 0;
-    @Entry(category = CONTROLLER, name = "2nd Controller ID") @Hidden public static Object secondControllerID = -1;
+
+    @Comment(category = SCREENS, centered = true, name="\uD83D\uDD27 UI Modifications") public static Comment _uiMods;
+    @Entry(category = SCREENS, name = "midnightcontrols.menu.move_chat") public static boolean moveChat = false;
+    @Entry(category = SCREENS, name = "Enable Shortcut in Controls Options") public static boolean shortcutInControls = true;
+
+    // Touch
    @Comment(category = TOUCH, centered = true, name="\uD83E\uDE84 Behaviour") public static Comment _touchBehaviour;
    @Entry(category = TOUCH, name = "midnightcontrols.menu.touch_with_controller") public static boolean touchInControllerMode = false;
    @Entry(category = TOUCH, name = "midnightcontrols.menu.touch_speed", isSlider = true, min = 0, max = 150, precision = 10) public static double touchSpeed = 50.0;
    @Entry(category = TOUCH, name = "midnightcontrols.menu.invert_touch") public static boolean invertTouch = false;
    @Entry(category = TOUCH, name = "midnightcontrols.menu.touch_mode") public static TouchMode touchMode = TouchMode.CROSSHAIR;
    @Entry(category = TOUCH, name = "midnightcontrols.menu.touch_break_delay", isSlider = true, min = 50, max = 500) public static int touchBreakDelay = 120;
+
    @Comment(category = TOUCH, centered = true, name="\uD83D\uDCA1 Visuals") public static Comment _visuals;
    @Entry(category = TOUCH, name = "midnightcontrols.menu.touch_transparency", isSlider = true, min = 0, max = 100) public static int touchTransparency = 75;
    @Entry(category = TOUCH, name = "Touch Outline Color", isColor = true) public static String touchOutlineColorHex = "#ffffff";
    @Entry(category = TOUCH, name = "Touch Outline Alpha", isSlider = true, min = 0, max = 255) public static int touchOutlineColorAlpha = 150;
+
    @Comment(category = TOUCH, centered = true, name="\uD83E\uDDEA Advanced") public static Comment _advanced;
    @Entry(category = TOUCH, name = "Screens with close button") public static List<String> closeButtonScreens = Lists.newArrayList(ChatScreen.class.getCanonicalName(), AdvancementsScreen.class.getCanonicalName(), RingScreen.class.getCanonicalName());
    @Entry(category = TOUCH, name = "Left Touch button bindings") public static List<String> leftTouchBinds = Lists.newArrayList("debug_screen", "screenshot","toggle_perspective");
    @Entry(category = TOUCH, name = "Right Touch button bindings") public static List<String> rightTouchBinds = Lists.newArrayList("screenshot","toggle_perspective", "use");

-    @Entry @Hidden public static Map<String, String> BINDING = new HashMap<>();
-
-    private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?");
-    @Comment(category = CONTROLLER, centered = true, name="\uD83D\uDD79 Max Analog Stick Values") public static Comment _maxAnalogValues;
-    @Entry(category = CONTROLLER, name = "Max analog value: Left X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftX = 1;
-    @Entry(category = CONTROLLER, name = "Max analog value: Left Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftY = 1;
-    @Entry(category = CONTROLLER, name = "Max analog value: Right X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightX = 1;
-    @Entry(category = CONTROLLER, name = "Max analog value: Right Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightY = 1;
-    @Comment(category = CONTROLLER, centered = true, name="☠ Dead Zones") public static Comment _deadZones;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.right_dead_zone", isSlider = true, min = 0.05, max = 1) public static double rightDeadZone = 0.25;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.left_dead_zone", isSlider = true, min = 0.05, max = 1) public static double leftDeadZone = 0.25;
-    @Entry(category = CONTROLLER, name = "Trigger Dead-Zone", isSlider = true, min = 0.05, max = 1) public static double triggerDeadZone = 0.1;
-    @Comment(category = CONTROLLER, centered = true, name="☆ Other Options") public static Comment _otherOptions;
-    @Entry(category = CONTROLLER, name = "Trigger button fix") public static boolean triggerFix = true;
-    @Entry(category = CONTROLLER, name = "Excluded Controllers (Name Regex)") public static List<String> excludedControllers = Lists.newArrayList(".*(Keyboard)$", ".*(Touchpad)$", ".*(Pen)$", ".*(Finger)$");
-    @Comment(category = SCREENS, centered = true, name="\uD83D\uDD27 UI Modifications") public static Comment _uiMods;
-    @Entry(category = SCREENS, name = "midnightcontrols.menu.move_chat") public static boolean moveChat = false;
-    @Entry(category = SCREENS, name = "Enable Shortcut in Controls Options") public static boolean shortcutInControls = true;
-    @Entry(category = MISC, name = "midnightcontrols.menu.virtual_keyboard_layout") public static String keyboardLayout = "en_US:qwerty";
+    // Miscellaneous
+    @Entry(category = MISC) @Hidden public static String keyboardLayout = "en_US:qwerty";
    @Entry(category = MISC, name = "Debug") public static boolean debug = false;
    @Entry(category = MISC, name = "Excluded Keybindings") public static List<String> excludedKeybindings = Lists.newArrayList("key.forward", "key.left", "key.back", "key.right", "key.jump", "key.sneak", "key.sprint", "key.inventory",
            "key.swapOffhand", "key.drop", "key.use", "key.attack", "key.chat", "key.playerlist", "key.screenshot", "key.togglePerspective", "key.smoothCamera", "key.fullscreen", "key.saveToolbarActivator", "key.loadToolbarActivator",
            "key.pickItem", "key.hotbar.1", "key.hotbar.2", "key.hotbar.3", "key.hotbar.4", "key.hotbar.5", "key.hotbar.6", "key.hotbar.7", "key.hotbar.8", "key.hotbar.9");
    @Entry(category = MISC, name = "Ring Bindings (WIP)") @Hidden public static List<String> ringBindings = new ArrayList<>();
    @Entry(category = MISC, name = "Ignored Unbound Keys") public static List<String> ignoredUnboundKeys = Lists.newArrayList("inventorytabs.key.next_tab");
+    @Comment(category = MISC, centered = true, name="☆ Other Options") public static Comment _otherOptions;
+    @Entry(category = MISC, name = "Trigger button fix") public static boolean triggerFix = true;
+    @Entry(category = MISC, name = "Excluded Controllers (Name Regex)") public static List<String> excludedControllers = Lists.newArrayList(".*(Keyboard)$", ".*(Touchpad)$", ".*(Pen)$", ".*(Finger)$");
+
+    // Init mapping tab (see #onTabInit())
+    //@Comment(category = MAPPING) @Condition(requiredModId = "thisModDoesNotExist") public static Comment this_spacer_will_never_be_visible_as_well;
+
    @Entry @Hidden public static Map<String, Map<String, String>> controllerBindingProfiles = new HashMap<>();
+
    private static Map<String, String> currentBindingProfile = new HashMap<>();
    private static Controller prevController;

+    public void onTabInit(String tabName, MidnightConfigListWidget list, MidnightConfigScreen screen) {
+        EntryInfo centeredComment = new EntryInfo(null, "midnightcontrols");
+        centeredComment.comment = new Comment() {
+            public Class<? extends Annotation> annotationType() {return null;}
+            public String category() {return "";}
+            public String name() {return "";}
+            public String url() {return "";}
+            public String requiredMod() {return "";}
+
+            @Override
+            public boolean centered() {
+                return true;
+            }
+        };
+        if (BUTTONS.equals(tabName)) {
+            InputManager.streamCategories()
+                    .sorted(Comparator.comparingInt(ButtonCategory::getPriority))
+                    .forEach(category -> {
+
+                        list.addButton(Lists.newArrayList(), Text.literal(category.getTranslatedName()), centeredComment);
+
+                        category.getBindings().forEach(binding -> {
+                            ControllerBindingButton.add(binding, list, screen);
+                        });
+                    });
+        }
+        if (MISC.equals(tabName)) {
+            TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> {
+                MidnightControlsConfig.keyboardLayout = "en_US:qwerty";
+                screen.updateList();
+            }), true).texture(Identifier.of("midnightlib","icon/reset"), 12, 12).dimension(20, 20).build();
+            resetButton.setPosition(screen.width - 205 + 150 + 25, 0);
+            ButtonWidget editButton = ButtonWidget.builder(Text.translatable(KeyboardLayoutManager.getById(MidnightControlsConfig.keyboardLayout).getTranslationKey()),
+                    button -> {
+                        MidnightControlsConfig.keyboardLayout = KeyboardLayoutManager.getNext(KeyboardLayoutManager.getById(MidnightControlsConfig.keyboardLayout)).getId();
+                        resetButton.active = !MidnightControlsConfig.keyboardLayout.equals("en_US:qwerty");
+                        button.setMessage(Text.translatable(KeyboardLayoutManager.getById(MidnightControlsConfig.keyboardLayout).getTranslationKey()));
+                    }).dimensions(screen.width - 185, 0, 150, 20).build();
+            resetButton.active = !MidnightControlsConfig.keyboardLayout.equals("en_US:qwerty");
+
+            list.addButton(List.of(editButton, resetButton), Text.translatable("midnightcontrols.menu.virtual_keyboard_layout"), new EntryInfo(null, screen.modid));
+        }
+        if (CONTROLLER.equals(tabName)) {
+            list.addButton(List.of(), Text.of("\uD83C\uDFAE General"), centeredComment);
+            ControllerSelectionButton.add(list, screen, false);
+            ControllerSelectionButton.add(list, screen, true);
+
+            ButtonWidget editButton = ButtonWidget.builder(Text.of("OPEN"),
+                    button -> {
+                        client.setScreen(new MidnightControlsSettingsScreen(client.currentScreen, false));
+                    }).dimensions(screen.width - 185, 0, 175, 20).build();
+            list.addButton(List.of(editButton), Text.of("Legacy Config UI"), new EntryInfo(null, screen.modid));
+        }
+//        if (MAPPING.equals(tabName)) {
+//            MappingsStringInputWidget.add(centeredComment, list, screen);
+//        }
+    }
+
    /**
     * Loads the configuration
     */
@@ -387,7 +481,6 @@ public class MidnightControlsConfig extends MidnightConfig {
        hudEnable = true;
        hudSide = HudSide.LEFT;
        analogMovement = true;
-        doubleTapToSprint = true;
        controllerToggleSneak = MinecraftClient.getInstance().options.getSneakToggled().getValue();
        controllerToggleSprint = MinecraftClient.getInstance().options.getSprintToggled().getValue();
        fastBlockPlacing = false;
@@ -432,17 +525,23 @@ public class MidnightControlsConfig extends MidnightConfig {
     * @return the controller name matches a type, else empty
     */
    public static @NotNull ControllerType matchControllerToType() {
-        String controller = getController().getName().toLowerCase();
-        if (controller.contains("xbox 360")) return ControllerType.XBOX_360;
-        else if (controller.contains("xbox") || controller.contains("afterglow")) return ControllerType.XBOX;
-        else if (controller.contains("steam") && GLX._getCpuInfo().contains("AMD Custom APU")) return ControllerType.STEAM_DECK;
-        else if (controller.contains("steam")) return ControllerType.STEAM_CONTROLLER;
-        else if (controller.contains("dualsense") || controller.contains("ps5")) return ControllerType.DUALSENSE;
-        else if (controller.contains("dualshock") || controller.contains("ps4")  || controller.contains("sony")) return ControllerType.DUALSHOCK;
-        else if (controller.contains("switch") || controller.contains("joy-con")  || controller.contains("wii") || controller.contains("nintendo")) return ControllerType.SWITCH;
-        else if (controller.contains("ouya")) return ControllerType.OUYA;
+        String name = getController().getName().toLowerCase();
+        if (containsAny(name, "xbox 360")) return ControllerType.XBOX_360;
+        else if (containsAny(name, "xbox") || name.contains("afterglow")) return ControllerType.XBOX;
+        else if (containsAny(name, "steam") && GLX._getCpuInfo().contains("AMD Custom APU")) return ControllerType.STEAM_DECK;
+        else if (containsAny(name, "steam")) return ControllerType.STEAM_CONTROLLER;
+        else if (containsAny(name, "dualsense", "ps5")) return ControllerType.DUALSENSE;
+        else if (containsAny(name, "dualshock", "ps4", "sony")) return ControllerType.DUALSHOCK;
+        else if (containsAny(name, "switch", "joy-con", "wii", "nintendo")) return ControllerType.SWITCH;
+        else if (containsAny(name, "ouya")) return ControllerType.OUYA;
        else return ControllerType.DEFAULT;
    }
+
+    private static boolean containsAny(String controller, String... substring) {
+        for (String s : substring) if (controller.contains(s)) return true;
+        return false;
+    }
+
    public static boolean doMixedInput() {
        return touchInControllerMode && controlsMode == ControlsMode.CONTROLLER;
    }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsModMenu.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsModMenu.java
@@ -1,28 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen;
-
-/**
- * Represents the API implementation of ModMenu for midnightcontrols.
- *
- * @author LambdAurora
- * @version 1.7.0
- * @since 1.1.0
- */
-public class MidnightControlsModMenu implements ModMenuApi {
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> new MidnightControlsSettingsScreen(parent, false);
-    }
-}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java
@@ -10,11 +10,20 @@
 package eu.midnightdust.midnightcontrols.client;

 import com.google.common.collect.ImmutableSet;
+import dev.lambdaurora.spruceui.navigation.NavigationEvent;
+import dev.lambdaurora.spruceui.screen.SpruceScreen;
+import dev.lambdaurora.spruceui.widget.AbstractSprucePressableButtonWidget;
+import dev.lambdaurora.spruceui.widget.AbstractSpruceWidget;
+import dev.lambdaurora.spruceui.widget.SpruceElement;
+import dev.lambdaurora.spruceui.widget.SpruceLabelWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceEntryListWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceParentWidget;
 import eu.midnightdust.lib.util.PlatformFunctions;
 import eu.midnightdust.midnightcontrols.client.compat.EmotecraftCompat;
 import eu.midnightdust.midnightcontrols.client.compat.LibGuiCompat;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
 import eu.midnightdust.midnightcontrols.client.compat.YACLCompat;
+import eu.midnightdust.midnightcontrols.client.gui.config.ControlsInput;
 import eu.midnightdust.midnightcontrols.client.mixin.AdvancementsScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.mixin.KeyboardAccessor;
@@ -23,6 +32,7 @@ import eu.midnightdust.midnightcontrols.client.util.InventoryUtil;
 import eu.midnightdust.midnightcontrols.client.util.storage.AxisStorage;
 import eu.midnightdust.midnightcontrols.client.util.storage.ButtonStorage;
 import net.minecraft.client.gui.Click;
+import net.minecraft.client.gui.navigation.NavigationDirection;
 import net.minecraft.client.gui.screen.option.KeybindsScreen;
 import net.minecraft.client.gui.widget.EntryListWidget;
 import net.minecraft.client.gui.widget.PressableWidget;
@@ -30,8 +40,6 @@ import net.minecraft.client.gui.widget.SliderWidget;
 import net.minecraft.client.input.KeyInput;
 import net.minecraft.client.input.MouseInput;
 import net.minecraft.entity.vehicle.BoatEntity;
-import org.thinkingstudio.obsidianui.widget.AbstractSpruceWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceEntryListWidget;
 import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
@@ -39,16 +47,9 @@ import eu.midnightdust.midnightcontrols.client.controller.InputManager;
 import eu.midnightdust.midnightcontrols.client.enums.CameraMode;
 import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import eu.midnightdust.midnightcontrols.client.touch.gui.TouchscreenOverlay;
-import eu.midnightdust.midnightcontrols.client.gui.widget.ControllerControlsWidget;
 import eu.midnightdust.midnightcontrols.client.ring.RingPage;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.util.MathUtil;
-import org.thinkingstudio.obsidianui.navigation.NavigationDirection;
-import org.thinkingstudio.obsidianui.screen.SpruceScreen;
-import org.thinkingstudio.obsidianui.widget.AbstractSprucePressableButtonWidget;
-import org.thinkingstudio.obsidianui.widget.SpruceElement;
-import org.thinkingstudio.obsidianui.widget.SpruceLabelWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceParentWidget;
 import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;
@@ -58,9 +59,6 @@ import net.minecraft.client.gui.screen.advancement.AdvancementTab;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
-import net.minecraft.client.gui.screen.ingame.MerchantScreen;
-import net.minecraft.client.gui.screen.ingame.StonecutterScreen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
 import net.minecraft.client.gui.screen.world.WorldListWidget;
 import net.minecraft.text.TranslatableTextContent;
@@ -101,7 +99,7 @@ public class MidnightInput {
    public int inventoryInteractionCooldown = 0;
    public int screenCloseCooldown = 0;

-    private ControllerControlsWidget controlsInput = null;
+    private ControlsInput controlsInput = null;

    public MidnightInput() {}

@@ -159,7 +157,7 @@ public class MidnightInput {
                    this.fetchJoystickInput(state, true, false);
                });

-        boolean allowInput = this.controlsInput == null || this.controlsInput.focusedBinding == null;
+        boolean allowInput = this.controlsInput == null || this.controlsInput.getFocusedBinding() == null;

        if (allowInput)
            InputManager.updateBindings();
@@ -170,11 +168,11 @@ public class MidnightInput {
            });
        }
        if (this.controlsInput != null && InputManager.STATES.int2ObjectEntrySet().parallelStream().map(Map.Entry::getValue).allMatch(ButtonState::isUnpressed)) {
-            if (MidnightControlsConfig.debug) MidnightControls.log("Starting MidnightInput Button Edit");
-            if (this.controlsInput.focusedBinding != null && !this.controlsInput.waiting) {
-                int[] buttons = new int[this.controlsInput.currentButtons.size()];
-                for (int i = 0; i < this.controlsInput.currentButtons.size(); i++)
-                    buttons[i] = this.controlsInput.currentButtons.get(i);
+            //if (MidnightControlsConfig.debug) MidnightControls.log("Starting MidnightInput Button Edit");
+            if (this.controlsInput.getFocusedBinding() != null && !this.controlsInput.isWaiting()) {
+                int[] buttons = new int[this.controlsInput.getCurrentButtons().size()];
+                for (int i = 0; i < this.controlsInput.getCurrentButtons().size(); i++)
+                    buttons[i] = this.controlsInput.getCurrentButtons().get(i);
                this.controlsInput.finishBindingEdit(buttons);
                this.controlsInput = null;
            }
@@ -249,11 +247,11 @@ public class MidnightInput {
        this.inventoryInteractionCooldown = 5;
    }

-    public void beginControlsInput(ControllerControlsWidget widget) {
+    public void beginControlsInput(ControlsInput widget) {
        this.controlsInput = widget;
        if (widget != null) {
-            this.controlsInput.currentButtons.clear();
-            this.controlsInput.waiting = true;
+            this.controlsInput.getCurrentButtons().clear();
+            this.controlsInput.setWaiting(true);
        }
    }

@@ -335,16 +333,17 @@ public class MidnightInput {
    }

    public void handleButton(ButtonStorage storage) {
-        if (this.controlsInput != null && this.controlsInput.focusedBinding != null) {
-            if (storage.state == ButtonState.PRESS && !this.controlsInput.currentButtons.contains(storage.button)) {
-                this.controlsInput.currentButtons.add(storage.button);
+        if (this.controlsInput != null && this.controlsInput.getFocusedBinding() != null) {
+            if (storage.state == ButtonState.PRESS && !this.controlsInput.getCurrentButtons().contains(storage.button)) {
+                this.controlsInput.getCurrentButtons().add(storage.button);

-                var buttons = new int[this.controlsInput.currentButtons.size()];
-                for (int i = 0; i < this.controlsInput.currentButtons.size(); i++)
-                    buttons[i] = this.controlsInput.currentButtons.get(i);
-                this.controlsInput.focusedBinding.setButton(buttons);
+                var buttons = new int[this.controlsInput.getCurrentButtons().size()];
+                for (int i = 0; i < this.controlsInput.getCurrentButtons().size(); i++)
+                    buttons[i] = this.controlsInput.getCurrentButtons().get(i);
+                this.controlsInput.getFocusedBinding().setButton(buttons);
+                this.controlsInput.update();

-                this.controlsInput.waiting = false;
+                this.controlsInput.setWaiting(false);
            }
            return;
        }
@@ -398,7 +397,7 @@ public class MidnightInput {
                accessor.midnightcontrols$onCursorPos(client.getWindow().getHandle(), client.mouse.getX(), client.mouse.getY());
                switch (storage.state) {
                    // Button pressed
-                    case PRESS -> accessor.midnightcontrols$onMouseButton(client.getWindow().getHandle(), new MouseInput(GLFW_MOUSE_BUTTON_LEFT, 1), 0);
+                    case PRESS -> accessor.midnightcontrols$onMouseButton(client.getWindow().getHandle(), new MouseInput(GLFW_MOUSE_BUTTON_LEFT, 0), 1);
                    case RELEASE -> { // Button released
                        accessor.midnightcontrols$onMouseButton(client.getWindow().getHandle(), new MouseInput(GLFW_MOUSE_BUTTON_LEFT, 0), 0);
                        client.currentScreen.setDragging(false);
@@ -520,17 +519,18 @@ public class MidnightInput {
        // @TODO allow rebinding to left stick
        int preferredAxis = true ? GLFW_GAMEPAD_AXIS_RIGHT_Y : GLFW_GAMEPAD_AXIS_LEFT_Y;

-        if (this.controlsInput != null && this.controlsInput.focusedBinding != null) {
-            if (storage.buttonState != ButtonState.NONE && !this.controlsInput.currentButtons.contains(storage.getButtonId(storage.buttonState == ButtonState.PRESS))) {
+        if (this.controlsInput != null && this.controlsInput.getFocusedBinding() != null) {
+            if (storage.buttonState != ButtonState.NONE && !this.controlsInput.getCurrentButtons().contains(storage.getButtonId(storage.buttonState == ButtonState.PRESS))) {

-                this.controlsInput.currentButtons.add(storage.getButtonId(storage.buttonState == ButtonState.PRESS));
+                this.controlsInput.getCurrentButtons().add(storage.getButtonId(storage.buttonState == ButtonState.PRESS));

-                int[] buttons = new int[this.controlsInput.currentButtons.size()];
-                for (int i = 0; i < this.controlsInput.currentButtons.size(); i++)
-                    buttons[i] = this.controlsInput.currentButtons.get(i);
-                this.controlsInput.focusedBinding.setButton(buttons);
+                int[] buttons = new int[this.controlsInput.getCurrentButtons().size()];
+                for (int i = 0; i < this.controlsInput.getCurrentButtons().size(); i++)
+                    buttons[i] = this.controlsInput.getCurrentButtons().get(i);
+                this.controlsInput.getFocusedBinding().setButton(buttons);
+                this.controlsInput.update();

-                this.controlsInput.waiting = false;
+                this.controlsInput.setWaiting(false);
            }
            return true;
        } else if (storage.absValue >= storage.deadZone) {
@@ -604,7 +604,7 @@ public class MidnightInput {
                    .map(element -> (EntryListWidget<?>) element)
                    .filter(element -> element.getType().isFocused())
                    .anyMatch(element -> {
-                        element.mouseScrolled(0.0, 0.0, 0, -value);
+                        element.mouseScrolled(0.0, 0.0, 0, -value / 30);
                        return true;
                    });
    }
@@ -653,7 +653,7 @@ public class MidnightInput {
     */
    private boolean handleLeftRight(@NotNull Screen screen, boolean right) {
        if (screen instanceof SpruceScreen spruceScreen) {
-            spruceScreen.onNavigation(right ? NavigationDirection.RIGHT : NavigationDirection.LEFT, false);
+            spruceScreen.onNavigation(new NavigationEvent(right ? NavigationDirection.RIGHT : NavigationDirection.LEFT, false, false));
            this.actionGuiCooldown = 5;
            return false;
        }
@@ -673,7 +673,7 @@ public class MidnightInput {
            case SpruceElement spruceElement -> {
                if (spruceElement.requiresCursor())
                    return true;
-                return !spruceElement.onNavigation(right ? NavigationDirection.RIGHT : NavigationDirection.LEFT, false);
+                return !spruceElement.onNavigation(new NavigationEvent(right ? NavigationDirection.RIGHT : NavigationDirection.LEFT, false, false));
            }
            case SliderWidget slider -> {
                if (slider.active) {
@@ -768,7 +768,7 @@ public class MidnightInput {
        if (!isScreenInteractive(screen) && !screen.getClass().getCanonicalName().contains("me.jellysquid.mods.sodium.client.gui")) return false;
        try {
            if (screen instanceof SpruceScreen spruceScreen) {
-                if (spruceScreen.onNavigation(direction, false)) {
+                if (spruceScreen.onNavigation(new NavigationEvent(direction, false, false))) {
                    this.actionGuiCooldown = 5;
                }
                return true;
@@ -819,6 +819,6 @@ public class MidnightInput {
        ((KeyboardAccessor) client.keyboard).midnightcontrols$onKey(client.getWindow().getHandle(), 1, new KeyInput(key, 0, 0));
    }
    public void pressKeyboardKey(Screen screen, int key) {
-        screen.keyPressed(new KeyInput(key, 0, 1));
+        screen.keyPressed(new KeyInput(key, 0, 0));
    }
 }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EmotecraftCompat.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EmotecraftCompat.java
@@ -29,7 +29,7 @@ public class EmotecraftCompat {
                InputManager.INPUT_MANAGER.updateMousePosition(client);

                if (stickReleased) {
-                    ((MouseAccessor) client.mouse).midnightcontrols$onMouseButton(client.getWindow().getHandle(), new MouseInput(GLFW.GLFW_MOUSE_BUTTON_LEFT, GLFW.GLFW_PRESS), 0);
+                    ((MouseAccessor) client.mouse).midnightcontrols$onMouseButton(client.getWindow().getHandle(), new MouseInput(GLFW.GLFW_MOUSE_BUTTON_LEFT, 0), GLFW.GLFW_PRESS);
                    prevIndex = -1;
                }
                else prevIndex = index;
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonBinding.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonBinding.java
@@ -77,7 +77,7 @@ public class ButtonBinding {
    public static final ButtonBinding SCREENSHOT = new Builder("screenshot").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_A)
            .action(InputHandlers::handleScreenshot).cooldown().register();
    public static final ButtonBinding DEBUG_SCREEN = new Builder("debug_screen").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_B)
-            .action((client,binding,value,action) -> {if (action == ButtonState.PRESS) client.inGameHud.getDebugHud().toggleRenderingChart(); return true;}).cooldown().register();
+            .action((client,binding,value,action) -> {if (action == ButtonState.PRESS) client.debugHudEntryList.setF3Enabled(!client.debugHudEntryList.isF3Enabled()); return true;}).cooldown().register();
    public static final ButtonBinding SLOT_DOWN = new Builder("slot_down").buttons(GLFW_GAMEPAD_BUTTON_DPAD_DOWN)
            .action(InputHandlers.handleInventorySlotPad(1)).onlyInInventory().cooldown().register();
    public static final ButtonBinding SLOT_LEFT = new Builder("slot_left").buttons(GLFW_GAMEPAD_BUTTON_DPAD_LEFT)
@@ -413,7 +413,7 @@ public class ButtonBinding {
    }

    static {
-        MOVEMENT_CATEGORY = InputManager.registerDefaultCategory("key.categories.movement", category -> category.registerAllBindings(
+        MOVEMENT_CATEGORY = InputManager.registerDefaultCategory("movement", category -> category.registerAllBindings(
                ButtonBinding.FORWARD,
                ButtonBinding.BACK,
                ButtonBinding.LEFT,
@@ -421,12 +421,12 @@ public class ButtonBinding {
                ButtonBinding.JUMP,
                ButtonBinding.SNEAK,
                ButtonBinding.SPRINT));
-        GAMEPLAY_CATEGORY = InputManager.registerDefaultCategory("key.categories.gameplay", category -> category.registerAllBindings(
+        GAMEPLAY_CATEGORY = InputManager.registerDefaultCategory("gameplay", category -> category.registerAllBindings(
                ButtonBinding.ATTACK,
                ButtonBinding.PICK_BLOCK,
                ButtonBinding.USE
        ));
-        INVENTORY_CATEGORY = InputManager.registerDefaultCategory("key.categories.inventory", category -> category.registerAllBindings(
+        INVENTORY_CATEGORY = InputManager.registerDefaultCategory("inventory", category -> category.registerAllBindings(
                ButtonBinding.EXIT,
                ButtonBinding.DROP_ITEM,
                ButtonBinding.HOTBAR_LEFT,
@@ -445,9 +445,9 @@ public class ButtonBinding {
                ButtonBinding.SLOT_LEFT,
                ButtonBinding.SLOT_RIGHT
        ));
-        MULTIPLAYER_CATEGORY = InputManager.registerDefaultCategory("key.categories.multiplayer",
+        MULTIPLAYER_CATEGORY = InputManager.registerDefaultCategory("multiplayer",
                category -> category.registerAllBindings(ButtonBinding.CHAT, ButtonBinding.PLAYER_LIST));
-        MISC_CATEGORY = InputManager.registerDefaultCategory("key.categories.misc", category -> category.registerAllBindings(
+        MISC_CATEGORY = InputManager.registerDefaultCategory("misc", category -> category.registerAllBindings(
                ButtonBinding.SCREENSHOT,
                ButtonBinding.TOGGLE_PERSPECTIVE,
                ButtonBinding.PAUSE_GAME,
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonCategory.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonCategory.java
@@ -38,15 +38,6 @@ public class ButtonCategory {
    public ButtonCategory(@NotNull Identifier id) {
        this(id, 100);
    }
-    @Deprecated
-    public ButtonCategory(@NotNull org.aperlambda.lambdacommon.Identifier id, int priority) {
-        this(Identifier.of(id.getNamespace(), id.getName()), priority);
-    }
-
-    @Deprecated
-    public ButtonCategory(@NotNull org.aperlambda.lambdacommon.Identifier id) {
-        this(id, 100);
-    }

    public void registerBinding(@NotNull ButtonBinding binding) {
        if (this.bindings.contains(binding))
@@ -74,15 +65,12 @@ public class ButtonCategory {
    /**
     * Gets the translated name of this category.
     * <p>
-     * The translation key should be `modid.identifier_name`.
+     * The translation key should be `key.category.modid.identifier_name`.
     *
     * @return the translated name
     */
    public @NotNull String getTranslatedName() {
-        if (this.id.getNamespace().equals("minecraft"))
-            return I18n.translate(this.id.getPath());
-        else
-            return I18n.translate(this.id.getNamespace() + "." + this.id.getPath());
+        return I18n.translate("key.category.%s.%s".formatted(id.getNamespace(), id.getPath()));
    }

    /**
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java
@@ -94,9 +94,9 @@ public class InputHandlers {
                    nextTab = tabs.size() - 1;
                else if (nextTab >= tabs.size())
                    nextTab = 0;
-                currentTab.setToggled(false);
+                currentTab.active = false;
                recipeBookAccessor.setCurrentTab(currentTab = tabs.get(nextTab));
-                currentTab.setToggled(true);
+                currentTab.active = true;
                recipeBookScreen.refreshRecipeBook();
                return true;
            } else if (client.currentScreen instanceof AdvancementsScreenAccessor screen) {
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputManager.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputManager.java
@@ -420,18 +420,9 @@ public class InputManager {
     * @param code the code
     * @param category the category of the key binding
     * @return the key binding
-     * @see #makeKeyBinding(Identifier, InputUtil.Type, int, String)
+     * @see #makeKeyBinding(Identifier, InputUtil.Type, int, net.minecraft.client.option.KeyBinding.Category)
     */
-    public static @NotNull KeyBinding makeKeyBinding(@NotNull Identifier id, InputUtil.Type type, int code, @NotNull String category) {
-        return new KeyBinding(String.format("key.%s.%s", id.getNamespace(), id.getPath()), type, code, new KeyBinding.Category(validVanillaId(category)));
-    }
-
-    private static Identifier validVanillaId(String path) {
-        for(int i = 0; i < path.length(); ++i) {
-            if (!Identifier.isPathCharacterValid(path.charAt(i))) {
-                path = path.replace(path.charAt(i), '_');
-            }
-        }
-        return Identifier.ofVanilla(path);
+    public static @NotNull KeyBinding makeKeyBinding(@NotNull Identifier id, InputUtil.Type type, int code, @NotNull KeyBinding.Category category) {
+        return new KeyBinding(String.format("key.%s.%s", id.getNamespace(), id.getPath()), type, code, category);
    }
 }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/PressAction.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/PressAction.java
@@ -28,7 +28,7 @@ public interface PressAction {
        if (action == ButtonState.REPEAT || client.currentScreen != null)
            return false;
        button.asKeyBinding().ifPresent(binding -> {
-            if (binding instanceof StickyKeyBinding)
+            if (binding instanceof StickyKeyBinding && binding != client.options.attackKey) // TODO: Properly fix sticky keys so the attack key doesn't need to be a hardcoded exception
                binding.setPressed(button.isPressed());
            else
                ((KeyBindingAccessor) binding).midnightcontrols$handlePressState(button.isPressed());
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MappingsStringInputWidget.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MappingsStringInputWidget.java
@@ -9,16 +9,16 @@

 package eu.midnightdust.midnightcontrols.client.gui;

+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.option.SpruceOption;
+import dev.lambdaurora.spruceui.option.SpruceSimpleActionOption;
+import dev.lambdaurora.spruceui.render.SpruceGuiGraphics;
+import dev.lambdaurora.spruceui.widget.container.SpruceContainerWidget;
+import dev.lambdaurora.spruceui.widget.text.SpruceTextAreaWidget;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.util.math.MatrixStack;
-import org.thinkingstudio.obsidianui.Position;
-import org.thinkingstudio.obsidianui.option.SpruceOption;
-import org.thinkingstudio.obsidianui.option.SpruceSimpleActionOption;
-import org.thinkingstudio.obsidianui.widget.container.SpruceContainerWidget;
-import org.thinkingstudio.obsidianui.widget.text.SpruceTextAreaWidget;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.text.Text;

@@ -105,9 +105,9 @@ public class MappingsStringInputWidget extends SpruceContainerWidget {
    }

    @Override
-    public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+    public void renderWidget(SpruceGuiGraphics context, int mouseX, int mouseY, float delta) {
        super.renderWidget(context, mouseX, mouseY, delta);
-        context.drawCenteredTextWithShadow(this.client.textRenderer, Text.translatable("midnightcontrols.menu.multiple_mapping_tip"), this.textArea.getX() + this.textArea.getWidth() / 2, this.textArea.getY() + this.textArea.getHeight() - 12, 0xFF888888);
-        context.drawCenteredTextWithShadow(this.client.textRenderer, Text.translatable("midnightcontrols.menu.current_controller_guid", MidnightControlsConfig.getController().getGuid()), this.textArea.getX() + this.textArea.getWidth() / 2, this.height - 21, 0xFFFFFFFF);
+        context.vanilla().drawCenteredTextWithShadow(this.client.textRenderer, Text.translatable("midnightcontrols.menu.multiple_mapping_tip"), this.textArea.getX() + this.textArea.getWidth() / 2, this.textArea.getY() + this.textArea.getHeight() - 12, 0xFF888888);
+        context.vanilla().drawCenteredTextWithShadow(this.client.textRenderer, Text.translatable("midnightcontrols.menu.current_controller_guid", MidnightControlsConfig.getController().getGuid()), this.textArea.getX() + this.textArea.getWidth() / 2, this.height - 21, 0xFFFFFFFF);
    }
 }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java
@@ -17,7 +17,6 @@ import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import net.minecraft.client.render.RenderTickCounter;
 import org.joml.Matrix3x2fStack;
-import org.thinkingstudio.obsidianui.hud.Hud;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.resource.language.I18n;
@@ -28,8 +27,6 @@ import net.minecraft.util.hit.HitResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

-import static eu.midnightdust.midnightcontrols.MidnightControls.id;
-
 /**
 * Represents the midnightcontrols HUD.
 *
@@ -37,7 +34,7 @@ import static eu.midnightdust.midnightcontrols.MidnightControls.id;
 * @version 1.7.0
 * @since 1.0.0
 */
-public class MidnightControlsHud extends Hud {
+public class MidnightControlsHud {
    private MinecraftClient client = MinecraftClient.getInstance();
    private int attackWidth = 0;
    private int attackButtonWidth = 0;
@@ -54,15 +51,15 @@ public class MidnightControlsHud extends Hud {
    private String placeAction = "";
    private int ticksDisplayedCrosshair = 0;
    private static boolean isCrammed = false;
+    public static boolean isVisible = false;
+    private static final MidnightControlsHud INSTANCE = new MidnightControlsHud();

-    public MidnightControlsHud() {
-        super(id("hud/button_indicator"));
+    public static MidnightControlsHud getInstance() {
+        return INSTANCE;
    }

-    @Override
-    public void init(@NotNull MinecraftClient client, int screenWidth, int screenHeight) {
-        this.client = MinecraftClient.getInstance();
-        super.init(client, screenWidth, screenHeight);
+    public void init() {
+        this.client = MidnightControlsClient.client;
        this.inventoryWidth = this.width(ButtonBinding.INVENTORY);
        this.inventoryButtonWidth = MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.INVENTORY);
        this.swapHandsWidth = this.width(ButtonBinding.SWAP_HANDS);
@@ -77,9 +74,8 @@ public class MidnightControlsHud extends Hud {
    /**
     * Renders the MidnightControls HUD.
     */
-    @Override
    public void render(DrawContext context, RenderTickCounter tickCounter) {
-        if (this.client == null) return;
+        if (this.client == null || !isVisible) return;
        if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && this.client.currentScreen == null) {
            isCrammed = client.getWindow().getScaledWidth() < 520;
            int y = bottom(2);
@@ -195,10 +191,8 @@ public class MidnightControlsHud extends Hud {
        if (!ButtonBinding.ATTACK.isNotBound()) this.drawTip(context, currentX, y, this.attackAction, this.attackWidth != 0);
    }

-    @Override
    public void tick() {
        if (this.client == null) return;
-        super.tick();
        if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER) {
            if (this.client.crosshairTarget == null)
                return;
@@ -255,7 +249,7 @@ public class MidnightControlsHud extends Hud {
                placeAction = customUseAction;

            this.placeAction = placeAction;
-            this.showSwapHandsAction = !this.client.player.getMainHandStack().isEmpty() || !this.client.player.getOffHandStack().isEmpty();
+            this.showSwapHandsAction = this.client.player != null && (!this.client.player.getMainHandStack().isEmpty() || !this.client.player.getOffHandStack().isEmpty());

            // Cache the "Use" tip width.
            if (this.placeAction.isEmpty())
@@ -265,11 +259,6 @@ public class MidnightControlsHud extends Hud {
        }
    }

-    @Override
-    public boolean hasTicks() {
-        return true;
-    }
-
    private int bottom(int y) {
        return (this.client.getWindow().getScaledHeight() - y - MidnightControlsRenderer.ICON_SIZE);
    }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java
@@ -9,45 +9,18 @@

 package eu.midnightdust.midnightcontrols.client.gui;

-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.textures.GpuTextureView;
-import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.client.enums.ControllerType;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.MidnightInput;
-import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
-import eu.midnightdust.midnightcontrols.client.enums.VirtualMouseSkin;
-import eu.midnightdust.midnightcontrols.client.gui.render.UnalignedTexturedQuadGuiElementRenderState;
-import eu.midnightdust.midnightcontrols.client.mixin.DrawContextAccessor;
-import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.render.state.TexturedQuadGuiElementRenderState;
-import net.minecraft.client.render.*;
 import net.minecraft.client.resource.language.I18n;
-import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.TextureSetup;
-import net.minecraft.client.util.SpriteIdentifier;
-import net.minecraft.screen.slot.Slot;
-import net.minecraft.text.Text;
-import net.minecraft.util.Atlases;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.ColorHelper;
 import org.jetbrains.annotations.NotNull;
-import org.joml.Matrix3x2f;
-import org.joml.Matrix4f;
 import org.lwjgl.glfw.GLFW;

-import java.util.function.Function;
-
-import static eu.midnightdust.midnightcontrols.MidnightControls.id;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-
 /**
 * Represents the midnightcontrols renderer.
 *
@@ -213,69 +186,6 @@ public class MidnightControlsRenderer {
    private static int getButtonTipWidth(@NotNull String action, @NotNull TextRenderer textRenderer) {
        return 15 + 5 + textRenderer.getWidth(action);
    }
-    public static void renderWaylandCursor(@NotNull DrawContext context, @NotNull MinecraftClient client) {
-        if (MidnightControlsConfig.virtualMouse || client.currentScreen == null || MidnightControlsConfig.controlsMode != ControlsMode.CONTROLLER) return;
-
-        float mouseX = (float) client.mouse.getX() * client.getWindow().getScaledWidth() / client.getWindow().getWidth();
-        float mouseY = (float) client.mouse.getY() * client.getWindow().getScaledHeight() / client.getWindow().getHeight();
-
-        try {
-            Identifier spritePath = MidnightControlsClient.WAYLAND_CURSOR_TEXTURE_LIGHT;
-            if (MidnightControlsConfig.virtualMouseSkin == VirtualMouseSkin.DEFAULT_DARK || MidnightControlsConfig.virtualMouseSkin == VirtualMouseSkin.SECOND_DARK)
-                spritePath = MidnightControlsClient.WAYLAND_CURSOR_TEXTURE_DARK;
-
-            Sprite sprite = client.getAtlasManager().getAtlasTexture(Atlases.GUI).getSprite(spritePath);
-            drawUnalignedTexturedQuad(RenderPipelines.GUI_TEXTURED, sprite.getAtlasId(), context, mouseX, mouseX + 8, mouseY, mouseY + 8, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV());
-        } catch (IllegalStateException ignored) {}
-    }
-
-    public static void renderVirtualCursor(@NotNull DrawContext context, @NotNull MinecraftClient client) {
-        if (!MidnightControlsConfig.virtualMouse || (client.currentScreen == null
-                || MidnightInput.isScreenInteractive(client.currentScreen)))
-            return;
-
-        float mouseX = (float) client.mouse.getX() * client.getWindow().getScaledWidth() / client.getWindow().getWidth();
-        float mouseY = (float) client.mouse.getY() * client.getWindow().getScaledHeight() / client.getWindow().getHeight();
-
-        boolean hoverSlot = false;
-
-        if (client.currentScreen instanceof HandledScreenAccessor inventoryScreen) {
-            int guiLeft = inventoryScreen.getX();
-            int guiTop = inventoryScreen.getY();
-
-            Slot slot = inventoryScreen.midnightcontrols$getSlotAt(mouseX, mouseY);
-
-            if (slot != null) {
-                mouseX = guiLeft + slot.x;
-                mouseY = guiTop + slot.y;
-                hoverSlot = true;
-            }
-        }
-
-        if (!hoverSlot && client.currentScreen != null) {
-            var slot = MidnightControlsCompat.getSlotAt(client.currentScreen, (int) mouseX, (int) mouseY);
-
-            if (slot != null) {
-                mouseX = slot.x();
-                mouseY = slot.y();
-                hoverSlot = true;
-            }
-        }
-
-        if (!hoverSlot) {
-            mouseX -= 8;
-            mouseY -= 8;
-        }
-
-        try {
-            Sprite sprite = client.getAtlasManager().getAtlasTexture(Atlases.GUI).getSprite(id(MidnightControlsConfig.virtualMouseSkin.getSpritePath() + (hoverSlot ? "_slot" : "")));
-            drawUnalignedTexturedQuad(RenderPipelines.GUI_TEXTURED, sprite.getAtlasId(), context, mouseX, mouseX + 16, mouseY, mouseY + 16, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV());
-        } catch (IllegalStateException ignored) {}
-    }
-    private static void drawUnalignedTexturedQuad(RenderPipeline pipeline, Identifier texture, DrawContext context, float x1, float x2, float y1, float y2, float u1, float u2, float v1, float v2) {
-        DrawContextAccessor accessor = (DrawContextAccessor) context;
-        accessor.getState().addSimpleElement(new UnalignedTexturedQuadGuiElementRenderState(pipeline, TextureSetup.withoutGlTexture(client.getTextureManager().getTexture(texture).getGlTextureView()), new Matrix3x2f(context.getMatrices()), x1, y1, x2, y2, u1, u2, v1, v2, 0xffffffff, accessor.getScissorStack().peekLast()));
-    }

    public record ButtonSize(int length, int height) {
    }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java
@@ -9,26 +9,28 @@

 package eu.midnightdust.midnightcontrols.client.gui;

+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.SpruceTexts;
+import dev.lambdaurora.spruceui.background.Background;
+import dev.lambdaurora.spruceui.option.*;
+import dev.lambdaurora.spruceui.render.SpruceGuiGraphics;
+import dev.lambdaurora.spruceui.screen.SpruceScreen;
+import dev.lambdaurora.spruceui.tooltip.TooltipData;
+import dev.lambdaurora.spruceui.widget.AbstractSpruceWidget;
+import dev.lambdaurora.spruceui.widget.SpruceLabelWidget;
+import dev.lambdaurora.spruceui.widget.SpruceWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceContainerWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceOptionListWidget;
+import dev.lambdaurora.spruceui.widget.container.tabbed.SpruceTabbedWidget;
 import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil;
 import eu.midnightdust.midnightcontrols.client.virtualkeyboard.KeyboardLayoutManager;
 import net.minecraft.util.math.ColorHelper;
-import org.thinkingstudio.obsidianui.background.Background;
-import org.thinkingstudio.obsidianui.widget.SpruceWidget;
 import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import eu.midnightdust.midnightcontrols.client.gui.widget.ControllerControlsWidget;
-import org.thinkingstudio.obsidianui.Position;
-import org.thinkingstudio.obsidianui.SpruceTexts;
-import org.thinkingstudio.obsidianui.option.*;
-import org.thinkingstudio.obsidianui.screen.SpruceScreen;
-import org.thinkingstudio.obsidianui.widget.AbstractSpruceWidget;
-import org.thinkingstudio.obsidianui.widget.SpruceLabelWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceContainerWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceOptionListWidget;
-import org.thinkingstudio.obsidianui.widget.container.tabbed.SpruceTabbedWidget;
 import eu.midnightdust.midnightcontrols.packet.ControlsModePayload;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
@@ -61,10 +63,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
    private final SpruceOption virtualKeyboardOption;
    private final SpruceOption hideCursorOption;
    private final SpruceOption resetOption;
-    private final SpruceOption advancedConfigOption;
    // Gameplay options
    private final SpruceOption analogMovementOption;
-    private final SpruceOption doubleTapToSprintOption;
    private final SpruceOption autoJumpOption;
    private final SpruceOption controllerToggleSneakOption;
    private final SpruceOption controllerToggleSprintOption;
@@ -100,7 +100,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                            return option.getDisplayText(Text.literal(controllerName).formatted(Formatting.GOLD));
                        else
                            return option.getDisplayText(Text.literal(controllerName));
-                    }, null);
+                    }, TooltipData.EMPTY);
    private final SpruceOption secondControllerOption = new SpruceCyclingOption("midnightcontrols.menu.controller2",
            amount -> {
                int id = MidnightControlsConfig.getSecondController().map(Controller::id).orElse(-1);
@@ -119,7 +119,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                else
                    return option.getDisplayText(Text.literal(controllerName));
            }).orElse(option.getDisplayText(SpruceTexts.OPTIONS_OFF.copyContentOnly().formatted(Formatting.RED))),
-            Text.translatable("midnightcontrols.menu.controller2.tooltip"));
+            TooltipData.builder().text(Text.translatable("midnightcontrols.menu.controller2.tooltip")).build());
    private final SpruceOption unfocusedInputOption;
    private final SpruceOption invertsRightXAxis;
    private final SpruceOption invertsRightYAxis;
@@ -141,14 +141,14 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                    },
                    option -> {
                        return option.getDisplayText(Text.translatable(KeyboardLayoutManager.getById(MidnightControlsConfig.keyboardLayout).getTranslationKey()));
-                    }, null);
+                    }, TooltipData.EMPTY);

    private static SpruceOption maxAnalogValueOption(String key, int axis) {
        return new SpruceDoubleOption(key, .25f, 1.f, 0.05f,
                () -> MidnightControlsConfig.getAxisMaxValue(axis),
                newValue -> MidnightControlsConfig.setAxisMaxValue(axis, newValue),
                option -> option.getDisplayText(Text.literal(String.format("%.2f", option.get()))),
-                Text.translatable(key.concat(".tooltip"))
+                TooltipData.builder().text(Text.translatable(key.concat(".tooltip"))).build()
        );
    }
    // Touch options
@@ -163,7 +163,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
            .append(Text.literal(GAMEPAD_TOOL_URL).formatted(Formatting.GOLD))
            .append("),");

-    private static int searchNextAvailableController(int newId, boolean allowNone) {
+    public static int searchNextAvailableController(int newId, boolean allowNone) {
        if ((allowNone && newId == -1) || newId == 0) return newId;

        Controller candidate = Controller.byId(newId);
@@ -194,80 +194,76 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                        NetworkUtil.sendPayloadC2S(new ControlsModePayload(next.getName()));
                    }
                }, option -> option.getDisplayText(Text.translatable(MidnightControlsConfig.controlsMode.getTranslationKey())),
-                Text.translatable("midnightcontrols.menu.controls_mode.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.controls_mode.tooltip")).build());
        this.autoSwitchModeOption = new SpruceToggleBooleanOption("midnightcontrols.menu.auto_switch_mode", () -> MidnightControlsConfig.autoSwitchMode,
-                value -> MidnightControlsConfig.autoSwitchMode = value, Text.translatable("midnightcontrols.menu.auto_switch_mode.tooltip"));
+                value -> MidnightControlsConfig.autoSwitchMode = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.auto_switch_mode.tooltip")).build());
        this.rotationSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.rotation_speed", 0.0, 100.0, .5f,
                () -> MidnightControlsConfig.rotationSpeed,
                value -> MidnightControlsConfig.rotationSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
-                Text.translatable("midnightcontrols.menu.rotation_speed.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.rotation_speed.tooltip")).build());
        this.yAxisRotationSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.y_axis_rotation_speed", 0.0, 100.0, .5f,
                () -> MidnightControlsConfig.yAxisRotationSpeed,
                value -> MidnightControlsConfig.yAxisRotationSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
-                Text.translatable("midnightcontrols.menu.y_axis_rotation_speed.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.y_axis_rotation_speed.tooltip")).build());
        this.mouseSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.mouse_speed", 0.0, 150.0, .5f,
                () -> MidnightControlsConfig.mouseSpeed,
                value -> MidnightControlsConfig.mouseSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
-                Text.translatable("midnightcontrols.menu.mouse_speed.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.mouse_speed.tooltip")).build());
        this.joystickAsMouseOption = new SpruceToggleBooleanOption("midnightcontrols.menu.joystick_as_mouse",
                () -> MidnightControlsConfig.joystickAsMouse, value -> MidnightControlsConfig.joystickAsMouse = value,
-                Text.translatable("midnightcontrols.menu.joystick_as_mouse.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.joystick_as_mouse.tooltip")).build());
        this.eyeTrackingAsMouseOption = new SpruceToggleBooleanOption("midnightcontrols.menu.eye_tracker_as_mouse",
                () -> MidnightControlsConfig.eyeTrackerAsMouse, value -> MidnightControlsConfig.eyeTrackerAsMouse = value,
-                Text.translatable("midnightcontrols.menu.eye_tracker_as_mouse.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.eye_tracker_as_mouse.tooltip")).build());
        this.eyeTrackingDeadzone = new SpruceDoubleInputOption("midnightcontrols.menu.eye_tracker_deadzone",
                () -> MidnightControlsConfig.eyeTrackerDeadzone, value -> MidnightControlsConfig.eyeTrackerDeadzone = value,
-                Text.translatable("midnightcontrols.menu.eye_tracker_deadzone.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.eye_tracker_deadzone.tooltip")).build());
        this.resetOption = SpruceSimpleActionOption.reset(btn -> {
            MidnightControlsConfig.reset();
            var client = MinecraftClient.getInstance();
-            this.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
+            this.init(client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
        });
-        this.advancedConfigOption = SpruceSimpleActionOption.of("midnightcontrols.midnightconfig.title", button -> client.setScreen(MidnightControlsConfig.getScreen(this, MidnightControlsConstants.NAMESPACE)));
        // Gameplay options
        this.analogMovementOption = new SpruceToggleBooleanOption("midnightcontrols.menu.analog_movement",
                () -> MidnightControlsConfig.analogMovement, value -> MidnightControlsConfig.analogMovement = value,
-                Text.translatable("midnightcontrols.menu.analog_movement.tooltip"));
-        this.doubleTapToSprintOption = new SpruceToggleBooleanOption("midnightcontrols.menu.double_tap_to_sprint",
-                () -> MidnightControlsConfig.doubleTapToSprint, value -> MidnightControlsConfig.doubleTapToSprint = value,
-                Text.translatable("midnightcontrols.menu.double_tap_to_sprint.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.analog_movement.tooltip")).build());
        this.autoJumpOption = new SpruceToggleBooleanOption("options.autoJump",
                () -> this.client.options.getAutoJump().getValue(),
                newValue -> this.client.options.getAutoJump().setValue(newValue),
-                null);
+                TooltipData.EMPTY);
        this.controllerToggleSneakOption = new SpruceToggleBooleanOption("midnightcontrols.menu.controller_toggle_sneak",
                () -> MidnightControlsConfig.controllerToggleSneak, value -> MidnightControlsConfig.controllerToggleSneak = value,
-                null);
+                TooltipData.EMPTY);
        this.controllerToggleSprintOption = new SpruceToggleBooleanOption("midnightcontrols.menu.controller_toggle_sprint",
                () -> MidnightControlsConfig.controllerToggleSprint, value -> MidnightControlsConfig.controllerToggleSprint = value,
-                null);
+                TooltipData.EMPTY);
        this.fastBlockPlacingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.fast_block_placing", () -> MidnightControlsConfig.fastBlockPlacing,
-                value -> MidnightControlsConfig.fastBlockPlacing = value, Text.translatable("midnightcontrols.menu.fast_block_placing.tooltip"));
+                value -> MidnightControlsConfig.fastBlockPlacing = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.fast_block_placing.tooltip")).build());
        this.frontBlockPlacingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.reacharound.horizontal", () -> MidnightControlsConfig.horizontalReacharound,
-                value -> MidnightControlsConfig.horizontalReacharound = value, Text.translatable("midnightcontrols.menu.reacharound.horizontal.tooltip"));
+                value -> MidnightControlsConfig.horizontalReacharound = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.reacharound.horizontal.tooltip")).build());
        this.verticalReacharoundOption = new SpruceToggleBooleanOption("midnightcontrols.menu.reacharound.vertical", () -> MidnightControlsConfig.verticalReacharound,
-                value -> MidnightControlsConfig.verticalReacharound = value, Text.translatable("midnightcontrols.menu.reacharound.vertical.tooltip"));
+                value -> MidnightControlsConfig.verticalReacharound = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.reacharound.vertical.tooltip")).build());
        this.flyDriftingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.fly_drifting", () -> MidnightControlsConfig.flyDrifting,
-                value -> MidnightControlsConfig.flyDrifting = value, Text.translatable("midnightcontrols.menu.fly_drifting.tooltip"));
+                value -> MidnightControlsConfig.flyDrifting = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.fly_drifting.tooltip")).build());
        this.flyVerticalDriftingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.fly_drifting_vertical", () -> MidnightControlsConfig.verticalFlyDrifting,
-                value -> MidnightControlsConfig.verticalFlyDrifting = value, Text.translatable("midnightcontrols.menu.fly_drifting_vertical.tooltip"));
+                value -> MidnightControlsConfig.verticalFlyDrifting = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.fly_drifting_vertical.tooltip")).build());
        // Appearance options
        this.controllerTypeOption = new SpruceCyclingOption("midnightcontrols.menu.controller_type",
                amount -> MidnightControlsConfig.controllerType = MidnightControlsConfig.controllerType.next(),
                option -> option.getDisplayText(MidnightControlsConfig.controllerType.getTranslatedText()),
-                Text.translatable("midnightcontrols.menu.controller_type.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.controller_type.tooltip")).build());
        this.virtualMouseSkinOption = new SpruceCyclingOption("midnightcontrols.menu.virtual_mouse.skin",
                amount -> MidnightControlsConfig.virtualMouseSkin = MidnightControlsConfig.virtualMouseSkin.next(),
                option -> option.getDisplayText(MidnightControlsConfig.virtualMouseSkin.getTranslatedText()),
-                null);
+                TooltipData.EMPTY);
        this.hudEnableOption = new SpruceToggleBooleanOption("midnightcontrols.menu.hud_enable", () -> MidnightControlsConfig.hudEnable,
-                MidnightControlsClient::setHudEnabled, Text.translatable("midnightcontrols.menu.hud_enable.tooltip"));
+                MidnightControlsClient::setHudEnabled, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.hud_enable.tooltip")).build());
        this.hudSideOption = new SpruceCyclingOption("midnightcontrols.menu.hud_side",
                amount -> MidnightControlsConfig.hudSide = MidnightControlsConfig.hudSide.next(),
                option -> option.getDisplayText(MidnightControlsConfig.hudSide.getTranslatedText()),
-                Text.translatable("midnightcontrols.menu.hud_side.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.hud_side.tooltip")).build());
        this.moveChatOption = new SpruceToggleBooleanOption("midnightcontrols.menu.move_chat", () -> MidnightControlsConfig.moveChat,
-                value -> MidnightControlsConfig.moveChat = value, Text.translatable("midnightcontrols.menu.move_chat.tooltip"));
+                value -> MidnightControlsConfig.moveChat = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.move_chat.tooltip")).build());
        // Controller options
        this.toggleControllerProfileOption = new SpruceToggleBooleanOption("midnightcontrols.menu.separate_controller_profile", () -> MidnightControlsConfig.controllerBindingProfiles.containsKey(MidnightControlsConfig.getController().getGuid()), value -> {
            if (value) {
@@ -278,56 +274,56 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                MidnightControlsConfig.updateBindingsForController(MidnightControlsConfig.getController());
            }

-        }, Text.empty());
+        }, TooltipData.EMPTY);
        this.cameraModeOption = new SpruceCyclingOption("midnightcontrols.menu.camera_mode",
                amount -> MidnightControlsConfig.cameraMode = MidnightControlsConfig.cameraMode.next(),
                option -> option.getDisplayText(MidnightControlsConfig.cameraMode.getTranslatedText()),
-                Text.translatable("midnightcontrols.menu.camera_mode.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.camera_mode.tooltip")).build());
        this.rightDeadZoneOption = new SpruceDoubleOption("midnightcontrols.menu.right_dead_zone", 0.05, 1.0, .05f,
                () -> MidnightControlsConfig.rightDeadZone,
                value -> MidnightControlsConfig.rightDeadZone = value, option -> {
            var value = String.valueOf(option.get());
            return option.getDisplayText(Text.literal(value.substring(0, Math.min(value.length(), 5))));
-        }, Text.translatable("midnightcontrols.menu.right_dead_zone.tooltip"));
+        }, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.right_dead_zone.tooltip")).build());
        this.leftDeadZoneOption = new SpruceDoubleOption("midnightcontrols.menu.left_dead_zone", 0.05, 1.0, .05f,
                () -> MidnightControlsConfig.leftDeadZone,
                value -> MidnightControlsConfig.leftDeadZone = value, option -> {
            var value = String.valueOf(option.get());
            return option.getDisplayText(Text.literal(value.substring(0, Math.min(value.length(), 5))));
-        }, Text.translatable("midnightcontrols.menu.left_dead_zone.tooltip"));
+        }, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.left_dead_zone.tooltip")).build());
        this.invertsRightXAxis = new SpruceToggleBooleanOption("midnightcontrols.menu.invert_right_x_axis", () -> MidnightControlsConfig.invertRightXAxis,
-                value -> MidnightControlsConfig.invertRightXAxis = value, null);
+                value -> MidnightControlsConfig.invertRightXAxis = value, TooltipData.EMPTY);
        this.invertsRightYAxis = new SpruceToggleBooleanOption("midnightcontrols.menu.invert_right_y_axis", () -> MidnightControlsConfig.invertRightYAxis,
-                value -> MidnightControlsConfig.invertRightYAxis = value, null);
+                value -> MidnightControlsConfig.invertRightYAxis = value, TooltipData.EMPTY);
        this.unfocusedInputOption = new SpruceToggleBooleanOption("midnightcontrols.menu.unfocused_input", () -> MidnightControlsConfig.unfocusedInput,
-                value -> MidnightControlsConfig.unfocusedInput = value, Text.translatable("midnightcontrols.menu.unfocused_input.tooltip"));
+                value -> MidnightControlsConfig.unfocusedInput = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.unfocused_input.tooltip")).build());
        this.virtualMouseOption = new SpruceToggleBooleanOption("midnightcontrols.menu.virtual_mouse", () -> MidnightControlsConfig.virtualMouse,
-                value -> MidnightControlsConfig.virtualMouse = value, Text.translatable("midnightcontrols.menu.virtual_mouse.tooltip"));
+                value -> MidnightControlsConfig.virtualMouse = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.virtual_mouse.tooltip")).build());
        this.virtualKeyboardOption = new SpruceToggleBooleanOption("midnightcontrols.menu.virtual_keyboard", () -> MidnightControlsConfig.virtualMouse,
-                value -> MidnightControlsConfig.virtualKeyboard = value, Text.translatable("midnightcontrols.menu.virtual_keyboard.tooltip"));
+                value -> MidnightControlsConfig.virtualKeyboard = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.virtual_keyboard.tooltip")).build());
        this.hideCursorOption = new SpruceToggleBooleanOption("midnightcontrols.menu.hide_cursor", () -> MidnightControlsConfig.hideNormalMouse,
-                value -> MidnightControlsConfig.hideNormalMouse = value, Text.translatable("midnightcontrols.menu.hide_cursor.tooltip"));
+                value -> MidnightControlsConfig.hideNormalMouse = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.hide_cursor.tooltip")).build());
        // Touch options
        this.touchModeOption = new SpruceCyclingOption("midnightcontrols.menu.touch_mode",
                amount -> MidnightControlsConfig.touchMode = MidnightControlsConfig.touchMode.next(),
                option -> option.getDisplayText(MidnightControlsConfig.touchMode.getTranslatedText()),
-                Text.translatable("midnightcontrols.menu.touch_mode.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.touch_mode.tooltip")).build());
        this.touchWithControllerOption = new SpruceToggleBooleanOption("midnightcontrols.menu.touch_with_controller", () -> MidnightControlsConfig.touchInControllerMode,
-                value -> MidnightControlsConfig.touchInControllerMode = value, Text.translatable("midnightcontrols.menu.touch_with_controller.tooltip"));
+                value -> MidnightControlsConfig.touchInControllerMode = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.touch_with_controller.tooltip")).build());
        this.touchSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.touch_speed", 0.0, 150.0, .5f,
                () -> MidnightControlsConfig.touchSpeed,
                value -> MidnightControlsConfig.touchSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
-                Text.translatable("midnightcontrols.menu.touch_speed.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.touch_speed.tooltip")).build());
        this.touchBreakDelayOption = new SpruceDoubleOption("midnightcontrols.menu.touch_break_delay", 50, 500, 1f,
                () -> (double) MidnightControlsConfig.touchBreakDelay,
                value -> MidnightControlsConfig.touchBreakDelay = value.intValue(), option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
-                Text.translatable("midnightcontrols.menu.touch_break_delay.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.touch_break_delay.tooltip")).build());
        this.touchTransparencyOption = new SpruceDoubleOption("midnightcontrols.menu.touch_transparency", 0, 100, 1f,
                () -> (double) MidnightControlsConfig.touchTransparency,
                value -> MidnightControlsConfig.touchTransparency = value.intValue(), option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
-                Text.translatable("midnightcontrols.menu.touch_break_delay.tooltip"));
+                TooltipData.builder().text(Text.translatable("midnightcontrols.menu.touch_break_delay.tooltip")).build());
        this.invertTouchOption = new SpruceToggleBooleanOption("midnightcontrols.menu.invert_touch", () -> MidnightControlsConfig.invertTouch,
-                value -> MidnightControlsConfig.invertTouch = value, Text.translatable("midnightcontrols.menu.invert_touch.tooltip"));
+                value -> MidnightControlsConfig.invertTouch = value, TooltipData.builder().text(Text.translatable("midnightcontrols.menu.invert_touch.tooltip")).build());
    }

    @Override
@@ -401,7 +397,6 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
        list.addSingleOptionEntry(this.hideCursorOption);
        list.addSingleOptionEntry(this.joystickAsMouseOption);
        list.addSingleOptionEntry(this.eyeTrackingAsMouseOption);
-        list.addSingleOptionEntry(this.advancedConfigOption);
        return list;
    }

@@ -409,7 +404,6 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
        var list = new SpruceOptionListWidget(Position.origin(), width, height);
        list.setBackground(new MidnightControlsBackground(130));
        list.addSingleOptionEntry(this.analogMovementOption);
-        list.addSingleOptionEntry(this.doubleTapToSprintOption);
        list.addSingleOptionEntry(this.controllerToggleSneakOption);
        list.addSingleOptionEntry(this.controllerToggleSprintOption);
        if (MidnightControls.isExtrasLoaded) list.addSingleOptionEntry(this.fastBlockPlacingOption);
@@ -426,7 +420,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
        list.setBackground(new MidnightControlsBackground(130));
        list.addSingleOptionEntry(this.controllerTypeOption);
        list.addSingleOptionEntry(this.virtualMouseSkinOption);
-        list.addSingleOptionEntry(new SpruceSeparatorOption("midnightcontrols.menu.title.hud", true, null));
+        list.addSingleOptionEntry(new SpruceSeparatorOption("midnightcontrols.menu.title.hud", true, TooltipData.EMPTY));
        list.addSingleOptionEntry(this.hudEnableOption);
        list.addSingleOptionEntry(this.hudSideOption);
        list.addSingleOptionEntry(this.moveChatOption);
@@ -442,17 +436,17 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {

        var aboutMappings1 = new SpruceLabelWidget(Position.of(0, 2),
                Text.translatable("midnightcontrols.controller.mappings.1", SDL2_GAMEPAD_TOOL),
-                width, true);
+                width);

        var gamepadToolUrlLabel = new SpruceLabelWidget(Position.of(0, aboutMappings1.getHeight() + 4),
                this.controllerMappingsUrlText, width,
-                label -> Util.getOperatingSystem().open(GAMEPAD_TOOL_URL), true);
+                label -> Util.getOperatingSystem().open(GAMEPAD_TOOL_URL));
        gamepadToolUrlLabel.setTooltip(Text.translatable("chat.link.open"));

        var aboutMappings3 = new SpruceLabelWidget(Position.of(0,
                aboutMappings1.getHeight() + gamepadToolUrlLabel.getHeight() + 6),
                Text.translatable("midnightcontrols.controller.mappings.3", Formatting.GREEN.toString(), Formatting.RESET.toString()),
-                width, true);
+                width);

        int listHeight = height - 8 - aboutMappings1.getHeight() - aboutMappings3.getHeight() - gamepadToolUrlLabel.getHeight();
        var labels = new SpruceContainerWidget(Position.of(0,
@@ -486,7 +480,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
        list.addSingleOptionEntry(this.touchSpeedOption);
        list.addSingleOptionEntry(this.touchWithControllerOption);
        list.addSingleOptionEntry(this.invertTouchOption);
-        list.addSingleOptionEntry(new SpruceSeparatorOption("midnightcontrols.menu.title.hud", true, null));
+        list.addSingleOptionEntry(new SpruceSeparatorOption("midnightcontrols.menu.title.hud", true, TooltipData.EMPTY));
        list.addSingleOptionEntry(this.touchModeOption);
        list.addSingleOptionEntry(this.touchBreakDelayOption);
        list.addSingleOptionEntry(this.touchTransparencyOption);
@@ -498,18 +492,19 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
    }

    @Override
-    public void renderTitle(DrawContext context, int mouseX, int mouseY, float delta) {
-        context.drawCenteredTextWithShadow(this.textRenderer, I18n.translate("midnightcontrols.menu.title"), this.width / 2, 8, 0xFFFFFFFF);
+    public void render(SpruceGuiGraphics context, int mouseX, int mouseY, float delta) {
+        super.render(context, mouseX, mouseY, delta);
+        context.vanilla().drawCenteredTextWithShadow(this.textRenderer, I18n.translate("midnightcontrols.menu.title"), this.width / 2, 8, 0xFFFFFFFF);
    }

    public static class MidnightControlsBackground implements Background {
-        private static int transparency = 160;
+        private int transparency = 160;
        public MidnightControlsBackground() {}
        public MidnightControlsBackground(int transparency) {
-            MidnightControlsBackground.transparency = transparency;
+            this.transparency = transparency;
        }
        @Override
-        public void render(DrawContext context, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
+        public void render(SpruceGuiGraphics context, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
            context.fill(widget.getX(), widget.getY(), widget.getX() + widget.getWidth(), widget.getY() + widget.getHeight(), ColorHelper.getArgb(transparency, 0, 0, 0));
        }
    }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/ReloadControllerMappingsOption.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/ReloadControllerMappingsOption.java
@@ -9,9 +9,10 @@

 package eu.midnightdust.midnightcontrols.client.gui;

+import dev.lambdaurora.spruceui.option.SpruceSimpleActionOption;
+import dev.lambdaurora.spruceui.tooltip.TooltipData;
+import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
-import org.thinkingstudio.obsidianui.option.SpruceSimpleActionOption;
-import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.text.Text;
@@ -32,9 +33,9 @@ public class ReloadControllerMappingsOption {
                before.accept(btn);
            Controller.updateMappings();
            if (client.currentScreen instanceof MidnightControlsSettingsScreen)
-                client.currentScreen.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
+                client.currentScreen.init(client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
            client.getToastManager().add(SystemToast.create(client, SystemToast.Type.PERIODIC_NOTIFICATION,
                    Text.translatable("midnightcontrols.controller.mappings.updated"), Text.empty()));
-        }, Text.translatable("midnightcontrols.tooltip.reload_controller_mappings"));
+        }, TooltipData.builder().text(Text.translatable("midnightcontrols.tooltip.reload_controller_mappings")).build());
    }
 }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/ControllerBindingButton.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/ControllerBindingButton.java
@@ -0,0 +1,161 @@
+package eu.midnightdust.midnightcontrols.client.gui.config;
+
+import com.google.common.collect.Lists;
+import dev.lambdaurora.spruceui.SpruceTexts;
+import eu.midnightdust.lib.config.EntryInfo;
+import eu.midnightdust.lib.config.MidnightConfigListWidget;
+import eu.midnightdust.lib.config.MidnightConfigScreen;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsRenderer;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.DrawnTextConsumer;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.tooltip.Tooltip;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.TextIconButtonWidget;
+import net.minecraft.client.input.AbstractInput;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class ControllerBindingButton extends ButtonWidget implements ControlsInput {
+    private static final int[] UNBOUND = new int[]{-1};
+    static boolean waiting = false;
+    static List<Integer> currentButtons = new ArrayList<>();
+    private int iconWidth;
+
+    public static void add(ButtonBinding binding, MidnightConfigListWidget list, MidnightConfigScreen screen) {
+        ControllerBindingButton editButton = new ControllerBindingButton(screen.width - 185 + 22, 0, 128, 20, binding);
+        TextIconButtonWidget resetButton = TextIconButtonWidget.builder(net.minecraft.text.Text.translatable("controls.reset"), (button -> {
+            MidnightControlsConfig.setButtonBinding(binding, binding.getDefaultButton());
+            MidnightControlsClient.input.beginControlsInput(null);
+            editButton.updateMessage(false);
+        }), true).texture(Identifier.of("midnightlib","icon/reset"), 12, 12).dimension(20, 20).build();
+        resetButton.setPosition(screen.width - 205 + 150 + 25, 0);
+        editButton.resetButton = resetButton;
+        editButton.updateMessage(false);
+        EntryInfo info = new EntryInfo(null, screen.modid);
+
+        TextIconButtonWidget unbindButton = TextIconButtonWidget.builder(net.minecraft.text.Text.translatable("midnightcontrols.narrator.unbound", binding.getText()), (button -> {
+            MidnightControlsConfig.setButtonBinding(binding, UNBOUND);
+            MidnightControlsClient.input.beginControlsInput(null);
+            editButton.updateMessage(false);
+        }), true).texture(Identifier.of("midnightcontrols","icon/unbind"), 12, 12).dimension(20, 20).build();
+        unbindButton.setPosition(screen.width - 205 + 20, 0);
+        unbindButton.setTooltip(Tooltip.of(SpruceTexts.GUI_UNBIND));
+        unbindButton.active = !binding.isNotBound();
+        editButton.unbindButton = unbindButton;
+
+        list.addButton(Lists.newArrayList(editButton, resetButton, unbindButton), net.minecraft.text.Text.translatable(binding.getTranslationKey()), info);
+    }
+
+    private final ButtonBinding binding;
+    private @Nullable ClickableWidget resetButton;
+    private @Nullable ClickableWidget unbindButton;
+    public ControllerBindingButton(int x, int y, int width, int height, ButtonBinding binding) {
+        super(x, y, width, height, binding.getText(), (button) -> {},
+                (textSupplier) -> binding.isNotBound() ? net.minecraft.text.Text.translatable("narrator.controls.unbound", binding.getTranslationKey()) : net.minecraft.text.Text.translatable("narrator.controls.bound", binding.getTranslationKey(), textSupplier.get()));
+        this.binding = binding;
+        updateMessage(false);
+    }
+
+    @Override
+    public void onPress(AbstractInput input) {
+        MidnightControlsClient.input.beginControlsInput(this);
+        this.updateMessage(true);
+    }
+
+
+    public void updateMessage(boolean focused) {
+        AtomicBoolean hasConflicts = new AtomicBoolean(false);
+        MutableText conflictingBindings = net.minecraft.text.Text.empty();
+        if (focused) this.setMessage(net.minecraft.text.Text.literal("> ").append(getTranslatedButtons().copy().formatted(Formatting.WHITE, Formatting.UNDERLINE)).append(" <").formatted(Formatting.YELLOW));
+        else {
+            this.setMessage(getTranslatedButtons());
+
+            if (!this.binding.isNotBound()) {
+                InputManager.streamBindings().forEach(keyBinding -> {
+                    if (keyBinding != this.binding && this.binding.equals(keyBinding)) {
+                        if (hasConflicts.get()) conflictingBindings.append(", ");
+
+                        hasConflicts.set(true);
+                        conflictingBindings.append(net.minecraft.text.Text.translatable(keyBinding.getTranslationKey()));
+                    }
+                });
+            }
+        }
+
+        if (this.resetButton != null) this.resetButton.active = !this.binding.isDefault();
+        if (this.unbindButton != null) this.unbindButton.active = !binding.isNotBound();
+
+        if (hasConflicts.get()) {
+            this.setMessage(net.minecraft.text.Text.literal("[ ").append(this.getMessage().copy().formatted(Formatting.WHITE)).append(" ]").formatted(Formatting.RED));
+            this.setTooltip(Tooltip.of(net.minecraft.text.Text.translatable("controls.keybinds.duplicateKeybinds", conflictingBindings)));
+        } else {
+            this.setTooltip(null);
+        }
+    }
+
+    private net.minecraft.text.Text getTranslatedButtons() {
+        return this.binding.isNotBound() ? SpruceTexts.NOT_BOUND.copy() :
+                (binding.getButton().length > 0 ? ButtonBinding.getLocalizedButtonName(binding.getButton()[0]) : net.minecraft.text.Text.literal("..."));
+    }
+
+    @Override
+    public void drawLabel(DrawnTextConsumer consumer) {
+        if (this.binding.getButton().length < 2) super.drawLabel(consumer);
+    }
+
+    @Override
+    protected void drawIcon(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+        this.drawButton(context);
+        this.drawLabel(context.getHoverListener(this, DrawContext.HoverType.NONE));
+        int x = this.getX();
+        if (this.binding.getButton().length > 1) {
+            x += (this.width / 2 - iconWidth / 2) - 4;
+        }
+        var size = MidnightControlsRenderer.drawButton(context, x, this.getY(), this.binding, MinecraftClient.getInstance());
+        iconWidth = size.length();
+    }
+
+    @Override
+    public void finishBindingEdit(int... buttons) {
+        MidnightControlsConfig.setButtonBinding(binding, buttons);
+        updateMessage(false);
+    }
+
+    @Override
+    public void update() {
+        this.updateMessage(true);
+    }
+
+    @Override
+    public void setWaiting(boolean value) {
+        waiting = value;
+    }
+
+    @Override
+    public boolean isWaiting() {
+        return waiting;
+    }
+
+    @Override
+    public List<Integer> getCurrentButtons() {
+        return currentButtons;
+    }
+
+    @Override
+    public ButtonBinding getFocusedBinding() {
+        return this.binding;
+    }
+}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/ControllerSelectionButton.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/ControllerSelectionButton.java
@@ -0,0 +1,64 @@
+package eu.midnightdust.midnightcontrols.client.gui.config;
+
+import dev.lambdaurora.spruceui.SpruceTexts;
+import eu.midnightdust.lib.config.EntryInfo;
+import eu.midnightdust.lib.config.MidnightConfigListWidget;
+import eu.midnightdust.lib.config.MidnightConfigScreen;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.controller.Controller;
+import net.minecraft.client.gui.tooltip.Tooltip;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.TextIconButtonWidget;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.Identifier;
+import org.lwjgl.glfw.GLFW;
+
+import java.util.List;
+
+import static eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen.searchNextAvailableController;
+
+public class ControllerSelectionButton {
+    public static void add(MidnightConfigListWidget list, MidnightConfigScreen screen, boolean second) {
+        TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> {
+            if (second) MidnightControlsConfig.secondControllerID = -1;
+            else MidnightControlsConfig.controllerID = 0;
+            screen.updateList();
+        }), true).texture(Identifier.of("midnightlib","icon/reset"), 12, 12).dimension(20, 20).build();
+        resetButton.setPosition(screen.width - 205 + 150 + 25, 0);
+        ButtonWidget editButton = ButtonWidget.builder(getControllerName(second),
+                button -> {
+                    int id = second ? MidnightControlsConfig.getSecondController().map(Controller::id).orElse(-1) : MidnightControlsConfig.getController().id();
+                    id += 1;
+                    if (id > GLFW.GLFW_JOYSTICK_LAST)
+                        id = GLFW.GLFW_JOYSTICK_1;
+                    id = searchNextAvailableController(id, second);
+                    if (second) {
+                        MidnightControlsConfig.setSecondController(Controller.byId(id));
+                    } else {
+                        MidnightControlsConfig.setController(Controller.byId(id));
+                    }
+                    if (MidnightControlsConfig.debug && id != -1) System.out.println(Controller.byId(id).getName() + "'s Controller GUID: " + Controller.byId(id).getGuid());
+
+                    resetButton.active = second ? MidnightControlsConfig.getSecondController().isPresent() : false;
+                    button.setMessage(getControllerName(second));
+                }).dimensions(screen.width - 185, 0, 150, 20).build();
+        resetButton.active = second ? MidnightControlsConfig.getSecondController().isPresent() : false;
+        if (second) editButton.setTooltip(Tooltip.of(Text.translatable("midnightcontrols.menu.controller2.tooltip")));
+
+        list.addButton(List.of(editButton, resetButton), Text.translatable(second ? "midnightcontrols.menu.controller2" : "midnightcontrols.menu.controller"), new EntryInfo(null, screen.modid));
+    }
+
+    private static Text getControllerName(boolean second) {
+        if (second && MidnightControlsConfig.getSecondController().isEmpty()) return SpruceTexts.OPTIONS_OFF.copyContentOnly().formatted(Formatting.RED);
+
+        var controller = second ? MidnightControlsConfig.getSecondController().get() : MidnightControlsConfig.getController();
+        var controllerName = controller.getName();
+        if (!controller.isConnected())
+            return Text.literal(controllerName).formatted(Formatting.RED);
+        else if (!controller.isGamepad())
+            return Text.literal(controllerName).formatted(Formatting.GOLD);
+        else
+            return Text.literal(controllerName);
+    }
+}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/ControlsInput.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/ControlsInput.java
@@ -0,0 +1,18 @@
+package eu.midnightdust.midnightcontrols.client.gui.config;
+
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+
+import java.util.List;
+
+public interface ControlsInput {
+    void setWaiting(boolean value);
+    boolean isWaiting();
+
+    List<Integer> getCurrentButtons();
+
+    ButtonBinding getFocusedBinding();
+
+    void finishBindingEdit(int[] buttons);
+
+    default void update() {};
+}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/MappingsStringInputWidget.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/MappingsStringInputWidget.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of midnightcontrols.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package eu.midnightdust.midnightcontrols.client.gui.config;
+
+import com.google.common.collect.Lists;
+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.widget.text.SpruceTextAreaWidget;
+import eu.midnightdust.lib.config.EntryInfo;
+import eu.midnightdust.lib.config.MidnightConfigListWidget;
+import eu.midnightdust.lib.config.MidnightConfigScreen;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import net.minecraft.client.gui.widget.*;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+import java.util.List;
+
+import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
+
+/**
+ * Represents the controller mappings file editor screen.
+ *
+ * @author LambdAurora
+ * @version 1.7.0
+ * @since 1.4.3
+ */
+public class MappingsStringInputWidget {
+
+    public static void add(EntryInfo centered, MidnightConfigListWidget list, MidnightConfigScreen screen) {
+        //SpruceTextAreaWidget editButton = new SpruceTextAreaWidget(Position.of(0, 0), 20, 20, Text.empty());
+        MultilineTextFieldWidget editButton = new MultilineTextFieldWidget(screen.getTextRenderer(), screen.width / 2 - 128, 0, 256, 60, Text.of("TESTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT\nnew line!"));
+        TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> {
+            screen.updateList();
+        }), true).texture(Identifier.of("midnightlib","icon/reset"), 12, 12).dimension(20, 60).build();
+        resetButton.setPosition(screen.width / 2 - 128 + 256 + 4, 0);
+        editButton.setChangedListener(string -> {
+            resetButton.active = !string.isEmpty();
+        });
+
+        list.addButton(List.of(), Text.translatable("midnightcontrols.menu.title.mappings.string"), centered);
+        //screen.addDrawableChild(editButton);
+        list.addButton(Lists.newArrayList(editButton, resetButton), Text.empty(), centered);
+        list.addButton(List.of(), Text.empty(), centered);
+        list.addButton(List.of(), Text.empty(), centered);
+        list.addButton(List.of(), Text.translatable("midnightcontrols.menu.multiple_mapping_tip"), centered);
+        //list.addButton();
+
+        ButtonWidget copyButton = TextIconButtonWidget.builder(Text.of("Copy GUID"), widget -> {
+            client.keyboard.setClipboard(MidnightControlsConfig.getController().getGuid());
+        }).dimensions(screen.width - 185, 0, 150, 20).build();
+
+        list.addButton(List.of(copyButton), Text.translatable("midnightcontrols.menu.current_controller_guid", MidnightControlsConfig.getController().getGuid()), new EntryInfo(null, screen.modid));
+    }
+}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/MultilineTextFieldWidget.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/MultilineTextFieldWidget.java
@@ -0,0 +1,13 @@
+package eu.midnightdust.midnightcontrols.client.gui.config;
+
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.widget.ScrollableTextWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.text.Text;
+
+public class MultilineTextFieldWidget extends TextFieldWidget {
+    public MultilineTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, Text text) {
+        super(textRenderer, x, y, width, height, text);
+    }
+    // TODO
+}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/CursorRenderer.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/CursorRenderer.java
@@ -0,0 +1,25 @@
+package eu.midnightdust.midnightcontrols.client.gui.cursor;
+
+import com.mojang.blaze3d.pipeline.RenderPipeline;
+import eu.midnightdust.midnightcontrols.client.mixin.DrawContextAccessor;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.cursor.Cursor;
+import net.minecraft.client.texture.TextureSetup;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.NotNull;
+import org.joml.Matrix3x2f;
+
+import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
+
+public abstract class CursorRenderer {
+    public static Cursor currentCursorStyle = Cursor.DEFAULT;
+
+    public abstract void renderCursor(@NotNull DrawContext context, @NotNull MinecraftClient client);
+
+    public static void drawUnalignedTexturedQuad(RenderPipeline pipeline, Identifier texture, DrawContext context, float x1, float x2, float y1, float y2, float u1, float u2, float v1, float v2) {
+        DrawContextAccessor accessor = (DrawContextAccessor) context;
+        var tex = client.getTextureManager().getTexture(texture);
+        accessor.getState().addSimpleElement(new UnalignedTexturedQuadGuiElementRenderState(pipeline, TextureSetup.of(tex.getGlTextureView(), tex.getSampler()), new Matrix3x2f(context.getMatrices()), x1, y1, x2, y2, u1, u2, v1, v2, 0xffffffff, accessor.getScissorStack().peekLast()));
+    }
+}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/UnalignedTexturedQuadGuiElementRenderState.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/UnalignedTexturedQuadGuiElementRenderState.java
@@ -1,4 +1,4 @@
-package eu.midnightdust.midnightcontrols.client.gui.render;
+package eu.midnightdust.midnightcontrols.client.gui.cursor;

 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import net.fabricmc.api.EnvType;
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/VirtualCursorRenderer.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/VirtualCursorRenderer.java
@@ -0,0 +1,67 @@
+package eu.midnightdust.midnightcontrols.client.gui.cursor;
+
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.MidnightInput;
+import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
+import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gl.RenderPipelines;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.util.Atlases;
+import org.jetbrains.annotations.NotNull;
+
+import static eu.midnightdust.midnightcontrols.MidnightControls.id;
+
+public class VirtualCursorRenderer extends CursorRenderer {
+    private static final VirtualCursorRenderer INSTANCE = new VirtualCursorRenderer();
+
+    public static VirtualCursorRenderer getInstance() {
+        return INSTANCE;
+    }
+
+    public void renderCursor(@NotNull DrawContext context, @NotNull MinecraftClient client) {
+        if (!MidnightControlsConfig.virtualMouse || (client.currentScreen == null
+                || MidnightInput.isScreenInteractive(client.currentScreen)))
+            return;
+
+        float mouseX = (float) client.mouse.getX() * client.getWindow().getScaledWidth() / client.getWindow().getWidth();
+        float mouseY = (float) client.mouse.getY() * client.getWindow().getScaledHeight() / client.getWindow().getHeight();
+
+        boolean hoverSlot = false;
+
+        if (client.currentScreen instanceof HandledScreenAccessor inventoryScreen) {
+            int guiLeft = inventoryScreen.getX();
+            int guiTop = inventoryScreen.getY();
+
+            Slot slot = inventoryScreen.midnightcontrols$getSlotAt(mouseX, mouseY);
+
+            if (slot != null) {
+                mouseX = guiLeft + slot.x;
+                mouseY = guiTop + slot.y;
+                hoverSlot = true;
+            }
+        }
+
+        if (!hoverSlot && client.currentScreen != null) {
+            var slot = MidnightControlsCompat.getSlotAt(client.currentScreen, (int) mouseX, (int) mouseY);
+
+            if (slot != null) {
+                mouseX = slot.x();
+                mouseY = slot.y();
+                hoverSlot = true;
+            }
+        }
+
+        if (!hoverSlot) {
+            mouseX -= 8;
+            mouseY -= 8;
+        }
+
+        try {
+            Sprite sprite = client.getAtlasManager().getAtlasTexture(Atlases.GUI).getSprite(id(MidnightControlsConfig.virtualMouseSkin.getSpritePath() + (hoverSlot ? "_slot" : "")));
+            drawUnalignedTexturedQuad(RenderPipelines.GUI_TEXTURED, sprite.getAtlasId(), context, mouseX, mouseX + 16, mouseY, mouseY + 16, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV());
+        } catch (IllegalStateException ignored) {}
+    }
+}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/WaylandCursorRenderer.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/WaylandCursorRenderer.java
@@ -0,0 +1,61 @@
+package eu.midnightdust.midnightcontrols.client.gui.cursor;
+
+import eu.midnightdust.midnightcontrols.ControlsMode;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.enums.VirtualMouseSkin;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gl.RenderPipelines;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.cursor.StandardCursors;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.util.Atlases;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.NotNull;
+
+import static eu.midnightdust.midnightcontrols.MidnightControls.id;
+
+public class WaylandCursorRenderer extends CursorRenderer {
+    private static final WaylandCursorRenderer INSTANCE = new WaylandCursorRenderer();
+
+    public static final Identifier WAYLAND_CURSOR_ARROW_LIGHT = id("cursor/light/mouse_arrow");
+    public static final Identifier WAYLAND_CURSOR_ARROW_DARK = id("cursor/dark/mouse_arrow");
+    public static final Identifier WAYLAND_CURSOR_POINTING_LIGHT = id("cursor/light/mouse_pointing_hand");
+    public static final Identifier WAYLAND_CURSOR_POINTING_DARK = id("cursor/dark/mouse_pointing_hand");
+    public static final Identifier WAYLAND_CURSOR_IBEAM_LIGHT = id("cursor/light/mouse_ibeam");
+    public static final Identifier WAYLAND_CURSOR_IBEAM_DARK = id("cursor/dark/mouse_ibeam");
+    public static final Identifier WAYLAND_CURSOR_RESIZE_VERTICAL_LIGHT = id("cursor/light/mouse_resize_vertical");
+    public static final Identifier WAYLAND_CURSOR_REZIZE_VERTICAL_DARK = id("cursor/dark/mouse_resize_vertical");
+    public static final Identifier WAYLAND_CURSOR_RESIZE_HORIZONTAL_LIGHT = id("cursor/light/mouse_resize_horizontal");
+    public static final Identifier WAYLAND_CURSOR_REZIZE_HORIZONTAL_DARK = id("cursor/dark/mouse_resize_horizontal");
+    public static final Identifier WAYLAND_CURSOR_NOT_ALLOWED_LIGHT = id("cursor/light/mouse_not_allowed");
+    public static final Identifier WAYLAND_CURSOR_NOT_ALLOWED_DARK = id("cursor/dark/mouse_not_allowed");
+
+    public static WaylandCursorRenderer getInstance() {
+        return INSTANCE;
+    }
+
+    public void renderCursor(@NotNull DrawContext context, @NotNull MinecraftClient client) {
+        if (MidnightControlsConfig.virtualMouse || client.currentScreen == null || MidnightControlsConfig.controlsMode != ControlsMode.CONTROLLER) return;
+
+        float mouseX = (float) client.mouse.getX() * client.getWindow().getScaledWidth() / client.getWindow().getWidth();
+        float mouseY = (float) client.mouse.getY() * client.getWindow().getScaledHeight() / client.getWindow().getHeight();
+
+        try {
+            Sprite sprite = getSprite(client);
+            drawUnalignedTexturedQuad(RenderPipelines.GUI_TEXTURED, sprite.getAtlasId(), context, mouseX - 2, mouseX + 6, mouseY - 2, mouseY + 6, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV());
+        } catch (IllegalStateException ignored) {}
+    }
+
+    private static Sprite getSprite(@NotNull MinecraftClient client) {
+        boolean isDark = MidnightControlsConfig.virtualMouseSkin == VirtualMouseSkin.DEFAULT_DARK || MidnightControlsConfig.virtualMouseSkin == VirtualMouseSkin.SECOND_DARK;
+        Identifier spritePath;
+        if (CursorRenderer.currentCursorStyle == StandardCursors.POINTING_HAND) spritePath = isDark ? WAYLAND_CURSOR_POINTING_DARK : WAYLAND_CURSOR_POINTING_LIGHT;
+        else if (CursorRenderer.currentCursorStyle == StandardCursors.IBEAM) spritePath = isDark ? WAYLAND_CURSOR_IBEAM_DARK : WAYLAND_CURSOR_IBEAM_LIGHT;
+        else if (CursorRenderer.currentCursorStyle == StandardCursors.RESIZE_NS) spritePath = isDark ? WAYLAND_CURSOR_REZIZE_VERTICAL_DARK : WAYLAND_CURSOR_RESIZE_VERTICAL_LIGHT;
+        else if (CursorRenderer.currentCursorStyle == StandardCursors.RESIZE_EW) spritePath = isDark ? WAYLAND_CURSOR_REZIZE_HORIZONTAL_DARK : WAYLAND_CURSOR_RESIZE_HORIZONTAL_LIGHT;
+        else if (CursorRenderer.currentCursorStyle == StandardCursors.NOT_ALLOWED) spritePath = isDark ? WAYLAND_CURSOR_NOT_ALLOWED_DARK : WAYLAND_CURSOR_NOT_ALLOWED_LIGHT;
+        else spritePath = isDark ? WAYLAND_CURSOR_ARROW_DARK : WAYLAND_CURSOR_ARROW_LIGHT;
+
+        return client.getAtlasManager().getAtlasTexture(Atlases.GUI).getSprite(spritePath);
+    }
+}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControllerButtonWidget.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControllerButtonWidget.java
@@ -9,11 +9,12 @@

 package eu.midnightdust.midnightcontrols.client.gui.widget;

+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.SpruceTexts;
+import dev.lambdaurora.spruceui.render.SpruceGuiGraphics;
+import dev.lambdaurora.spruceui.widget.AbstractSpruceIconButtonWidget;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsRenderer;
-import org.thinkingstudio.obsidianui.Position;
-import org.thinkingstudio.obsidianui.SpruceTexts;
-import org.thinkingstudio.obsidianui.widget.AbstractSpruceIconButtonWidget;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.text.Text;
@@ -45,12 +46,12 @@ public class ControllerButtonWidget extends AbstractSpruceIconButtonWidget {
    }

    @Override
-    protected int renderIcon(DrawContext context, int mouseX, int mouseY, float delta) {
+    protected int renderIcon(SpruceGuiGraphics spruceGuiGraphics, int mouseX, int mouseY, float delta) {
        int x = this.getX();
        if (this.binding.getButton().length > 1) {
            x += (this.width / 2 - this.iconWidth / 2) - 4;
        }
-        var size = MidnightControlsRenderer.drawButton(context, x, this.getY(), this.binding, MinecraftClient.getInstance());
+        var size = MidnightControlsRenderer.drawButton(spruceGuiGraphics.vanilla(), x, this.getY(), this.binding, MinecraftClient.getInstance());
        this.iconWidth = size.length();
        return size.height();
    }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControllerControlsWidget.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControllerControlsWidget.java
@@ -9,13 +9,15 @@

 package eu.midnightdust.midnightcontrols.client.gui.widget;

+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.SpruceTexts;
+import dev.lambdaurora.spruceui.render.SpruceGuiGraphics;
+import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceContainerWidget;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
-import org.thinkingstudio.obsidianui.Position;
-import org.thinkingstudio.obsidianui.SpruceTexts;
-import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceContainerWidget;
+import eu.midnightdust.midnightcontrols.client.gui.config.ControlsInput;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
@@ -29,11 +31,11 @@ import java.util.stream.Collectors;
 /**
 * Represents the controls screen.
 */
-public class ControllerControlsWidget extends SpruceContainerWidget {
+public class ControllerControlsWidget extends SpruceContainerWidget implements ControlsInput {
    private SpruceButtonWidget resetButton;
-    public ButtonBinding focusedBinding;
-    public boolean waiting = false;
-    public List<Integer> currentButtons = new ArrayList<>();
+    ButtonBinding focusedBinding = null;
+    boolean waiting = false;
+    List<Integer> currentButtons = new ArrayList<>();

    public ControllerControlsWidget(Position position, int width, int height) {
        super(position, width, height);
@@ -54,8 +56,8 @@ public class ControllerControlsWidget extends SpruceContainerWidget {
    }

    @Override
-    public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
-        context.drawCenteredTextWithShadow(this.client.textRenderer, Text.translatable("midnightcontrols.menu.title.controller_controls"),
+    public void renderWidget(SpruceGuiGraphics context, int mouseX, int mouseY, float delta) {
+        context.vanilla().drawCenteredTextWithShadow(this.client.textRenderer, Text.translatable("midnightcontrols.menu.title.controller_controls"),
                this.getX() + this.width / 2, this.getY() + 4, 0xFFFFFFFF);
        this.resetButton.setActive(InputManager.streamBindings().anyMatch(Predicates.not(ButtonBinding::isDefault)));
        super.renderWidget(context, mouseX, mouseY, delta);
@@ -66,4 +68,24 @@ public class ControllerControlsWidget extends SpruceContainerWidget {
        MidnightControlsConfig.setButtonBinding(this.focusedBinding, buttons);
        this.focusedBinding = null;
    }
+
+    @Override
+    public void setWaiting(boolean value) {
+        this.waiting = value;
+    }
+
+    @Override
+    public boolean isWaiting() {
+        return this.waiting;
+    }
+
+    @Override
+    public List<Integer> getCurrentButtons() {
+        return currentButtons;
+    }
+
+    @Override
+    public ButtonBinding getFocusedBinding() {
+        return focusedBinding;
+    }
 }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControlsListWidget.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControlsListWidget.java
@@ -9,6 +9,17 @@

 package eu.midnightdust.midnightcontrols.client.gui.widget;

+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.SpruceTexts;
+import dev.lambdaurora.spruceui.navigation.NavigationEvent;
+import dev.lambdaurora.spruceui.navigation.NavigationUtils;
+import dev.lambdaurora.spruceui.render.SpruceGuiGraphics;
+import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
+import dev.lambdaurora.spruceui.widget.SpruceIconButtonWidget;
+import dev.lambdaurora.spruceui.widget.SpruceSeparatorWidget;
+import dev.lambdaurora.spruceui.widget.SpruceWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceEntryListWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceParentWidget;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
@@ -16,20 +27,11 @@ import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
 import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.Click;
+import net.minecraft.client.gui.navigation.NavigationAxis;
+import net.minecraft.client.gui.navigation.NavigationDirection;
 import net.minecraft.client.input.KeyInput;
 import net.minecraft.client.input.MouseInput;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.util.Identifier;
-import org.thinkingstudio.obsidianui.Position;
-import org.thinkingstudio.obsidianui.SpruceTexts;
-import org.thinkingstudio.obsidianui.navigation.NavigationDirection;
-import org.thinkingstudio.obsidianui.navigation.NavigationUtils;
-import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget;
-import org.thinkingstudio.obsidianui.widget.SpruceIconButtonWidget;
-import org.thinkingstudio.obsidianui.widget.SpruceSeparatorWidget;
-import org.thinkingstudio.obsidianui.widget.SpruceWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceEntryListWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceParentWidget;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.DrawContext;
@@ -114,11 +116,11 @@ public class ControlsListWidget extends SpruceEntryListWidget<ControlsListWidget
                private final Identifier resetTexture = Identifier.of("midnightlib","icon/reset");

                @Override
-                protected int renderIcon(DrawContext drawContext, int mouseX, int mouseY, float delta) {
+                protected int renderIcon(SpruceGuiGraphics context, int mouseX, int mouseY, float delta) {
                    int size = 12;
                    int x = this.getX() + this.getWidth() / 2 - size / 2;
                    int y = this.getY() + this.getHeight() / 2 - size / 2;
-                    drawContext.drawGuiTexture(RenderPipelines.GUI_TEXTURED, resetTexture, x, y, size, size);
+                    context.vanilla().drawGuiTexture(RenderPipelines.GUI_TEXTURED, resetTexture, x, y, size, size);
                    return 1;
                }
            };
@@ -168,7 +170,7 @@ public class ControlsListWidget extends SpruceEntryListWidget<ControlsListWidget
        /* Input */

        @Override
-        protected boolean onMouseClick(double mouseX, double mouseY, int button) {
+        protected boolean onMouseClick(Click click, boolean doubleClick) {
            var it = this.children().iterator();

            SpruceWidget element;
@@ -178,30 +180,30 @@ public class ControlsListWidget extends SpruceEntryListWidget<ControlsListWidget
                }

                element = it.next();
-            } while (!element.mouseClicked(new Click(mouseX, mouseY, new MouseInput(button, 0)), false));
+            } while (!element.mouseClicked(click, false));

            this.setFocused(element);
-            if (button == GLFW.GLFW_MOUSE_BUTTON_1)
+            if (click.button() == GLFW.GLFW_MOUSE_BUTTON_1)
                this.dragging = true;

            return true;
        }

        @Override
-        protected boolean onMouseRelease(double mouseX, double mouseY, int button) {
+        protected boolean onMouseRelease(Click click) {
            this.dragging = false;
-            return this.hoveredElement(mouseX, mouseY).filter(element -> element.mouseReleased(new Click(mouseX, mouseY, new MouseInput(button, 0)))).isPresent();
+            return this.hoveredElement(click.x(), click.y()).filter(element -> element.mouseReleased(click)).isPresent();
        }

        @Override
-        protected boolean onMouseDrag(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-            return this.getFocused() != null && this.dragging && button == GLFW.GLFW_MOUSE_BUTTON_1
-                    && this.getFocused().mouseDragged(new Click(mouseX, mouseY, new MouseInput(button, 0)), deltaX, deltaY);
+        protected boolean onMouseDrag(@NotNull Click click, double deltaX, double deltaY) {
+            return this.getFocused() != null && this.dragging && click.button() == GLFW.GLFW_MOUSE_BUTTON_1
+                    && this.getFocused().mouseDragged(click, deltaX, deltaY);
        }

        @Override
-        protected boolean onKeyPress(int keyCode, int scanCode, int modifiers) {
-            return this.focused != null && this.focused.keyPressed(new KeyInput(keyCode, scanCode, modifiers));
+        protected boolean onKeyPress(@NotNull KeyInput input) {
+            return this.focused != null && this.focused.keyPressed(input);
        }

        /* Navigation */
@@ -215,9 +217,9 @@ public class ControlsListWidget extends SpruceEntryListWidget<ControlsListWidget
        }

        @Override
-        public boolean onNavigation(@NotNull NavigationDirection direction, boolean tab) {
+        public boolean onNavigation(NavigationEvent event) {
            if (this.requiresCursor()) return false;
-            if (!tab && direction.isVertical()) {
+            if (!event.tab() && event.direction().getAxis() == NavigationAxis.VERTICAL) {
                if (this.isFocused()) {
                    this.setFocused(null);
                    return false;
@@ -225,16 +227,16 @@ public class ControlsListWidget extends SpruceEntryListWidget<ControlsListWidget
                int lastIndex = this.parent.lastIndex;
                if (lastIndex >= this.children.size())
                    lastIndex = this.children.size() - 1;
-                if (!this.children.get(lastIndex).onNavigation(direction, tab))
+                if (!this.children.get(lastIndex).onNavigation(event))
                    return false;
                this.setFocused(this.children.get(lastIndex));
                return true;
            }

-            boolean result = NavigationUtils.tryNavigate(direction, tab, this.children, this.focused, this::setFocused, true);
+            boolean result = NavigationUtils.tryNavigate(event, this.children, this.focused, this::setFocused, true);
            if (result) {
                this.setFocused(true);
-                if (direction.isHorizontal() && this.getFocused() != null) {
+                if (event.direction().getAxis() == NavigationAxis.HORIZONTAL && this.getFocused() != null) {
                    this.parent.lastIndex = this.children.indexOf(this.getFocused());
                }
            }
@@ -244,7 +246,7 @@ public class ControlsListWidget extends SpruceEntryListWidget<ControlsListWidget
        /* Rendering */

        @Override
-        protected void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+        protected void renderWidget(SpruceGuiGraphics context, int mouseX, int mouseY, float delta) {
            boolean focused = gui.focusedBinding == this.binding;

            var textRenderer = ControlsListWidget.this.client.textRenderer;
@@ -300,14 +302,14 @@ public class ControlsListWidget extends SpruceEntryListWidget<ControlsListWidget
        /* Navigation */

        @Override
-        public boolean onNavigation(@NotNull NavigationDirection direction, boolean tab) {
-            return this.separatorWidget.onNavigation(direction, tab);
+        public boolean onNavigation(NavigationEvent event) {
+            return this.separatorWidget.onNavigation(event);
        }

        /* Rendering */

        @Override
-        protected void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+        protected void renderWidget(SpruceGuiGraphics context, int mouseX, int mouseY, float delta) {
            this.separatorWidget.render(context, mouseX, mouseY, delta);
        }

--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ClientPlayerEntityMixin.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ClientPlayerEntityMixin.java
@@ -56,12 +56,9 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
    @Shadow
    protected abstract boolean isCamera();

-    @Shadow protected int ticksLeftToDoubleTapSprint;
-

    @Inject(method = "move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"))
    public void onMove(MovementType type, Vec3d movement, CallbackInfo ci) {
-        if (!MidnightControlsConfig.doubleTapToSprint) ticksLeftToDoubleTapSprint = 0;
        if (!MidnightControls.isExtrasLoaded) return;
        if (type == MovementType.SELF) {
            if (this.getAbilities().flying && (!MidnightControlsConfig.flyDrifting || !MidnightControlsConfig.verticalFlyDrifting)) {
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/CursorMixin.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/CursorMixin.java
@@ -0,0 +1,17 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import eu.midnightdust.midnightcontrols.client.gui.cursor.CursorRenderer;
+import net.minecraft.client.gui.cursor.Cursor;
+import net.minecraft.client.util.Window;
+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;
+
+@Mixin(Cursor.class)
+public abstract class CursorMixin {
+    @Inject(method = "applyTo", at = @At("TAIL"))
+    public void midnightcontrols$applyCursorStyle(Window window, CallbackInfo ci) {
+        CursorRenderer.currentCursorStyle = ((Cursor) (Object) this);
+    }
+}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameOptionsScreenMixin.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameOptionsScreenMixin.java
@@ -9,6 +9,7 @@

 package eu.midnightdust.midnightcontrols.client.mixin;

+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
@@ -34,7 +35,7 @@ import static eu.midnightdust.midnightcontrols.MidnightControls.id;
 public abstract class GameOptionsScreenMixin extends Screen {
    @Shadow @Nullable protected OptionListWidget body;
    @Unique TextIconButtonWidget midnightcontrols$button = TextIconButtonWidget.builder(Text.translatable("midnightcontrols.menu.title.controller"),
-                    (button -> this.client.setScreen(new MidnightControlsSettingsScreen(this, false))), true)
+                    (button -> this.client.setScreen(MidnightControlsConfig.getScreen(this, "midnightcontrols"))), true)
            .dimension(20,20).texture(id("icon/controller"), 20, 20).build();

    protected GameOptionsScreenMixin(Text title) {
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameRendererMixin.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameRendererMixin.java
@@ -14,7 +14,8 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsRenderer;
+import eu.midnightdust.midnightcontrols.client.gui.cursor.VirtualCursorRenderer;
+import eu.midnightdust.midnightcontrols.client.gui.cursor.WaylandCursorRenderer;
 import eu.midnightdust.midnightcontrols.client.touch.TouchUtils;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
@@ -39,12 +40,11 @@ public abstract class GameRendererMixin {
    }
    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderWithTooltip(Lnet/minecraft/client/gui/DrawContext;IIF)V", shift = At.Shift.AFTER))
    private void midnightcontrols$renderVirtualCursor(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci, @Local DrawContext drawContext) {
-        MidnightControlsRenderer.renderVirtualCursor(drawContext,  client);
-        if (MidnightControlsClient.isWayland) MidnightControlsRenderer.renderWaylandCursor(drawContext, client);
-        //drawContext.draw();
+        VirtualCursorRenderer.getInstance().renderCursor(drawContext,  client);
+        if (MidnightControlsClient.isWayland) WaylandCursorRenderer.getInstance().renderCursor(drawContext, client);
    }
    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;renderHand(FZLorg/joml/Matrix4f;)V"), method = "renderWorld")
-    private void midnigtcontrols$captureMatrices(RenderTickCounter tickCounter, CallbackInfo ci, @Local(ordinal = 1) Matrix4f projectionMatrix, @Local(ordinal = 1) Matrix4f worldSpaceMatrix) {
+    private void midnigtcontrols$captureMatrices(RenderTickCounter tickCounter, CallbackInfo ci, @Local(ordinal = 0) Matrix4f projectionMatrix, @Local(ordinal = 1) Matrix4f worldSpaceMatrix) {
        TouchUtils.lastProjMat.set(projectionMatrix);
        TouchUtils.lastModMat.set(RenderSystem.getModelViewMatrix());
        TouchUtils.lastWorldSpaceMatrix.set(worldSpaceMatrix);
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/InGameHudMixin.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/InGameHudMixin.java
@@ -0,0 +1,30 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsHud;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.client.render.RenderTickCounter;
+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;
+
+@Mixin(InGameHud.class)
+public class InGameHudMixin {
+
+    @Inject(method = "<init>", at = @At("TAIL"))
+    private static void midnightcontrols$initHud(MinecraftClient client, CallbackInfo ci) {
+        MidnightControlsHud.getInstance().init();
+    }
+
+    @Inject(method = "renderMainHud", at = @At("HEAD"))
+    public void midnightcontrols$renderHud(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
+        MidnightControlsHud.getInstance().render(context, tickCounter);
+    }
+
+    @Inject(method = "tick()V", at = @At("HEAD"))
+    public void midnightcontrols$tickHud(CallbackInfo ci) {
+        MidnightControlsHud.getInstance().tick();
+    }
+}
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MinecraftClientMixin.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MinecraftClientMixin.java
@@ -56,7 +56,7 @@ public abstract class MinecraftClientMixin {

    @Shadow public abstract void setScreen(Screen screen);

-    @Shadow public int attackCooldown;
+    @Shadow protected int attackCooldown;

    @Shadow protected abstract void handleInputEvents();

--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ScreenMixin.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ScreenMixin.java
@@ -1,6 +1,6 @@
 package eu.midnightdust.midnightcontrols.client.mixin;

-import org.thinkingstudio.obsidianui.Position;
+import dev.lambdaurora.spruceui.Position;
 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
@@ -28,11 +28,11 @@ public abstract class ScreenMixin {

    @Shadow public int width;

-    @Inject(method = "init(Lnet/minecraft/client/MinecraftClient;II)V", at = @At("TAIL"))
-    public void midnightcontrols$addCloseButton(MinecraftClient client, int width, int height, CallbackInfo ci) {
+    @Inject(method = "init(II)V", at = @At("TAIL"))
+    public void midnightcontrols$addCloseButton(int width, int height, CallbackInfo ci) {
        if (MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN && (MidnightControlsConfig.closeButtonScreens.stream().anyMatch(s -> this.getClass().getName().startsWith(s) || ((Object)this) instanceof HandledScreen<?>))) {
            this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(this.width - 30, 10), 20, 20, Text.empty(), btn ->
-                    InputHandlers.handleExit().press(client, ButtonBinding.BACK, 0f, ButtonState.PRESS), 20, 160, 20, WIDGETS_LOCATION));
+                    InputHandlers.handleExit().press(MinecraftClient.getInstance(), ButtonBinding.BACK, 0f, ButtonState.PRESS), 20, 160, 20, WIDGETS_LOCATION));
        }
    }
 }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/WorldRendererMixin.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/WorldRendererMixin.java
@@ -34,7 +34,6 @@ 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

 import java.awt.*;
@@ -55,30 +54,21 @@ public abstract class WorldRendererMixin {
    @Shadow
    private ClientWorld world;

-    @Shadow
-    @Final
-    private BufferBuilderStorage bufferBuilders;
-
-    @Inject(method = "renderTargetBlockOutline", at = @At("HEAD"), cancellable = true)
-    private void dontRenderOutline(VertexConsumerProvider.Immediate immediate, MatrixStack matrices, boolean renderBlockOutline, WorldRenderState renderStates, CallbackInfo ci) {
-        if (MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN && MidnightControlsConfig.touchMode == TouchMode.FINGER_POS) {
-            ci.cancel();
-        }
-    }
-
    @Inject(
            method = "renderTargetBlockOutline",
-            at = @At("HEAD")
+            at = @At("HEAD"),
+            cancellable = true
    )
    private void onOutlineRender(VertexConsumerProvider.Immediate immediate, MatrixStack matrices, boolean renderBlockOutline, WorldRenderState renderStates, CallbackInfo ci) {
        if (((MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.touchInControllerMode) || MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN)
                && MidnightControlsConfig.touchMode == TouchMode.FINGER_POS) {
-            this.midnightcontrols$renderFingerOutline(matrices, client.gameRenderer.getCamera());
+            this.midnightcontrols$renderFingerOutline(immediate, matrices, client.gameRenderer.getCamera());
+            ci.cancel();
        }
-        this.midnightcontrols$renderReacharoundOutline(matrices, client.gameRenderer.getCamera());
+        this.midnightcontrols$renderReacharoundOutline(immediate, matrices, client.gameRenderer.getCamera());
    }
    @Unique
-    private void midnightcontrols$renderFingerOutline(MatrixStack matrices, Camera camera) {
+    private void midnightcontrols$renderFingerOutline(VertexConsumerProvider.Immediate immediate, MatrixStack matrices, Camera camera) {
        if (TouchInput.firstHitResult == null || TouchInput.firstHitResult.getType() != HitResult.Type.BLOCK)
            return;
        BlockHitResult result = (BlockHitResult) TouchInput.firstHitResult;
@@ -87,16 +77,16 @@ public abstract class WorldRendererMixin {
            var outlineShape = this.world.getBlockState(blockPos).getOutlineShape(this.client.world, blockPos, ShapeContext.of(camera.getFocusedEntity()));
            Color rgb = MidnightColorUtil.hex2Rgb(MidnightControlsConfig.touchOutlineColorHex);
            if (MidnightControlsConfig.touchOutlineColorHex.isEmpty()) rgb = RainbowColor.radialRainbow(1,1);
-            var pos = camera.getPos();
+            var pos = camera.getCameraPos();
            matrices.push();
-            var vertexConsumer = this.bufferBuilders.getEntityVertexConsumers().getBuffer(RenderLayer.getLines());
+            var vertexConsumer = immediate.getBuffer(RenderLayers.lines());
            VertexRendering.drawOutline(matrices, vertexConsumer, outlineShape, blockPos.getX() - pos.getX(), blockPos.getY() - pos.getY(), blockPos.getZ() - pos.getZ(),
-                    ColorHelper.withAlpha(MidnightControlsConfig.touchOutlineColorAlpha, rgb.getRGB()));
+                    ColorHelper.withAlpha(MidnightControlsConfig.touchOutlineColorAlpha, rgb.getRGB()), 4);
            matrices.pop();
        }
    }
    @Unique
-    private void midnightcontrols$renderReacharoundOutline(MatrixStack matrices, Camera camera) {
+    private void midnightcontrols$renderReacharoundOutline(VertexConsumerProvider.Immediate immediate, MatrixStack matrices, Camera camera) {
        if (this.client.crosshairTarget == null || this.client.crosshairTarget.getType() != HitResult.Type.MISS || !MidnightControlsConfig.shouldRenderReacharoundOutline)
            return;
        var result = reacharound.getLastReacharoundResult();
@@ -115,15 +105,15 @@ public abstract class WorldRendererMixin {
            var placementState = block.getPlacementState(context);
            if (placementState == null)
                return;
-            var pos = camera.getPos();
+            var pos = camera.getCameraPos();

            var outlineShape = placementState.getOutlineShape(this.client.world, blockPos, ShapeContext.of(camera.getFocusedEntity()));
            Color rgb = MidnightColorUtil.hex2Rgb(MidnightControlsConfig.reacharoundOutlineColorHex);
            if (MidnightControlsConfig.reacharoundOutlineColorHex.isEmpty()) rgb = RainbowColor.radialRainbow(1,1);
            matrices.push();
-            var vertexConsumer = this.bufferBuilders.getEntityVertexConsumers().getBuffer(RenderLayer.getLines());
+            var vertexConsumer = immediate.getBuffer(RenderLayers.lines());
            VertexRendering.drawOutline(matrices, vertexConsumer, outlineShape, blockPos.getX() - pos.getX(), blockPos.getY() - pos.getY(), blockPos.getZ() - pos.getZ(),
-                    ColorHelper.withAlpha(MidnightControlsConfig.touchOutlineColorAlpha, rgb.getRGB()));
+                    ColorHelper.withAlpha(MidnightControlsConfig.touchOutlineColorAlpha, rgb.getRGB()), 4);
            matrices.pop();
        }
    }
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchUtils.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchUtils.java
@@ -62,7 +62,7 @@ public class TouchUtils {
                .unproject((float) x / displayWidth * viewport[2],
                        (float) (displayHeight - y) / displayHeight * viewport[3], (float) d, viewport, target);

-        return new Vec3d(target.x, target.y, target.z).add(camera.getPos());
+        return new Vec3d(target.x, target.y, target.z).add(camera.getCameraPos());
    }

    public static boolean hasInWorldUseAction(ItemStack stack) {
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/gui/ItemUseButtonWidget.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/gui/ItemUseButtonWidget.java
@@ -1,9 +1,9 @@
 package eu.midnightdust.midnightcontrols.client.touch.gui;

+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.consume.UseAction;
-import org.thinkingstudio.obsidianui.Position;
-import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget;
 import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import net.minecraft.text.Text;
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/gui/SilentTexturedButtonWidget.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/gui/SilentTexturedButtonWidget.java
@@ -1,8 +1,8 @@
 package eu.midnightdust.midnightcontrols.client.touch.gui;

+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.widget.SpruceTexturedButtonWidget;
 import eu.midnightdust.midnightcontrols.client.touch.TouchInput;
-import org.thinkingstudio.obsidianui.Position;
-import org.thinkingstudio.obsidianui.widget.SpruceTexturedButtonWidget;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;

--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/gui/TouchscreenOverlay.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/gui/TouchscreenOverlay.java
@@ -9,21 +9,20 @@

 package eu.midnightdust.midnightcontrols.client.touch.gui;

+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
 import eu.midnightdust.midnightcontrols.client.touch.TouchInput;
 import eu.midnightdust.midnightcontrols.client.util.storage.AxisStorage;
 import net.minecraft.client.gui.Click;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.consume.UseAction;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Atlases;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
-import org.thinkingstudio.obsidianui.Position;
-import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget;
 import eu.midnightdust.lib.util.PlatformFunctions;
 import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
@@ -37,7 +36,6 @@ import eu.midnightdust.midnightcontrols.client.util.KeyBindingAccessor;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
 import net.minecraft.client.gui.widget.TextIconButtonWidget;
-import net.minecraft.client.texture.MissingSprite;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
 import net.minecraft.text.Text;
@@ -145,7 +143,7 @@ public class TouchscreenOverlay extends Screen {
     */
    private void handleJump(SpruceButtonWidget btn) {
        assert this.client != null;
-        ((KeyBindingAccessor) this.client.options.jumpKey).midnightcontrols$handlePressState(btn.isActive());
+        ((KeyBindingAccessor) this.client.options.jumpKey).midnightcontrols$handlePressState(btn.isInteractable());
    }
    /**
     * Handles the jump button.
@@ -210,7 +208,7 @@ public class TouchscreenOverlay extends Screen {
        // Swap items hand.
        this.addDrawableChild(this.swapHandsButton = new SilentTexturedButtonWidget(Position.of(swapHandsX, sneakButtonY), 20, 20, Text.empty(),
                button -> {
-                    if (button.isActive()) {
+                    if (button.isInteractable()) {
                        if (!this.client.player.isSpectator()) {
                            Objects.requireNonNull(this.client.getNetworkHandler()).sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND, BlockPos.ORIGIN, Direction.DOWN));
                        }
@@ -218,7 +216,7 @@ public class TouchscreenOverlay extends Screen {
                },0, 160, 20, WIDGETS_LOCATION));
        // Drop
        this.addDrawableChild(this.dropButton = new SilentTexturedButtonWidget(Position.of(swapHandsX, sneakButtonY + 5 + 20), 20, 20, Text.empty(), btn -> {
-            if (btn.isActive() && !client.player.isSpectator() && client.player.dropSelectedItem(false)) {
+            if (btn.isInteractable() && !client.player.isSpectator() && client.player.dropSelectedItem(false)) {
                client.player.swingHand(Hand.MAIN_HAND);
            }
        }, 20, 160, 20, WIDGETS_LOCATION));
@@ -235,12 +233,12 @@ public class TouchscreenOverlay extends Screen {
                this::handleJump, 40, 40, 20, WIDGETS_LOCATION
        ));
        this.addDrawableChild(this.flyDownButton = new SilentTexturedButtonWidget(Position.of(jumpButtonX, sneakButtonY + 20 + 5), 20, 20, Text.empty(),
-                btn -> ((KeyBindingAccessor) this.client.options.sneakKey).midnightcontrols$handlePressState(btn.isActive()), 60, 40, 20, WIDGETS_LOCATION
+                btn -> ((KeyBindingAccessor) this.client.options.sneakKey).midnightcontrols$handlePressState(btn.isInteractable()), 60, 40, 20, WIDGETS_LOCATION
        ));
        this.updateJumpButtons();
        // Movements keys
        this.addDrawableChild((this.startSneakButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY), 20, 20, Text.empty(), btn -> {
-                    if (btn.isActive()) {
+                    if (btn.isInteractable()) {
                        ((KeyBindingAccessor) this.client.options.sneakKey).midnightcontrols$handlePressState(true);
                        this.startSneakButton.setVisible(false);
                        this.endSneakButton.setVisible(true);
@@ -248,40 +246,40 @@ public class TouchscreenOverlay extends Screen {
                }, 0, 120, 20, WIDGETS_LOCATION))
        );
        this.addDrawableChild((this.endSneakButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY), 20, 20, Text.empty(), btn -> {
-            if (btn.isActive()) {
+            if (btn.isInteractable()) {
                ((KeyBindingAccessor) this.client.options.sneakKey).midnightcontrols$handlePressState(false);
                this.endSneakButton.setVisible(false);
                this.startSneakButton.setVisible(true);
            }
        }, 20, 120, 20, WIDGETS_LOCATION)));
        this.addDrawableChild(this.forwardLeftButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX - 20 - 5, sneakButtonY - 5 - 20), 20, 20, Text.empty(), btn -> {
-            ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isActive());
-            ((KeyBindingAccessor) this.client.options.leftKey).midnightcontrols$handlePressState(btn.isActive());
-            this.updateForwardButtonsState(btn.isActive());
+            ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isInteractable());
+            ((KeyBindingAccessor) this.client.options.leftKey).midnightcontrols$handlePressState(btn.isInteractable());
+            this.updateForwardButtonsState(btn.isInteractable());
        }, 80, 80, 20, WIDGETS_LOCATION
        ));
        this.addDrawableChild(this.forwardButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY - 5 - 20), 20, 20, Text.empty(), btn -> {
-            ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isActive());
-            this.updateForwardButtonsState(btn.isActive());
+            ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isInteractable());
+            this.updateForwardButtonsState(btn.isInteractable());
            this.forwardLeftButton.setVisible(true);
            this.forwardRightButton.setVisible(true);
        }, 0, 80, 20, WIDGETS_LOCATION
        ));
        this.addDrawableChild(this.forwardRightButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX + 20 + 5, sneakButtonY - 5 - 20), 20, 20, Text.empty(), btn -> {
-            ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isActive());
-            ((KeyBindingAccessor) this.client.options.rightKey).midnightcontrols$handlePressState(btn.isActive());
-            this.updateForwardButtonsState(btn.isActive());
+            ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isInteractable());
+            ((KeyBindingAccessor) this.client.options.rightKey).midnightcontrols$handlePressState(btn.isInteractable());
+            this.updateForwardButtonsState(btn.isInteractable());
        }, 100, 80, 20, WIDGETS_LOCATION
        ));

        this.addDrawableChild(this.rightButton =new SilentTexturedButtonWidget(Position.of(sneakButtonX + 20 + 5, sneakButtonY), 20, 20, Text.empty(),
-                btn -> ((KeyBindingAccessor) this.client.options.rightKey).midnightcontrols$handlePressState(btn.isActive()), 20, 80, 20, WIDGETS_LOCATION
+                btn -> ((KeyBindingAccessor) this.client.options.rightKey).midnightcontrols$handlePressState(btn.isInteractable()), 20, 80, 20, WIDGETS_LOCATION
        ));
        this.addDrawableChild(this.backButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY + 20 + 5), 20, 20, Text.empty(),
-                btn -> ((KeyBindingAccessor) this.client.options.backKey).midnightcontrols$handlePressState(btn.isActive()), 40, 80, 20, WIDGETS_LOCATION
+                btn -> ((KeyBindingAccessor) this.client.options.backKey).midnightcontrols$handlePressState(btn.isInteractable()), 40, 80, 20, WIDGETS_LOCATION
        ));
        this.addDrawableChild(this.leftButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX - 20 - 5, sneakButtonY), 20, 20, Text.empty(),
-                btn -> ((KeyBindingAccessor) this.client.options.leftKey).midnightcontrols$handlePressState(btn.isActive()), 60, 80, 20, WIDGETS_LOCATION
+                btn -> ((KeyBindingAccessor) this.client.options.leftKey).midnightcontrols$handlePressState(btn.isInteractable()), 60, 80, 20, WIDGETS_LOCATION
        ));
        initCustomButtons(true);
        initCustomButtons(false);
--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/clickhandler/TextFieldWrapper.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/clickhandler/TextFieldWrapper.java
@@ -1,8 +1,8 @@
 package eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler;

+import dev.lambdaurora.spruceui.widget.text.SpruceTextFieldWidget;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.widget.TextFieldWidget;
-import org.thinkingstudio.obsidianui.widget.text.SpruceTextFieldWidget;

 public record TextFieldWrapper(Object textField) {

--- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/gui/VirtualKeyboardScreen.java
+++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/gui/VirtualKeyboardScreen.java
@@ -1,16 +1,15 @@
 package eu.midnightdust.midnightcontrols.client.virtualkeyboard.gui;

+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.SpruceTexts;
+import dev.lambdaurora.spruceui.screen.SpruceScreen;
+import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceContainerWidget;
+import dev.lambdaurora.spruceui.widget.text.SpruceTextAreaWidget;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.virtualkeyboard.KeyboardLayout;
 import eu.midnightdust.midnightcontrols.client.virtualkeyboard.KeyboardLayoutManager;
-import net.minecraft.client.gui.DrawContext;
 import net.minecraft.text.Text;
-import org.thinkingstudio.obsidianui.Position;
-import org.thinkingstudio.obsidianui.SpruceTexts;
-import org.thinkingstudio.obsidianui.screen.SpruceScreen;
-import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceContainerWidget;
-import org.thinkingstudio.obsidianui.widget.text.SpruceTextAreaWidget;

 import java.util.List;

--- a/common/src/main/resources/assets/midnightcontrols/lang/en_us.json
+++ b/common/src/main/resources/assets/midnightcontrols/lang/en_us.json
@@ -1,5 +1,5 @@
 {
-  "midnightcontrols.midnightconfig.title": "MidnightControls Advanced Config",
+  "midnightcontrols.midnightconfig.title": "MidnightControls Config",
  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_LIGHT": "Default Light",
  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_DARK": "Default Dark",
  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_LIGHT": "Second Light",
@@ -23,7 +23,7 @@
  "midnightcontrols.midnightconfig.enum.TouchMode.FINGER_POS": "Finger Position",
  "midnightcontrols.midnightconfig.enum.CameraMode.FLAT": "Flat",
  "midnightcontrols.midnightconfig.enum.CameraMode.ADAPTIVE": "Adaptive",
-  "key.categories.midnightcontrols": "MidnightControls",
+  "key.category.midnightcontrols.keybinds": "MidnightControls",
  "key.midnightcontrols.look_down": "Look Down",
  "key.midnightcontrols.look_left": "Look Left",
  "key.midnightcontrols.look_right": "Look Right",
@@ -237,6 +237,8 @@
  "midnightcontrols.virtual_mouse.skin.second_light": "Second Light",
  "midnightcontrols.virtual_mouse.skin.second_dark": "Second Dark",
  "midnightcontrols.midnightconfig.category.controller": "Controller",
+  "midnightcontrols.midnightconfig.category.buttons": "Buttons",
+  "midnightcontrols.midnightconfig.category.mapping": "Mapping",
  "midnightcontrols.midnightconfig.category.misc": "Miscellaneous",
  "midnightcontrols.midnightconfig.category.screens": "Screens",
  "midnightcontrols.midnightconfig.category.gameplay": "Gameplay",
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/dark/mouse_arrow.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/dark/mouse_arrow.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/dark/mouse_ibeam.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/dark/mouse_ibeam.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/dark/mouse_pointer.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/dark/mouse_pointer.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/dark/mouse_pointing_hand.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/dark/mouse_pointing_hand.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_arrow.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_arrow.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_ibeam.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_ibeam.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_not_allowed.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_not_allowed.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_pointer.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_pointer.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_pointing_hand.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_pointing_hand.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_resize_horizontal.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_resize_horizontal.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_resize_vertical.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/cursor/light/mouse_resize_vertical.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/icon/keyboard_mouse.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/icon/keyboard_mouse.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/icon/touchscreen.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/icon/touchscreen.png
--- a/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/icon/unbind.png
+++ b/common/src/main/resources/assets/midnightcontrols/textures/gui/sprites/icon/unbind.png
--- a/common/src/main/resources/midnightcontrols.mixins.json
+++ b/common/src/main/resources/midnightcontrols.mixins.json
@@ -12,14 +12,17 @@
    "ClickableWidgetAccessor",
    "ClientPlayerEntityMixin",
    "CreativeInventoryScreenAccessor",
+    "CursorMixin",
    "DrawContextAccessor",
    "GameOptionsScreenMixin",
    "GameRendererMixin",
    "HandledScreenMixin",
+    "InGameHudMixin",
    "InputAccessor",
    "InputUtilMixin",
    "KeyBindingIDAccessor",
    "KeyBindingMixin",
+    "KeyboardAccessor",
    "KeyboardMixin",
    "MinecraftClientMixin",
    "MouseAccessor",
--- a/common/src/main/resources/resourcepacks/bedrock/pack.mcmeta
+++ b/common/src/main/resources/resourcepacks/bedrock/pack.mcmeta
@@ -1,7 +1,9 @@
 {
  "pack": {
    "pack_format": 15,
-    "supported_formats": [15, 999],
+    "supported_formats": [15, 255],
+    "min_format": 15,
+    "max_format": 255,
    "description": "Makes controller tooltips use similar icons to Bedrock Edition"
  }
 }
--- a/common/src/main/resources/resourcepacks/legacy/pack.mcmeta
+++ b/common/src/main/resources/resourcepacks/legacy/pack.mcmeta
@@ -1,7 +1,9 @@
 {
  "pack": {
    "pack_format": 15,
-    "supported_formats": [15, 999],
+    "supported_formats": [15, 255],
+    "min_format": 15,
+    "max_format": 255,
    "description": "Makes controller icons look similar to Legacy Console Edit."
  }
 }
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -24,7 +24,8 @@ dependencies {
    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
    modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
-    modImplementation include ("maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric")
+    modImplementation include ("dev.lambdaurora:spruceui:${project.spruceui_version}")
+    include("dev.yumi.mc.core:yumi-mc-foundation:1.0.0-beta.1+1.21.11")
    include 'org.aperlambda:lambdajcommon:1.8.1'
    modCompileOnly "maven.modrinth:emi:${project.emi_version}"

--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -40,9 +40,6 @@
    ],
    "client": [
      "eu.midnightdust.midnightcontrols.fabric.MidnightControlsClientFabric"
-    ],
-    "modmenu": [
-      "eu.midnightdust.midnightcontrols.client.MidnightControlsModMenu"
    ]
  },
  "mixins": [
@@ -52,8 +49,8 @@
  "depends": {
    "fabricloader": ">=0.11.3",
    "fabric": ">=0.71.0",
-    "minecraft": ">=1.20.5",
-    "obsidianui": ">=0.2.5",
+    "minecraft": ">=1.21.9",
+    "spruceui": "*",
    "java": ">=21"
  },
  "suggests": {
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,32 +2,34 @@
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2048M

-minecraft_version=1.21.9-rc1
+loom.ignoreDependencyLoomVersionValidation=true
+
+minecraft_version=1.21.11
 supported_versions=
-yarn_mappings=1.21.9-rc1+build.2
+yarn_mappings=1.21.11+build.2
 enabled_platforms=fabric,neoforge

 archives_base_name=midnightcontrols
-mod_version=1.11.2
+mod_version=1.11.4-beta.1
 maven_group=eu.midnightdust
-release_type=release
+release_type=beta
 modrinth_id = bXX9h73M
 curseforge_id = 621768
 # Configure the IDs here after creating the projects on the websites

-midnightlib_version=1.8.0+1.21.9-rc1
+midnightlib_version=1.9.2+1.21.11

-fabric_loader_version=0.17.2
-fabric_api_version=0.133.13+1.21.9
+fabric_loader_version=0.18.2
+fabric_api_version=0.139.4+1.21.11

-neoforge_version=21.6.0-beta
+neoforge_version=21.11.3-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4

 quilt_loader_version=0.19.0-beta.18
 quilt_fabric_api_version=7.0.1+0.83.0-1.20

 sodium_version=mc1.21-0.6.0-beta.1
-obsidianui_version=0.2.12+mc1.21.6
+spruceui_version=9.1.0+1.21.11
 modmenu_version=10.0.0-beta.1
 emotecraft_version=2.5.5+1.21.4-fabric
 bendylib_version=2.0.+
Author	SHA1	Message	Date
Martin Prokoph	f8117cf3d0	fix: bundle correct version of SpruceUI	2025-12-15 21:23:28 +01:00
Martin Prokoph	13adff2e26	fix: resourcepacks appearing as outdated	2025-12-11 16:28:57 +01:00
Martin Prokoph	381d715fa8	port: Mounts of Mayham (1.21.11)	2025-12-11 16:27:12 +01:00
Martin Prokoph	d668707300	fix: depend on SpruceUI instead of ObsidianUI	2025-10-30 22:12:45 +01:00
Martin Prokoph	dac5e55ee1	release: v1.11.3-beta.2	2025-10-29 15:16:27 +01:00
Martin Prokoph	6b89dbf8e5	feat: back to SpruceUI! - SpruceUI is now also available for NeoForge, so I can ditch ObsidianUI and move back to an actively maintained UI library :)	2025-10-03 18:47:27 +02:00
Martin Prokoph	faf24ced17	feat: improve options screen with tooltips & better reset	2025-10-02 17:24:25 +02:00
Martin Prokoph	d7ea484e71	clean: remove double tap to sprint option Now configurable in vanilla	2025-10-02 17:23:00 +02:00
Martin Prokoph	e24ecdc78b	config: reduce default deadzones	2025-10-02 16:24:15 +02:00
Martin Prokoph	66874b7164	feat: fancy input mode icons	2025-10-02 16:22:47 +02:00
Martin Prokoph	238ea583a2	feat: re-order config class	2025-10-02 16:22:22 +02:00
Martin Prokoph	b3b3eb4d55	feat: switch to new MidnightLib-based screen What used to be the advanced config screen is now the one-and-only default config screen	2025-10-02 16:21:48 +02:00
Martin Prokoph	c2cab16989	fix: controller mouse click simulation in screens	2025-10-02 00:13:40 +02:00
Martin Prokoph	f2372cf406	release: 1.11.3-alpha.2	2025-10-01 17:07:27 +02:00
Martin Prokoph	ffa1bb5a33	fix: get debug hud toggle working correctly	2025-10-01 17:06:20 +02:00
Martin Prokoph	1d9a4287d7	fix: touchscreen interaction finger outline	2025-10-01 16:55:55 +02:00
Martin Prokoph	b3a170f862	fix: server list moving entries instead of cycling	2025-10-01 16:55:09 +02:00
Martin Prokoph	15e1b08e8f	fix: attack key not working properly for mobs	2025-10-01 16:54:24 +02:00
Martin Prokoph	7660f6b0ee	release: 1.11.3-alpha.1	2025-10-01 14:14:20 +02:00
Martin Prokoph	5c1657aef2	feat: more mouse cursors 🐁	2025-10-01 14:13:47 +02:00
Martin Prokoph	830ac38b02	fix: button category names	2025-10-01 14:12:12 +02:00
Martin Prokoph	4d85879c87	feat: add more functionality to MidnightLib-based config - The plan is to slowly phase out ObsidianUI, as it is not updated fast enough	2025-10-01 14:11:47 +02:00
Martin Prokoph	60f5142796	fix: correctly register keybind category This drastically changed in 1.21.9	2025-09-28 13:51:55 +02:00
Martin Prokoph	b8ee08bf81	feat: support more mouse cursor styles	2025-09-28 13:46:09 +02:00