diff --git a/Penumbra.Api b/Penumbra.Api
index 6d262cd3..2cbf4bac 160000
--- a/Penumbra.Api
+++ b/Penumbra.Api
@@ -1 +1 @@
-Subproject commit 6d262cd3181d44c29891c9473f7c423300320f15
+Subproject commit 2cbf4bace53a5749d3eab1ff03025a6e6bd9fc37
diff --git a/Penumbra.GameData b/Penumbra.GameData
index ab3ee0ee..9442f1d6 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit ab3ee0ee814e170b59e0c13b023bbb8bc9314c74
+Subproject commit 9442f1d60578dae7598cbb0a1ff545d24905bdfd
diff --git a/Penumbra/Services/StainService.cs b/Penumbra/Services/StainService.cs
index 0a437da0..b16d4dcd 100644
--- a/Penumbra/Services/StainService.cs
+++ b/Penumbra/Services/StainService.cs
@@ -16,7 +16,7 @@ namespace Penumbra.Services;
 public class StainService : IService
 {
     public sealed class StainTemplateCombo<TDyePack>(FilterComboColors[] stainCombos, StmFile<TDyePack> stmFile)
-        : FilterComboCache<ushort>(stmFile.Entries.Keys.Prepend((ushort)0), MouseWheelType.None, Penumbra.Log)
+        : FilterComboCache<StmKeyType>(stmFile.Entries.Keys.Prepend(0), MouseWheelType.None, Penumbra.Log)
         where TDyePack : unmanaged, IDyePack
     {
         // FIXME There might be a better way to handle that.
@@ -31,7 +31,7 @@ public class StainService : IService
             return baseSize + ImGui.GetTextLineHeight() * 3 + ImGui.GetStyle().ItemInnerSpacing.X * 3;
         }
 
-        protected override string ToString(ushort obj)
+        protected override string ToString(StmKeyType obj)
             => $"{obj,4}";
 
         protected override void DrawFilter(int currentSelected, float width)
diff --git a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ColorTable.cs b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ColorTable.cs
index f32a3dc9..0c987972 100644
--- a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ColorTable.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ColorTable.cs
@@ -607,7 +607,7 @@ public partial class MtrlTab
         if (_stainService.GudTemplateCombo.Draw("##dyeTemplate", dye.Template.ToString(), string.Empty,
                 scalarSize + ImGui.GetStyle().ScrollbarSize / 2, ImGui.GetTextLineHeightWithSpacing(), ImGuiComboFlags.NoArrowButton))
         {
-            dye.Template = _stainService.GudTemplateCombo.CurrentSelection;
+            dye.Template = _stainService.GudTemplateCombo.CurrentSelection.UShort;
             ret          = true;
         }
 
diff --git a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.LegacyColorTable.cs b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.LegacyColorTable.cs
index f21d86a9..0ffdd1cc 100644
--- a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.LegacyColorTable.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.LegacyColorTable.cs
@@ -184,7 +184,7 @@ public partial class MtrlTab
             if (_stainService.LegacyTemplateCombo.Draw("##dyeTemplate", dye.Template.ToString(), string.Empty, intSize
                   + ImGui.GetStyle().ScrollbarSize / 2, ImGui.GetTextLineHeightWithSpacing(), ImGuiComboFlags.NoArrowButton))
             {
-                dyeTable[rowIdx].Template = _stainService.LegacyTemplateCombo.CurrentSelection;
+                dyeTable[rowIdx].Template = _stainService.LegacyTemplateCombo.CurrentSelection.UShort;
                 ret                       = true;
             }
 
@@ -299,7 +299,7 @@ public partial class MtrlTab
             if (_stainService.LegacyTemplateCombo.Draw("##dyeTemplate", dye.Template.ToString(), string.Empty, intSize
                   + ImGui.GetStyle().ScrollbarSize / 2, ImGui.GetTextLineHeightWithSpacing(), ImGuiComboFlags.NoArrowButton))
             {
-                dyeTable[rowIdx].Template = _stainService.LegacyTemplateCombo.CurrentSelection;
+                dyeTable[rowIdx].Template = _stainService.LegacyTemplateCombo.CurrentSelection.UShort;
                 ret                       = true;
             }