diff --git a/Luna b/Luna
index fbfe51b4..4b346670 160000
--- a/Luna
+++ b/Luna
@@ -1 +1 @@
-Subproject commit fbfe51b4c39b0f094678f1017f7688632e8f61b8
+Subproject commit 4b346670840c3ae0ef33a3f94445ff9c2f55559e
diff --git a/Penumbra/Api/Api/UiApi.cs b/Penumbra/Api/Api/UiApi.cs
index 3d801376..5e3bb800 100644
--- a/Penumbra/Api/Api/UiApi.cs
+++ b/Penumbra/Api/Api/UiApi.cs
@@ -84,12 +84,6 @@ public class UiApi : IPenumbraApiUi, Luna.IApiService, IDisposable
     public void CloseMainWindow()
         => _mainWindow.IsOpen = false;
 
-    public PenumbraApiEc RegisterSettingsSection(Action draw)
-        => throw new NotImplementedException();
-
-    public PenumbraApiEc UnregisterSettingsSection(Action draw)
-        => throw new NotImplementedException();
-
     private void OnChangedItemClick(in ChangedItemClick.Arguments arguments)
     {
         if (ChangedItemClicked == null)
diff --git a/Penumbra/Api/IpcTester/CollectionsIpcTester.cs b/Penumbra/Api/IpcTester/CollectionsIpcTester.cs
index 5edcc4cb..121fdd45 100644
--- a/Penumbra/Api/IpcTester/CollectionsIpcTester.cs
+++ b/Penumbra/Api/IpcTester/CollectionsIpcTester.cs
@@ -151,9 +151,9 @@ public class CollectionsIpcTester(IDalamudPluginInterface pi) : IUiService
                 Im.Popup.Open("Changed Item List"u8);
             }
         }
-        IpcTester.DrawIntro(RedrawCollectionMembers.Label, "Redraw Collection Members");
-        if (ImGui.Button("Redraw##ObjectCollection"))
-             new RedrawCollectionMembers(pi).Invoke(collectionList[0].Id, RedrawType.Redraw);
+        IpcTester.DrawIntro(RedrawCollectionMembers.LabelU8, "Redraw Collection Members"u8);
+        if (Im.Button("Redraw##ObjectCollection"u8))
+             new RedrawCollectionMembers(pi).Invoke(_collectionId.GetValueOrDefault(Guid.Empty), RedrawType.Redraw);
             
     }
 
diff --git a/Penumbra/UI/ModsTab/RedrawFooter.cs b/Penumbra/UI/ModsTab/RedrawFooter.cs
index 72655285..db5a098b 100644
--- a/Penumbra/UI/ModsTab/RedrawFooter.cs
+++ b/Penumbra/UI/ModsTab/RedrawFooter.cs
@@ -1,4 +1,4 @@
-using Dalamud.Game.ClientState.Objects;
+using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using ImSharp;
 using Luna;
diff --git a/Penumbra/UI/Tabs/ModsTab.cs b/Penumbra/UI/Tabs/ModsTab.cs
index e0da43f8..3abcadcd 100644
--- a/Penumbra/UI/Tabs/ModsTab.cs
+++ b/Penumbra/UI/Tabs/ModsTab.cs
@@ -1,4 +1,4 @@
-using Dalamud.Game.ClientState.Objects;
+using Dalamud.Plugin.Services;
 using Penumbra.UI.Classes;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using ImSharp;
diff --git a/Penumbra/UI/Tabs/SettingsTab.cs b/Penumbra/UI/Tabs/SettingsTab.cs
index 3e387dc7..c1669cbf 100644
--- a/Penumbra/UI/Tabs/SettingsTab.cs
+++ b/Penumbra/UI/Tabs/SettingsTab.cs
@@ -789,8 +789,8 @@ public sealed class SettingsTab : ITab<TabType>
             "Edit the raw matrix components of tile UV transforms, instead of having them decomposed into scale, rotation and shear."u8,
             _config.EditRawTileTransforms, v => _config.EditRawTileTransforms = v);
 
-        Checkbox("Advanced Editing: Always Highlight Color Row Pair when Hovering Selection Button",
-            "Make the whole color row pair selection button highlight the pair in game, instead of just the crosshair, even without holding Control.",
+        Checkbox("Advanced Editing: Always Highlight Color Row Pair when Hovering Selection Button"u8,
+            "Make the whole color row pair selection button highlight the pair in game, instead of just the crosshair, even without holding Control."u8,
             _config.WholePairSelectorAlwaysHighlights, v => _config.WholePairSelectorAlwaysHighlights = v);
     }