diff --git a/MatterControlLib/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs
index 992f4e9f3..3446a17c7 100644
--- a/MatterControlLib/ApplicationView/ApplicationController.cs
+++ b/MatterControlLib/ApplicationView/ApplicationController.cs
@@ -1211,6 +1211,15 @@ namespace MatterHackers.MatterControl
 
 				this.IsReloading = true;
 
+				var theme = ApplicationController.Instance.Theme;
+				SingleWindowProvider.SetWindowTheme(theme.TextColor,
+					theme.DefaultFontSize - 1,
+					theme.InvertIcons,
+					() => theme.CreateSmallResetButton(),
+					theme.ToolbarPadding,
+					theme.TabBarBackground,
+					new Color(theme.PrimaryAccentColor, 175));
+
 				reloadingOverlay = new GuiWidget
 				{
 					HAnchor = HAnchor.Stretch,
diff --git a/Program.cs b/Program.cs
index 37f32bb9c..0b9135f06 100644
--- a/Program.cs
+++ b/Program.cs
@@ -229,7 +229,14 @@ namespace MatterHackers.MatterControl
 
 			var systemWindow = Application.LoadRootWindow(width, height);
 
-			SingleWindowProvider.SetWindowTheme(Color.Black, 12, false, () => new Button("X", 0, 0), 3, Color.LightGray, Color.DarkGray);
+			var theme = ApplicationController.Instance.Theme;
+			SingleWindowProvider.SetWindowTheme(theme.TextColor,
+				theme.DefaultFontSize - 1,
+				theme.InvertIcons,
+				() => theme.CreateSmallResetButton(),
+				theme.ToolbarPadding,
+				theme.TabBarBackground,
+				new Color(theme.PrimaryAccentColor, 175));
 
 			systemWindow.ShowAsSystemWindow();
 		}
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 6a7fde48c..add8734a2 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 6a7fde48cfbb15480629dee42a1272d3a3423fe1
+Subproject commit add8734a2078a9a5430133208daf60728d9444e8