diff --git a/build/README.md b/build/README.md
index 0698a8fbc1..718d38b42d 100644
--- a/build/README.md
+++ b/build/README.md
@@ -13,3 +13,58 @@ dotnet publish -c Release -r $RUNTIME_IDENTIFIER -o $DESTINATION_FOLDER src/Sour
 ```
 > [!NOTE]
 > Please replace the `$RUNTIME_IDENTIFIER` with one of `win-x64`,`win-arm64`,`linux-x64`,`linux-arm64`,`osx-x64`,`osx-arm64`, and replace the `$DESTINATION_FOLDER` with the real path that will store the output executable files.
+
+
+## Native AOT diagnostics
+
+Release builds publish as Native AOT. A successful publish can still report AOT
+analysis warnings from dependencies. To expand a third-party assembly warning
+such as `IL3053`, publish with:
+
+```sh
+dotnet publish src/SourceGit.csproj -c Release -r linux-x64 -p:TrimmerSingleWarn=false
+```
+
+`SuppressTrimAnalysisWarnings` currently suppresses trimming diagnostics; it does
+not suppress AOT diagnostics. The command above expands the existing AOT warnings
+without disabling the analysis or changing their severity.
+
+### DataGrid warnings
+
+With Avalonia.Controls.DataGrid 12.1.2, the expanded `IL3053` consists of three
+`IL3050` warnings:
+
+* `TypeHelper.GetPropertyOrIndexer()` in `Utils/ReflectionHelper.cs` dynamically
+  constructs `IList<T>` and `IReadOnlyList<T>` with `Type.MakeGenericType`. These
+  two warnings also occur with DataGrid 11.3.13. This fallback is reached only for
+  an indexer path when no suitable default indexer was found and an element type
+  can be inferred.
+* `DataGrid.GenerateColumn()` in `DataGridColumns.cs` creates a reflection-based
+  `Binding` for an automatically generated column. Avalonia 12 marks that
+  constructor as requiring dynamic code.
+
+SourceGit's `HistoriesCommitList` sets `AutoGenerateColumns` and
+`CanUserSortColumns` to `false`, sets `IsReadOnly` to `true`, and defines its
+columns explicitly as `DataGridTemplateColumn` instances. It does not configure
+indexed property paths for DataGrid's bound-column, sorting, or grouping helpers.
+These usage constraints are the basis for accepting the audited warnings; they
+are not proof of unreachability available to the AOT compiler.
+
+Revisit this assessment when changing the DataGrid version, adding automatically
+generated or bound columns, introducing indexed property paths, or enabling
+property-based sorting or grouping. Setting a runtime DataGrid property does not
+remove the corresponding implementation from AOT analysis. The current DataGrid
+package has no feature switch to disable its indexer fallback.
+
+Keep AOT warnings enabled. A global `NoWarn=IL3050` would also hide unrelated
+warnings introduced by future changes. An `UnconditionalSuppressMessage` on a
+SourceGit caller does not suppress warnings emitted inside a dependency method.
+A dependency-level fix or suppression would require changes to that dependency;
+suppression alone would not change its runtime behavior.
+
+References:
+
+* [IL3053: assembly produced AOT warnings](https://learn.microsoft.com/en-us/dotnet/core/deploying/native-aot/warnings/il3053)
+* [IL3050: calls requiring dynamic code](https://learn.microsoft.com/en-us/dotnet/core/deploying/native-aot/warnings/il3050)
+* [DataGrid 12.1.2 indexer fallback](https://github.com/AvaloniaUI/Avalonia.Controls.DataGrid/blob/1e12211eb0c52a09e314ca57a344147c37d0a26c/src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs#L342-L416)
+* [DataGrid 12.1.2 automatic column generation](https://github.com/AvaloniaUI/Avalonia.Controls.DataGrid/blob/1e12211eb0c52a09e314ca57a344147c37d0a26c/src/Avalonia.Controls.DataGrid/DataGridColumns.cs#L1703-L1784)
diff --git a/depends/AvaloniaEdit b/depends/AvaloniaEdit
index ddf00a91dc..358f2c9e4a 160000
--- a/depends/AvaloniaEdit
+++ b/depends/AvaloniaEdit
@@ -1 +1 @@
-Subproject commit ddf00a91dc0da29b85c79b85c9583860213a99ff
+Subproject commit 358f2c9e4ac57667c0183bf68f8869b110a69b1e
diff --git a/global.json b/global.json
index 32035c6564..d46d21e50b 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "10.0.0",
-    "rollForward": "latestMajor",
+    "version": "10.0.100",
+    "rollForward": "latestFeature",
     "allowPrerelease": false
   }
 }
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 66882b4869..d2c84256e3 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -7,11 +7,9 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Media.Fonts;
-using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Threading;
 
@@ -54,6 +52,8 @@ public static AppBuilder BuildAvaloniaApp()
         {
             var builder = AppBuilder.Configure<App>();
             builder.UsePlatformDetect();
+            if (OperatingSystem.IsLinux() && !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("WAYLAND_DISPLAY")))
+                builder.UseWayland();
             builder.LogToTrace();
             builder.WithInterFont();
             builder.With(new FontManagerOptions()
@@ -251,8 +251,6 @@ public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
-                BindingPlugins.DataValidators.RemoveAt(0);
-
                 // Disable tooltip if window is not active.
                 ToolTip.ToolTipOpeningEvent.AddClassHandler<Control>((c, e) =>
                 {
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index 3d09f82663..96a616a6fd 100644
--- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs
@@ -7,7 +7,6 @@
 
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Platform;
 
 namespace SourceGit.Native
 {
@@ -28,12 +27,12 @@ public void SetupWindow(Window window)
 
             if (OS.UseSystemWindowFrame)
             {
-                window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.Default;
+                window.WindowDecorations = WindowDecorations.Full;
                 window.ExtendClientAreaToDecorationsHint = false;
             }
             else
             {
-                window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.NoChrome;
+                window.WindowDecorations = WindowDecorations.None;
                 window.ExtendClientAreaToDecorationsHint = true;
                 window.Classes.Add("custom_window_frame");
             }
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index 06d09e8fa3..59e731a159 100644
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@@ -8,7 +8,6 @@
 
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Platform;
 
 namespace SourceGit.Native
 {
@@ -50,7 +49,7 @@ public void SetupApp(AppBuilder builder)
 
         public void SetupWindow(Window window)
         {
-            window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.SystemChrome;
+            window.WindowDecorations = WindowDecorations.Full;
             window.ExtendClientAreaToDecorationsHint = true;
             window.BorderThickness = new Thickness(0);
         }
diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
index fde6cb25a7..0349012b4a 100644
--- a/src/Native/Windows.cs
+++ b/src/Native/Windows.cs
@@ -9,7 +9,6 @@
 
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Platform;
 using Avalonia.Threading;
 
 namespace SourceGit.Native
@@ -48,7 +47,7 @@ public void SetupApp(AppBuilder builder)
 
         public void SetupWindow(Window window)
         {
-            window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.NoChrome;
+            window.WindowDecorations = WindowDecorations.BorderOnly;
             window.ExtendClientAreaToDecorationsHint = true;
             window.BorderThickness = new Thickness(1);
             window.Padding = new Thickness(0);
diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index d1ba76c821..2455a5043f 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -19,7 +19,7 @@
 
     <Setter Property="Background" Value="{DynamicResource Brush.Window}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource Brush.WindowBorder}"/>
-    <Setter Property="SystemDecorations" Value="Full"/>
+    <Setter Property="WindowDecorations" Value="Full"/>
     <Setter Property="Padding" Value="0"/>
     <Setter Property="TextElement.FontFamily" Value="{DynamicResource Fonts.Default}"/>
     <Setter Property="TextElement.FontSize" Value="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize}"/>
@@ -57,7 +57,7 @@
   <Style Selector="Window.custom_window_frame">
     <Setter Property="Background" Value="Transparent"/>
     <Setter Property="BorderThickness" Value="0"/>
-    <Setter Property="SystemDecorations" Value="None"/>
+    <Setter Property="WindowDecorations" Value="None"/>
     <Setter Property="Padding" Value="12"/>
     <Setter Property="CornerRadius" Value="8"/>
 
@@ -1487,7 +1487,7 @@
                 Padding="10">
           <Grid RowDefinitions="Auto,Auto">
             <StackPanel Grid.Row="0" Orientation="Horizontal">
-              <TextBox Watermark="{x:Static ae:SR.SearchLabel}"
+              <TextBox PlaceholderText="{x:Static ae:SR.SearchLabel}"
                        BorderBrush="{DynamicResource Brush.Border2}"
                        Name="PART_searchTextBox"
                        Width="265" Height="28"
diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 65f49a3a40..655b857d92 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -21,6 +21,7 @@
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release' and '$(DisableAOT)' != 'true'">
     <PublishAot>true</PublishAot>
+    <PublishAotUsingRuntimePack>true</PublishAotUsingRuntimePack>
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>link</TrimMode>
   </PropertyGroup>
@@ -48,12 +49,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.22" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.22" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.22" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.22" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.22" Condition="'$(Configuration)' == 'Debug'" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
+    <PackageReference Include="Avalonia" Version="12.1.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="12.1.3" />
+    <PackageReference Include="Avalonia.Wayland" Version="12.1.3" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.3" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="12.1.2" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.9.0-beta.1" />
     <PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.660" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
diff --git a/src/Views/AIAssistant.axaml.cs b/src/Views/AIAssistant.axaml.cs
index 84a1803608..b0f4cd6af1 100644
--- a/src/Views/AIAssistant.axaml.cs
+++ b/src/Views/AIAssistant.axaml.cs
@@ -2,6 +2,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 
diff --git a/src/Views/AddRemote.axaml b/src/Views/AddRemote.axaml
index 3903c540a8..245868b5da 100644
--- a/src/Views/AddRemote.axaml
+++ b/src/Views/AddRemote.axaml
@@ -28,7 +28,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Remote.Name.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Remote.Name.Placeholder}"
                Text="{Binding Name, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
           <Path Width="12" Height="12"
@@ -46,7 +46,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Remote.URL.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Remote.URL.Placeholder}"
                Text="{Binding Url, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
           <Path Width="12" Height="12"
@@ -70,7 +70,7 @@
                  Height="28"
                  VerticalAlignment="Center"
                  CornerRadius="3"
-                 Watermark="{DynamicResource Text.SSHKey.Placeholder}"
+                 PlaceholderText="{DynamicResource Text.SSHKey.Placeholder}"
                  Text="{Binding SSHKey, Mode=TwoWay}">
           <TextBox.InnerLeftContent>
             <Path Width="12" Height="12"
diff --git a/src/Views/AddSubmodule.axaml b/src/Views/AddSubmodule.axaml
index 0d5f442ef9..68cde640e3 100644
--- a/src/Views/AddSubmodule.axaml
+++ b/src/Views/AddSubmodule.axaml
@@ -27,7 +27,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.RepositoryURL}"
+               PlaceholderText="{DynamicResource Text.RepositoryURL}"
                Text="{Binding Url, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
           <Path Width="12" Height="12"
@@ -49,7 +49,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Submodule.RelativePath.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Submodule.RelativePath.Placeholder}"
                Text="{Binding RelativePath, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
           <Path Width="12" Height="12"
diff --git a/src/Views/AddWorktree.axaml b/src/Views/AddWorktree.axaml
index f0f5060cfe..342391e642 100644
--- a/src/Views/AddWorktree.axaml
+++ b/src/Views/AddWorktree.axaml
@@ -28,7 +28,7 @@
                Height="28"
                CornerRadius="3"
                Text="{Binding WorktreePath, Mode=TwoWay}"
-               Watermark="{DynamicResource Text.AddWorktree.Location.Placeholder}">
+               PlaceholderText="{DynamicResource Text.AddWorktree.Location.Placeholder}">
         <TextBox.InnerRightContent>
           <Button Classes="icon_button" Width="28" Height="28" Margin="4,0,0,0" Click="SelectLocation">
             <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
@@ -45,7 +45,7 @@
                                 VerticalAlignment="Center"
                                 CornerRadius="3"
                                 Text="{Binding BranchName, Mode=TwoWay}"
-                                Watermark="{DynamicResource Text.AddWorktree.Name.Placeholder}"/>
+                                PlaceholderText="{DynamicResource Text.AddWorktree.Name.Placeholder}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Apply.axaml b/src/Views/Apply.axaml
index afa6cf1a0e..ab003841a3 100644
--- a/src/Views/Apply.axaml
+++ b/src/Views/Apply.axaml
@@ -36,7 +36,7 @@
                Height="28"
                Margin="0,0,0,6"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Apply.File.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Apply.File.Placeholder}"
                IsEnabled="{Binding !FromClipboard, Mode=OneWay}"
                IsVisible="{Binding !FromClipboard, Mode=OneWay}"
                Text="{Binding PatchFile, Mode=TwoWay}">
diff --git a/src/Views/Archive.axaml b/src/Views/Archive.axaml
index 3e2b599913..85d3d8674a 100644
--- a/src/Views/Archive.axaml
+++ b/src/Views/Archive.axaml
@@ -67,7 +67,7 @@
                x:Name="TxtSaveFile"
                Height="28"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Archive.File.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Archive.File.Placeholder}"
                Text="{Binding SaveFile, Mode=TwoWay}">
         <TextBox.InnerRightContent>
           <Button Classes="icon_button" Width="30" Height="30" Click="SelectOutputFile">
diff --git a/src/Views/Avatar.cs b/src/Views/Avatar.cs
index 82fa0a8473..fa7973521d 100644
--- a/src/Views/Avatar.cs
+++ b/src/Views/Avatar.cs
@@ -8,6 +8,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
@@ -45,12 +46,8 @@ public Avatar()
         {
             RenderOptions.SetBitmapInterpolationMode(this, BitmapInterpolationMode.HighQuality);
 
-            Bind(UseGitHubStyleAvatarProperty, new Binding()
-            {
-                Mode = BindingMode.OneWay,
-                Source = ViewModels.Preferences.Instance,
-                Path = "UseGitHubStyleAvatar"
-            });
+            Bind(UseGitHubStyleAvatarProperty, CompiledBinding.Create((ViewModels.Preferences pref) => pref.UseGitHubStyleAvatar,
+                source: ViewModels.Preferences.Instance, mode: BindingMode.OneWay));
         }
 
         public override void Render(DrawingContext context)
@@ -246,7 +243,7 @@ private void OnContextRequested(object sender, ContextRequestedEventArgs e)
                     {
                         if (_img != null)
                         {
-                            _img.Save(writer);
+                            _img.Save(writer, PngBitmapEncoderOptions.Default);
                         }
                         else
                         {
@@ -257,7 +254,7 @@ private void OnContextRequested(object sender, ContextRequestedEventArgs e)
                             using (var ctx = rt.CreateDrawingContext())
                             {
                                 Render(ctx);
-                                rt.Save(writer);
+                                rt.Save(writer, PngBitmapEncoderOptions.Default);
                             }
                         }
                     }
diff --git a/src/Views/BinaryFileViewer.axaml b/src/Views/BinaryFileViewer.axaml
index 962f60109c..d8d7636650 100644
--- a/src/Views/BinaryFileViewer.axaml
+++ b/src/Views/BinaryFileViewer.axaml
@@ -57,7 +57,7 @@
                                     CornerRadius="13"
                                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                     ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                                    Watermark="{DynamicResource Text.File.HexViewer.GotoAddress}"
+                                    PlaceholderText="{DynamicResource Text.File.HexViewer.GotoAddress}"
                                     TextChanged="OnGotoAddressTextChanged">
           <TextBox.InnerLeftContent>
             <Path Width="14" Height="14"
diff --git a/src/Views/BranchTree.axaml.cs b/src/Views/BranchTree.axaml.cs
index 35d313e3a2..6ba9dfdd4f 100644
--- a/src/Views/BranchTree.axaml.cs
+++ b/src/Views/BranchTree.axaml.cs
@@ -249,7 +249,7 @@ protected override async void OnAttachedToVisualTree(VisualTreeAttachmentEventAr
                 if (DataContext is not Models.Branch branch)
                     break;
 
-                if (e.Root is not PopupRoot { Parent: Popup { Parent: Border owner } })
+                if (TopLevel.GetTopLevel(this) is not PopupRoot { Parent: Popup { Parent: Border owner } })
                     break;
 
                 var tree = owner.FindAncestorOfType<BranchTree>();
diff --git a/src/Views/ChangeSubmoduleUrl.axaml b/src/Views/ChangeSubmoduleUrl.axaml
index bf3d7b3db2..bf58ad13eb 100644
--- a/src/Views/ChangeSubmoduleUrl.axaml
+++ b/src/Views/ChangeSubmoduleUrl.axaml
@@ -36,7 +36,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.RepositoryURL}"
+               PlaceholderText="{DynamicResource Text.RepositoryURL}"
                Text="{Binding Url, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
           <Path Width="12" Height="12"
diff --git a/src/Views/CheckoutAsWorktree.axaml b/src/Views/CheckoutAsWorktree.axaml
index 825f608acc..080bc3c9a1 100644
--- a/src/Views/CheckoutAsWorktree.axaml
+++ b/src/Views/CheckoutAsWorktree.axaml
@@ -37,7 +37,7 @@
                Height="28"
                CornerRadius="3"
                Text="{Binding WorktreePath, Mode=TwoWay}"
-               Watermark="{DynamicResource Text.CheckoutAsWorktree.WorktreePath.Placeholder}">
+               PlaceholderText="{DynamicResource Text.CheckoutAsWorktree.WorktreePath.Placeholder}">
         <TextBox.InnerRightContent>
           <Button Classes="icon_button" Width="28" Height="28" Margin="4,0,0,0" Click="SelectLocation">
             <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
diff --git a/src/Views/CheckoutRemoteBranchAsWorktree.axaml b/src/Views/CheckoutRemoteBranchAsWorktree.axaml
index 84b68ae3ae..bcdc00c43e 100644
--- a/src/Views/CheckoutRemoteBranchAsWorktree.axaml
+++ b/src/Views/CheckoutRemoteBranchAsWorktree.axaml
@@ -37,7 +37,7 @@
                Height="28"
                CornerRadius="3"
                Text="{Binding WorktreePath, Mode=TwoWay}"
-               Watermark="{DynamicResource Text.CheckoutAsWorktree.WorktreePath.Placeholder}">
+               PlaceholderText="{DynamicResource Text.CheckoutAsWorktree.WorktreePath.Placeholder}">
         <TextBox.InnerRightContent>
           <Button Classes="icon_button" Width="28" Height="28" Margin="4,0,0,0" Click="SelectLocation">
             <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
@@ -54,7 +54,7 @@
                                 VerticalAlignment="Center"
                                 CornerRadius="3"
                                 Text="{Binding BranchName, Mode=TwoWay}"
-                                Watermark="{DynamicResource Text.CheckoutAsWorktree.NewBranchName.Placeholder}"/>
+                                PlaceholderText="{DynamicResource Text.CheckoutAsWorktree.NewBranchName.Placeholder}"/>
 
       <CheckBox Grid.Row="3" Grid.Column="1"
                 Height="32"
diff --git a/src/Views/Clone.axaml b/src/Views/Clone.axaml
index b6cd696a8e..1f4971a22e 100644
--- a/src/Views/Clone.axaml
+++ b/src/Views/Clone.axaml
@@ -50,7 +50,7 @@
                x:Name="TxtSshKey"
                Height="28"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.SSHKey.Placeholder}"
+               PlaceholderText="{DynamicResource Text.SSHKey.Placeholder}"
                Text="{Binding SSHKey, Mode=TwoWay}"
                IsVisible="{Binding UseSSH}">
         <TextBox.InnerLeftContent>
@@ -90,7 +90,7 @@
       <TextBox Grid.Row="3" Grid.Column="1"
                Height="28"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Clone.LocalName.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Clone.LocalName.Placeholder}"
                Text="{Binding Local, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="4" Grid.Column="0"
@@ -100,7 +100,7 @@
       <TextBox Grid.Row="4" Grid.Column="1"
                Height="28"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Clone.AdditionalParam.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Clone.AdditionalParam.Placeholder}"
                Text="{Binding ExtraArgs, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="5" Grid.Column="0"
diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml
index 6fcdad2815..9cb485fbc1 100644
--- a/src/Views/CommitChanges.axaml
+++ b/src/Views/CommitChanges.axaml
@@ -23,7 +23,7 @@
                  BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                  Background="Transparent"
                  CornerRadius="4"
-                 Watermark="{DynamicResource Text.CommitDetail.Changes.Search}"
+                 PlaceholderText="{DynamicResource Text.CommitDetail.Changes.Search}"
                  Text="{Binding SearchChangeFilter, Mode=TwoWay}">
           <TextBox.InnerLeftContent>
             <Path Width="14" Height="14" Margin="4,0,0,0" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Search}"/>
diff --git a/src/Views/CommitMessageToolBox.axaml b/src/Views/CommitMessageToolBox.axaml
index 8f65e5372c..7c3e8ff893 100644
--- a/src/Views/CommitMessageToolBox.axaml
+++ b/src/Views/CommitMessageToolBox.axaml
@@ -19,7 +19,7 @@
                                 CornerRadius="4,4,0,0"
                                 Background="Transparent"
                                 Text="{Binding #ThisControl.CommitMessage, Mode=TwoWay}"
-                                Watermark="{DynamicResource Text.CommitMessageTextBox.Placeholder}"
+                                PlaceholderText="{DynamicResource Text.CommitMessageTextBox.Placeholder}"
                                 SubjectGuideLength="{Binding Source={x:Static vm:Preferences.Instance}, Path=SubjectGuideLength, Mode=OneWay}"
                                 GuideLineBrush="{DynamicResource Brush.Border2}"
                                 FontFamily="{DynamicResource Fonts.Monospace}">
diff --git a/src/Views/CommitMessageToolBox.axaml.cs b/src/Views/CommitMessageToolBox.axaml.cs
index 373e737261..dc5895b0d3 100644
--- a/src/Views/CommitMessageToolBox.axaml.cs
+++ b/src/Views/CommitMessageToolBox.axaml.cs
@@ -332,7 +332,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             }
         }
 
-        protected override void OnLostFocus(RoutedEventArgs e)
+        protected override void OnLostFocus(FocusChangedEventArgs e)
         {
             base.OnLostFocus(e);
             Suggestions = null;
diff --git a/src/Views/CommitSubjectPresenter.cs b/src/Views/CommitSubjectPresenter.cs
index 6949072746..af9882adaa 100644
--- a/src/Views/CommitSubjectPresenter.cs
+++ b/src/Views/CommitSubjectPresenter.cs
@@ -132,10 +132,10 @@ public override void Render(DrawingContext context)
 
             var ro = new RenderOptions()
             {
-                TextRenderingMode = TextRenderingMode.SubpixelAntialias,
                 EdgeMode = EdgeMode.Antialias
             };
 
+            using (context.PushTextOptions(new TextOptions { TextRenderingMode = TextRenderingMode.SubpixelAntialias }))
             using (context.PushRenderOptions(ro))
             {
                 var height = Bounds.Height;
diff --git a/src/Views/Compare.axaml b/src/Views/Compare.axaml
index 72f4a0a799..5f0fbc55e1 100644
--- a/src/Views/Compare.axaml
+++ b/src/Views/Compare.axaml
@@ -154,7 +154,7 @@
                      BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                      Background="Transparent"
                      CornerRadius="4"
-                     Watermark="{DynamicResource Text.CommitDetail.Changes.Search}"
+                     PlaceholderText="{DynamicResource Text.CommitDetail.Changes.Search}"
                      Text="{Binding SearchFilter, Mode=TwoWay}">
               <TextBox.InnerLeftContent>
                 <Path Width="14" Height="14" Margin="4,0,0,0" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Search}"/>
diff --git a/src/Views/ControlExtensions.cs b/src/Views/ControlExtensions.cs
index 33c20b4f26..3db41275bc 100644
--- a/src/Views/ControlExtensions.cs
+++ b/src/Views/ControlExtensions.cs
@@ -4,6 +4,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
+using Avalonia.Input.Platform;
 using Avalonia.Media;
 
 namespace SourceGit.Views
diff --git a/src/Views/ConventionalCommitMessageBuilder.axaml b/src/Views/ConventionalCommitMessageBuilder.axaml
index 394901dc96..d0e7e8bf62 100644
--- a/src/Views/ConventionalCommitMessageBuilder.axaml
+++ b/src/Views/ConventionalCommitMessageBuilder.axaml
@@ -88,7 +88,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Optional}"
+               PlaceholderText="{DynamicResource Text.Optional}"
                Text="{Binding Scope, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
@@ -115,7 +115,7 @@
                VerticalAlignment="Center"
                VerticalContentAlignment="Top"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Optional}"
+               PlaceholderText="{DynamicResource Text.Optional}"
                Text="{Binding Detail, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="4" Grid.Column="0"
@@ -132,7 +132,7 @@
                VerticalAlignment="Center"
                VerticalContentAlignment="Top"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Optional}"
+               PlaceholderText="{DynamicResource Text.Optional}"
                Text="{Binding BreakingChanges, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="5" Grid.Column="0"
@@ -143,7 +143,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Optional}"
+               PlaceholderText="{DynamicResource Text.Optional}"
                Text="{Binding ClosedIssue, Mode=TwoWay}"/>
     </Grid>
 
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index 670a6ff9ac..a8029c2c4f 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -74,7 +74,7 @@
                                 VerticalAlignment="Center"
                                 CornerRadius="3"
                                 Text="{Binding Name, Mode=TwoWay}"
-                                Watermark="{DynamicResource Text.CreateBranch.Name.Placeholder}"/>
+                                PlaceholderText="{DynamicResource Text.CreateBranch.Name.Placeholder}"/>
 
       <Border Grid.Row="2" Grid.Column="0"
               Height="32"
diff --git a/src/Views/CreateTag.axaml b/src/Views/CreateTag.axaml
index eefb54f6be..f18b0c32ed 100644
--- a/src/Views/CreateTag.axaml
+++ b/src/Views/CreateTag.axaml
@@ -62,7 +62,7 @@
                                 VerticalAlignment="Center"
                                 CornerRadius="3"
                                 Text="{Binding TagName, Mode=TwoWay}"
-                                Watermark="{DynamicResource Text.CreateTag.Name.Placeholder}"/>
+                                PlaceholderText="{DynamicResource Text.CreateTag.Name.Placeholder}"/>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
@@ -86,7 +86,7 @@
                AcceptsReturn="True" AcceptsTab="False"
                VerticalAlignment="Center" VerticalContentAlignment="Top"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.CreateTag.Message.Placeholder}"
+               PlaceholderText="{DynamicResource Text.CreateTag.Message.Placeholder}"
                Text="{Binding Message, Mode=TwoWay}"
                IsVisible="{Binding Annotated}"
                Tag="{Binding Source={x:Static v:StealHotKey.Enter}}"/>
diff --git a/src/Views/DateTimePresenter.cs b/src/Views/DateTimePresenter.cs
index eddfec96eb..876415f44c 100644
--- a/src/Views/DateTimePresenter.cs
+++ b/src/Views/DateTimePresenter.cs
@@ -60,19 +60,11 @@ public ulong Timestamp
 
         public DateTimePresenter()
         {
-            Bind(Use24HoursProperty, new Binding()
-            {
-                Mode = BindingMode.OneWay,
-                Source = ViewModels.Preferences.Instance,
-                Path = "Use24Hours"
-            });
+            Bind(Use24HoursProperty, CompiledBinding.Create((ViewModels.Preferences pref) => pref.Use24Hours,
+                source: ViewModels.Preferences.Instance, mode: BindingMode.OneWay));
 
-            Bind(DateTimeFormatProperty, new Binding()
-            {
-                Mode = BindingMode.OneWay,
-                Source = ViewModels.Preferences.Instance,
-                Path = "DateTimeFormat"
-            });
+            Bind(DateTimeFormatProperty, CompiledBinding.Create((ViewModels.Preferences pref) => pref.DateTimeFormat,
+                source: ViewModels.Preferences.Instance, mode: BindingMode.OneWay));
         }
 
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
diff --git a/src/Views/EditRemote.axaml b/src/Views/EditRemote.axaml
index 3c88ae9669..6ffc59d1c4 100644
--- a/src/Views/EditRemote.axaml
+++ b/src/Views/EditRemote.axaml
@@ -27,7 +27,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Remote.Name.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Remote.Name.Placeholder}"
                Text="{Binding Name, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
           <Path Width="12" Height="12"
@@ -45,7 +45,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Remote.URL.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Remote.URL.Placeholder}"
                Text="{Binding Url, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
           <Path Width="12" Height="12"
@@ -69,7 +69,7 @@
                  Height="26"
                  VerticalAlignment="Center"
                  CornerRadius="3"
-                 Watermark="{DynamicResource Text.SSHKey.Placeholder}"
+                 PlaceholderText="{DynamicResource Text.SSHKey.Placeholder}"
                  Text="{Binding SSHKey, Mode=TwoWay}">
           <TextBox.InnerLeftContent>
             <Path Width="12" Height="12"
diff --git a/src/Views/ExecuteCustomAction.axaml b/src/Views/ExecuteCustomAction.axaml
index 6769f94814..301ddc16fc 100644
--- a/src/Views/ExecuteCustomAction.axaml
+++ b/src/Views/ExecuteCustomAction.axaml
@@ -95,7 +95,7 @@
                      Height="28"
                      VerticalAlignment="Center"
                      CornerRadius="3"
-                     Watermark="{Binding Placeholder, Mode=OneWay}"
+                     PlaceholderText="{Binding Placeholder, Mode=OneWay}"
                      Text="{Binding Text, Mode=TwoWay}"/>
           </Grid>
         </DataTemplate>
@@ -118,7 +118,7 @@
             <TextBox Grid.Column="1"
                      Height="28"
                      CornerRadius="3"
-                     Watermark="{Binding Placeholder, Mode=OneWay}"
+                     PlaceholderText="{Binding Placeholder, Mode=OneWay}"
                      Text="{Binding Path, Mode=TwoWay}">
               <TextBox.InnerRightContent>
                 <Button Classes="icon_button" Width="30" Height="30" Click="SelectPath">
diff --git a/src/Views/GitFlowStart.axaml b/src/Views/GitFlowStart.axaml
index 51827c6d66..359b4e45d3 100644
--- a/src/Views/GitFlowStart.axaml
+++ b/src/Views/GitFlowStart.axaml
@@ -37,7 +37,7 @@
                                 Height="26"
                                 VerticalAlignment="Center"
                                 CornerRadius="3"
-                                Watermark="{DynamicResource Text.GitFlow.StartPlaceholder}"
+                                PlaceholderText="{DynamicResource Text.GitFlow.StartPlaceholder}"
                                 Text="{Binding Name, Mode=TwoWay}"
                                 ClipToBounds="True">
         <v:BranchOrTagNameTextBox.InnerLeftContent>
diff --git a/src/Views/InitGitFlow.axaml b/src/Views/InitGitFlow.axaml
index 916262c7a0..ab5f88834d 100644
--- a/src/Views/InitGitFlow.axaml
+++ b/src/Views/InitGitFlow.axaml
@@ -81,7 +81,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Optional}"
+               PlaceholderText="{DynamicResource Text.Optional}"
                Text="{Binding TagPrefix, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
diff --git a/src/Views/MergeConflictEditor.axaml.cs b/src/Views/MergeConflictEditor.axaml.cs
index 79e9c961e5..f478f8d729 100644
--- a/src/Views/MergeConflictEditor.axaml.cs
+++ b/src/Views/MergeConflictEditor.axaml.cs
@@ -316,7 +316,7 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             if (_scrollViewer != null)
             {
                 _scrollViewer.ScrollChanged += OnTextViewScrollChanged;
-                _scrollViewer.Bind(ScrollViewer.OffsetProperty, new Binding("ScrollOffset", BindingMode.OneWay));
+                _scrollViewer.Bind(ScrollViewer.OffsetProperty, CompiledBinding.Create((ViewModels.MergeConflictEditor vm) => vm.ScrollOffset, mode: BindingMode.OneWay));
             }
         }
 
@@ -681,7 +681,7 @@ public Models.ConflictSelectedChunk SelectedChunk
         public MergeConflictEditor()
         {
             InitializeComponent();
-            Bind(SelectedChunkProperty, new Binding("SelectedChunk", BindingMode.OneWay));
+            Bind(SelectedChunkProperty, CompiledBinding.Create((ViewModels.MergeConflictEditor vm) => vm.SelectedChunk, mode: BindingMode.OneWay));
         }
 
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
diff --git a/src/Views/MoveSubmodule.axaml b/src/Views/MoveSubmodule.axaml
index 4ef27945f9..adcb66a231 100644
--- a/src/Views/MoveSubmodule.axaml
+++ b/src/Views/MoveSubmodule.axaml
@@ -35,7 +35,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.Submodule.RelativePath.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Submodule.RelativePath.Placeholder}"
                Text="{Binding MoveTo, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 55c2b17276..104dd275b2 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -356,7 +356,7 @@
                      Height="28"
                      CornerRadius="3"
                      Text="{Binding #ThisControl.DefaultUser, Mode=TwoWay}"
-                     Watermark="{DynamicResource Text.Preferences.Git.User.Placeholder}"/>
+                     PlaceholderText="{DynamicResource Text.Preferences.Git.User.Placeholder}"/>
 
             <TextBlock Grid.Row="3" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Git.Email}"
@@ -366,7 +366,7 @@
                      Height="28"
                      CornerRadius="3"
                      Text="{Binding #ThisControl.DefaultEmail, Mode=TwoWay}"
-                     Watermark="{DynamicResource Text.Preferences.Git.Email.Placeholder}"/>
+                     PlaceholderText="{DynamicResource Text.Preferences.Git.Email.Placeholder}"/>
 
             <TextBlock Grid.Row="4" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Git.CRLF}"
@@ -474,7 +474,7 @@
                      Height="28"
                      CornerRadius="3"
                      Text="{Binding #ThisControl.GPGExecutableFile, Mode=TwoWay}"
-                     Watermark="{DynamicResource Text.Preferences.GPG.Path.Placeholder}"
+                     PlaceholderText="{DynamicResource Text.Preferences.GPG.Path.Placeholder}"
                      IsVisible="{Binding #ThisControl.GPGFormat.NeedFindProgram}">
               <TextBox.InnerRightContent>
                 <Button Classes="icon_button" Width="30" Height="30" Click="SelectGPGExecutable">
@@ -491,7 +491,7 @@
                      Height="28"
                      CornerRadius="3"
                      Text="{Binding #ThisControl.GPGUserKey, Mode=TwoWay}"
-                     Watermark="{DynamicResource Text.Preferences.GPG.UserKey.Placeholder}"/>
+                     PlaceholderText="{DynamicResource Text.Preferences.GPG.UserKey.Placeholder}"/>
 
             <CheckBox Grid.Row="3" Grid.Column="1"
                       Content="{DynamicResource Text.Preferences.GPG.CommitEnabled}"
@@ -626,7 +626,7 @@
                        Height="28"
                        CornerRadius="3"
                        Text="{Binding ExternalMergeToolPath, Mode=TwoWay}"
-                       Watermark="{DynamicResource Text.Preferences.DiffMerge.Path.Placeholder}"
+                       PlaceholderText="{DynamicResource Text.Preferences.DiffMerge.Path.Placeholder}"
                        IsVisible="{Binding ExternalMergeToolType, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
                 <TextBox.InnerRightContent>
                   <Button Classes="icon_button" Width="30" Height="30" Click="SelectExternalMergeTool">
diff --git a/src/Views/RenameBranch.axaml b/src/Views/RenameBranch.axaml
index fd465afa61..f104155f87 100644
--- a/src/Views/RenameBranch.axaml
+++ b/src/Views/RenameBranch.axaml
@@ -37,7 +37,7 @@
                                 VerticalAlignment="Center"
                                 CornerRadius="3"
                                 Text="{Binding Name, Mode=TwoWay}"
-                                Watermark="{DynamicResource Text.RenameBranch.Name.Placeholder}"/>
+                                PlaceholderText="{DynamicResource Text.RenameBranch.Name.Placeholder}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 23540a29e6..f8915ffb73 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -267,7 +267,7 @@
                        BorderThickness="1"
                        CornerRadius="13"
                        BorderBrush="{DynamicResource Brush.Border2}"
-                       Watermark="{DynamicResource Text.Repository.Filter}"
+                       PlaceholderText="{DynamicResource Text.Repository.Filter}"
                        Text="{Binding Filter, Mode=TwoWay}"
                        VerticalContentAlignment="Center">
                 <TextBox.InnerLeftContent>
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 8509df574e..76af35d99a 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -52,7 +52,7 @@
           <TextBox Grid.Row="0" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
-                   Watermark="{DynamicResource Text.Configure.User.Placeholder}"
+                   PlaceholderText="{DynamicResource Text.Configure.User.Placeholder}"
                    Text="{Binding UserName, Mode=TwoWay}"/>
 
           <TextBlock Grid.Row="1" Grid.Column="0"
@@ -62,7 +62,7 @@
           <TextBox Grid.Row="1" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
-                   Watermark="{DynamicResource Text.Configure.Email.Placeholder}"
+                   PlaceholderText="{DynamicResource Text.Configure.Email.Placeholder}"
                    Text="{Binding UserEmail, Mode=TwoWay}"/>
 
           <TextBlock Grid.Row="2" Grid.Column="0"
@@ -127,7 +127,7 @@
           <TextBox Grid.Row="4" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
-                   Watermark="{DynamicResource Text.Configure.Proxy.Placeholder}"
+                   PlaceholderText="{DynamicResource Text.Configure.Proxy.Placeholder}"
                    Text="{Binding HttpProxy, Mode=TwoWay}">
             <TextBox.InnerRightContent>
               <Button Classes="icon_button" IsVisible="{Binding HttpProxy, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" Command="{Binding ClearHttpProxy}">
@@ -143,7 +143,7 @@
           <TextBox Grid.Row="5" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
-                   Watermark="{DynamicResource Text.Preferences.GPG.UserKey.Placeholder}"
+                   PlaceholderText="{DynamicResource Text.Preferences.GPG.UserKey.Placeholder}"
                    Text="{Binding GPGUserSigningKey, Mode=TwoWay}"/>
 
           <TextBlock Grid.Row="6" Grid.Column="0"
diff --git a/src/Views/RepositoryToolbar.axaml.cs b/src/Views/RepositoryToolbar.axaml.cs
index c5ba572cad..c02d77d7c4 100644
--- a/src/Views/RepositoryToolbar.axaml.cs
+++ b/src/Views/RepositoryToolbar.axaml.cs
@@ -32,7 +32,7 @@ private void OpenWithExternalTools(object sender, RoutedEventArgs ev)
 
                 RenderOptions.SetBitmapInterpolationMode(menu, BitmapInterpolationMode.HighQuality);
                 RenderOptions.SetEdgeMode(menu, EdgeMode.Antialias);
-                RenderOptions.SetTextRenderingMode(menu, TextRenderingMode.SubpixelAntialias);
+                TextOptions.SetTextRenderingMode(menu, TextRenderingMode.SubpixelAntialias);
 
                 var explore = new MenuItem();
                 explore.Header = App.Text("Repository.Explore");
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index e76bb87962..e13fd2a910 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -84,7 +84,7 @@
                    BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                    Background="Transparent"
                    CornerRadius="4"
-                   Watermark="{DynamicResource Text.CommitDetail.Changes.Search}"
+                   PlaceholderText="{DynamicResource Text.CommitDetail.Changes.Search}"
                    Text="{Binding SearchFilter, Mode=TwoWay}">
             <TextBox.InnerLeftContent>
               <Path Width="14" Height="14" Margin="4,0,0,0" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Search}"/>
diff --git a/src/Views/RevisionFileContentViewer.axaml.cs b/src/Views/RevisionFileContentViewer.axaml.cs
index fa2ecfec48..e96f282445 100644
--- a/src/Views/RevisionFileContentViewer.axaml.cs
+++ b/src/Views/RevisionFileContentViewer.axaml.cs
@@ -3,6 +3,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index 0c0ca22eec..0b8668ba32 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -25,7 +25,7 @@
                  BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                  Background="Transparent"
                  CornerRadius="4"
-                 Watermark="{DynamicResource Text.CommitDetail.Files.Search}"
+                 PlaceholderText="{DynamicResource Text.CommitDetail.Files.Search}"
                  Text="{Binding RevisionFileSearchFilter, Mode=TwoWay}"
                  KeyDown="OnSearchBoxKeyDown"
                  TextChanged="OnSearchBoxTextChanged"
diff --git a/src/Views/SSHKeyHelper.axaml b/src/Views/SSHKeyHelper.axaml
index 53d462c8d1..23367c1615 100644
--- a/src/Views/SSHKeyHelper.axaml
+++ b/src/Views/SSHKeyHelper.axaml
@@ -208,7 +208,7 @@
                                Height="28"
                                CornerRadius="3"
                                VerticalAlignment="Center"
-                               Watermark="{DynamicResource Text.SSHKeyHelper.Generator.Name.Placeholder}"
+                               PlaceholderText="{DynamicResource Text.SSHKeyHelper.Generator.Name.Placeholder}"
                                Text="{Binding Name, Mode=TwoWay}"/>
 
                       <TextBlock Grid.Row="2" Grid.Column="0"
@@ -219,7 +219,7 @@
                                Height="28"
                                CornerRadius="3"
                                VerticalAlignment="Center"
-                               Watermark="{DynamicResource Text.SSHKeyHelper.Generator.Email.Placeholder}"
+                               PlaceholderText="{DynamicResource Text.SSHKeyHelper.Generator.Email.Placeholder}"
                                Text="{Binding Email, Mode=TwoWay}"/>
 
                       <TextBlock Grid.Row="3" Grid.Column="0"
diff --git a/src/Views/SetSubmoduleBranch.axaml b/src/Views/SetSubmoduleBranch.axaml
index b04897e96d..0c9622a80d 100644
--- a/src/Views/SetSubmoduleBranch.axaml
+++ b/src/Views/SetSubmoduleBranch.axaml
@@ -44,7 +44,7 @@
                Height="26"
                VerticalAlignment="Center"
                CornerRadius="3"
-               Watermark="{DynamicResource Text.SetSubmoduleBranch.New.Tip}"
+               PlaceholderText="{DynamicResource Text.SetSubmoduleBranch.New.Tip}"
                Text="{Binding ChangeTo, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
diff --git a/src/Views/StashChanges.axaml b/src/Views/StashChanges.axaml
index 944f0c1680..58862e95ad 100644
--- a/src/Views/StashChanges.axaml
+++ b/src/Views/StashChanges.axaml
@@ -49,7 +49,7 @@
                Margin="0,4,0,0"
                CornerRadius="3"
                Text="{Binding Message, Mode=TwoWay}"
-               Watermark="{DynamicResource Text.Stash.Message.Placeholder}"
+               PlaceholderText="{DynamicResource Text.Stash.Message.Placeholder}"
                AcceptsReturn="True"
                AcceptsTab="False"
                VerticalContentAlignment="Top"
diff --git a/src/Views/SubmoduleRevisionCompare.axaml b/src/Views/SubmoduleRevisionCompare.axaml
index e94888b750..c5944a81f6 100644
--- a/src/Views/SubmoduleRevisionCompare.axaml
+++ b/src/Views/SubmoduleRevisionCompare.axaml
@@ -116,7 +116,7 @@
                      BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                      Background="Transparent"
                      CornerRadius="4"
-                     Watermark="{DynamicResource Text.CommitDetail.Changes.Search}"
+                     PlaceholderText="{DynamicResource Text.CommitDetail.Changes.Search}"
                      Text="{Binding SearchFilter, Mode=TwoWay}">
               <TextBox.InnerLeftContent>
                 <Path Width="14" Height="14" Margin="4,0,0,0" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Search}"/>
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 3d7d0eac3a..aacfd3c5df 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -992,7 +992,7 @@ protected override void OnLoaded(RoutedEventArgs e)
             _scrollViewer = this.FindDescendantOfType<ScrollViewer>();
             if (_scrollViewer != null)
             {
-                _scrollViewer.Bind(ScrollViewer.OffsetProperty, new Binding("ScrollOffset", BindingMode.TwoWay));
+                _scrollViewer.Bind(ScrollViewer.OffsetProperty, CompiledBinding.Create((ViewModels.CombinedTextDiff vm) => vm.ScrollOffset, mode: BindingMode.TwoWay));
                 _scrollViewer.ScrollChanged += OnTextViewScrollChanged;
             }
         }
@@ -1180,7 +1180,7 @@ protected override void OnLoaded(RoutedEventArgs e)
             if (_scrollViewer != null)
             {
                 _scrollViewer.ScrollChanged += OnTextViewScrollChanged;
-                _scrollViewer.Bind(ScrollViewer.OffsetProperty, new Binding("ScrollOffset", BindingMode.OneWay));
+                _scrollViewer.Bind(ScrollViewer.OffsetProperty, CompiledBinding.Create((ViewModels.TwoSideTextDiff vm) => vm.ScrollOffset, mode: BindingMode.OneWay));
             }
         }
 
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index c777852982..f897fb0100 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -27,7 +27,7 @@
                BorderBrush="{DynamicResource Brush.Border0}"
                BorderThickness="1"
                Background="{DynamicResource Brush.Contents}"
-               Watermark="{DynamicResource Text.Welcome.Search}"
+               PlaceholderText="{DynamicResource Text.Welcome.Search}"
                VerticalContentAlignment="Center"
                Text="{Binding SearchFilter, Mode=TwoWay}">
         <TextBox.Styles>
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 85a606bd14..4896b94bfe 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -41,7 +41,7 @@
                    CornerRadius="12"
                    Text="{Binding Filter, Mode=TwoWay}"
                    BorderBrush="{DynamicResource Brush.Border2}"
-                   Watermark="{DynamicResource Text.WorkingCopy.FilterChanges}"
+                   PlaceholderText="{DynamicResource Text.WorkingCopy.FilterChanges}"
                    VerticalContentAlignment="Center">
             <TextBox.InnerLeftContent>
               <Path Width="14" Height="14"