diff --git a/src/api/java/mcp/mobius/waila/api/component/NamedItemComponent.java b/src/api/java/mcp/mobius/waila/api/component/NamedItemComponent.java
index 00383b1be..0483a6606 100644
--- a/src/api/java/mcp/mobius/waila/api/component/NamedItemComponent.java
+++ b/src/api/java/mcp/mobius/waila/api/component/NamedItemComponent.java
@@ -1,12 +1,13 @@
 package mcp.mobius.waila.api.component;
 
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import mcp.mobius.waila.api.ITooltipComponent;
 import mcp.mobius.waila.api.WailaHelper;
 import mcp.mobius.waila.api.__internal__.ApiSide;
 import mcp.mobius.waila.api.__internal__.IApiService;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
 
@@ -44,15 +45,17 @@ public int getHeight() {
     }
 
     @Override
-    public void render(GuiGraphics ctx, int x, int y, float delta) {
-        var pose = ctx.pose();
+    public void render(PoseStack matrices, int x, int y, float delta) {
+        var pose = RenderSystem.getModelViewStack();
         pose.pushPose();
         pose.translate(x, y, 0);
         pose.scale(0.5f, 0.5f, 0.5f);
-        ctx.renderItem(stack, 0, 0);
+        RenderSystem.applyModelViewMatrix();
+        Minecraft.getInstance().getItemRenderer().renderGuiItem(stack, 0, 0);
         pose.popPose();
+        RenderSystem.applyModelViewMatrix();
 
-        ctx.drawString(getFont(), label, x + 10, y, IApiService.INSTANCE.getFontColor());
+        getFont().drawShadow(matrices, label, x + 10, y, IApiService.INSTANCE.getFontColor());
     }
 
     private Font getFont() {
diff --git a/src/api/java/mcp/mobius/waila/api/component/NamedItemListComponent.java b/src/api/java/mcp/mobius/waila/api/component/NamedItemListComponent.java
index 8e71a30b6..68fdc7394 100644
--- a/src/api/java/mcp/mobius/waila/api/component/NamedItemListComponent.java
+++ b/src/api/java/mcp/mobius/waila/api/component/NamedItemListComponent.java
@@ -3,12 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import mcp.mobius.waila.api.ITooltipComponent;
 import mcp.mobius.waila.api.__internal__.ApiSide;
 import mcp.mobius.waila.api.__internal__.IApiService;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.world.item.ItemStack;
 
 /**
@@ -57,16 +57,16 @@ public int getHeight() {
     }
 
     @Override
-    public void render(GuiGraphics ctx, int x, int y, float delta) {
+    public void render(PoseStack matrices, int x, int y, float delta) {
         var iy = y;
 
         for (var component : components) {
-            component.render(ctx, x, iy, delta);
+            component.render(matrices, x, iy, delta);
             iy += component.getHeight();
         }
 
         if (hasOverflow) {
-            ctx.drawString(getFont(), MORE, x + 10, iy, IApiService.INSTANCE.getFontColor());
+            getFont().drawShadow(matrices, MORE, x + 10, iy, IApiService.INSTANCE.getFontColor());
         }
     }