diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 08fcd17a..5505cb4f 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -21,10 +21,11 @@
     <PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.9" />
     <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.9" />
+    <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
     <PackageReference Include="Avalonia.Diagnostics" Version="11.0.9" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="AvaloniaEdit.TextMate" Version="11.0.6" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="OneWare.AvaloniaEdit" Version="11.0.7" />
-    <PackageReference Include="OneWare.AvaloniaEdit.TextMate" Version="11.0.7" />
+    <PackageReference Include="TextMateSharp.Grammars" Version="1.0.56" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index 7bf8d601..c76dee78 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -73,7 +73,7 @@
 
           <StackPanel Orientation="Horizontal" Margin="0,2,0,0">
             <TextBlock Text="{DynamicResource Text.About.Editor}" />
-            <TextBlock Text="OneWare.AvaloniaEdit" Cursor="Hand" Foreground="{DynamicResource Brush.Accent1}" TextDecorations="Underline" PointerPressed="OnVisitAvaloniaEdit"/>
+            <TextBlock Text="AvaloniaEdit" Cursor="Hand" Foreground="{DynamicResource Brush.Accent1}" TextDecorations="Underline" PointerPressed="OnVisitAvaloniaEdit"/>
           </StackPanel>
 
           <StackPanel Orientation="Horizontal" Margin="0,2,0,0">
diff --git a/src/Views/About.axaml.cs b/src/Views/About.axaml.cs
index 90d047ef..b15e3842 100644
--- a/src/Views/About.axaml.cs
+++ b/src/Views/About.axaml.cs
@@ -27,7 +27,7 @@ namespace SourceGit.Views {
         }
 
         private void OnVisitAvaloniaEdit(object sender, PointerPressedEventArgs e) {
-            Native.OS.OpenBrowser("https://www.nuget.org/packages/OneWare.AvaloniaEdit");
+            Native.OS.OpenBrowser("https://github.com/AvaloniaUI/AvaloniaEdit");
             e.Handled = true;
         }
 
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index e84f16ec..74990a36 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Styling;
@@ -517,7 +518,7 @@ namespace SourceGit.Views {
         }
 
         private void OnTextViewScrollOffsetChanged(object sender, EventArgs e) {
-            SyncScrollOffset = ScrollViewer.Offset;
+            SyncScrollOffset = TextArea.TextView.ScrollOffset;
         }
 
         private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e) {
@@ -566,8 +567,9 @@ namespace SourceGit.Views {
                     Text = string.Empty;
                 }
             } else if (change.Property == SyncScrollOffsetProperty) {
-                if (ScrollViewer.Offset != SyncScrollOffset) {
-                    ScrollViewer.Offset = SyncScrollOffset;
+                if (TextArea.TextView.ScrollOffset != SyncScrollOffset) {
+                    IScrollable scrollable = TextArea.TextView;
+                    scrollable.Offset = SyncScrollOffset;
                 }
             } else if (change.Property.Name == "ActualThemeVariant" && change.NewValue != null && _textMate != null) {
                 if (App.Current?.ActualThemeVariant == ThemeVariant.Dark) {