diff --git a/src/client/java/works/nuty/calcite/mixin/client/ChatInputSuggestorFields.java b/src/client/java/works/nuty/calcite/mixin/client/ChatInputSuggestorFields.java
new file mode 100644
index 0000000..5dfd8a7
--- /dev/null
+++ b/src/client/java/works/nuty/calcite/mixin/client/ChatInputSuggestorFields.java
@@ -0,0 +1,28 @@
+package works.nuty.calcite.mixin.client;
+
+import com.mojang.brigadier.ParseResults;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.screen.ChatInputSuggestor;
+import net.minecraft.command.CommandSource;
+import net.minecraft.text.OrderedText;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Environment(EnvType.CLIENT)
+@Mixin(ChatInputSuggestor.class)
+public interface ChatInputSuggestorFields {
+    @Accessor
+    ChatInputSuggestor.SuggestionWindow getWindow();
+
+    @Accessor
+    int getMaxSuggestionSize();
+
+    @Accessor
+    ParseResults<CommandSource> getParse();
+
+    @Accessor
+    List<OrderedText> getMessages();
+}
diff --git a/src/client/java/works/nuty/calcite/mixin/client/SuggestionWindowFields.java b/src/client/java/works/nuty/calcite/mixin/client/SuggestionWindowFields.java
new file mode 100644
index 0000000..6a5097d
--- /dev/null
+++ b/src/client/java/works/nuty/calcite/mixin/client/SuggestionWindowFields.java
@@ -0,0 +1,21 @@
+package works.nuty.calcite.mixin.client;
+
+import com.mojang.brigadier.suggestion.Suggestion;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.screen.ChatInputSuggestor;
+import net.minecraft.client.util.math.Rect2i;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Environment(EnvType.CLIENT)
+@Mixin(ChatInputSuggestor.SuggestionWindow.class)
+public interface SuggestionWindowFields {
+    @Accessor
+    Rect2i getArea();
+
+    @Accessor
+    List<Suggestion> getSuggestions();
+}
diff --git a/src/client/java/works/nuty/calcite/mixin/client/SuggestionWindowMixin.java b/src/client/java/works/nuty/calcite/mixin/client/SuggestionWindowMixin.java
new file mode 100644
index 0000000..3441b12
--- /dev/null
+++ b/src/client/java/works/nuty/calcite/mixin/client/SuggestionWindowMixin.java
@@ -0,0 +1,45 @@
+package works.nuty.calcite.mixin.client;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.screen.ChatInputSuggestor;
+import org.lwjgl.glfw.GLFW;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Environment(EnvType.CLIENT)
+@Mixin(ChatInputSuggestor.SuggestionWindow.class)
+public abstract class SuggestionWindowMixin {
+    @Shadow
+    boolean completed;
+
+    @Shadow
+    public abstract void scroll(int offset);
+
+    @Shadow
+    public abstract void complete();
+
+    @Inject(at = @At("HEAD"), method = "keyPressed", cancellable = true)
+    public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
+        if ((modifiers & GLFW.GLFW_MOD_CONTROL) > 0 && keyCode == GLFW.GLFW_KEY_N) {
+            this.scroll(1);
+            this.completed = false;
+            cir.setReturnValue(true);
+            cir.cancel();
+        }
+        if ((modifiers & GLFW.GLFW_MOD_CONTROL) > 0 && keyCode == GLFW.GLFW_KEY_P) {
+            this.scroll(-1);
+            this.completed = false;
+            cir.setReturnValue(true);
+            cir.cancel();
+        }
+        if (keyCode == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER) {
+            this.complete();
+            cir.setReturnValue(true);
+            cir.cancel();
+        }
+    }
+}
diff --git a/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java b/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java
index 93f3ea1..93ab0ec 100644
--- a/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java
+++ b/src/client/java/works/nuty/calcite/screen/CalciteCommandScreen.java
@@ -11,6 +11,7 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.screen.ChatInputSuggestor;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
@@ -25,6 +26,8 @@
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
+import works.nuty.calcite.mixin.client.ChatInputSuggestorFields;
+import works.nuty.calcite.mixin.client.SuggestionWindowFields;
 import works.nuty.calcite.widget.AutoActivateButtonWidget;
 import works.nuty.calcite.widget.CalciteTextFieldWidget;
 import works.nuty.calcite.widget.ModeButtonWidget;
