diff --git a/DiffPlex.App/Assets/LockScreenLogo.scale-100.png b/DiffPlex.App/Assets/LockScreenLogo.scale-100.png
index 1f43a3f3..8ee74539 100644
Binary files a/DiffPlex.App/Assets/LockScreenLogo.scale-100.png and b/DiffPlex.App/Assets/LockScreenLogo.scale-100.png differ
diff --git a/DiffPlex.App/Assets/LockScreenLogo.scale-200.png b/DiffPlex.App/Assets/LockScreenLogo.scale-200.png
index 209e7c30..4756c6cf 100644
Binary files a/DiffPlex.App/Assets/LockScreenLogo.scale-200.png and b/DiffPlex.App/Assets/LockScreenLogo.scale-200.png differ
diff --git a/DiffPlex.App/Assets/LockScreenLogo.scale-400.png b/DiffPlex.App/Assets/LockScreenLogo.scale-400.png
index 5ebcca8b..6502a594 100644
Binary files a/DiffPlex.App/Assets/LockScreenLogo.scale-400.png and b/DiffPlex.App/Assets/LockScreenLogo.scale-400.png differ
diff --git a/DiffPlex.App/Assets/SplashScreen.scale-200.png b/DiffPlex.App/Assets/SplashScreen.scale-200.png
index 824b2dba..185285b5 100644
Binary files a/DiffPlex.App/Assets/SplashScreen.scale-200.png and b/DiffPlex.App/Assets/SplashScreen.scale-200.png differ
diff --git a/DiffPlex.App/Assets/Square150x150Logo.scale-100.png b/DiffPlex.App/Assets/Square150x150Logo.scale-100.png
index b3623f82..8b57dda4 100644
Binary files a/DiffPlex.App/Assets/Square150x150Logo.scale-100.png and b/DiffPlex.App/Assets/Square150x150Logo.scale-100.png differ
diff --git a/DiffPlex.App/Assets/Square150x150Logo.scale-200.png b/DiffPlex.App/Assets/Square150x150Logo.scale-200.png
index 38d27c98..e7fca060 100644
Binary files a/DiffPlex.App/Assets/Square150x150Logo.scale-200.png and b/DiffPlex.App/Assets/Square150x150Logo.scale-200.png differ
diff --git a/DiffPlex.App/Assets/Square150x150Logo.scale-400.png b/DiffPlex.App/Assets/Square150x150Logo.scale-400.png
index c9ea02a4..60728fa3 100644
Binary files a/DiffPlex.App/Assets/Square150x150Logo.scale-400.png and b/DiffPlex.App/Assets/Square150x150Logo.scale-400.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.scale-100.png b/DiffPlex.App/Assets/Square44x44Logo.scale-100.png
index 66a8be72..92f1d7fc 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.scale-100.png and b/DiffPlex.App/Assets/Square44x44Logo.scale-100.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.scale-200.png b/DiffPlex.App/Assets/Square44x44Logo.scale-200.png
index d6dff4e6..b6914b60 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.scale-200.png and b/DiffPlex.App/Assets/Square44x44Logo.scale-200.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.scale-400.png b/DiffPlex.App/Assets/Square44x44Logo.scale-400.png
index f96b5fb2..d5cd0606 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.scale-400.png and b/DiffPlex.App/Assets/Square44x44Logo.scale-400.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.targetsize-128_altform-unplated.png b/DiffPlex.App/Assets/Square44x44Logo.targetsize-128_altform-unplated.png
index ce178b51..3f5d0591 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.targetsize-128_altform-unplated.png and b/DiffPlex.App/Assets/Square44x44Logo.targetsize-128_altform-unplated.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.targetsize-16_altform-unplated.png b/DiffPlex.App/Assets/Square44x44Logo.targetsize-16_altform-unplated.png
index dbf6f2a7..2941fafb 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.targetsize-16_altform-unplated.png and b/DiffPlex.App/Assets/Square44x44Logo.targetsize-16_altform-unplated.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/DiffPlex.App/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
index 5e6fe0c4..8ee74539 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and b/DiffPlex.App/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.targetsize-256_altform-unplated.png b/DiffPlex.App/Assets/Square44x44Logo.targetsize-256_altform-unplated.png
index b487eff9..69df7a7b 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.targetsize-256_altform-unplated.png and b/DiffPlex.App/Assets/Square44x44Logo.targetsize-256_altform-unplated.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.targetsize-32_altform-unplated.png b/DiffPlex.App/Assets/Square44x44Logo.targetsize-32_altform-unplated.png
index 434650a1..f0919d1c 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.targetsize-32_altform-unplated.png and b/DiffPlex.App/Assets/Square44x44Logo.targetsize-32_altform-unplated.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.targetsize-48_altform-unplated.png b/DiffPlex.App/Assets/Square44x44Logo.targetsize-48_altform-unplated.png
index 80e137e8..9c1a646e 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.targetsize-48_altform-unplated.png and b/DiffPlex.App/Assets/Square44x44Logo.targetsize-48_altform-unplated.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.targetsize-64_altform-unplated.png b/DiffPlex.App/Assets/Square44x44Logo.targetsize-64_altform-unplated.png
index 54b86ea6..ec4ecb7a 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.targetsize-64_altform-unplated.png and b/DiffPlex.App/Assets/Square44x44Logo.targetsize-64_altform-unplated.png differ
diff --git a/DiffPlex.App/Assets/Square44x44Logo.targetsize-80_altform-unplated.png b/DiffPlex.App/Assets/Square44x44Logo.targetsize-80_altform-unplated.png
index c893c9c6..6a26294c 100644
Binary files a/DiffPlex.App/Assets/Square44x44Logo.targetsize-80_altform-unplated.png and b/DiffPlex.App/Assets/Square44x44Logo.targetsize-80_altform-unplated.png differ
diff --git a/DiffPlex.App/Assets/StoreLogo.png b/DiffPlex.App/Assets/StoreLogo.png
index ecf6942d..3f5a6f6c 100644
Binary files a/DiffPlex.App/Assets/StoreLogo.png and b/DiffPlex.App/Assets/StoreLogo.png differ
diff --git a/DiffPlex.App/Assets/StoreLogo.scale-200.png b/DiffPlex.App/Assets/StoreLogo.scale-200.png
index 029e1375..91d11f3a 100644
Binary files a/DiffPlex.App/Assets/StoreLogo.scale-200.png and b/DiffPlex.App/Assets/StoreLogo.scale-200.png differ
diff --git a/DiffPlex.App/Assets/StoreLogo.scale-400.png b/DiffPlex.App/Assets/StoreLogo.scale-400.png
index 9431af2d..11d68dae 100644
Binary files a/DiffPlex.App/Assets/StoreLogo.scale-400.png and b/DiffPlex.App/Assets/StoreLogo.scale-400.png differ
diff --git a/DiffPlex.App/Assets/Wide310x150Logo.scale-200.png b/DiffPlex.App/Assets/Wide310x150Logo.scale-200.png
index 62617b5d..ac1e51b6 100644
Binary files a/DiffPlex.App/Assets/Wide310x150Logo.scale-200.png and b/DiffPlex.App/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/DiffPlex.App/DiffPlex.App.csproj b/DiffPlex.App/DiffPlex.App.csproj
index d35bb398..6cdb7ff8 100644
--- a/DiffPlex.App/DiffPlex.App.csproj
+++ b/DiffPlex.App/DiffPlex.App.csproj
@@ -1,19 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <WindowsSdkPackageVersion>10.0.19041.48</WindowsSdkPackageVersion>
     <RootNamespace>DiffPlex.UI</RootNamespace>
     <AssemblyName>DiffPlex.App</AssemblyName>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <PackageTags>diff</PackageTags>
     <Description>Diff files and text.</Description>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.0.0</FileVersion>
