diff --git a/AboutPage/ContactForm.cs b/AboutPage/ContactForm.cs
index de4501778..5403cdcf5 100644
--- a/AboutPage/ContactForm.cs
+++ b/AboutPage/ContactForm.cs
@@ -232,7 +232,7 @@ namespace MatterHackers.MatterControl.ContactForm
 			{
 				UiThread.RunOnIdle(Close);
 			};
-			submitButton.Click += new EventHandler(SubmitContactForm);
+			submitButton.Click += SubmitContactForm;
 		}
 
 		private void SubmitContactForm(object sender, EventArgs mouseEvent)
diff --git a/ActionBar/PrinterConnectAndSelectControl.cs b/ActionBar/PrinterConnectAndSelectControl.cs
index deb56ff2f..0d3d5896c 100644
--- a/ActionBar/PrinterConnectAndSelectControl.cs
+++ b/ActionBar/PrinterConnectAndSelectControl.cs
@@ -180,7 +180,7 @@ namespace MatterHackers.MatterControl.ActionBar
 				resetConnectionButton.Margin = new BorderDouble(6, 0, 3, 3);
 				this.AddChild(resetConnectionButton);
 
-				resetConnectionButton.Click += new EventHandler((s,e) => PrinterConnectionAndCommunication.Instance.RebootBoard());
+				resetConnectionButton.Click += (s, e) => PrinterConnectionAndCommunication.Instance.RebootBoard();
 				resetConnectionButton.Visible = ActiveSliceSettings.Instance.GetValue<bool>(SettingsKey.show_reset_connection);
 
 				ActiveSliceSettings.SettingChanged.RegisterEvent((sender, e) => 
diff --git a/ConfigurationPage/CloudSettings/CloudSettingsView.cs b/ConfigurationPage/CloudSettings/CloudSettingsView.cs
index 0f5b2bce2..9407cec3a 100644
--- a/ConfigurationPage/CloudSettings/CloudSettingsView.cs
+++ b/ConfigurationPage/CloudSettings/CloudSettingsView.cs
@@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
             linkButtonFactory.fontSize = 10;
             Button cloudSyncGoLink = linkButtonFactory.Generate("Go to Dashboard".Localize().ToUpper());
             cloudSyncGoLink.ToolTipText = "Open cloud sync dashboard in web browser".Localize();
-            cloudSyncGoLink.Click += new EventHandler(cloudSyncGoButton_Click);
+            cloudSyncGoLink.Click += cloudSyncGoButton_Click;
 			cloudSyncGoLink.VAnchor = VAnchor.ParentCenter;
 
 
@@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
 			configureNotificationSettingsButton.Name = "Configure Notification Settings Button";
 			configureNotificationSettingsButton.Margin = new BorderDouble(left: 6);
 			configureNotificationSettingsButton.VAnchor = VAnchor.ParentCenter;
-			configureNotificationSettingsButton.Click += new EventHandler(configureNotificationSettingsButton_Click);
+			configureNotificationSettingsButton.Click += configureNotificationSettingsButton_Click;
 
 			notificationSettingsLabel = new TextWidget("Notifications".Localize());
 			notificationSettingsLabel.AutoExpandBoundsToText = true;
diff --git a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs
index 5895bd89a..b4dd5c40e 100644
--- a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs
+++ b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs
@@ -252,8 +252,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 			// set these to 0 so the button does not do any movements by default (we will handle the movement on our click callback)
 			zPlusControl.MoveAmount = 0;
 			zMinusControl.MoveAmount = 0;
-			zPlusControl.Click += new EventHandler(zPlusControl_Click);
-			zMinusControl.Click += new EventHandler(zMinusControl_Click);
+			zPlusControl.Click += zPlusControl_Click;
+			zMinusControl.Click += zMinusControl_Click;
 			return zButtons;
 		}
 
@@ -318,8 +318,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 			container.backButton.Enabled = false;
 			container.nextButton.Enabled = false;
 
-			zPlusControl.Click += new EventHandler(zControl_Click);
-			zMinusControl.Click += new EventHandler(zControl_Click);
+			zPlusControl.Click += zControl_Click;
+			zMinusControl.Click += zControl_Click;
 		}
 
 		protected void zControl_Click(object sender, EventArgs mouseEvent)
diff --git a/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs b/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs
index 02a2a5455..caa66f72c 100644
--- a/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs
+++ b/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs
@@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
 			cameraLabel.VAnchor = VAnchor.ParentCenter;
 
 			openCameraButton = textImageButtonFactory.Generate("Preview".Localize().ToUpper());
