diff --git a/AboutPage/ContactForm.cs b/AboutPage/ContactForm.cs
index 385c24f24..3a55893f9 100644
--- a/AboutPage/ContactForm.cs
+++ b/AboutPage/ContactForm.cs
@@ -329,7 +329,7 @@ namespace MatterHackers.MatterControl.ContactForm
 			contactFormWidget = new ContactFormWidget(subject, bodyText);
 
 #if __ANDROID__
-			this.AddChild(new SoftKeyboardContentOffset(contactFormWidget, SoftKeyboardContentOffset.AndroidKeyboardOffset));
+			this.AddChild(new SoftKeyboardContentOffset(contactFormWidget));
 #else
 			AddChild(contactFormWidget);
 #endif
diff --git a/BrailleBuilder/BrailleBuilderMainWindow.cs b/BrailleBuilder/BrailleBuilderMainWindow.cs
index 30afbeb95..cd2e61061 100644
--- a/BrailleBuilder/BrailleBuilderMainWindow.cs
+++ b/BrailleBuilder/BrailleBuilderMainWindow.cs
@@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
 				ActiveSliceSettings.Instance.BedShape);
 
 #if __ANDROID__
-			this.AddChild(new SoftKeyboardContentOffset(part3DView, SoftKeyboardContentOffset.AndroidKeyboardOffset));
+			this.AddChild(new SoftKeyboardContentOffset(part3DView));
 #else
 			this.AddChild(part3DView);
 #endif
diff --git a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
index c4b15a1e2..20cfc04a8 100644
--- a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
+++ b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
@@ -516,7 +516,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
                 LocalizedString.ResetTranslationMap();
                 ApplicationController.Instance.MainView = new CompactApplicationView();
                 app.RemoveAllChildren();
-                app.AddChild(new SoftKeyboardContentOffset(ApplicationController.Instance.MainView, SoftKeyboardContentOffset.AndroidKeyboardOffset));
+                app.AddChild(new SoftKeyboardContentOffset(ApplicationController.Instance.MainView));
                 app.AnchorAll();
 #endif
 			});
diff --git a/EeProm/EePromMarlinWindow.cs b/EeProm/EePromMarlinWindow.cs
index a4e91d68c..3ba66d1ff 100644
--- a/EeProm/EePromMarlinWindow.cs
+++ b/EeProm/EePromMarlinWindow.cs
@@ -185,7 +185,7 @@ namespace MatterHackers.MatterControl.EeProm
 
 #if __ANDROID__
 			TerminalWidget terminalWidget = new TerminalWidget(true);
-			this.AddChild(new SoftKeyboardContentOffset(mainContainer, SoftKeyboardContentOffset.AndroidKeyboardOffset));
+			this.AddChild(new SoftKeyboardContentOffset(mainContainer));
 			//mainContainer.Closed += (sender, e) => { Close(); };
 #else
 			AddChild(mainContainer);
diff --git a/EeProm/EePromRepetierWindow.cs b/EeProm/EePromRepetierWindow.cs
index b1cbfcf16..69ae1a95f 100644
--- a/EeProm/EePromRepetierWindow.cs
+++ b/EeProm/EePromRepetierWindow.cs
@@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.EeProm
 
 #if __ANDROID__
 			TerminalWidget terminalWidget = new TerminalWidget(true);
-			this.AddChild(new SoftKeyboardContentOffset(topToBottom, SoftKeyboardContentOffset.AndroidKeyboardOffset));
+			this.AddChild(new SoftKeyboardContentOffset(topToBottom));
 			//topToBottom.Closed += (sender, e) => { Close(); };
 #else
 			this.AddChild(topToBottom);