+    <LangVersion>12.0</LangVersion>
+    <AssemblyVersion>1.2.0.0</AssemblyVersion>
+    <FileVersion>1.2.0.0</FileVersion>
     <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
     <Authors>Kingcean Tuan; Matthew Manela</Authors>
@@ -42,8 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
diff --git a/DiffPlex.App/MainWindow.xaml b/DiffPlex.App/MainWindow.xaml
index d33b6dca..7289de34 100644
--- a/DiffPlex.App/MainWindow.xaml
+++ b/DiffPlex.App/MainWindow.xaml
@@ -18,7 +18,7 @@
         </StackPanel>
         <local:DiffTextView x:Name="MainElement" Background="#20808080" Grid.Row="1" >
             <local:DiffTextView.SecondaryCommands>
-                <AppBarButton x:Uid="/DiffPlex.Windows/InternalResources/AboutLabel" Label="About" Click="OnAboutClick" >
+                <AppBarButton x:Uid="/DiffPlex.Windows/InternalResources/AboutLabel" Label="About" Click="OnAboutClick" AccessKey="A" >
                     <AppBarButton.Icon>
                         <FontIcon Glyph="&#xE946;" />
                     </AppBarButton.Icon>
@@ -32,7 +32,7 @@
                 <TextBlock x:Name="VersionText" HorizontalAlignment="Center" Margin="0,0,0,20" />
                 <HyperlinkButton Content="Open source on GitHub (Apache-2.0 license)" Padding="8,0" NavigateUri="https://github.com/mmanela/diffplex" HorizontalAlignment="Center" />
                 <TextBlock Text="Copyright © 2022 Matthew Manela. All rights reserved." HorizontalAlignment="Center" />
-                <Button Content="OK" Style="{StaticResource AccentButtonStyle}" Width="100" Margin="0,20,0,60" HorizontalAlignment="Center" Click="OnExitAboutClick" />
+                <Button x:Name="OkButton" Content="OK" Style="{StaticResource AccentButtonStyle}" Width="100" Margin="0,20,0,60" HorizontalAlignment="Center" Click="OnExitAboutClick" />
             </StackPanel>
         </ScrollViewer>
     </Grid>
diff --git a/DiffPlex.App/MainWindow.xaml.cs b/DiffPlex.App/MainWindow.xaml.cs
index 2647b205..37800499 100644
--- a/DiffPlex.App/MainWindow.xaml.cs
+++ b/DiffPlex.App/MainWindow.xaml.cs
@@ -32,8 +32,6 @@ public MainWindow()
         Title = "DiffPlex";
         ExtendsContentIntoTitleBar = true;
         SetTitleBar(HeaderBar);
-        var osVer = Environment.OSVersion.Version;
-        if (osVer.Major < 10 || (osVer.Major == 10 && osVer.Minor == 0 && osVer.Build < 22000)) return;
         MainElement.OpenFileToReadText = GetFileTextAsync;
 #if DEBUG
         LoadData();
@@ -43,7 +41,7 @@ public MainWindow()
         var appWindow = VisualUtility.TryGetAppWindow(this);
         try
         {
-            if (appWindow != null) appWindow.SetIcon("DiffPlex.ico");
+            appWindow?.SetIcon("DiffPlex.ico");
         }
         catch (ArgumentException)
         {
@@ -95,7 +93,16 @@ private Task<string> GetFileTextAsync()
         => InternalUtilities.TryGetFileTextAsync(this);
 
     private void OnAboutClick(object sender, RoutedEventArgs e)
-        => AboutPanel.Visibility = Visibility.Visible;
+    {
+        AboutPanel.Visibility = Visibility.Visible;
+        _ = FocusOkButtonAsync();
+    }
+
+    private async Task FocusOkButtonAsync()
+    {
+        await Task.Delay(200);
+        if (AboutPanel.Visibility == Visibility.Visible) OkButton.Focus(FocusState.Programmatic);
+    }
 
     private void OnExitAboutClick(object sender, RoutedEventArgs e)
         => AboutPanel.Visibility = Visibility.Collapsed;
diff --git a/DiffPlex.App/Properties/PublishProfiles/win-arm64.pubxml b/DiffPlex.App/Properties/PublishProfiles/win-arm64.pubxml
new file mode 100644
index 00000000..dd2c455e
--- /dev/null
+++ b/DiffPlex.App/Properties/PublishProfiles/win-arm64.pubxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Platform>arm64</Platform>
+    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
+    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/DiffPlex.App/Properties/PublishProfiles/win-x64.pubxml b/DiffPlex.App/Properties/PublishProfiles/win-x64.pubxml
new file mode 100644
index 00000000..ca40a9e6
--- /dev/null
+++ b/DiffPlex.App/Properties/PublishProfiles/win-x64.pubxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Platform>x64</Platform>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/DiffPlex.App/Properties/PublishProfiles/win-x86.pubxml b/DiffPlex.App/Properties/PublishProfiles/win-x86.pubxml
new file mode 100644
index 00000000..be62e6b7
--- /dev/null
+++ b/DiffPlex.App/Properties/PublishProfiles/win-x86.pubxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Platform>x86</Platform>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/DiffPlex.Windows/Converters.cs b/DiffPlex.Windows/Converters.cs
index adc8c878..9942b10d 100644
--- a/DiffPlex.Windows/Converters.cs
+++ b/DiffPlex.Windows/Converters.cs
@@ -129,42 +129,3 @@ public NewDiffChangeTypeConverter()
     {
     }
 }
-
-/// <summary>
-/// The converter for visibility and boolean.
-/// </summary>
-internal class VisibilityBooleanConverter : IValueConverter
-{
-    /// <summary>
-    /// Converts a source to target.
-    /// </summary>
-    public object Convert(object value, Type targetType, object parameter, string language)
-    {
-        if (value is bool b)
-        {
-            if (targetType == typeof(bool)) return b;
-            return b ? Visibility.Visible : Visibility.Collapsed;
-        }
-
-        if (value is int i)
-        {
-            if (targetType == typeof(bool)) return i > 0;
-            return i > 0 ? Visibility.Visible : Visibility.Collapsed;
-        }
-
-        if (value is Visibility v)
-        {
-            if (targetType == typeof(Visibility)) return v;
-            return v == Visibility.Visible;
-        }
-
-        if (targetType == typeof(bool)) return false;
-        return null;
-    }
-
-    /// <summary>
-    /// Converts the source back.
-    /// </summary>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-        => Convert(value, targetType, parameter, language);
-}
diff --git a/DiffPlex.Windows/DiffPlex.Windows.csproj b/DiffPlex.Windows/DiffPlex.Windows.csproj
index dc1197f5..e3477b89 100644
--- a/DiffPlex.Windows/DiffPlex.Windows.csproj
+++ b/DiffPlex.Windows/DiffPlex.Windows.csproj
@@ -1,20 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows10.0.17763.0;net6.0-windows10.0.19041.0;net6.0-windows10.0.22000.0;net7.0-windows10.0.17763.0;net7.0-windows10.0.19041.0;net7.0-windows10.0.22000.0</TargetFrameworks>
+    <TargetFrameworks>net9.0-windows10.0.17763.0;net9.0-windows10.0.19041.0;net9.0-windows10.0.22000.0;net9.0-windows10.0.22621.0;net8.0-windows10.0.17763.0;net8.0-windows10.0.19041.0;net8.0-windows10.0.22000.0;net8.0-windows10.0.22621.0</TargetFrameworks>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>DiffPlex.UI</RootNamespace>
     <AssemblyName>DiffPlex.Windows</AssemblyName>
     <PackageId>DiffPlex.Windows</PackageId>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <PackageTags>diff</PackageTags>
     <PackageIcon>diffplex_icon.png</PackageIcon>
     <Description>DiffPlex.Windows is a Windows App SDK control library that allows you to programatically render visual text diffs in your application.</Description>
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
-    <FileVersion>1.1.0.0</FileVersion>
+    <LangVersion>13.0</LangVersion>
+    <AssemblyVersion>1.2.0.0</AssemblyVersion>
+    <FileVersion>1.2.0.0</FileVersion>
     <Authors>Kingcean Tuan; Matthew Manela</Authors>
     <Copyright>Copyright (c) 2022 Matthew Manela. All rights reserved.</Copyright>