-			openCameraButton.Click += new EventHandler(openCameraPreview_Click);
+			openCameraButton.Click += openCameraPreview_Click;
 			openCameraButton.Margin = new BorderDouble(left: 6);
 
 			buttonRow.AddChild(cameraIcon);
@@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
 
 			openGcodeTerminalButton = textImageButtonFactory.Generate("Show Terminal".Localize().ToUpper());
 			openGcodeTerminalButton.Name = "Show Terminal Button";
-			openGcodeTerminalButton.Click += new EventHandler(openGcodeTerminalButton_Click);
+			openGcodeTerminalButton.Click += openGcodeTerminalButton_Click;
 
 			buttonRow.AddChild(terminalIcon);
 			buttonRow.AddChild(gcodeTerminalLabel);
@@ -173,7 +173,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
 			levelingIcon.Margin = new BorderDouble(right: 6);
 
 			Button configureEePromButton = textImageButtonFactory.Generate("Configure".Localize().ToUpper());
-			configureEePromButton.Click += new EventHandler(configureEePromButton_Click);
+			configureEePromButton.Click += configureEePromButton_Click;
 
 			//buttonRow.AddChild(eePromIcon);
 			buttonRow.AddChild(notificationSettingsLabel);
diff --git a/ControlElements/SplitButtonFactory.cs b/ControlElements/SplitButtonFactory.cs
index 1329e0e08..061083762 100644
--- a/ControlElements/SplitButtonFactory.cs
+++ b/ControlElements/SplitButtonFactory.cs
@@ -72,11 +72,7 @@ namespace MatterHackers.MatterControl
 			buttonFactory.hoverBorderColor = this.hoverBorderColor;
 
 			Button button = buttonFactory.Generate(buttonInfo.Item1, normalImageName: imageName, centerText: true);
-
-			button.Click += (object sender, EventArgs e) =>
-			{
-				buttonInfo.Item2();
-			};
+			button.Click += (s, e) => buttonInfo.Item2();
 
 			return button;
 		}
diff --git a/ControlElements/StyledMessageBoxWindow.cs b/ControlElements/StyledMessageBoxWindow.cs
index 37f6f7b59..af37f8f2b 100644
--- a/ControlElements/StyledMessageBoxWindow.cs
+++ b/ControlElements/StyledMessageBoxWindow.cs
@@ -128,7 +128,7 @@ namespace MatterHackers.MatterControl
 						Title = "MatterControl - " + "Please Confirm".Localize();
 						Button yesButton = textImageButtonFactory.Generate(yesOk, centerText: true);
 						yesButton.Name = "Yes Button";
-						yesButton.Click += new EventHandler(okButton_Click);
+						yesButton.Click += okButton_Click;
 						yesButton.Cursor = Cursors.Hand;
 						buttonRow.AddChild(yesButton);
 
@@ -136,7 +136,7 @@ namespace MatterHackers.MatterControl
 
 						Button noButton = textImageButtonFactory.Generate(no, centerText: true);
 						noButton.Name = "No Button";
-						noButton.Click += new EventHandler(noButton_Click);
+						noButton.Click += noButton_Click;
 						noButton.Cursor = Cursors.Hand;
 						buttonRow.AddChild(noButton);
 					}
@@ -148,7 +148,7 @@ namespace MatterHackers.MatterControl
 						Button okButton = textImageButtonFactory.Generate("Ok".Localize(), centerText: true);
 						okButton.Name = "Ok Button";
 						okButton.Cursor = Cursors.Hand;
-						okButton.Click += new EventHandler(okButton_Click);
+						okButton.Click += okButton_Click;
 						buttonRow.AddChild(okButton);
 					}
 					break;
diff --git a/CustomWidgets/EditableNumberDisplay.cs b/CustomWidgets/EditableNumberDisplay.cs
index 4566ccbab..136ee4e71 100644
--- a/CustomWidgets/EditableNumberDisplay.cs
+++ b/CustomWidgets/EditableNumberDisplay.cs
@@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl
 			valueDisplay.TextColor = ActiveTheme.Instance.PrimaryTextColor;
 			valueDisplay.Margin = new BorderDouble(6);
 
-			clickableValueContainer.Click += new EventHandler(editField_Click);
+			clickableValueContainer.Click += editField_Click;
 
 			clickableValueContainer.AddChild(valueDisplay);
 			clickableValueContainer.SetBoundsToEncloseChildren();
@@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl
 				}
 			};
 
-			setButton.Click += new EventHandler(setButton_Click);
+			setButton.Click += setButton_Click;
 
 			this.AddChild(clickableValueContainer);
 			this.AddChild(numberInputField);
