diff --git a/CustomWidgets/ThemeColorSelectorWidget.cs b/CustomWidgets/ThemeColorSelectorWidget.cs
index 76c5e237f..6507c5adf 100644
--- a/CustomWidgets/ThemeColorSelectorWidget.cs
+++ b/CustomWidgets/ThemeColorSelectorWidget.cs
@@ -75,13 +75,13 @@ namespace MatterHackers.MatterControl
 		public Button CreateThemeButton(IThemeColors darkTheme, int darkThemeIndex)
 		{
 			var normal = new GuiWidget(colorSelectSize, colorSelectSize);
-			normal.BackgroundColor = darkTheme.PrimaryAccentColor;
+			normal.BackgroundColor = darkTheme.SourceColor;
 
 			var hover = new GuiWidget(colorSelectSize, colorSelectSize);
-			hover.BackgroundColor = darkTheme.SecondaryAccentColor;
+			hover.BackgroundColor = darkTheme.SourceColor;
 
 			var pressed = new GuiWidget(colorSelectSize, colorSelectSize);
-			pressed.BackgroundColor = darkTheme.SecondaryAccentColor;
+			pressed.BackgroundColor = darkTheme.SourceColor;
 
 			var disabled = new GuiWidget(colorSelectSize, colorSelectSize);
 
diff --git a/Library/Widgets/ListView/ListView.cs b/Library/Widgets/ListView/ListView.cs
index b21ed3661..a1fe2162f 100644
--- a/Library/Widgets/ListView/ListView.cs
+++ b/Library/Widgets/ListView/ListView.cs
@@ -88,7 +88,6 @@ namespace MatterHackers.MatterControl.CustomWidgets
 		public ILibraryContainer ActiveContainer => this.LibraryContext.ActiveContainer;
 
 		public Color ThumbnailBackground { get; } = ActiveTheme.Instance.TertiaryBackgroundColor.AdjustLightness(1.05).ToColor();
-		public Color ThumbnailForeground { get; set; } = ActiveTheme.Instance.PrimaryAccentColor;
 
 		private async void ActiveContainer_Changed(object sender, ContainerChangedEventArgs e)
 		{
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 5ac31a91b..bad43f38e 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 5ac31a91bf082a4e699390235116ee410ee0a742
+Subproject commit bad43f38ef713d6b5b953cc674bfd600edfe5082