diff --git a/ILSpy.Tests/Analyzers/AnalyzerResultHighlightTests.cs b/ILSpy.Tests/Analyzers/AnalyzerResultHighlightTests.cs
index 9ee2c18e9..7eed5011c 100644
--- a/ILSpy.Tests/Analyzers/AnalyzerResultHighlightTests.cs
+++ b/ILSpy.Tests/Analyzers/AnalyzerResultHighlightTests.cs
@@ -27,8 +27,8 @@ using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
 
 using ILSpy.Analyzers;
-using ILSpy.AppEnv;
 using ILSpy.Analyzers.TreeNodes;
+using ILSpy.AppEnv;
 using ILSpy.Docking;
 using ILSpy.TextView;
 using ILSpy.TreeNodes;
diff --git a/ILSpy.Tests/Docking/LayoutPersistenceTests.cs b/ILSpy.Tests/Docking/LayoutPersistenceTests.cs
index c745de01f..82134a8ff 100644
--- a/ILSpy.Tests/Docking/LayoutPersistenceTests.cs
+++ b/ILSpy.Tests/Docking/LayoutPersistenceTests.cs
@@ -21,12 +21,12 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
-using Dock.Model.Core;
-
 using Avalonia.Headless.NUnit;
 
 using AwesomeAssertions;
 
+using Dock.Model.Core;
+
 using ILSpy.AppEnv;
 using ILSpy.Docking;
 using ILSpy.ViewModels;
diff --git a/ILSpy.Tests/Navigation/ViewStateRoundTripTests.cs b/ILSpy.Tests/Navigation/ViewStateRoundTripTests.cs
index d931b5faa..02e08543c 100644
--- a/ILSpy.Tests/Navigation/ViewStateRoundTripTests.cs
+++ b/ILSpy.Tests/Navigation/ViewStateRoundTripTests.cs
@@ -30,10 +30,10 @@ using ILSpy.TreeNodes;
 using ILSpy.ViewModels;
 using ILSpy.Views;
 
-using FoldingSnapshot = ILSpy.TextView.FoldingsViewState.Snapshot;
-
 using NUnit.Framework;
 
+using FoldingSnapshot = ILSpy.TextView.FoldingsViewState.Snapshot;
+
 namespace ICSharpCode.ILSpy.Tests.Navigation;
 
 /// <summary>
diff --git a/ILSpy.Tests/TestApp.axaml.cs b/ILSpy.Tests/TestApp.axaml.cs
index 73e2129e7..859bfd8ac 100644
--- a/ILSpy.Tests/TestApp.axaml.cs
+++ b/ILSpy.Tests/TestApp.axaml.cs
@@ -24,6 +24,7 @@ using ICSharpCode.ILSpyX.Settings;
 using ILSpy.AppEnv;
 
 using ProductionApp = ILSpy.App;
+using SettingsService = ILSpy.SettingsService;
 
 namespace ICSharpCode.ILSpy.Tests;
 
diff --git a/ILSpy/Options/DisplaySettingsViewModel.cs b/ILSpy/Options/DisplaySettingsViewModel.cs
index ba6080b21..e5b587834 100644
--- a/ILSpy/Options/DisplaySettingsViewModel.cs
+++ b/ILSpy/Options/DisplaySettingsViewModel.cs
@@ -21,10 +21,10 @@ using System.ComponentModel;
 using System.Linq;
 using System.Xml.Linq;
 
-using global::Avalonia.Media;
-
 using CommunityToolkit.Mvvm.ComponentModel;
 
+using global::Avalonia.Media;
+
 using ICSharpCode.ILSpy.Properties;
 
 namespace ILSpy.Options
diff --git a/ILSpy/TextView/CaretHighlightAdorner.cs b/ILSpy/TextView/CaretHighlightAdorner.cs
index 2ca900aba..f8f1f064b 100644
--- a/ILSpy/TextView/CaretHighlightAdorner.cs
+++ b/ILSpy/TextView/CaretHighlightAdorner.cs
@@ -19,14 +19,14 @@
 using System;
 using System.Diagnostics;
 
+using AvaloniaEdit.Editing;
+using AvaloniaEdit.Rendering;
+
 using global::Avalonia;
 using global::Avalonia.Controls.Documents;
 using global::Avalonia.Media;
 using global::Avalonia.Threading;
 
-using AvaloniaEdit.Editing;
-using AvaloniaEdit.Rendering;
-
 namespace ILSpy.TextView
 {
 	/// <summary>
diff --git a/ILSpy/Views/MetadataTablePage.axaml.cs b/ILSpy/Views/MetadataTablePage.axaml.cs
index 1ef5ec8d0..5d9e56109 100644
--- a/ILSpy/Views/MetadataTablePage.axaml.cs
+++ b/ILSpy/Views/MetadataTablePage.axaml.cs
@@ -20,6 +20,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Reflection;
 
 using Avalonia;
 using Avalonia.Collections;
@@ -29,8 +30,6 @@ using Avalonia.Input.Platform;
 using Avalonia.Markup.Xaml;
 using Avalonia.VisualTree;
 
-using System.Reflection;
-
 using ILSpy.AppEnv;
 using ILSpy.Commands;
 using ILSpy.Metadata;