diff --git a/CustomWidgets/ExportPrintItemWindow.cs b/CustomWidgets/ExportPrintItemWindow.cs
index 6904e14f9..efeaab1bb 100644
--- a/CustomWidgets/ExportPrintItemWindow.cs
+++ b/CustomWidgets/ExportPrintItemWindow.cs
@@ -98,7 +98,7 @@ namespace MatterHackers.MatterControl
 				Button exportAsStlButton = textImageButtonFactory.Generate(exportStlTextFull);
 				exportAsStlButton.HAnchor = HAnchor.ParentLeft;
 				exportAsStlButton.Cursor = Cursors.Hand;
-				exportAsStlButton.Click += new EventHandler(exportSTL_Click);
+				exportAsStlButton.Click += exportSTL_Click;
 				middleRowContainer.AddChild(exportAsStlButton);
 			}
 
@@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl
 				Button exportAsAmfButton = textImageButtonFactory.Generate(exportAmfTextFull);
 				exportAsAmfButton.HAnchor = HAnchor.ParentLeft;
 				exportAsAmfButton.Cursor = Cursors.Hand;
-				exportAsAmfButton.Click += new EventHandler(exportAMF_Click);
+				exportAsAmfButton.Click += exportAMF_Click;
 				middleRowContainer.AddChild(exportAsAmfButton);
 			}
 
@@ -122,10 +122,10 @@ namespace MatterHackers.MatterControl
 				exportGCode.Name = "Export as GCode Button";
 				exportGCode.HAnchor = HAnchor.ParentLeft;
 				exportGCode.Cursor = Cursors.Hand;
-				exportGCode.Click += new EventHandler((object sender, EventArgs e) =>
+				exportGCode.Click += (s, e) =>
 				{
 					UiThread.RunOnIdle(ExportGCode_Click);
-				});
+				};
 				middleRowContainer.AddChild(exportGCode);
 
 				PluginFinder<ExportGcodePlugin> exportPluginFinder = new PluginFinder<ExportGcodePlugin>();
@@ -139,7 +139,7 @@ namespace MatterHackers.MatterControl
 					Button exportButton = textImageButtonFactory.Generate(exportButtonText);
 					exportButton.HAnchor = HAnchor.ParentLeft;
 					exportButton.Cursor = Cursors.Hand;
