diff --git a/OtterGui b/OtterGui
index a79abe20..201dd38e 160000
--- a/OtterGui
+++ b/OtterGui
@@ -1 +1 @@
-Subproject commit a79abe203da2673f71a4e31422c6058375fb8dec
+Subproject commit 201dd38e88ebc1762070b8e691d2600375f5c8a4
diff --git a/Penumbra.GameData/Structs/CharacterArmor.cs b/Penumbra.GameData/Structs/CharacterArmor.cs
index 9027a5cf..7351bc48 100644
--- a/Penumbra.GameData/Structs/CharacterArmor.cs
+++ b/Penumbra.GameData/Structs/CharacterArmor.cs
@@ -31,11 +31,11 @@ public struct CharacterArmor : IEquatable<CharacterArmor>
     public readonly CharacterArmor With(StainId stain)
         => new(Set, Variant, stain);
 
-    public readonly CharacterWeapon ToWeapon()
-        => new(Set, 0, Variant, Stain);
+    public readonly CharacterWeapon ToWeapon(WeaponType type)
+        => new(Set, type, Variant, Stain);
 
-    public readonly CharacterWeapon ToWeapon(StainId stain)
-        => new(Set, 0, Variant, stain);
+    public readonly CharacterWeapon ToWeapon(WeaponType type, StainId stain)
+        => new(Set, type, Variant, stain);
 
     public override readonly string ToString()
         => $"{Set},{Variant},{Stain}";
diff --git a/Penumbra.GameData/Structs/CharacterWeapon.cs b/Penumbra.GameData/Structs/CharacterWeapon.cs
index a1f2dd11..c86dd467 100644
--- a/Penumbra.GameData/Structs/CharacterWeapon.cs
+++ b/Penumbra.GameData/Structs/CharacterWeapon.cs
@@ -40,6 +40,9 @@ public struct CharacterWeapon : IEquatable<CharacterWeapon>
         Stain   = (StainId)(value >> 48);
     }
 
+    public readonly CharacterWeapon With(StainId stain)
+        => new(Set, Type, Variant, stain);
+
     public readonly CharacterArmor ToArmor()
         => new(Set, (byte)Variant, Stain);