diff --git a/Dalamud/Game/UnlockState/UnlockState.cs b/Dalamud/Game/UnlockState/UnlockState.cs
index cc70a524c..1878f54db 100644
--- a/Dalamud/Game/UnlockState/UnlockState.cs
+++ b/Dalamud/Game/UnlockState/UnlockState.cs
@@ -267,26 +267,26 @@ internal unsafe class UnlockState : IInternalDisposableService, IUnlockState
         switch ((ItemActionAction)row.ItemAction.Value.Action.RowId)
         {
             case ItemActionAction.Companion:
-                return UIState.Instance()->IsCompanionUnlocked(row.ItemAction.Value.Data[0]);
+                return UIState.Instance()->IsCompanionUnlocked(row.ItemAction.Value.Data[0].RowId);
 
             case ItemActionAction.BuddyEquip:
-                return UIState.Instance()->Buddy.CompanionInfo.IsBuddyEquipUnlocked(row.ItemAction.Value.Data[0]);
+                return UIState.Instance()->Buddy.CompanionInfo.IsBuddyEquipUnlocked(row.ItemAction.Value.Data[0].RowId);
 
             case ItemActionAction.Mount:
-                return PlayerState.Instance()->IsMountUnlocked(row.ItemAction.Value.Data[0]);
+                return PlayerState.Instance()->IsMountUnlocked(row.ItemAction.Value.Data[0].RowId);
 
             case ItemActionAction.SecretRecipeBook:
-                return PlayerState.Instance()->IsSecretRecipeBookUnlocked(row.ItemAction.Value.Data[0]);
+                return PlayerState.Instance()->IsSecretRecipeBookUnlocked(row.ItemAction.Value.Data[0].RowId);
 
             case ItemActionAction.UnlockLink:
             case ItemActionAction.OccultRecords:
-                return UIState.Instance()->IsUnlockLinkUnlocked(row.ItemAction.Value.Data[0]);
+                return UIState.Instance()->IsUnlockLinkUnlocked(row.ItemAction.Value.Data[0].RowId);
 
             case ItemActionAction.TripleTriadCard when row.AdditionalData.Is<TripleTriadCard>():
                 return UIState.Instance()->IsTripleTriadCardUnlocked((ushort)row.AdditionalData.RowId);
 
             case ItemActionAction.FolkloreTome:
-                return PlayerState.Instance()->IsFolkloreBookUnlocked(row.ItemAction.Value.Data[0]);
+                return PlayerState.Instance()->IsFolkloreBookUnlocked(row.ItemAction.Value.Data[0].RowId);
 
             case ItemActionAction.OrchestrionRoll when row.AdditionalData.Is<Orchestrion>():
                 return PlayerState.Instance()->IsOrchestrionRollUnlocked(row.AdditionalData.RowId);
@@ -295,13 +295,13 @@ internal unsafe class UnlockState : IInternalDisposableService, IUnlockState
                 return PlayerState.Instance()->IsFramersKitUnlocked(row.AdditionalData.RowId);
 
             case ItemActionAction.Ornament:
-                return PlayerState.Instance()->IsOrnamentUnlocked(row.ItemAction.Value.Data[0]);
+                return PlayerState.Instance()->IsOrnamentUnlocked(row.ItemAction.Value.Data[0].RowId);
 
             case ItemActionAction.Glasses:
                 return PlayerState.Instance()->IsGlassesUnlocked((ushort)row.AdditionalData.RowId);
 
             case ItemActionAction.SoulShards when PublicContentOccultCrescent.GetState() is var occultCrescentState && occultCrescentState != null:
-                var supportJobId = (byte)row.ItemAction.Value.Data[0];
+                var supportJobId = (byte)row.ItemAction.Value.Data[0].RowId;
                 return supportJobId < occultCrescentState->SupportJobLevels.Length && occultCrescentState->SupportJobLevels[supportJobId] != 0;
 
             case ItemActionAction.CompanySealVouchers:
diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs
index 3550f053c..fd3f1d11c 100644
--- a/Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs
+++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs
@@ -126,17 +126,17 @@ internal class UiColorWidget : IDataWindowWidget
                 ImGui.TableNextColumn();
                 ImGui.AlignTextToFramePadding();
                 ImGui.PushID($"row{id}_white");
-                if (this.DrawColorColumn(row.Unknown0) &&
+                if (this.DrawColorColumn(row.ClearWhite) &&
                     adjacentRow.HasValue)
-                    DrawEdgePreview(id, row.Unknown0, adjacentRow.Value.Unknown0);
+                    DrawEdgePreview(id, row.ClearWhite, adjacentRow.Value.ClearWhite);
                 ImGui.PopID();
 
                 ImGui.TableNextColumn();
                 ImGui.AlignTextToFramePadding();
                 ImGui.PushID($"row{id}_green");
-                if (this.DrawColorColumn(row.Unknown1) &&
+                if (this.DrawColorColumn(row.ClearGreen) &&
                     adjacentRow.HasValue)
-                    DrawEdgePreview(id, row.Unknown1, adjacentRow.Value.Unknown1);
+                    DrawEdgePreview(id, row.ClearGreen, adjacentRow.Value.ClearGreen);
                 ImGui.PopID();
             }
         }