diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e0e9bb..c0386f5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Setup Dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.x
+        dotnet-version: 9.x
         source-url: https://nuget.pkg.github.com/ResoniteModdingGroup/index.json
     
     - name: Add MonkeyLoader NuGet Source
@@ -98,7 +98,7 @@ jobs:
     - name: Setup Dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.x
+        dotnet-version: 9.x
         source-url: https://nuget.pkg.github.com/ResoniteModdingGroup/index.json
 
     - name: Add MonkeyLoader NuGet Source
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 059338c..3fe7a28 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -68,7 +68,7 @@ jobs:
       - name: Setup Dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.x
+          dotnet-version: 9.x
           source-url: https://nuget.pkg.github.com/ResoniteModdingGroup/index.json
 
       - name: Add MonkeyLoader NuGet Source
diff --git a/ComponentSelectorAdditions/ComponentResult.cs b/ComponentSelectorAdditions/ComponentResult.cs
index 57ced2a..aac0201 100644
--- a/ComponentSelectorAdditions/ComponentResult.cs
+++ b/ComponentSelectorAdditions/ComponentResult.cs
@@ -86,7 +86,7 @@ public ComponentResult(CategoryNode<Type>? category, Type type, string? group)
         }
 
         /// <inheritdoc/>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
             => obj is ComponentResult otherResult && otherResult.Type == Type;
 
         /// <inheritdoc/>
diff --git a/ComponentSelectorAdditions/ComponentSelectorAdditions.csproj b/ComponentSelectorAdditions/ComponentSelectorAdditions.csproj
index 0bb020d..cdee5bf 100644
--- a/ComponentSelectorAdditions/ComponentSelectorAdditions.csproj
+++ b/ComponentSelectorAdditions/ComponentSelectorAdditions.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyTitle>ComponentSelectorAdditions</AssemblyTitle>
     <AssemblyFileName>$(AssemblyTitle).dll</AssemblyFileName>
     <RootNamespace>ComponentSelectorAdditions</RootNamespace>
@@ -11,11 +10,12 @@
     <PackageId>ComponentSelectorAdditions</PackageId>
     <Title>Component Selector Additions</Title>
     <Authors>Banane9</Authors>
-    <Version>0.9.0-beta</Version>
+    <Version>0.10.0-beta</Version>
     <Description>This MonkeyLoader mod for Resonite overhauls the Component Selector / Protoflux Node Selector to have a search, as well as favorites and recents categories.</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/ResoniteModdingGroup/ComponentSelectorAdditions</PackageProjectUrl>
+    <RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
     <PackageTags>mod; mods; monkeyloader; resonite; component; attacher; selector; protoflux; node; picker; search; favorites</PackageTags>
   </PropertyGroup>
   
@@ -30,18 +30,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MicroUtils.HarmonyAnalyzers" Version="1.4.0">
+    <PackageReference Include="MicroUtils.HarmonyAnalyzers" Version="1.6.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MonkeyLoader.GamePacks.Resonite" Version="0.22.1-beta" />
+    <PackageReference Include="MonkeyLoader.GamePacks.Resonite" Version="0.24.1-beta" />
     <PackageReference Include="PolySharp" Version="1.15.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Resonite.Elements.Assets" Version="1.3.3" />
-    <PackageReference Include="Resonite.Elements.Core" Version="1.4.3" />
+    <PackageReference Include="Resonite.Elements.Core" Version="1.4.9.4" />
     <PackageReference Include="Resonite.Elements.Quantity" Version="1.2.3" />
-    <PackageReference Include="Resonite.FrooxEngine" Version="2025.3.21.23" />
+    <PackageReference Include="Resonite.FrooxEngine" Version="2025.8.25.222" />
   </ItemGroup>
 </Project>