+    <ApplicationIcon>../DiffPlex.ico</ApplicationIcon>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/mmanela/diffplex</PackageProjectUrl>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -33,9 +35,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageReference Include="Trivial.WindowsKit" Version="7.1.0" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+    <PackageReference Include="Trivial.WindowsKit" Version="9.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/DiffPlex.Windows/DiffTextView.xaml b/DiffPlex.Windows/DiffTextView.xaml
index 3b7004ee..51fa2c25 100644
--- a/DiffPlex.Windows/DiffTextView.xaml
+++ b/DiffPlex.Windows/DiffTextView.xaml
@@ -12,7 +12,7 @@
     <UserControl.Resources>
         <local:OldDiffChangeTypeConverter x:Key="OldBrushConverter"/>
         <local:NewDiffChangeTypeConverter x:Key="NewBrushConverter"/>
-        <local:VisibilityBooleanConverter x:Key="VisibilityBooleanConverter" />
+        <controls:BooleanVisibilityConverter x:Key="VisibilityBooleanConverter" />
         <FontFamily x:Key="CodeFonts" >Cascadia Code, Consolas, Courier New, monospace, Segoe UI, Microsoft Yahei, Microsoft Jhenghei, MS Gothic, Malgun Gothic, Microsoft Himalaya</FontFamily>
         <Style TargetType="local:DiffTextView" >
             <Setter Property="Padding" Value="3" />
@@ -87,94 +87,94 @@
         </Grid.RowDefinitions>
         <Border x:Name="BackgroundPanel" Grid.RowSpan="2" />
         <CommandBar x:Name="TopCommandBar" DefaultLabelPosition="{x:Bind CommandLabelPosition}" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Row="0" >
-            <AppBarButton x:Uid="/DiffPlex.Windows/InternalResources/PreviousLabel" Label="Previous" Click="OnPreviousDiffClick" >
+            <AppBarButton x:Uid="/DiffPlex.Windows/InternalResources/PreviousLabel" Label="Previous" Click="OnPreviousDiffClick" AccessKey="P" >
                 <AppBarButton.Icon>
                     <FontIcon Glyph="&#xE010;" />
                 </AppBarButton.Icon>
             </AppBarButton>
-            <AppBarButton x:Uid="/DiffPlex.Windows/InternalResources/NextLabel" Label="Next" Click="OnNextDiffClick" >
+            <AppBarButton x:Uid="/DiffPlex.Windows/InternalResources/NextLabel" Label="Next" Click="OnNextDiffClick" AccessKey="N" >
                 <AppBarButton.Icon>
                     <FontIcon Glyph="&#xE011;" />
                 </AppBarButton.Icon>
             </AppBarButton>
-            <AppBarToggleButton x:Uid="/DiffPlex.Windows/InternalResources/GoToLabel" x:Name="GoToMenuButton" Label="Go to" Click="OnGoToClick" >
+            <AppBarToggleButton x:Uid="/DiffPlex.Windows/InternalResources/GoToLabel" x:Name="GoToMenuButton" Label="Go to" Click="OnGoToClick" AccessKey="G" >
                 <AppBarToggleButton.Icon>
                     <FontIcon Glyph="&#xE7FD;" />
                 </AppBarToggleButton.Icon>
             </AppBarToggleButton>
-            <AppBarButton x:Uid="/DiffPlex.Windows/InternalResources/ViewLabel" Label="View" >
+            <AppBarButton x:Uid="/DiffPlex.Windows/InternalResources/ViewLabel" Label="View" AccessKey="V" >
                 <AppBarButton.Icon>
                     <FontIcon Glyph="&#xE154;" />
                 </AppBarButton.Icon>
                 <AppBarButton.Flyout>
                     <MenuFlyout>
-                        <ToggleMenuFlyoutItem x:Name="SplitViewMenuItem" x:Uid="/DiffPlex.Windows/InternalResources/SplitText" Text="Split" Click="OnSplitViewClick" IsChecked="True" >
+                        <ToggleMenuFlyoutItem x:Name="SplitViewMenuItem" x:Uid="/DiffPlex.Windows/InternalResources/SplitText" Text="Split" Click="OnSplitViewClick" IsChecked="True" AccessKey="S" >
                             <ToggleMenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xF58C;" />
                             </ToggleMenuFlyoutItem.Icon>
                         </ToggleMenuFlyoutItem>
-                        <ToggleMenuFlyoutItem x:Name="UnifiedViewMenuItem" x:Uid="/DiffPlex.Windows/InternalResources/UnifiedText" Text="Unified" Click="OnUnifiedViewClick" >
+                        <ToggleMenuFlyoutItem x:Name="UnifiedViewMenuItem" x:Uid="/DiffPlex.Windows/InternalResources/UnifiedText" Text="Unified" Click="OnUnifiedViewClick" AccessKey="U" >
                             <ToggleMenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xF58A;" />
                             </ToggleMenuFlyoutItem.Icon>
                         </ToggleMenuFlyoutItem>
                         <MenuFlyoutSeparator />
-                        <ToggleMenuFlyoutItem x:Name="CollapseUnchangedMenuItem" x:Uid="/DiffPlex.Windows/InternalResources/CollapseUnchangedText" Text="Collapse unchanged sections" Click="OnCollaspeUnchangedClick" >
+                        <ToggleMenuFlyoutItem x:Name="CollapseUnchangedMenuItem" x:Uid="/DiffPlex.Windows/InternalResources/CollapseUnchangedText" Text="Collapse unchanged sections" Click="OnCollaspeUnchangedClick" AccessKey="C" >
                             <MenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xE169;" />
                             </MenuFlyoutItem.Icon>
                         </ToggleMenuFlyoutItem>
-                        <MenuFlyoutSubItem x:Name="LinesContextMenuItem" x:Uid="/DiffPlex.Windows/InternalResources/LineContextText" Text="Lines for context" Visibility="Collapsed" >
+                        <MenuFlyoutSubItem x:Name="LinesContextMenuItem" x:Uid="/DiffPlex.Windows/InternalResources/LineContextText" Text="Lines for context" Visibility="Collapsed" AccessKey="L" >
                             <MenuFlyoutSubItem.Icon>
                                 <FontIcon Glyph="&#xE133;" />
                             </MenuFlyoutSubItem.Icon>
