diff --git a/MatterControlLib/ApplicationView/AppContext.cs b/MatterControlLib/ApplicationView/AppContext.cs
index 393b0ad15..b896a1180 100644
--- a/MatterControlLib/ApplicationView/AppContext.cs
+++ b/MatterControlLib/ApplicationView/AppContext.cs
@@ -164,11 +164,8 @@ namespace MatterHackers.MatterControl
 
 					var themeConfig = JsonConvert.DeserializeObject<ThemeConfig>(json);
 					themeConfig.EnsureDefaults();
-					if (ThemeSet?.Theme != null)
-					{
-						ThemeConfigExtensions.RebuildTheme(ThemeSet.Theme);
-					}
-
+					ThemeConfigExtensions.RebuildTheme(themeConfig);
+                    
 					return themeConfig;
 				}
 			}
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index fca955fe3..5abd29704 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit fca955fe34e0ee63a8d74f10de47b183810fd1c0
+Subproject commit 5abd29704a4358afab0366bbe21c42066b9cd15d
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index bbe723395..661ea5a25 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -751,6 +751,12 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 			if (!testRunner.NameExists(libraryRowItemName, .2))
 			{
+				while (!testRunner.NameExists("Bread Crumb Button Home", .2))
+				{
+					testRunner.ClickByName("Library Up Button")
+						.Delay();                    
+				}
+                
 				// go back to the home section
 				testRunner.ClickByName("Bread Crumb Button Home")
 					.Delay();