diff --git a/MatterControlLib/AboutPage/UpdateControlData.cs b/MatterControlLib/AboutPage/UpdateControlData.cs
index 7808afee1..87cad6253 100644
--- a/MatterControlLib/AboutPage/UpdateControlData.cs
+++ b/MatterControlLib/AboutPage/UpdateControlData.cs
@@ -112,11 +112,9 @@ namespace MatterHackers.MatterControl
 				if (this.UpdateRequired && !haveShowUpdateRequired)
 				{
 					haveShowUpdateRequired = true;
-					if (!UserSettings.Instance.IsTouchScreen)
+					if (!GuiWidget.TouchScreenMode)
 					{
-#if !__ANDROID__
 						UiThread.RunOnIdle(() => DialogWindow.Show<CheckForUpdatesPage>());
-#endif
 					}
 				}
 			}
diff --git a/MatterControlLib/PartPreviewWindow/LibraryBrowserPage.cs b/MatterControlLib/PartPreviewWindow/LibraryBrowserPage.cs
index f7ca37fc9..ca1c99197 100644
--- a/MatterControlLib/PartPreviewWindow/LibraryBrowserPage.cs
+++ b/MatterControlLib/PartPreviewWindow/LibraryBrowserPage.cs
@@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl
 		public override void OnLoad(EventArgs args)
 		{
 			if (itemNameWidget != null
-				&& !UserSettings.Instance.IsTouchScreen)
+				&& !GuiWidget.TouchScreenMode)
 			{
 				UiThread.RunOnIdle(itemNameWidget.Focus);
 			}
diff --git a/MatterControlLib/PrinterControls/JogControls.cs b/MatterControlLib/PrinterControls/JogControls.cs
index 86d08530b..5626f09e5 100644
--- a/MatterControlLib/PrinterControls/JogControls.cs
+++ b/MatterControlLib/PrinterControls/JogControls.cs
@@ -291,7 +291,7 @@ namespace MatterHackers.MatterControl
 			{
 				HAnchor = HAnchor.Center,
 				Margin = new BorderDouble(5),
-				Visible = !UserSettings.Instance.IsTouchScreen,
+				Visible = !GuiWidget.TouchScreenMode,
 				Enabled = false,
 				Selectable = false
 			};
diff --git a/MatterControlLib/RootSystemWindow.cs b/MatterControlLib/RootSystemWindow.cs
index 371295137..fb2d65286 100644
--- a/MatterControlLib/RootSystemWindow.cs
+++ b/MatterControlLib/RootSystemWindow.cs
@@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl
 			GuiWidget.DefaultEnforceIntegerBounds = true;
 
 			// TODO: Needs review - doesn't seem like we want to scale on Touchscreen, rather we want device specific, configuration based scaling. Suggest remove
-			if (UserSettings.Instance.IsTouchScreen)
+			if (GuiWidget.TouchScreenMode)
 			{
 				// TODO: This steps on user scaling
 				GuiWidget.DeviceScale = 1.3;
@@ -126,7 +126,7 @@ namespace MatterHackers.MatterControl
 		{
 			int width = 0;
 			int height = 0;
-			if (UserSettings.Instance.IsTouchScreen)
+			if (GuiWidget.TouchScreenMode)
 			{
 				minSize = new Vector2(800, 480);
 			}
diff --git a/MatterControlLib/SettingsManagement/UserSettings.cs b/MatterControlLib/SettingsManagement/UserSettings.cs
index 12cea846c..322b4f3b9 100644
--- a/MatterControlLib/SettingsManagement/UserSettings.cs
+++ b/MatterControlLib/SettingsManagement/UserSettings.cs
@@ -127,7 +127,7 @@ namespace MatterHackers.MatterControl
 						if (globalInstance == null)
 						{
 							globalInstance = new UserSettings();
-							ToolTipManager.AllowToolTips = !UserSettings.Instance.IsTouchScreen;
+							ToolTipManager.AllowToolTips = !GuiWidget.TouchScreenMode;
 						}
 					}
 				}
@@ -242,11 +242,7 @@ namespace MatterHackers.MatterControl
 		{
 			get
 			{
-#if __ANDROID__
-				return true;
-#else
 				return this.get(UserSettingsKey.ApplicationDisplayMode) == "touchscreen";
-#endif
 			}
 		}
 
@@ -254,19 +250,14 @@ namespace MatterHackers.MatterControl
 		{
 			get
 			{
-#if __ANDROID__
-				// Always use flat thumbnails on Android - at least until alpha glitch is resolve and compute cost for thumbnails is reduced
-				return "orthographic";
-#else
 				string renderingMode = this.get(UserSettingsKey.ThumbnailRenderingMode);
 				if (string.IsNullOrWhiteSpace(renderingMode))
 				{
 					// If the current value is unset or invalid, use platform defaults
-					return UserSettings.Instance.IsTouchScreen ? "orthographic" : "raytraced";
+					return GuiWidget.TouchScreenMode ? "orthographic" : "raytraced";
 				}
 
 				return renderingMode;
-#endif
 			}
 
 			set