-                            <ToggleMenuFlyoutItem Text="0" Click="OnLinesContextClick" />
-                            <ToggleMenuFlyoutItem Text="1" Click="OnLinesContextClick" />
-                            <ToggleMenuFlyoutItem Text="2" Click="OnLinesContextClick" IsChecked="True" />
-                            <ToggleMenuFlyoutItem Text="3" Click="OnLinesContextClick" />
-                            <ToggleMenuFlyoutItem Text="4" Click="OnLinesContextClick" />
-                            <ToggleMenuFlyoutItem Text="5" Click="OnLinesContextClick" />
-                            <ToggleMenuFlyoutItem Text="6" Click="OnLinesContextClick" />
-                            <ToggleMenuFlyoutItem Text="7" Click="OnLinesContextClick" />
-                            <ToggleMenuFlyoutItem Text="8" Click="OnLinesContextClick" />
-                            <ToggleMenuFlyoutItem Text="9" Click="OnLinesContextClick" />
+                            <ToggleMenuFlyoutItem Text="0" Click="OnLinesContextClick" AccessKey="0" />
+                            <ToggleMenuFlyoutItem Text="1" Click="OnLinesContextClick" AccessKey="1" />
+                            <ToggleMenuFlyoutItem Text="2" Click="OnLinesContextClick" AccessKey="2" IsChecked="True" />
+                            <ToggleMenuFlyoutItem Text="3" Click="OnLinesContextClick" AccessKey="3" />
+                            <ToggleMenuFlyoutItem Text="4" Click="OnLinesContextClick" AccessKey="4" />
+                            <ToggleMenuFlyoutItem Text="5" Click="OnLinesContextClick" AccessKey="5" />
+                            <ToggleMenuFlyoutItem Text="6" Click="OnLinesContextClick" AccessKey="6" />
+                            <ToggleMenuFlyoutItem Text="7" Click="OnLinesContextClick" AccessKey="7" />
+                            <ToggleMenuFlyoutItem Text="8" Click="OnLinesContextClick" AccessKey="8" />
+                            <ToggleMenuFlyoutItem Text="9" Click="OnLinesContextClick" AccessKey="9" />
                         </MenuFlyoutSubItem>
                     </MenuFlyout>
                 </AppBarButton.Flyout>
             </AppBarButton>
-            <AppBarButton x:Uid="/DiffPlex.Windows/InternalResources/SelectFileLabel" Label="Select file" Visibility="{x:Bind IsFileMenuEnabled, Converter={StaticResource VisibilityBooleanConverter}}" >
+            <AppBarButton x:Uid="/DiffPlex.Windows/InternalResources/SelectFileLabel" Label="Select file" Visibility="{x:Bind IsFileMenuEnabled, Converter={StaticResource VisibilityBooleanConverter}}" AccessKey="O" >
                 <AppBarButton.Icon>
                     <FontIcon Glyph="&#xE838;" />
                 </AppBarButton.Icon>
                 <AppBarButton.Flyout>
                     <MenuFlyout>
-                        <MenuFlyoutItem x:Uid="/DiffPlex.Windows/InternalResources/LeftText" Text="Left (old)" Click="OnLeftFileClick" >
+                        <MenuFlyoutItem x:Uid="/DiffPlex.Windows/InternalResources/LeftText" Text="Left (old)" Click="OnLeftFileClick" AccessKey="L" >
                             <MenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xF26D;" />
                             </MenuFlyoutItem.Icon>
                         </MenuFlyoutItem>
-                        <MenuFlyoutItem x:Uid="/DiffPlex.Windows/InternalResources/RightText" Text="Right (new)" Click="OnRightFileClick" >
+                        <MenuFlyoutItem x:Uid="/DiffPlex.Windows/InternalResources/RightText" Text="Right (new)" Click="OnRightFileClick" AccessKey="R" >
                             <MenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xF26E;" />
                             </MenuFlyoutItem.Icon>
                         </MenuFlyoutItem>
                         <MenuFlyoutSeparator />
-                        <MenuFlyoutSubItem x:Uid="/DiffPlex.Windows/InternalResources/EditTextText" Text="Edit text" >
+                        <MenuFlyoutSubItem x:Uid="/DiffPlex.Windows/InternalResources/EditTextText" Text="Edit text" AccessKey="E" >
                             <MenuFlyoutSubItem.Icon>
                                 <FontIcon Glyph="&#xE1C2;" />
                             </MenuFlyoutSubItem.Icon>
-                            <MenuFlyoutItem x:Uid="/DiffPlex.Windows/InternalResources/LeftText" Text="Left (old)" Click="OnLeftTextClick" >
+                            <MenuFlyoutItem x:Uid="/DiffPlex.Windows/InternalResources/LeftText" Text="Left (old)" Click="OnLeftTextClick" AccessKey="L" >
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xF26D;" />
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
-                            <MenuFlyoutItem x:Uid="/DiffPlex.Windows/InternalResources/RightText" Text="Right (new)" Click="OnRightTextClick" >
+                            <MenuFlyoutItem x:Uid="/DiffPlex.Windows/InternalResources/RightText" Text="Right (new)" Click="OnRightTextClick" AccessKey="R" >
                                 <MenuFlyoutItem.Icon>
                                     <FontIcon Glyph="&#xF26E;" />
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
                         </MenuFlyoutSubItem>
-                        <MenuFlyoutItem x:Uid="/DiffPlex.Windows/InternalResources/SwitchText" Text="Switch" Click="OnSwitchClick" >
+                        <MenuFlyoutItem x:Uid="/DiffPlex.Windows/InternalResources/SwitchText" Text="Switch" Click="OnSwitchClick" AccessKey="X" >
                             <MenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xE13C;" />
                             </MenuFlyoutItem.Icon>
@@ -192,8 +192,8 @@
                             <ColumnDefinition Width="{Binding Path=OldTextWidth, ElementName=CurrentControl}" />
                             <ColumnDefinition Width="{Binding Path=NewTextWidth, ElementName=CurrentControl}" />
                         </Grid.ColumnDefinitions>
