diff --git a/MatterControl.Winforms/InspectForm.cs b/MatterControl.Winforms/InspectForm.cs
index bc1ae5e4c..9017ac2fd 100644
--- a/MatterControl.Winforms/InspectForm.cs
+++ b/MatterControl.Winforms/InspectForm.cs
@@ -345,7 +345,7 @@ namespace MatterHackers.MatterControl
 				&& tabControl1.SelectedIndex == 0)
 			{
 				var namedChildren = new List<GuiWidget.WidgetAndPosition>();
-				inspectedSystemWindow.FindNamedChildrenRecursive(
+				inspectedSystemWindow.FindDescendants(
 					"",
 					namedChildren,
 					new RectangleDouble(mousePosition.X, mousePosition.Y, mousePosition.X + 1, mousePosition.Y + 1),
diff --git a/MatterControlLib/AboutPage/UpdateControlData.cs b/MatterControlLib/AboutPage/UpdateControlData.cs
index 80d6320d2..aa78dbf93 100644
--- a/MatterControlLib/AboutPage/UpdateControlData.cs
+++ b/MatterControlLib/AboutPage/UpdateControlData.cs
@@ -225,7 +225,7 @@ namespace MatterHackers.MatterControl
 			{
 				InitiateUpdateDownload();
 				// Switch to the about page so we can see the download progress.
-				GuiWidget aboutTabWidget = ApplicationController.Instance.MainView.FindNamedChildRecursive("About Tab");
+				GuiWidget aboutTabWidget = ApplicationController.Instance.MainView.FindDescendant("About Tab");
 
 				if (aboutTabWidget is Tab aboutTab)
 				{
diff --git a/MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs b/MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs
index 37939d1ff..893212d1c 100644
--- a/MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs
+++ b/MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs
@@ -352,7 +352,7 @@ namespace MatterHackers.MatterControl.ActionBar
 				// Hide TextWidget
 				presetsSelector.Children.First().Visible = false;
 
-				var pulldownContainer = presetsSelector.FindNamedChildRecursive("Preset Pulldown Container");
+				var pulldownContainer = presetsSelector.FindDescendant("Preset Pulldown Container");
 				if (pulldownContainer != null)
 				{
 					pulldownContainer.Padding = menuTheme.ToolbarPadding;
diff --git a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
index 60554c8e2..ba65c2399 100644
--- a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
+++ b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
@@ -185,7 +185,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				modelViewSidePanel.Width = gcodeContainer.Width;
 			};
 
-			var splitContainer = view3DWidget.FindNamedChildRecursive("SplitContainer");
+			var splitContainer = view3DWidget.FindDescendant("SplitContainer");
 
 			splitContainer.AddChild(gcodeContainer);
 
diff --git a/MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs b/MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs
index f79642ed0..208346cf3 100644
--- a/MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs
+++ b/MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs
@@ -333,7 +333,7 @@ namespace MatterHackers.MeshVisualizer
 			base.OnClosed(e);
 		}
 
-		public override void FindNamedChildrenRecursive(string nameToSearchFor, List<WidgetAndPosition> foundChildren, RectangleDouble touchingBounds, SearchType seachType, bool allowInvalidItems = true)
+		public override List<WidgetAndPosition> FindDescendants(string nameToSearchFor, List<WidgetAndPosition> foundChildren, RectangleDouble touchingBounds, SearchType seachType, bool allowInvalidItems = true)
 		{
 			foreach (InteractionVolume child in interactionLayer.InteractionVolumes)
 			{
@@ -429,7 +429,7 @@ namespace MatterHackers.MeshVisualizer
 				}
 			}
 
-			base.FindNamedChildrenRecursive(nameToSearchFor, foundChildren, touchingBounds, seachType, allowInvalidItems);
+			return base.FindDescendants(nameToSearchFor, foundChildren, touchingBounds, seachType, allowInvalidItems);
 		}
 
 		public static Color GetExtruderColor(int extruderIndex)
diff --git a/MatterControlLib/SetupWizard/TourOverlay.cs b/MatterControlLib/SetupWizard/TourOverlay.cs
index 12f153e37..12d286ca5 100644
--- a/MatterControlLib/SetupWizard/TourOverlay.cs
+++ b/MatterControlLib/SetupWizard/TourOverlay.cs
@@ -84,8 +84,7 @@ namespace MatterControlLib.SetupWizard
 				GuiWidget tourLocationWidget = null;
 				while (checkLocation < tourLocations.Count)
 				{
-					var foundChildren = new List<GuiWidget.WidgetAndPosition>();
-					window.FindNamedChildrenRecursive(tourLocations[checkLocation].WidgetName, foundChildren);
+					var foundChildren = window.FindDescendants(tourLocations[checkLocation].WidgetName);
 
 					GuiWidget foundLocation = null;
 					foreach (var widgetAndPosition in foundChildren)
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index f41ca0ff7..4ca87fd28 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit f41ca0ff7c45c6d8a397565ca62ba97927075c45
+Subproject commit 4ca87fd2858405b708470cddba233cb497213fcd