diff --git a/ComponentSelectorAdditions/Events/BuildButtonEvent.cs b/ComponentSelectorAdditions/Events/BuildButtonEvent.cs
index 8ab6778..9ea6e70 100644
--- a/ComponentSelectorAdditions/Events/BuildButtonEvent.cs
+++ b/ComponentSelectorAdditions/Events/BuildButtonEvent.cs
@@ -9,13 +9,49 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Abstract base class for button generation events.
+    /// </summary>
     public abstract class BuildButtonEvent : CancelableBuildUIEvent
     {
+        /// <summary>
+        /// Gets whether the target of the button being generated is
+        /// a direct <see cref="CategoryNode{T}.Elements">element</see>
+        /// of the current <see cref="RootCategory">root category</see>.
+        /// </summary>
         public bool IsDirectItem { get; }
+
+        /// <summary>
+        /// Gets the category that the target of the button belongs to, if available.
+        /// </summary>
         public CategoryNode<Type>? ItemCategory { get; }
+
+        /// <summary>
+        /// Gets the current root category of the <see cref="ComponentSelector">selector</see>
+        /// that the button is being generated for, if available.
+        /// </summary>
         public CategoryNode<Type>? RootCategory { get; }
+
+        /// <summary>
+        /// Gets the selector that the button is being generated for.
+        /// </summary>
         public ComponentSelector Selector { get; }
 
+        /// <summary>
+        /// Creates a new button generation event with the given data.
+        /// </summary>
+        /// <param name="selector">The selector that the button is being generated for.</param>
+        /// <param name="ui">The <see cref="UIBuilder"/> to use while generating extra UI elements.</param>
+        /// <param name="rootCategory">
+        /// The current root category of the <see cref="ComponentSelector">selector</see>
+        /// that the button is being generated for, if available.
+        /// </param>
+        /// <param name="itemCategory">The category that the target of the button belongs to, if available.</param>
+        /// <param name="isDirectItem">
+        /// Whether the target of the button being generated is
+        /// a direct <see cref="CategoryNode{T}.Elements">element</see>
+        /// of the current <see cref="RootCategory">root category</see>.
+        /// </param>
         protected BuildButtonEvent(ComponentSelector selector, UIBuilder ui, CategoryNode<Type>? rootCategory, CategoryNode<Type>? itemCategory, bool isDirectItem) : base(ui)
         {
             Selector = selector;
diff --git a/ComponentSelectorAdditions/Events/BuildCategoryButtonEvent.cs b/ComponentSelectorAdditions/Events/BuildCategoryButtonEvent.cs
index ad1f4f2..a54444d 100644
--- a/ComponentSelectorAdditions/Events/BuildCategoryButtonEvent.cs
+++ b/ComponentSelectorAdditions/Events/BuildCategoryButtonEvent.cs
@@ -8,6 +8,13 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Represents the event data for the Build Category Button Event.
+    /// </summary>
+    /// <remarks>
+    /// This is used to generate the button for opening a nested
+    /// <see cref="CategoryNode{T}">category</see> in a <see cref="ComponentSelector">selector</see>.
+    /// </remarks>
     public sealed class BuildCategoryButtonEvent : BuildButtonEvent
     {
         /// <inheritdoc/>
diff --git a/ComponentSelectorAdditions/Events/BuildComponentButtonEvent.cs b/ComponentSelectorAdditions/Events/BuildComponentButtonEvent.cs
index 5e044a4..48ae7b2 100644
--- a/ComponentSelectorAdditions/Events/BuildComponentButtonEvent.cs
+++ b/ComponentSelectorAdditions/Events/BuildComponentButtonEvent.cs
@@ -8,10 +8,23 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Represents the event data for the Build Component Button Event.
+    /// </summary>
+    /// <remarks>
+    /// This is used to generate the button to attach a concrete component,
+    /// or to open the custom generic selection page for open generics.
+    /// </remarks>
     public sealed class BuildComponentButtonEvent : BuildButtonEvent
     {
+        /// <summary>
+        /// Gets the component result that the button targets.
+        /// </summary>
         public ComponentResult Component { get; }
 
+        /// <summary>
+        /// Gets the current selector path.
+        /// </summary>
         public SelectorPath Path { get; }
 
         /// <inheritdoc/>
diff --git a/ComponentSelectorAdditions/Events/BuildCustomGenericBuilder.cs b/ComponentSelectorAdditions/Events/BuildCustomGenericBuilder.cs
index f1b273f..c38198a 100644
--- a/ComponentSelectorAdditions/Events/BuildCustomGenericBuilder.cs
+++ b/ComponentSelectorAdditions/Events/BuildCustomGenericBuilder.cs
@@ -11,13 +11,27 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Represents the event data for the Build Custom Generic Builder Event.
+    /// </summary>
+    /// <remarks>
+    /// This is used to generate the UI for picking custom generic arguments for generic components.
+    /// </remarks>
     public sealed class BuildCustomGenericBuilder : BuildUIEvent
     {
         internal readonly HashSet<Button> OtherAddedButtonsSet = new();
 
+        /// <summary>
+        /// Gets or sets whether a create custom type button has been added already during this event.
+        /// </summary>
+        /// <value><see langword="true"/> if a create custom type button has been added; otherwise, <see langword="false"/>.</value>
         [MemberNotNullWhen(true, nameof(CreateCustomTypeButton))]
         public bool AddsCreateCustomTypeButton => CreateCustomTypeButton is not null;
 
+        /// <summary>
+        /// Gets or sets whether the inputs for generic arguments have been added already during this event.
+        /// </summary>
+        /// <value><see langword="true"/> if the inputs for generic arguments have been added; otherwise, <see langword="false"/>.</value>
         public bool AddsGenericArgumentInputs { get; set; }
 
         /// <summary>
@@ -34,8 +48,19 @@ public sealed class BuildCustomGenericBuilder : BuildUIEvent
         /// </summary>
         public Button? CreateCustomTypeButton { get; set; }
 
+        /// <summary>
+        /// Gets the generic arguments that inputs need to be generated for.
+        /// </summary>
         public Type[] GenericArguments { get; }
+
+        /// <summary>
+        /// Gets the other buttons that have been added to the custom generic builder.
+        /// </summary>
         public IEnumerable<Button> OtherAddedButtons => OtherAddedButtonsSet.AsSafeEnumerable();
+
+        /// <summary>
+        /// Gets the selector that the custom generic builder is being build for.
+        /// </summary>
         public ComponentSelector Selector { get; }
 
         internal BuildCustomGenericBuilder(ComponentSelector selector, UIBuilder ui, Type component) : base(ui)
@@ -45,12 +70,27 @@ internal BuildCustomGenericBuilder(ComponentSelector selector, UIBuilder ui, Typ
             GenericArguments = component.GetGenericArguments();
         }
 
+        /// <summary>
+        /// Adds <see cref="OtherAddedButtons">another</see> button to the custom generic builder.
+        /// </summary>
+        /// <param name="button">The button to add.</param>
+        /// <returns><see langword="true"/> if it was newly added; otherwise, <see langword="false"/>.</returns>
         public bool AddOtherButton(Button button)
             => OtherAddedButtonsSet.Add(button);
 
+        /// <summary>
+        /// Determines whether <see cref="OtherAddedButtons">another</see> button is already part of the custom generic builder.
+        /// </summary>
+        /// <param name="button">The button to check for.</param>
+        /// <returns><see langword="true"/> if it was found; otherwise, <see langword="false"/>.</returns>
         public bool HasOtherButton(Button button)
             => OtherAddedButtonsSet.Contains(button);
 
+        /// <summary>
+        /// Removes <see cref="OtherAddedButtons">another</see> button from the custom generic builder.
+        /// </summary>
+        /// <param name="button">The button to remove.</param>
+        /// <returns><see langword="true"/> if it was found and removed; otherwise, <see langword="false"/>.</returns>
         public bool RemoveOtherButton(Button button)
             => OtherAddedButtonsSet.Remove(button);
     }
diff --git a/ComponentSelectorAdditions/Events/BuildGroupButtonEvent.cs b/ComponentSelectorAdditions/Events/BuildGroupButtonEvent.cs
index 2a235ec..7cdf249 100644
--- a/ComponentSelectorAdditions/Events/BuildGroupButtonEvent.cs
+++ b/ComponentSelectorAdditions/Events/BuildGroupButtonEvent.cs
@@ -8,9 +8,22 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Represents the event data for the Build Group Button Event.
+    /// </summary>
+    /// <remarks>
+    /// This is used to generate the button to open a group of components.
+    /// </remarks>
     public sealed class BuildGroupButtonEvent : BuildButtonEvent
     {
+        /// <summary>
+        /// Gets the group identifier that the button targets.
+        /// </summary>
         public string Group { get; }
+
+        /// <summary>
+        /// Gets the group name that the button should show.
+        /// </summary>
         public string GroupName { get; }
 
         /// <inheritdoc/>
diff --git a/ComponentSelectorAdditions/Events/BuildSelectorEvent.cs b/ComponentSelectorAdditions/Events/BuildSelectorEvent.cs
index f7a5363..75d18a7 100644
--- a/ComponentSelectorAdditions/Events/BuildSelectorEvent.cs
+++ b/ComponentSelectorAdditions/Events/BuildSelectorEvent.cs
@@ -6,16 +6,40 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Abstract base class for Build Selector Events.
+    /// </summary>
     public abstract class BuildSelectorEvent : BuildUIEvent
     {
+        /// <summary>
+        /// Gets or sets whether a back button has been added already during this event.
+        /// </summary>
+        /// <value><see langword="true"/> if a back button has been added; otherwise, <see langword="false"/>.</value>
         public bool AddsBackButton { get; set; }
+
+        /// <summary>
+        /// Gets or sets whether a cancel button has been added already during this event.
+        /// </summary>
+        /// <value><see langword="true"/> if a cancel button has been added; otherwise, <see langword="false"/>.</value>
         public bool AddsCancelButton { get; set; }
 
+        /// <summary>
+        /// Gets or sets whether a <see cref="SearchBar">search bar</see> has been added already during this event.
+        /// </summary>
+        /// <value><see langword="true"/> if a search bar has been added; otherwise, <see langword="false"/>.</value>
         [MemberNotNullWhen(true, nameof(SearchBar))]
         public bool AddsSearchBar => SearchBar is not null;
 
+        /// <summary>
+        /// Gets or sets the search bar that has been added.
+        /// </summary>
         public SelectorSearchBar? SearchBar { get; set; }
+
+        /// <summary>
+        /// Gets the selector that is being build.
+        /// </summary>
         public ComponentSelector Selector { get; }
+
         internal Action<SelectorPath, bool>? SelectorUIChangedHandlers => SelectorUIChanged;
 
         internal BuildSelectorEvent(ComponentSelector selector, UIBuilder ui) : base(ui)
@@ -23,6 +47,13 @@ internal BuildSelectorEvent(ComponentSelector selector, UIBuilder ui) : base(ui)
             Selector = selector;
         }
 
+        /// <summary>
+        /// Fired when the selector UI is changed.<br/>
+        /// The <see langword="bool"/> determines, whether the back button should be shown.
+        /// </summary>
+        /// <remarks>
+        /// This allows UI generated from this event to respond to changes in the path or back button state.
+        /// </remarks>
         public event Action<SelectorPath, bool>? SelectorUIChanged;
     }
 }
\ No newline at end of file
diff --git a/ComponentSelectorAdditions/Events/BuildSelectorFooterEvent.cs b/ComponentSelectorAdditions/Events/BuildSelectorFooterEvent.cs
index f2b4a93..682cee6 100644
--- a/ComponentSelectorAdditions/Events/BuildSelectorFooterEvent.cs
+++ b/ComponentSelectorAdditions/Events/BuildSelectorFooterEvent.cs
@@ -4,12 +4,23 @@
 namespace ComponentSelectorAdditions.Events
 {
     /// <summary>
-    /// Represents the event fired when a <see cref="ComponentSelector"/>'s footer is constructed.
+    /// Represents the event data for the Build Selector Footer Event.
     /// </summary>
+    /// <remarks>
+    /// Fired when a <see cref="ComponentSelector"/>'s footer is constructed.
+    /// </remarks>
     public sealed class BuildSelectorFooterEvent : BuildSelectorEvent
     {
+        /// <summary>
+        /// Gets whether a back button was already added in
+        /// the <see cref="BuildSelectorHeaderEvent">header</see>.
+        /// </summary>
         public bool HasBackButton { get; }
 
+        /// <summary>
+        /// Gets whether a cancel button was already added in
+        /// the <see cref="BuildSelectorHeaderEvent">header</see>.
+        /// </summary>
         public bool HasCancelButton { get; }
 
         internal BuildSelectorFooterEvent(ComponentSelector selector, UIBuilder ui, SelectorSearchBar? searchBar, bool hasBackButton, bool hasCancelButton)
diff --git a/ComponentSelectorAdditions/Events/BuildSelectorHeaderEvent.cs b/ComponentSelectorAdditions/Events/BuildSelectorHeaderEvent.cs
index 0ad8f70..35f47f0 100644
--- a/ComponentSelectorAdditions/Events/BuildSelectorHeaderEvent.cs
+++ b/ComponentSelectorAdditions/Events/BuildSelectorHeaderEvent.cs
@@ -3,6 +3,12 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Represents the event data for the Build Selector Footer Event.
+    /// </summary>
+    /// <remarks>
+    /// Fired when a <see cref="ComponentSelector"/>'s header is constructed.
+    /// </remarks>
     public sealed class BuildSelectorHeaderEvent : BuildSelectorEvent
     {
         /// <inheritdoc/>
diff --git a/ComponentSelectorAdditions/Events/EnumerateCategoriesEvent.cs b/ComponentSelectorAdditions/Events/EnumerateCategoriesEvent.cs
index b6df279..a3e691e 100644
--- a/ComponentSelectorAdditions/Events/EnumerateCategoriesEvent.cs
+++ b/ComponentSelectorAdditions/Events/EnumerateCategoriesEvent.cs
@@ -6,20 +6,31 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Represents the event data for the Enumerate Categories Event.
+    /// </summary>
+    /// <remarks>
+    /// Fired to enumerate the categories to show in the <see cref="ComponentSelector">selector</see>.
+    /// </remarks>
     public sealed class EnumerateCategoriesEvent : CancelableSortedItemsEvent<CategoryNode<Type>>, IEnumerateSelectorResultEvent
     {
+        /// <summary>
+        /// Gets the sorted categories that should be shown in the <see cref="ComponentSelector">selector</see>.
+        /// </summary>
         public override IEnumerable<CategoryNode<Type>> Items
             => sortableItems.OrderBy(entry => entry.Value)
                 .ThenBy(entry => entry.Key.Name)
                 .Select(entry => entry.Key);
 
+        /// <inheritdoc/>
         public SelectorPath Path { get; }
 
+        /// <inheritdoc/>
         public CategoryNode<Type> RootCategory { get; }
 
+        /// <inheritdoc/>
         public ComponentSelector Selector { get; }
 
-        /// <inheritdoc/>
         internal EnumerateCategoriesEvent(ComponentSelector selector, SelectorPath path, CategoryNode<Type> rootCategory)
         {
             Selector = selector;
diff --git a/ComponentSelectorAdditions/Events/EnumerateComponentsEvent.cs b/ComponentSelectorAdditions/Events/EnumerateComponentsEvent.cs
index 3e46533..1d81a5d 100644
--- a/ComponentSelectorAdditions/Events/EnumerateComponentsEvent.cs
+++ b/ComponentSelectorAdditions/Events/EnumerateComponentsEvent.cs
@@ -7,10 +7,22 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Represents the event data for the Enumerate Components Event.
+    /// </summary>
+    /// <remarks>
+    /// Fired to enumerate the components to show in the <see cref="ComponentSelector">selector</see>.
+    /// </remarks>
     public sealed class EnumerateComponentsEvent : CancelableSortedItemsEvent<ComponentResult>, IEnumerateSelectorResultEvent
     {
+        /// <summary>
+        /// Gets the predicate that determines whether a given type should be included.
+        /// </summary>
         public Predicate<Type> ComponentFilter { get; }
 
+        /// <summary>
+        /// Gets the sorted components that should be shown in the <see cref="ComponentSelector">selector</see>.
+        /// </summary>
         public override IEnumerable<ComponentResult> Items
         {
             get
@@ -29,13 +41,15 @@ public override IEnumerable<ComponentResult> Items
             }
         }
 
+        /// <inheritdoc/>
         public SelectorPath Path { get; }
 
+        /// <inheritdoc/>
         public CategoryNode<Type> RootCategory { get; }
 
+        /// <inheritdoc/>
         public ComponentSelector Selector { get; }
 
-        /// <inheritdoc/>
         internal EnumerateComponentsEvent(ComponentSelector selector, SelectorPath path, CategoryNode<Type> rootCategory, Predicate<Type> componentFilter)
         {
             Selector = selector;
diff --git a/ComponentSelectorAdditions/Events/EnumerateConcreteGenericsEvent.cs b/ComponentSelectorAdditions/Events/EnumerateConcreteGenericsEvent.cs
index f47686f..68f9f2c 100644
--- a/ComponentSelectorAdditions/Events/EnumerateConcreteGenericsEvent.cs
+++ b/ComponentSelectorAdditions/Events/EnumerateConcreteGenericsEvent.cs
@@ -6,7 +6,13 @@
 
 namespace ComponentSelectorAdditions.Events
 {
-    public class EnumerateConcreteGenericsEvent : SortedItemsEvent<Type>
+    /// <summary>
+    /// Represents the event data for the Enumerate Concrete Generics Event.
+    /// </summary>
+    /// <remarks>
+    /// Fired to enumerate the components to show in the <see cref="ComponentSelector">selector</see>.
+    /// </remarks>
+    public sealed class EnumerateConcreteGenericsEvent : SortedItemsEvent<Type>
     {
         /// <summary>
         /// Gets the Type of the <see cref="FrooxEngine.Component"/>
@@ -14,13 +20,19 @@ public class EnumerateConcreteGenericsEvent : SortedItemsEvent<Type>
         /// </summary>
         public Type Component { get; }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the sorted concrete generic components that should be shown in
+        /// the <see cref="ComponentSelector">selector</see>'s custom generic builder selection.
+        /// </summary>
         public override IEnumerable<Type> Items
             => sortableItems
                 .Where(entry => Selector.World.Types.IsSupported(entry.Key))
                 .OrderBy(entry => entry.Value)
                 .Select(entry => entry.Key);
 
+        /// <summary>
+        /// Gets the selector that results should be enumerated for.
+        /// </summary>
         public ComponentSelector Selector { get; }
 
         internal EnumerateConcreteGenericsEvent(ComponentSelector selector, Type component)
diff --git a/ComponentSelectorAdditions/Events/IEnumerateSelectorResultEvent.cs b/ComponentSelectorAdditions/Events/IEnumerateSelectorResultEvent.cs
index 3344bf0..e4cbacd 100644
--- a/ComponentSelectorAdditions/Events/IEnumerateSelectorResultEvent.cs
+++ b/ComponentSelectorAdditions/Events/IEnumerateSelectorResultEvent.cs
@@ -5,10 +5,25 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Defines the interface for the events that enumerate selector categories and components.
+    /// </summary>
     public interface IEnumerateSelectorResultEvent
     {
+        /// <summary>
+        /// Gets the current path of the <see cref="ComponentSelector">selector</see>.
+        /// </summary>
         public SelectorPath Path { get; }
+
+        /// <summary>
+        /// Gets the current root category of the <see cref="ComponentSelector">selector</see>,
+        /// based on which categories and components should be enumerated.
+        /// </summary>
         public CategoryNode<Type> RootCategory { get; }
+
+        /// <summary>
+        /// Gets the selector that results should be enumerated for.
+        /// </summary>
         public ComponentSelector Selector { get; }
     }
 }
\ No newline at end of file
diff --git a/ComponentSelectorAdditions/Events/PostProcessButtonsEvent.cs b/ComponentSelectorAdditions/Events/PostProcessButtonsEvent.cs
index ba7aef3..331a3ce 100644
--- a/ComponentSelectorAdditions/Events/PostProcessButtonsEvent.cs
+++ b/ComponentSelectorAdditions/Events/PostProcessButtonsEvent.cs
@@ -10,6 +10,12 @@
 
 namespace ComponentSelectorAdditions.Events
 {
+    /// <summary>
+    /// Represents the event data for the Post-Process Buttons Event.
+    /// </summary>
+    /// <remarks>
+    /// Fired to post-process all the <see cref="Button"/>s in the <see cref="ComponentSelector">selector</see>'s results.
+    /// </remarks>
     public sealed class PostProcessButtonsEvent : BuildUIEvent
     {
         private readonly Button[] _addButtons;
@@ -17,27 +23,70 @@ public sealed class PostProcessButtonsEvent : BuildUIEvent
         private readonly Button[] _genericButtons;
         private readonly Button[] _groupButtons;
 
+        /// <summary>
+        /// Gets all buttons that directly add a component.
+        /// </summary>
         public IEnumerable<Button> AddButtons => _addButtons;
+
+        /// <summary>
+        /// Gets the back button if it's part of the results.
+        /// </summary>
         public Button? BackButton { get; }
+
+        /// <summary>
+        /// Gets the cancel button if it's part of the results.
+        /// </summary>
         public Button? CancelButton { get; }
+
+        /// <summary>
+        /// Gets all buttons that open a category.
+        /// </summary>
         public IEnumerable<Button> CategoryButtons => _categoryButtons;
+
+        /// <summary>
+        /// Gets the button that adds the constructed custom generic component, if available.
+        /// </summary>
         public Button? CustomGenericButton { get; }
 
+        /// <summary>
+        /// Gets all buttons that open the custom generic builder page.
+        /// </summary>
         public IEnumerable<Button> GenericButtons => _genericButtons;
 
+        /// <summary>
+        /// Gets all buttons that open a group of components.
+        /// </summary>
         public IEnumerable<Button> GroupButtons => _groupButtons;
 
+        /// <summary>
+        /// Gets whether there is a <see cref="BackButton">back button</see>.
+        /// </summary>
+        /// <value><see langword="true"/> if it's <see langword="not"/> <see langword="null"/>; otherwise, <see langword="false"/>.</value>
         [MemberNotNullWhen(true, nameof(BackButton))]
         public bool HasBackButton => BackButton != null;
 
+        /// <summary>
+        /// Gets whether there is a <see cref="CancelButton">cancel button</see>.
+        /// </summary>
+        /// <value><see langword="true"/> if it's <see langword="not"/> <see langword="null"/>; otherwise, <see langword="false"/>.</value>
         [MemberNotNullWhen(true, nameof(CancelButton))]
         public bool HasCancelButton => CancelButton != null;
 
+        /// <summary>
+        /// Gets whether there is a <see cref="CustomGenericButton">custom generic button</see>.
+        /// </summary>
+        /// <value><see langword="true"/> if it's <see langword="not"/> <see langword="null"/>; otherwise, <see langword="false"/>.</value>
         [MemberNotNullWhen(true, nameof(CustomGenericButton))]
         public bool HasCustomGenericButton => CustomGenericButton != null;
 
+        /// <summary>
+        /// Gets the current path of the <see cref="ComponentSelector">selector</see>.
+        /// </summary>
         public SelectorPath Path { get; }
 
+        /// <summary>
+        /// Gets the selector that results should be enumerated for.
+        /// </summary>
         public ComponentSelector Selector { get; }
 
         internal PostProcessButtonsEvent(ComponentSelector selector, SelectorPath path, UIBuilder ui, Button? backButton, Button? customGenericButton, Button? cancelButton, HashSet<Button>? otherAddedButtons)
diff --git a/ComponentSelectorAdditions/FavoritesCategories.cs b/ComponentSelectorAdditions/FavoritesCategories.cs
index 695f8fb..6998e99 100644
--- a/ComponentSelectorAdditions/FavoritesCategories.cs
+++ b/ComponentSelectorAdditions/FavoritesCategories.cs
@@ -233,10 +233,10 @@ private bool IsFavoriteCategory(TypeManager types, string name)
             => ConfigSection.Categories.Contains(name);
 
         private bool IsFavoriteComponent(TypeManager types, string name)
-            => ConfigSection.Components.Contains(types.DecodeType(name) ?? Type.GetType(name));
+            => ConfigSection.Components.Contains(types.DecodeType(name) ?? Type.GetType(name)!);
 
         private bool IsFavoriteProtoFluxNode(TypeManager types, string name)
-            => ConfigSection.ProtoFluxNodes.Contains(types.DecodeType(name) ?? Type.GetType(name));
+            => ConfigSection.ProtoFluxNodes.Contains(types.DecodeType(name) ?? Type.GetType(name)!);
 
         private bool IsProtoFluxFavoriteCategory(TypeManager types, string name)
             => ConfigSection.ProtoFluxCategories.Contains(name);
@@ -254,10 +254,10 @@ private bool ToggleFavoriteCategory(TypeManager types, string name)
             => ToggleHashSetContains(ConfigSection.Categories, name);
 
         private bool ToggleFavoriteComponent(TypeManager types, string name)
-            => ToggleHashSetContains(ConfigSection.Components, types.DecodeType(name) ?? Type.GetType(name));
+            => ToggleHashSetContains(ConfigSection.Components!, types.DecodeType(name) ?? Type.GetType(name));
 
         private bool ToggleFavoriteProtoFluxNode(TypeManager types, string name)
-            => ToggleHashSetContains(ConfigSection.ProtoFluxNodes, types.DecodeType(name) ?? Type.GetType(name));
+            => ToggleHashSetContains(ConfigSection.ProtoFluxNodes!, types.DecodeType(name) ?? Type.GetType(name));
 
         private bool ToggleProtoFluxFavoriteCategory(TypeManager types, string name)
             => ToggleHashSetContains(ConfigSection.ProtoFluxCategories, name);
diff --git a/ComponentSelectorAdditions/Injector.cs b/ComponentSelectorAdditions/Injector.cs
index 2165854..6f66c00 100644
--- a/ComponentSelectorAdditions/Injector.cs
+++ b/ComponentSelectorAdditions/Injector.cs
@@ -137,7 +137,7 @@ private static void BuildCategoryUI(ComponentSelector selector, UIBuilder ui, Se
                 groupCounter = new KeyCounter<string>();
                 groupNames = new HashSet<string>();
 
-                foreach (var component in enumerateComponentsData.Items.Where(component => component.HasGroup))
+                foreach (var component in enumerateComponentsData.Items.Where(component => component.HasGroup && !component.IsConcreteGeneric))
                     groupCounter.Increment(component.Group!);
             }
 
@@ -146,7 +146,8 @@ private static void BuildCategoryUI(ComponentSelector selector, UIBuilder ui, Se
                 if (path.HasGroup && component.Group != path.Group)
                     continue;
 
-                if (!path.HasGroup && component.HasGroup && groupCounter![component.Group] > 1)
+                if (!path.HasGroup && component.HasGroup && groupCounter![component.Group] > 1
+                 && !component.IsConcreteGeneric && !(path.HasSearchGeneric && component.Type.Name.EndsWith(path.SearchGeneric, StringComparison.OrdinalIgnoreCase)))
                 {
                     if (groupNames!.Add(component.Group))
                         OnBuildGroupButton(selector, ui, rootCategory, component);
@@ -164,21 +165,21 @@ private static void BuildGenericTypeUI(ComponentSelector selector, UIBuilder ui,
             backButton = null;
 
             var type = Type.GetType(path.PathSegments[^1]);
-            selector._genericType.Value = type;
+            selector._genericType.Value = type!;
 
             if (!doNotGenerateBack)
                 backButton = ui.Button("ComponentSelector.Back".AsLocaleKey(), RadiantUI_Constants.BUTTON_COLOR, selector.OnOpenCategoryPressed, path.OpenParentCategoryPath, 0.35f);
 
             ui.Text("ComponentSelector.CustomGenericArguments".AsLocaleKey());
 
-            var customGenericBuilderData = OnBuildCustomGenericBuilder(selector, ui, type);
+            var customGenericBuilderData = OnBuildCustomGenericBuilder(selector, ui, type!);
             customGenericButton = customGenericBuilderData.CreateCustomTypeButton!;
             otherAddedButtons = customGenericBuilderData.OtherAddedButtonsSet;
 
             ui.Panel();
             ui.NestOut();
 
-            var concreteGenericsEventData = OnEnumerateConcreteGenerics(selector, type);
+            var concreteGenericsEventData = OnEnumerateConcreteGenerics(selector, type!);
 
             if (concreteGenericsEventData.Items.Any())
             {
diff --git a/ComponentSelectorAdditions/SearchConfig.cs b/ComponentSelectorAdditions/SearchConfig.cs
index 2d1293b..663ca0d 100644
--- a/ComponentSelectorAdditions/SearchConfig.cs
+++ b/ComponentSelectorAdditions/SearchConfig.cs
@@ -153,10 +153,7 @@ protected override void OnLoad(JObject source, JsonSerializer jsonSerializer)
         private static void LoadUserExcludedCategories(string? categoryList)
         {
             foreach (var category in ProcessCategoryString(categoryList))
-            {
-                if (!_excludedCategories.ContainsKey(category))
-                    _excludedCategories.Add(category, true);
-            }
+                _excludedCategories.TryAdd(category, true);
         }
 
         private static IEnumerable<string> ProcessCategoryString(string? categoryList)
diff --git a/ComponentSelectorAdditions/SelectorPath.cs b/ComponentSelectorAdditions/SelectorPath.cs
index bbfec20..e0cb8cc 100644
--- a/ComponentSelectorAdditions/SelectorPath.cs
+++ b/ComponentSelectorAdditions/SelectorPath.cs
@@ -112,7 +112,7 @@ internal SelectorPath(string? rawPath, string? search, bool genericType, string?
                     if (starts > ends) // Automatically add any missing >
                         generic += new string(_genericParamEnd, starts - ends);
                     else if (ends > starts) // Probably not gonna happen often, but if someone adds too many closing > ...
-                        generic = generic.Remove(generic.Length - (ends - starts));
+                        generic = generic[..^(ends - starts)];
 
                     SearchGeneric = generic;
                     search = search[..genericParamStartIndex];
diff --git a/Directory.Build.props b/Directory.Build.props
index 2738185..ac602c6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyFileName>$(AssemblyTitle).dll</AssemblyFileName>
     <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
@@ -20,7 +20,6 @@
 
   <PropertyGroup>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <IncludeSymbols>False</IncludeSymbols>
     <EmbedAllSources>True</EmbedAllSources>