-                        <controls:TextLineBlock TextHighlighters="{x:Bind GetLeftHighlighter()}" Foreground="{Binding Path=Foreground, ElementName=CurrentControl}" TextBackground="{x:Bind Left.Type, Converter={StaticResource OldBrushConverter}}" LineNumberWidth="{Binding Path=LineNumberWidth, ElementName=CurrentControl}" LineNumber="{x:Bind Left.Position, Mode=OneTime}" LineNumberStyle="{Binding Path=LineNumberStyle, ElementName=CurrentControl}" Prefix="{x:Bind Left.Type, Converter={StaticResource OldBrushConverter}, Mode=OneTime}" PrefixWidth="{Binding Path=ChangeTypeWidth, ElementName=CurrentControl}" PrefixStyle="{Binding Path=ChangeTypeStyle, ElementName=CurrentControl}" Text="{x:Bind Left.Text, Mode=OneTime}" TextStyle="{Binding Path=TextStyle, ElementName=CurrentControl}" IsTextSelectionEnabled="{Binding Path=IsTextSelectionEnabled, ElementName=CurrentControl}" Grid.Column="0" />
-                        <controls:TextLineBlock TextHighlighters="{x:Bind GetRightHighlighter()}" Foreground="{Binding Path=Foreground, ElementName=CurrentControl}" TextBackground="{x:Bind Right.Type, Converter={StaticResource NewBrushConverter}}" LineNumberWidth="{Binding Path=LineNumberWidth, ElementName=CurrentControl}" LineNumber="{x:Bind Right.Position, Mode=OneTime}" LineNumberStyle="{Binding Path=LineNumberStyle, ElementName=CurrentControl}" Prefix="{x:Bind Right.Type, Converter={StaticResource NewBrushConverter}, Mode=OneTime}" PrefixWidth="{Binding Path=ChangeTypeWidth, ElementName=CurrentControl}" PrefixStyle="{Binding Path=ChangeTypeStyle, ElementName=CurrentControl}" Text="{x:Bind Right.Text, Mode=OneTime}" TextStyle="{Binding Path=TextStyle, ElementName=CurrentControl}" IsTextSelectionEnabled="{Binding Path=IsTextSelectionEnabled, ElementName=CurrentControl}" Grid.Column="1" />
+                        <controls:TextLineBlock TextHighlighters="{x:Bind GetLeftHighlighter(), Mode=OneTime}" Foreground="{Binding Path=Foreground, ElementName=CurrentControl}" TextBackground="{x:Bind Left.Type, Converter={StaticResource OldBrushConverter}, Mode=OneTime}" LineNumberWidth="{Binding Path=LineNumberWidth, ElementName=CurrentControl}" LineNumber="{x:Bind Left.Position, Mode=OneTime}" LineNumberStyle="{Binding Path=LineNumberStyle, ElementName=CurrentControl}" Prefix="{x:Bind Left.Type, Converter={StaticResource OldBrushConverter}, Mode=OneTime}" PrefixWidth="{Binding Path=ChangeTypeWidth, ElementName=CurrentControl}" PrefixStyle="{Binding Path=ChangeTypeStyle, ElementName=CurrentControl}" Text="{x:Bind Left.Text, Mode=OneTime}" TextStyle="{Binding Path=TextStyle, ElementName=CurrentControl}" IsTextSelectionEnabled="{Binding Path=IsTextSelectionEnabled, ElementName=CurrentControl}" Grid.Column="0" />
+                        <controls:TextLineBlock TextHighlighters="{x:Bind GetRightHighlighter(), Mode=OneTime}" Foreground="{Binding Path=Foreground, ElementName=CurrentControl}" TextBackground="{x:Bind Right.Type, Converter={StaticResource NewBrushConverter}, Mode=OneTime}" LineNumberWidth="{Binding Path=LineNumberWidth, ElementName=CurrentControl}" LineNumber="{x:Bind Right.Position, Mode=OneTime}" LineNumberStyle="{Binding Path=LineNumberStyle, ElementName=CurrentControl}" Prefix="{x:Bind Right.Type, Converter={StaticResource NewBrushConverter}, Mode=OneTime}" PrefixWidth="{Binding Path=ChangeTypeWidth, ElementName=CurrentControl}" PrefixStyle="{Binding Path=ChangeTypeStyle, ElementName=CurrentControl}" Text="{x:Bind Right.Text, Mode=OneTime}" TextStyle="{Binding Path=TextStyle, ElementName=CurrentControl}" IsTextSelectionEnabled="{Binding Path=IsTextSelectionEnabled, ElementName=CurrentControl}" Grid.Column="1" />
                     </Grid>
                 </DataTemplate>
             </ListView.ItemTemplate>
@@ -201,7 +201,7 @@
         <ListView x:Name="UnifiedElement" Foreground="{x:Bind Foreground}" Margin="0" Visibility="Collapsed" ItemContainerStyle="{x:Bind ItemContainerStyle}" SelectionMode="{x:Bind SelectionMode}" SelectionChanged="OnSelectionChanged" Grid.Row="1" >
             <ListView.ItemTemplate>
                 <DataTemplate x:DataType="local:InlineDiffTextViewModel" >
-                    <controls:TextLineBlock TextHighlighters="{x:Bind GetTextHighlighter()}" Foreground="{Binding Path=Foreground, ElementName=CurrentControl}" TextBackground="{x:Bind Line.Type, Converter={StaticResource NewBrushConverter}}" LineNumberWidth="{Binding Path=LineNumberWidth, ElementName=CurrentControl}" LineNumber="{x:Bind Position, Mode=OneTime}" LineNumberStyle="{Binding Path=LineNumberStyle, ElementName=CurrentControl}" Prefix="{x:Bind Line.Type, Converter={StaticResource NewBrushConverter}, Mode=OneTime}" PrefixWidth="{Binding Path=ChangeTypeWidth, ElementName=CurrentControl}" PrefixStyle="{Binding Path=ChangeTypeStyle, ElementName=CurrentControl}" Text="{x:Bind Text, Mode=OneTime}" TextStyle="{Binding Path=TextStyle, ElementName=CurrentControl}" IsTextSelectionEnabled="{Binding Path=IsTextSelectionEnabled, ElementName=CurrentControl}" />
+                    <controls:TextLineBlock TextHighlighters="{x:Bind GetTextHighlighter(), Mode=OneTime}" Foreground="{Binding Path=Foreground, ElementName=CurrentControl}" TextBackground="{x:Bind Line.Type, Converter={StaticResource NewBrushConverter}, Mode=OneTime}" LineNumberWidth="{Binding Path=LineNumberWidth, ElementName=CurrentControl}" LineNumber="{x:Bind Position, Mode=OneTime}" LineNumberStyle="{Binding Path=LineNumberStyle, ElementName=CurrentControl}" Prefix="{x:Bind Line.Type, Converter={StaticResource NewBrushConverter}, Mode=OneTime}" PrefixWidth="{Binding Path=ChangeTypeWidth, ElementName=CurrentControl}" PrefixStyle="{Binding Path=ChangeTypeStyle, ElementName=CurrentControl}" Text="{x:Bind Text, Mode=OneTime}" TextStyle="{Binding Path=TextStyle, ElementName=CurrentControl}" IsTextSelectionEnabled="{Binding Path=IsTextSelectionEnabled, ElementName=CurrentControl}" />
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
@@ -211,7 +211,7 @@
             <Button x:Uid="/DiffPlex.Windows/InternalResources/CancelButton" Content="Cancel" Width="110" Margin="120,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Bottom" Click="OnEditorCancelClick" />
         </Grid>
         <Border x:Name="GoToNumberContainer" Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}" CornerRadius="8" Width="300" Padding="8" Margin="20,0" HorizontalAlignment="Left" VerticalAlignment="Top" Visibility="Collapsed" Grid.Row="1" >
-            <NumberBox x:Name="GoToNumberBox" x:Uid="/DiffPlex.Windows/InternalResources/GoToInput" PlaceholderText="Line" ValueChanged="OnGoToChange" Minimum="1" LostFocus="OnGoToBoxLostFocus" />
+            <NumberBox x:Name="GoToNumberBox" x:Uid="/DiffPlex.Windows/InternalResources/GoToInput" PlaceholderText="Line" ValueChanged="OnGoToChange" Minimum="1" LostFocus="OnGoToBoxLostFocus" KeyDown="OnGoToBoxKeyDown" />
         </Border>
         <Grid x:Name="FilePathContainer" Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}" CornerRadius="8" Padding="8,8" Margin="20,0" HorizontalAlignment="Stretch" VerticalAlignment="Top" Visibility="Collapsed" Grid.Row="1" >
             <TextBox x:Name="FilePathTextBox" x:Uid="/DiffPlex.Windows/InternalResources/FilePathInput" PlaceholderText="File path" Margin="0,0,90,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
diff --git a/DiffPlex.Windows/DiffTextView.xaml.cs b/DiffPlex.Windows/DiffTextView.xaml.cs
index b7b5a166..1b32e18d 100644
--- a/DiffPlex.Windows/DiffTextView.xaml.cs
+++ b/DiffPlex.Windows/DiffTextView.xaml.cs
@@ -29,6 +29,7 @@
 
 namespace DiffPlex.UI;
 
+using static Trivial.Reflection.ExceptionHandler;
 using DependencyObjectProxy = DependencyObjectProxy<DiffTextView>;
 
 public sealed partial class DiffTextView : UserControl
