diff --git a/ConfigurationPage/CalibrationSettings/CalibrationControls.cs b/ConfigurationPage/CalibrationSettings/CalibrationControls.cs
index 0b2602518..2ccf989ce 100644
--- a/ConfigurationPage/CalibrationSettings/CalibrationControls.cs
+++ b/ConfigurationPage/CalibrationSettings/CalibrationControls.cs
@@ -14,7 +14,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 	{
 		private EventHandler unregisterEvents;
 		private EditLevelingSettingsWindow editLevelingSettingsWindow;
-		private Button runPrintLevelingButton;
+		private GuiWidget runPrintLevelingButton;
 
 		private TextImageButtonFactory buttonFactory;
 		private PrinterConfig printer;
@@ -32,7 +32,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 			};
 
 			buttonRow.AddChild(
-				new ImageWidget(AggContext.StaticData.LoadIcon("leveling_32x32.png", 24, 24, IconColor.Theme))
+				new IconButton(AggContext.StaticData.LoadIcon("leveling_32x32.png", 24, 24, IconColor.Theme), theme)
 				{
 					Margin = new BorderDouble(right: 6),
 					VAnchor = VAnchor.Center
@@ -40,18 +40,18 @@ namespace MatterHackers.MatterControl.PrinterControls
 
 			// label
 			buttonRow.AddChild(
-				new TextWidget("", textColor: theme.Colors.PrimaryTextColor, pointSize: theme.DefaultFontSize)
+				new TextWidget("Software Print Leveling".Localize(), textColor: theme.Colors.PrimaryTextColor, pointSize: theme.DefaultFontSize)
 				{
 					AutoExpandBoundsToText = true,
 					VAnchor = VAnchor.Center,
-					Text = "Software Print Leveling".Localize()
 				});
 
 			buttonRow.AddChild(new HorizontalSpacer());
 
 			// configure button
-			runPrintLevelingButton = buttonFactory.Generate("Configure".Localize().ToUpper());
-			runPrintLevelingButton.Margin = new BorderDouble(left: 6);
+			runPrintLevelingButton = new TextButton("Configure".Localize(), theme);
+			runPrintLevelingButton.Margin = theme.ButtonSpacing;
+			runPrintLevelingButton.BackgroundColor = theme.MinimalShade;
 			runPrintLevelingButton.VAnchor = VAnchor.Center;
 			runPrintLevelingButton.Click += (sender, e) =>
 			{
diff --git a/PrinterControls/ControlWidgets/AdjustmentControls.cs b/PrinterControls/ControlWidgets/AdjustmentControls.cs
index fa2f63e66..cebd18f54 100644
--- a/PrinterControls/ControlWidgets/AdjustmentControls.cs
+++ b/PrinterControls/ControlWidgets/AdjustmentControls.cs
@@ -67,10 +67,9 @@ namespace MatterHackers.MatterControl.PrinterControls
 					VAnchor = VAnchor.Fit
 				};
 
-				var feedRateDescription = new TextWidget("Speed Multiplier".Localize(), pointSize: theme.DefaultFontSize)
+				var feedRateDescription = new TextWidget("Speed Multiplier".Localize(), pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
 				{
 					MinimumSize = new Vector2(140, 0) * GuiWidget.DeviceScale,
-					TextColor = ActiveTheme.Instance.PrimaryTextColor,
 					VAnchor = VAnchor.Center,
 				};
 				row.AddChild(feedRateDescription);
@@ -132,10 +131,9 @@ namespace MatterHackers.MatterControl.PrinterControls
 					VAnchor = VAnchor.Fit
 				};
 
-				var extrusionDescription = new TextWidget("Extrusion Multiplier".Localize(), pointSize: theme.DefaultFontSize)
+				var extrusionDescription = new TextWidget("Extrusion Multiplier".Localize(), pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
 				{
 					MinimumSize = new Vector2(140, 0) * GuiWidget.DeviceScale,
-					TextColor = ActiveTheme.Instance.PrimaryTextColor,
 					VAnchor = VAnchor.Center
 				};
 				row.AddChild(extrusionDescription);
diff --git a/PrinterControls/ControlWidgets/MacroControls.cs b/PrinterControls/ControlWidgets/MacroControls.cs
index d17eb3e4c..d7064de92 100644
--- a/PrinterControls/ControlWidgets/MacroControls.cs
+++ b/PrinterControls/ControlWidgets/MacroControls.cs
@@ -42,10 +42,7 @@ namespace MatterHackers.MatterControl.PrinterControls
 		//private PrinterConfig printer;
 		private MacroControls(PrinterConfig printer, ThemeConfig theme)
 		{
-			var noMacrosFound = new TextWidget("No macros are currently set up for this printer.".Localize(), pointSize: 10)
-			{
-				TextColor = ActiveTheme.Instance.PrimaryTextColor,
-			};
+			var noMacrosFound = new TextWidget("No macros are currently set up for this printer.".Localize(), pointSize: 10, textColor: theme.Colors.PrimaryTextColor);
 			this.AddChild(noMacrosFound);
 
 			if (printer.Settings?.GetMacros(MacroUiLocation.Controls).Any() != true)
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index ecec8c48d..9de4051d4 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit ecec8c48d63c0b35c96ca8988655d83d806ed00d
+Subproject commit 9de4051d4a7b124a105e49da6cb8b0fd2304b258