diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index b661e0b78a..9d153e0336 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -76,7 +76,7 @@ jobs:
 # ================================
   linux:
     name: Linux
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runtime == 'linux-x64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
     strategy:
       matrix:
         runtime: [ linux-x64, linux-arm64, linux-arm ]
@@ -89,6 +89,13 @@ jobs:
       with:
         dotnet-version: 10.0.x
 
+    - name: Install cross-compilation toolchain (arm)
+      if: matrix.runtime == 'linux-arm'
+      run: |
+        sudo apt-get update
+        # Brings in cross-compilation toolchain for armhf including binutils
+        sudo apt-get install -y gcc-arm-linux-gnueabihf
+
     - name: Install dependencies
       run: dotnet restore
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
index d19eef0708..2374d94c61 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,10 +6,9 @@
 
   <ItemGroup>
     <!-- Avalonia -->
-    <PackageVersion Include="Avalonia" Version="11.1.3" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.1.3" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.1.3" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.1.3" />
+    <PackageVersion Include="Avalonia" Version="12.0.5" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.0.5" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.5" />
 
     <!-- Microsoft Identity -->
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.65.0" />
@@ -23,7 +22,6 @@
     <!-- Other -->
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
-    <PackageVersion Include="Tmds.DBus.Protocol" Version="0.21.3" />
     <PackageVersion Include="Tools.InnoSetup" Version="6.3.1" GeneratePathProperty="true" />
 
     <!-- Testing -->
diff --git a/src/linux/Packaging.Linux/install-from-source.sh b/src/linux/Packaging.Linux/install-from-source.sh
index 1337b75273..64f925811f 100755
--- a/src/linux/Packaging.Linux/install-from-source.sh
+++ b/src/linux/Packaging.Linux/install-from-source.sh
@@ -259,5 +259,9 @@ if [ -z "$DOTNET_ROOT" ]; then
 fi
 
 cd "$toplevel_path"