@@ -486,26 +487,16 @@ public void Clear()
     /// </summary>
     public void ScrollPreviousDiffIntoView()
     {
-        if (IsSplitView) ScrollPreviousDiffIntoView<DiffTextViewModel>(SplitElement, GetDiffPiece);
-        else ScrollPreviousDiffIntoView<InlineDiffTextViewModel>(UnifiedElement, GetDiffPiece);
-    }
-
-    /// <summary>
-    /// Scrolls to previous diff line.
-    /// </summary>
-    private static void ScrollPreviousDiffIntoView<T>(ListView list, Func<T, DiffPiece> resolver) where T : class
-    {
-        var elements = new List<(T, double)>();
+        var list = GetActiveListView();
+        var elements = new List<(BaseDiffTextViewModel, double)>();
         foreach (var item in list.Items)
         {
-            var container = list.ContainerFromItem(item) as ListViewItem;
-            if (container == null || item is not T model) continue;
-            var piece = resolver(model);
-            if (piece == null) continue;
+            if (!GetItemFromList(list, item, out var container, out var model)) continue;
+            if (model.IsNullLine) continue;
             var transform = container.TransformToVisual(list) as MatrixTransform;
             if (transform == null) continue;
             var pos = transform.Matrix.OffsetY;
-            var isUnchanged = piece.Type == ChangeType.Unchanged;
+            var isUnchanged = model.IsUnchanged;
             if (pos >= 0) break;
             if (!isUnchanged) elements.Add((model, pos));
         }
@@ -519,7 +510,7 @@ private static void ScrollPreviousDiffIntoView<T>(ListView list, Func<T, DiffPie
             return;
         }
 
-        var first = list.Items.OfType<T>().FirstOrDefault();
+        var first = list.Items.OfType<BaseDiffTextViewModel>().FirstOrDefault();
         if (first != null) list.ScrollIntoView(first);
     }
 
@@ -528,23 +519,13 @@ private static void ScrollPreviousDiffIntoView<T>(ListView list, Func<T, DiffPie
     /// </summary>
     public void ScrollNextDiffIntoView()
     {
-        if (IsSplitView) ScrollNextDiffIntoView<DiffTextViewModel>(SplitElement, GetDiffPiece);
-        else ScrollNextDiffIntoView<InlineDiffTextViewModel>(UnifiedElement, GetDiffPiece);
-    }
-
-    /// <summary>
-    /// Scrolls to previous diff line.
-    /// </summary>
-    private static void ScrollNextDiffIntoView<T>(ListView list, Func<T, DiffPiece> resolver) where T : class
-    {
+        var list = GetActiveListView();
         var isIn = false;
         var height = Math.Max(list.ActualHeight - 50, 10);
         foreach (var item in list.Items)
         {
-            var container = list.ContainerFromItem(item) as ListViewItem;
-            if (container == null || item is not T model) continue;
-            var piece = resolver(model);
-            if (piece == null) continue;
+            if (!GetItemFromList(list, item, out var container, out var model)) continue;
+            if (model.IsNullLine) continue;
             var transform = container.TransformToVisual(list) as MatrixTransform;
             if (transform == null) continue;
             var pos = transform.Matrix.OffsetY;
@@ -554,13 +535,88 @@ private static void ScrollNextDiffIntoView<T>(ListView list, Func<T, DiffPiece>
                 continue;
             }
 
-            if (!isIn || piece.Type == ChangeType.Unchanged) continue;
+            if (!isIn || model.IsUnchanged) continue;
             isIn = true;
             list.ScrollIntoView(model, ScrollIntoViewAlignment.Leading);
             break;
         }
     }
 
+    /// <summary>
+    /// Finds all line numbers that the text contains the given string.
+    /// </summary>
+    /// <param name="q">The string to seek.</param>
+    /// <returns>All line numbers with the given string.</returns>
+    public IEnumerable<int> Find(string q)
+    {
+        var list = GetActiveListView();
+        foreach (var item in list.Items)
+        {
+            if (!GetItemFromList(list, item, out var container, out var model)) continue;
+            if (model.Contains(q)) yield return model.LineNumber;
+        }
+    }
+
+    /// <summary>
+    /// Attempts to set focus to a specific line.
+    /// </summary>
+    /// <param name="lineNumber">The line number.</param>
+    /// <param name="focusState">How this element obtains focus.</param>
+    /// <returns>true if keyboard focus and logical focus were set to the specific line; otherwise, false, if only logical focus was set to the specific line, or if the call to this method did not force the focus to change.</returns>
+    public bool Focus(int lineNumber, FocusState focusState)
+    {
+        if (IsSplitView)
+        {
+            var line = sideBySide.FirstOrDefault(ele => ele?.Right?.Position == lineNumber);
+            if (line is null || SplitElement.ContainerFromItem(line) is not ListViewItem container) return false;
+            return container.Focus(focusState);
+        }
+        else
+        {
+            var line = inlines.FirstOrDefault(ele => ele?.Position == lineNumber);
+            if (line is null || UnifiedElement.ContainerFromItem(line) is not ListViewItem container) return false;
+            return container.Focus(focusState);
+        }
+    }
+
+    /// <summary>
+    /// Attempts to set focus to a specific line.
+    /// </summary>
+    /// <param name="lineNumber">The line number.</param>
+    /// <param name="isLeft">true if the line number is for old text; otherwise, false.</param>
+    /// <param name="focusState">How this element obtains focus.</param>
+    /// <returns>true if keyboard focus and logical focus were set to the specific line; otherwise, false, if only logical focus was set to the specific line, or if the call to this method did not force the focus to change.</returns>
+    public bool FocusInSplitView(int lineNumber, bool isOld, FocusState focusState)
+    {
+        if (!IsSplitView) IsSplitView = true;
+        var line = isOld ? sideBySide.FirstOrDefault(ele => ele?.Left?.Position == lineNumber) : sideBySide.FirstOrDefault(ele => ele?.Right?.Position == lineNumber);
+        if (line is null || SplitElement.ContainerFromItem(line) is not ListViewItem container) return false;
+        return container.Focus(focusState);
+    }
+
+    /// <summary>
+    /// Attempts to set focus to a specific line.
+    /// </summary>
+    /// <param name="lineNumber">The line number.</param>
+    /// <param name="focusState">How this element obtains focus.</param>
+    /// <returns>true if keyboard focus and logical focus were set to the specific line; otherwise, false, if only logical focus was set to the specific line, or if the call to this method did not force the focus to change.</returns>
+    public bool FocusInSplitView(int lineNumber, FocusState focusState)
+        => FocusInSplitView(lineNumber, false, focusState);
+
+    /// <summary>
+    /// Attempts to set focus to a specific line.
+    /// </summary>
+    /// <param name="lineNumber">The line number.</param>
+    /// <param name="focusState">How this element obtains focus.</param>
+    /// <returns>true if keyboard focus and logical focus were set to the specific line; otherwise, false, if only logical focus was set to the specific line, or if the call to this method did not force the focus to change.</returns>
+    public bool FocusInUnifiedView(int lineNumber, FocusState focusState)
+    {
+        if (IsSplitView) IsSplitView = false;
+        var line = inlines.FirstOrDefault(ele => ele?.Position == lineNumber);
+        if (line is null || UnifiedElement.ContainerFromItem(line) is not ListViewItem container) return false;
+        return container.Focus(focusState);
+    }
+
     /// <summary>
     /// Scrolls the list to bring the specified line number into view with the specified alignment.
     /// </summary>
@@ -571,11 +627,13 @@ public void ScrollIntoView(int lineNumber, ScrollIntoViewAlignment alignment = S
         if (IsSplitView)
         {
             var line = sideBySide.FirstOrDefault(ele => ele?.Right?.Position == lineNumber);
+            if (line is null) return;
             SplitElement.ScrollIntoView(line, alignment);
         }
         else
         {
             var line = inlines.FirstOrDefault(ele => ele?.Position == lineNumber);
+            if (line is null) return;
             UnifiedElement.ScrollIntoView(line, alignment);
         }
     }
@@ -638,7 +696,24 @@ public void ShowNewFileSelectDialog()
         _ = FocusFilePathTextBoxAsync();
     }
 
