diff --git a/MatterControlLib/ApplicationView/Themes/ThemeSet.cs b/MatterControlLib/ApplicationView/Themes/ThemeSet.cs
index c31b7ed23..359ef68e1 100644
--- a/MatterControlLib/ApplicationView/Themes/ThemeSet.cs
+++ b/MatterControlLib/ApplicationView/Themes/ThemeSet.cs
@@ -34,7 +34,7 @@ namespace MatterHackers.MatterControl
 {
 	public class ThemeSet
 	{
-		public static int LatestSchemeVersion { get; } = 20190413;
+		public static int LatestSchemeVersion { get; } = 20210524;
 
 		/// <summary>
 		/// The identifier to use for this combination of accent colors, theme and menu theme
diff --git a/StaticData/Themes/System/Modern/Modern-Dark-Menu.json b/StaticData/Themes/System/Modern/Modern-Dark-Menu.json
index d1e86f084..87e3a9e40 100644
--- a/StaticData/Themes/System/Modern/Modern-Dark-Menu.json
+++ b/StaticData/Themes/System/Modern/Modern-Dark-Menu.json
@@ -74,7 +74,7 @@
   },
   "DisabledColor": "#FBFBFB",
   "SplashAccentColor": "#00000000",
-  "BedBackgroundColor": "#00000000",
+  "BedBackgroundColor": "#3B3B3B",
   "PrimaryAccentColor": "#00000000",
-  "SectionBackgroundColor": "#393939"
+  "SectionBackgroundColor": "#3B3B3B"
 }
\ No newline at end of file
diff --git a/StaticData/Themes/System/Modern/Modern-Dark.json b/StaticData/Themes/System/Modern/Modern-Dark.json
index 97cc4a8bf..a3d71a477 100644
--- a/StaticData/Themes/System/Modern/Modern-Dark.json
+++ b/StaticData/Themes/System/Modern/Modern-Dark.json
@@ -86,7 +86,7 @@
   },
   "DisabledColor": "#505050",
   "SplashAccentColor": "#EEEEEE",
-  "BedBackgroundColor": "#00000000",
+  "BedBackgroundColor": "#323232",
   "PrimaryAccentColor": "#B58900",
   "SectionBackgroundColor": "#404040"
 }
\ No newline at end of file
diff --git a/StaticData/Themes/System/Solarized/Solarized-Light-Menu.json b/StaticData/Themes/System/Solarized/Solarized-Light-Menu.json
index 2e2b325af..681c955e2 100644
--- a/StaticData/Themes/System/Solarized/Solarized-Light-Menu.json
+++ b/StaticData/Themes/System/Solarized/Solarized-Light-Menu.json
@@ -74,7 +74,7 @@
   },
   "DisabledColor": "#DDDDDD",
   "SplashAccentColor": "#00000000",
-  "BedBackgroundColor": "#00000000",
+  "BedBackgroundColor": "#ECECEC",
   "PrimaryAccentColor": "#B58900",
   "SectionBackgroundColor": "#e6e6e6"
 }
\ No newline at end of file
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 952f37ff1..ac83f1da1 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 952f37ff18425598fcebdff2b0e8057dfa9394e8
+Subproject commit ac83f1da1840d97dabf78f399c8cc74920990f6d