@@ -347,7 +350,7 @@ public void scrollToFocused() {
 
     @Environment(EnvType.CLIENT)
     public class CommandWidget extends AbstractCommandWidget {
-        protected final CalciteInputSuggestor commandSuggestor;
+        protected final ChatInputSuggestor commandSuggestor;
         protected final List<ClickableWidget> children;
         private final CommandBlockBlockEntity blockEntity;
         private final CalciteTextFieldWidget commandEdit;
@@ -368,10 +371,11 @@ public CommandWidget(CommandBlockBlockEntity blockEntity) {
             this.commandEdit.setMaxLength(32500);
             this.commandEdit.setChangedListener(this::onCommandChanged);
 
-            this.commandSuggestor = new CalciteInputSuggestor(CalciteCommandScreen.this.client, CalciteCommandScreen.this, this.commandEdit, CalciteCommandScreen.this.textRenderer, true, true, 0, 7, Integer.MIN_VALUE);
+            this.commandSuggestor = new ChatInputSuggestor(CalciteCommandScreen.this.client, CalciteCommandScreen.this, this.commandEdit, CalciteCommandScreen.this.textRenderer, true, true, 0, 7, false, Integer.MIN_VALUE);
             this.commandSuggestor.setWindowActive(true);
             this.commandSuggestor.refresh();
 
+            this.commandEdit.suggestor = this.commandSuggestor;
             this.commandEdit.setSuggestion(null);
 
             this.children = List.of(this.commandEdit);
@@ -503,11 +507,14 @@ public void render(DrawContext context, int index, int y, int x, int entryWidth,
                 CalciteCommandScreen.this.commandSuggestorRenderer = () -> {
                     context.getMatrices().push();
                     context.getMatrices().translate(0, 0, 1);
-                    CalciteInputSuggestor.SuggestionWindow window = this.commandSuggestor.window;
+                    ChatInputSuggestor.SuggestionWindow window = ((ChatInputSuggestorFields) this.commandSuggestor).getWindow();
                     if (window != null) {
-                        window.area.setY(window.calculateY(y));
+                        ((SuggestionWindowFields) window).getArea().setY(calculateSuggestionY(y));
+                    }
+                    if (!this.commandSuggestor.tryRenderWindow(context, mouseX, mouseY)) {
+                        context.getMatrices().translate(0, calculateMessageY(y), 0);
+                        this.commandSuggestor.renderMessages(context);
                     }
-                    this.commandSuggestor.render(context, mouseX, mouseY, y);
                     context.getMatrices().pop();
                 };
             }
@@ -531,5 +538,17 @@ protected void syncSettingsToServer() {
             CommandBlockExecutor commandExecutor = blockEntity.getCommandExecutor();
             CalciteCommandScreen.this.client.getNetworkHandler().sendPacket(new UpdateCommandBlockC2SPacket(BlockPos.ofFloored(commandExecutor.getPos()), this.commandEdit.getText(), this.mode, commandExecutor.isTrackingOutput(), this.conditional, this.autoActivate));
         }
+
+        private int calculateSuggestionY(int y) {
+            return height / 2 - 6 < y
+                ? y - 3 - Math.min(((SuggestionWindowFields) ((ChatInputSuggestorFields) this.commandSuggestor).getWindow()).getSuggestions().size(), ((ChatInputSuggestorFields) this.commandSuggestor).getMaxSuggestionSize()) * 12
+                : (y + 24) - (this.commandEdit.drawsBackground() ? 1 : 0);
+        }
+
+        private int calculateMessageY(int y) {
+            return (height / 2 - 6 < y
+                ? y - 3 - ((ChatInputSuggestorFields) this.commandSuggestor).getMessages().size() * 12
+                : (y + 24) - (this.commandEdit.drawsBackground() ? 1 : 0)) - 72;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java b/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java
deleted file mode 100644
index 93488d2..0000000
--- a/src/client/java/works/nuty/calcite/screen/CalciteInputSuggestor.java
+++ /dev/null
@@ -1,527 +0,0 @@
-package works.nuty.calcite.screen;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.Message;
-import com.mojang.brigadier.ParseResults;
-import com.mojang.brigadier.StringReader;
-import com.mojang.brigadier.context.CommandContextBuilder;
-import com.mojang.brigadier.context.ParsedArgument;
-import com.mojang.brigadier.context.SuggestionContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.suggestion.Suggestion;
-import com.mojang.brigadier.suggestion.Suggestions;
-import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import com.mojang.brigadier.tree.CommandNode;
-import com.mojang.brigadier.tree.LiteralCommandNode;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.util.math.Rect2i;
-import net.minecraft.command.CommandSource;
-import net.minecraft.screen.ScreenTexts;
-import net.minecraft.server.command.CommandManager;
-import net.minecraft.text.OrderedText;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.text.Texts;
-import net.minecraft.util.Colors;
-import net.minecraft.util.Formatting;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec2f;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.Nullable;
-import works.nuty.calcite.widget.CalciteTextFieldWidget;
-
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-@Environment(EnvType.CLIENT)
-public class CalciteInputSuggestor {
-    private static final Pattern WHITESPACE_PATTERN = Pattern.compile("(\\s+)");
-    private static final Style ERROR_STYLE = Style.EMPTY.withColor(Formatting.RED);
-    private static final Style INFO_STYLE = Style.EMPTY.withColor(Formatting.GRAY);
-    private static final List<Style> HIGHLIGHT_STYLES = Stream.of(Formatting.AQUA, Formatting.YELLOW, Formatting.GREEN, Formatting.LIGHT_PURPLE, Formatting.GOLD).map(Style.EMPTY::withColor).collect(ImmutableList.toImmutableList());
-    private static final Logger LOGGER = LogManager.getLogger("calcite");
-    final MinecraftClient client;
-    final CalciteTextFieldWidget textField;
-    final TextRenderer textRenderer;
-    final int inWindowIndexOffset;
-    final int maxSuggestionSize;
-    final int color;
-    private final Screen owner;
-    private final boolean slashOptional;
-    private final boolean suggestingWhenEmpty;
-    private final List<OrderedText> messages = Lists.newArrayList();
-    @Nullable
-    protected SuggestionWindow window;
-    boolean completingSuggestions;
-    private int x;
-    private int width;
-    @Nullable
-    public ParseResults<CommandSource> parse;
-    @Nullable
-    private CompletableFuture<Suggestions> pendingSuggestions;
-    private boolean windowActive;
-    private boolean canLeave = true;
-
-    public CalciteInputSuggestor(MinecraftClient client, Screen owner, CalciteTextFieldWidget textField, TextRenderer textRenderer, boolean slashOptional, boolean suggestingWhenEmpty, int inWindowIndexOffset, int maxSuggestionSize, int color) {
-        this.client = client;
-        this.owner = owner;
-        this.textField = textField;
-        this.textField.suggestor = this;
-        this.textRenderer = textRenderer;
-        this.slashOptional = slashOptional;
-        this.suggestingWhenEmpty = suggestingWhenEmpty;
-        this.inWindowIndexOffset = inWindowIndexOffset;
-        this.maxSuggestionSize = maxSuggestionSize;
-        this.color = color;
-        textField.setRenderTextProvider(this::provideRenderText);
-    }
-
-    private static int getStartOfCurrentWord(String input) {
-        if (Strings.isNullOrEmpty(input)) {
-            return 0;
-        }
-        int i = 0;
-        Matcher matcher = WHITESPACE_PATTERN.matcher(input);
-        while (matcher.find()) {
-            i = matcher.end();
-        }
-        return i;
-    }
-
-    private static OrderedText formatException(CommandSyntaxException exception) {
-        Text text = Texts.toText(exception.getRawMessage());
-        String string = exception.getContext();
-        if (string == null) {
-            return text.asOrderedText();
-        }
-        return Text.translatable("command.context.parse_error", text, exception.getCursor(), string).asOrderedText();
-    }
-
-    @Nullable
-    static String getSuggestionSuffix(String original, String suggestion) {
-        if (suggestion.startsWith(original)) {
-            return suggestion.substring(original.length());
-        }
-        return null;
-    }
-
-    private static OrderedText highlight(ParseResults<CommandSource> parse, String original, int firstCharacterIndex) {
-        int m;
-        ArrayList<OrderedText> list = Lists.newArrayList();
-        int i = 0;
-        int j = -1;
-        CommandContextBuilder<CommandSource> commandContextBuilder = parse.getContext().getLastChild();
-        for (ParsedArgument<CommandSource, ?> parsedArgument : commandContextBuilder.getArguments().values()) {
-            int k;
-            if (++j >= HIGHLIGHT_STYLES.size()) {
-                j = 0;
-            }
-            if ((k = Math.max(parsedArgument.getRange().getStart() - firstCharacterIndex, 0)) >= original.length())
-                break;
-            int l = Math.min(parsedArgument.getRange().getEnd() - firstCharacterIndex, original.length());
-            if (l <= 0) continue;
-            list.add(OrderedText.styledForwardsVisitedString(original.substring(i, k), INFO_STYLE));
-            list.add(OrderedText.styledForwardsVisitedString(original.substring(k, l), HIGHLIGHT_STYLES.get(j)));
-            i = l;
-        }
-        if (parse.getReader().canRead() && (m = Math.max(parse.getReader().getCursor() - firstCharacterIndex, 0)) < original.length()) {
-            int n = Math.min(m + parse.getReader().getRemainingLength(), original.length());
-            list.add(OrderedText.styledForwardsVisitedString(original.substring(i, m), INFO_STYLE));
-            list.add(OrderedText.styledForwardsVisitedString(original.substring(m, n), ERROR_STYLE));
-            i = n;
-        }
-        list.add(OrderedText.styledForwardsVisitedString(original.substring(i), INFO_STYLE));
-        return OrderedText.concat(list);
-    }
-
-    public void setWindowActive(boolean windowActive) {
-        this.windowActive = windowActive;
-        if (!windowActive) {
-            this.window = null;
-        }
-    }
-
-    public void setCanLeave(boolean canLeave) {
-        this.canLeave = canLeave;
-    }
-
-    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        boolean bl = this.window != null;
-        if (bl && this.window.keyPressed(keyCode, scanCode, modifiers)) {
-            return true;
-        }
-        if (this.owner.getFocused() == this.textField && keyCode == 258 && (!this.canLeave || bl)) {
-            this.show(true);
-            return true;
-        }
-        return false;
-    }
-
-    public boolean mouseScrolled(double amount) {
-        return this.window != null && this.window.mouseScrolled(MathHelper.clamp(amount, -1.0, 1.0));
-    }
-
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        return this.window != null && this.window.mouseClicked((int) mouseX, (int) mouseY, button);
-    }
-
-    public void show(boolean narrateFirstSuggestion) {
-        Suggestions suggestions;
-        if (this.pendingSuggestions != null && this.pendingSuggestions.isDone() && !(suggestions = this.pendingSuggestions.join()).isEmpty()) {
-            int i = 0;
-            for (Suggestion suggestion : suggestions.getList()) {
-                i = Math.max(i, this.textRenderer.getWidth(suggestion.getText()));
-            }
-            int j = MathHelper.clamp(this.textField.getCharacterX(suggestions.getRange().getStart()), 0, this.textField.getCharacterX(0) + this.textField.getInnerWidth() - i);
-            int k = 0;
-            this.window = new SuggestionWindow(j, k, i, this.sortSuggestions(suggestions), narrateFirstSuggestion);
-        }
-    }
-
-    public boolean isOpen() {
-        return this.window != null;
-    }
-
-    public Text getSuggestionUsageNarrationText() {
-        if (this.window != null && this.window.completed) {
-            if (this.canLeave) {
-                return Text.translatable("narration.suggestion.usage.cycle.hidable");
-            }
-            return Text.translatable("narration.suggestion.usage.cycle.fixed");
-        }
-        if (this.canLeave) {
-            return Text.translatable("narration.suggestion.usage.fill.hidable");
-        }
-        return Text.translatable("narration.suggestion.usage.fill.fixed");
-    }
-
-    public void clearWindow() {
-        this.window = null;
-    }
-
-    private List<Suggestion> sortSuggestions(Suggestions suggestions) {
-        String string = this.textField.getText().substring(0, this.textField.getCursor());
-        int i = getStartOfCurrentWord(string);
-        String string2 = string.substring(i).toLowerCase(Locale.ROOT);
-        ArrayList<Suggestion> list = Lists.newArrayList();
-        ArrayList<Suggestion> list2 = Lists.newArrayList();
-        for (Suggestion suggestion : suggestions.getList()) {
-            if (suggestion.getText().startsWith(string2) || suggestion.getText().startsWith("minecraft:" + string2)) {
-                list.add(suggestion);
-                continue;
-            }
-            list2.add(suggestion);
-        }
-        list.addAll(list2);
-        return list;
-    }
-
-    public void refresh() {
-        String string = this.textField.getText();
-        if (this.parse != null && !this.parse.getReader().getString().equals(string)) {
-            this.parse = null;
-        }
-        if (!this.completingSuggestions) {
-            this.textField.setSuggestion(null);
-            this.window = null;
-        }
-        this.messages.clear();
-        StringReader stringReader = new StringReader(string);
-        boolean startsWithSlash = stringReader.canRead() && stringReader.peek() == '/';
-        if (startsWithSlash) {
-            stringReader.skip();
-        }
-        boolean isCommand = this.slashOptional || startsWithSlash;
-        int i = this.textField.getCursor();
-        if (isCommand) {
-            CommandDispatcher<CommandSource> commandDispatcher = this.client.player.networkHandler.getCommandDispatcher();
-            if (this.parse == null) {
-                this.parse = commandDispatcher.parse(stringReader, this.client.player.networkHandler.getCommandSource());
-            }
-            int j = this.suggestingWhenEmpty ? stringReader.getCursor() : 1;
-            if (!(i < j || this.window != null && this.completingSuggestions)) {
-                this.pendingSuggestions = commandDispatcher.getCompletionSuggestions(this.parse, i);
-                this.pendingSuggestions.thenRun(() -> {
-                    if (!this.pendingSuggestions.isDone()) {
-                        return;
-                    }
-                    this.showCommandSuggestions();
-                });
-            }
-        } else {
-            String string2 = string.substring(0, i);
-            int j = CalciteInputSuggestor.getStartOfCurrentWord(string2);
-            Collection<String> collection = this.client.player.networkHandler.getCommandSource().getChatSuggestions();
-            this.pendingSuggestions = CommandSource.suggestMatching(collection, new SuggestionsBuilder(string2, j));
-        }
-    }
-
-    private void showCommandSuggestions() {
-        boolean bl = false;
-        if (this.textField.getCursor() == this.textField.getText().length()) {
-            if (this.pendingSuggestions.join().isEmpty() && !this.parse.getExceptions().isEmpty()) {
-                int i = 0;
-                for (Map.Entry<CommandNode<CommandSource>, CommandSyntaxException> entry : this.parse.getExceptions().entrySet()) {
-                    CommandSyntaxException commandSyntaxException = entry.getValue();
-                    if (commandSyntaxException.getType() == CommandSyntaxException.BUILT_IN_EXCEPTIONS.literalIncorrect()) {
-                        ++i;
-                        continue;
-                    }
-                    this.messages.add(CalciteInputSuggestor.formatException(commandSyntaxException));
-                }
-                if (i > 0) {
-                    this.messages.add(CalciteInputSuggestor.formatException(CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand().create()));
-                }
-            } else if (this.parse.getReader().canRead()) {
-                bl = true;
-            }
-        }
-        this.x = 0;
-        this.width = this.owner.width;
-        if (this.messages.isEmpty() && !this.showUsages(Formatting.GRAY) && bl) {
-            this.messages.add(CalciteInputSuggestor.formatException(CommandManager.getException(this.parse)));
-        }
-        this.window = null;
-        if (this.windowActive && this.client.options.getAutoSuggestions().getValue()) {
-            this.show(false);
-        }
-    }
-
-    private boolean showUsages(Formatting formatting) {
-        CommandContextBuilder<CommandSource> commandContextBuilder = this.parse.getContext();
-        SuggestionContext<CommandSource> suggestionContext = commandContextBuilder.findSuggestionContext(this.textField.getCursor());
-        Map<CommandNode<CommandSource>, String> map = this.client.player.networkHandler.getCommandDispatcher().getSmartUsage(suggestionContext.parent, this.client.player.networkHandler.getCommandSource());
-        ArrayList<OrderedText> list = Lists.newArrayList();
-        int i = 0;
-        Style style = Style.EMPTY.withColor(formatting);
-        for (Map.Entry<CommandNode<CommandSource>, String> entry : map.entrySet()) {
-            if (entry.getKey() instanceof LiteralCommandNode) continue;
-            list.add(OrderedText.styledForwardsVisitedString(entry.getValue(), style));
-            i = Math.max(i, this.textRenderer.getWidth(entry.getValue()));
-        }
-        if (!list.isEmpty()) {
-            this.messages.addAll(list);
-            this.x = MathHelper.clamp(this.textField.getCharacterX(suggestionContext.startPos), 0, this.textField.getCharacterX(0) + this.textField.getInnerWidth() - i);
-            this.width = i;
-            return true;
-        }
-        return false;
-    }
-
-    private OrderedText provideRenderText(String original, int firstCharacterIndex) {
-        if (this.parse != null) {
-            return CalciteInputSuggestor.highlight(this.parse, original, firstCharacterIndex);
-        }
-        return OrderedText.styledForwardsVisitedString(original, Style.EMPTY);
-    }
-
-    public void render(DrawContext context, int mouseX, int mouseY, int y) {
-        if (!this.tryRenderWindow(context, mouseX, mouseY)) {
-            this.renderMessages(context, y);
-        }
-    }
-
-    public boolean tryRenderWindow(DrawContext context, int mouseX, int mouseY) {
-        if (this.window != null) {
-            this.window.render(context, mouseX, mouseY);
-            return true;
-        }
-        return false;
-    }
-
-    public void renderMessages(DrawContext context, int y) {
-        int i = CalciteInputSuggestor.this.owner.height / 2 - 6 < y ? y - 3 - this.messages.size() * 12 : (y + 24) - (CalciteInputSuggestor.this.textField.drawsBackground() ? 1 : 0);
-        int direction = CalciteInputSuggestor.this.owner.height / 2 - 6 < y ? 1 : -1;
-        for (OrderedText orderedText : this.messages) {
-            context.fill(this.x - 1, i, this.x + this.width + 1, i + 12, this.color);
-            context.drawTextWithShadow(this.textRenderer, orderedText, this.x, i + 2, -1);
-            i += 12 * direction;
-        }
-    }
-
-    public Text getNarration() {
-        if (this.window != null) {
-            return ScreenTexts.LINE_BREAK.copy().append(this.window.getNarration());
-        }
-        return ScreenTexts.EMPTY;
-    }
-
-    @Environment(value = EnvType.CLIENT)
-    public class SuggestionWindow {
-        protected final Rect2i area;
-        private final String typedText;
-        private final List<Suggestion> suggestions;
-        boolean completed;
-        private int inWindowIndex;
-        private int selection;
-        private Vec2f mouse = Vec2f.ZERO;
-        private int lastNarrationIndex;
-
-        SuggestionWindow(int x, int y, int width, List<Suggestion> suggestions, boolean narrateFirstSuggestion) {
-            int i = x - (CalciteInputSuggestor.this.textField.drawsBackground() ? 0 : 1) + 3;
-            int j = CalciteInputSuggestor.this.owner.height / 2 < y ? y - 3 - Math.min(suggestions.size(), CalciteInputSuggestor.this.maxSuggestionSize) * 12 : (y + 24) - (CalciteInputSuggestor.this.textField.drawsBackground() ? 1 : 0);
-            this.area = new Rect2i(i, j, width + 1, Math.min(suggestions.size(), CalciteInputSuggestor.this.maxSuggestionSize) * 12);
-            this.typedText = CalciteInputSuggestor.this.textField.getText();
-            this.lastNarrationIndex = narrateFirstSuggestion ? -1 : 0;
-            this.suggestions = suggestions;
-            this.select(0);
-        }
-
-        public int calculateY(int y) {
-            return CalciteInputSuggestor.this.owner.height / 2 - 6 < y ? y - 3 - Math.min(suggestions.size(), CalciteInputSuggestor.this.maxSuggestionSize) * 12 : (y + 24) - (CalciteInputSuggestor.this.textField.drawsBackground() ? 1 : 0);
-        }
-
-        public void render(DrawContext context, int mouseX, int mouseY) {
-            Message message;
-            int i = Math.min(this.suggestions.size(), CalciteInputSuggestor.this.maxSuggestionSize);
-            boolean bl = this.inWindowIndex > 0;
-            boolean bl2 = this.suggestions.size() > this.inWindowIndex + i;
-            boolean bl3 = bl || bl2;
-            boolean bl4 = this.mouse.x != (float) mouseX || this.mouse.y != (float) mouseY;
-            if (bl4) {
-                this.mouse = new Vec2f((float) mouseX, (float) mouseY);
-            }
-            if (bl3) {
-                int k;
-                context.fill(this.area.getX(), this.area.getY() - 1, this.area.getX() + this.area.getWidth(), this.area.getY(), CalciteInputSuggestor.this.color);
-                context.fill(this.area.getX(), this.area.getY() + this.area.getHeight(), this.area.getX() + this.area.getWidth(), this.area.getY() + this.area.getHeight() + 1, CalciteInputSuggestor.this.color);
-                if (bl) {
-                    for (k = 0; k < this.area.getWidth(); ++k) {
-                        if (k % 2 != 0) continue;
-                        context.fill(this.area.getX() + k, this.area.getY() - 1, this.area.getX() + k + 1, this.area.getY(), -1);
-                    }
-                }
-                if (bl2) {
-                    for (k = 0; k < this.area.getWidth(); ++k) {
-                        if (k % 2 != 0) continue;
-                        context.fill(this.area.getX() + k, this.area.getY() + this.area.getHeight(), this.area.getX() + k + 1, this.area.getY() + this.area.getHeight() + 1, -1);
-                    }
-                }
-            }
-            boolean bl52 = false;
-            for (int l = 0; l < i; ++l) {
-                Suggestion suggestion = this.suggestions.get(l + this.inWindowIndex);
-                context.fill(this.area.getX(), this.area.getY() + 12 * l, this.area.getX() + this.area.getWidth(), this.area.getY() + 12 * l + 12, CalciteInputSuggestor.this.color);
-                if (mouseX > this.area.getX() && mouseX < this.area.getX() + this.area.getWidth() && mouseY > this.area.getY() + 12 * l && mouseY < this.area.getY() + 12 * l + 12) {
-                    if (bl4) {
-                        this.select(l + this.inWindowIndex);
-                    }
-                    bl52 = true;
-                }
-                context.drawTextWithShadow(CalciteInputSuggestor.this.textRenderer, suggestion.getText(), this.area.getX() + 1, this.area.getY() + 2 + 12 * l, l + this.inWindowIndex == this.selection ? Colors.YELLOW : -5592406);
-            }
-            if (bl52 && (message = this.suggestions.get(this.selection).getTooltip()) != null) {
-                context.drawTooltip(CalciteInputSuggestor.this.textRenderer, Texts.toText(message), mouseX, mouseY);
-            }
-        }
-
-        public boolean mouseClicked(int x, int y, int button) {
-            if (!this.area.contains(x, y)) {
-                return false;
-            }
-            int i = (y - this.area.getY()) / 12 + this.inWindowIndex;
-            if (i >= 0 && i < this.suggestions.size()) {
-                this.select(i);
-                this.complete();
-            }
-            return true;
-        }
-
-        public boolean mouseScrolled(double amount) {
-            int i = (int) (CalciteInputSuggestor.this.client.mouse.getX() * (double) CalciteInputSuggestor.this.client.getWindow().getScaledWidth() / (double) CalciteInputSuggestor.this.client.getWindow().getWidth());
-            int j = (int) (CalciteInputSuggestor.this.client.mouse.getY() * (double) CalciteInputSuggestor.this.client.getWindow().getScaledHeight() / (double) CalciteInputSuggestor.this.client.getWindow().getHeight());
-            if (this.area.contains(i, j)) {
-                this.inWindowIndex = MathHelper.clamp((int) ((double) this.inWindowIndex - amount), 0, Math.max(this.suggestions.size() - CalciteInputSuggestor.this.maxSuggestionSize, 0));
-                return true;
-            }
-            return false;
-        }
-
-        public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-            if (keyCode == 265) {
-                this.scroll(-1);
-                this.completed = false;
-                return true;
-            }
-            if (keyCode == 264) {
-                this.scroll(1);
-                this.completed = false;
-                return true;
-            }
-            if (keyCode == 258) {
-                if (this.completed) {
-                    this.scroll(Screen.hasShiftDown() ? -1 : 1);
-                }
-                this.complete();
-                return true;
-            }
-            if (keyCode == 256) {
-                CalciteInputSuggestor.this.clearWindow();
-                CalciteInputSuggestor.this.textField.setSuggestion(null);
-                return true;
-            }
-            return false;
-        }
-
-        public void scroll(int offset) {
-            this.select(this.selection + offset);
-            int i = this.inWindowIndex;
-            int j = this.inWindowIndex + CalciteInputSuggestor.this.maxSuggestionSize - 1;
-            if (this.selection < i) {
-                this.inWindowIndex = MathHelper.clamp(this.selection, 0, Math.max(this.suggestions.size() - CalciteInputSuggestor.this.maxSuggestionSize, 0));
-            } else if (this.selection > j) {
-                this.inWindowIndex = MathHelper.clamp(this.selection + CalciteInputSuggestor.this.inWindowIndexOffset - CalciteInputSuggestor.this.maxSuggestionSize, 0, Math.max(this.suggestions.size() - CalciteInputSuggestor.this.maxSuggestionSize, 0));
-            }
-        }
-
-        public void select(int index) {
-            this.selection = index;
-            if (this.selection < 0) {
-                this.selection += this.suggestions.size();
-            }
-            if (this.selection >= this.suggestions.size()) {
-                this.selection -= this.suggestions.size();
-            }
-            Suggestion suggestion = this.suggestions.get(this.selection);
-            CalciteInputSuggestor.this.textField.setSuggestion(CalciteInputSuggestor.getSuggestionSuffix(CalciteInputSuggestor.this.textField.getText(), suggestion.apply(this.typedText)));
-            if (this.lastNarrationIndex != this.selection) {
-                CalciteInputSuggestor.this.client.getNarratorManager().narrate(this.getNarration());
-            }
-        }
-
-        public void complete() {
-            Suggestion suggestion = this.suggestions.get(this.selection);
-            CalciteInputSuggestor.this.completingSuggestions = true;
-            CalciteInputSuggestor.this.textField.setText(suggestion.apply(this.typedText));
-            int i = suggestion.getRange().getStart() + suggestion.getText().length();
-            CalciteInputSuggestor.this.textField.setSelectionStart(i);
-            CalciteInputSuggestor.this.textField.setSelectionEnd(i);
-            this.select(this.selection);
-            CalciteInputSuggestor.this.completingSuggestions = false;
-            this.completed = true;
-        }
-
-        Text getNarration() {
-            this.lastNarrationIndex = this.selection;
-            Suggestion suggestion = this.suggestions.get(this.selection);
-            Message message = suggestion.getTooltip();
-            if (message != null) {
-                return Text.translatable("narration.suggestion.tooltip", this.selection + 1, this.suggestions.size(), suggestion.getText(), Text.of(message));
-            }
-            return Text.translatable("narration.suggestion", this.selection + 1, this.suggestions.size(), suggestion.getText());
-        }
-    }
-}
-
diff --git a/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java b/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
index f16f9cc..c3d88e5 100644
--- a/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
+++ b/src/client/java/works/nuty/calcite/widget/CalciteTextFieldWidget.java
@@ -8,12 +8,12 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.screen.ButtonTextures;
+import net.minecraft.client.gui.screen.ChatInputSuggestor;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.screen.narration.NarrationPart;
-import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.sound.SoundManager;
 import net.minecraft.command.CommandSource;
@@ -28,7 +28,7 @@
 import org.jetbrains.annotations.Nullable;
 import works.nuty.calcite.CalciteModClient;
 import works.nuty.calcite.VerticalNbtTextFormatter;
-import works.nuty.calcite.screen.CalciteInputSuggestor;
+import works.nuty.calcite.mixin.client.ChatInputSuggestorFields;
 
 import java.util.List;
 import java.util.Objects;
@@ -38,8 +38,7 @@
 
 @Environment(value = EnvType.CLIENT)
 public class CalciteTextFieldWidget
-        extends ClickableWidget
-        implements Drawable {
+    extends TextFieldWidget {
     public static final int DEFAULT_EDITABLE_COLOR = 0xE0E0E0;
     private static final ButtonTextures TEXTURES = new ButtonTextures(new Identifier("widget/text_field"), new Identifier("widget/text_field_highlighted"));
     private static final int VERTICAL_CURSOR_COLOR = -3092272;
@@ -58,7 +57,7 @@ public class CalciteTextFieldWidget
     private int selectionEnd;
     private int editableColor = 0xE0E0E0;
     private int uneditableColor = 0x707070;
-    public CalciteInputSuggestor suggestor;
+    public ChatInputSuggestor suggestor;
     @Nullable
     private String suggestion;
     @Nullable
@@ -75,8 +74,8 @@ public CalciteTextFieldWidget(TextRenderer textRenderer, int x, int y, int width
         this(textRenderer, x, y, width, height, null, text);
     }
 
-    public CalciteTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, @Nullable net.minecraft.client.gui.widget.TextFieldWidget copyFrom, Text text) {
-        super(x, y, width, height, text);
+    public CalciteTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, @Nullable TextFieldWidget copyFrom, Text text) {
+        super(textRenderer, x, y, width, height, copyFrom, text);
         this.textRenderer = textRenderer;
         if (copyFrom != null) {
             this.setText(copyFrom.getText());
@@ -411,8 +410,8 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
             int displayedSelectionRight = left + this.textRenderer.getWidth(displayedString.substring(0, displayedSelectionEnd));
             this.drawSelectionHighlight(context, cursor2, top - 1, displayedSelectionRight - 1, top + 1 + this.textRenderer.fontHeight);
         }
-        if (isHovered() && suggestor.parse != null) {
-            var args = suggestor.parse.getContext().getLastChild().getArguments();
+        if (isHovered() && ((ChatInputSuggestorFields) suggestor).getParse() != null) {
+            var args = ((ChatInputSuggestorFields) suggestor).getParse().getContext().getLastChild().getArguments();
 
             for (String key : args.keySet()) {
                 ParsedArgument<CommandSource, ?> arg = args.get(key);
diff --git a/src/client/resources/calcite.client.mixins.json b/src/client/resources/calcite.client.mixins.json
index e104c9c..5764a11 100644
--- a/src/client/resources/calcite.client.mixins.json
+++ b/src/client/resources/calcite.client.mixins.json
@@ -3,10 +3,15 @@
   "package": "works.nuty.calcite.mixin.client",
   "compatibilityLevel": "JAVA_17",
   "client": [
+    "ChatInputSuggestorFields",
     "ClientPlayerEntityMixin",
-    "DataQueryHandlerMixin"
+    "DataQueryHandlerMixin",
+    "SuggestionWindowFields",
+    "SuggestionWindowMixin"
   ],
   "injectors": {
     "defaultRequire": 1
-	}
+  },
+  "mixins": [
+  ]
 }
\ No newline at end of file