-    private List<T> Filter<T>(List<T> col, Func<T, DiffPiece> piece)
+    private ListView GetActiveListView()
+        => IsSplitView ? SplitElement : UnifiedElement;
+
+    private bool GetItemFromList(ListView list, object item, out ListViewItem element, out BaseDiffTextViewModel model)
+    {
+        if (item is not BaseDiffTextViewModel m)
+        {
+            element = null;
+            model = null;
+            return false;
+        }
+
+        element = (list ?? GetActiveListView()).ContainerFromItem(item) as ListViewItem;
+        model = m;
+        return element is not null;
+    }
+
+    private List<T> Filter<T>(List<T> col) where T : BaseDiffTextViewModel
     {
         if (!IsUnchangedSectionCollapsed) return col;
         var list = new List<T>();
@@ -649,11 +724,10 @@ private List<T> Filter<T>(List<T> col, Func<T, DiffPiece> piece)
             try
             {
                 var row = col[i];
-                var item = piece(row);
-                if (item == null) continue;
+                if (row.IsNullLine) continue;
                 var j = list.Count;
                 list.Add(row);
-                if (item.Type == ChangeType.Unchanged)
+                if (row.IsUnchanged)
                 {
                     if (isUnchanged < 0) isUnchanged = j;
                     continue;
@@ -671,6 +745,13 @@ private List<T> Filter<T>(List<T> col, Func<T, DiffPiece> piece)
             }
         }
 
+        if (isUnchanged >= 0)
+        {
+            var begin = isUnchanged + lines;
+            var len = list.Count - lines - begin;
+            if (len >= 0) list.RemoveRange(begin, len);
+        }
+
         return list;
     }
 
@@ -695,7 +776,7 @@ private void RefreshSplitView(bool forceToUpdate = false)
         }
 
         sideBySide = col;
-        SplitElement.ItemsSource = Filter(col, GetDiffPiece);
+        SplitElement.ItemsSource = Filter(col);
         InfoElement.Text = $"+{add}  -{remove}";
     }
 
@@ -730,7 +811,7 @@ private void RefreshUnifiedView(bool forceToUpdate = false)
             }
         }
 
-        UnifiedElement.ItemsSource = Filter(col, GetDiffPiece);
+        UnifiedElement.ItemsSource = Filter(col);
         InfoElement.Text = $"+{add}  -{remove}";
     }
 
@@ -744,7 +825,7 @@ private void UpdateCollapseState()
         LinesContextMenuItem.Visibility = isCollapsed ? Visibility.Visible : Visibility.Collapsed;
         foreach (var m in LinesContextMenuItem.Items)
         {
-            if (m is not RadioMenuFlyoutItem radio) continue;
+            if (m is not ToggleMenuFlyoutItem radio) continue;
             var s = radio.Text?.Trim();
             if (string.IsNullOrEmpty(s))
             {
@@ -813,6 +894,16 @@ private void OnGoToChange(NumberBox sender, NumberBoxValueChangedEventArgs args)
         else UnifiedElement.Focus(FocusState.Programmatic);
     }
 
+    private void OnGoToBoxKeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        switch (e.Key)
+        {
+            case Windows.System.VirtualKey.Escape:
+                OnGoToBoxLostFocus();
+                break;
+        }
+    }
+
     private void OnSplitViewClick(object sender, RoutedEventArgs e)
         => IsSplitView = true;
 
@@ -889,13 +980,22 @@ private void OnLinesContextClick(object sender, RoutedEventArgs e)
         CollapseUnchangedSections(i);
     }
 
-    private void OnGoToBoxLostFocus(object sender, RoutedEventArgs e)
+    private void OnGoToBoxLostFocus()
     {
-        GoToNumberBox.Value = double.NaN;
-        GoToNumberContainer.Visibility = Visibility.Collapsed;
-        GoToMenuButton.IsChecked = false;
+        try
+        {
+            GoToNumberBox.Value = double.NaN;
+            GoToNumberContainer.Visibility = Visibility.Collapsed;
+            GoToMenuButton.IsChecked = false;
+        }
+        catch (InvalidOperationException)
+        {
+        }
     }
 
+    private void OnGoToBoxLostFocus(object sender, RoutedEventArgs e)
+        => OnGoToBoxLostFocus();
+
     private void OnFileSelectClick(object sender, RoutedEventArgs e)
     {
         if (FilePathContainer.Tag is not bool b) return;
@@ -990,10 +1090,4 @@ private static void SetSplitView(DiffTextView c, ChangeEventArgs<bool> e, Depend
 
     private static void UpdateCollapseState<T>(DiffTextView c, ChangeEventArgs<T> e, DependencyProperty d)
         => c?.UpdateCollapseState();
-
-    private static DiffPiece GetDiffPiece(DiffTextViewModel m)
-        => m.Right;
-
-    private static DiffPiece GetDiffPiece(InlineDiffTextViewModel m)
-        => m.Line;
 }
diff --git a/DiffPlex.Windows/InternalResources.lang-en-US.resw b/DiffPlex.Windows/InternalResources.lang-en-US.resw
new file mode 100644
index 00000000..2886010b
--- /dev/null
+++ b/DiffPlex.Windows/InternalResources.lang-en-US.resw
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AboutLabel.Label" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="CancelButton.Content" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="CollapseUnchangedText.Text" xml:space="preserve">
+    <value>Collapse unchanged sections</value>
+  </data>
+  <data name="EditTextText.Text" xml:space="preserve">
+    <value>Edit text</value>
+  </data>
+  <data name="FilePathInput.PlaceholderText" xml:space="preserve">
+    <value>File path</value>
+  </data>
+  <data name="GoToInput.PlaceholderText" xml:space="preserve">
+    <value>Line</value>
+  </data>
+  <data name="GoToLabel.Label" xml:space="preserve">
+    <value>Go to</value>
+  </data>
+  <data name="LeftText.Text" xml:space="preserve">
+    <value>Left (old)</value>
+  </data>
+  <data name="LinesContextText.Text" xml:space="preserve">
+    <value>Lines for context</value>
+  </data>
+  <data name="NextLabel.Label" xml:space="preserve">
+    <value>Next</value>
+  </data>
+  <data name="OkButton.Content" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="PreviousLabel.Label" xml:space="preserve">
+    <value>Previous</value>
+  </data>
+  <data name="RightText.Text" xml:space="preserve">
+    <value>Right (new)</value>
+  </data>
+  <data name="SameText.Text" xml:space="preserve">
+    <value>Same</value>
+  </data>
+  <data name="SaveAsButton.Content" xml:space="preserve">
+    <value>Save as…</value>
+  </data>
+  <data name="SelectFileLabel.Label" xml:space="preserve">
+    <value>Select file</value>
+  </data>
+  <data name="SplitText.Text" xml:space="preserve">
+    <value>Split</value>
+  </data>
+  <data name="SwitchText.Text" xml:space="preserve">
+    <value>Switch</value>
+  </data>
+  <data name="UnifiedText.Text" xml:space="preserve">
+    <value>Unified</value>
+  </data>
+  <data name="ViewLabel.Label" xml:space="preserve">
+    <value>View</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/DiffPlex.Windows/Internals.cs b/DiffPlex.Windows/Internals.cs
index 52ab20f2..54976e9d 100644
--- a/DiffPlex.Windows/Internals.cs
+++ b/DiffPlex.Windows/Internals.cs
@@ -167,7 +167,38 @@ public static async Task<string> TryGetFileTextAsync(Window window, Action<Excep
     }
 }
 
