diff --git a/src/DiffEngineTray.Tests/DiffEngineTray.Tests.csproj b/src/DiffEngineTray.Tests/DiffEngineTray.Tests.csproj
index 27fe8b52..80f25538 100644
--- a/src/DiffEngineTray.Tests/DiffEngineTray.Tests.csproj
+++ b/src/DiffEngineTray.Tests/DiffEngineTray.Tests.csproj
@@ -1,7 +1,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <NoWarn>CA1416</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/DiffEngineTray/DiffEngineTray.csproj b/src/DiffEngineTray/DiffEngineTray.csproj
index 7e1a5bca..e01c240e 100644
--- a/src/DiffEngineTray/DiffEngineTray.csproj
+++ b/src/DiffEngineTray/DiffEngineTray.csproj
@@ -2,13 +2,12 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <PackAsTool>True</PackAsTool>
     <Description>A utility that runs in the windows tray and handles the results of file differences.</Description>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <NoWarn>NETSDK1137;WFAC010;NU5119</NoWarn>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
diff --git a/src/DiffEngineTray/Program.cs b/src/DiffEngineTray/Program.cs
index 9bee467d..45f676bb 100644
--- a/src/DiffEngineTray/Program.cs
+++ b/src/DiffEngineTray/Program.cs
@@ -5,6 +5,9 @@ static class Program
     static async Task Main()
     {
         Logging.Init();
+        Application.EnableVisualStyles();
+        Application.SetCompatibleTextRenderingDefault(false);
+        Application.SetHighDpiMode(HighDpiMode.SystemAware);
 
         try
         {
diff --git a/src/DiffEngineTray/Settings/HotKeyControl.cs b/src/DiffEngineTray/Settings/HotKeyControl.cs
index bebf0e2a..1873e519 100644
--- a/src/DiffEngineTray/Settings/HotKeyControl.cs
+++ b/src/DiffEngineTray/Settings/HotKeyControl.cs
@@ -7,6 +7,7 @@ public HotKeyControl()
         keyCombo.Items.AddRange(GetAlphabet().ToArray());
     }
 
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public HotKey? HotKey
     {
         get
@@ -39,12 +40,14 @@ public HotKey? HotKey
         }
     }
 
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public string Label
     {
         get => hotKeyEnabled.Text;
         set => hotKeyEnabled.Text = value;
     }
 
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public string? Help
     {
         get => (string?) helpLabel.Text;
diff --git a/src/DiffEngineTray/Settings/OptionsFormLauncher.cs b/src/DiffEngineTray/Settings/OptionsFormLauncher.cs
index d782adae..c5f948be 100644
--- a/src/DiffEngineTray/Settings/OptionsFormLauncher.cs
+++ b/src/DiffEngineTray/Settings/OptionsFormLauncher.cs
@@ -2,12 +2,6 @@ static class OptionsFormLauncher
 {
     static OptionsForm? instance;
 
-    static EventHandler formOnClosed = (_, _) =>
-    {
-        instance!.Closed -= formOnClosed;
-        instance = null;
-    };
-
     public static async Task Launch(KeyRegister keyRegister, Tracker tracker)
     {
         if (instance != null)
@@ -21,8 +15,8 @@ public static async Task Launch(KeyRegister keyRegister, Tracker tracker)
             settings,
             newSettings => Save(keyRegister, tracker, newSettings));
         instance = form;
-        form.Closed += formOnClosed;
-        form.ShowDialog();
+        await form.ShowDialogAsync();
+        instance = null;
     }
 
     static async Task<IReadOnlyCollection<string>> Save(KeyRegister keyRegister, Tracker tracker, Settings settings)
diff --git a/src/DiffEngineTray/app.manifest b/src/DiffEngineTray/app.manifest
deleted file mode 100644
index 4e3bc024..00000000
--- a/src/DiffEngineTray/app.manifest
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-        <application>
-            <!-- Windows 10 compatibility -->
-            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-        </application>
-    </compatibility>
-
-    <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
-       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
-       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
-       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
-    <application xmlns="urn:schemas-microsoft-com:asm.v3">
-        <windowsSettings>
-            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-        </windowsSettings>
-    </application>
-
-    <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
-
-    <dependency>
-        <dependentAssembly>
-            <assemblyIdentity
-                    type="win32"
-                    name="Microsoft.Windows.Common-Controls"
-                    version="6.0.0.0"
-                    processorArchitecture="*"
-                    publicKeyToken="6595b64144ccf1df"
-                    language="*"
-            />
-        </dependentAssembly>
-    </dependency>
-</assembly>
\ No newline at end of file