diff --git a/common/src/main/java/org/saturnclient/common/minecraft/MinecraftProvider.java b/common/src/main/java/org/saturnclient/common/minecraft/MinecraftProvider.java
index d2465f4..b8d0998 100644
--- a/common/src/main/java/org/saturnclient/common/minecraft/MinecraftProvider.java
+++ b/common/src/main/java/org/saturnclient/common/minecraft/MinecraftProvider.java
@@ -15,4 +15,6 @@ public abstract class MinecraftProvider {
     public abstract int getWidth(String text, int font);
 
     public abstract void registerBufferedImageTexture(SaturnIdentifier i, BufferedImage bi);
+
+    public abstract String getKeyName(int key);
 }
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java b/common/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java
rename to common/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/ElementRendererImpl.java b/common/src/main/java/org/saturnclient/ui/components/ElementRendererImpl.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/ElementRendererImpl.java
rename to common/src/main/java/org/saturnclient/ui/components/ElementRendererImpl.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/SaturnModule.java b/common/src/main/java/org/saturnclient/ui/components/SaturnModule.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/SaturnModule.java
rename to common/src/main/java/org/saturnclient/ui/components/SaturnModule.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/Sidebar.java b/common/src/main/java/org/saturnclient/ui/components/Sidebar.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/Sidebar.java
rename to common/src/main/java/org/saturnclient/ui/components/Sidebar.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/SkinPreview.java b/common/src/main/java/org/saturnclient/ui/components/SkinPreview.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/SkinPreview.java
rename to common/src/main/java/org/saturnclient/ui/components/SkinPreview.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java b/common/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java
rename to common/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java b/common/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java
rename to common/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java b/common/src/main/java/org/saturnclient/ui/components/inputs/Input.java
similarity index 90%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java
rename to common/src/main/java/org/saturnclient/ui/components/inputs/Input.java
index 25e6ffb..c1cd845 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java
+++ b/common/src/main/java/org/saturnclient/ui/components/inputs/Input.java
@@ -1,8 +1,7 @@
 package org.saturnclient.ui.components.inputs;
 
-import org.lwjgl.glfw.GLFW;
-import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.config.Theme;
+import org.saturnclient.config.manager.Key;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;
@@ -22,18 +21,18 @@ public abstract class Input extends Element {
 
     @Override
     public void keyPressed(int keyCode, int scanCode, int modifiers) {
-        if (keyCode == GLFW.GLFW_KEY_BACKSPACE) {
+        if (keyCode == Key.GLFW_KEY_BACKSPACE) {
             if (cursorPosition > 0 && validateBackspace()) {
                 text = text.substring(0, cursorPosition - 1) +
                         text.substring(cursorPosition);
                 cursorPosition--;
                 backspace();
             }
-        } else if (keyCode == GLFW.GLFW_KEY_LEFT) {
+        } else if (keyCode == Key.GLFW_KEY_LEFT) {
             if (cursorPosition > 0) {
                 cursorPosition--;
             }
-        } else if (keyCode == GLFW.GLFW_KEY_RIGHT) {
+        } else if (keyCode == Key.GLFW_KEY_RIGHT) {
             if (cursorPosition < text.length()) {
                 cursorPosition++;
             }
@@ -49,7 +48,7 @@ public abstract class Input extends Element {
         float textWidth = 0;
 
         for (int i = 0; i < visibleText.length(); i++) {
-            textWidth = SaturnClient.client.textRenderer.getWidth(visibleText.substring(0, i + 1)) * 0.6f;
+            textWidth = Fonts.getWidth(visibleText.substring(0, i + 1), Theme.FONT.value) * 0.6f;
 
             if (textWidth > mouseX) {
                 break;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java b/common/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java
rename to common/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java b/common/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java
similarity index 83%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java
rename to common/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java
index c3c099a..f3e9910 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java
+++ b/common/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java
@@ -1,7 +1,8 @@
 package org.saturnclient.ui.components.inputs;
 
-import org.lwjgl.glfw.GLFW;
+import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.Theme;
+import org.saturnclient.config.manager.Key;
 import org.saturnclient.config.manager.Property;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
@@ -21,7 +22,7 @@ public class KeybindingSelector extends Element {
     public void render(RenderScope renderScope, ElementContext ctx) {
         int textColor = focused ? 0xFFFFFF : 0xAAAAAA;
         renderScope.drawRoundedRectangle(0, 0, width, height, 10, 0xFF000000);
-        String name = GLFW.glfwGetKeyName(prop.value, GLFW.glfwGetKeyScancode(prop.value));
+        String name = MinecraftProvider.PROVIDER.getKeyName(prop.value);
 
         renderScope.drawText(0.6f,
                 prop.value == -1 ? "<NONE>"
@@ -31,7 +32,7 @@ public class KeybindingSelector extends Element {
 
     @Override
     public void keyPressed(int keyCode, int scanCode, int modifiers) {
-        if (keyCode == GLFW.GLFW_KEY_BACKSPACE) {
+        if (keyCode == Key.GLFW_KEY_BACKSPACE) {
             prop.value = -1;
         } else {
             prop.value = keyCode;
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Select.java b/common/src/main/java/org/saturnclient/ui/components/inputs/Select.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Select.java
rename to common/src/main/java/org/saturnclient/ui/components/inputs/Select.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java b/common/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java
similarity index 100%
rename from versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java
rename to common/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java
diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java
index aba7b01..cca2f19 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java
@@ -38,4 +38,9 @@ public class SaturnClientProvider extends MinecraftProvider {
     public void registerBufferedImageTexture(SaturnIdentifier i, BufferedImage bi) {
         IdentifierUtils.registerBufferedImageTextureFast((Identifier) i.inner, bi);
     }
+
+    @Override
+    public String getKeyName(int key) {
+        return GLFW.glfwGetKeyName(key, GLFW.glfwGetKeyScancode(key));
+    }
 }