-internal class DiffTextViewModel
+/// <summary>
+/// The base view model for diff text.
+/// </summary>
+internal abstract class BaseDiffTextViewModel
+{
+    /// <summary>
+    /// Get or set the line number.
+    /// </summary>
+    public int LineNumber { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the line is unchanged.
+    /// </summary>
+    public abstract bool IsUnchanged { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether the current line is null.
+    /// </summary>
+    public abstract bool IsNullLine { get; }
+
+    /// <summary>
+    /// Returns a value indicating whether a specified substring occurs within the text in this view model.
+    /// </summary>
+    /// <param name="q">The string to seek.</param>
+    /// <returns>true if the value parameter occurs within the text in this view model; otherwise, false.</returns>
+    public abstract bool Contains(string q);
+}
+
+/// <summary>
+/// The diff text view model of split mode.
+/// </summary>
+internal class DiffTextViewModel : BaseDiffTextViewModel
 {
     public DiffTextViewModel()
     {
@@ -186,26 +217,44 @@ public DiffTextViewModel(int number, DiffPiece left, DiffPiece right, DiffTextVi
         Reference = reference;
     }
 
-    public int LineNumber { get; set; }
+    public DiffPiece Left { get; private set; }
+
+    public DiffPiece Right { get; private set; }
 
-    public DiffPiece Left { get; set; }
+    public DiffTextViewReference Reference { get; private set; }
 
-    public DiffPiece Right { get; set; }
+    public string LeftText => Left?.Text;
 
-    public DiffTextViewReference Reference { get; set; }
+    public string RightText => Right?.Text;
 
-    public string LeftText => Left.Text;
+    /// <inheritdoc />
+    public override bool IsUnchanged => Right?.Type == ChangeType.Unchanged;
 
-    public string RightText => Right.Text;
+    /// <inheritdoc />
+    public override bool IsNullLine => Right is null;
 
     public IEnumerable<TextHighlighter> GetLeftHighlighter()
         => InternalUtilities.GetTextHighlighter(Left?.SubPieces, ChangeType.Deleted, Reference?.Element?.Foreground);
 
     public IEnumerable<TextHighlighter> GetRightHighlighter()
         => InternalUtilities.GetTextHighlighter(Right?.SubPieces, ChangeType.Inserted, Reference?.Element?.Foreground);
+
+    /// <inheritdoc />
+    public override bool Contains(string q)
+    {
+        if (string.IsNullOrEmpty(q)) return false;
+        var v = Right?.Text;
+        if (v != null && v.Contains(q)) return true;
+        v = Left?.Text;
+        if (v != null && v.Contains(q)) return true;
+        return false;
+    }
 }
 
-internal class InlineDiffTextViewModel
+/// <summary>
+/// The diff text view model of unified mode.
+/// </summary>
+internal class InlineDiffTextViewModel : BaseDiffTextViewModel
 {
     public InlineDiffTextViewModel()
     {
@@ -223,26 +272,33 @@ public InlineDiffTextViewModel(int number, DiffPiece line, DiffTextViewReference
         Reference = reference;
     }
 
-    public int LineNumber { get; set; }
-
-    public DiffPiece Line { get; set; }
+    public DiffPiece Line { get; private set; }
 
     public string Text => Line?.Text;
 
     public int? Position => Line?.Position;
 
-    public DiffTextViewReference Reference { get; set; }
+    public DiffTextViewReference Reference { get; private set; }
+
+    /// <inheritdoc />
+    public override bool IsUnchanged => Line?.Type == ChangeType.Unchanged;
+
+    /// <inheritdoc />
+    public override bool IsNullLine => Line is null;
 
     public IEnumerable<TextHighlighter> GetTextHighlighter()
         => InternalUtilities.GetTextHighlighter(Line?.SubPieces, ChangeType.Deleted, Reference?.Element?.Foreground);
-}
 
-internal class DiffTextViewReference
-{
-    public DiffTextViewReference(DiffTextView element)
+    /// <inheritdoc />
+    public override bool Contains(string q)
     {
-        Element = element;
+        if (string.IsNullOrEmpty(q)) return false;
+        var v = Line?.Text;
+        return v != null && v.Contains(q);
     }
+}
 
-    public DiffTextView Element { get; set; }
+internal class DiffTextViewReference(DiffTextView element)
+{
+    public DiffTextView Element { get; set; } = element;
 }
diff --git a/DiffPlex.Wpf.Demo/DiffPlex.Wpf.Demo.csproj b/DiffPlex.Wpf.Demo/DiffPlex.Wpf.Demo.csproj
index e233b18f..b934ef03 100644
--- a/DiffPlex.Wpf.Demo/DiffPlex.Wpf.Demo.csproj
+++ b/DiffPlex.Wpf.Demo/DiffPlex.Wpf.Demo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net6.0-windows;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0-windows;net48</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <StartupObject>DiffPlex.Wpf.Demo.App</StartupObject>
diff --git a/DiffPlex.Wpf/DiffPlex.Wpf.csproj b/DiffPlex.Wpf/DiffPlex.Wpf.csproj
index 0b547bfa..296c4a08 100644
--- a/DiffPlex.Wpf/DiffPlex.Wpf.csproj
+++ b/DiffPlex.Wpf/DiffPlex.Wpf.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\NuGet.props" />
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows;net46;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0-windows;net8.0-windows;net6.0-windows;net46;net48</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
-    <Version>1.4.0</Version>
+    <Version>1.5.0</Version>
     <RootNamespace>DiffPlex.Wpf</RootNamespace>
     <AssemblyName>DiffPlex.Wpf</AssemblyName>
     <PackageTags>diff, wpf</PackageTags>
     <Description>DiffPlex.Wpf is a WPF control library that allows you to programatically render visual text diffs in your application. It also provide a diff viewer control used in Windows Forms application.</Description>
-    <AssemblyVersion>1.4.0.0</AssemblyVersion>
-    <FileVersion>1.4.0.0</FileVersion>
+    <AssemblyVersion>1.5.0.0</AssemblyVersion>
+    <FileVersion>1.5.0.0</FileVersion>
     <ApplicationIcon>..\DiffPlex.ico</ApplicationIcon>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
diff --git a/DiffPlex.ico b/DiffPlex.ico
index c1a97234..655c0143 100644
Binary files a/DiffPlex.ico and b/DiffPlex.ico differ
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6ad5843e..5cb5596b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,6 +16,16 @@ variables:
 
 steps:
 
+- task: UseDotNet@2
+  inputs:
+    packageType: 'sdk'
+    version: '9.x'
+
+- task: UseDotNet@2
+  inputs:
+    packageType: 'sdk'
+    version: '8.x'
+
 - task: UseDotNet@2
   inputs:
     packageType: 'sdk'
diff --git a/images/diffplex_icon.png b/images/diffplex_icon.png
index c2e64b03..401374ab 100644
Binary files a/images/diffplex_icon.png and b/images/diffplex_icon.png differ