diff --git a/PartPreviewWindow/PartPreviewMainWindow.cs b/PartPreviewWindow/PartPreviewMainWindow.cs
index 0975f09ed..580d3660c 100644
--- a/PartPreviewWindow/PartPreviewMainWindow.cs
+++ b/PartPreviewWindow/PartPreviewMainWindow.cs
@@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 #if __ANDROID__
 			TerminalWidget terminalWidget = new TerminalWidget(true);
-			this.AddChild(new SoftKeyboardContentOffset(partPreviewWidget, SoftKeyboardContentOffset.AndroidKeyboardOffset));
+			this.AddChild(new SoftKeyboardContentOffset(partPreviewWidget));
 			//mainContainer.Closed += (sender, e) => { Close(); };
 #else
 			this.AddChild(partPreviewWidget);
diff --git a/PartPreviewWindow/SaveAsWindow.cs b/PartPreviewWindow/SaveAsWindow.cs
index bf2b6e257..23a5496af 100644
--- a/PartPreviewWindow/SaveAsWindow.cs
+++ b/PartPreviewWindow/SaveAsWindow.cs
@@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl
 			topToBottom.AddChild(buttonRow);
 
 #if __ANDROID__
-			this.AddChild(new SoftKeyboardContentOffset(topToBottom, SoftKeyboardContentOffset.AndroidKeyboardOffset));
+			this.AddChild(new SoftKeyboardContentOffset(topToBottom));
 #else
 			this.AddChild(topToBottom);
 #endif
diff --git a/PrinterControls/PrinterConnections/EditConnectionWidget.cs b/PrinterControls/PrinterConnections/EditConnectionWidget.cs
index 13a7b187d..c45e1147b 100644
--- a/PrinterControls/PrinterConnections/EditConnectionWidget.cs
+++ b/PrinterControls/PrinterConnections/EditConnectionWidget.cs
@@ -219,7 +219,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 			mainContainer.AddChild(buttonContainer);
 
 #if __ANDROID__
-			this.AddChild(new SoftKeyboardContentOffset(mainContainer, SoftKeyboardContentOffset.AndroidKeyboardOffset));
+			this.AddChild(new SoftKeyboardContentOffset(mainContainer));
 #else
 			this.AddChild(mainContainer);
 #endif
diff --git a/PrinterControls/TerminalWindow/TerminalWindow.cs b/PrinterControls/TerminalWindow/TerminalWindow.cs
index cfda3d10b..7a8e1c615 100644
--- a/PrinterControls/TerminalWindow/TerminalWindow.cs
+++ b/PrinterControls/TerminalWindow/TerminalWindow.cs
@@ -98,7 +98,7 @@ namespace MatterHackers.MatterControl
 			AlwaysOnTopOfMain = true;
 #if __ANDROID__
 			TerminalWidget terminalWidget = new TerminalWidget(true);
-			this.AddChild(new SoftKeyboardContentOffset(terminalWidget, SoftKeyboardContentOffset.AndroidKeyboardOffset));
+			this.AddChild(new SoftKeyboardContentOffset(terminalWidget));
 			terminalWidget.Closed += (sender, e) => { Close(); };
 #else
 			this.AddChild(new TerminalWidget(true));
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 8ddc271e2..a0a0f8761 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 8ddc271e27290492eff02d0bc7e30b1768c81459
+Subproject commit a0a0f876162678299b6b1d8aecd1c777694ff58a
diff --git a/TextCreator/TextCreatorMainWindow.cs b/TextCreator/TextCreatorMainWindow.cs
index 8f56706ad..472a9e058 100644
--- a/TextCreator/TextCreatorMainWindow.cs
+++ b/TextCreator/TextCreatorMainWindow.cs
@@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
 				ActiveSliceSettings.Instance.BedShape);
 
 #if __ANDROID__
-			this.AddChild(new SoftKeyboardContentOffset(part3DView, SoftKeyboardContentOffset.AndroidKeyboardOffset));
+			this.AddChild(new SoftKeyboardContentOffset(part3DView));
 #else
 			this.AddChild(part3DView);
 #endif