-					exportButton.Click += (object sender, EventArgs e) =>
+					exportButton.Click += (s, e) =>
 					{
 						UiThread.RunOnIdle(() =>
 						{
diff --git a/CustomWidgets/WizardControl.cs b/CustomWidgets/WizardControl.cs
index 64569d1d1..8d80e8d99 100644
--- a/CustomWidgets/WizardControl.cs
+++ b/CustomWidgets/WizardControl.cs
@@ -107,11 +107,11 @@ namespace MatterHackers.MatterControl
 				buttonBar.Padding = new BorderDouble(0, 3);
 
 				backButton = textImageButtonFactory.Generate("Back".Localize(), centerText: true);
-				backButton.Click += new EventHandler(back_Click);
+				backButton.Click += back_Click;
 
 				nextButton = textImageButtonFactory.Generate("Next".Localize(), centerText: true);
 				nextButton.Name = "Next Button";
-				nextButton.Click += new EventHandler(next_Click);
+				nextButton.Click += next_Click;
 
 				doneButton = textImageButtonFactory.Generate("Done".Localize(), centerText: true);
 				doneButton.Name = "Done Button";
diff --git a/Library/CreateFolderWindow.cs b/Library/CreateFolderWindow.cs
index 404e7c0c4..f7a285fa7 100644
--- a/Library/CreateFolderWindow.cs
+++ b/Library/CreateFolderWindow.cs
@@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl
 			createFolderButton.Cursor = Cursors.Hand;
 			buttonRow.AddChild(createFolderButton);
 
-			createFolderButton.Click += new EventHandler(createFolderButton_Click);
+			createFolderButton.Click += createFolderButton_Click;
 			folderNameWidget.ActualTextEditWidget.EnterPressed += new KeyEventHandler(ActualTextEditWidget_EnterPressed);
 
 			//Adds Create and Close Button to button container
diff --git a/Library/LibraryRowItemPart.cs b/Library/LibraryRowItemPart.cs
index 6511cd9c7..bf720bd0c 100644
--- a/Library/LibraryRowItemPart.cs
+++ b/Library/LibraryRowItemPart.cs
@@ -44,12 +44,6 @@ using System.Threading.Tasks;
 
 namespace MatterHackers.MatterControl.PrintLibrary
 {
-
-	public interface IClickable
-	{
-		event EventHandler Click;
-	}
-
 	public class LibraryRowItemPart : LibraryRowItem
 	{
 		public bool isActivePrint = false;
@@ -64,7 +58,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
 			: base(libraryDataView, thumbnailWidget)
 		{
 			thumbnailWidth = thumbnailWidget.Width;
-			var widget = thumbnailWidget as IClickable;
+			var widget = thumbnailWidget;
 			if (widget != null)
 			{
 				widget.Click += onViewPartClick;
diff --git a/Library/RenameItemWindow.cs b/Library/RenameItemWindow.cs
index ec8e4db98..2b08c6589 100644
--- a/Library/RenameItemWindow.cs
+++ b/Library/RenameItemWindow.cs
@@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl
 			renameItemButton.Cursor = Cursors.Hand;
 			buttonRow.AddChild(renameItemButton);
 
-			renameItemButton.Click += new EventHandler(renameItemButton_Click);
+			renameItemButton.Click += renameItemButton_Click;
 			saveAsNameWidget.ActualTextEditWidget.EnterPressed += new KeyEventHandler(ActualTextEditWidget_EnterPressed);
 
 			//Adds Create and Close Button to button container
diff --git a/PartPreviewWindow/SaveAsWindow.cs b/PartPreviewWindow/SaveAsWindow.cs
index e8f31c7b6..003d4dc34 100644
--- a/PartPreviewWindow/SaveAsWindow.cs
+++ b/PartPreviewWindow/SaveAsWindow.cs
@@ -129,7 +129,7 @@ namespace MatterHackers.MatterControl
 
 			librarySelectorWidget.ChangedCurrentLibraryProvider += EnableSaveAsButtonOnChangedLibraryProvider;
 
-			saveAsButton.Click += new EventHandler(saveAsButton_Click);
+			saveAsButton.Click += saveAsButton_Click;
 
 			//Adds SaveAs and Close Button to button container
 			buttonRow.AddChild(new HorizontalSpacer());
diff --git a/PartPreviewWindow/View3D/SideBar/MirrorControls.cs b/PartPreviewWindow/View3D/SideBar/MirrorControls.cs
index 8d5b2cf09..67e830cd4 100644
--- a/PartPreviewWindow/View3D/SideBar/MirrorControls.cs
+++ b/PartPreviewWindow/View3D/SideBar/MirrorControls.cs
@@ -83,7 +83,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			Button mirrorXButton = view3DWidget.textImageButtonFactory.Generate("X", centerText: true);
 			buttonContainer.AddChild(mirrorXButton);
 			mirrorControls.Add(mirrorXButton);
-			mirrorXButton.Click += (object sender, EventArgs mouseEvent) =>
+			mirrorXButton.Click += (s, e) =>
 			{
 				if (view3DWidget.SelectedMeshGroupIndex != -1)
 				{
@@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			Button mirrorYButton = view3DWidget.textImageButtonFactory.Generate("Y", centerText: true);
 			buttonContainer.AddChild(mirrorYButton);
 			mirrorControls.Add(mirrorYButton);
-			mirrorYButton.Click += (object sender, EventArgs mouseEvent) =>
+			mirrorYButton.Click += (s, e) =>
 			{
 				if (view3DWidget.SelectedMeshGroupIndex != -1)
 				{
@@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			Button mirrorZButton = view3DWidget.textImageButtonFactory.Generate("Z", centerText: true);
 			buttonContainer.AddChild(mirrorZButton);
 			mirrorControls.Add(mirrorZButton);
-			mirrorZButton.Click += (object sender, EventArgs mouseEvent) =>
+			mirrorZButton.Click += (s, e) =>
 			{
 				if (view3DWidget.SelectedMeshGroupIndex != -1)
 				{
diff --git a/PartPreviewWindow/View3D/SideBar/ScaleControls.cs b/PartPreviewWindow/View3D/SideBar/ScaleControls.cs
index 0ceba6211..0ba4d1769 100644
--- a/PartPreviewWindow/View3D/SideBar/ScaleControls.cs
+++ b/PartPreviewWindow/View3D/SideBar/ScaleControls.cs
@@ -124,7 +124,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			buttonPanel.AddChild(applyScaleButton);
 
 			scaleControls.Add(applyScaleButton);
-			applyScaleButton.Click += (object sender, EventArgs mouseEvent) =>
+			applyScaleButton.Click += (s, e) =>
 			{
 				ApplyScaleFromEditField();
 			};
diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs
index 27ea9bc9a..a7309d8ea 100644
--- a/PartPreviewWindow/View3D/View3DWidget.cs
+++ b/PartPreviewWindow/View3D/View3DWidget.cs
@@ -1178,7 +1178,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			TextWidget centeredX = new TextWidget("X", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor); centeredX.Margin = new BorderDouble(3, 0, 0, 0); centeredX.AnchorCenter(); rotateXButton.AddChild(centeredX);
 			rotateButtonContainer.AddChild(rotateXButton);
 			rotateControls.Add(rotateXButton);
-			rotateXButton.Click += (object sender, EventArgs mouseEvent) =>
+			rotateXButton.Click += (s, e) =>
 			{
 				if (SelectedMeshGroupIndex != -1)
 				{
@@ -1197,7 +1197,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			TextWidget centeredY = new TextWidget("Y", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor); centeredY.Margin = new BorderDouble(3, 0, 0, 0); centeredY.AnchorCenter(); rotateYButton.AddChild(centeredY);
 			rotateButtonContainer.AddChild(rotateYButton);
 			rotateControls.Add(rotateYButton);
-			rotateYButton.Click += (object sender, EventArgs mouseEvent) =>
+			rotateYButton.Click += (s, e) =>
 			{
 				if (SelectedMeshGroupIndex != -1)
 				{
@@ -1216,7 +1216,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			TextWidget centeredZ = new TextWidget("Z", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor); centeredZ.Margin = new BorderDouble(3, 0, 0, 0); centeredZ.AnchorCenter(); rotateZButton.AddChild(centeredZ);
 			rotateButtonContainer.AddChild(rotateZButton);
 			rotateControls.Add(rotateZButton);
-			rotateZButton.Click += (object sender, EventArgs mouseEvent) =>
+			rotateZButton.Click += (s, e) =>
 			{
 				if (SelectedMeshGroupIndex != -1)
 				{
@@ -1237,7 +1237,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			layFlatButton.Cursor = Cursors.Hand;
 			buttonPanel.AddChild(layFlatButton);
 
-			layFlatButton.Click += (object sender, EventArgs mouseEvent) =>
+			layFlatButton.Click += (s, e) =>
 			{
 				if (SelectedMeshGroupIndex != -1)
 				{
diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs
index 81fabd002..55904cd42 100644
--- a/PartPreviewWindow/ViewGcodeBasic.cs
+++ b/PartPreviewWindow/ViewGcodeBasic.cs
@@ -189,7 +189,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			generateGCodeButton = textImageButtonFactory.Generate("Generate".Localize());
 			generateGCodeButton.Name = "Generate Gcode Button";
-			generateGCodeButton.Click += new EventHandler(generateButton_Click);
+			generateGCodeButton.Click += generateButton_Click;
 			buttonBottomPanel.AddChild(generateGCodeButton);
 
 			layerSelectionButtonsPanel = new FlowLayoutWidget(FlowDirection.RightToLeft);
@@ -1245,7 +1245,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			setLayerButton = textImageButtonFactory.Generate("Go".Localize());
 			setLayerButton.VAnchor = Agg.UI.VAnchor.ParentCenter;
-			setLayerButton.Click += new EventHandler(layerCountTextWidget_EditComplete);
+			setLayerButton.Click += layerCountTextWidget_EditComplete;
 			this.AddChild(setLayerButton);
 		}
 
@@ -1285,7 +1285,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			textImageButtonFactory.pressedTextColor = ActiveTheme.Instance.PrimaryTextColor;
 
 			prevLayerButton = textImageButtonFactory.Generate("<<");
-			prevLayerButton.Click += new EventHandler(prevLayer_ButtonClick);
+			prevLayerButton.Click += prevLayer_ButtonClick;
 			this.AddChild(prevLayerButton);
 
 			layerCountTextWidget = new TextWidget("/1____", 12);
@@ -1296,7 +1296,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			this.AddChild(layerCountTextWidget);
 
 			nextLayerButton = textImageButtonFactory.Generate(">>");
-			nextLayerButton.Click += new EventHandler(nextLayer_ButtonClick);
+			nextLayerButton.Click += nextLayer_ButtonClick;
 			this.AddChild(nextLayerButton);
 		}
 
diff --git a/PrinterControls/ControlWidgets/MovementControls.cs b/PrinterControls/ControlWidgets/MovementControls.cs
index 7b3b771e7..8dd9f3cc2 100644
--- a/PrinterControls/ControlWidgets/MovementControls.cs
+++ b/PrinterControls/ControlWidgets/MovementControls.cs
@@ -203,30 +203,30 @@ namespace MatterHackers.MatterControl.PrinterControls
 			this.textImageButtonFactory.normalFillColor = oldColor;
 			homeAllButton.ToolTipText = "Home X, Y and Z".Localize();
 			homeAllButton.Margin = new BorderDouble(0, 0, 6, 0);
-			homeAllButton.Click += new EventHandler(homeAll_Click);
+			homeAllButton.Click += homeAll_Click;
 
 			textImageButtonFactory.FixedWidth = (int)homeAllButton.Width * GuiWidget.DeviceScale;
 			homeXButton = textImageButtonFactory.Generate("X", centerText: true);
 			homeXButton.ToolTipText = "Home X".Localize();
 			homeXButton.Margin = new BorderDouble(0, 0, 6, 0);
-			homeXButton.Click += new EventHandler(homeXButton_Click);
+			homeXButton.Click += homeXButton_Click;
 
 			homeYButton = textImageButtonFactory.Generate("Y", centerText: true);
 			homeYButton.ToolTipText = "Home Y".Localize();
 			homeYButton.Margin = new BorderDouble(0, 0, 6, 0);
-			homeYButton.Click += new EventHandler(homeYButton_Click);
+			homeYButton.Click += homeYButton_Click;
 
 			homeZButton = textImageButtonFactory.Generate("Z", centerText: true);
 			homeZButton.ToolTipText = "Home Z".Localize();
 			homeZButton.Margin = new BorderDouble(0, 0, 6, 0);
-			homeZButton.Click += new EventHandler(homeZButton_Click);
+			homeZButton.Click += homeZButton_Click;
 
 			textImageButtonFactory.normalFillColor = RGBA_Bytes.White;
 			textImageButtonFactory.FixedWidth = 0;
 
 			disableMotors = textImageButtonFactory.Generate("Release".Localize().ToUpper());
 			disableMotors.Margin = new BorderDouble(0);
-			disableMotors.Click += new EventHandler(disableMotors_Click);
+			disableMotors.Click += disableMotors_Click;
 			this.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
 
 			GuiWidget spacerReleaseShow = new GuiWidget(10 * GuiWidget.DeviceScale, 0);
diff --git a/PrinterControls/EditLevelingSettingsWindow.cs b/PrinterControls/EditLevelingSettingsWindow.cs
index 103824f37..2da83590e 100644
--- a/PrinterControls/EditLevelingSettingsWindow.cs
+++ b/PrinterControls/EditLevelingSettingsWindow.cs
@@ -146,7 +146,7 @@ namespace MatterHackers.MatterControl
 			MinimumSize = new Vector2(Width, Height);
 
 			Button savePresetsButton = textImageButtonFactory.Generate("Save".Localize());
-			savePresetsButton.Click += new EventHandler(save_Click);
+			savePresetsButton.Click += save_Click;
 
 			Button cancelPresetsButton = textImageButtonFactory.Generate("Cancel".Localize());
 			cancelPresetsButton.Click += (sender, e) =>
diff --git a/PrinterControls/EditMacrosWindow.cs b/PrinterControls/EditMacrosWindow.cs
index a35ff2df0..7fca54cb5 100644
--- a/PrinterControls/EditMacrosWindow.cs
+++ b/PrinterControls/EditMacrosWindow.cs
@@ -156,7 +156,7 @@ namespace MatterHackers.MatterControl
 			presetsFormContainer.AddChild(CreateMacroActionEdit());
 
 			Button addMacroButton = textImageButtonFactory.Generate("Save".Localize());
-			addMacroButton.Click += new EventHandler(SaveMacro_Click);
+			addMacroButton.Click += SaveMacro_Click;
 
 			Button cancelPresetsButton = textImageButtonFactory.Generate("Cancel".Localize());
 			cancelPresetsButton.Click += (sender, e) =>
diff --git a/PrinterControls/EditManualMovementSpeedsWindow.cs b/PrinterControls/EditManualMovementSpeedsWindow.cs
index 59edf1d5b..d07a50526 100644
--- a/PrinterControls/EditManualMovementSpeedsWindow.cs
+++ b/PrinterControls/EditManualMovementSpeedsWindow.cs
@@ -163,7 +163,7 @@ namespace MatterHackers.MatterControl
 			MinimumSize = new Vector2(260, 300);
 
 			Button savePresetsButton = textImageButtonFactory.Generate("Save".Localize());
-			savePresetsButton.Click += new EventHandler(save_Click);
+			savePresetsButton.Click += save_Click;
 
 			Button cancelPresetsButton = textImageButtonFactory.Generate("Cancel".Localize());
 			cancelPresetsButton.Click += (sender, e) =>
diff --git a/PrinterControls/EditTemperaturePresetsWindow.cs b/PrinterControls/EditTemperaturePresetsWindow.cs
index e3d1e4dd5..7d7cbfc6d 100644
--- a/PrinterControls/EditTemperaturePresetsWindow.cs
+++ b/PrinterControls/EditTemperaturePresetsWindow.cs
@@ -191,7 +191,7 @@ namespace MatterHackers.MatterControl
 			MinimumSize = new Vector2(360, 300);
 
 			Button savePresetsButton = textImageButtonFactory.Generate("Save".Localize());
-			savePresetsButton.Click += new EventHandler(save_Click);
+			savePresetsButton.Click += save_Click;
 
 			Button cancelPresetsButton = textImageButtonFactory.Generate("Cancel".Localize());
 			cancelPresetsButton.Click += (sender, e) => { CloseOnIdle(); };
diff --git a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs b/PrinterControls/PrinterConnections/SetupStepBaudRate.cs
index 88ec2e7b7..3ab2454e4 100644
--- a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs
+++ b/PrinterControls/PrinterConnections/SetupStepBaudRate.cs
@@ -26,7 +26,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 			contentRow.AddChild(printerBaudRateContainer);
 			{
 				nextButton = textImageButtonFactory.Generate("Continue".Localize());
-				nextButton.Click += new EventHandler(NextButton_Click);
+				nextButton.Click += NextButton_Click;
 
 				//Add buttons to buttonContainer
 				footerRow.AddChild(nextButton);
@@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 			printerBaudRateHelpLink = linkButtonFactory.Generate("What's this?".Localize());
 			printerBaudRateHelpLink.Margin = new BorderDouble(left: 5);
 			printerBaudRateHelpLink.VAnchor = VAnchor.ParentBottom;
-			printerBaudRateHelpLink.Click += new EventHandler(printerBaudRateHelp_Click);
+			printerBaudRateHelpLink.Click += printerBaudRateHelp_Click;
 
 			printerBaudRateHelpMessage = new TextWidget("The term 'Baud Rate' roughly means the speed at which\ndata is transmitted.  Baud rates may differ from printer to\nprinter. Refer to your printer manual for more info.\n\nTip: If you are uncertain - try 250000.".Localize(), 0, 0, 10);
 			printerBaudRateHelpMessage.TextColor = ActiveTheme.Instance.PrimaryTextColor;
diff --git a/PrinterControls/TemperatureIndicator.cs b/PrinterControls/TemperatureIndicator.cs
index 07146751e..01b4de958 100644
--- a/PrinterControls/TemperatureIndicator.cs
+++ b/PrinterControls/TemperatureIndicator.cs
@@ -444,16 +444,12 @@ namespace MatterHackers.MatterControl
 		{
 			PrinterConnectionAndCommunication.Instance.ExtruderTemperatureRead.RegisterEvent(onTemperatureRead, ref unregisterEvents);
 			PrinterConnectionAndCommunication.Instance.ExtruderTemperatureSet.RegisterEvent(onTemperatureSet, ref unregisterEvents);
-			tempOffButton.Click += new EventHandler(onOffButtonClicked);
+			tempOffButton.Click += onOffButtonClicked;
 		}
 
 		public override void OnClosed(EventArgs e)
 		{
-			if (unregisterEvents != null)
-			{
-				unregisterEvents(this, null);
-			}
-
+			unregisterEvents.Invoke(this, null);
 			base.OnClosed(e);
 		}
 
@@ -545,7 +541,7 @@ namespace MatterHackers.MatterControl
 		{
 			PrinterConnectionAndCommunication.Instance.BedTemperatureRead.RegisterEvent(onTemperatureRead, ref unregisterEvents);
 			PrinterConnectionAndCommunication.Instance.BedTemperatureSet.RegisterEvent(onTemperatureSet, ref unregisterEvents);
-			tempOffButton.Click += new EventHandler(onOffButtonClicked);
+			tempOffButton.Click += onOffButtonClicked;
 		}
 
 		public override void OnClosed(EventArgs e)
diff --git a/PrinterControls/TerminalWindow/TerminalWidget.cs b/PrinterControls/TerminalWindow/TerminalWidget.cs
index e57de36d0..dd5ef7a63 100644
--- a/PrinterControls/TerminalWindow/TerminalWidget.cs
+++ b/PrinterControls/TerminalWindow/TerminalWidget.cs
@@ -172,7 +172,7 @@ namespace MatterHackers.MatterControl
 				};
 
 				sendCommand = controlButtonFactory.Generate("Send".Localize());
-				sendCommand.Click += new EventHandler(sendManualCommandToPrinter_Click);
+				sendCommand.Click += sendManualCommandToPrinter_Click;
 
 				FlowLayoutWidget bottomRowContainer = new FlowLayoutWidget();
 				bottomRowContainer.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
diff --git a/PrinterControls/XYZJogControls.cs b/PrinterControls/XYZJogControls.cs
index 20c34daba..d1c40e3af 100644
--- a/PrinterControls/XYZJogControls.cs
+++ b/PrinterControls/XYZJogControls.cs
@@ -668,7 +668,7 @@ namespace MatterHackers.MatterControl
 				this.ExtruderNumber = extruderNumber;
 				this.movementFeedRate = movementFeedRate;
 
-				this.Click += new EventHandler(moveAxis_Click);
+				this.Click += moveAxis_Click;
 			}
 
 			private void moveAxis_Click(object sender, EventArgs mouseEvent)
diff --git a/Queue/QueueDataWidget.cs b/Queue/QueueDataWidget.cs
index 39fa869f0..e0fd03b96 100644
--- a/Queue/QueueDataWidget.cs
+++ b/Queue/QueueDataWidget.cs
@@ -181,7 +181,7 @@ namespace MatterHackers.MatterControl.PrintQueue
 					addToQueueButton.ToolTipText = "Add an .stl, .amf, .gcode or .zip file to the Queue".Localize();
 					buttonPanel1.AddChild(addToQueueButton);
 					addToQueueButton.Margin = new BorderDouble(0, 0, 3, 0);
-					addToQueueButton.Click += new EventHandler(addToQueueButton_Click);
+					addToQueueButton.Click += addToQueueButton_Click;
 					addToQueueButton.Name = "Queue Add Button";
 
 					// put in the creator button
@@ -251,21 +251,21 @@ namespace MatterHackers.MatterControl.PrintQueue
 			Button exportItemButton = editButtonFactory.Generate("Export".Localize());
 			exportItemButton.Name = "Queue Export Button";
 			exportItemButton.Margin = new BorderDouble(3, 0);
-			exportItemButton.Click += new EventHandler(exportButton_Click);
+			exportItemButton.Click += exportButton_Click;
 			editButtonsEnableData.Add(new ButtonEnableData(false, false, false));
 			itemOperationButtons.AddChild(exportItemButton);
 
 			Button copyItemButton = editButtonFactory.Generate("Copy".Localize());
 			copyItemButton.Name = "Queue Copy Button";
 			copyItemButton.Margin = new BorderDouble(3, 0);
-			copyItemButton.Click += new EventHandler(copyButton_Click);
+			copyItemButton.Click += copyButton_Click;
 			editButtonsEnableData.Add(new ButtonEnableData(false, true, false));
 			itemOperationButtons.AddChild(copyItemButton);
 
 			Button removeItemButton = editButtonFactory.Generate("Remove".Localize());
 			removeItemButton.Name = "Queue Remove Button";
 			removeItemButton.Margin = new BorderDouble(3, 0);
-			removeItemButton.Click += new EventHandler(removeButton_Click);
+			removeItemButton.Click += removeButton_Click;
 			editButtonsEnableData.Add(new ButtonEnableData(true, true, true));
 			itemOperationButtons.AddChild(removeItemButton);
 
diff --git a/SetupWizard/AndroidConnectDevicePage.cs b/SetupWizard/AndroidConnectDevicePage.cs
index 4a9a88da0..4bf8c9217 100644
--- a/SetupWizard/AndroidConnectDevicePage.cs
+++ b/SetupWizard/AndroidConnectDevicePage.cs
@@ -80,10 +80,10 @@ namespace MatterHackers.MatterControl
 			//Construct buttons
 			connectButton = whiteImageButtonFactory.Generate("Connect".Localize(),centerText:true);
 			connectButton.Margin = new BorderDouble(0,0,10,0);
-			connectButton.Click += new EventHandler(ConnectButton_Click);
+			connectButton.Click += ConnectButton_Click;
 
 			skipButton = whiteImageButtonFactory.Generate("Skip".Localize(), centerText:true);
-			skipButton.Click += new EventHandler(NextButton_Click);
+			skipButton.Click += NextButton_Click;
 
 			connectButtonContainer.AddChild(connectButton);
 			connectButtonContainer.AddChild(skipButton);
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index d93a8872a..6d6103b9d 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit d93a8872a3412dfebbccf71373bea4e9ddcbf31e
+Subproject commit 6d6103b9dba120c4e0bb1a602a823311e946e476
diff --git a/TextCreator/View3DTextCreator.cs b/TextCreator/View3DTextCreator.cs
index 22f54e6c5..f86fef265 100644
--- a/TextCreator/View3DTextCreator.cs
+++ b/TextCreator/View3DTextCreator.cs
@@ -839,7 +839,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
 
 		private void AddHandlers()
 		{
-			closeButton.Click += new EventHandler(onCloseButton_Click);
+			closeButton.Click += onCloseButton_Click;
 
 			saveButton.Click += (sender, e) =>
 			{