-$sudo_cmd env "PATH=$PATH" $DOTNET_ROOT/dotnet build ./src/linux/Packaging.Linux/Packaging.Linux.csproj -c Release -p:InstallFromSource=true -p:installPrefix=$installPrefix
+# Build a non-AOT binary so installing from source needs only the .NET SDK,
+# not a C toolchain (clang + zlib) to link a native build. PublishAot is read
+# from the environment by Git-Credential-Manager.csproj and inherited by the
+# nested publish.
+$sudo_cmd env "PATH=$PATH" PublishAot=false $DOTNET_ROOT/dotnet build ./src/linux/Packaging.Linux/Packaging.Linux.csproj -c Release -p:InstallFromSource=true -p:installPrefix=$installPrefix
 add_to_PATH "$installPrefix/bin"
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketOAuth2Client.cs b/src/shared/Atlassian.Bitbucket/BitbucketOAuth2Client.cs
index 1ca23d0f57..84e76518f3 100644
--- a/src/shared/Atlassian.Bitbucket/BitbucketOAuth2Client.cs
+++ b/src/shared/Atlassian.Bitbucket/BitbucketOAuth2Client.cs
@@ -42,7 +42,9 @@ protected override bool TryCreateTokenEndpointResult(string json, out OAuth2Toke
             // We override the token endpoint response parsing because the Bitbucket authority returns
             // the non-standard 'scopes' property for the list of scopes, rather than the (optional)
             // 'scope' (note the singular vs plural) property as outlined in the standard.
-            if (TryDeserializeJson(json, out BitbucketTokenEndpointResponseJson jsonObj))
+            if (TryDeserializeJson(json,
+                    BitbucketOAuthJsonContext.Default.BitbucketTokenEndpointResponseJson,
+                    out BitbucketTokenEndpointResponseJson jsonObj))
             {
                 result = jsonObj.ToResult();
                 return true;
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketTokenEndpointResponseJson.cs b/src/shared/Atlassian.Bitbucket/BitbucketTokenEndpointResponseJson.cs
index c28e63de11..afc8c43a5f 100644
--- a/src/shared/Atlassian.Bitbucket/BitbucketTokenEndpointResponseJson.cs
+++ b/src/shared/Atlassian.Bitbucket/BitbucketTokenEndpointResponseJson.cs
@@ -5,6 +5,9 @@
 
 namespace Atlassian.Bitbucket
 {
+    [JsonSerializable(typeof(BitbucketTokenEndpointResponseJson))]
+    public partial class BitbucketOAuthJsonContext : JsonSerializerContext;
+
     [JsonConverter(typeof(BitbucketCustomTokenEndpointResponseJsonConverter))]
     public class BitbucketTokenEndpointResponseJson : TokenEndpointResponseJson
     {
diff --git a/src/shared/Atlassian.Bitbucket/Cloud/BitbucketRestApi.cs b/src/shared/Atlassian.Bitbucket/Cloud/BitbucketRestApi.cs
index 94021e14da..c90932f381 100644
--- a/src/shared/Atlassian.Bitbucket/Cloud/BitbucketRestApi.cs
+++ b/src/shared/Atlassian.Bitbucket/Cloud/BitbucketRestApi.cs
@@ -8,6 +8,13 @@
 
 namespace Atlassian.Bitbucket.Cloud
 {
+    [JsonSerializable(typeof(UserInfo))]
+    [JsonSourceGenerationOptions(
+        PropertyNameCaseInsensitive = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+    )]
+    public partial class BitbucketCloudRestApiJsonContext : JsonSerializerContext;
+
     public class BitbucketRestApi : IBitbucketRestApi
     {
         private readonly ICommandContext _context;
@@ -43,11 +50,7 @@ public async Task<RestApiResult<IUserInfo>> GetUserInformationAsync(string userN
 
                     if (response.IsSuccessStatusCode)
                     {
-                        var obj = JsonSerializer.Deserialize<UserInfo>(json,
-                            new JsonSerializerOptions
-                            {
-                                PropertyNameCaseInsensitive = true,
-                            });
+                        UserInfo obj = JsonSerializer.Deserialize(json, BitbucketCloudRestApiJsonContext.Default.UserInfo);
 
                         return new RestApiResult<IUserInfo>(response.StatusCode, obj);
                     }
diff --git a/src/shared/Atlassian.Bitbucket/DataCenter/BitbucketRestApi.cs b/src/shared/Atlassian.Bitbucket/DataCenter/BitbucketRestApi.cs
index 159229885d..65c2520d16 100644
--- a/src/shared/Atlassian.Bitbucket/DataCenter/BitbucketRestApi.cs
+++ b/src/shared/Atlassian.Bitbucket/DataCenter/BitbucketRestApi.cs
@@ -10,6 +10,15 @@
 
 namespace Atlassian.Bitbucket.DataCenter
 {
+    [JsonSerializable(typeof(UserInfo))]
+    [JsonSerializable(typeof(LoginOption))]
+    [JsonSerializable(typeof(LoginOptions))]
+    [JsonSourceGenerationOptions(
+        PropertyNameCaseInsensitive = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+    )]
+    public partial class BitbucketDataCenterRestApiJsonContext : JsonSerializerContext;
+
     public class BitbucketRestApi : IBitbucketRestApi
     {
         private readonly ICommandContext _context;
@@ -107,12 +116,8 @@ public async Task<List<AuthenticationMethod>> GetAuthenticationMethodsAsync()
 
                     if (response.IsSuccessStatusCode)
                     {
-                        var loginOptions = JsonSerializer.Deserialize<LoginOptions>(json,
-                            new JsonSerializerOptions
-                            {
-                                PropertyNameCaseInsensitive = true,
-                                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-                            });
+                        LoginOptions loginOptions = JsonSerializer.Deserialize(
+                            json, BitbucketDataCenterRestApiJsonContext.Default.LoginOptions);
 
                         if (loginOptions.Results.Any(r => "LOGIN_FORM".Equals(r.Type)))
                         {
@@ -151,4 +156,4 @@ private Uri ApiUri
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml b/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml
index 717500b7be..895587b610 100644
--- a/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml
+++ b/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml
@@ -5,6 +5,7 @@
              xmlns:vm="clr-namespace:Atlassian.Bitbucket.UI.ViewModels;assembly=Atlassian.Bitbucket"
              xmlns:converters="clr-namespace:GitCredentialManager.UI.Converters;assembly=gcmcore"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="vm:CredentialsViewModel"
              x:Class="Atlassian.Bitbucket.UI.Views.CredentialsView">
     <Design.DataContext>
         <vm:CredentialsViewModel/>
@@ -63,11 +64,11 @@
                 <StackPanel Margin="0,15">
                     <TextBox x:Name="_userNameTextBox" Margin="0,0,0,10"
                              HorizontalAlignment="Stretch"
-                             Watermark="Email or username"
+                             PlaceholderText="Email or username"
                              Text="{Binding UserName}" />
                     <TextBox x:Name="_passwordTextBox" Margin="0,0,0,10"
                              HorizontalAlignment="Stretch"
-                             Watermark="Password or token" PasswordChar="●"
+                             PlaceholderText="Password or token" PasswordChar="●"
                              Text="{Binding Password}" />
                     <Button IsDefault="True"
                             HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
diff --git a/src/shared/Core/Authentication/OAuth/Json/OAuthJsonContext.cs b/src/shared/Core/Authentication/OAuth/Json/OAuthJsonContext.cs
new file mode 100644
index 0000000000..3737c9fcd2
--- /dev/null
+++ b/src/shared/Core/Authentication/OAuth/Json/OAuthJsonContext.cs
@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace GitCredentialManager.Authentication.OAuth.Json;
+
+[JsonSerializable(typeof(DeviceAuthorizationEndpointResponseJson))]
+[JsonSerializable(typeof(TokenEndpointResponseJson))]
+[JsonSerializable(typeof(ErrorResponseJson))]
+[JsonSourceGenerationOptions(PropertyNameCaseInsensitive = true)]
+public partial class OAuthJsonContext : JsonSerializerContext;
diff --git a/src/shared/Core/Authentication/OAuth/OAuth2Client.cs b/src/shared/Core/Authentication/OAuth/OAuth2Client.cs
index 27834d2aaf..199a0c0310 100644
--- a/src/shared/Core/Authentication/OAuth/OAuth2Client.cs
+++ b/src/shared/Core/Authentication/OAuth/OAuth2Client.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using GitCredentialManager.Authentication.OAuth.Json;
 using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
 
 namespace GitCredentialManager.Authentication.OAuth
 {
@@ -213,7 +214,7 @@ public async Task<OAuth2DeviceCodeResult> GetDeviceCodeAsync(IEnumerable<string>
             {
                 string json = await response.Content.ReadAsStringAsync();
 
-                if (response.IsSuccessStatusCode && TryDeserializeJson(json, out DeviceAuthorizationEndpointResponseJson jsonObj))
+                if (response.IsSuccessStatusCode && TryDeserializeJson(json, OAuthJsonContext.Default.DeviceAuthorizationEndpointResponseJson, out DeviceAuthorizationEndpointResponseJson jsonObj))
                 {
                     return jsonObj.ToResult();
                 }
@@ -321,12 +322,9 @@ public async Task<OAuth2TokenResult> GetTokenByDeviceCodeAsync(OAuth2DeviceCodeR
                             return result;
                         }
 
-                        var error = JsonSerializer.Deserialize<ErrorResponseJson>(json, new JsonSerializerOptions
-                        {
-                            PropertyNameCaseInsensitive = true
-                        });
+                        TryDeserializeJson(json, OAuthJsonContext.Default.ErrorResponseJson, out ErrorResponseJson error);
 
-                        switch (error.Error)
+                        switch (error?.Error)
                         {
                             case OAuth2Constants.DeviceAuthorization.Errors.AuthorizationPending:
                                 // Retry with the current polling interval value
@@ -358,7 +356,9 @@ public async Task<OAuth2TokenResult> GetTokenByDeviceCodeAsync(OAuth2DeviceCodeR
 
         protected virtual bool TryCreateTokenEndpointResult(string json, out OAuth2TokenResult result)
         {
-            if (TryDeserializeJson(json, out TokenEndpointResponseJson jsonObj))
+            if (TryDeserializeJson(json,
+                    OAuthJsonContext.Default.TokenEndpointResponseJson,
+                    out TokenEndpointResponseJson jsonObj))
             {
                 result = jsonObj.ToResult();
                 return true;
@@ -370,7 +370,7 @@ protected virtual bool TryCreateTokenEndpointResult(string json, out OAuth2Token
 
         protected virtual bool TryCreateExceptionFromResponse(string json, out OAuth2Exception exception)
         {
-            if (TryDeserializeJson(json, out ErrorResponseJson obj))
+            if (TryDeserializeJson(json, OAuthJsonContext.Default.ErrorResponseJson, out ErrorResponseJson obj))
             {
                 exception = obj.ToException();
                 return true;
@@ -410,11 +410,11 @@ protected Exception CreateExceptionFromResponse(string json)
             return new Trace2OAuth2Exception(_trace2, message, format);
         }
 
-        protected static bool TryDeserializeJson<T>(string json, out T obj)
+        protected static bool TryDeserializeJson<T>(string json, JsonTypeInfo<T> typeInfo, out T obj)
         {
             try
             {
-                obj = JsonSerializer.Deserialize<T>(json);
+                obj = JsonSerializer.Deserialize(json, typeInfo);
                 return true;
             }
             catch
diff --git a/src/shared/Core/Core.csproj b/src/shared/Core/Core.csproj
index f014900688..e15eac327c 100644
--- a/src/shared/Core/Core.csproj
+++ b/src/shared/Core/Core.csproj
@@ -19,9 +19,4 @@
     <PackageReference Include="Avalonia.Themes.Fluent" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-    <PackageReference Include="Avalonia.Diagnostics" />
-    <PackageReference Include="Tmds.DBus.Protocol" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/shared/Core/Trace2.cs b/src/shared/Core/Trace2.cs
index de6ca58224..ebce213da2 100644
--- a/src/shared/Core/Trace2.cs
+++ b/src/shared/Core/Trace2.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.IO.Pipes;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Threading;
 
 namespace GitCredentialManager;
@@ -13,13 +14,21 @@ namespace GitCredentialManager;
 /// </summary>
 public enum Trace2Event
 {
+    [JsonStringEnumMemberName("version")]
     Version = 0,
+    [JsonStringEnumMemberName("start")]
     Start = 1,
+    [JsonStringEnumMemberName("exit")]
     Exit = 2,
+    [JsonStringEnumMemberName("child_start")]
     ChildStart = 3,
+    [JsonStringEnumMemberName("child_exit")]
     ChildExit = 4,
+    [JsonStringEnumMemberName("error")]
     Error = 5,
+    [JsonStringEnumMemberName("region_enter")]
     RegionEnter = 6,
+    [JsonStringEnumMemberName("region_leave")]
     RegionLeave = 7,
 }
 
@@ -28,9 +37,13 @@ public enum Trace2Event
 /// </summary>
 public enum Trace2ProcessClass
 {
+    [JsonStringEnumMemberName("none")]
     None = 0,
+    [JsonStringEnumMemberName("ui_helper")]
     UIHelper = 1,
+    [JsonStringEnumMemberName("git")]
     Git = 2,
+    [JsonStringEnumMemberName("other")]
     Other = 3
 }
 
diff --git a/src/shared/Core/Trace2Message.cs b/src/shared/Core/Trace2Message.cs
index 78eb05a203..175fd8bf02 100644
--- a/src/shared/Core/Trace2Message.cs
+++ b/src/shared/Core/Trace2Message.cs
@@ -6,17 +6,27 @@
 
 namespace GitCredentialManager;
 
+[JsonSerializable(typeof(VersionMessage))]
+[JsonSerializable(typeof(StartMessage))]
+[JsonSerializable(typeof(ExitMessage))]
+[JsonSerializable(typeof(ChildStartMessage))]
+[JsonSerializable(typeof(ChildExitMessage))]
+[JsonSerializable(typeof(ErrorMessage))]
+[JsonSerializable(typeof(RegionEnterMessage))]
+[JsonSerializable(typeof(RegionLeaveMessage))]
+[JsonSourceGenerationOptions(
+    UseStringEnumConverter = true,
+    PropertyNamingPolicy = JsonKnownNamingPolicy.SnakeCaseLower,
+    PropertyNameCaseInsensitive = true
+)]
+public partial class Trace2JsonContext : JsonSerializerContext;
+
 public abstract class Trace2Message
 {
     private const int SourceColumnMaxWidth = 23;
     private const string NormalPerfTimeFormat = "HH:mm:ss.ffffff";
 
     protected const string EmptyPerformanceSpan =  "|     |           |           |             ";
-    protected static readonly JsonSerializerOptions JsonSerializerOptions = new()
-    {
-        PropertyNameCaseInsensitive = true,
-        Converters = { new JsonStringEnumConverter(new SnakeCaseNamingPolicy()) }
-    };
 
     [JsonPropertyName("event")]
     [JsonPropertyOrder(1)]
@@ -194,7 +204,7 @@ public class VersionMessage : Trace2Message
 
     public override string ToJson()
     {
-        return JsonSerializer.Serialize(this, JsonSerializerOptions);
+        return JsonSerializer.Serialize(this, Trace2JsonContext.Default.VersionMessage);
     }
 
     public override string ToNormalString()
@@ -230,7 +240,7 @@ public class StartMessage : Trace2Message
 
     public override string ToJson()
     {
-        return JsonSerializer.Serialize(this, JsonSerializerOptions);
+        return JsonSerializer.Serialize(this, Trace2JsonContext.Default.StartMessage);
     }
 
     public override string ToNormalString()
@@ -266,7 +276,7 @@ public class ExitMessage : Trace2Message
 
     public override string ToJson()
     {
-        return JsonSerializer.Serialize(this, JsonSerializerOptions);
+        return JsonSerializer.Serialize(this, Trace2JsonContext.Default.ExitMessage);
     }
 
     public override string ToNormalString()
@@ -314,7 +324,7 @@ public class ChildStartMessage : Trace2Message
 
     public override string ToJson()
     {
-        return JsonSerializer.Serialize(this, JsonSerializerOptions);
+        return JsonSerializer.Serialize(this, Trace2JsonContext.Default.ChildStartMessage);
     }
 
     public override string ToNormalString()
@@ -371,7 +381,7 @@ public class ChildExitMessage : Trace2Message
 
     public override string ToJson()
     {
-        return JsonSerializer.Serialize(this, JsonSerializerOptions);
+        return JsonSerializer.Serialize(this, Trace2JsonContext.Default.ChildExitMessage);
     }
 
     public override string ToNormalString()
@@ -415,7 +425,7 @@ public class ErrorMessage : Trace2Message
 
     public override string ToJson()
     {
-        return JsonSerializer.Serialize(this, JsonSerializerOptions);
+        return JsonSerializer.Serialize(this, Trace2JsonContext.Default.ErrorMessage);
     }
 
     public override string ToNormalString()
@@ -473,7 +483,7 @@ public class RegionEnterMessage : RegionMessage
 {
     public override string ToJson()
     {
-        return JsonSerializer.Serialize(this, JsonSerializerOptions);
+        return JsonSerializer.Serialize(this, Trace2JsonContext.Default.RegionEnterMessage);
     }
 
     public override string ToNormalString()
@@ -504,7 +514,7 @@ public class RegionLeaveMessage : RegionMessage
 
     public override string ToJson()
     {
-        return JsonSerializer.Serialize(this, JsonSerializerOptions);
+        return JsonSerializer.Serialize(this, Trace2JsonContext.Default.RegionLeaveMessage);
     }
 
     public override string ToNormalString()
@@ -527,9 +537,3 @@ protected override string GetEventMessage(Trace2FormatTarget formatTarget)
         return Message;
     }
 }
-
-public class SnakeCaseNamingPolicy : JsonNamingPolicy
-{
-    public override string ConvertName(string name) =>
-        name.ToSnakeCase();
-}
diff --git a/src/shared/Core/UI/Controls/DialogWindow.axaml b/src/shared/Core/UI/Controls/DialogWindow.axaml
index 42d4636ebb..6e65489d2c 100644
--- a/src/shared/Core/UI/Controls/DialogWindow.axaml
+++ b/src/shared/Core/UI/Controls/DialogWindow.axaml
@@ -7,7 +7,8 @@
         mc:Ignorable="d" d:DesignWidth="420" d:DesignHeight="520"
         x:Class="GitCredentialManager.UI.Controls.DialogWindow"
         ExtendClientAreaToDecorationsHint="{Binding ExtendClientArea}"
-        ExtendClientAreaChromeHints="{Binding ShowCustomChrome, Converter={x:Static converters:WindowClientAreaConverters.BoolToChromeHints}}"
+        WindowDecorations="{Binding WindowDecorations}"
+        x:DataType="vm:WindowViewModel"
         Title="{Binding Title}"
         SizeToContent="Height" CanResize="False"
         Width="420" MaxHeight="520" MinHeight="280"
@@ -18,54 +19,58 @@
     <Design.DataContext>
         <vm:WindowViewModel/>
     </Design.DataContext>
-    <Border BorderBrush="{DynamicResource DialogWindowBorderBrush}"
-            BorderThickness="{Binding ShowCustomWindowBorder, Converter={x:Static converters:BoolConvertersEx.ToThickness}}">
-        <DockPanel>
-            <DockPanel DockPanel.Dock="Top" HorizontalAlignment="Stretch" Margin="0"
-                       IsVisible="{Binding ShowCustomChrome}">
-                <Button DockPanel.Dock="Right" Margin="0"
-                        IsCancel="True" Height="35" Width="40"
-                        Click="CloseButton_Click"
-                        Background="Transparent">
-                    <Button.Styles>
-                        <Style Selector="ContentPresenter#PART_ContentPresenter">
-                            <Setter Property="CornerRadius" Value="0" />
-                        </Style>
-                    </Button.Styles>
-                    <Path Width="16" Height="16"
-                          Fill="{DynamicResource DialogWindowCloseButtonBrush}"
-                          Data="F1M8.583,8L13,12.424 12.424,13 8,8.583 3.576,13 3,12.424 7.417,8 3,3.576 3.576,3 8,7.417 12.424,3 13,3.576z"/>
-                </Button>
-                <TextBlock DockPanel.Dock="Left" Margin="10,0,0,0"
-                           VerticalAlignment="Center"
-                           Text="{Binding Title}"/>
-            </DockPanel>
+    <DockPanel>
+        <DockPanel DockPanel.Dock="Top" HorizontalAlignment="Stretch" Margin="0"
+                   IsVisible="{Binding ShowCustomTitleBar}">
+            <Button DockPanel.Dock="Right" Margin="0"
+                    IsCancel="True" Height="35" Width="40"
+                    Click="CloseButton_Click"
+                    Background="Transparent">
+                <Button.Styles>
+                    <Style Selector="ContentPresenter#PART_ContentPresenter">
+                        <Setter Property="CornerRadius" Value="0" />
+                    </Style>
+                </Button.Styles>
+                <Path Width="16" Height="16"
+                      Fill="{DynamicResource DialogWindowCloseButtonBrush}"
+                      Data="F1M8.583,8L13,12.424 12.424,13 8,8.583 3.576,13 3,12.424 7.417,8 3,3.576 3.576,3 8,7.417 12.424,3 13,3.576z"/>
+            </Button>
+            <TextBlock DockPanel.Dock="Left" Margin="10,0,0,0"
+                       VerticalAlignment="Center"
+                       Text="{Binding Title}"/>
+        </DockPanel>
 
-            <!-- Padding/spacer when extending the client area but not using custom window controls.
-                 Sadly Avalonia doesn't seem to support triggered styles like WPF does, otherwise
-                 we could just apply a different top-margin to the ContentControl. -->
-            <Panel DockPanel.Dock="Top" Height="35">
-                <Panel.IsVisible>
-                    <MultiBinding Converter="{x:Static BoolConverters.And}">
-                        <Binding Path="ExtendClientArea" />
-                        <Binding Path="!ShowCustomChrome" />
-                    </MultiBinding>
-                </Panel.IsVisible>
-            </Panel>
+        <!-- Padding/spacer when extending the client area but not using custom window controls.
+             Sadly Avalonia doesn't seem to support triggered styles like WPF does, otherwise
+             we could just apply a different top-margin to the ContentControl. -->
+        <Panel DockPanel.Dock="Top" Height="35">
+            <Panel.IsVisible>
+                <MultiBinding Converter="{x:Static BoolConverters.And}">
+                    <Binding Path="ExtendClientArea" />
+                    <Binding Path="!ShowCustomTitleBar" />
+                </MultiBinding>
+            </Panel.IsVisible>
+        </Panel>
 
-            <!-- DEBUG CONTROLS (toggle with ALT-D from a debug build) -->
-            <StackPanel DockPanel.Dock="Bottom"
-                        IsVisible="{Binding ShowDebugControls}"
-                        Background="LightGray" Orientation="Horizontal">
-                <TextBlock Text="DEBUG:" Margin="5,0" Foreground="#888888" VerticalAlignment="Center"/>
-                <CheckBox IsChecked="{Binding ExtendClientArea}"
-                          Content="Extend Client Area" Margin="5,0"/>
-                <CheckBox IsChecked="{Binding ShowCustomChromeOverride}"
-                          Content="Show Custom Chrome" Margin="5,0"/>
-            </StackPanel>
+        <!-- DEBUG CONTROLS (toggle with ALT-D from a debug build) -->
+        <Grid DockPanel.Dock="Bottom" ColumnDefinitions="Auto,*"
+              IsVisible="{Binding ShowDebugControls}"
+              Background="{DynamicResource WindowBackgroundBrush}">
+            <CheckBox IsChecked="{Binding ExtendClientArea}"
+                      Content="Extend Client Area" Margin="5,0"
+                      Grid.Column="0"/>
+            <Grid Grid.Column="1" ColumnDefinitions="Auto,*">
+                <Label Grid.Column="0"
+                       Content="Window Decorations:" Margin="5, 0,0, 0" VerticalAlignment="Center"/>
+                <ComboBox Grid.Column="1"
+                          SelectedItem="{Binding WindowDecorations}"
+                          ItemsSource="{x:Static vm:WindowViewModel.WindowDecorationsValues}"
+                          Margin="0"
+                          HorizontalAlignment="Stretch"/>
+            </Grid>
+        </Grid>
 
-            <ContentControl x:Name="_contentHolder" Margin="30,25,30,30"/>
-        </DockPanel>
-    </Border>
+        <ContentControl x:Name="_contentHolder" Margin="30,25,30,30"/>
+    </DockPanel>
 
 </Window>
diff --git a/src/shared/Core/UI/Controls/ProgressWindow.axaml b/src/shared/Core/UI/Controls/ProgressWindow.axaml
index 3bfc20f5ca..e8a7346774 100644
--- a/src/shared/Core/UI/Controls/ProgressWindow.axaml
+++ b/src/shared/Core/UI/Controls/ProgressWindow.axaml
@@ -4,7 +4,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="182" d:DesignHeight="46"
         SizeToContent="WidthAndHeight" CanResize="False" Topmost="True"
-        ExtendClientAreaChromeHints="NoChrome" ExtendClientAreaToDecorationsHint="True"
+        WindowDecorations="None"
         ShowInTaskbar="False" Title="Git Credential Manager" WindowStartupLocation="CenterScreen"
         x:Class="GitCredentialManager.UI.Controls.ProgressWindow">
     <ProgressBar Orientation="Horizontal"
diff --git a/src/shared/Core/UI/Converters/WindowClientAreaConverters.cs b/src/shared/Core/UI/Converters/WindowClientAreaConverters.cs
deleted file mode 100644
index e4c047163b..0000000000
--- a/src/shared/Core/UI/Converters/WindowClientAreaConverters.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Avalonia.Data.Converters;
-using Avalonia.Platform;
-
-namespace GitCredentialManager.UI.Converters
-{
-    public static class WindowClientAreaConverters
-    {
-        public static readonly IValueConverter BoolToChromeHints =
-            new FuncValueConverter<bool, ExtendClientAreaChromeHints>(
-                x => x
-                    ? ExtendClientAreaChromeHints.NoChrome
-                    : ExtendClientAreaChromeHints.PreferSystemChrome);
-    }
-}
diff --git a/src/shared/Core/UI/ViewModels/WindowViewModel.cs b/src/shared/Core/UI/ViewModels/WindowViewModel.cs
index 078d7c3b83..f95c845a1b 100644
--- a/src/shared/Core/UI/ViewModels/WindowViewModel.cs
+++ b/src/shared/Core/UI/ViewModels/WindowViewModel.cs
@@ -1,14 +1,17 @@
 using System;
+using Avalonia.Controls;
 
 namespace GitCredentialManager.UI.ViewModels
 {
     public class WindowViewModel : ViewModel
     {
         private bool _extendClientArea;
-        private bool _showCustomChromeOverride;
+        private WindowDecorations _windowDecorations;
         private bool _showDebugControls;
         private string _title;
 
+        public static readonly WindowDecorations[] WindowDecorationsValues = Enum.GetValues<WindowDecorations>();
+
         public event EventHandler Accepted;
         public event EventHandler Canceled;
 
@@ -18,6 +21,13 @@ public WindowViewModel()
             
             // Extend the client area on Windows and macOS only
             ExtendClientArea = PlatformUtils.IsMacOS() || PlatformUtils.IsWindows();
+
+            // On Windows we prefer to show our own title bar, but we want the system
+            // to continue to draw the window border for us, which includes rounded
+            // window corners and shadow.
+            WindowDecorations = PlatformUtils.IsWindows()
+                ? WindowDecorations.BorderOnly
+                : WindowDecorations.Full;
         }
 
         public bool WindowResult { get; private set; }
@@ -28,39 +38,24 @@ public bool ShowDebugControls
             set => SetAndRaisePropertyChanged(ref _showDebugControls, value);
         }
 
-        public bool ShowCustomChrome
-        {
-            // On macOS we typically do NOT want to show the custom chrome if we've extended the client area
-            // because the native 'traffic light' controls will still be visible and we don't want to show our own.
-            get => ShowCustomChromeOverride || (ExtendClientArea && !PlatformUtils.IsMacOS());
-        }
-
-        public bool ShowCustomWindowBorder
-        {
-            // Draw the window border explicitly on Windows
-            get => ShowCustomChrome && PlatformUtils.IsWindows();
-        }
-
-        public bool ShowCustomChromeOverride
+        public WindowDecorations WindowDecorations
         {
-            get => _showCustomChromeOverride;
+            get => _windowDecorations;
             set
             {
-                SetAndRaisePropertyChanged(ref _showCustomChromeOverride, value);
-                RaisePropertyChanged(nameof(ShowCustomChrome));
-                RaisePropertyChanged(nameof(ShowCustomWindowBorder));
+                SetAndRaisePropertyChanged(ref _windowDecorations, value);
+                RaisePropertyChanged(nameof(ShowCustomTitleBar));
             }
         }
 
+        // Without system window decorations there's now way to close the window,
+        // so we need to draw our own title bar and close button.
+        public bool ShowCustomTitleBar => WindowDecorations != WindowDecorations.Full;
+
         public bool ExtendClientArea
         {
             get => _extendClientArea;
-            set
-            {
-                SetAndRaisePropertyChanged(ref _extendClientArea, value);
-                RaisePropertyChanged(nameof(ShowCustomChrome));
-                RaisePropertyChanged(nameof(ShowCustomWindowBorder));
-            }
+            set => SetAndRaisePropertyChanged(ref _extendClientArea, value);
         }
 
         public string Title
diff --git a/src/shared/Core/UI/Views/CredentialsView.axaml b/src/shared/Core/UI/Views/CredentialsView.axaml
index 9e85c48720..0fb41261b3 100644
--- a/src/shared/Core/UI/Views/CredentialsView.axaml
+++ b/src/shared/Core/UI/Views/CredentialsView.axaml
@@ -5,6 +5,7 @@
              xmlns:vm="clr-namespace:GitCredentialManager.UI.ViewModels;assembly=gcmcore"
              xmlns:converters="clr-namespace:GitCredentialManager.UI.Converters;assembly=gcmcore"
              mc:Ignorable="d" d:DesignWidth="420"
+             x:DataType="vm:CredentialsViewModel"
              x:Class="GitCredentialManager.UI.Views.CredentialsView">
     <Design.DataContext>
         <vm:CredentialsViewModel/>
@@ -34,10 +35,10 @@
 
         <StackPanel Margin="20,0">
             <TextBox x:Name="_userNameTextBox"
-                     Watermark="Username" Margin="0,0,0,10"
+                     PlaceholderText="Username" Margin="0,0,0,10"
                      Text="{Binding UserName}"/>
             <TextBox x:Name="_passwordTextBox"
-                     Watermark="Password" Margin="0,0,0,20"
+                     PlaceholderText="Password" Margin="0,0,0,20"
                      PasswordChar="●"
                      Text="{Binding Password}"/>
             <Button Content="Continue"
diff --git a/src/shared/Core/UI/Views/DefaultAccountView.axaml b/src/shared/Core/UI/Views/DefaultAccountView.axaml
index 83a677220c..cac5bf4983 100644
--- a/src/shared/Core/UI/Views/DefaultAccountView.axaml
+++ b/src/shared/Core/UI/Views/DefaultAccountView.axaml
@@ -5,6 +5,7 @@
              xmlns:vm="clr-namespace:GitCredentialManager.UI.ViewModels;assembly=gcmcore"
              xmlns:converters="clr-namespace:GitCredentialManager.UI.Converters;assembly=gcmcore"
              mc:Ignorable="d" d:DesignWidth="420"
+             x:DataType="vm:DefaultAccountViewModel"
              x:Class="GitCredentialManager.UI.Views.DefaultAccountView">
     <Design.DataContext>
         <vm:DefaultAccountViewModel/>
diff --git a/src/shared/Core/UI/Views/DeviceCodeView.axaml b/src/shared/Core/UI/Views/DeviceCodeView.axaml
index ea14072cfd..1ad23f3f10 100644
--- a/src/shared/Core/UI/Views/DeviceCodeView.axaml
+++ b/src/shared/Core/UI/Views/DeviceCodeView.axaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:sharedVms="clr-namespace:GitCredentialManager.UI.ViewModels;assembly=gcmcore"
              mc:Ignorable="d" d:DesignWidth="420"
+             x:DataType="sharedVms:DeviceCodeViewModel"
              x:Class="GitCredentialManager.UI.Views.DeviceCodeView">
     <Design.DataContext>
         <sharedVms:DeviceCodeViewModel/>
diff --git a/src/shared/Core/UI/Views/EnableNtlmView.axaml b/src/shared/Core/UI/Views/EnableNtlmView.axaml
index a4df2e9378..8299a023b1 100644
--- a/src/shared/Core/UI/Views/EnableNtlmView.axaml
+++ b/src/shared/Core/UI/Views/EnableNtlmView.axaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:GitCredentialManager.UI.ViewModels;assembly=gcmcore"
              mc:Ignorable="d" d:DesignWidth="420"
+             x:DataType="vm:EnableNtlmViewModel"
              x:Class="GitCredentialManager.UI.Views.EnableNtlmView">
     <Design.DataContext>
         <vm:EnableNtlmViewModel/>
diff --git a/src/shared/Core/UI/Views/OAuthView.axaml b/src/shared/Core/UI/Views/OAuthView.axaml
index abf9afc5ea..3d86ac7af5 100644
--- a/src/shared/Core/UI/Views/OAuthView.axaml
+++ b/src/shared/Core/UI/Views/OAuthView.axaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:GitCredentialManager.UI.ViewModels;assembly=gcmcore"
              mc:Ignorable="d" d:DesignWidth="420"
+             x:DataType="vm:OAuthViewModel"
              x:Class="GitCredentialManager.UI.Views.OAuthView">
     <Design.DataContext>
         <vm:OAuthViewModel/>
diff --git a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
index 10336ae8e3..d96cea4518 100644
--- a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
+++ b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
@@ -10,6 +10,10 @@
     <IsTestProject>false</IsTestProject>
     <LangVersion>latest</LangVersion>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <!-- Produce a native AOT build by default. Building from source can set
+         PublishAot=false in the environment to opt out, so installing locally
+         doesn't require a C toolchain (clang + zlib) just to link. -->
+    <PublishAot Condition="'$(PublishAot)' == ''">true</PublishAot>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/shared/GitHub/GitHubRestApi.cs b/src/shared/GitHub/GitHubRestApi.cs
index 5051ed2bb8..d82263c4a4 100644
--- a/src/shared/GitHub/GitHubRestApi.cs
+++ b/src/shared/GitHub/GitHubRestApi.cs
@@ -106,7 +106,7 @@ public async Task<GitHubUserInfo> GetUserInfoAsync(Uri targetUri, string accessT
 
                     string json = await response.Content.ReadAsStringAsync();
 
-                    return JsonSerializer.Deserialize<GitHubUserInfo>(json);
+                    return JsonSerializer.Deserialize(json, GitHubRestApiJsonContext.Default.GitHubUserInfo);
                 }
             }
         }
@@ -125,7 +125,7 @@ public async Task<GitHubMetaInfo> GetMetaInfoAsync(Uri targetUri)
 
                 string json = await response.Content.ReadAsStringAsync();
 
-                return JsonSerializer.Deserialize<GitHubMetaInfo>(json);
+                return JsonSerializer.Deserialize(json, GitHubRestApiJsonContext.Default.GitHubMetaInfo);
             }
         }
 
@@ -269,6 +269,10 @@ public void Dispose()
         #endregion
     }
 
+    [JsonSerializable(typeof(GitHubUserInfo))]
+    [JsonSerializable(typeof(GitHubMetaInfo))]
+    public partial class GitHubRestApiJsonContext : JsonSerializerContext;
+
     public class GitHubUserInfo
     {
         [JsonPropertyName("login")]
diff --git a/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs b/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs
index e018232de8..b8425d979b 100644
--- a/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs
+++ b/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs
@@ -5,8 +5,9 @@
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
 using GitCredentialManager;
 using GitCredentialManager.UI.Controls;
 
@@ -89,7 +90,7 @@ private void SetUpTextBox(TextBox textBox)
             void OnPreviewKeyDown(object sender, KeyEventArgs e)
             {
                 // Handle paste
-                if (TopLevel.GetTopLevel(this)?.PlatformSettings?.HotkeyConfiguration.Paste.Any(x => x.Matches(e)) ?? false)
+                if (this.GetPlatformSettings()?.HotkeyConfiguration.Paste.Any(x => x.Matches(e)) ?? false)
                 {
                     OnPaste();
                     e.Handled = true;
@@ -156,7 +157,7 @@ void OnPreviewKeyDown(object sender, KeyEventArgs e)
 
         private void OnPaste()
         {
-            Text = TopLevel.GetTopLevel(this)?.Clipboard?.GetTextAsync().GetAwaiter().GetResult();
+            Text = TopLevel.GetTopLevel(this)?.Clipboard?.TryGetTextAsync().GetAwaiter().GetResult();
         }
 
         private bool MoveNext() => MoveFocus(true);
diff --git a/src/shared/GitHub/UI/Views/CredentialsView.axaml b/src/shared/GitHub/UI/Views/CredentialsView.axaml
index 9ea6f3fb87..6478b02d67 100644
--- a/src/shared/GitHub/UI/Views/CredentialsView.axaml
+++ b/src/shared/GitHub/UI/Views/CredentialsView.axaml
@@ -6,6 +6,7 @@
              xmlns:vm="clr-namespace:GitHub.UI.ViewModels"
              xmlns:converters="clr-namespace:GitCredentialManager.UI.Converters;assembly=gcmcore"
              mc:Ignorable="d" d:DesignWidth="420"
+             x:DataType="vm:CredentialsViewModel"
              x:Class="GitHub.UI.Views.CredentialsView">
     <Design.DataContext>
         <vm:CredentialsViewModel/>
@@ -86,7 +87,7 @@
                 </TabItem.Header>
                 <StackPanel Margin="0,10">
                     <TextBox x:Name="_tokenTextBox"
-                             Watermark="Personal access token" Margin="0,0,0,10"
+                             PlaceholderText="Personal access token" Margin="0,0,0,10"
                              PasswordChar="●"
                              Text="{Binding Token}"/>
                     <Button Content="Sign in"
@@ -104,10 +105,10 @@
                 </TabItem.Header>
                 <StackPanel Margin="0,10">
                     <TextBox x:Name="_userNameTextBox"
-                             Watermark="Username or email" Margin="0,0,0,10"
+                             PlaceholderText="Username or email" Margin="0,0,0,10"
                              Text="{Binding UserName}"/>
                     <TextBox x:Name="_passwordTextBox"
-                             Watermark="Password" Margin="0,0,0,10"
+                             PlaceholderText="Password" Margin="0,0,0,10"
                              PasswordChar="●"
                              Text="{Binding Password}"/>
                     <Button Content="Sign in"
diff --git a/src/shared/GitHub/UI/Views/DeviceCodeView.axaml b/src/shared/GitHub/UI/Views/DeviceCodeView.axaml
index c4f3204111..21a59fc8eb 100644
--- a/src/shared/GitHub/UI/Views/DeviceCodeView.axaml
+++ b/src/shared/GitHub/UI/Views/DeviceCodeView.axaml
@@ -5,6 +5,7 @@
              xmlns:controls="clr-namespace:GitHub.UI.Controls"
              xmlns:vm="clr-namespace:GitHub.UI.ViewModels"
              mc:Ignorable="d" d:DesignWidth="420"
+             x:DataType="vm:DeviceCodeViewModel"
              x:Class="GitHub.UI.Views.DeviceCodeView">
     <Design.DataContext>
         <vm:DeviceCodeViewModel/>
diff --git a/src/shared/GitHub/UI/Views/SelectAccountView.axaml b/src/shared/GitHub/UI/Views/SelectAccountView.axaml
index 417d583873..40a2fcfadc 100644
--- a/src/shared/GitHub/UI/Views/SelectAccountView.axaml
+++ b/src/shared/GitHub/UI/Views/SelectAccountView.axaml
@@ -5,6 +5,7 @@
              xmlns:controls="clr-namespace:GitHub.UI.Controls"
              xmlns:vm="clr-namespace:GitHub.UI.ViewModels"
              mc:Ignorable="d" d:DesignWidth="420"
+             x:DataType="vm:SelectAccountViewModel"
              x:Class="GitHub.UI.Views.SelectAccountView">
     <Design.DataContext>
         <vm:SelectAccountViewModel/>
diff --git a/src/shared/GitHub/UI/Views/TwoFactorView.axaml b/src/shared/GitHub/UI/Views/TwoFactorView.axaml
index cb67d3b121..13cd1d33d8 100644
--- a/src/shared/GitHub/UI/Views/TwoFactorView.axaml
+++ b/src/shared/GitHub/UI/Views/TwoFactorView.axaml
@@ -5,6 +5,7 @@
              xmlns:controls="clr-namespace:GitHub.UI.Controls"
              xmlns:vm="clr-namespace:GitHub.UI.ViewModels"
              mc:Ignorable="d" d:DesignWidth="420"
+             x:DataType="vm:TwoFactorViewModel"
              x:Class="GitHub.UI.Views.TwoFactorView">
     <Design.DataContext>
         <vm:TwoFactorViewModel/>
diff --git a/src/shared/GitLab/UI/Views/CredentialsView.axaml b/src/shared/GitLab/UI/Views/CredentialsView.axaml
index 89b2e78998..4209115b43 100644
--- a/src/shared/GitLab/UI/Views/CredentialsView.axaml
+++ b/src/shared/GitLab/UI/Views/CredentialsView.axaml
@@ -5,6 +5,7 @@
              xmlns:vm="clr-namespace:GitLab.UI.ViewModels"
              xmlns:converters="clr-namespace:GitCredentialManager.UI.Converters;assembly=gcmcore"
              mc:Ignorable="d" d:DesignWidth="420"
+             x:DataType="vm:CredentialsViewModel"
              x:Class="GitLab.UI.Views.CredentialsView"
              x:Name="view">
     <UserControl.Resources>
@@ -88,10 +89,10 @@
                 </TabItem.Header>
                 <StackPanel Margin="0,10">
                     <TextBox x:Name="_patUserNameTextBox"
-                             Watermark="Username or email (optional)" Margin="0,0,0,10"
+                             PlaceholderText="Username or email (optional)" Margin="0,0,0,10"
                              Text="{Binding TokenUserName}"/>
                     <TextBox x:Name="_tokenTextBox"
-                             Watermark="Personal access token" Margin="0,0,0,10"
+                             PlaceholderText="Personal access token" Margin="0,0,0,10"
                              PasswordChar="●"
                              Text="{Binding Token}"/>
                     <Button Content="Sign in"
@@ -109,10 +110,10 @@
                 </TabItem.Header>
                 <StackPanel Margin="0,10">
                     <TextBox x:Name="_userNameTextBox"
-                             Watermark="Username or email" Margin="0,0,0,10"
+                             PlaceholderText="Username or email" Margin="0,0,0,10"
                              Text="{Binding UserName}"/>
                     <TextBox x:Name="_passwordTextBox"
-                             Watermark="Password" Margin="0,0,0,10"
+                             PlaceholderText="Password" Margin="0,0,0,10"
                              PasswordChar="●"
                              Text="{Binding Password}"/>
                     <Button Content="Sign in"