From 5a411b8040a99a623d11be5ae134db7b17172714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 May 2026 04:43:15 +0200
Subject: [PATCH 01/16] Attempt to fix file type detection logic on Android
 (#6748)

Intends to close https://github.com/ppy/osu/issues/37704

On Android, you can choose what file picker you like best. Some OEMs
leverage this to implement their own (sometimes ad-ridden, *you know
who you are*) file pickers.

It appears that while some file pickers return content URIs that end
with the actual underlying file's name, some file pickers return their
specific gibberish, without a file extension in sight. And they are
entitled to do so by the Android Decree of "you shall only ever
interact with files via our magic APIs".

But then game-side TagLib rolls up, sees a filename without an
extension, goes "wots all dis den" and just rejects the file. So to keep
the lie up, attempt a little harder to synthesise an actual usable file
extension as if this was still a desktop computer with actual files.
---
 osu.Framework.Android/AndroidGameActivity.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Framework.Android/AndroidGameActivity.cs b/osu.Framework.Android/AndroidGameActivity.cs
index 94b52d752f..d3a733f283 100644
--- a/osu.Framework.Android/AndroidGameActivity.cs
+++ b/osu.Framework.Android/AndroidGameActivity.cs
@@ -128,7 +128,7 @@ private void recycleTempContentDirectory()
 
         public FileInfo CreateTemporaryFileFromContentUri(Uri contentUri)
         {
-            // while content URIs are not real paths, in practice they appear to at least contain filenames at the end.
+            // while content URIs are not real paths, in practice they *appear* to at least *sometimes* contain real filenames at the end.
             // try using that first, since it's the least likely thing to fail later.
             // the reason why this is important is that downstream consumers may depend on the *extension* of the file in particular,
             // and there's no guarantee that we can recover it safely from anywhere else.
@@ -136,8 +136,15 @@ public FileInfo CreateTemporaryFileFromContentUri(Uri contentUri)
 
             // if the content URI fails generate something else.
             if (string.IsNullOrEmpty(filename))
-            {
                 filename = Path.GetRandomFileName();
+
+            // check if we have an extension to use.
+            // there are two cases where we might not:
+            // - the content-providing app gave something resembling a filename but not an extension (known to happen in the wild)
+            // - there was no actual filename to use at any point, and we just generated our own above
+            // in both cases, attempt to synthesise an extension ourselves since there's nothing left to use anyway.
+            if (string.IsNullOrEmpty(Path.GetExtension(filename)))
+            {
                 string? mimeType = ContentResolver?.GetType(contentUri);
                 string? extension = MimeTypeMap.Singleton?.GetExtensionFromMimeType(mimeType);
 

From ce76a4b76a3f6a97b426b098ddae3a882d363d53 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 12 May 2026 18:05:17 +0900
Subject: [PATCH 02/16] Bump SDL3 package

---
 osu.Framework/osu.Framework.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Framework/osu.Framework.csproj b/osu.Framework/osu.Framework.csproj
index 985844dab7..2c6d1227fb 100644
--- a/osu.Framework/osu.Framework.csproj
+++ b/osu.Framework/osu.Framework.csproj
@@ -38,7 +38,7 @@
     <PackageReference Include="ppy.osuTK.NS20" Version="1.0.211" />
     <PackageReference Include="StbiSharp" Version="1.1.0" />
     <PackageReference Include="ppy.SDL2-CS" Version="1.0.741-alpha" />
-    <PackageReference Include="ppy.SDL3-CS" Version="2026.302.0" />
+    <PackageReference Include="ppy.SDL3-CS" Version="2026.512.0" />
     <PackageReference Include="ppy.osu.Framework.SourceGeneration" Version="2025.1121.1" />
 
     <!-- DO NOT use ProjectReference for native packaging project.

From e3bf29e8d7567ec68287a04bbac8a6c11025385b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 15:36:30 +0000
Subject: [PATCH 03/16] perf: eliminate per-frame heap allocations (video
 ReturnFrame, GL ref/out overloads, Dropdown LINQ)

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/05a927e1-bc76-443b-b53a-7d5698daeda5

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 osu.Framework/Graphics/OpenGL/Textures/GLTexture.cs   |  7 ++-----
 .../Graphics/OpenGL/Textures/GLVideoTexture.cs        |  2 +-
 osu.Framework/Graphics/UserInterface/Dropdown.cs      |  2 +-
 osu.Framework/Graphics/Video/Video.cs                 |  2 +-
 osu.Framework/Graphics/Video/VideoDecoder.cs          | 11 +++++++++++
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Framework/Graphics/OpenGL/Textures/GLTexture.cs b/osu.Framework/Graphics/OpenGL/Textures/GLTexture.cs
index 8240362b51..b30cc9f870 100644
--- a/osu.Framework/Graphics/OpenGL/Textures/GLTexture.cs
+++ b/osu.Framework/Graphics/OpenGL/Textures/GLTexture.cs
@@ -124,7 +124,7 @@ protected virtual void Dispose(bool isDisposing)
                 if (disposableId <= 0)
                     return;
 
-                GL.DeleteTextures(1, new[] { disposableId });
+                GL.DeleteTextures(1, ref disposableId);
 
                 texture.memoryLease?.Dispose();
 
@@ -273,10 +273,7 @@ protected virtual void DoUpload(ITextureUpload upload, IntPtr dataPointer)
                 // We only need to generate a new texture if we don't have one already. Otherwise just re-use the current one.
                 if (textureId <= 0)
                 {
-                    int[] textures = new int[1];
-                    GL.GenTextures(1, textures);
-
-                    textureId = textures[0];
+                    GL.GenTextures(1, out textureId);
 
                     Renderer.BindTexture(this);
 
diff --git a/osu.Framework/Graphics/OpenGL/Textures/GLVideoTexture.cs b/osu.Framework/Graphics/OpenGL/Textures/GLVideoTexture.cs
index 9ea5289b9d..fd47352c2a 100644
--- a/osu.Framework/Graphics/OpenGL/Textures/GLVideoTexture.cs
+++ b/osu.Framework/Graphics/OpenGL/Textures/GLVideoTexture.cs
@@ -96,7 +96,7 @@ protected override void Dispose(bool isDisposing)
                 for (int i = 0; i < ids.Length; i++)
                 {
                     if (ids[i] >= 0)
-                        GL.DeleteTextures(1, new[] { ids[i] });
+                        GL.DeleteTextures(1, ref ids[i]);
                 }
             }, this);
         }
diff --git a/osu.Framework/Graphics/UserInterface/Dropdown.cs b/osu.Framework/Graphics/UserInterface/Dropdown.cs
index ec253b78d8..e87eaad407 100644
--- a/osu.Framework/Graphics/UserInterface/Dropdown.cs
+++ b/osu.Framework/Graphics/UserInterface/Dropdown.cs
@@ -285,7 +285,7 @@ private void filterCompleted()
 
         private void selectionKeyPressed(DropdownHeader.DropdownSelectionAction action)
         {
-            if (!MenuItems.Any())
+            if (itemMap.Count == 0)
                 return;
 
             var dropdownMenuItems = MenuItems.ToList();
diff --git a/osu.Framework/Graphics/Video/Video.cs b/osu.Framework/Graphics/Video/Video.cs
index acf4ea6f5a..30d9975c89 100644
--- a/osu.Framework/Graphics/Video/Video.cs
+++ b/osu.Framework/Graphics/Video/Video.cs
@@ -158,7 +158,7 @@ protected override void Update()
 
             while (availableFrames.Count > 0 && checkNextFrameValid(availableFrames.Peek()))
             {
-                if (lastFrame != null) decoder.ReturnFrames(new[] { lastFrame });
+                if (lastFrame != null) decoder.ReturnFrame(lastFrame);
                 lastFrame = availableFrames.Dequeue();
                 lastFrameShown = false;
             }
diff --git a/osu.Framework/Graphics/Video/VideoDecoder.cs b/osu.Framework/Graphics/Video/VideoDecoder.cs
index 216a05e7e4..e93ba98c6b 100644
--- a/osu.Framework/Graphics/Video/VideoDecoder.cs
+++ b/osu.Framework/Graphics/Video/VideoDecoder.cs
@@ -200,6 +200,17 @@ public void ReturnFrames(IEnumerable<DecodedFrame> frames)
             }
         }
 
+        /// <summary>
+        /// Returns a single frame back to the decoder, allowing the decoder to reuse the texture contained in the frame to draw new frames.
+        /// Prefer this overload over <see cref="ReturnFrames"/> when only one frame is being returned to avoid allocating a temporary array.
+        /// </summary>
+        /// <param name="frame">The frame that should be returned to the decoder.</param>
+        public void ReturnFrame(DecodedFrame frame)
+        {
+            frame.Texture.FlushUploads();
+            availableTextures.Enqueue(frame.Texture);
+        }
+
         /// <summary>
         /// Starts the decoding process. The decoding will happen asynchronously in a separate thread. The decoded frames can be retrieved by using <see cref="GetDecodedFrames"/>.
         /// </summary>

From 116910e615409607b9879b272ac819bc54e50c38 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 16:34:12 +0000
Subject: [PATCH 04/16] perf: BufferedContainer skip-redraw on
 self-invalidation, Metal UBO staging, Path AABB hit-test cache

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/bbb64d78-3f8b-4d1e-b0b5-2b0331c61dd1

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 .../Graphics/Containers/BufferedContainer.cs  | 16 ++++++++----
 osu.Framework/Graphics/Lines/Path.cs          | 23 ++++++++++++++---
 .../Buffers/VeldridUniformBufferStorage.cs    | 25 +++++++++++--------
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/osu.Framework/Graphics/Containers/BufferedContainer.cs b/osu.Framework/Graphics/Containers/BufferedContainer.cs
index fba5fa63f0..d6fabe79bf 100644
--- a/osu.Framework/Graphics/Containers/BufferedContainer.cs
+++ b/osu.Framework/Graphics/Containers/BufferedContainer.cs
@@ -113,7 +113,7 @@ public ColourInfo EffectColour
                     return;
 
                 effectColour = value;
-                Invalidate(Invalidation.DrawNode);
+                ForceRedraw();
             }
         }
 
@@ -133,7 +133,7 @@ public BlendingParameters EffectBlending
                     return;
 
                 effectBlending = value;
-                Invalidate(Invalidation.DrawNode);
+                ForceRedraw();
             }
         }
 
@@ -150,7 +150,7 @@ public EffectPlacement EffectPlacement
                     return;
 
                 field = value;
-                Invalidate(Invalidation.DrawNode);
+                ForceRedraw();
             }
         }
 
@@ -228,7 +228,11 @@ public bool RedrawOnScale
         /// Forces a redraw of the framebuffer before it is blitted the next time.
         /// Only relevant if <see cref="UsingCachedFrameBuffer"/> is true.
         /// </summary>
-        public void ForceRedraw() => Invalidate(Invalidation.DrawNode);
+        public void ForceRedraw()
+        {
+            ++updateVersion;
+            Invalidate(Invalidation.DrawNode);
+        }
 
         /// <summary>
         /// In order to signal the draw thread to re-draw the buffered container we version it.
@@ -300,7 +304,9 @@ protected override bool OnInvalidate(Invalidation invalidation, InvalidationSour
 
             if ((invalidation & Invalidation.DrawNode) > 0)
             {
-                ++updateVersion;
+                if (source == InvalidationSource.Child)
+                    ++updateVersion;
+
                 result = true;
             }
 
diff --git a/osu.Framework/Graphics/Lines/Path.cs b/osu.Framework/Graphics/Lines/Path.cs
index 9c57ed3735..ddfb1c20df 100644
--- a/osu.Framework/Graphics/Lines/Path.cs
+++ b/osu.Framework/Graphics/Lines/Path.cs
@@ -206,9 +206,13 @@ public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
             var localPos = ToLocalSpace(screenSpacePos);
             float pathRadiusSquared = PathRadius * PathRadius;
 
-            foreach (var t in segments)
+            // Calling segments ensures both segmentsBacking and segmentAABBsBacking are populated.
+            var segs = segments;
+            var bounds = segmentAABBsBacking;
+
+            for (int i = 0; i < segs.Count; i++)
             {
-                if (t.DistanceSquaredToPoint(localPos) <= pathRadiusSquared)
+                if (bounds[i].Contains(localPos) && segs[i].DistanceSquaredToPoint(localPos) <= pathRadiusSquared)
                     return true;
             }
 
@@ -251,18 +255,31 @@ public void ReplaceVertex(int index, Vector2 pos)
         }
 
         private readonly List<Line> segmentsBacking = new List<Line>();
+        private readonly List<RectangleF> segmentAABBsBacking = new List<RectangleF>();
         private readonly Cached segmentsCache = new Cached();
         private List<Line> segments => segmentsCache.IsValid ? segmentsBacking : generateSegments();
 
         private List<Line> generateSegments()
         {
             segmentsBacking.Clear();
+            segmentAABBsBacking.Clear();
 
             if (vertices.Count > 1)
             {
                 Vector2 offset = vertexBounds.TopLeft;
+                float r = PathRadius;
+
                 for (int i = 0; i < vertices.Count - 1; ++i)
-                    segmentsBacking.Add(new Line(vertices[i] - offset, vertices[i + 1] - offset));
+                {
+                    var line = new Line(vertices[i] - offset, vertices[i + 1] - offset);
+                    segmentsBacking.Add(line);
+
+                    float minX = Math.Min(line.StartPoint.X, line.EndPoint.X) - r;
+                    float minY = Math.Min(line.StartPoint.Y, line.EndPoint.Y) - r;
+                    float maxX = Math.Max(line.StartPoint.X, line.EndPoint.X) + r;
+                    float maxY = Math.Max(line.StartPoint.Y, line.EndPoint.Y) + r;
+                    segmentAABBsBacking.Add(new RectangleF(minX, minY, maxX - minX, maxY - minY));
+                }
             }
 
             segmentsCache.Validate();
diff --git a/osu.Framework/Graphics/Veldrid/Buffers/VeldridUniformBufferStorage.cs b/osu.Framework/Graphics/Veldrid/Buffers/VeldridUniformBufferStorage.cs
index 225c1d1b95..2b838dbd2d 100644
--- a/osu.Framework/Graphics/Veldrid/Buffers/VeldridUniformBufferStorage.cs
+++ b/osu.Framework/Graphics/Veldrid/Buffers/VeldridUniformBufferStorage.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using osu.Framework.Graphics.Veldrid.Buffers.Staging;
 using osu.Framework.Platform;
 using Veldrid;
 
@@ -12,40 +13,44 @@ internal class VeldridUniformBufferStorage<TData>
         where TData : unmanaged, IEquatable<TData>
     {
         private readonly VeldridRenderer renderer;
-        private readonly DeviceBuffer buffer;
         private readonly NativeMemoryTracker.NativeMemoryLease memoryLease;
 
+        private readonly IStagingBuffer<TData> stagingBuffer;
+        private readonly DeviceBuffer gpuBuffer;
+
         private ResourceSet? set;
+
         public VeldridUniformBufferStorage(VeldridRenderer renderer)
         {
             this.renderer = renderer;
 
-            buffer = renderer.Factory.CreateBuffer(new BufferDescription((uint)Marshal.SizeOf(default(TData)), BufferUsage.UniformBuffer));
-            memoryLease = NativeMemoryTracker.AddMemory(this, buffer.SizeInBytes);
+            stagingBuffer = renderer.CreateStagingBuffer<TData>(1);
+            gpuBuffer = renderer.Factory.CreateBuffer(new BufferDescription((uint)Marshal.SizeOf(default(TData)), BufferUsage.UniformBuffer | stagingBuffer.CopyTargetUsageFlags));
+            memoryLease = NativeMemoryTracker.AddMemory(this, gpuBuffer.SizeInBytes);
         }
 
         private bool hasUploaded;
 
         public TData Data
         {
-            get;
+            get => stagingBuffer.Data[0];
             set
             {
-                if (hasUploaded && field.Equals(value))
+                if (hasUploaded && stagingBuffer.Data[0].Equals(value))
                     return;
 
-                field = value;
                 hasUploaded = true;
-
-                renderer.BufferUpdateCommands.UpdateBuffer(buffer, 0, ref field);
+                stagingBuffer.Data[0] = value;
+                stagingBuffer.CopyTo(gpuBuffer, 0, 0, 1);
             }
         }
 
-        public ResourceSet GetResourceSet(ResourceLayout layout) => set ??= renderer.Factory.CreateResourceSet(new ResourceSetDescription(layout, buffer));
+        public ResourceSet GetResourceSet(ResourceLayout layout) => set ??= renderer.Factory.CreateResourceSet(new ResourceSetDescription(layout, gpuBuffer));
 
         public void Dispose()
         {
-            buffer.Dispose();
+            gpuBuffer.Dispose();
+            stagingBuffer.Dispose();
             memoryLease.Dispose();
             set?.Dispose();
         }

From a5c7a2f6e0e6b442a951171fbaa7cdfc43c84601 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 16:43:15 +0000
Subject: [PATCH 05/16] perf: implement PathBBH (bounding box hierarchy) for
 O(log n) path hit-testing

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/5f125f41-4cc8-4874-a96e-c2e1645fb709

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 osu.Framework/Graphics/Lines/Path.DrawNode.cs |  35 ++-
 osu.Framework/Graphics/Lines/Path.cs          | 111 ++------
 osu.Framework/Graphics/Lines/PathBBH.cs       | 261 ++++++++++++++++++
 3 files changed, 307 insertions(+), 100 deletions(-)
 create mode 100644 osu.Framework/Graphics/Lines/PathBBH.cs

diff --git a/osu.Framework/Graphics/Lines/Path.DrawNode.cs b/osu.Framework/Graphics/Lines/Path.DrawNode.cs
index 99ea7dd8f1..2f50fe2273 100644
--- a/osu.Framework/Graphics/Lines/Path.DrawNode.cs
+++ b/osu.Framework/Graphics/Lines/Path.DrawNode.cs
@@ -27,6 +27,8 @@ private class PathDrawNode : DrawNode
 
             private float radius;
             private IShader? pathShader;
+            private Vector2 pathOffset;
+            private int treeVersion;
 
             private IVertexBatch<PathVertex>? quadBatch;
 
@@ -39,8 +41,21 @@ public override void ApplyState()
             {
                 base.ApplyState();
 
-                segments.Clear();
-                segments.AddRange(Source.segments);
+                var bbh = Source.BBH;
+
+                int newTreeVersion = bbh.TreeVersion;
+
+                // BufferedDrawNode can trigger ApplyState for child draw node
+                // even in cases when path isn't being redrawn (for example with alpha change)
+                if (newTreeVersion != treeVersion)
+                {
+                    segments.Clear();
+                    segments.AddRange(bbh.Segments);
+
+                    treeVersion = newTreeVersion;
+                }
+
+                pathOffset = bbh.VertexBounds.TopLeft;
 
                 radius = Source.PathRadius;
                 pathShader = Source.pathShader;
@@ -158,10 +173,10 @@ private void drawQuad(Vector2 topLeft, Vector2 topRight, Vector2 bottomLeft, Vec
             {
                 Debug.Assert(quadBatch != null);
 
-                quadBatch.Add(new PathVertex(topLeft, start, end, radius));
-                quadBatch.Add(new PathVertex(topRight, start, end, radius));
-                quadBatch.Add(new PathVertex(bottomRight, start, end, radius));
-                quadBatch.Add(new PathVertex(bottomLeft, start, end, radius));
+                quadBatch.Add(new PathVertex(topLeft, start, end, radius, pathOffset));
+                quadBatch.Add(new PathVertex(topRight, start, end, radius, pathOffset));
+                quadBatch.Add(new PathVertex(bottomRight, start, end, radius, pathOffset));
+                quadBatch.Add(new PathVertex(bottomLeft, start, end, radius, pathOffset));
             }
 
             private void updateVertexBuffer()
@@ -322,11 +337,11 @@ public DrawableSegment(Line guide, float radius)
                 [VertexMember(1, VertexAttribPointerType.Float)]
                 public readonly float Radius;
 
-                public PathVertex(Vector2 position, Vector2 startPos, Vector2 endPos, float radius)
+                public PathVertex(Vector2 position, Vector2 startPos, Vector2 endPos, float radius, Vector2 pathOffset)
                 {
-                    Position = position;
-                    StartPos = startPos;
-                    EndPos = endPos;
+                    Position = position - pathOffset;
+                    StartPos = startPos - pathOffset;
+                    EndPos = endPos - pathOffset;
                     Radius = radius;
                 }
 
diff --git a/osu.Framework/Graphics/Lines/Path.cs b/osu.Framework/Graphics/Lines/Path.cs
index ddfb1c20df..6fab8457d0 100644
--- a/osu.Framework/Graphics/Lines/Path.cs
+++ b/osu.Framework/Graphics/Lines/Path.cs
@@ -4,18 +4,18 @@
 #nullable disable
 
 using System;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Textures;
+using osuTK;
+using osu.Framework.Graphics.Shaders;
+using osu.Framework.Allocation;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using osu.Framework.Allocation;
 using osu.Framework.Caching;
 using osu.Framework.Extensions.EnumExtensions;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Rendering;
-using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Shaders.Types;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Layout;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Lines
@@ -50,8 +50,7 @@ public IReadOnlyList<Vector2> Vertices
                 vertices.Clear();
                 vertices.AddRange(value);
 
-                vertexBoundsCache.Invalidate();
-                segmentsCache.Invalidate();
+                bbhCache.Invalidate();
 
                 Invalidate(Invalidation.DrawSize);
             }
@@ -74,8 +73,7 @@ public virtual float PathRadius
 
                 pathRadius = value;
 
-                vertexBoundsCache.Invalidate();
-                segmentsCache.Invalidate();
+                bbhCache.Invalidate();
 
                 Invalidate(Invalidation.DrawSize);
             }
@@ -170,54 +168,9 @@ public override Vector2 Size
             }
         }
 
-        private readonly Cached<RectangleF> vertexBoundsCache = new Cached<RectangleF>();
-
-        private RectangleF vertexBounds
-        {
-            get
-            {
-                if (vertexBoundsCache.IsValid)
-                    return vertexBoundsCache.Value;
-
-                if (vertices.Count > 0)
-                {
-                    float minX = 0;
-                    float minY = 0;
-                    float maxX = 0;
-                    float maxY = 0;
-
-                    foreach (var v in vertices)
-                    {
-                        minX = Math.Min(minX, v.X - PathRadius);
-                        minY = Math.Min(minY, v.Y - PathRadius);
-                        maxX = Math.Max(maxX, v.X + PathRadius);
-                        maxY = Math.Max(maxY, v.Y + PathRadius);
-                    }
-
-                    return vertexBoundsCache.Value = new RectangleF(minX, minY, maxX - minX, maxY - minY);
-                }
-
-                return vertexBoundsCache.Value = new RectangleF(0, 0, 0, 0);
-            }
-        }
-
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
-        {
-            var localPos = ToLocalSpace(screenSpacePos);
-            float pathRadiusSquared = PathRadius * PathRadius;
-
-            // Calling segments ensures both segmentsBacking and segmentAABBsBacking are populated.
-            var segs = segments;
-            var bounds = segmentAABBsBacking;
-
-            for (int i = 0; i < segs.Count; i++)
-            {
-                if (bounds[i].Contains(localPos) && segs[i].DistanceSquaredToPoint(localPos) <= pathRadiusSquared)
-                    return true;
-            }
+        private RectangleF vertexBounds => BBH.VertexBounds;
 
-            return false;
-        }
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => BBH.Contains(ToLocalSpace(screenSpacePos));
 
         public Vector2 PositionInBoundingBox(Vector2 pos) => pos - vertexBounds.TopLeft;
 
@@ -228,8 +181,7 @@ public void ClearVertices()
 
             vertices.Clear();
 
-            vertexBoundsCache.Invalidate();
-            segmentsCache.Invalidate();
+            bbhCache.Invalidate();
 
             Invalidate(Invalidation.DrawSize);
         }
@@ -238,8 +190,7 @@ public void AddVertex(Vector2 pos)
         {
             vertices.Add(pos);
 
-            vertexBoundsCache.Invalidate();
-            segmentsCache.Invalidate();
+            bbhCache.Invalidate();
 
             Invalidate(Invalidation.DrawSize);
         }
@@ -248,42 +199,21 @@ public void ReplaceVertex(int index, Vector2 pos)
         {
             vertices[index] = pos;
 
-            vertexBoundsCache.Invalidate();
-            segmentsCache.Invalidate();
+            bbhCache.Invalidate();
 
             Invalidate(Invalidation.DrawSize);
         }
 
-        private readonly List<Line> segmentsBacking = new List<Line>();
-        private readonly List<RectangleF> segmentAABBsBacking = new List<RectangleF>();
-        private readonly Cached segmentsCache = new Cached();
-        private List<Line> segments => segmentsCache.IsValid ? segmentsBacking : generateSegments();
-
-        private List<Line> generateSegments()
-        {
-            segmentsBacking.Clear();
-            segmentAABBsBacking.Clear();
-
-            if (vertices.Count > 1)
-            {
-                Vector2 offset = vertexBounds.TopLeft;
-                float r = PathRadius;
+        private readonly PathBBH bbhBacking = new PathBBH();
+        private readonly Cached bbhCache = new Cached();
 
-                for (int i = 0; i < vertices.Count - 1; ++i)
-                {
-                    var line = new Line(vertices[i] - offset, vertices[i + 1] - offset);
-                    segmentsBacking.Add(line);
-
-                    float minX = Math.Min(line.StartPoint.X, line.EndPoint.X) - r;
-                    float minY = Math.Min(line.StartPoint.Y, line.EndPoint.Y) - r;
-                    float maxX = Math.Max(line.StartPoint.X, line.EndPoint.X) + r;
-                    float maxY = Math.Max(line.StartPoint.Y, line.EndPoint.Y) + r;
-                    segmentAABBsBacking.Add(new RectangleF(minX, minY, maxX - minX, maxY - minY));
-                }
-            }
+        protected PathBBH BBH => bbhCache.IsValid ? bbhBacking : computeBBH();
 
-            segmentsCache.Validate();
-            return segmentsBacking;
+        private PathBBH computeBBH()
+        {
+            bbhBacking.SetVertices(vertices, pathRadius);
+            bbhCache.Validate();
+            return bbhBacking;
         }
 
         private Texture texture;
@@ -391,6 +321,7 @@ protected override void Dispose(bool isDisposing)
             texture = null;
 
             sharedData.Dispose();
+            bbhBacking.Dispose();
         }
     }
 }
diff --git a/osu.Framework/Graphics/Lines/PathBBH.cs b/osu.Framework/Graphics/Lines/PathBBH.cs
new file mode 100644
index 0000000000..a4f5683b62
--- /dev/null
+++ b/osu.Framework/Graphics/Lines/PathBBH.cs
@@ -0,0 +1,261 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Diagnostics;
+using osu.Framework.Graphics.Primitives;
+using osuTK;
+
+namespace osu.Framework.Graphics.Lines
+{
+    /// <summary>
+    /// A Bounding Box Hierarchy of a set of vertices which when drawn consecutively represent a path.
+    /// </summary>
+    public class PathBBH : IDisposable
+    {
+        public IEnumerable<Line> Segments
+        {
+            get
+            {
+                if (segmentCount > 0 && nodes != null)
+                {
+                    for (int i = firstLeafIndex; i <= lastLeafIndex; i++)
+                        yield return nodes[i].Segment!.Value;
+                }
+            }
+        }
+
+        public RectangleF VertexBounds { get; private set; } = RectangleF.Empty;
+
+        public int TreeVersion { get; private set; }
+
+        private float radius;
+        private BBHNode[]? nodes;
+        private int treeDepth;
+        private int firstLeafIndex;
+        private int lastLeafIndex;
+        private int segmentCount;
+
+        public void SetVertices(IReadOnlyList<Vector2> vertices, float pathRadius)
+        {
+            ObjectDisposedException.ThrowIf(isDisposed, this);
+
+            TreeVersion++;
+            radius = pathRadius;
+
+            segmentCount = Math.Max(vertices.Count - 1, 0);
+            // Definition of a leaf here is a node containing a segment
+            // Since we are building a binary tree, compute the max value that is bigger than segmentCount and the power of 2.
+            // That would be the bottom layer of a tree.
+            int maxLeafCount = Math.Max((int)System.Numerics.BitOperations.RoundUpToPowerOf2((uint)segmentCount), 1);
+            treeDepth = (int)Math.Log2(maxLeafCount);
+
+            // We can avoid storing empty nodes by computing amount of all the nodes within a tree,
+            // which have descendant with at least 1 leaf (or leaf itself).
+            // That would be the size of an array holding the tree
+            int arrayLength = segmentCount;
+            int nodesOnDepth = segmentCount;
+
+            for (int i = treeDepth - 1; i >= 0; i--)
+            {
+                nodesOnDepth = (nodesOnDepth + 1) / 2;
+                arrayLength += nodesOnDepth;
+            }
+
+            firstLeafIndex = arrayLength - segmentCount;
+            lastLeafIndex = arrayLength - 1;
+
+            if (nodes != null)
+            {
+                if (nodes.Length < arrayLength)
+                {
+                    ArrayPool<BBHNode>.Shared.Return(nodes);
+                    nodes = ArrayPool<BBHNode>.Shared.Rent(arrayLength);
+                }
+            }
+            else
+            {
+                nodes = ArrayPool<BBHNode>.Shared.Rent(arrayLength);
+            }
+
+            switch (vertices.Count)
+            {
+                case 0:
+                    VertexBounds = RectangleF.Empty;
+                    break;
+
+                case 1:
+                    VertexBounds = RectangleF.Union(new RectangleF(vertices[0] - new Vector2(radius), new Vector2(radius * 2)), RectangleF.Empty);
+                    break;
+
+                default:
+                {
+                    computeNodes(vertices);
+                    VertexBounds = RectangleF.Union(nodes[0].Bounds, RectangleF.Empty);
+                    break;
+                }
+            }
+        }
+
+        private void computeNodes(IReadOnlyList<Vector2> vertices)
+        {
+            Debug.Assert(nodes != null);
+
+            for (int i = 0; i < vertices.Count - 1; i++)
+            {
+                var segment = new Line(vertices[i], vertices[i + 1]);
+
+                nodes[firstLeafIndex + i] = new BBHNode
+                {
+                    Bounds = lineAABB(segment, radius),
+                    Segment = segment
+                };
+            }
+
+            if (segmentCount == 1) // At this point root must contain a segment, no parent nodes exist.
+                return;
+
+            int nodesOnCurrentDepth = segmentCount;
+            int currentNodeIndex = lastLeafIndex - segmentCount;
+
+            // iterate over the tree layers starting from the bottom
+            for (int i = treeDepth - 1; i >= 0; i--)
+            {
+                int nodesOnNextDepth = nodesOnCurrentDepth;
+                nodesOnCurrentDepth = Math.Max((nodesOnCurrentDepth + 1) / 2, 1);
+
+                // iterate over the tree nodes within a layer from right to left
+                for (int j = nodesOnCurrentDepth - 1; j >= 0; j--)
+                {
+                    int offset = (nodesOnCurrentDepth - j) + 2 * j;
+                    int left = currentNodeIndex + offset;
+                    int rightOffset = offset + 1;
+
+                    // Right child exists
+                    if (rightOffset <= nodesOnNextDepth)
+                    {
+                        int right = currentNodeIndex + rightOffset;
+
+                        nodes[currentNodeIndex] = new BBHNode
+                        {
+                            Bounds = RectangleF.Union(nodes[left].Bounds, nodes[right].Bounds),
+                            Left = left,
+                            Right = right,
+                        };
+                    }
+                    else
+                    {
+                        nodes[currentNodeIndex] = new BBHNode
+                        {
+                            Bounds = nodes[left].Bounds,
+                            Left = left,
+                        };
+                    }
+
+                    currentNodeIndex--;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Whether any segment of a current path contains a given point.
+        /// </summary>
+        /// <param name="localPos">A point in local coordinates.</param>
+        public bool Contains(Vector2 localPos) => segmentCount > 0 && nodes != null && contains(localPos + VertexBounds.TopLeft, 0);
+
+        private bool contains(Vector2 position, int? index)
+        {
+            if (!index.HasValue)
+                return false;
+
+            BBHNode node = nodes![index.Value];
+
+            if (!node.Bounds.Contains(position))
+                return false;
+
+            if (node.IsLeaf)
+                return node.Segment!.Value.DistanceSquaredToPoint(position) < radius * radius;
+
+            return contains(position, node.Left) || contains(position, node.Right);
+        }
+
+        public void CollectBoundingBoxes(List<RectangleF> boxes)
+        {
+            boxes.Clear();
+
+            if (segmentCount == 0 || nodes?.Length == 0)
+                return;
+
+            collectBoundingBoxes(0, boxes);
+        }
+
+        private void collectBoundingBoxes(int? index, List<RectangleF> boxes)
+        {
+            if (!index.HasValue)
+                return;
+
+            BBHNode node = nodes![index.Value];
+
+            boxes.Add(new RectangleF(node.Bounds.TopLeft - VertexBounds.TopLeft, node.Bounds.Size));
+
+            if (node.IsLeaf)
+                return;
+
+            collectBoundingBoxes(node.Left, boxes);
+            collectBoundingBoxes(node.Right, boxes);
+        }
+
+        private static RectangleF lineAABB(Line line, float radius)
+        {
+            float minX = Math.Min(line.StartPoint.X, line.EndPoint.X);
+            float minY = Math.Min(line.StartPoint.Y, line.EndPoint.Y);
+            float maxX = line.StartPoint.X + line.EndPoint.X - minX;
+            float maxY = line.StartPoint.Y + line.EndPoint.Y - minY;
+            return new RectangleF(minX - radius, minY - radius, maxX - minX + radius * 2, maxY - minY + radius * 2);
+        }
+
+        private bool isDisposed;
+
+        public void Dispose()
+        {
+            if (isDisposed)
+                return;
+
+            isDisposed = true;
+
+            if (nodes != null)
+                ArrayPool<BBHNode>.Shared.Return(nodes);
+        }
+
+        private readonly struct BBHNode
+        {
+            /// <summary>
+            /// Index of a left child of this <see cref="BBHNode"/> in the tree array.
+            /// </summary>
+            public int Left { get; init; }
+
+            /// <summary>
+            /// Index of a right child of this <see cref="BBHNode"/> in the tree array. Null if no right child exists.
+            /// </summary>
+            public int? Right { get; init; }
+
+            /// <summary>
+            /// Whether this <see cref="BBHNode"/> contains a path segment.
+            /// </summary>
+            public bool IsLeaf => Segment.HasValue;
+
+            /// <summary>
+            /// The line which represents a path segment in case when this <see cref="BBHNode"/> is marked as a <see cref="IsLeaf"/>.
+            /// </summary>
+            public Line? Segment { get; init; }
+
+            /// <summary>
+            /// If <see cref="IsLeaf"/> - bounding box of the <see cref="Segment"/>.
+            /// Otherwise - combined bounding box of <see cref="Left"/> and <see cref="Right"/> nodes.
+            /// </summary>
+            public required RectangleF Bounds { get; init; }
+        }
+    }
+}

From 84c1a721208babb13221b5770525f6f49fdbc7ad Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 17:03:01 +0000
Subject: [PATCH 06/16] =?UTF-8?q?feat:=20PR#5551=20additive=20blend=20with?=
 =?UTF-8?q?out=20GPU=20state=20change=20(no-flush=20additive=E2=86=94mixtu?=
 =?UTF-8?q?re)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/434e7381-a46c-433a-976b-5dad4011309e

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 .../Color4Extensions/Color4Extensions.cs      |  9 ++++
 osu.Framework/Graphics/BlendingParameters.cs  | 44 +++++++++++++++----
 .../Graphics/Rendering/GlobalUniformData.cs   |  1 +
 osu.Framework/Graphics/Rendering/IRenderer.cs | 12 +++++
 osu.Framework/Graphics/Rendering/Renderer.cs  | 21 +++++++--
 .../Graphics/Rendering/RendererExtensions.cs  | 36 ++++++++++-----
 .../Shaders/Internal/sh_GlobalUniforms.h      |  4 ++
 .../Resources/Shaders/sh_CircularBlob.fs      |  2 +-
 .../Resources/Shaders/sh_CircularProgress.fs  |  2 +-
 osu.Framework/Resources/Shaders/sh_Masking.h  | 26 ++++++-----
 osu.Framework/Resources/Shaders/sh_Utils.h    | 20 +++++----
 11 files changed, 132 insertions(+), 45 deletions(-)

diff --git a/osu.Framework/Extensions/Color4Extensions/Color4Extensions.cs b/osu.Framework/Extensions/Color4Extensions/Color4Extensions.cs
index 11e108f8d3..42d1bf6a61 100644
--- a/osu.Framework/Extensions/Color4Extensions/Color4Extensions.cs
+++ b/osu.Framework/Extensions/Color4Extensions/Color4Extensions.cs
@@ -98,6 +98,15 @@ public static Color4 Multiply(Color4 first, Color4 second)
                 first.A * second.A);
         }
 
+        /// <summary>
+        /// Returns a version of the color with negated components depending on arguments.
+        /// Used for the shader-level additive blend mode.
+        /// </summary>
+        /// <param name="colour">Original colour</param>
+        /// <param name="negateAlpha">Negates alpha if true</param>
+        public static Color4 NegateAlphaIfTrue(this Color4 colour, bool negateAlpha) =>
+            new Color4(colour.R, colour.G, colour.B, negateAlpha ? -colour.A : colour.A);
+
         /// <summary>
         /// Returns a lightened version of the colour.
         /// </summary>
diff --git a/osu.Framework/Graphics/BlendingParameters.cs b/osu.Framework/Graphics/BlendingParameters.cs
index 4cc7bd4edd..78e9d23ab2 100644
--- a/osu.Framework/Graphics/BlendingParameters.cs
+++ b/osu.Framework/Graphics/BlendingParameters.cs
@@ -26,6 +26,14 @@ public struct BlendingParameters : IEquatable<BlendingParameters>
         /// </summary>
         public BlendingType Destination;
 
+        /// <summary>
+        /// Whether or not blending is additive. If true, the destination color will act as if using
+        /// <see cref="BlendingType.One"/> rather than <see cref="BlendingType.OneMinusSrcAlpha"/>,
+        /// but this is accomplished at the shader level rather than via the rendering backend's
+        /// blend function for performance reasons.
+        /// </summary>
+        public bool DestinationAdditive;
+
         /// <summary>
         /// The blending factor for the source alpha of the blend.
         /// </summary>
@@ -54,6 +62,7 @@ public struct BlendingParameters : IEquatable<BlendingParameters>
         {
             Source = BlendingType.One,
             Destination = BlendingType.Zero,
+            DestinationAdditive = false,
             SourceAlpha = BlendingType.One,
             DestinationAlpha = BlendingType.Zero,
             RGBEquation = BlendingEquation.Add,
@@ -64,6 +73,7 @@ public struct BlendingParameters : IEquatable<BlendingParameters>
         {
             Source = BlendingType.Inherit,
             Destination = BlendingType.Inherit,
+            DestinationAdditive = false,
             SourceAlpha = BlendingType.Inherit,
             DestinationAlpha = BlendingType.Inherit,
             RGBEquation = BlendingEquation.Inherit,
@@ -72,20 +82,22 @@ public struct BlendingParameters : IEquatable<BlendingParameters>
 
         public static BlendingParameters Mixture => new BlendingParameters
         {
-            Source = BlendingType.SrcAlpha,
+            Source = BlendingType.One,
             Destination = BlendingType.OneMinusSrcAlpha,
+            DestinationAdditive = false,
             SourceAlpha = BlendingType.One,
-            DestinationAlpha = BlendingType.One,
+            DestinationAlpha = BlendingType.OneMinusSrcAlpha,
             RGBEquation = BlendingEquation.Add,
             AlphaEquation = BlendingEquation.Add,
         };
 
         public static BlendingParameters Additive => new BlendingParameters
         {
-            Source = BlendingType.SrcAlpha,
-            Destination = BlendingType.One,
+            Source = BlendingType.One,
+            Destination = BlendingType.OneMinusSrcAlpha,
+            DestinationAdditive = true,
             SourceAlpha = BlendingType.One,
-            DestinationAlpha = BlendingType.One,
+            DestinationAlpha = BlendingType.OneMinusSrcAlpha,
             RGBEquation = BlendingEquation.Add,
             AlphaEquation = BlendingEquation.Add,
         };
@@ -102,7 +114,10 @@ public void CopyFromParent(BlendingParameters parent)
                 Source = parent.Source;
 
             if (Destination == BlendingType.Inherit)
+            {
                 Destination = parent.Destination;
+                DestinationAdditive = parent.DestinationAdditive;
+            }
 
             if (SourceAlpha == BlendingType.Inherit)
                 SourceAlpha = parent.SourceAlpha;
@@ -123,16 +138,19 @@ public void CopyFromParent(BlendingParameters parent)
         public void ApplyDefaultToInherited()
         {
             if (Source == BlendingType.Inherit)
-                Source = BlendingType.SrcAlpha;
+                Source = BlendingType.One;
 
             if (Destination == BlendingType.Inherit)
+            {
                 Destination = BlendingType.OneMinusSrcAlpha;
+                DestinationAdditive = false;
+            }
 
             if (SourceAlpha == BlendingType.Inherit)
                 SourceAlpha = BlendingType.One;
 
             if (DestinationAlpha == BlendingType.Inherit)
-                DestinationAlpha = BlendingType.One;
+                DestinationAlpha = BlendingType.OneMinusSrcAlpha;
 
             if (RGBEquation == BlendingEquation.Inherit)
                 RGBEquation = BlendingEquation.Add;
@@ -141,9 +159,18 @@ public void ApplyDefaultToInherited()
                 AlphaEquation = BlendingEquation.Add;
         }
 
+        public readonly bool EqualsExceptForAdditive(BlendingParameters other) =>
+            other.Source == Source
+            && other.Destination == Destination
+            && other.SourceAlpha == SourceAlpha
+            && other.DestinationAlpha == DestinationAlpha
+            && other.RGBEquation == RGBEquation
+            && other.AlphaEquation == AlphaEquation;
+
         public readonly bool Equals(BlendingParameters other) =>
             other.Source == Source
             && other.Destination == Destination
+            && other.DestinationAdditive == DestinationAdditive
             && other.SourceAlpha == SourceAlpha
             && other.DestinationAlpha == DestinationAlpha
             && other.RGBEquation == RGBEquation
@@ -152,6 +179,7 @@ public readonly bool Equals(BlendingParameters other) =>
         public static bool operator ==(in BlendingParameters left, in BlendingParameters right) =>
             left.Source == right.Source &&
             left.Destination == right.Destination &&
+            left.DestinationAdditive == right.DestinationAdditive &&
             left.SourceAlpha == right.SourceAlpha &&
             left.DestinationAlpha == right.DestinationAlpha &&
             left.RGBEquation == right.RGBEquation &&
@@ -162,7 +190,7 @@ public readonly bool Equals(BlendingParameters other) =>
         public override readonly bool Equals(object obj) => obj is BlendingParameters other && this == other;
 
         [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
-        public override readonly int GetHashCode() => HashCode.Combine(Source, Destination, SourceAlpha, DestinationAlpha, RGBEquation, AlphaEquation);
+        public override readonly int GetHashCode() => HashCode.Combine(Source, Destination, DestinationAdditive, SourceAlpha, DestinationAlpha, RGBEquation, AlphaEquation);
 
         public readonly bool IsDisabled =>
             Source == BlendingType.One
diff --git a/osu.Framework/Graphics/Rendering/GlobalUniformData.cs b/osu.Framework/Graphics/Rendering/GlobalUniformData.cs
index 51ba8b7e13..dadc949e10 100644
--- a/osu.Framework/Graphics/Rendering/GlobalUniformData.cs
+++ b/osu.Framework/Graphics/Rendering/GlobalUniformData.cs
@@ -34,5 +34,6 @@ public record struct GlobalUniformData
         public UniformFloat InnerCornerRadius;
         public UniformInt WrapModeS;
         public UniformInt WrapModeT;
+        public UniformBool TextureHasPremultipliedAlpha;
     }
 }
diff --git a/osu.Framework/Graphics/Rendering/IRenderer.cs b/osu.Framework/Graphics/Rendering/IRenderer.cs
index 09e883cb3c..d22b847e7d 100644
--- a/osu.Framework/Graphics/Rendering/IRenderer.cs
+++ b/osu.Framework/Graphics/Rendering/IRenderer.cs
@@ -128,6 +128,11 @@ public interface IRenderer
         /// </summary>
         StencilInfo CurrentStencilInfo { get; }
 
+        /// <summary>
+        /// The current blending parameters.
+        /// </summary>
+        BlendingParameters CurrentBlendingParameters { get; }
+
         /// <summary>
         /// The current horizontal texture wrap mode.
         /// </summary>
@@ -254,6 +259,13 @@ public interface IRenderer
         /// <param name="blendingMask">The blending mask.</param>
         void SetBlendMask(BlendingMask blendingMask);
 
+        /// <summary>
+        /// Sets whether the currently bound texture has premultiplied alpha.
+        /// When true, the shader will unmultiply it before processing and premultiply the output.
+        /// </summary>
+        /// <param name="isPremultiplied">Whether the texture has premultiplied alpha.</param>
+        void SetTextureIsPremultiplied(bool isPremultiplied);
+
         /// <summary>
         /// Applies a new viewport rectangle.
         /// </summary>
diff --git a/osu.Framework/Graphics/Rendering/Renderer.cs b/osu.Framework/Graphics/Rendering/Renderer.cs
index 4e70630c2e..a3ed833a01 100644
--- a/osu.Framework/Graphics/Rendering/Renderer.cs
+++ b/osu.Framework/Graphics/Rendering/Renderer.cs
@@ -113,6 +113,7 @@ protected internal Storage? CacheStorage
         protected ClearInfo CurrentClearInfo { get; private set; }
         public BlendingParameters CurrentBlendingParameters { get; private set; }
         protected BlendingMask CurrentBlendingMask { get; private set; }
+        private bool currentTextureIsPremultiplied;
 
         /// <summary>
         /// Whether scissor is currently enabled.
@@ -480,13 +481,14 @@ public void Clear(ClearInfo clearInfo)
 
         public void SetBlend(BlendingParameters blendingParameters)
         {
-            if (CurrentBlendingParameters == blendingParameters)
+            BlendingParameters oldBlendingParameters = CurrentBlendingParameters;
+            CurrentBlendingParameters = blendingParameters;
+
+            if (CurrentBlendingParameters.EqualsExceptForAdditive(oldBlendingParameters))
                 return;
 
             FlushCurrentBatch(FlushBatchSource.SetBlend);
             SetBlendImplementation(blendingParameters);
-
-            CurrentBlendingParameters = blendingParameters;
         }
 
         public void SetBlendMask(BlendingMask blendingMask)
@@ -512,6 +514,16 @@ public void SetBlendMask(BlendingMask blendingMask)
         /// <param name="blendingMask">The blending mask.</param>
         protected abstract void SetBlendMaskImplementation(BlendingMask blendingMask);
 
+        public void SetTextureIsPremultiplied(bool isPremultiplied)
+        {
+            if (currentTextureIsPremultiplied == isPremultiplied)
+                return;
+
+            FlushCurrentBatch(FlushBatchSource.BindTexture);
+            currentTextureIsPremultiplied = isPremultiplied;
+            globalUniformsChanged = true;
+        }
+
         #endregion
 
         #region Viewport
@@ -1112,7 +1124,8 @@ public void DrawVertices(PrimitiveTopology topology, int vertexStart, int vertic
                         ? currentMaskingInfo.HollowCornerRadius
                         : globalUniformBuffer.Data.InnerCornerRadius,
                     WrapModeS = (int)CurrentWrapModeS,
-                    WrapModeT = (int)CurrentWrapModeT
+                    WrapModeT = (int)CurrentWrapModeT,
+                    TextureHasPremultipliedAlpha = currentTextureIsPremultiplied
                 };
 
                 globalUniformsChanged = false;
diff --git a/osu.Framework/Graphics/Rendering/RendererExtensions.cs b/osu.Framework/Graphics/Rendering/RendererExtensions.cs
index 848db8f702..abb12631ec 100644
--- a/osu.Framework/Graphics/Rendering/RendererExtensions.cs
+++ b/osu.Framework/Graphics/Rendering/RendererExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.OpenGL.Buffers;
 using osu.Framework.Graphics.Primitives;
@@ -27,14 +28,17 @@ public static class RendererExtensions
         /// <param name="vertexAction">An action that adds vertices to a <see cref="IVertexBatch{T}"/>.</param>
         /// <param name="inflationPercentage">The percentage amount that <paramref name="textureRect"/> should be inflated.</param>
         /// <param name="textureCoords">The texture coordinates of the triangle's vertices (translated from the corresponding quad's rectangle).</param>
+        /// <param name="premultipliedAlpha">Whether the texture has premultiplied alpha or not.</param>
         public static void DrawTriangle(this IRenderer renderer, Texture texture, Triangle vertexTriangle, ColourInfo drawColour, RectangleF? textureRect = null,
-                                        Action<TexturedVertex2D>? vertexAction = null, Vector2? inflationPercentage = null, RectangleF? textureCoords = null)
+                                        Action<TexturedVertex2D>? vertexAction = null, Vector2? inflationPercentage = null, RectangleF? textureCoords = null, bool premultipliedAlpha = false)
         {
             ObjectDisposedException.ThrowIf(!texture.Available, texture);
 
             if (!renderer.BindTexture(texture))
                 return;
 
+            renderer.SetTextureIsPremultiplied(premultipliedAlpha);
+
             RectangleF texRect = texture.GetTextureRect(textureRect);
             Vector2 inflationAmount = inflationPercentage.HasValue ? new Vector2(inflationPercentage.Value.X * texRect.Width, inflationPercentage.Value.Y * texRect.Height) : Vector2.Zero;
 
@@ -64,13 +68,15 @@ public static void DrawTriangle(this IRenderer renderer, Texture texture, Triang
             SRGBColour topColour = (drawColour.TopLeft + drawColour.TopRight) / 2;
             SRGBColour bottomColour = (drawColour.BottomLeft + drawColour.BottomRight) / 2;
 
+            bool additive = renderer.CurrentBlendingParameters.DestinationAdditive;
+
             vertexAction(new TexturedVertex2D(renderer)
             {
                 Position = vertexTriangle.P0,
                 TexturePosition = new Vector2((inflatedCoordRect.Left + inflatedCoordRect.Right) / 2, inflatedCoordRect.Top),
                 TextureRect = new Vector4(texRect.Left, texRect.Top, texRect.Right, texRect.Bottom),
                 BlendRange = inflationAmount,
-                Colour = topColour.SRGB,
+                Colour = topColour.SRGB.NegateAlphaIfTrue(additive),
             });
             vertexAction(new TexturedVertex2D(renderer)
             {
@@ -78,7 +84,7 @@ public static void DrawTriangle(this IRenderer renderer, Texture texture, Triang
                 TexturePosition = new Vector2(inflatedCoordRect.Left, inflatedCoordRect.Bottom),
                 TextureRect = new Vector4(texRect.Left, texRect.Top, texRect.Right, texRect.Bottom),
                 BlendRange = inflationAmount,
-                Colour = drawColour.BottomLeft.SRGB,
+                Colour = drawColour.BottomLeft.SRGB.NegateAlphaIfTrue(additive),
             });
             vertexAction(new TexturedVertex2D(renderer)
             {
@@ -86,7 +92,7 @@ public static void DrawTriangle(this IRenderer renderer, Texture texture, Triang
                 TexturePosition = new Vector2((inflatedCoordRect.Left + inflatedCoordRect.Right) / 2, inflatedCoordRect.Bottom),
                 TextureRect = new Vector4(texRect.Left, texRect.Top, texRect.Right, texRect.Bottom),
                 BlendRange = inflationAmount,
-                Colour = bottomColour.SRGB,
+                Colour = bottomColour.SRGB.NegateAlphaIfTrue(additive),
             });
             vertexAction(new TexturedVertex2D(renderer)
             {
@@ -94,7 +100,7 @@ public static void DrawTriangle(this IRenderer renderer, Texture texture, Triang
                 TexturePosition = new Vector2(inflatedCoordRect.Right, inflatedCoordRect.Bottom),
                 TextureRect = new Vector4(texRect.Left, texRect.Top, texRect.Right, texRect.Bottom),
                 BlendRange = inflationAmount,
-                Colour = drawColour.BottomRight.SRGB,
+                Colour = drawColour.BottomRight.SRGB.NegateAlphaIfTrue(additive),
             });
 
             long area = (long)vertexTriangle.Area;
@@ -117,14 +123,17 @@ public static void DrawTriangle(this IRenderer renderer, Texture texture, Triang
         /// <param name="inflationPercentage">The percentage amount that <paramref name="textureRect"/> should be inflated.</param>
         /// <param name="blendRangeOverride">The range over which the edges of the <paramref name="textureRect"/> should be blended.</param>
         /// <param name="textureCoords">The texture coordinates of the quad's vertices.</param>
+        /// <param name="premultipliedAlpha">Whether the texture has premultiplied alpha or not.</param>
         public static void DrawQuad(this IRenderer renderer, Texture texture, Quad vertexQuad, ColourInfo drawColour, RectangleF? textureRect = null, Action<TexturedVertex2D>? vertexAction = null,
-                                    Vector2? inflationPercentage = null, Vector2? blendRangeOverride = null, RectangleF? textureCoords = null)
+                                    Vector2? inflationPercentage = null, Vector2? blendRangeOverride = null, RectangleF? textureCoords = null, bool premultipliedAlpha = false)
         {
             ObjectDisposedException.ThrowIf(!texture.Available, texture);
 
             if (!renderer.BindTexture(texture))
                 return;
 
+            renderer.SetTextureIsPremultiplied(premultipliedAlpha);
+
             RectangleF texRect = texture.GetTextureRect(textureRect);
             Vector2 inflationAmount = inflationPercentage.HasValue ? new Vector2(inflationPercentage.Value.X * texRect.Width, inflationPercentage.Value.Y * texRect.Height) : Vector2.Zero;
 
@@ -148,13 +157,15 @@ public static void DrawQuad(this IRenderer renderer, Texture texture, Quad verte
 
             vertexAction ??= renderer.DefaultQuadBatch.AddAction;
 
+            bool additive = renderer.CurrentBlendingParameters.DestinationAdditive;
+
             vertexAction(new TexturedVertex2D(renderer)
             {
                 Position = vertexQuad.BottomLeft,
                 TexturePosition = new Vector2(inflatedCoordRect.Left, inflatedCoordRect.Bottom),
                 TextureRect = new Vector4(texRect.Left, texRect.Top, texRect.Right, texRect.Bottom),
                 BlendRange = blendRange,
-                Colour = drawColour.BottomLeft.SRGB,
+                Colour = drawColour.BottomLeft.SRGB.NegateAlphaIfTrue(additive),
             });
             vertexAction(new TexturedVertex2D(renderer)
             {
@@ -162,7 +173,7 @@ public static void DrawQuad(this IRenderer renderer, Texture texture, Quad verte
                 TexturePosition = new Vector2(inflatedCoordRect.Right, inflatedCoordRect.Bottom),
                 TextureRect = new Vector4(texRect.Left, texRect.Top, texRect.Right, texRect.Bottom),
                 BlendRange = blendRange,
-                Colour = drawColour.BottomRight.SRGB,
+                Colour = drawColour.BottomRight.SRGB.NegateAlphaIfTrue(additive),
             });
             vertexAction(new TexturedVertex2D(renderer)
             {
@@ -170,7 +181,7 @@ public static void DrawQuad(this IRenderer renderer, Texture texture, Quad verte
                 TexturePosition = new Vector2(inflatedCoordRect.Right, inflatedCoordRect.Top),
                 TextureRect = new Vector4(texRect.Left, texRect.Top, texRect.Right, texRect.Bottom),
                 BlendRange = blendRange,
-                Colour = drawColour.TopRight.SRGB,
+                Colour = drawColour.TopRight.SRGB.NegateAlphaIfTrue(additive),
             });
             vertexAction(new TexturedVertex2D(renderer)
             {
@@ -178,7 +189,7 @@ public static void DrawQuad(this IRenderer renderer, Texture texture, Quad verte
                 TexturePosition = new Vector2(inflatedCoordRect.Left, inflatedCoordRect.Top),
                 TextureRect = new Vector4(texRect.Left, texRect.Top, texRect.Right, texRect.Bottom),
                 BlendRange = blendRange,
-                Colour = drawColour.TopLeft.SRGB,
+                Colour = drawColour.TopLeft.SRGB.NegateAlphaIfTrue(additive),
             });
 
             long area = (long)vertexQuad.Area;
@@ -225,10 +236,11 @@ public static void DrawClipped<T>(this IRenderer renderer, ref T polygon, Textur
         /// <param name="vertexAction">An action that adds vertices to a <see cref="IVertexBatch{T}"/>.</param>
         /// <param name="inflationPercentage">The percentage amount that the frame buffer area  should be inflated.</param>
         /// <param name="blendRangeOverride">The range over which the edges of the frame buffer should be blended.</param>
+        /// <param name="premultipliedAlpha">Whether the framebuffer's RGB values have premultiplied alpha. Usually true due to the way shaders work in this codebase.</param>
         public static void DrawFrameBuffer(this IRenderer renderer, IFrameBuffer frameBuffer, Quad vertexQuad, ColourInfo drawColour, Action<TexturedVertex2D>? vertexAction = null,
-                                           Vector2? inflationPercentage = null, Vector2? blendRangeOverride = null)
+                                           Vector2? inflationPercentage = null, Vector2? blendRangeOverride = null, bool premultipliedAlpha = true)
         {
-            renderer.DrawQuad(frameBuffer.Texture, vertexQuad, drawColour, null, vertexAction, inflationPercentage, blendRangeOverride);
+            renderer.DrawQuad(frameBuffer.Texture, vertexQuad, drawColour, null, vertexAction, inflationPercentage, blendRangeOverride, null, premultipliedAlpha);
         }
 
         /// <summary>
diff --git a/osu.Framework/Resources/Shaders/Internal/sh_GlobalUniforms.h b/osu.Framework/Resources/Shaders/Internal/sh_GlobalUniforms.h
index 514c2dcb88..b92d17ce19 100644
--- a/osu.Framework/Resources/Shaders/Internal/sh_GlobalUniforms.h
+++ b/osu.Framework/Resources/Shaders/Internal/sh_GlobalUniforms.h
@@ -39,6 +39,10 @@ layout(std140, set = -1, binding = 0) uniform g_GlobalUniforms
     // 3 -> Repeat
     int g_WrapModeS;
     int g_WrapModeT;
+
+    // Whether the currently bound texture has premultiplied alpha.
+    // When true, the shader will unmultiply it before processing, then premultiply the output.
+    bool g_TextureHasPremultipliedAlpha;
 };
 
 #endif
\ No newline at end of file
diff --git a/osu.Framework/Resources/Shaders/sh_CircularBlob.fs b/osu.Framework/Resources/Shaders/sh_CircularBlob.fs
index fa5f027085..5c09fd614f 100644
--- a/osu.Framework/Resources/Shaders/sh_CircularBlob.fs
+++ b/osu.Framework/Resources/Shaders/sh_CircularBlob.fs
@@ -33,7 +33,7 @@ void main(void)
     highp vec2 wrappedCoord = wrap(v_TexCoord, v_TexRect);
     lowp vec4 textureColour = getRoundedColor(wrappedSampler(wrappedCoord, v_TexRect, m_Texture, m_Sampler, -0.9), wrappedCoord);
 
-    o_Colour = vec4(textureColour.rgb, textureColour.a * blobAlphaAt(pixelPos, innerRadius, texelSize, frequency, amplitude, noisePosition));
+    o_Colour = textureColour * blobAlphaAt(pixelPos, innerRadius, texelSize, frequency, amplitude, noisePosition);
 }
 
 #endif
\ No newline at end of file
diff --git a/osu.Framework/Resources/Shaders/sh_CircularProgress.fs b/osu.Framework/Resources/Shaders/sh_CircularProgress.fs
index 7cf8fe57d9..6ddec55a56 100644
--- a/osu.Framework/Resources/Shaders/sh_CircularProgress.fs
+++ b/osu.Framework/Resources/Shaders/sh_CircularProgress.fs
@@ -32,7 +32,7 @@ void main(void)
     highp vec2 wrappedCoord = wrap(v_TexCoord, v_TexRect);
     lowp vec4 textureColour = getRoundedColor(wrappedSampler(wrappedCoord, v_TexRect, m_Texture, m_Sampler, -0.9), wrappedCoord);
 
-    o_Colour = vec4(textureColour.rgb, textureColour.a * progressAlphaAt(pixelPos, progress, innerRadius, roundedCaps, texelSize));
+    o_Colour = textureColour * progressAlphaAt(pixelPos, progress, innerRadius, roundedCaps, texelSize);
 }
 
 #endif
\ No newline at end of file
diff --git a/osu.Framework/Resources/Shaders/sh_Masking.h b/osu.Framework/Resources/Shaders/sh_Masking.h
index 3fdc6c8846..51945bdff8 100644
--- a/osu.Framework/Resources/Shaders/sh_Masking.h
+++ b/osu.Framework/Resources/Shaders/sh_Masking.h
@@ -63,11 +63,20 @@ lowp vec4 getBorderColour()
 
 lowp vec4 getRoundedColor(lowp vec4 texel, mediump vec2 texCoord)
 {
-	if (!g_IsMasking && v_BlendRange == vec2(0.0))
+	// The rest of the shader assumes non-premultiplied alpha for the texel.
+	// Unmultiply if the texture already has premultiplied alpha (e.g. a framebuffer).
+	if (g_TextureHasPremultipliedAlpha)
 	{
-		return v_Colour * texel;
+		texel.a = max(texel.a, 1.0 / 1024.0);
+		texel.rgb /= texel.a;
 	}
 
+	bool isEmissive = v_Colour.a < 0.0;
+	vec4 colour = abs(v_Colour);
+
+	if (!g_IsMasking && v_BlendRange == vec2(0.0))
+		return toEmissive(toPremultipliedAlpha(colour * texel), isEmissive);
+
 	highp float dist = distanceFromRoundedRect(vec2(0.0), g_CornerRadius);
 	lowp float alphaFactor = 1.0;
 
@@ -98,14 +107,10 @@ lowp vec4 getRoundedColor(lowp vec4 texel, mediump vec2 texCoord)
 	alphaFactor *= min(fadeStart - dist, 1.0);
 
 	if (v_BlendRange.x > 0.0 || v_BlendRange.y > 0.0)
-	{
 		alphaFactor *= clamp(1.0 - distanceFromDrawingRect(texCoord), 0.0, 1.0);
-	}
 
 	if (alphaFactor <= 0.0)
-	{
 		return vec4(0.0);
-	}
 
 	// This ends up softening glow without negatively affecting edge smoothness much.
 	alphaFactor = pow(alphaFactor, g_AlphaExponent);
@@ -113,19 +118,20 @@ lowp vec4 getRoundedColor(lowp vec4 texel, mediump vec2 texCoord)
 	highp float borderStart = 1.0 + fadeStart - g_BorderThickness;
 	lowp float colourWeight = min(borderStart - dist, 1.0);
 
-	lowp vec4 contentColour = v_Colour * texel;
+	lowp vec4 contentColour = colour * texel;
 
 	if (colourWeight == 1.0)
-		return vec4(contentColour.rgb, contentColour.a * alphaFactor);
+		return toEmissive(toPremultipliedAlpha(vec4(contentColour.rgb, contentColour.a * alphaFactor)), isEmissive);
 
 	lowp vec4 borderColour = getBorderColour();
 
 	if (colourWeight <= 0.0)
-		return vec4(borderColour.rgb, borderColour.a * alphaFactor);
+		return toEmissive(toPremultipliedAlpha(vec4(borderColour.rgb, borderColour.a * alphaFactor)), isEmissive);
 
 	contentColour.a *= alphaFactor;
 	borderColour.a *= 1.0 - colourWeight;
-	return blend(borderColour, contentColour);
+
+	return toEmissive(blend(toPremultipliedAlpha(borderColour), toPremultipliedAlpha(contentColour)), isEmissive);
 }
 
 #endif
\ No newline at end of file
diff --git a/osu.Framework/Resources/Shaders/sh_Utils.h b/osu.Framework/Resources/Shaders/sh_Utils.h
index 6e2e010c25..15d486b945 100644
--- a/osu.Framework/Resources/Shaders/sh_Utils.h
+++ b/osu.Framework/Resources/Shaders/sh_Utils.h
@@ -4,19 +4,21 @@
 #undef GAMMA
 #define GAMMA 2.4
 
-// perform alpha compositing of two colour components.
-// see http://apoorvaj.io/alpha-compositing-opengl-blending-and-premultiplied-alpha.html
+// Perform alpha compositing of two colour components. Assumed both are premultiplied.
 lowp vec4 blend(lowp vec4 src, lowp vec4 dst)
 {
-    lowp float finalAlpha = src.a + dst.a * (1.0 - src.a);
+    return src + dst * (1.0 - src.a);
+}
 
-    if (finalAlpha == 0.0)
-        return vec4(0);
+lowp vec4 toPremultipliedAlpha(lowp vec4 colour)
+{
+    return vec4(colour.rgb * colour.a, colour.a);
+}
 
-    return vec4(
-        (src.rgb * src.a + dst.rgb * dst.a * (1.0 - src.a)) / finalAlpha,
-        finalAlpha
-    );
+// For additive blending: sets alpha to 0 so GPU destination factor becomes 1 (additive).
+lowp vec4 toEmissive(lowp vec4 colour, bool isEmissive)
+{
+    return vec4(colour.rgb, isEmissive ? 0.0 : colour.a);
 }
 
 // http://lolengine.net/blog/2013/07/27/rgb-to-hsv-in-glsl

From 96be553d831b88ab3ad76bee3f82f81f9636d812 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 17:29:48 +0000
Subject: [PATCH 07/16] Replace osuTK.Vector2/3/4 with
 System.Numerics.Vector2/3/4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Migrate ~400 files from osuTK.Vector2/3/4 to System.Numerics equivalents
- Add Vector3/Vector4 bridge methods to BridgingExtensions
- Update Vector2Extensions to use System.Numerics.Vector2; add Normalized(),
  PerpDot(), NormalizeFast(), PerpendicularRight(), PerpendicularLeft()
- Add QuaternionExtensions for osuTK↔System.Numerics Quaternion bridging
- Fix UniformMatrix3/4 to bridge osuTK.Vector3/4 ↔ UniformVector3/4
- Fix GLRenderer to convert System.Numerics vectors before passing to GL uniforms
- Fix MatrixExtensions local Vector3 variables (use var to avoid alias conflict)
- Fix various .Length → .Length() and .LengthSquared → .LengthSquared() calls
- Preserve osuTK types: Matrix2/3/4, Quaternion, Color4, DisplayIndex, etc.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 fix_length.py                                 |  83 +++++++
 migrate_numerics.py                           | 235 ++++++++++++++++++
 .../Containers/TestSceneContainerState.cs     |   2 +-
 .../Exceptions/TestLoadExceptions.cs          |   2 +-
 .../Input/JoystickInputTest.cs                |   2 +-
 .../Input/KeyBindingInputTest.cs              |   2 +-
 .../Input/KeyboardInputTest.cs                |   2 +-
 osu.Framework.Tests/Input/MouseInputTest.cs   |   2 +-
 osu.Framework.Tests/Input/TouchInputTest.cs   |   2 +-
 .../Layout/TestSceneContainerLayout.cs        |   2 +-
 .../Layout/TestSceneDrawableLayout.cs         |   2 +-
 .../Layout/TestSceneGridContainerLayout.cs    |   2 +-
 .../Layout/TestSceneSpriteLayout.cs           |   2 +-
 .../MathUtils/TestInterpolation.cs            |   4 +-
 .../MathUtils/TestPathApproximator.cs         |   4 +-
 .../ConvexPolygonClipperFuzzingTest.cs        |   4 +-
 .../Polygons/ConvexPolygonClippingTest.cs     |   2 +-
 .../Polygons/LineIntersections.cs             |   4 +-
 osu.Framework.Tests/Primitives/QuadTest.cs    |   3 +-
 .../Primitives/TriangleTest.cs                |   4 +-
 .../Primitives/Vector2ExtensionsTest.cs       |   4 +-
 osu.Framework.Tests/Text/TextBuilderTest.cs   |   2 +-
 .../Visual/Audio/TestSceneAudioMixer.cs       |   4 +-
 .../Visual/Audio/TestSceneSamples.cs          |   2 +-
 .../Visual/Audio/TestSceneTrackAdjustments.cs |   4 +-
 .../TestSceneBindableAutoUnbinding.cs         |   2 +-
 .../Visual/Clocks/TestSceneClock.cs           |   2 +-
 .../Containers/TestSceneBufferedContainer.cs  |   4 +-
 .../TestSceneBufferedContainerClipping.cs     |   2 +-
 .../TestSceneCachedBufferedContainer.cs       |   4 +-
 .../Containers/TestSceneCircularContainer.cs  |   4 +-
 .../TestSceneCircularContainerSizing.cs       |   4 +-
 .../Containers/TestSceneCompositeDrawable.cs  |   2 +-
 .../Containers/TestSceneCoordinateSpaces.cs   |   4 +-
 .../Containers/TestSceneCursorContainer.cs    |   2 +-
 .../TestSceneCustomizableTextContainer.cs     |   2 +-
 ...estSceneDrawSizePreservingFillContainer.cs |   2 +-
 .../Containers/TestSceneDynamicDepth.cs       |   4 +-
 .../Visual/Containers/TestSceneFrontToBack.cs |   2 +-
 .../Containers/TestSceneFrontToBackBox.cs     |   2 +-
 .../TestSceneFrontToBackBufferedContainer.cs  |   4 +-
 .../TestSceneFrontToBackTriangle.cs           |   4 +-
 .../Visual/Containers/TestSceneMasking.cs     |   4 +-
 .../Visual/Containers/TestScenePadding.cs     |   4 +-
 .../Containers/TestSceneSafeAreaContainer.cs  |   4 +-
 .../Containers/TestSceneSafeAreaOverrides.cs  |   4 +-
 .../Containers/TestSceneScrollContainer.cs    |   2 +-
 ...TestSceneScrollContainerDoublePrecision.cs |   2 +-
 .../TestSceneScrollContainerNested.cs         |   2 +-
 .../Visual/Containers/TestSceneSizing.cs      |   4 +-
 .../Containers/TestSceneTextFlowContainer.cs  |   2 +-
 .../TestSceneVisibilityContainer.cs           |   2 +-
 .../Visual/Drawables/TestSceneAutoSize.cs     |   2 +-
 .../Visual/Drawables/TestSceneBlending.cs     |   2 +-
 .../Visual/Drawables/TestSceneBorderColour.cs |   2 +-
 .../Drawables/TestSceneBorderSmoothing.cs     |   4 +-
 .../TestSceneCircularArcBoundingBox.cs        |   1 +
 .../Drawables/TestSceneColourGradient.cs      |   4 +-
 .../TestSceneColourInfoInterpolation.cs       |   4 +-
 .../Drawables/TestSceneComplexBlending.cs     |   4 +-
 .../Drawables/TestSceneConcurrentLoad.cs      |   2 +-
 .../Drawables/TestSceneCubicBezierEasing.cs   |   3 +-
 .../Drawables/TestSceneCustomEasingCurve.cs   |   2 +-
 .../TestSceneDelayedLoadUnloadWrapper.cs      |   2 +-
 .../Drawables/TestSceneDelayedLoadWrapper.cs  |   2 +-
 .../Drawables/TestSceneDrawNodeDisposal.cs    |   2 +-
 .../TestSceneDrawableLoadCancellation.cs      |   2 +-
 .../Visual/Drawables/TestSceneDrawablePool.cs |   2 +-
 .../Drawables/TestSceneDrawableScale.cs       |   2 +-
 .../Visual/Drawables/TestSceneEasingCurves.cs |   2 +-
 .../Visual/Drawables/TestSceneEffects.cs      |   4 +-
 .../Visual/Drawables/TestSceneFastCircle.cs   |   2 +-
 .../Visual/Drawables/TestSceneFillModes.cs    |   4 +-
 .../Visual/Drawables/TestSceneFocus.cs        |   4 +-
 .../Drawables/TestSceneGammaCorrection.cs     |   2 +-
 .../Drawables/TestSceneHollowEdgeEffect.cs    |   4 +-
 .../TestSceneInteractivePathDrawing.cs        |   4 +-
 .../Visual/Drawables/TestSceneIsMaskedAway.cs |   4 +-
 .../Drawables/TestSceneModelBackedDrawable.cs |   4 +-
 ...TestSceneModelBackedDrawableWithLoading.cs |   2 +-
 ...stSceneModelBackedDrawableWithUnloading.cs |   2 +-
 .../Drawables/TestScenePathApproximator.cs    |   4 +-
 .../Drawables/TestScenePathCapAngles.cs       |   3 +-
 .../Drawables/TestScenePathWithZeroLength.cs  |   4 +-
 .../TestScenePiecewiseLinearToBSpline.cs      |   4 +-
 .../Drawables/TestScenePropertyBoundaries.cs  |   4 +-
 .../TestSceneProxyDrawableLifetime.cs         |   2 +-
 .../Drawables/TestSceneProxyDrawables.cs      |   4 +-
 .../Visual/Drawables/TestSceneSpring.cs       |   2 +-
 .../Drawables/TestSceneStressGLDisposal.cs    |   2 +-
 .../TestSceneSynchronizationContext.cs        |   2 +-
 .../Drawables/TestSceneTransformRewinding.cs  |   2 +-
 .../Drawables/TestSceneTransformSequence.cs   |   4 +-
 .../Drawables/TestSceneUpdateBeforeDraw.cs    |   4 +-
 .../Visual/Drawables/TestSceneWaveform.cs     |   1 +
 .../Visual/Graphics/TestSceneColours.cs       |   2 +-
 .../Visual/Graphics/TestSceneScissor.cs       |   2 +-
 .../TestSceneShaderStorageBufferObject.cs     |   2 +-
 .../Visual/Graphics/TestSceneStencil.cs       |   2 +-
 .../TestSceneTexturePremultiplication.cs      |   2 +-
 .../Graphics/TestSceneVertexBatching.cs       |   2 +-
 .../Visual/Input/TestSceneClickLenience.cs    |   4 +-
 .../Visual/Input/TestSceneHandleInput.cs      |   4 +-
 .../Visual/Input/TestSceneInputManager.cs     |   4 +-
 .../Visual/Input/TestSceneInputQueueChange.cs |   4 +-
 .../Visual/Input/TestSceneInputResampler.cs   |   4 +-
 .../Visual/Input/TestSceneJoystick.cs         |   4 +-
 .../Input/TestSceneKeyBindingContainer.cs     |   2 +-
 .../TestSceneKeyBindingInputQueueChange.cs    |   2 +-
 .../Visual/Input/TestSceneKeyBindingsGrid.cs  |   4 +-
 .../Visual/Input/TestSceneMidi.cs             |   4 +-
 .../Visual/Input/TestSceneMouseStates.cs      |   8 +-
 .../Visual/Input/TestSceneNestedHover.cs      |   4 +-
 .../Input/TestScenePassThroughInputManager.cs |   4 +-
 .../Visual/Input/TestScenePathInput.cs        |   4 +-
 .../Input/TestScenePlatformActionContainer.cs |   2 +-
 ...TestSceneReadableKeyCombinationProvider.cs |   4 +-
 .../Visual/Input/TestSceneTabletInput.cs      |   4 +-
 .../Visual/Input/TestSceneTouchInput.cs       |   2 +-
 .../Visual/Input/TestSceneTouchVisualiser.cs  |   6 +-
 .../Layout/TestSceneFillFlowContainer.cs      |   4 +-
 .../Visual/Layout/TestSceneFitInsideFlow.cs   |   2 +-
 .../Visual/Layout/TestSceneGridContainer.cs   |   2 +-
 .../Visual/Layout/TestSceneLayoutDurations.cs |   4 +-
 .../TestSceneLayoutTransformRewinding.cs      |   3 +-
 .../Visual/Layout/TestSceneScrollableFlow.cs  |   4 +-
 .../Visual/Layout/TestSceneTableContainer.cs  |   2 +-
 .../Performance/PerformanceTestScene.cs       |   2 +-
 .../RepeatedDrawablePerformanceTestScene.cs   |   2 +-
 .../TestSceneBlendingPerformance.cs           |   2 +-
 .../TestSceneBufferingPerformance.cs          |   2 +-
 ...stSceneCircularProgressRingsPerformance.cs |   2 +-
 .../Platform/FrameworkConfigVisualiser.cs     |   2 +-
 .../Visual/Platform/TestSceneDisplayMode.cs   |   2 +-
 .../Visual/Platform/TestSceneExternalLinks.cs |   4 +-
 .../Visual/Platform/TestSceneFullscreen.cs    |   4 +-
 .../TestScenePresentFileExternally.cs         |   4 +-
 .../Platform/TestSceneResourceStores.cs       |   2 +-
 .../Visual/Platform/TestSceneWindowed.cs      |   4 +-
 .../Visual/Platform/WindowDisplaysPreview.cs  |   2 +-
 .../Sprites/TestSceneAnimationLayout.cs       |   4 +-
 .../Sprites/TestSceneBufferedContainerView.cs |   4 +-
 .../Sprites/TestSceneLargeTextureStore.cs     |   2 +-
 .../Sprites/TestSceneNineSliceSprite.cs       |   2 +-
 .../Visual/Sprites/TestSceneScreenshot.cs     |   2 +-
 .../Visual/Sprites/TestSceneSmoothedEdges.cs  |   4 +-
 .../Visual/Sprites/TestSceneSpriteIcon.cs     |   4 +-
 .../Sprites/TestSceneSpriteTextScenarios.cs   |   2 +-
 .../Sprites/TestSceneSpriteTextTruncate.cs    |   4 +-
 .../Visual/Sprites/TestSceneTextFlow.cs       |   4 +-
 .../Sprites/TestSceneTextureCropping.cs       |   2 +-
 .../Sprites/TestSceneTexturedTriangle.cs      |   4 +-
 .../Visual/Sprites/TestSceneTriangles.cs      |   4 +-
 .../Visual/Sprites/TestSceneVideo.cs          |   4 +-
 .../Visual/Sprites/TestSceneVideoLayout.cs    |   4 +-
 .../Visual/Sprites/TestSceneWrapModes.cs      |   4 +-
 .../Visual/Testing/TestSceneDrawVisualiser.cs |   4 +-
 .../TestSceneManualInputManagerTestScene.cs   |   2 +-
 .../Visual/Testing/TestSceneNestedGame.cs     |   4 +-
 .../Visual/Testing/TestSceneStepButton.cs     |   4 +-
 .../Visual/UserInterface/TestSceneButton.cs   |   4 +-
 .../UserInterface/TestSceneCheckboxes.cs      |   4 +-
 .../UserInterface/TestSceneCircularBlob.cs    |   4 +-
 .../TestSceneCircularProgress.cs              |   4 +-
 .../UserInterface/TestSceneClosableMenu.cs    |   2 +-
 .../UserInterface/TestSceneContextMenu.cs     |   2 +-
 .../UserInterface/TestSceneCountingText.cs    |   2 +-
 .../UserInterface/TestSceneDrawablePath.cs    |   4 +-
 .../Visual/UserInterface/TestSceneDropdown.cs |   2 +-
 .../TestSceneFocusedOverlayContainer.cs       |   2 +-
 .../UserInterface/TestSceneHSVColourPicker.cs |   2 +-
 .../UserInterface/TestSceneHexColourPicker.cs |   2 +-
 .../UserInterface/TestSceneNestedMenus.cs     |   4 +-
 .../Visual/UserInterface/TestScenePopover.cs  |   4 +-
 .../TestScenePopoverContainer.cs              |   2 +-
 .../TestSceneRearrangeableListContainer.cs    |   2 +-
 .../UserInterface/TestSceneRigidBody.cs       |   4 +-
 .../UserInterface/TestSceneScreenStack.cs     |   4 +-
 .../UserInterface/TestSceneSearchContainer.cs |   4 +-
 .../UserInterface/TestSceneSliderBar.cs       |   4 +-
 .../UserInterface/TestSceneTabControl.cs      |   4 +-
 .../TestSceneTabControlEvents.cs              |   2 +-
 .../Visual/UserInterface/TestSceneTextBox.cs  |   4 +-
 .../UserInterface/TestSceneTextBoxEvents.cs   |   2 +-
 .../TestSceneTextBoxKeyEvents.cs              |   2 +-
 .../TestSceneTextInputProperties.cs           |   2 +-
 .../Visual/UserInterface/TestSceneTooltip.cs  |   4 +-
 osu.Framework/Extensions/AnchorExtensions.cs  |   2 +-
 .../Extensions/BridgingExtensions.cs          |  16 ++
 .../MatrixExtensions/MatrixExtensions.cs      |   8 +-
 .../ConvexPolygonExtensions.cs                |   4 +-
 .../PolygonExtensions/PolygonExtensions.cs    |   4 +-
 .../Extensions/QuaternionExtensions.cs        |  17 ++
 osu.Framework/Game.cs                         |   2 +-
 .../CustomisableSizeCompositeDrawable.cs      |   2 +-
 .../Graphics/Animations/DrawableAnimation.cs  |   4 +-
 .../Graphics/Animations/TextureAnimation.cs   |   4 +-
 osu.Framework/Graphics/Audio/WaveformGraph.cs |   4 +-
 osu.Framework/Graphics/BufferedDrawNode.cs    |   1 +
 osu.Framework/Graphics/Colour/ColourInfo.cs   |   4 +-
 osu.Framework/Graphics/Colour/SRGBColour.cs   |   4 +-
 .../Graphics/Containers/AudioContainer.cs     |   2 +-
 .../Containers/BasicScrollContainer.cs        |   4 +-
 .../Containers/BufferedContainer.DrawNode.cs  |   4 +-
 .../Graphics/Containers/BufferedContainer.cs  |   1 +
 .../Containers/CompositeDrawable.DrawNode.cs  |   6 +-
 .../Graphics/Containers/CompositeDrawable.cs  |   2 +-
 .../Graphics/Containers/Container.cs          |   2 +-
 .../Containers/ContainerExtensions.cs         |   4 +-
 .../DrawSizePreservingFillContainer.cs        |   2 +-
 .../Graphics/Containers/FillFlowContainer.cs  |   2 +-
 .../Graphics/Containers/FlowContainer.cs      |   4 +-
 .../Graphics/Containers/GridContainer.cs      |   2 +-
 .../Graphics/Containers/IBufferedContainer.cs |   4 +-
 .../Graphics/Containers/IContainer.cs         |   4 +-
 .../Graphics/Containers/IFillFlowContainer.cs |   4 +-
 .../Footnotes/MarkdownFootnoteBacklink.cs     |   2 +-
 .../Footnotes/MarkdownFootnoteGroup.cs        |   2 +-
 .../Containers/Markdown/MarkdownContainer.cs  |   2 +-
 .../Containers/Markdown/MarkdownList.cs       |   2 +-
 .../Containers/RearrangeableListContainer.cs  |   2 +-
 .../Containers/RearrangeableListItem.cs       |   2 +-
 .../Graphics/Containers/SafeAreaContainer.cs  |   2 +-
 .../Graphics/Containers/ScrollContainer.cs    |   2 +-
 .../Graphics/Containers/TextFlowContainer.cs  |   2 +-
 .../Graphics/Cursor/ContextMenuContainer.cs   |   4 +-
 .../Graphics/Cursor/CursorContainer.cs        |   4 +-
 osu.Framework/Graphics/Cursor/ITooltip.cs     |   4 +-
 .../Graphics/Cursor/PopoverContainer.cs       |   2 +-
 .../Graphics/Cursor/TooltipContainer.cs       |   8 +-
 osu.Framework/Graphics/DrawInfo.cs            |   3 +-
 osu.Framework/Graphics/Drawable.cs            |   8 +-
 osu.Framework/Graphics/Effects/BlurEffect.cs  |   4 +-
 .../Graphics/Effects/EdgeEffectParameters.cs  |   2 +-
 osu.Framework/Graphics/Effects/GlowEffect.cs  |   4 +-
 .../Graphics/Effects/OutlineEffect.cs         |   4 +-
 osu.Framework/Graphics/IBufferedDrawable.cs   |   2 +-
 osu.Framework/Graphics/IDrawable.cs           |   4 +-
 osu.Framework/Graphics/Lines/Path.DrawNode.cs |  12 +-
 osu.Framework/Graphics/Lines/Path.cs          |   4 +-
 osu.Framework/Graphics/Lines/PathBBH.cs       |   2 +-
 osu.Framework/Graphics/MarginPadding.cs       |   4 +-
 .../Graphics/OpenGL/Buffers/GLFrameBuffer.cs  |   4 +-
 .../Graphics/OpenGL/Buffers/GLRenderBuffer.cs |   4 +-
 osu.Framework/Graphics/OpenGL/GLRenderer.cs   |  13 +-
 .../Performance/FrameStatisticsDisplay.cs     |   4 +-
 .../Performance/PerformanceOverlay.cs         |   2 +-
 osu.Framework/Graphics/Primitives/IPolygon.cs |   4 +-
 osu.Framework/Graphics/Primitives/Line.cs     |   3 +-
 .../Graphics/Primitives/ProjectionRange.cs    |   4 +-
 osu.Framework/Graphics/Primitives/Quad.cs     |  15 +-
 .../Graphics/Primitives/RectangleF.cs         |   6 +-
 .../Graphics/Primitives/RectangleI.cs         |   4 +-
 .../Primitives/SimpleConvexPolygon.cs         |   2 +-
 osu.Framework/Graphics/Primitives/Triangle.cs |   3 +-
 osu.Framework/Graphics/Primitives/Vector2I.cs |   4 +-
 .../Rendering/Deferred/DeferredFrameBuffer.cs |   2 +-
 .../Rendering/Deferred/DeferredRenderer.cs    |   2 +-
 .../Rendering/Dummy/DummyFrameBuffer.cs       |   2 +-
 .../Graphics/Rendering/IFrameBuffer.cs        |   2 +-
 osu.Framework/Graphics/Rendering/IRenderer.cs |   1 +
 .../Graphics/Rendering/MaskingInfo.cs         |   1 +
 osu.Framework/Graphics/Rendering/Renderer.cs  |   2 +
 .../Graphics/Rendering/RendererExtensions.cs  |   2 +
 .../Rendering/Vertices/ParticleVertex2D.cs    |   4 +-
 .../Rendering/Vertices/TexturedVertex2D.cs    |   4 +-
 .../Rendering/Vertices/TexturedVertex3D.cs    |   4 +-
 .../Vertices/TimedTexturedVertex2D.cs         |   4 +-
 .../Rendering/Vertices/UncolouredVertex2D.cs  |   4 +-
 .../Graphics/Rendering/Vertices/Vertex2D.cs   |   4 +-
 .../Graphics/Shaders/Types/UniformMatrix3.cs  |  13 +-
 .../Graphics/Shaders/Types/UniformMatrix4.cs  |  17 +-
 .../Graphics/Shaders/Types/UniformVector2.cs  |   2 +-
 .../Graphics/Shaders/Types/UniformVector3.cs  |   2 +-
 .../Graphics/Shaders/Types/UniformVector4.cs  |   2 +-
 osu.Framework/Graphics/Shapes/Box.cs          |   4 +-
 .../Graphics/Shapes/EquilateralTriangle.cs    |   4 +-
 osu.Framework/Graphics/Shapes/FastCircle.cs   |   2 +-
 osu.Framework/Graphics/Shapes/Triangle.cs     |   4 +-
 .../Graphics/Sprites/NineSliceSprite.cs       |   2 +-
 osu.Framework/Graphics/Sprites/Sprite.cs      |  11 +-
 .../Graphics/Sprites/SpriteDrawNode.cs        |   4 +-
 osu.Framework/Graphics/Sprites/SpriteIcon.cs  |   2 +-
 .../Graphics/Sprites/SpriteText.DrawNode.cs   |   7 +-
 osu.Framework/Graphics/Sprites/SpriteText.cs  |   2 +-
 osu.Framework/Graphics/Textures/Texture.cs    |   4 +-
 .../Graphics/TransformSequenceExtensions.cs   |   4 +-
 .../Graphics/TransformableExtensions.cs       |   4 +-
 .../Transforms/CubicBezierEasingFunction.cs   |   2 +-
 osu.Framework/Graphics/Transforms/Spring.cs   |   2 +-
 .../Graphics/UserInterface/BasicCheckbox.cs   |   4 +-
 .../UserInterface/BasicDirectorySelector.cs   |   2 +-
 ...BasicDirectorySelectorBreadcrumbDisplay.cs |   2 +-
 .../UserInterface/BasicFileSelector.cs        |   2 +-
 .../UserInterface/BasicHSVColourPicker.cs     |   4 +-
 .../Graphics/UserInterface/BasicPopover.cs    |   2 +-
 .../BasicRearrangeableListContainer.cs        |   2 +-
 .../Graphics/UserInterface/BasicSliderBar.cs  |   1 -
 .../Graphics/UserInterface/BasicTextBox.cs    |   4 +-
 osu.Framework/Graphics/UserInterface/Caret.cs |   4 +-
 .../Graphics/UserInterface/CircularBlob.cs    |   4 +-
 .../UserInterface/CircularProgress.cs         |   2 +-
 .../UserInterface/DirectorySelector.cs        |   2 +-
 .../DirectorySelectorBreadcrumbDisplay.cs     |   2 +-
 .../UserInterface/DirectorySelectorItem.cs    |   2 +-
 .../UserInterface/DropdownSearchBar.cs        |   2 +-
 .../HSVColourPicker.HueSelector.cs            |   2 +-
 ...HSVColourPicker.SaturationValueSelector.cs |   2 +-
 osu.Framework/Graphics/UserInterface/Menu.cs  |   4 +-
 .../Graphics/UserInterface/Popover.cs         |   4 +-
 .../Graphics/UserInterface/SliderBar.cs       |   1 -
 .../Graphics/UserInterface/TabControl.cs      |   2 +-
 .../Graphics/UserInterface/TextBox.cs         |   2 +-
 osu.Framework/Graphics/Vector2Extensions.cs   |  34 ++-
 .../Veldrid/Buffers/VeldridFrameBuffer.cs     |   2 +-
 .../Graphics/Veldrid/VeldridRenderer.cs       |   2 +-
 osu.Framework/Graphics/Video/Video.cs         |   3 +-
 .../Audio/AudioChannelDisplay.cs              |   4 +-
 .../Audio/AudioMixerVisualiser.cs             |   2 +-
 .../Visualisation/Audio/MixerDisplay.cs       |   4 +-
 .../Graphics/Visualisation/DrawVisualiser.cs  |   2 +-
 .../Visualisation/DrawableScreenshotter.cs    |   2 +-
 .../Visualisation/DrawableTransform.cs        |   2 +-
 .../Graphics/Visualisation/InfoOverlay.cs     |   2 +-
 .../Graphics/Visualisation/LogOverlay.cs      |   2 +-
 .../Graphics/Visualisation/PropertyDisplay.cs |   1 +
 .../Visualisation/TextureVisualiser.cs        |   2 +-
 .../Graphics/Visualisation/TitleBar.cs        |   4 +-
 .../Graphics/Visualisation/ToolWindow.cs      |   4 +-
 .../Visualisation/TransformDisplay.cs         |   2 +-
 .../Visualisation/VisualisedDrawable.cs       |   2 +-
 .../IO/Serialization/Vector2Converter.cs      |   2 +-
 .../Input/Bindings/KeyBindingContainer.cs     |   4 +-
 .../Input/Bindings/KeyCombination.cs          |   4 +-
 osu.Framework/Input/Events/ClickEvent.cs      |   4 +-
 .../Input/Events/DoubleClickEvent.cs          |   4 +-
 osu.Framework/Input/Events/DragEndEvent.cs    |   4 +-
 osu.Framework/Input/Events/DragEvent.cs       |   4 +-
 osu.Framework/Input/Events/DragStartEvent.cs  |   4 +-
 .../Input/Events/MouseButtonEvent.cs          |   4 +-
 osu.Framework/Input/Events/MouseDownEvent.cs  |   4 +-
 osu.Framework/Input/Events/MouseMoveEvent.cs  |   4 +-
 osu.Framework/Input/Events/MouseUpEvent.cs    |   4 +-
 osu.Framework/Input/Events/ScrollEvent.cs     |   4 +-
 osu.Framework/Input/Events/TouchEvent.cs      |   4 +-
 osu.Framework/Input/Events/TouchMoveEvent.cs  |   4 +-
 osu.Framework/Input/Events/TouchUpEvent.cs    |   4 +-
 osu.Framework/Input/Events/UIEvent.cs         |   2 +-
 .../Handlers/INeedsMousePositionFeedback.cs   |   4 +-
 .../Input/Handlers/Mouse/MouseHandler.cs      |   2 +-
 .../Input/Handlers/Pen/PenHandler.cs          |   2 +-
 .../Input/Handlers/Tablet/ITabletHandler.cs   |   4 +-
 .../Tablet/OpenTabletDriverHandler.cs         |   4 +-
 .../Input/Handlers/Tablet/TabletInfo.cs       |   4 +-
 osu.Framework/Input/InputManager.cs           |   4 +-
 osu.Framework/Input/InputResampler.cs         |   8 +-
 .../Input/MouseButtonEventManager.cs          |   4 +-
 .../Input/PassThroughInputManager.cs          |   2 +-
 .../Events/MousePositionChangeEvent.cs        |   4 +-
 .../Events/MouseScrollChangeEvent.cs          |   4 +-
 .../Events/TouchStateChangeEvent.cs           |   4 +-
 .../MousePositionAbsoluteInput.cs             |   4 +-
 .../MousePositionRelativeInput.cs             |   4 +-
 .../StateChanges/MouseScrollRelativeInput.cs  |   4 +-
 osu.Framework/Input/States/MouseState.cs      |   2 +-
 osu.Framework/Input/States/TabletState.cs     |   4 +-
 osu.Framework/Input/States/TouchState.cs      |   2 +-
 osu.Framework/Input/Touch.cs                  |   2 +-
 osu.Framework/Input/TouchEventManager.cs      |   4 +-
 osu.Framework/Input/UserInputManager.cs       |   4 +-
 osu.Framework/Physics/IRigidBody.cs           |   8 +-
 osu.Framework/Physics/RigidBodyContainer.cs   |   9 +-
 osu.Framework/Physics/RigidBodySimulation.cs  |   4 +-
 osu.Framework/Platform/GameHost.cs            |   4 +-
 osu.Framework/Platform/ISDLWindow.cs          |   2 +-
 .../Platform/MacOS/SDL2MacOSWindow.cs         |   2 +-
 .../Platform/MacOS/SDL3MacOSWindow.cs         |   2 +-
 .../Platform/SDL2/SDL2Window.Input.cs         |   2 +-
 .../Platform/SDL2/SDL2Window.Windowing.cs     |   2 +
 .../Platform/SDL3/SDL3Window.Input.cs         |   2 +-
 .../Platform/SDL3/SDL3Window.Windowing.cs     |   2 +
 .../Platform/Windows/IWindowsWindow.cs        |   2 +-
 .../Platform/Windows/SDL2WindowsWindow.cs     |   2 +-
 .../Platform/Windows/SDL3WindowsWindow.cs     |   2 +-
 .../Windows/WindowsMouseHandler.SDL2.cs       |   2 +-
 .../Platform/Windows/WindowsMouseHandler.cs   |   2 +-
 .../Sections/ToolbarRecordSection.cs          |   2 +-
 .../Sections/ToolbarRunAllStepsSection.cs     |   2 +-
 .../Drawables/Steps/StepColourPicker.cs       |   2 +-
 osu.Framework/Testing/Drawables/TestButton.cs |   2 +-
 .../Testing/Input/ManualInputManager.cs       |   2 +-
 .../Testing/Input/TestCursorContainer.cs      |   4 +-
 .../Testing/ManualInputManagerTestScene.cs    |   4 +-
 osu.Framework/Testing/TestBrowser.cs          |   1 +
 osu.Framework/Testing/TestScene.cs            |   2 +-
 osu.Framework/Text/MultilineTextBuilder.cs    |   2 +-
 osu.Framework/Text/TextBuilder.cs             |   6 +-
 osu.Framework/Text/TruncatingTextBuilder.cs   |   2 +-
 osu.Framework/Threading/DrawThread.cs         |   4 +-
 osu.Framework/Utils/CircularArcProperties.cs  |  10 +-
 osu.Framework/Utils/ConvexPolygonClipper.cs   |   2 +-
 .../Utils/IncrementalBSplineBuilder.cs        |   5 +-
 osu.Framework/Utils/Interpolation.cs          |   4 +-
 osu.Framework/Utils/PathApproximator.cs       |   3 +-
 osu.Framework/Utils/Precision.cs              |   4 +-
 osu.Framework/Utils/Validation.cs             |   2 +-
 406 files changed, 1054 insertions(+), 632 deletions(-)
 create mode 100644 fix_length.py
 create mode 100644 migrate_numerics.py
 create mode 100644 osu.Framework/Extensions/QuaternionExtensions.cs

diff --git a/fix_length.py b/fix_length.py
new file mode 100644
index 0000000000..721a057b11
--- /dev/null
+++ b/fix_length.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+"""Fix Vector2/3/4 .Length and .LengthSquared (property in osuTK) to be method calls in System.Numerics."""
+import re
+import os
+
+DIRS = [
+    '/home/runner/work/osu-framework/osu-framework/osu.Framework',
+    '/home/runner/work/osu-framework/osu-framework/osu.Framework.Tests',
+]
+
+def fix_file(path):
+    with open(path, 'r', encoding='utf-8-sig') as f:
+        content = f.read()
+    
+    # Only process files that now use System.Numerics (directly or via alias)
+    uses_sn = ('using System.Numerics;' in content or 
+               'using Vector2 = System.Numerics.Vector2;' in content or
+               'using Vector3 = System.Numerics.Vector3;' in content or
+               'using Vector4 = System.Numerics.Vector4;' in content)
+    
+    if not uses_sn:
+        return False
+    
+    original = content
+    
+    # Replace .LengthSquared (not followed by () - i.e. used as property) → .LengthSquared()
+    # Skip when followed by existing ()
+    content = re.sub(r'\.LengthSquared(?!\s*\()', '.LengthSquared()', content)
+    
+    # Replace .Length used as a float value (not for arrays)
+    # Patterns: .Length followed by ;, ), *, /, +, -, ,, whitespace-comparison operators, or = (but not ==)
+    # DON'T replace: .Length - 1, .Length ==, array context
+    # We do this carefully: only when .Length is at end of expression
+    # Simple approach: replace .Length followed by ; or ) or , or arithmetic
+    # But avoid array .Length (hard to distinguish without types)
+    # Heuristic: only replace .Length followed by ; ) , * / > < - + (but NOT .Length -)
+    # Actually .Length - 1 means subtract, could be array subtraction OR vector length minus float
+    # In vector context, .Length is always followed by ; ) , * / comparisons
+    # In array context, .Length is often followed by - ) ; 
+    # Too risky for general case. Just do the ones at end of statement:
+    # .Length; .Length) .Length,
+    # And ones in float assignment: variable = something.Length
+    
+    # Conservative: replace .Length when used as the full expression (not as part of array indexing)
+    # Skip .Length followed by space then - (array length - something)
+    # Only convert .Length in these patterns:
+    # 1. at end of statement: .Length;
+    # 2. in comparison: .Length > / .Length < / .Length == / .Length !=  
+    # 3. in assignment: = x.Length (semicolon after)
+    # 4. in parentheses: .Length)
+    # But skip .Length on arrays like controlPoints.Length
+
+    # Strategy: replace .Length followed by ; ) , whitespace then = == != > < <= >= * / + or end of line
+    # But exclude when preceded by array-like names (controlPoints, controlpoints, array, Array, etc)
+    
+    # Actually the safest approach for THIS codebase:
+    # Replace ALL .Length (not already ()) with .Length()
+    # Then fix false positives if any
+    content = re.sub(r'(?<!\w)\.Length(?!\s*\(|\s*\[|\w)', '.Length()', content)
+    
+    if content != original:
+        with open(path, 'w', encoding='utf-8') as f:
+            f.write(content)
+        return True
+    return False
+
+changed = []
+for base_dir in DIRS:
+    for root, dirs, files in os.walk(base_dir):
+        dirs[:] = [d for d in dirs if d not in ('bin', 'obj', '.git')]
+        for fname in files:
+            if not fname.endswith('.cs'):
+                continue
+            path = os.path.join(root, fname)
+            try:
+                if fix_file(path):
+                    changed.append(path)
+            except Exception as e:
+                print(f'ERROR {path}: {e}')
+
+print(f'Changed {len(changed)} files')
+for p in changed:
+    print(f'  {p.replace("/home/runner/work/osu-framework/osu-framework/", "")}')
diff --git a/migrate_numerics.py b/migrate_numerics.py
new file mode 100644
index 0000000000..e71d4b5ff1
--- /dev/null
+++ b/migrate_numerics.py
@@ -0,0 +1,235 @@
+#!/usr/bin/env python3
+"""
+Migrate osuTK Vector2/3/4 to System.Numerics.Vector2/3/4 in C# files.
+"""
+
+import os
+import re
+import sys
+
+# Non-Vector osuTK types that require keeping `using osuTK;`
+NON_VECTOR_OSTK_TYPES = re.compile(
+    r'\b(Matrix2|Matrix3|Matrix4|Quaternion|MathHelper|Box2|Box2d|Bezier|'
+    r'BezierCurve|Half|Vector2d|Vector3d|Vector4d|Vector2h|Vector3h|Vector4h|'
+    r'Vector2i|Vector3i|Vector4i)\b'
+)
+
+# Directories to process
+DIRS = [
+    '/home/runner/work/osu-framework/osu-framework/osu.Framework',
+    '/home/runner/work/osu-framework/osu-framework/osu.Framework.Tests',
+]
+
+def uses_vector_types(content):
+    """Check which Vector types (2/3/4) are used in the content."""
+    used = set()
+    # Avoid matching inside comments/strings is imperfect but good enough
+    if re.search(r'\bVector2\b', content):
+        used.add('Vector2')
+    if re.search(r'\bVector3\b', content):
+        used.add('Vector3')
+    if re.search(r'\bVector4\b', content):
+        used.add('Vector4')
+    return used
+
+def uses_non_vector_ostk(content):
+    """Check if the file uses non-Vector osuTK types."""
+    return bool(NON_VECTOR_OSTK_TYPES.search(content))
+
+def add_numerics_using(content, vector_types_used):
+    """
+    If file only uses Vector types from osuTK: replace `using osuTK;` with `using System.Numerics;`
+    If file also uses non-Vector osuTK types: keep `using osuTK;` and add aliases.
+    """
+    has_using_ostk = bool(re.search(r'^using osuTK;', content, re.MULTILINE))
+    if not has_using_ostk:
+        return content
+
+    needs_non_vector = uses_non_vector_ostk(content)
+
+    if not needs_non_vector:
+        # Safe to replace `using osuTK;` with `using System.Numerics;`
+        # But check if System.Numerics is already there
+        if re.search(r'^using System\.Numerics;', content, re.MULTILINE):
+            # Just remove `using osuTK;`
+            content = re.sub(r'^using osuTK;\n', '', content, flags=re.MULTILINE)
+        else:
+            content = re.sub(r'^using osuTK;', 'using System.Numerics;', content, flags=re.MULTILINE)
+    else:
+        # Keep `using osuTK;`, add aliases for Vector types that are used
+        # But only if `using System.Numerics;` is not already present as an alias
+        aliases_to_add = []
+        for vt in sorted(vector_types_used):
+            alias = f'using {vt} = System.Numerics.{vt};'
+            if alias not in content:
+                aliases_to_add.append(alias)
+
+        if aliases_to_add:
+            # Insert aliases right after `using osuTK;`
+            aliases_str = '\n'.join(aliases_to_add)
+            content = re.sub(
+                r'^(using osuTK;)',
+                r'\1\n' + aliases_str,
+                content,
+                flags=re.MULTILINE
+            )
+
+    return content
+
+def fix_api_differences(content):
+    """Fix osuTK-specific Vector2 API calls to System.Numerics equivalents."""
+
+    # Vector2.Dot(ref a, ref b, out float c); → float c = Vector2.Dot(a, b);
+    # Pattern: Vector2.Dot(ref <expr>, ref <expr>, out <type> <var>);
+    def replace_dot_ref(m):
+        a = m.group(1).strip()
+        b = m.group(2).strip()
+        typ = m.group(3).strip()
+        var = m.group(4).strip()
+        return f'{typ} {var} = Vector2.Dot({a}, {b});'
+
+    content = re.sub(
+        r'Vector2\.Dot\(ref\s+(\w+),\s*ref\s+(\w+),\s*out\s+(float)\s+(\w+)\);',
+        replace_dot_ref,
+        content
+    )
+
+    # Vector2.PerpDot(ref a, ref b, out float c); → float c = Vector2Extensions.PerpDot(a, b);
+    def replace_perpdot_ref(m):
+        a = m.group(1).strip()
+        b = m.group(2).strip()
+        typ = m.group(3).strip()
+        var = m.group(4).strip()
+        return f'{typ} {var} = Vector2Extensions.PerpDot({a}, {b});'
+
+    content = re.sub(
+        r'Vector2\.PerpDot\(ref\s+(\w+),\s*ref\s+(\w+),\s*out\s+(float)\s+(\w+)\);',
+        replace_perpdot_ref,
+        content
+    )
+
+    # Vector2.PerpDot(a, b) → Vector2Extensions.PerpDot(a, b)  (non-ref version)
+    # Be careful not to replace Vector2Extensions.PerpDot
+    content = re.sub(
+        r'(?<!Extensions\.)(?<!\w)Vector2\.PerpDot\(',
+        'Vector2Extensions.PerpDot(',
+        content
+    )
+
+    # Vector2.ComponentMin(a, b) → Vector2.Min(a, b)
+    content = re.sub(r'\bVector2\.ComponentMin\b', 'Vector2.Min', content)
+    content = re.sub(r'\bVector3\.ComponentMin\b', 'Vector3.Min', content)
+    content = re.sub(r'\bVector4\.ComponentMin\b', 'Vector4.Min', content)
+
+    # Vector2.ComponentMax(a, b) → Vector2.Max(a, b)
+    content = re.sub(r'\bVector2\.ComponentMax\b', 'Vector2.Max', content)
+    content = re.sub(r'\bVector3\.ComponentMax\b', 'Vector3.Max', content)
+    content = re.sub(r'\bVector4\.ComponentMax\b', 'Vector4.Max', content)
+
+    # .PerpendicularRight (property) → .PerpendicularRight() (extension method)
+    # Only replace when not already followed by '('
+    content = re.sub(r'\.PerpendicularRight(?!\s*\()', '.PerpendicularRight()', content)
+
+    # .PerpendicularLeft (property) → .PerpendicularLeft() (extension method)
+    content = re.sub(r'\.PerpendicularLeft(?!\s*\()', '.PerpendicularLeft()', content)
+
+    # .Xy on osuTK.Vector3 → .Xy.ToSystemNumerics()
+    # This is tricky to do automatically; handle specific patterns
+    # ExtractScale().Xy → ExtractScale().Xy.ToSystemNumerics()
+    content = re.sub(
+        r'(ExtractScale\(\))\.Xy\b(?!\.ToSystemNumerics)',
+        r'\1.Xy.ToSystemNumerics()',
+        content
+    )
+    # For cases like `scale.Xy` where scale was declared as Vector3
+    # We handle these in specific files manually if needed
+
+    return content
+
+def ensure_vector2extensions_using(content):
+    """
+    If file uses Vector2Extensions.PerpDot (added by our migration) but doesn't 
+    have the using for osu.Framework.Graphics, add it.
+    """
+    if 'Vector2Extensions.' not in content:
+        return content
+    if 'using osu.Framework.Graphics;' in content:
+        return content
+
+    # Check if it's in the osu.Framework.Graphics namespace itself
+    if 'namespace osu.Framework.Graphics' in content:
+        return content
+
+    # Insert after other using directives
+    # Find the last `using` line and insert after
+    lines = content.split('\n')
+    last_using_idx = -1
+    for i, line in enumerate(lines):
+        if line.strip().startswith('using ') and not line.strip().startswith('using static'):
+            last_using_idx = i
+
+    if last_using_idx >= 0:
+        lines.insert(last_using_idx + 1, 'using osu.Framework.Graphics;')
+        return '\n'.join(lines)
+    return content
+
+def process_file(path):
+    """Process a single C# file."""
+    with open(path, 'r', encoding='utf-8-sig') as f:
+        original = f.read()
+
+    content = original
+
+    # Only process files that have `using osuTK;`
+    if not re.search(r'^using osuTK;', content, re.MULTILINE):
+        return False
+
+    # Determine what vector types are used
+    vector_types = uses_vector_types(content)
+
+    if not vector_types:
+        return False  # No Vector types, skip (shouldn't happen in practice)
+
+    # Fix API differences first (before changing using directives)
+    content = fix_api_differences(content)
+
+    # Add/replace using directives
+    content = add_numerics_using(content, vector_types)
+
+    # Ensure Vector2Extensions namespace is imported if needed
+    content = ensure_vector2extensions_using(content)
+
+    if content != original:
+        with open(path, 'w', encoding='utf-8') as f:
+            f.write(content)
+        return True
+    return False
+
+def main():
+    changed = []
+    skipped = []
+
+    for base_dir in DIRS:
+        for root, dirs, files in os.walk(base_dir):
+            # Skip bin/obj directories
+            dirs[:] = [d for d in dirs if d not in ('bin', 'obj', '.git')]
+            for fname in files:
+                if not fname.endswith('.cs'):
+                    continue
+                path = os.path.join(root, fname)
+                try:
+                    if process_file(path):
+                        changed.append(path)
+                    else:
+                        pass
+                except Exception as e:
+                    print(f'ERROR processing {path}: {e}', file=sys.stderr)
+
+    print(f'Changed {len(changed)} files:')
+    for p in changed:
+        # Print relative path
+        p_rel = p.replace('/home/runner/work/osu-framework/osu-framework/', '')
+        print(f'  {p_rel}')
+
+if __name__ == '__main__':
+    main()
diff --git a/osu.Framework.Tests/Containers/TestSceneContainerState.cs b/osu.Framework.Tests/Containers/TestSceneContainerState.cs
index 9107e0508e..929421b60a 100644
--- a/osu.Framework.Tests/Containers/TestSceneContainerState.cs
+++ b/osu.Framework.Tests/Containers/TestSceneContainerState.cs
@@ -14,7 +14,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Tests.Visual;
-using osuTK;
+using System.Numerics;
 
 #pragma warning disable CA1826 // Performance for test is not important
 
diff --git a/osu.Framework.Tests/Exceptions/TestLoadExceptions.cs b/osu.Framework.Tests/Exceptions/TestLoadExceptions.cs
index c70833bfb1..2e77b7aee8 100644
--- a/osu.Framework.Tests/Exceptions/TestLoadExceptions.cs
+++ b/osu.Framework.Tests/Exceptions/TestLoadExceptions.cs
@@ -17,7 +17,7 @@
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Exceptions
diff --git a/osu.Framework.Tests/Input/JoystickInputTest.cs b/osu.Framework.Tests/Input/JoystickInputTest.cs
index f4a2f5f7ff..34b1a09c78 100644
--- a/osu.Framework.Tests/Input/JoystickInputTest.cs
+++ b/osu.Framework.Tests/Input/JoystickInputTest.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Input
 {
diff --git a/osu.Framework.Tests/Input/KeyBindingInputTest.cs b/osu.Framework.Tests/Input/KeyBindingInputTest.cs
index 046ce56bb5..040f588d82 100644
--- a/osu.Framework.Tests/Input/KeyBindingInputTest.cs
+++ b/osu.Framework.Tests/Input/KeyBindingInputTest.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Input
diff --git a/osu.Framework.Tests/Input/KeyboardInputTest.cs b/osu.Framework.Tests/Input/KeyboardInputTest.cs
index 4cb72130ef..52a24380c8 100644
--- a/osu.Framework.Tests/Input/KeyboardInputTest.cs
+++ b/osu.Framework.Tests/Input/KeyboardInputTest.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Input
diff --git a/osu.Framework.Tests/Input/MouseInputTest.cs b/osu.Framework.Tests/Input/MouseInputTest.cs
index 460d50567e..8f8f87de60 100644
--- a/osu.Framework.Tests/Input/MouseInputTest.cs
+++ b/osu.Framework.Tests/Input/MouseInputTest.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Input
diff --git a/osu.Framework.Tests/Input/TouchInputTest.cs b/osu.Framework.Tests/Input/TouchInputTest.cs
index ffef529a13..e045f5c65f 100644
--- a/osu.Framework.Tests/Input/TouchInputTest.cs
+++ b/osu.Framework.Tests/Input/TouchInputTest.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Input
 {
diff --git a/osu.Framework.Tests/Layout/TestSceneContainerLayout.cs b/osu.Framework.Tests/Layout/TestSceneContainerLayout.cs
index 81cd0577d0..7af97bd405 100644
--- a/osu.Framework.Tests/Layout/TestSceneContainerLayout.cs
+++ b/osu.Framework.Tests/Layout/TestSceneContainerLayout.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Testing;
 using osu.Framework.Tests.Visual;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Layout
 {
diff --git a/osu.Framework.Tests/Layout/TestSceneDrawableLayout.cs b/osu.Framework.Tests/Layout/TestSceneDrawableLayout.cs
index 85e12e101b..0f9c387f5f 100644
--- a/osu.Framework.Tests/Layout/TestSceneDrawableLayout.cs
+++ b/osu.Framework.Tests/Layout/TestSceneDrawableLayout.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Testing;
 using osu.Framework.Tests.Visual;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Layout
diff --git a/osu.Framework.Tests/Layout/TestSceneGridContainerLayout.cs b/osu.Framework.Tests/Layout/TestSceneGridContainerLayout.cs
index e8ff12a0bc..14f75df309 100644
--- a/osu.Framework.Tests/Layout/TestSceneGridContainerLayout.cs
+++ b/osu.Framework.Tests/Layout/TestSceneGridContainerLayout.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Testing;
 using osu.Framework.Tests.Visual;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Layout
 {
diff --git a/osu.Framework.Tests/Layout/TestSceneSpriteLayout.cs b/osu.Framework.Tests/Layout/TestSceneSpriteLayout.cs
index 8670be0f25..006fcc81b3 100644
--- a/osu.Framework.Tests/Layout/TestSceneSpriteLayout.cs
+++ b/osu.Framework.Tests/Layout/TestSceneSpriteLayout.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Framework.Tests.Visual;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Layout
 {
diff --git a/osu.Framework.Tests/MathUtils/TestInterpolation.cs b/osu.Framework.Tests/MathUtils/TestInterpolation.cs
index 054f1caaac..d5c4994ae5 100644
--- a/osu.Framework.Tests/MathUtils/TestInterpolation.cs
+++ b/osu.Framework.Tests/MathUtils/TestInterpolation.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.MathUtils
 {
diff --git a/osu.Framework.Tests/MathUtils/TestPathApproximator.cs b/osu.Framework.Tests/MathUtils/TestPathApproximator.cs
index 8b32b06d78..32911f986a 100644
--- a/osu.Framework.Tests/MathUtils/TestPathApproximator.cs
+++ b/osu.Framework.Tests/MathUtils/TestPathApproximator.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -6,7 +6,7 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.MathUtils
 {
diff --git a/osu.Framework.Tests/Polygons/ConvexPolygonClipperFuzzingTest.cs b/osu.Framework.Tests/Polygons/ConvexPolygonClipperFuzzingTest.cs
index 6ebe1123f1..45718c896c 100644
--- a/osu.Framework.Tests/Polygons/ConvexPolygonClipperFuzzingTest.cs
+++ b/osu.Framework.Tests/Polygons/ConvexPolygonClipperFuzzingTest.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Polygons
 {
diff --git a/osu.Framework.Tests/Polygons/ConvexPolygonClippingTest.cs b/osu.Framework.Tests/Polygons/ConvexPolygonClippingTest.cs
index d8955b6013..e023369bb1 100644
--- a/osu.Framework.Tests/Polygons/ConvexPolygonClippingTest.cs
+++ b/osu.Framework.Tests/Polygons/ConvexPolygonClippingTest.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Polygons
 {
diff --git a/osu.Framework.Tests/Polygons/LineIntersections.cs b/osu.Framework.Tests/Polygons/LineIntersections.cs
index bbfb460b24..2ffc2628a8 100644
--- a/osu.Framework.Tests/Polygons/LineIntersections.cs
+++ b/osu.Framework.Tests/Polygons/LineIntersections.cs
@@ -1,10 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Polygons
 {
diff --git a/osu.Framework.Tests/Primitives/QuadTest.cs b/osu.Framework.Tests/Primitives/QuadTest.cs
index fed9176cdf..3ff38e16c6 100644
--- a/osu.Framework.Tests/Primitives/QuadTest.cs
+++ b/osu.Framework.Tests/Primitives/QuadTest.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections;
@@ -7,6 +7,7 @@
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Utils;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Tests.Primitives
 {
diff --git a/osu.Framework.Tests/Primitives/TriangleTest.cs b/osu.Framework.Tests/Primitives/TriangleTest.cs
index 0e9ef4e922..f5a57cb47a 100644
--- a/osu.Framework.Tests/Primitives/TriangleTest.cs
+++ b/osu.Framework.Tests/Primitives/TriangleTest.cs
@@ -1,10 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections;
 using NUnit.Framework;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Primitives
 {
diff --git a/osu.Framework.Tests/Primitives/Vector2ExtensionsTest.cs b/osu.Framework.Tests/Primitives/Vector2ExtensionsTest.cs
index 5c07427fb9..c09909b693 100644
--- a/osu.Framework.Tests/Primitives/Vector2ExtensionsTest.cs
+++ b/osu.Framework.Tests/Primitives/Vector2ExtensionsTest.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Primitives
 {
diff --git a/osu.Framework.Tests/Text/TextBuilderTest.cs b/osu.Framework.Tests/Text/TextBuilderTest.cs
index a0bc358cfc..4288299992 100644
--- a/osu.Framework.Tests/Text/TextBuilderTest.cs
+++ b/osu.Framework.Tests/Text/TextBuilderTest.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Text;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Text
 {
diff --git a/osu.Framework.Tests/Visual/Audio/TestSceneAudioMixer.cs b/osu.Framework.Tests/Visual/Audio/TestSceneAudioMixer.cs
index 0fa2481396..59bb8e58af 100644
--- a/osu.Framework.Tests/Visual/Audio/TestSceneAudioMixer.cs
+++ b/osu.Framework.Tests/Visual/Audio/TestSceneAudioMixer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Audio
diff --git a/osu.Framework.Tests/Visual/Audio/TestSceneSamples.cs b/osu.Framework.Tests/Visual/Audio/TestSceneSamples.cs
index 3572deb79d..6fa5618b7a 100644
--- a/osu.Framework.Tests/Visual/Audio/TestSceneSamples.cs
+++ b/osu.Framework.Tests/Visual/Audio/TestSceneSamples.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Audio
diff --git a/osu.Framework.Tests/Visual/Audio/TestSceneTrackAdjustments.cs b/osu.Framework.Tests/Visual/Audio/TestSceneTrackAdjustments.cs
index 5a2e57099f..7896e6a0f7 100644
--- a/osu.Framework.Tests/Visual/Audio/TestSceneTrackAdjustments.cs
+++ b/osu.Framework.Tests/Visual/Audio/TestSceneTrackAdjustments.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Audio
diff --git a/osu.Framework.Tests/Visual/Bindables/TestSceneBindableAutoUnbinding.cs b/osu.Framework.Tests/Visual/Bindables/TestSceneBindableAutoUnbinding.cs
index 0b2d396ab6..a65082f181 100644
--- a/osu.Framework.Tests/Visual/Bindables/TestSceneBindableAutoUnbinding.cs
+++ b/osu.Framework.Tests/Visual/Bindables/TestSceneBindableAutoUnbinding.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Bindables
diff --git a/osu.Framework.Tests/Visual/Clocks/TestSceneClock.cs b/osu.Framework.Tests/Visual/Clocks/TestSceneClock.cs
index 7ca2e894a1..65ceae7102 100644
--- a/osu.Framework.Tests/Visual/Clocks/TestSceneClock.cs
+++ b/osu.Framework.Tests/Visual/Clocks/TestSceneClock.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Clocks
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneBufferedContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneBufferedContainer.cs
index 58778e61e0..e46f80722c 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneBufferedContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneBufferedContainer.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Containers
 {
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneBufferedContainerClipping.cs b/osu.Framework.Tests/Visual/Containers/TestSceneBufferedContainerClipping.cs
index a93f4f5aac..815239d75f 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneBufferedContainerClipping.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneBufferedContainerClipping.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Containers
 {
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneCachedBufferedContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneCachedBufferedContainer.cs
index 266538f7db..e87e8f2bee 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneCachedBufferedContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneCachedBufferedContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneCircularContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneCircularContainer.cs
index f73d4cab97..c7744e5f21 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneCircularContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneCircularContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Containers
 {
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneCircularContainerSizing.cs b/osu.Framework.Tests/Visual/Containers/TestSceneCircularContainerSizing.cs
index cf638b3326..4af56b9093 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneCircularContainerSizing.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneCircularContainerSizing.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Containers
 {
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneCompositeDrawable.cs b/osu.Framework.Tests/Visual/Containers/TestSceneCompositeDrawable.cs
index 8064c71d70..7130cfe5a3 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneCompositeDrawable.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneCompositeDrawable.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneCoordinateSpaces.cs b/osu.Framework.Tests/Visual/Containers/TestSceneCoordinateSpaces.cs
index 19ea50ee25..179ac0e45d 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneCoordinateSpaces.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneCoordinateSpaces.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Globalization;
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneCursorContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneCursorContainer.cs
index ec8eb114c2..48a82d8509 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneCursorContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneCursorContainer.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneCustomizableTextContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneCustomizableTextContainer.cs
index a22c33a287..430b68fb1b 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneCustomizableTextContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneCustomizableTextContainer.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Containers
 {
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneDrawSizePreservingFillContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneDrawSizePreservingFillContainer.cs
index 283ed270b4..2b9cf82e2c 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneDrawSizePreservingFillContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneDrawSizePreservingFillContainer.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneDynamicDepth.cs b/osu.Framework.Tests/Visual/Containers/TestSceneDynamicDepth.cs
index b73d2415ec..a8ba5a91d9 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneDynamicDepth.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneDynamicDepth.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBack.cs b/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBack.cs
index 706178bb2d..04422f4957 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBack.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBack.cs
@@ -15,7 +15,7 @@
 using osu.Framework.Graphics.Veldrid;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Graphics.ES30;
 
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackBox.cs b/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackBox.cs
index 7c21962c8d..ec47f7cef0 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackBox.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackBox.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackBufferedContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackBufferedContainer.cs
index 938bcbfd7c..7c919f18fc 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackBufferedContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackBufferedContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackTriangle.cs b/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackTriangle.cs
index d76214e925..41e296b24c 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackTriangle.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneFrontToBackTriangle.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneMasking.cs b/osu.Framework.Tests/Visual/Containers/TestSceneMasking.cs
index 6a450848d9..07309e2d72 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneMasking.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneMasking.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestScenePadding.cs b/osu.Framework.Tests/Visual/Containers/TestScenePadding.cs
index f5ea78f80e..25e9091b83 100644
--- a/osu.Framework.Tests/Visual/Containers/TestScenePadding.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestScenePadding.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
@@ -8,7 +8,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Layout;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneSafeAreaContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneSafeAreaContainer.cs
index 10a8c93f86..cc265213f0 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneSafeAreaContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneSafeAreaContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneSafeAreaOverrides.cs b/osu.Framework.Tests/Visual/Containers/TestSceneSafeAreaOverrides.cs
index 2c77397310..e580f0fad6 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneSafeAreaOverrides.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneSafeAreaOverrides.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainer.cs
index 8b683b5ada..235cccd11f 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainer.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainerDoublePrecision.cs b/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainerDoublePrecision.cs
index 7b995fdfae..e56cb1a4bd 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainerDoublePrecision.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainerDoublePrecision.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainerNested.cs b/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainerNested.cs
index 4ccf690558..0ac1a72632 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainerNested.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneScrollContainerNested.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneSizing.cs b/osu.Framework.Tests/Visual/Containers/TestSceneSizing.cs
index ed0f3ee510..07ae13816f 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneSizing.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneSizing.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneTextFlowContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneTextFlowContainer.cs
index 464f47c2cd..8fecc1e8b1 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneTextFlowContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneTextFlowContainer.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Containers/TestSceneVisibilityContainer.cs b/osu.Framework.Tests/Visual/Containers/TestSceneVisibilityContainer.cs
index f4e41ba491..e36d74c1a0 100644
--- a/osu.Framework.Tests/Visual/Containers/TestSceneVisibilityContainer.cs
+++ b/osu.Framework.Tests/Visual/Containers/TestSceneVisibilityContainer.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Containers
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneAutoSize.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneAutoSize.cs
index f4639a4b8e..f38ad1b7be 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneAutoSize.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneAutoSize.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Drawables
 {
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneBlending.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneBlending.cs
index 3b8902be35..9dfc195630 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneBlending.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneBlending.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneBorderColour.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneBorderColour.cs
index 203fcb39af..e6144dc258 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneBorderColour.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneBorderColour.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Drawables
 {
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneBorderSmoothing.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneBorderSmoothing.cs
index b4fb91b750..9c8d3e818b 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneBorderSmoothing.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneBorderSmoothing.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneCircularArcBoundingBox.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneCircularArcBoundingBox.cs
index a4afa80279..97724eca73 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneCircularArcBoundingBox.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneCircularArcBoundingBox.cs
@@ -13,6 +13,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneColourGradient.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneColourGradient.cs
index cd774462ec..ef19234c91 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneColourGradient.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneColourGradient.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions.Color4Extensions;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneColourInfoInterpolation.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneColourInfoInterpolation.cs
index d797b69c42..fc9f63199b 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneColourInfoInterpolation.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneColourInfoInterpolation.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneComplexBlending.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneComplexBlending.cs
index 883c59538c..60c9eead08 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneComplexBlending.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneComplexBlending.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Logging;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneConcurrentLoad.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneConcurrentLoad.cs
index 54f4d0eed2..c9cb28a9e2 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneConcurrentLoad.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneConcurrentLoad.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneCubicBezierEasing.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneCubicBezierEasing.cs
index 3f3bae265a..3120439a54 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneCubicBezierEasing.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneCubicBezierEasing.cs
@@ -16,6 +16,7 @@
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Tests.Visual.Drawables
 {
@@ -174,7 +175,7 @@ private void easingChanged()
 
                 path.OriginPosition = path.PositionInBoundingBox(new Vector2());
 
-                line1.Width = p1.Value.Length;
+                line1.Width = p1.Value.Length();
                 line1.Rotation = -MathHelper.RadiansToDegrees(MathF.Atan2(p1.Value.Y, p1.Value.X));
 
                 line2.Width = Vector2.Distance(p2.Value, Vector2.One);
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneCustomEasingCurve.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneCustomEasingCurve.cs
index d7673038de..eeeb4b1822 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneCustomEasingCurve.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneCustomEasingCurve.cs
@@ -15,7 +15,7 @@
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneDelayedLoadUnloadWrapper.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneDelayedLoadUnloadWrapper.cs
index 97fdf7fc9b..e2385bb2a7 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneDelayedLoadUnloadWrapper.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneDelayedLoadUnloadWrapper.cs
@@ -14,7 +14,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Lists;
 using osu.Framework.Threading;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneDelayedLoadWrapper.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneDelayedLoadWrapper.cs
index 123e47ed85..7ea3129fa6 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneDelayedLoadWrapper.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneDelayedLoadWrapper.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneDrawNodeDisposal.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneDrawNodeDisposal.cs
index d3149c7edc..daffeadb23 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneDrawNodeDisposal.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneDrawNodeDisposal.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneDrawableLoadCancellation.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneDrawableLoadCancellation.cs
index 7a22918d50..4c6d7e23cc 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneDrawableLoadCancellation.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneDrawableLoadCancellation.cs
@@ -15,7 +15,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Logging;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneDrawablePool.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneDrawablePool.cs
index e2cd4e5b58..69fa2c7ad6 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneDrawablePool.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneDrawablePool.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneDrawableScale.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneDrawableScale.cs
index cd4b0c24f2..29a9faa1d7 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneDrawableScale.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneDrawableScale.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Drawables
 {
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneEasingCurves.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneEasingCurves.cs
index 8abbbed657..0a0e152bdb 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneEasingCurves.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneEasingCurves.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneEffects.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneEffects.cs
index 25faa073f3..833753c1f8 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneEffects.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneEffects.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneFastCircle.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneFastCircle.cs
index a76b401860..3543de9bb9 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneFastCircle.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneFastCircle.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneFillModes.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneFillModes.cs
index a3e291b0d1..98f15ec75b 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneFillModes.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneFillModes.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneFocus.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneFocus.cs
index 1da78d6cad..72fb5e4358 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneFocus.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneFocus.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -14,7 +14,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneGammaCorrection.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneGammaCorrection.cs
index 729f9d43fb..3e31078785 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneGammaCorrection.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneGammaCorrection.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneHollowEdgeEffect.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneHollowEdgeEffect.cs
index e9577c0b54..c7b3aff60b 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneHollowEdgeEffect.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneHollowEdgeEffect.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneInteractivePathDrawing.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneInteractivePathDrawing.cs
index 64edfc7b90..a833c63b29 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneInteractivePathDrawing.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneInteractivePathDrawing.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneIsMaskedAway.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneIsMaskedAway.cs
index c4d1aca68b..dbd384529a 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneIsMaskedAway.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneIsMaskedAway.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Drawables
 {
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawable.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawable.cs
index 0add34d375..cb400ab40d 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawable.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawable.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawableWithLoading.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawableWithLoading.cs
index f1a1113b2e..5dadd199d1 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawableWithLoading.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawableWithLoading.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawableWithUnloading.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawableWithUnloading.cs
index 409a9d48ff..f502c0a631 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawableWithUnloading.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawableWithUnloading.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestScenePathApproximator.cs b/osu.Framework.Tests/Visual/Drawables/TestScenePathApproximator.cs
index 128201f435..3cbefb8a16 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestScenePathApproximator.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestScenePathApproximator.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestScenePathCapAngles.cs b/osu.Framework.Tests/Visual/Drawables/TestScenePathCapAngles.cs
index 83ff863693..675601113e 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestScenePathCapAngles.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestScenePathCapAngles.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,6 +8,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestScenePathWithZeroLength.cs b/osu.Framework.Tests/Visual/Drawables/TestScenePathWithZeroLength.cs
index d716a20cb9..c88d8682a7 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestScenePathWithZeroLength.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestScenePathWithZeroLength.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Lines;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestScenePiecewiseLinearToBSpline.cs b/osu.Framework.Tests/Visual/Drawables/TestScenePiecewiseLinearToBSpline.cs
index 213dfa56d7..aee70a7974 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestScenePiecewiseLinearToBSpline.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestScenePiecewiseLinearToBSpline.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestScenePropertyBoundaries.cs b/osu.Framework.Tests/Visual/Drawables/TestScenePropertyBoundaries.cs
index 60fb3d048b..ea6691ba74 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestScenePropertyBoundaries.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestScenePropertyBoundaries.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Drawables
 {
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneProxyDrawableLifetime.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneProxyDrawableLifetime.cs
index b16810e63d..0ebe7a344f 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneProxyDrawableLifetime.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneProxyDrawableLifetime.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Drawables
 {
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneProxyDrawables.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneProxyDrawables.cs
index 63cc7bd619..ba1313c436 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneProxyDrawables.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneProxyDrawables.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions.Color4Extensions;
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneSpring.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneSpring.cs
index 866607e641..6af5e7dff0 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneSpring.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneSpring.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Layout;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneStressGLDisposal.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneStressGLDisposal.cs
index 189716322b..69326717ea 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneStressGLDisposal.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneStressGLDisposal.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Drawables
 {
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneSynchronizationContext.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneSynchronizationContext.cs
index d39acbfba7..12e97057e3 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneSynchronizationContext.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneSynchronizationContext.cs
@@ -16,7 +16,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Drawables
 {
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneTransformRewinding.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneTransformRewinding.cs
index 3f419fb9dd..a46c6c416a 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneTransformRewinding.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneTransformRewinding.cs
@@ -16,7 +16,7 @@
 using osu.Framework.Graphics.Visualisation;
 using osu.Framework.Timing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneTransformSequence.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneTransformSequence.cs
index c9ae53d663..dceaa62e0c 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneTransformSequence.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneTransformSequence.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneUpdateBeforeDraw.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneUpdateBeforeDraw.cs
index c8ea96f018..68e640a0c7 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneUpdateBeforeDraw.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneUpdateBeforeDraw.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Drawables
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs
index 0c1f0dccd9..9ef9a4e2bc 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs
@@ -18,6 +18,7 @@
 using osu.Framework.Testing;
 using osuTK;
 using osuTK.Graphics;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Tests.Visual.Drawables
 {
diff --git a/osu.Framework.Tests/Visual/Graphics/TestSceneColours.cs b/osu.Framework.Tests/Visual/Graphics/TestSceneColours.cs
index 1aa279c247..c2d058c27d 100644
--- a/osu.Framework.Tests/Visual/Graphics/TestSceneColours.cs
+++ b/osu.Framework.Tests/Visual/Graphics/TestSceneColours.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Graphics
 {
diff --git a/osu.Framework.Tests/Visual/Graphics/TestSceneScissor.cs b/osu.Framework.Tests/Visual/Graphics/TestSceneScissor.cs
index 9f4625326a..11b36a59d6 100644
--- a/osu.Framework.Tests/Visual/Graphics/TestSceneScissor.cs
+++ b/osu.Framework.Tests/Visual/Graphics/TestSceneScissor.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Graphics
diff --git a/osu.Framework.Tests/Visual/Graphics/TestSceneShaderStorageBufferObject.cs b/osu.Framework.Tests/Visual/Graphics/TestSceneShaderStorageBufferObject.cs
index 6d0b7693a3..11b5f3755b 100644
--- a/osu.Framework.Tests/Visual/Graphics/TestSceneShaderStorageBufferObject.cs
+++ b/osu.Framework.Tests/Visual/Graphics/TestSceneShaderStorageBufferObject.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Rendering.Vertices;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Shaders.Types;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics.ES30;
 
 namespace osu.Framework.Tests.Visual.Graphics
diff --git a/osu.Framework.Tests/Visual/Graphics/TestSceneStencil.cs b/osu.Framework.Tests/Visual/Graphics/TestSceneStencil.cs
index e918640c39..1c06909202 100644
--- a/osu.Framework.Tests/Visual/Graphics/TestSceneStencil.cs
+++ b/osu.Framework.Tests/Visual/Graphics/TestSceneStencil.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Graphics
diff --git a/osu.Framework.Tests/Visual/Graphics/TestSceneTexturePremultiplication.cs b/osu.Framework.Tests/Visual/Graphics/TestSceneTexturePremultiplication.cs
index b257e1be1b..f8541c00ff 100644
--- a/osu.Framework.Tests/Visual/Graphics/TestSceneTexturePremultiplication.cs
+++ b/osu.Framework.Tests/Visual/Graphics/TestSceneTexturePremultiplication.cs
@@ -14,7 +14,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework.Tests/Visual/Graphics/TestSceneVertexBatching.cs b/osu.Framework.Tests/Visual/Graphics/TestSceneVertexBatching.cs
index 13767014d7..b36e60b293 100644
--- a/osu.Framework.Tests/Visual/Graphics/TestSceneVertexBatching.cs
+++ b/osu.Framework.Tests/Visual/Graphics/TestSceneVertexBatching.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Graphics
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneClickLenience.cs b/osu.Framework.Tests/Visual/Input/TestSceneClickLenience.cs
index 030bd928d5..326a75baf3 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneClickLenience.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneClickLenience.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneHandleInput.cs b/osu.Framework.Tests/Visual/Input/TestSceneHandleInput.cs
index 31de3112fe..d58830143f 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneHandleInput.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneHandleInput.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions.Color4Extensions;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Input
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneInputManager.cs b/osu.Framework.Tests/Visual/Input/TestSceneInputManager.cs
index 68c33dddfe..0f516c20da 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneInputManager.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneInputManager.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -16,7 +16,7 @@
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Input.Handlers.Pen;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Input
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneInputQueueChange.cs b/osu.Framework.Tests/Visual/Input/TestSceneInputQueueChange.cs
index 8e4862ff07..019491d847 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneInputQueueChange.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneInputQueueChange.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneInputResampler.cs b/osu.Framework.Tests/Visual/Input/TestSceneInputResampler.cs
index 174afbf555..46c6535970 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneInputResampler.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneInputResampler.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -13,7 +13,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneJoystick.cs b/osu.Framework.Tests/Visual/Input/TestSceneJoystick.cs
index d1d2b206d3..ba20835c3b 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneJoystick.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneJoystick.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -9,7 +9,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Input
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingContainer.cs b/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingContainer.cs
index 2c89192e2d..dc9c450339 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingContainer.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingContainer.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.Input
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingInputQueueChange.cs b/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingInputQueueChange.cs
index 396626a8d2..524a8fe7e5 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingInputQueueChange.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingInputQueueChange.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingsGrid.cs b/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingsGrid.cs
index 1596923882..0c51756bdd 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingsGrid.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneKeyBindingsGrid.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -14,7 +14,7 @@
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneMidi.cs b/osu.Framework.Tests/Visual/Input/TestSceneMidi.cs
index 0d963ab2f4..8fa19cc396 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneMidi.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneMidi.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -12,7 +12,7 @@
 using osu.Framework.Input.Handlers.Midi;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Input
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneMouseStates.cs b/osu.Framework.Tests/Visual/Input/TestSceneMouseStates.cs
index 71d06b5541..d2835db53d 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneMouseStates.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneMouseStates.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -13,7 +13,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
@@ -453,8 +453,8 @@ private void checkEventCount(Type type, int change = 0, bool outer = false)
         }
 
         private void checkLastPositionDelta(Func<float> expected) => AddAssert("correct position delta", () =>
-            Precision.AlmostEquals(s1.LastDelta.Length, expected()) &&
-            Precision.AlmostEquals(s2.LastDelta.Length, expected()));
+            Precision.AlmostEquals(s1.LastDelta.Length(), expected()) &&
+            Precision.AlmostEquals(s2.LastDelta.Length(), expected()));
 
         private void checkLastScrollDelta(Vector2 expected) => AddAssert("correct scroll delta", () =>
             Precision.AlmostEquals(s1.LastScrollDelta, expected) &&
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneNestedHover.cs b/osu.Framework.Tests/Visual/Input/TestSceneNestedHover.cs
index b5a527aa5b..6c3fec08d0 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneNestedHover.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneNestedHover.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Input
diff --git a/osu.Framework.Tests/Visual/Input/TestScenePassThroughInputManager.cs b/osu.Framework.Tests/Visual/Input/TestScenePassThroughInputManager.cs
index f19f25083a..ab3b737e9e 100644
--- a/osu.Framework.Tests/Visual/Input/TestScenePassThroughInputManager.cs
+++ b/osu.Framework.Tests/Visual/Input/TestScenePassThroughInputManager.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -14,7 +14,7 @@
 using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using osu.Framework.Testing.Input;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.Input
diff --git a/osu.Framework.Tests/Visual/Input/TestScenePathInput.cs b/osu.Framework.Tests/Visual/Input/TestScenePathInput.cs
index ed045fd9e9..02771b86e3 100644
--- a/osu.Framework.Tests/Visual/Input/TestScenePathInput.cs
+++ b/osu.Framework.Tests/Visual/Input/TestScenePathInput.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Input
diff --git a/osu.Framework.Tests/Visual/Input/TestScenePlatformActionContainer.cs b/osu.Framework.Tests/Visual/Input/TestScenePlatformActionContainer.cs
index de727bc9c3..b143c9329f 100644
--- a/osu.Framework.Tests/Visual/Input/TestScenePlatformActionContainer.cs
+++ b/osu.Framework.Tests/Visual/Input/TestScenePlatformActionContainer.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Input
 {
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneReadableKeyCombinationProvider.cs b/osu.Framework.Tests/Visual/Input/TestSceneReadableKeyCombinationProvider.cs
index 21d8e43af4..bd5a2e2911 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneReadableKeyCombinationProvider.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneReadableKeyCombinationProvider.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
@@ -10,7 +10,7 @@
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Input
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneTabletInput.cs b/osu.Framework.Tests/Visual/Input/TestSceneTabletInput.cs
index 5eacda4e86..b05e95cf27 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneTabletInput.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneTabletInput.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -13,7 +13,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Input
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneTouchInput.cs b/osu.Framework.Tests/Visual/Input/TestSceneTouchInput.cs
index b2939e1769..da20550e8f 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneTouchInput.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneTouchInput.cs
@@ -17,7 +17,7 @@
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.States;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneTouchVisualiser.cs b/osu.Framework.Tests/Visual/Input/TestSceneTouchVisualiser.cs
index 7dcacfa850..2cfd8c28c6 100644
--- a/osu.Framework.Tests/Visual/Input/TestSceneTouchVisualiser.cs
+++ b/osu.Framework.Tests/Visual/Input/TestSceneTouchVisualiser.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -11,7 +11,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Input
@@ -82,7 +82,7 @@ protected override void OnTouchUp(TouchUpEvent e)
 
             private Color4 colourFor(TouchSource source)
             {
-                return Color4.FromHsv(new Vector4((float)source / TouchState.MAX_TOUCH_COUNT, 1f, 1f, 1f));
+                return Color4.FromHsv(new osuTK.Vector4((float)source / TouchState.MAX_TOUCH_COUNT, 1f, 1f, 1f));
             }
 
             private partial class FadingCircle : Circle
diff --git a/osu.Framework.Tests/Visual/Layout/TestSceneFillFlowContainer.cs b/osu.Framework.Tests/Visual/Layout/TestSceneFillFlowContainer.cs
index aec26d4739..6ba8ed618f 100644
--- a/osu.Framework.Tests/Visual/Layout/TestSceneFillFlowContainer.cs
+++ b/osu.Framework.Tests/Visual/Layout/TestSceneFillFlowContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -15,7 +15,7 @@
 using osu.Framework.Localisation;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Layout
diff --git a/osu.Framework.Tests/Visual/Layout/TestSceneFitInsideFlow.cs b/osu.Framework.Tests/Visual/Layout/TestSceneFitInsideFlow.cs
index 882dea74a8..d6bd89865b 100644
--- a/osu.Framework.Tests/Visual/Layout/TestSceneFitInsideFlow.cs
+++ b/osu.Framework.Tests/Visual/Layout/TestSceneFitInsideFlow.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Layout
 {
diff --git a/osu.Framework.Tests/Visual/Layout/TestSceneGridContainer.cs b/osu.Framework.Tests/Visual/Layout/TestSceneGridContainer.cs
index bb933c1a75..fb26fc3ba7 100644
--- a/osu.Framework.Tests/Visual/Layout/TestSceneGridContainer.cs
+++ b/osu.Framework.Tests/Visual/Layout/TestSceneGridContainer.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Layout
diff --git a/osu.Framework.Tests/Visual/Layout/TestSceneLayoutDurations.cs b/osu.Framework.Tests/Visual/Layout/TestSceneLayoutDurations.cs
index 7a809144b8..b9b6b414c8 100644
--- a/osu.Framework.Tests/Visual/Layout/TestSceneLayoutDurations.cs
+++ b/osu.Framework.Tests/Visual/Layout/TestSceneLayoutDurations.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -10,7 +10,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Layout
diff --git a/osu.Framework.Tests/Visual/Layout/TestSceneLayoutTransformRewinding.cs b/osu.Framework.Tests/Visual/Layout/TestSceneLayoutTransformRewinding.cs
index 51f88c8d35..6389902274 100644
--- a/osu.Framework.Tests/Visual/Layout/TestSceneLayoutTransformRewinding.cs
+++ b/osu.Framework.Tests/Visual/Layout/TestSceneLayoutTransformRewinding.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -9,6 +9,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Tests.Visual.Layout
 {
diff --git a/osu.Framework.Tests/Visual/Layout/TestSceneScrollableFlow.cs b/osu.Framework.Tests/Visual/Layout/TestSceneScrollableFlow.cs
index 97554d8f8a..d560b2b6dd 100644
--- a/osu.Framework.Tests/Visual/Layout/TestSceneScrollableFlow.cs
+++ b/osu.Framework.Tests/Visual/Layout/TestSceneScrollableFlow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Layout
diff --git a/osu.Framework.Tests/Visual/Layout/TestSceneTableContainer.cs b/osu.Framework.Tests/Visual/Layout/TestSceneTableContainer.cs
index a711aa47b2..4201f09ca5 100644
--- a/osu.Framework.Tests/Visual/Layout/TestSceneTableContainer.cs
+++ b/osu.Framework.Tests/Visual/Layout/TestSceneTableContainer.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Layout
diff --git a/osu.Framework.Tests/Visual/Performance/PerformanceTestScene.cs b/osu.Framework.Tests/Visual/Performance/PerformanceTestScene.cs
index b5a5c8e9af..9050eeda17 100644
--- a/osu.Framework.Tests/Visual/Performance/PerformanceTestScene.cs
+++ b/osu.Framework.Tests/Visual/Performance/PerformanceTestScene.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Performance
diff --git a/osu.Framework.Tests/Visual/Performance/RepeatedDrawablePerformanceTestScene.cs b/osu.Framework.Tests/Visual/Performance/RepeatedDrawablePerformanceTestScene.cs
index 813545f727..24c7ac2c75 100644
--- a/osu.Framework.Tests/Visual/Performance/RepeatedDrawablePerformanceTestScene.cs
+++ b/osu.Framework.Tests/Visual/Performance/RepeatedDrawablePerformanceTestScene.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Performance
diff --git a/osu.Framework.Tests/Visual/Performance/TestSceneBlendingPerformance.cs b/osu.Framework.Tests/Visual/Performance/TestSceneBlendingPerformance.cs
index 59f7c3f167..2e409f6285 100644
--- a/osu.Framework.Tests/Visual/Performance/TestSceneBlendingPerformance.cs
+++ b/osu.Framework.Tests/Visual/Performance/TestSceneBlendingPerformance.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Performance
 {
diff --git a/osu.Framework.Tests/Visual/Performance/TestSceneBufferingPerformance.cs b/osu.Framework.Tests/Visual/Performance/TestSceneBufferingPerformance.cs
index 84d0dfe393..244d68ae20 100644
--- a/osu.Framework.Tests/Visual/Performance/TestSceneBufferingPerformance.cs
+++ b/osu.Framework.Tests/Visual/Performance/TestSceneBufferingPerformance.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Performance
 {
diff --git a/osu.Framework.Tests/Visual/Performance/TestSceneCircularProgressRingsPerformance.cs b/osu.Framework.Tests/Visual/Performance/TestSceneCircularProgressRingsPerformance.cs
index f15580f890..8c8f765d09 100644
--- a/osu.Framework.Tests/Visual/Performance/TestSceneCircularProgressRingsPerformance.cs
+++ b/osu.Framework.Tests/Visual/Performance/TestSceneCircularProgressRingsPerformance.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Performance
 {
diff --git a/osu.Framework.Tests/Visual/Platform/FrameworkConfigVisualiser.cs b/osu.Framework.Tests/Visual/Platform/FrameworkConfigVisualiser.cs
index 56701f67e5..c3668594f4 100644
--- a/osu.Framework.Tests/Visual/Platform/FrameworkConfigVisualiser.cs
+++ b/osu.Framework.Tests/Visual/Platform/FrameworkConfigVisualiser.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Platform
 {
diff --git a/osu.Framework.Tests/Visual/Platform/TestSceneDisplayMode.cs b/osu.Framework.Tests/Visual/Platform/TestSceneDisplayMode.cs
index d13199481a..3312359659 100644
--- a/osu.Framework.Tests/Visual/Platform/TestSceneDisplayMode.cs
+++ b/osu.Framework.Tests/Visual/Platform/TestSceneDisplayMode.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Platform
 {
diff --git a/osu.Framework.Tests/Visual/Platform/TestSceneExternalLinks.cs b/osu.Framework.Tests/Visual/Platform/TestSceneExternalLinks.cs
index 646878ba3b..717760988a 100644
--- a/osu.Framework.Tests/Visual/Platform/TestSceneExternalLinks.cs
+++ b/osu.Framework.Tests/Visual/Platform/TestSceneExternalLinks.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Platform
 {
diff --git a/osu.Framework.Tests/Visual/Platform/TestSceneFullscreen.cs b/osu.Framework.Tests/Visual/Platform/TestSceneFullscreen.cs
index 63223d6224..5b09c33dd6 100644
--- a/osu.Framework.Tests/Visual/Platform/TestSceneFullscreen.cs
+++ b/osu.Framework.Tests/Visual/Platform/TestSceneFullscreen.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -19,7 +19,7 @@
 using osu.Framework.Input;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using WindowState = osu.Framework.Platform.WindowState;
 
 namespace osu.Framework.Tests.Visual.Platform
diff --git a/osu.Framework.Tests/Visual/Platform/TestScenePresentFileExternally.cs b/osu.Framework.Tests/Visual/Platform/TestScenePresentFileExternally.cs
index 17df49bc82..bca8d52a1f 100644
--- a/osu.Framework.Tests/Visual/Platform/TestScenePresentFileExternally.cs
+++ b/osu.Framework.Tests/Visual/Platform/TestScenePresentFileExternally.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Platform
 {
diff --git a/osu.Framework.Tests/Visual/Platform/TestSceneResourceStores.cs b/osu.Framework.Tests/Visual/Platform/TestSceneResourceStores.cs
index 4eebe5fee1..d33f51ae31 100644
--- a/osu.Framework.Tests/Visual/Platform/TestSceneResourceStores.cs
+++ b/osu.Framework.Tests/Visual/Platform/TestSceneResourceStores.cs
@@ -17,7 +17,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Platform
diff --git a/osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs b/osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs
index c1329badd9..40a9f9ade8 100644
--- a/osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs
+++ b/osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -12,7 +12,9 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
+using System.Numerics;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 using WindowState = osu.Framework.Platform.WindowState;
 
 namespace osu.Framework.Tests.Visual.Platform
diff --git a/osu.Framework.Tests/Visual/Platform/WindowDisplaysPreview.cs b/osu.Framework.Tests/Visual/Platform/WindowDisplaysPreview.cs
index 6bd980cc4d..ed548d1d0b 100644
--- a/osu.Framework.Tests/Visual/Platform/WindowDisplaysPreview.cs
+++ b/osu.Framework.Tests/Visual/Platform/WindowDisplaysPreview.cs
@@ -15,7 +15,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Platform
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneAnimationLayout.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneAnimationLayout.cs
index 7e98d5ca10..f1c36dc1e6 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneAnimationLayout.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneAnimationLayout.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneBufferedContainerView.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneBufferedContainerView.cs
index c32838546d..fc8449f3de 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneBufferedContainerView.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneBufferedContainerView.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Tests.Visual.Containers;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneLargeTextureStore.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneLargeTextureStore.cs
index 447d0df64e..21c5a34836 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneLargeTextureStore.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneLargeTextureStore.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Sprites
 {
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneNineSliceSprite.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneNineSliceSprite.cs
index 1825edc92d..09685f96a0 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneNineSliceSprite.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneNineSliceSprite.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneScreenshot.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneScreenshot.cs
index c03a9c04d9..206fd25134 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneScreenshot.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneScreenshot.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneSmoothedEdges.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneSmoothedEdges.cs
index b65f111fe4..322873d6f7 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneSmoothedEdges.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneSmoothedEdges.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteIcon.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteIcon.cs
index 00368ff9cf..d612e748e6 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteIcon.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteIcon.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -16,7 +16,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Threading;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteTextScenarios.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteTextScenarios.cs
index 444c902bd1..5c824a0af7 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteTextScenarios.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteTextScenarios.cs
@@ -20,7 +20,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteTextTruncate.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteTextTruncate.cs
index fe0ba5306c..23304a5464 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteTextTruncate.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneSpriteTextTruncate.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneTextFlow.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneTextFlow.cs
index fcd54e7620..50eeccc8b1 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneTextFlow.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneTextFlow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneTextureCropping.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneTextureCropping.cs
index 9780fc4717..e1acc37c55 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneTextureCropping.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneTextureCropping.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Sprites
 {
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneTexturedTriangle.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneTexturedTriangle.cs
index 6496cc8f4f..639ef436d5 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneTexturedTriangle.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneTexturedTriangle.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Sprites
 {
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneTriangles.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneTriangles.cs
index beb9ebd478..8a9656003a 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneTriangles.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneTriangles.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Tests.Visual.Containers;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneVideo.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneVideo.cs
index 088121f84d..344505d094 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneVideo.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneVideo.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -15,7 +15,7 @@
 using osu.Framework.Graphics.Video;
 using osu.Framework.IO.Stores;
 using osu.Framework.Timing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Sprites
 {
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneVideoLayout.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneVideoLayout.cs
index 22aad5f9fc..0ec41926ea 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneVideoLayout.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneVideoLayout.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Sprites/TestSceneWrapModes.cs b/osu.Framework.Tests/Visual/Sprites/TestSceneWrapModes.cs
index 3f625e1e58..6a4426c18c 100644
--- a/osu.Framework.Tests/Visual/Sprites/TestSceneWrapModes.cs
+++ b/osu.Framework.Tests/Visual/Sprites/TestSceneWrapModes.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -13,7 +13,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Sprites
diff --git a/osu.Framework.Tests/Visual/Testing/TestSceneDrawVisualiser.cs b/osu.Framework.Tests/Visual/Testing/TestSceneDrawVisualiser.cs
index 2a82cf93ec..b5ab5f250e 100644
--- a/osu.Framework.Tests/Visual/Testing/TestSceneDrawVisualiser.cs
+++ b/osu.Framework.Tests/Visual/Testing/TestSceneDrawVisualiser.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics.Visualisation;
 using osu.Framework.Input;
 using osu.Framework.Tests.Visual.Containers;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Testing
 {
diff --git a/osu.Framework.Tests/Visual/Testing/TestSceneManualInputManagerTestScene.cs b/osu.Framework.Tests/Visual/Testing/TestSceneManualInputManagerTestScene.cs
index 2a12ec8ce5..86d2fbace5 100644
--- a/osu.Framework.Tests/Visual/Testing/TestSceneManualInputManagerTestScene.cs
+++ b/osu.Framework.Tests/Visual/Testing/TestSceneManualInputManagerTestScene.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Framework.Testing.Input;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.Testing
diff --git a/osu.Framework.Tests/Visual/Testing/TestSceneNestedGame.cs b/osu.Framework.Tests/Visual/Testing/TestSceneNestedGame.cs
index d7ad09bfc5..d96fdc74b5 100644
--- a/osu.Framework.Tests/Visual/Testing/TestSceneNestedGame.cs
+++ b/osu.Framework.Tests/Visual/Testing/TestSceneNestedGame.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.Testing
diff --git a/osu.Framework.Tests/Visual/Testing/TestSceneStepButton.cs b/osu.Framework.Tests/Visual/Testing/TestSceneStepButton.cs
index 5ad1a54e4b..63503d7686 100644
--- a/osu.Framework.Tests/Visual/Testing/TestSceneStepButton.cs
+++ b/osu.Framework.Tests/Visual/Testing/TestSceneStepButton.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing.Drawables.Steps;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.Testing
 {
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneButton.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneButton.cs
index 9c50a7ec67..5a5649ca2d 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneButton.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneButton.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneCheckboxes.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneCheckboxes.cs
index 5ce7f95f3b..5ef401da8e 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneCheckboxes.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneCheckboxes.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.UserInterface
 {
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneCircularBlob.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneCircularBlob.cs
index b12ecb5c22..0223848392 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneCircularBlob.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneCircularBlob.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneCircularProgress.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneCircularProgress.cs
index bd67862713..67bf76a0cd 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneCircularProgress.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneCircularProgress.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneClosableMenu.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneClosableMenu.cs
index 9d7959e8bc..8fe22f5ccc 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneClosableMenu.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneClosableMenu.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneContextMenu.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneContextMenu.cs
index 9654988db4..d35e68cb29 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneContextMenu.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneContextMenu.cs
@@ -14,7 +14,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneCountingText.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneCountingText.cs
index 3d5aa5c3cf..3f6f27fda7 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneCountingText.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneCountingText.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.UserInterface
 {
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneDrawablePath.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneDrawablePath.cs
index 42c15e0ffe..75a3218cea 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneDrawablePath.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneDrawablePath.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -13,7 +13,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneDropdown.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneDropdown.cs
index c1d247b409..0dd83888fe 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneDropdown.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneDropdown.cs
@@ -20,7 +20,7 @@
 using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Framework.Testing.Input;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneFocusedOverlayContainer.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneFocusedOverlayContainer.cs
index 7530bcd616..0117cfa49f 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneFocusedOverlayContainer.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneFocusedOverlayContainer.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneHSVColourPicker.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneHSVColourPicker.cs
index 7e2a72076a..7258723029 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneHSVColourPicker.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneHSVColourPicker.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneHexColourPicker.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneHexColourPicker.cs
index 2e5975248d..de12a62fd2 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneHexColourPicker.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneHexColourPicker.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneNestedMenus.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneNestedMenus.cs
index f310e809cf..53c70f3749 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneNestedMenus.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneNestedMenus.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestScenePopover.cs b/osu.Framework.Tests/Visual/UserInterface/TestScenePopover.cs
index 98654e6e9b..d5d185ad34 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestScenePopover.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestScenePopover.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.UserInterface
 {
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestScenePopoverContainer.cs b/osu.Framework.Tests/Visual/UserInterface/TestScenePopoverContainer.cs
index 31d5b255c7..8880d304b0 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestScenePopoverContainer.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestScenePopoverContainer.cs
@@ -15,7 +15,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneRearrangeableListContainer.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneRearrangeableListContainer.cs
index 8b7de51eb0..9c0cb202f6 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneRearrangeableListContainer.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneRearrangeableListContainer.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneRigidBody.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneRigidBody.cs
index f4d59ff415..0a08429978 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneRigidBody.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneRigidBody.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Physics;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneScreenStack.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneScreenStack.cs
index 023ba4907f..afa6ee0b2b 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneScreenStack.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneScreenStack.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -19,7 +19,7 @@
 using osu.Framework.Testing;
 using osu.Framework.Testing.Input;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneSearchContainer.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneSearchContainer.cs
index 3743262975..caed55381b 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneSearchContainer.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneSearchContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -14,7 +14,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Framework.Tests.Visual.Localisation;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.UserInterface
 {
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneSliderBar.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneSliderBar.cs
index b333e16dbb..a0a8f1f9a2 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneSliderBar.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneSliderBar.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -14,7 +14,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneTabControl.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneTabControl.cs
index f265370e34..ff209675a1 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneTabControl.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneTabControl.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -15,7 +15,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Localisation;
-using osuTK;
+using System.Numerics;
 
 #pragma warning disable CA1826 // Performance for test is not important
 
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneTabControlEvents.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneTabControlEvents.cs
index d0eea0e202..a8b1a181eb 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneTabControlEvents.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneTabControlEvents.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBox.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBox.cs
index 0921acd480..990bfd7e14 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBox.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBox.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -14,7 +14,7 @@
 using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBoxEvents.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBoxEvents.cs
index 8861819bf5..a08c93bb75 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBoxEvents.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBoxEvents.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Framework.Testing.Input;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBoxKeyEvents.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBoxKeyEvents.cs
index b1281b4a43..8b8fab9c58 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBoxKeyEvents.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneTextBoxKeyEvents.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Testing.Input;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneTextInputProperties.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneTextInputProperties.cs
index 3c45176d78..a725cc0937 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneTextInputProperties.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneTextInputProperties.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Tests.Visual.UserInterface
 {
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneTooltip.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneTooltip.cs
index fc5ae4856c..d83c4f124d 100644
--- a/osu.Framework.Tests/Visual/UserInterface/TestSceneTooltip.cs
+++ b/osu.Framework.Tests/Visual/UserInterface/TestSceneTooltip.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -15,7 +15,7 @@
 using osu.Framework.Input;
 using osu.Framework.Localisation;
 using osu.Framework.Testing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Tests.Visual.UserInterface
diff --git a/osu.Framework/Extensions/AnchorExtensions.cs b/osu.Framework/Extensions/AnchorExtensions.cs
index 08aee6e906..45d86e2c65 100644
--- a/osu.Framework/Extensions/AnchorExtensions.cs
+++ b/osu.Framework/Extensions/AnchorExtensions.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Extensions
 {
diff --git a/osu.Framework/Extensions/BridgingExtensions.cs b/osu.Framework/Extensions/BridgingExtensions.cs
index ce061e8df3..fb3b5cf384 100644
--- a/osu.Framework/Extensions/BridgingExtensions.cs
+++ b/osu.Framework/Extensions/BridgingExtensions.cs
@@ -4,7 +4,11 @@
 using SDPoint = System.Drawing.Point;
 using SDSize = System.Drawing.Size;
 using SNVector2 = System.Numerics.Vector2;
+using SNVector3 = System.Numerics.Vector3;
+using SNVector4 = System.Numerics.Vector4;
 using TKVector2 = osuTK.Vector2;
+using TKVector3 = osuTK.Vector3;
+using TKVector4 = osuTK.Vector4;
 
 namespace osu.Framework.Extensions
 {
@@ -20,6 +24,18 @@ public static TKVector2 ToOsuTK(this SNVector2 vec) =>
         public static SNVector2 ToSystemNumerics(this TKVector2 vec) =>
             new SNVector2(vec.X, vec.Y);
 
+        public static TKVector3 ToOsuTK(this SNVector3 vec) =>
+            new TKVector3(vec.X, vec.Y, vec.Z);
+
+        public static SNVector3 ToSystemNumerics(this TKVector3 vec) =>
+            new SNVector3(vec.X, vec.Y, vec.Z);
+
+        public static TKVector4 ToOsuTK(this SNVector4 vec) =>
+            new TKVector4(vec.X, vec.Y, vec.Z, vec.W);
+
+        public static SNVector4 ToSystemNumerics(this TKVector4 vec) =>
+            new SNVector4(vec.X, vec.Y, vec.Z, vec.W);
+
         public static SNVector2 ToSystemNumerics(this SDSize size) =>
             new SNVector2(size.Width, size.Height);
 
diff --git a/osu.Framework/Extensions/MatrixExtensions/MatrixExtensions.cs b/osu.Framework/Extensions/MatrixExtensions/MatrixExtensions.cs
index 7a1a16fce7..fd1baadacb 100644
--- a/osu.Framework/Extensions/MatrixExtensions/MatrixExtensions.cs
+++ b/osu.Framework/Extensions/MatrixExtensions/MatrixExtensions.cs
@@ -1,8 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
+using Vector3 = System.Numerics.Vector3;
 
 namespace osu.Framework.Extensions.MatrixExtensions
 {
@@ -31,7 +33,7 @@ public static void RotateFromLeft(ref Matrix3 m, float radians)
             float cos = MathF.Cos(radians);
             float sin = MathF.Sin(radians);
 
-            Vector3 row0 = m.Row0 * cos + m.Row1 * sin;
+            var row0 = m.Row0 * cos + m.Row1 * sin;
             m.Row1 = m.Row1 * cos - m.Row0 * sin;
             m.Row0 = row0;
         }
@@ -85,7 +87,7 @@ public static void ScaleFromRight(ref Matrix3 m, Vector2 v)
         /// <param name="v">The X and Y amounts of shearing.</param>
         public static void ShearFromLeft(ref Matrix3 m, Vector2 v)
         {
-            Vector3 row0 = m.Row0 + m.Row1 * v.Y + m.Row0 * v.X * v.Y;
+            var row0 = m.Row0 + m.Row1 * v.Y + m.Row0 * v.X * v.Y;
             m.Row1 += m.Row0 * v.X;
             m.Row0 = row0;
         }
diff --git a/osu.Framework/Extensions/PolygonExtensions/ConvexPolygonExtensions.cs b/osu.Framework/Extensions/PolygonExtensions/ConvexPolygonExtensions.cs
index 30334eb593..8592c7c72a 100644
--- a/osu.Framework/Extensions/PolygonExtensions/ConvexPolygonExtensions.cs
+++ b/osu.Framework/Extensions/PolygonExtensions/ConvexPolygonExtensions.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Extensions.PolygonExtensions
 {
diff --git a/osu.Framework/Extensions/PolygonExtensions/PolygonExtensions.cs b/osu.Framework/Extensions/PolygonExtensions/PolygonExtensions.cs
index c9383c40ea..0eb1a9e65d 100644
--- a/osu.Framework/Extensions/PolygonExtensions/PolygonExtensions.cs
+++ b/osu.Framework/Extensions/PolygonExtensions/PolygonExtensions.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Extensions.PolygonExtensions
 {
diff --git a/osu.Framework/Extensions/QuaternionExtensions.cs b/osu.Framework/Extensions/QuaternionExtensions.cs
new file mode 100644
index 0000000000..2a821352bd
--- /dev/null
+++ b/osu.Framework/Extensions/QuaternionExtensions.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using SNQuaternion = System.Numerics.Quaternion;
+using TKQuaternion = osuTK.Quaternion;
+
+namespace osu.Framework.Extensions
+{
+    public static class QuaternionExtensions
+    {
+        public static TKQuaternion ToOsuTK(this SNQuaternion q) =>
+            new TKQuaternion(q.X, q.Y, q.Z, q.W);
+
+        public static SNQuaternion ToSystemNumerics(this TKQuaternion q) =>
+            new SNQuaternion(q.X, q.Y, q.Z, q.W);
+    }
+}
diff --git a/osu.Framework/Game.cs b/osu.Framework/Game.cs
index 322da868cf..ca03390aff 100644
--- a/osu.Framework/Game.cs
+++ b/osu.Framework/Game.cs
@@ -23,7 +23,7 @@
 using osu.Framework.IO.Stores;
 using osu.Framework.Localisation;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework
 {
diff --git a/osu.Framework/Graphics/Animations/CustomisableSizeCompositeDrawable.cs b/osu.Framework/Graphics/Animations/CustomisableSizeCompositeDrawable.cs
index 6d9b6b7c1c..00ecdc90ea 100644
--- a/osu.Framework/Graphics/Animations/CustomisableSizeCompositeDrawable.cs
+++ b/osu.Framework/Graphics/Animations/CustomisableSizeCompositeDrawable.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Containers;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Animations
 {
diff --git a/osu.Framework/Graphics/Animations/DrawableAnimation.cs b/osu.Framework/Graphics/Animations/DrawableAnimation.cs
index 41c1924e7b..02bf9e119d 100644
--- a/osu.Framework/Graphics/Animations/DrawableAnimation.cs
+++ b/osu.Framework/Graphics/Animations/DrawableAnimation.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
 
 using System.Linq;
 using osu.Framework.Graphics.Containers;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Animations
 {
diff --git a/osu.Framework/Graphics/Animations/TextureAnimation.cs b/osu.Framework/Graphics/Animations/TextureAnimation.cs
index 3a2fbc04fd..bd65d13344 100644
--- a/osu.Framework/Graphics/Animations/TextureAnimation.cs
+++ b/osu.Framework/Graphics/Animations/TextureAnimation.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
 
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Animations
 {
diff --git a/osu.Framework/Graphics/Audio/WaveformGraph.cs b/osu.Framework/Graphics/Audio/WaveformGraph.cs
index ea257acc32..7b7eec4380 100644
--- a/osu.Framework/Graphics/Audio/WaveformGraph.cs
+++ b/osu.Framework/Graphics/Audio/WaveformGraph.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Rendering;
@@ -18,6 +19,7 @@
 using osu.Framework.Utils;
 using osuTK;
 using osuTK.Graphics;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Graphics.Audio
 {
@@ -324,7 +326,7 @@ protected override void Draw(IRenderer renderer)
                 shader.Bind();
                 texture.Bind();
 
-                Vector2 localInflationAmount = new Vector2(0, 1) * DrawInfo.MatrixInverse.ExtractScale().Xy;
+                Vector2 localInflationAmount = new Vector2(0, 1) * DrawInfo.MatrixInverse.ExtractScale().Xy.ToSystemNumerics();
 
                 // We're dealing with a _large_ number of points, so we need to optimise the quadToDraw * drawInfo.Matrix multiplications below
                 // for points that are going to be masked out anyway. This allows for higher resolution graphs at larger scales with virtually no performance loss.
diff --git a/osu.Framework/Graphics/BufferedDrawNode.cs b/osu.Framework/Graphics/BufferedDrawNode.cs
index f250b96411..353872efed 100644
--- a/osu.Framework/Graphics/BufferedDrawNode.cs
+++ b/osu.Framework/Graphics/BufferedDrawNode.cs
@@ -9,6 +9,7 @@
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Statistics;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics
diff --git a/osu.Framework/Graphics/Colour/ColourInfo.cs b/osu.Framework/Graphics/Colour/ColourInfo.cs
index fe0400789c..3513ec8c07 100644
--- a/osu.Framework/Graphics/Colour/ColourInfo.cs
+++ b/osu.Framework/Graphics/Colour/ColourInfo.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Colour
diff --git a/osu.Framework/Graphics/Colour/SRGBColour.cs b/osu.Framework/Graphics/Colour/SRGBColour.cs
index 9820fb0327..afc68ddcd4 100644
--- a/osu.Framework/Graphics/Colour/SRGBColour.cs
+++ b/osu.Framework/Graphics/Colour/SRGBColour.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using osu.Framework.Extensions.Color4Extensions;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Colour
diff --git a/osu.Framework/Graphics/Containers/AudioContainer.cs b/osu.Framework/Graphics/Containers/AudioContainer.cs
index f07c5dfcc7..3d89761286 100644
--- a/osu.Framework/Graphics/Containers/AudioContainer.cs
+++ b/osu.Framework/Graphics/Containers/AudioContainer.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Effects;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/BasicScrollContainer.cs b/osu.Framework/Graphics/Containers/BasicScrollContainer.cs
index d477f3fc1e..cf9381f580 100644
--- a/osu.Framework/Graphics/Containers/BasicScrollContainer.cs
+++ b/osu.Framework/Graphics/Containers/BasicScrollContainer.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/BufferedContainer.DrawNode.cs b/osu.Framework/Graphics/Containers/BufferedContainer.DrawNode.cs
index 8acc7683d8..cd8c86a5d5 100644
--- a/osu.Framework/Graphics/Containers/BufferedContainer.DrawNode.cs
+++ b/osu.Framework/Graphics/Containers/BufferedContainer.DrawNode.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Shaders.Types;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Containers
diff --git a/osu.Framework/Graphics/Containers/BufferedContainer.cs b/osu.Framework/Graphics/Containers/BufferedContainer.cs
index d6fabe79bf..99565449e1 100644
--- a/osu.Framework/Graphics/Containers/BufferedContainer.cs
+++ b/osu.Framework/Graphics/Containers/BufferedContainer.cs
@@ -12,6 +12,7 @@
 using osu.Framework.Layout;
 using osu.Framework.Utils;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Containers
diff --git a/osu.Framework/Graphics/Containers/CompositeDrawable.DrawNode.cs b/osu.Framework/Graphics/Containers/CompositeDrawable.DrawNode.cs
index 4e65ff73fa..a489b8e87d 100644
--- a/osu.Framework/Graphics/Containers/CompositeDrawable.DrawNode.cs
+++ b/osu.Framework/Graphics/Containers/CompositeDrawable.DrawNode.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Rendering.Vertices;
 using osu.Framework.Graphics.Shaders;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
@@ -77,7 +77,7 @@ public override void ApplyState()
                 if (!Source.Masking && (Source.BorderThickness != 0.0f || Source.EdgeEffect.Type != EdgeEffectType.None))
                     throw new InvalidOperationException("Can not have border effects/edge effects if masking is disabled.");
 
-                Vector3 scale = DrawInfo.MatrixInverse.ExtractScale();
+                var scale = DrawInfo.MatrixInverse.ExtractScale();
                 float blendRange = Source.MaskingSmoothness * (scale.X + scale.Y) / 2;
 
                 // Calculate a shrunk rectangle which is free from corner radius/smoothing/border effects
diff --git a/osu.Framework/Graphics/Containers/CompositeDrawable.cs b/osu.Framework/Graphics/Containers/CompositeDrawable.cs
index c845cd285b..3766eb0159 100644
--- a/osu.Framework/Graphics/Containers/CompositeDrawable.cs
+++ b/osu.Framework/Graphics/Containers/CompositeDrawable.cs
@@ -29,7 +29,7 @@
 using osu.Framework.Threading;
 using osu.Framework.Timing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Containers
diff --git a/osu.Framework/Graphics/Containers/Container.cs b/osu.Framework/Graphics/Containers/Container.cs
index 7104ba2404..7784a94172 100644
--- a/osu.Framework/Graphics/Containers/Container.cs
+++ b/osu.Framework/Graphics/Containers/Container.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Lists;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/ContainerExtensions.cs b/osu.Framework/Graphics/Containers/ContainerExtensions.cs
index 5541cdecde..fb5b94c10d 100644
--- a/osu.Framework/Graphics/Containers/ContainerExtensions.cs
+++ b/osu.Framework/Graphics/Containers/ContainerExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -6,7 +6,7 @@
 using System.Linq;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/DrawSizePreservingFillContainer.cs b/osu.Framework/Graphics/Containers/DrawSizePreservingFillContainer.cs
index a533ec60ee..09e753ae88 100644
--- a/osu.Framework/Graphics/Containers/DrawSizePreservingFillContainer.cs
+++ b/osu.Framework/Graphics/Containers/DrawSizePreservingFillContainer.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/FillFlowContainer.cs b/osu.Framework/Graphics/Containers/FillFlowContainer.cs
index 8ebb7e57d1..25d2f22e7b 100644
--- a/osu.Framework/Graphics/Containers/FillFlowContainer.cs
+++ b/osu.Framework/Graphics/Containers/FillFlowContainer.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/FlowContainer.cs b/osu.Framework/Graphics/Containers/FlowContainer.cs
index 95d8c8ca28..ca5bc095b5 100644
--- a/osu.Framework/Graphics/Containers/FlowContainer.cs
+++ b/osu.Framework/Graphics/Containers/FlowContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Layout;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/GridContainer.cs b/osu.Framework/Graphics/Containers/GridContainer.cs
index f2af3f4f48..47fc0423fe 100644
--- a/osu.Framework/Graphics/Containers/GridContainer.cs
+++ b/osu.Framework/Graphics/Containers/GridContainer.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Caching;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Layout;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/IBufferedContainer.cs b/osu.Framework/Graphics/Containers/IBufferedContainer.cs
index 83f7cc198c..b38ed70fd2 100644
--- a/osu.Framework/Graphics/Containers/IBufferedContainer.cs
+++ b/osu.Framework/Graphics/Containers/IBufferedContainer.cs
@@ -1,7 +1,7 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/IContainer.cs b/osu.Framework/Graphics/Containers/IContainer.cs
index 3df53c66e4..a94c61a394 100644
--- a/osu.Framework/Graphics/Containers/IContainer.cs
+++ b/osu.Framework/Graphics/Containers/IContainer.cs
@@ -1,10 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics.Effects;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/IFillFlowContainer.cs b/osu.Framework/Graphics/Containers/IFillFlowContainer.cs
index 84160cd132..eaa708edf4 100644
--- a/osu.Framework/Graphics/Containers/IFillFlowContainer.cs
+++ b/osu.Framework/Graphics/Containers/IFillFlowContainer.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Transforms;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/Markdown/Footnotes/MarkdownFootnoteBacklink.cs b/osu.Framework/Graphics/Containers/Markdown/Footnotes/MarkdownFootnoteBacklink.cs
index 24a7b1ae5a..e92a1c648c 100644
--- a/osu.Framework/Graphics/Containers/Markdown/Footnotes/MarkdownFootnoteBacklink.cs
+++ b/osu.Framework/Graphics/Containers/Markdown/Footnotes/MarkdownFootnoteBacklink.cs
@@ -4,7 +4,7 @@
 using Markdig.Extensions.Footnotes;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Containers.Markdown.Footnotes
diff --git a/osu.Framework/Graphics/Containers/Markdown/Footnotes/MarkdownFootnoteGroup.cs b/osu.Framework/Graphics/Containers/Markdown/Footnotes/MarkdownFootnoteGroup.cs
index 17d40ca46c..115d298871 100644
--- a/osu.Framework/Graphics/Containers/Markdown/Footnotes/MarkdownFootnoteGroup.cs
+++ b/osu.Framework/Graphics/Containers/Markdown/Footnotes/MarkdownFootnoteGroup.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Markdig.Extensions.Footnotes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers.Markdown.Footnotes
 {
diff --git a/osu.Framework/Graphics/Containers/Markdown/MarkdownContainer.cs b/osu.Framework/Graphics/Containers/Markdown/MarkdownContainer.cs
index d8e143afee..7a1380a016 100644
--- a/osu.Framework/Graphics/Containers/Markdown/MarkdownContainer.cs
+++ b/osu.Framework/Graphics/Containers/Markdown/MarkdownContainer.cs
@@ -17,7 +17,7 @@
 using osu.Framework.Graphics.Containers.Markdown.Footnotes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers.Markdown
 {
diff --git a/osu.Framework/Graphics/Containers/Markdown/MarkdownList.cs b/osu.Framework/Graphics/Containers/Markdown/MarkdownList.cs
index cafda85334..3681ba3e46 100644
--- a/osu.Framework/Graphics/Containers/Markdown/MarkdownList.cs
+++ b/osu.Framework/Graphics/Containers/Markdown/MarkdownList.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers.Markdown
 {
diff --git a/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs b/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs
index d2cf726451..e5c774d8e8 100644
--- a/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs
+++ b/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/RearrangeableListItem.cs b/osu.Framework/Graphics/Containers/RearrangeableListItem.cs
index 456488e41e..18113616b1 100644
--- a/osu.Framework/Graphics/Containers/RearrangeableListItem.cs
+++ b/osu.Framework/Graphics/Containers/RearrangeableListItem.cs
@@ -5,7 +5,7 @@
 
 using System;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/SafeAreaContainer.cs b/osu.Framework/Graphics/Containers/SafeAreaContainer.cs
index bb621086bc..a78881aeec 100644
--- a/osu.Framework/Graphics/Containers/SafeAreaContainer.cs
+++ b/osu.Framework/Graphics/Containers/SafeAreaContainer.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Layout;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Containers/ScrollContainer.cs b/osu.Framework/Graphics/Containers/ScrollContainer.cs
index 4b55074e63..6f1ac6c04e 100644
--- a/osu.Framework/Graphics/Containers/ScrollContainer.cs
+++ b/osu.Framework/Graphics/Containers/ScrollContainer.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Layout;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Graphics.Containers
diff --git a/osu.Framework/Graphics/Containers/TextFlowContainer.cs b/osu.Framework/Graphics/Containers/TextFlowContainer.cs
index a5e19b1bce..e65fabc378 100644
--- a/osu.Framework/Graphics/Containers/TextFlowContainer.cs
+++ b/osu.Framework/Graphics/Containers/TextFlowContainer.cs
@@ -16,7 +16,7 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Containers
 {
diff --git a/osu.Framework/Graphics/Cursor/ContextMenuContainer.cs b/osu.Framework/Graphics/Cursor/ContextMenuContainer.cs
index 4d6e64242c..f6849f7b64 100644
--- a/osu.Framework/Graphics/Cursor/ContextMenuContainer.cs
+++ b/osu.Framework/Graphics/Cursor/ContextMenuContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Graphics.Cursor
diff --git a/osu.Framework/Graphics/Cursor/CursorContainer.cs b/osu.Framework/Graphics/Cursor/CursorContainer.cs
index 78da25041d..db493023c9 100644
--- a/osu.Framework/Graphics/Cursor/CursorContainer.cs
+++ b/osu.Framework/Graphics/Cursor/CursorContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Cursor
diff --git a/osu.Framework/Graphics/Cursor/ITooltip.cs b/osu.Framework/Graphics/Cursor/ITooltip.cs
index 2cec948cf0..7d1a663cb0 100644
--- a/osu.Framework/Graphics/Cursor/ITooltip.cs
+++ b/osu.Framework/Graphics/Cursor/ITooltip.cs
@@ -1,7 +1,7 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Cursor
 {
diff --git a/osu.Framework/Graphics/Cursor/PopoverContainer.cs b/osu.Framework/Graphics/Cursor/PopoverContainer.cs
index 87cb32cc5d..572985b88e 100644
--- a/osu.Framework/Graphics/Cursor/PopoverContainer.cs
+++ b/osu.Framework/Graphics/Cursor/PopoverContainer.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Cursor
 {
diff --git a/osu.Framework/Graphics/Cursor/TooltipContainer.cs b/osu.Framework/Graphics/Cursor/TooltipContainer.cs
index 3f4c65ab5b..e47cc03d05 100644
--- a/osu.Framework/Graphics/Cursor/TooltipContainer.cs
+++ b/osu.Framework/Graphics/Cursor/TooltipContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -14,7 +14,7 @@
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Localisation;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Cursor
@@ -122,8 +122,8 @@ private Vector2 computeMouseTooltipPosition()
                 // We only need to check 2 of the 4 vertices, because we only allow affine transformations
                 // and the quad is therefore symmetric around the centre.
                 boundingRadius = Math.Max(
-                    (cursorQuad.TopLeft - cursorCentre).Length,
-                    (cursorQuad.TopRight - cursorCentre).Length);
+                    (cursorQuad.TopLeft - cursorCentre).Length(),
+                    (cursorQuad.TopRight - cursorCentre).Length());
             }
 
             Vector2 southEast = new Vector2(1).Normalized();
diff --git a/osu.Framework/Graphics/DrawInfo.cs b/osu.Framework/Graphics/DrawInfo.cs
index d6515f8a2f..4a109520c8 100644
--- a/osu.Framework/Graphics/DrawInfo.cs
+++ b/osu.Framework/Graphics/DrawInfo.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -6,6 +6,7 @@
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Utils;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Graphics
 {
diff --git a/osu.Framework/Graphics/Drawable.cs b/osu.Framework/Graphics/Drawable.cs
index c41b605eae..6b3ee6f982 100644
--- a/osu.Framework/Graphics/Drawable.cs
+++ b/osu.Framework/Graphics/Drawable.cs
@@ -33,7 +33,7 @@
 using osu.Framework.Threading;
 using osu.Framework.Timing;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 using Container = osu.Framework.Graphics.Containers.Container;
@@ -1687,9 +1687,9 @@ private Vector2 computeRequiredParentSizeToFit()
             Vector2 bottomRightSize2 = -bottomRightOffset * ratio2;
 
             // Expand bounds according to clipped offset
-            return Vector2.ComponentMax(
-                Vector2.ComponentMax(topLeftSize1, topLeftSize2),
-                Vector2.ComponentMax(bottomRightSize1, bottomRightSize2));
+            return Vector2.Max(
+                Vector2.Max(topLeftSize1, topLeftSize2),
+                Vector2.Max(bottomRightSize1, bottomRightSize2));
         }
 
         /// <summary>
diff --git a/osu.Framework/Graphics/Effects/BlurEffect.cs b/osu.Framework/Graphics/Effects/BlurEffect.cs
index 5fb3cbb38b..14685e7b4f 100644
--- a/osu.Framework/Graphics/Effects/BlurEffect.cs
+++ b/osu.Framework/Graphics/Effects/BlurEffect.cs
@@ -1,10 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Effects
diff --git a/osu.Framework/Graphics/Effects/EdgeEffectParameters.cs b/osu.Framework/Graphics/Effects/EdgeEffectParameters.cs
index 47e12572fe..62b50b176d 100644
--- a/osu.Framework/Graphics/Effects/EdgeEffectParameters.cs
+++ b/osu.Framework/Graphics/Effects/EdgeEffectParameters.cs
@@ -4,7 +4,7 @@
 using System;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Effects
 {
diff --git a/osu.Framework/Graphics/Effects/GlowEffect.cs b/osu.Framework/Graphics/Effects/GlowEffect.cs
index 59768f36b9..8a13aae434 100644
--- a/osu.Framework/Graphics/Effects/GlowEffect.cs
+++ b/osu.Framework/Graphics/Effects/GlowEffect.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Effects
diff --git a/osu.Framework/Graphics/Effects/OutlineEffect.cs b/osu.Framework/Graphics/Effects/OutlineEffect.cs
index 919a9de618..d7ca4d3b8f 100644
--- a/osu.Framework/Graphics/Effects/OutlineEffect.cs
+++ b/osu.Framework/Graphics/Effects/OutlineEffect.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Effects
diff --git a/osu.Framework/Graphics/IBufferedDrawable.cs b/osu.Framework/Graphics/IBufferedDrawable.cs
index 2ebdf994dd..50cb1f2cec 100644
--- a/osu.Framework/Graphics/IBufferedDrawable.cs
+++ b/osu.Framework/Graphics/IBufferedDrawable.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Rendering;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics
diff --git a/osu.Framework/Graphics/IDrawable.cs b/osu.Framework/Graphics/IDrawable.cs
index 7128dd1a53..80d4c64719 100644
--- a/osu.Framework/Graphics/IDrawable.cs
+++ b/osu.Framework/Graphics/IDrawable.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Timing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics
 {
diff --git a/osu.Framework/Graphics/Lines/Path.DrawNode.cs b/osu.Framework/Graphics/Lines/Path.DrawNode.cs
index 2f50fe2273..9c16f41199 100644
--- a/osu.Framework/Graphics/Lines/Path.DrawNode.cs
+++ b/osu.Framework/Graphics/Lines/Path.DrawNode.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Rendering.Vertices;
 using osu.Framework.Graphics.Shaders;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics.ES30;
 
 namespace osu.Framework.Graphics.Lines
@@ -120,7 +120,7 @@ private void drawSegment(ref DrawableSegment segment, ref DrawableSegment prevSe
 
                     Vector2 dir2 = -prevSegment.DirectionNormalized;
 
-                    Vector2.Dot(ref dir, ref dir2, out float dot);
+                    float dot = Vector2.Dot(dir, dir2);
 
                     // Angle between segments is less than 90 degrees - don't draw anything and use segment start cap instead.
                     // Overdraw is inevitable anyway and this seems like a cheaper option than computing exact shape.
@@ -131,7 +131,7 @@ private void drawSegment(ref DrawableSegment segment, ref DrawableSegment prevSe
                     }
                     else
                     {
-                        Vector2.PerpDot(ref dir, ref dir2, out float pDot);
+                        float pDot = Vector2Extensions.PerpDot(dir, dir2);
                         float thetaDiff = Math.Abs(MathF.Atan(pDot / dot));
 
                         // at this small angle curvature isn't noticeable, we can get away with straight-up connecting segment to the previous one.
@@ -206,14 +206,14 @@ private void updateVertexBuffer()
                     }
 
                     Vector2 dir2 = nextVertex - segmentToDraw.StartPoint;
-                    Vector2.PerpDot(ref dir, ref dir2, out float pDot);
+                    float pDot = Vector2Extensions.PerpDot(dir, dir2);
 
                     // Expand segment if next end point is located within a line passing through it (distance from the next vertex to the segment is less than precision)
                     if (pDot * pDot / lengthSquared < precision * precision)
                     {
                         nextLocation = SegmentStartLocation.StartOrMiddle;
 
-                        Vector2.Dot(ref dir, ref dir2, out float dot);
+                        float dot = Vector2.Dot(dir, dir2);
 
                         // new vertex is located behind the segment start point, expand segment backwards
                         if (dot < 0)
diff --git a/osu.Framework/Graphics/Lines/Path.cs b/osu.Framework/Graphics/Lines/Path.cs
index 6fab8457d0..721f70e4f1 100644
--- a/osu.Framework/Graphics/Lines/Path.cs
+++ b/osu.Framework/Graphics/Lines/Path.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -6,7 +6,7 @@
 using System;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Allocation;
 using System.Collections.Generic;
diff --git a/osu.Framework/Graphics/Lines/PathBBH.cs b/osu.Framework/Graphics/Lines/PathBBH.cs
index a4f5683b62..d08c444f8e 100644
--- a/osu.Framework/Graphics/Lines/PathBBH.cs
+++ b/osu.Framework/Graphics/Lines/PathBBH.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Lines
 {
diff --git a/osu.Framework/Graphics/MarginPadding.cs b/osu.Framework/Graphics/MarginPadding.cs
index 1a688ac09e..56178dc800 100644
--- a/osu.Framework/Graphics/MarginPadding.cs
+++ b/osu.Framework/Graphics/MarginPadding.cs
@@ -1,10 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics
 {
diff --git a/osu.Framework/Graphics/OpenGL/Buffers/GLFrameBuffer.cs b/osu.Framework/Graphics/OpenGL/Buffers/GLFrameBuffer.cs
index bba7360f6d..7a37270835 100644
--- a/osu.Framework/Graphics/OpenGL/Buffers/GLFrameBuffer.cs
+++ b/osu.Framework/Graphics/OpenGL/Buffers/GLFrameBuffer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics.ES30;
 
 namespace osu.Framework.Graphics.OpenGL.Buffers
diff --git a/osu.Framework/Graphics/OpenGL/Buffers/GLRenderBuffer.cs b/osu.Framework/Graphics/OpenGL/Buffers/GLRenderBuffer.cs
index 2ee6a0aa5a..8f58a4ac42 100644
--- a/osu.Framework/Graphics/OpenGL/Buffers/GLRenderBuffer.cs
+++ b/osu.Framework/Graphics/OpenGL/Buffers/GLRenderBuffer.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
 
 using System;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics.ES30;
 
 namespace osu.Framework.Graphics.OpenGL.Buffers
diff --git a/osu.Framework/Graphics/OpenGL/GLRenderer.cs b/osu.Framework/Graphics/OpenGL/GLRenderer.cs
index c2f72fea5c..606fc888d3 100644
--- a/osu.Framework/Graphics/OpenGL/GLRenderer.cs
+++ b/osu.Framework/Graphics/OpenGL/GLRenderer.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics.OpenGL.Batches;
 using osu.Framework.Graphics.OpenGL.Buffers;
@@ -19,6 +20,9 @@
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
+using Vector3 = System.Numerics.Vector3;
+using Vector4 = System.Numerics.Vector4;
 using osuTK.Graphics;
 using osuTK.Graphics.ES30;
 using SixLabors.ImageSharp;
@@ -167,15 +171,18 @@ protected override void SetUniformImplementation<T>(IUniformWithValue<T> uniform
                     break;
 
                 case IUniformWithValue<Vector2> v2:
-                    GL.Uniform2(uniform.Location, ref v2.GetValueByRef());
+                    osuTK.Vector2 v2tk = v2.GetValue().ToOsuTK();
+                    GL.Uniform2(uniform.Location, ref v2tk);
                     break;
 
                 case IUniformWithValue<Vector3> v3:
-                    GL.Uniform3(uniform.Location, ref v3.GetValueByRef());
+                    osuTK.Vector3 v3tk = v3.GetValue().ToOsuTK();
+                    GL.Uniform3(uniform.Location, ref v3tk);
                     break;
 
                 case IUniformWithValue<Vector4> v4:
-                    GL.Uniform4(uniform.Location, ref v4.GetValueByRef());
+                    osuTK.Vector4 v4tk = v4.GetValue().ToOsuTK();
+                    GL.Uniform4(uniform.Location, ref v4tk);
                     break;
 
                 case IUniformWithValue<Matrix2> m2:
diff --git a/osu.Framework/Graphics/Performance/FrameStatisticsDisplay.cs b/osu.Framework/Graphics/Performance/FrameStatisticsDisplay.cs
index 509699036b..d813d751e6 100644
--- a/osu.Framework/Graphics/Performance/FrameStatisticsDisplay.cs
+++ b/osu.Framework/Graphics/Performance/FrameStatisticsDisplay.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -21,7 +21,7 @@
 using osu.Framework.Statistics;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework/Graphics/Performance/PerformanceOverlay.cs b/osu.Framework/Graphics/Performance/PerformanceOverlay.cs
index 2134a7f36c..c0df8bbc87 100644
--- a/osu.Framework/Graphics/Performance/PerformanceOverlay.cs
+++ b/osu.Framework/Graphics/Performance/PerformanceOverlay.cs
@@ -15,7 +15,7 @@
 using osu.Framework.Platform.SDL2;
 using osu.Framework.Platform.SDL3;
 using osu.Framework.Threading;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework/Graphics/Primitives/IPolygon.cs b/osu.Framework/Graphics/Primitives/IPolygon.cs
index b637ebada4..1dd1d60f3e 100644
--- a/osu.Framework/Graphics/Primitives/IPolygon.cs
+++ b/osu.Framework/Graphics/Primitives/IPolygon.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Primitives
 {
diff --git a/osu.Framework/Graphics/Primitives/Line.cs b/osu.Framework/Graphics/Primitives/Line.cs
index 5c6ee570eb..efc4f103bf 100644
--- a/osu.Framework/Graphics/Primitives/Line.cs
+++ b/osu.Framework/Graphics/Primitives/Line.cs
@@ -5,6 +5,7 @@
 using System.Runtime.CompilerServices;
 using osu.Framework.Utils;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Graphics.Primitives
 {
@@ -26,7 +27,7 @@ public readonly struct Line
         /// <summary>
         /// The length of the line.
         /// </summary>
-        public float Rho => (EndPoint - StartPoint).Length;
+        public float Rho => (EndPoint - StartPoint).Length();
 
         /// <summary>
         /// The direction of the second point from the first.
diff --git a/osu.Framework/Graphics/Primitives/ProjectionRange.cs b/osu.Framework/Graphics/Primitives/ProjectionRange.cs
index 97b134b764..be7ff5d668 100644
--- a/osu.Framework/Graphics/Primitives/ProjectionRange.cs
+++ b/osu.Framework/Graphics/Primitives/ProjectionRange.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Primitives
 {
diff --git a/osu.Framework/Graphics/Primitives/Quad.cs b/osu.Framework/Graphics/Primitives/Quad.cs
index 57987a9fb6..d552e7127f 100644
--- a/osu.Framework/Graphics/Primitives/Quad.cs
+++ b/osu.Framework/Graphics/Primitives/Quad.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -6,6 +6,7 @@
 using System.Runtime.InteropServices;
 using osu.Framework.Utils;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Graphics.Primitives
 {
@@ -60,10 +61,10 @@ public Matrix2 BasisTransform
                 Vector2 row1 = BottomLeft - TopLeft;
 
                 if (row0 != Vector2.Zero)
-                    row0 /= row0.LengthSquared;
+                    row0 /= row0.LengthSquared();
 
                 if (row1 != Vector2.Zero)
-                    row1 /= row1.LengthSquared;
+                    row1 /= row1.LengthSquared();
 
                 return new Matrix2(
                     row0.X, row0.Y,
@@ -142,19 +143,19 @@ public bool Contains(Vector2 pos)
             // however, NaN values may come from Infinity - Infinity subtractions in `Vector2.PerpDot`.
             // there's not much good left to be done in such cases, so we err on the side of caution and reject points that generate any NaNs on sight.
 
-            float perpDot1 = Vector2.PerpDot(BottomLeft - TopLeft, pos - TopLeft);
+            float perpDot1 = Vector2Extensions.PerpDot(BottomLeft - TopLeft, pos - TopLeft);
             if (float.IsNaN(perpDot1))
                 return false;
 
-            float perpDot2 = Vector2.PerpDot(BottomRight - BottomLeft, pos - BottomLeft);
+            float perpDot2 = Vector2Extensions.PerpDot(BottomRight - BottomLeft, pos - BottomLeft);
             if (float.IsNaN(perpDot2) || perpDot1 * perpDot2 < 0)
                 return false;
 
-            float perpDot3 = Vector2.PerpDot(TopRight - BottomRight, pos - BottomRight);
+            float perpDot3 = Vector2Extensions.PerpDot(TopRight - BottomRight, pos - BottomRight);
             if (float.IsNaN(perpDot3) || perpDot1 * perpDot3 < 0 || perpDot2 * perpDot3 < 0)
                 return false;
 
-            float perpDot4 = Vector2.PerpDot(TopLeft - TopRight, pos - TopRight);
+            float perpDot4 = Vector2Extensions.PerpDot(TopLeft - TopRight, pos - TopRight);
             if (float.IsNaN(perpDot4) || perpDot1 * perpDot4 < 0 || perpDot2 * perpDot4 < 0 || perpDot3 * perpDot4 < 0)
                 return false;
 
diff --git a/osu.Framework/Graphics/Primitives/RectangleF.cs b/osu.Framework/Graphics/Primitives/RectangleF.cs
index d1dad42586..e5e4c5e49e 100644
--- a/osu.Framework/Graphics/Primitives/RectangleF.cs
+++ b/osu.Framework/Graphics/Primitives/RectangleF.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -8,7 +8,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Primitives
 {
@@ -341,7 +341,7 @@ internal float DistanceSquared(Vector2 localSpacePos)
                 Math.Max(0.0f, Math.Max(localSpacePos.Y - Bottom, Top - localSpacePos.Y))
             );
 
-            return dist.LengthSquared;
+            return dist.LengthSquared();
         }
 
         internal float DistanceExponentiated(Vector2 localSpacePos, float exponent)
diff --git a/osu.Framework/Graphics/Primitives/RectangleI.cs b/osu.Framework/Graphics/Primitives/RectangleI.cs
index ea599ccac8..cd8778821b 100644
--- a/osu.Framework/Graphics/Primitives/RectangleI.cs
+++ b/osu.Framework/Graphics/Primitives/RectangleI.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -8,7 +8,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Primitives
 {
diff --git a/osu.Framework/Graphics/Primitives/SimpleConvexPolygon.cs b/osu.Framework/Graphics/Primitives/SimpleConvexPolygon.cs
index 10806735cc..59e9c51905 100644
--- a/osu.Framework/Graphics/Primitives/SimpleConvexPolygon.cs
+++ b/osu.Framework/Graphics/Primitives/SimpleConvexPolygon.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Linq;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Primitives
 {
diff --git a/osu.Framework/Graphics/Primitives/Triangle.cs b/osu.Framework/Graphics/Primitives/Triangle.cs
index 8134b9048d..477cc38884 100644
--- a/osu.Framework/Graphics/Primitives/Triangle.cs
+++ b/osu.Framework/Graphics/Primitives/Triangle.cs
@@ -1,10 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Graphics.Primitives
 {
diff --git a/osu.Framework/Graphics/Primitives/Vector2I.cs b/osu.Framework/Graphics/Primitives/Vector2I.cs
index 0497adae30..e526b442e3 100644
--- a/osu.Framework/Graphics/Primitives/Vector2I.cs
+++ b/osu.Framework/Graphics/Primitives/Vector2I.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -6,7 +6,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Primitives
 {
diff --git a/osu.Framework/Graphics/Rendering/Deferred/DeferredFrameBuffer.cs b/osu.Framework/Graphics/Rendering/Deferred/DeferredFrameBuffer.cs
index aa09df660c..9f9b5078db 100644
--- a/osu.Framework/Graphics/Rendering/Deferred/DeferredFrameBuffer.cs
+++ b/osu.Framework/Graphics/Rendering/Deferred/DeferredFrameBuffer.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Veldrid.Buffers;
 using osu.Framework.Graphics.Veldrid.Textures;
-using osuTK;
+using System.Numerics;
 using Veldrid;
 using Texture = osu.Framework.Graphics.Textures.Texture;
 
diff --git a/osu.Framework/Graphics/Rendering/Deferred/DeferredRenderer.cs b/osu.Framework/Graphics/Rendering/Deferred/DeferredRenderer.cs
index 713088b6f8..e8149847e9 100644
--- a/osu.Framework/Graphics/Rendering/Deferred/DeferredRenderer.cs
+++ b/osu.Framework/Graphics/Rendering/Deferred/DeferredRenderer.cs
@@ -14,7 +14,7 @@
 using osu.Framework.Graphics.Veldrid.Shaders;
 using osu.Framework.Graphics.Veldrid.Textures;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework/Graphics/Rendering/Dummy/DummyFrameBuffer.cs b/osu.Framework/Graphics/Rendering/Dummy/DummyFrameBuffer.cs
index f4a1d18a1e..f45ad9054e 100644
--- a/osu.Framework/Graphics/Rendering/Dummy/DummyFrameBuffer.cs
+++ b/osu.Framework/Graphics/Rendering/Dummy/DummyFrameBuffer.cs
@@ -3,7 +3,7 @@
 
 using System;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Rendering.Dummy
 {
diff --git a/osu.Framework/Graphics/Rendering/IFrameBuffer.cs b/osu.Framework/Graphics/Rendering/IFrameBuffer.cs
index fabbc62816..7c1358f3d5 100644
--- a/osu.Framework/Graphics/Rendering/IFrameBuffer.cs
+++ b/osu.Framework/Graphics/Rendering/IFrameBuffer.cs
@@ -3,7 +3,7 @@
 
 using System;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Rendering
 {
diff --git a/osu.Framework/Graphics/Rendering/IRenderer.cs b/osu.Framework/Graphics/Rendering/IRenderer.cs
index d22b847e7d..48d4c2941c 100644
--- a/osu.Framework/Graphics/Rendering/IRenderer.cs
+++ b/osu.Framework/Graphics/Rendering/IRenderer.cs
@@ -9,6 +9,7 @@
 using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework/Graphics/Rendering/MaskingInfo.cs b/osu.Framework/Graphics/Rendering/MaskingInfo.cs
index 8198d45b6a..ccede065f0 100644
--- a/osu.Framework/Graphics/Rendering/MaskingInfo.cs
+++ b/osu.Framework/Graphics/Rendering/MaskingInfo.cs
@@ -5,6 +5,7 @@
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Primitives;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Graphics.Rendering
 {
diff --git a/osu.Framework/Graphics/Rendering/Renderer.cs b/osu.Framework/Graphics/Rendering/Renderer.cs
index a3ed833a01..dc170672f1 100644
--- a/osu.Framework/Graphics/Rendering/Renderer.cs
+++ b/osu.Framework/Graphics/Rendering/Renderer.cs
@@ -24,6 +24,8 @@
 using osu.Framework.Threading;
 using osu.Framework.Timing;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
+using Vector4 = System.Numerics.Vector4;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework/Graphics/Rendering/RendererExtensions.cs b/osu.Framework/Graphics/Rendering/RendererExtensions.cs
index abb12631ec..57a93f9575 100644
--- a/osu.Framework/Graphics/Rendering/RendererExtensions.cs
+++ b/osu.Framework/Graphics/Rendering/RendererExtensions.cs
@@ -12,6 +12,8 @@
 using osu.Framework.Statistics;
 using osu.Framework.Utils;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
+using Vector4 = System.Numerics.Vector4;
 
 namespace osu.Framework.Graphics.Rendering
 {
diff --git a/osu.Framework/Graphics/Rendering/Vertices/ParticleVertex2D.cs b/osu.Framework/Graphics/Rendering/Vertices/ParticleVertex2D.cs
index c352a2b949..ccb0c8e252 100644
--- a/osu.Framework/Graphics/Rendering/Vertices/ParticleVertex2D.cs
+++ b/osu.Framework/Graphics/Rendering/Vertices/ParticleVertex2D.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Graphics.ES30;
 
diff --git a/osu.Framework/Graphics/Rendering/Vertices/TexturedVertex2D.cs b/osu.Framework/Graphics/Rendering/Vertices/TexturedVertex2D.cs
index 808d46314b..03e779241b 100644
--- a/osu.Framework/Graphics/Rendering/Vertices/TexturedVertex2D.cs
+++ b/osu.Framework/Graphics/Rendering/Vertices/TexturedVertex2D.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Graphics.ES30;
 
diff --git a/osu.Framework/Graphics/Rendering/Vertices/TexturedVertex3D.cs b/osu.Framework/Graphics/Rendering/Vertices/TexturedVertex3D.cs
index 34bcbac314..866c3234e3 100644
--- a/osu.Framework/Graphics/Rendering/Vertices/TexturedVertex3D.cs
+++ b/osu.Framework/Graphics/Rendering/Vertices/TexturedVertex3D.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Graphics.ES30;
 
diff --git a/osu.Framework/Graphics/Rendering/Vertices/TimedTexturedVertex2D.cs b/osu.Framework/Graphics/Rendering/Vertices/TimedTexturedVertex2D.cs
index 2ce3663f7f..26b4cc9c35 100644
--- a/osu.Framework/Graphics/Rendering/Vertices/TimedTexturedVertex2D.cs
+++ b/osu.Framework/Graphics/Rendering/Vertices/TimedTexturedVertex2D.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Graphics.ES30;
 
diff --git a/osu.Framework/Graphics/Rendering/Vertices/UncolouredVertex2D.cs b/osu.Framework/Graphics/Rendering/Vertices/UncolouredVertex2D.cs
index b2dbb1f048..7d1f526af5 100644
--- a/osu.Framework/Graphics/Rendering/Vertices/UncolouredVertex2D.cs
+++ b/osu.Framework/Graphics/Rendering/Vertices/UncolouredVertex2D.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics.ES30;
 
 namespace osu.Framework.Graphics.Rendering.Vertices
diff --git a/osu.Framework/Graphics/Rendering/Vertices/Vertex2D.cs b/osu.Framework/Graphics/Rendering/Vertices/Vertex2D.cs
index d530fb2b47..1b171a0b62 100644
--- a/osu.Framework/Graphics/Rendering/Vertices/Vertex2D.cs
+++ b/osu.Framework/Graphics/Rendering/Vertices/Vertex2D.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Graphics.ES30;
 
diff --git a/osu.Framework/Graphics/Shaders/Types/UniformMatrix3.cs b/osu.Framework/Graphics/Shaders/Types/UniformMatrix3.cs
index 864b2d1dfd..8e23fe8174 100644
--- a/osu.Framework/Graphics/Shaders/Types/UniformMatrix3.cs
+++ b/osu.Framework/Graphics/Shaders/Types/UniformMatrix3.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Runtime.InteropServices;
+using osu.Framework.Extensions;
 using osuTK;
 
 namespace osu.Framework.Graphics.Shaders.Types
@@ -18,16 +19,16 @@ public record struct UniformMatrix3
 
         public static implicit operator Matrix3(UniformMatrix3 matrix) => new Matrix3
         {
-            Row0 = matrix.Row0,
-            Row1 = matrix.Row1,
-            Row2 = matrix.Row2
+            Row0 = ((System.Numerics.Vector3)matrix.Row0).ToOsuTK(),
+            Row1 = ((System.Numerics.Vector3)matrix.Row1).ToOsuTK(),
+            Row2 = ((System.Numerics.Vector3)matrix.Row2).ToOsuTK()
         };
 
         public static implicit operator UniformMatrix3(Matrix3 matrix) => new UniformMatrix3
         {
-            Row0 = matrix.Row0,
-            Row1 = matrix.Row1,
-            Row2 = matrix.Row2
+            Row0 = matrix.Row0.ToSystemNumerics(),
+            Row1 = matrix.Row1.ToSystemNumerics(),
+            Row2 = matrix.Row2.ToSystemNumerics()
         };
     }
 }
diff --git a/osu.Framework/Graphics/Shaders/Types/UniformMatrix4.cs b/osu.Framework/Graphics/Shaders/Types/UniformMatrix4.cs
index bd0ced4549..a6b1248542 100644
--- a/osu.Framework/Graphics/Shaders/Types/UniformMatrix4.cs
+++ b/osu.Framework/Graphics/Shaders/Types/UniformMatrix4.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Runtime.InteropServices;
+using osu.Framework.Extensions;
 using osuTK;
 
 namespace osu.Framework.Graphics.Shaders.Types
@@ -19,18 +20,18 @@ public record struct UniformMatrix4
 
         public static implicit operator Matrix4(UniformMatrix4 matrix) => new Matrix4
         {
-            Row0 = matrix.Row0,
-            Row1 = matrix.Row1,
-            Row2 = matrix.Row2,
-            Row3 = matrix.Row3
+            Row0 = ((System.Numerics.Vector4)matrix.Row0).ToOsuTK(),
+            Row1 = ((System.Numerics.Vector4)matrix.Row1).ToOsuTK(),
+            Row2 = ((System.Numerics.Vector4)matrix.Row2).ToOsuTK(),
+            Row3 = ((System.Numerics.Vector4)matrix.Row3).ToOsuTK()
         };
 
         public static implicit operator UniformMatrix4(Matrix4 matrix) => new UniformMatrix4
         {
-            Row0 = matrix.Row0,
-            Row1 = matrix.Row1,
-            Row2 = matrix.Row2,
-            Row3 = matrix.Row3
+            Row0 = matrix.Row0.ToSystemNumerics(),
+            Row1 = matrix.Row1.ToSystemNumerics(),
+            Row2 = matrix.Row2.ToSystemNumerics(),
+            Row3 = matrix.Row3.ToSystemNumerics()
         };
     }
 }
diff --git a/osu.Framework/Graphics/Shaders/Types/UniformVector2.cs b/osu.Framework/Graphics/Shaders/Types/UniformVector2.cs
index fe65a30a5e..f4d7c2c5aa 100644
--- a/osu.Framework/Graphics/Shaders/Types/UniformVector2.cs
+++ b/osu.Framework/Graphics/Shaders/Types/UniformVector2.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Shaders.Types
 {
diff --git a/osu.Framework/Graphics/Shaders/Types/UniformVector3.cs b/osu.Framework/Graphics/Shaders/Types/UniformVector3.cs
index c8ff493e6b..5d6b6e0e95 100644
--- a/osu.Framework/Graphics/Shaders/Types/UniformVector3.cs
+++ b/osu.Framework/Graphics/Shaders/Types/UniformVector3.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Shaders.Types
 {
diff --git a/osu.Framework/Graphics/Shaders/Types/UniformVector4.cs b/osu.Framework/Graphics/Shaders/Types/UniformVector4.cs
index 5061688722..6aad6d4f41 100644
--- a/osu.Framework/Graphics/Shaders/Types/UniformVector4.cs
+++ b/osu.Framework/Graphics/Shaders/Types/UniformVector4.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Runtime.InteropServices;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Shaders.Types
 {
diff --git a/osu.Framework/Graphics/Shapes/Box.cs b/osu.Framework/Graphics/Shapes/Box.cs
index f9dad2caf7..b6c007b98f 100644
--- a/osu.Framework/Graphics/Shapes/Box.cs
+++ b/osu.Framework/Graphics/Shapes/Box.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Shapes
 {
diff --git a/osu.Framework/Graphics/Shapes/EquilateralTriangle.cs b/osu.Framework/Graphics/Shapes/EquilateralTriangle.cs
index 98149b8dd8..9d12688f10 100644
--- a/osu.Framework/Graphics/Shapes/EquilateralTriangle.cs
+++ b/osu.Framework/Graphics/Shapes/EquilateralTriangle.cs
@@ -1,7 +1,7 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Shapes
 {
diff --git a/osu.Framework/Graphics/Shapes/FastCircle.cs b/osu.Framework/Graphics/Shapes/FastCircle.cs
index 3342b6e522..2f8b9c0d2e 100644
--- a/osu.Framework/Graphics/Shapes/FastCircle.cs
+++ b/osu.Framework/Graphics/Shapes/FastCircle.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Rendering.Vertices;
 using osu.Framework.Graphics.Shaders;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Shapes
 {
diff --git a/osu.Framework/Graphics/Shapes/Triangle.cs b/osu.Framework/Graphics/Shapes/Triangle.cs
index 45e2d9200c..0bbdeab5f8 100644
--- a/osu.Framework/Graphics/Shapes/Triangle.cs
+++ b/osu.Framework/Graphics/Shapes/Triangle.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Shapes
 {
diff --git a/osu.Framework/Graphics/Sprites/NineSliceSprite.cs b/osu.Framework/Graphics/Sprites/NineSliceSprite.cs
index 85c44e9399..a23d14a9e2 100644
--- a/osu.Framework/Graphics/Sprites/NineSliceSprite.cs
+++ b/osu.Framework/Graphics/Sprites/NineSliceSprite.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Sprites
 {
diff --git a/osu.Framework/Graphics/Sprites/Sprite.cs b/osu.Framework/Graphics/Sprites/Sprite.cs
index 04cc0d4e40..7b2bd9ee6c 100644
--- a/osu.Framework/Graphics/Sprites/Sprite.cs
+++ b/osu.Framework/Graphics/Sprites/Sprite.cs
@@ -5,11 +5,12 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Layout;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Sprites
 {
@@ -193,7 +194,7 @@ private Vector2 computeInflationAmount()
             if (EdgeSmoothness == Vector2.Zero)
                 return Vector2.Zero;
 
-            return DrawInfo.MatrixInverse.ExtractScale().Xy * EdgeSmoothness;
+            return DrawInfo.MatrixInverse.ExtractScale().Xy.ToSystemNumerics() * EdgeSmoothness;
         }
 
         protected override Quad ComputeScreenSpaceDrawQuad()
@@ -229,12 +230,12 @@ protected virtual Quad ComputeConservativeScreenSpaceDrawQuad()
 
             // RectangleF texRect = RelativeDrawTextureRectangle;
             // Vector2 shrinkageAmount = Vector2.Divide(texRect.Size * (1 << IRenderer.MAX_MIPMAP_LEVELS) / 2, Texture.Size);
-            // shrinkageAmount = Vector2.ComponentMin(shrinkageAmount, texRect.Size / 2);
+            // shrinkageAmount = Vector2.Min(shrinkageAmount, texRect.Size / 2);
             // texRect = texRect.Inflate(-shrinkageAmount);
             //
             // return ToScreenSpace(texRect * DrawSize);
 
-            Vector3 scale = DrawInfo.MatrixInverse.ExtractScale();
+            var scale = DrawInfo.MatrixInverse.ExtractScale();
             RectangleF rectangle = DrawTextureRectangle;
 
             // If the texture wraps or is clamped to its edge in some direction, then the entire
@@ -252,7 +253,7 @@ protected virtual Quad ComputeConservativeScreenSpaceDrawQuad()
                 rectangle.Height = DrawHeight;
             }
 
-            Vector2 shrinkageAmount = Vector2.ComponentMin(scale.Xy, rectangle.Size / 2);
+            Vector2 shrinkageAmount = Vector2.Min(scale.Xy.ToSystemNumerics(), rectangle.Size / 2);
 
             return ToScreenSpace(rectangle.Inflate(-shrinkageAmount));
         }
diff --git a/osu.Framework/Graphics/Sprites/SpriteDrawNode.cs b/osu.Framework/Graphics/Sprites/SpriteDrawNode.cs
index 0faa667afd..b76750d9e6 100644
--- a/osu.Framework/Graphics/Sprites/SpriteDrawNode.cs
+++ b/osu.Framework/Graphics/Sprites/SpriteDrawNode.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Sprites
 {
diff --git a/osu.Framework/Graphics/Sprites/SpriteIcon.cs b/osu.Framework/Graphics/Sprites/SpriteIcon.cs
index 9bb7aad956..cc9db04901 100644
--- a/osu.Framework/Graphics/Sprites/SpriteIcon.cs
+++ b/osu.Framework/Graphics/Sprites/SpriteIcon.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Sprites
diff --git a/osu.Framework/Graphics/Sprites/SpriteText.DrawNode.cs b/osu.Framework/Graphics/Sprites/SpriteText.DrawNode.cs
index 5657a4c700..53f43737e0 100644
--- a/osu.Framework/Graphics/Sprites/SpriteText.DrawNode.cs
+++ b/osu.Framework/Graphics/Sprites/SpriteText.DrawNode.cs
@@ -1,14 +1,15 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Sprites
@@ -96,7 +97,7 @@ private void updateScreenSpaceCharacters()
                     parts.EnsureCapacity(partCount);
                 }
 
-                Vector2 inflationAmount = DrawInfo.MatrixInverse.ExtractScale().Xy;
+                Vector2 inflationAmount = DrawInfo.MatrixInverse.ExtractScale().Xy.ToSystemNumerics();
 
                 foreach (var character in Source.characters)
                 {
diff --git a/osu.Framework/Graphics/Sprites/SpriteText.cs b/osu.Framework/Graphics/Sprites/SpriteText.cs
index d39d5361e9..ae16593553 100644
--- a/osu.Framework/Graphics/Sprites/SpriteText.cs
+++ b/osu.Framework/Graphics/Sprites/SpriteText.cs
@@ -17,7 +17,7 @@
 using osu.Framework.Localisation;
 using osu.Framework.Text;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Sprites
diff --git a/osu.Framework/Graphics/Textures/Texture.cs b/osu.Framework/Graphics/Textures/Texture.cs
index fb93dcf0ce..9e3492759e 100644
--- a/osu.Framework/Graphics/Textures/Texture.cs
+++ b/osu.Framework/Graphics/Textures/Texture.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Visualisation;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Textures
 {
diff --git a/osu.Framework/Graphics/TransformSequenceExtensions.cs b/osu.Framework/Graphics/TransformSequenceExtensions.cs
index 9caadc0ea3..f107c7a9bf 100644
--- a/osu.Framework/Graphics/TransformSequenceExtensions.cs
+++ b/osu.Framework/Graphics/TransformSequenceExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Threading;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics
diff --git a/osu.Framework/Graphics/TransformableExtensions.cs b/osu.Framework/Graphics/TransformableExtensions.cs
index 0706d5d9de..378f472a5a 100644
--- a/osu.Framework/Graphics/TransformableExtensions.cs
+++ b/osu.Framework/Graphics/TransformableExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics
diff --git a/osu.Framework/Graphics/Transforms/CubicBezierEasingFunction.cs b/osu.Framework/Graphics/Transforms/CubicBezierEasingFunction.cs
index 189da2ea89..5b4f963438 100644
--- a/osu.Framework/Graphics/Transforms/CubicBezierEasingFunction.cs
+++ b/osu.Framework/Graphics/Transforms/CubicBezierEasingFunction.cs
@@ -3,7 +3,7 @@
 
 using System;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Transforms
 {
diff --git a/osu.Framework/Graphics/Transforms/Spring.cs b/osu.Framework/Graphics/Transforms/Spring.cs
index ca5766675a..c460c5cefa 100644
--- a/osu.Framework/Graphics/Transforms/Spring.cs
+++ b/osu.Framework/Graphics/Transforms/Spring.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Transforms
 {
diff --git a/osu.Framework/Graphics/UserInterface/BasicCheckbox.cs b/osu.Framework/Graphics/UserInterface/BasicCheckbox.cs
index cc77d4fc1a..7f8f3e0a55 100644
--- a/osu.Framework/Graphics/UserInterface/BasicCheckbox.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicCheckbox.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.UserInterface
diff --git a/osu.Framework/Graphics/UserInterface/BasicDirectorySelector.cs b/osu.Framework/Graphics/UserInterface/BasicDirectorySelector.cs
index 33d11129e6..f4d4a9cc07 100644
--- a/osu.Framework/Graphics/UserInterface/BasicDirectorySelector.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicDirectorySelector.cs
@@ -6,7 +6,7 @@
 using System.IO;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorBreadcrumbDisplay.cs b/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorBreadcrumbDisplay.cs
index ee3a8beaae..4ff3619a0a 100644
--- a/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorBreadcrumbDisplay.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicDirectorySelectorBreadcrumbDisplay.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/BasicFileSelector.cs b/osu.Framework/Graphics/UserInterface/BasicFileSelector.cs
index 4d2cd50736..784553accc 100644
--- a/osu.Framework/Graphics/UserInterface/BasicFileSelector.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicFileSelector.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/BasicHSVColourPicker.cs b/osu.Framework/Graphics/UserInterface/BasicHSVColourPicker.cs
index 567b979df5..b285485414 100644
--- a/osu.Framework/Graphics/UserInterface/BasicHSVColourPicker.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicHSVColourPicker.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/BasicPopover.cs b/osu.Framework/Graphics/UserInterface/BasicPopover.cs
index 39514d0e6b..2cfef68512 100644
--- a/osu.Framework/Graphics/UserInterface/BasicPopover.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicPopover.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/BasicRearrangeableListContainer.cs b/osu.Framework/Graphics/UserInterface/BasicRearrangeableListContainer.cs
index 6796bb5a6c..575fed62e1 100644
--- a/osu.Framework/Graphics/UserInterface/BasicRearrangeableListContainer.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicRearrangeableListContainer.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.UserInterface
diff --git a/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs b/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs
index 1cf67501cd..d6a3f48df6 100644
--- a/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs
@@ -5,7 +5,6 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osuTK.Graphics;
-using Vector2 = osuTK.Vector2;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/BasicTextBox.cs b/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
index 381699178e..76dd90e758 100644
--- a/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions.Color4Extensions;
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.UserInterface
diff --git a/osu.Framework/Graphics/UserInterface/Caret.cs b/osu.Framework/Graphics/UserInterface/Caret.cs
index 4c6189640d..fe03c109cf 100644
--- a/osu.Framework/Graphics/UserInterface/Caret.cs
+++ b/osu.Framework/Graphics/UserInterface/Caret.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Containers;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/CircularBlob.cs b/osu.Framework/Graphics/UserInterface/CircularBlob.cs
index bb9e02cfa5..90bad6037d 100644
--- a/osu.Framework/Graphics/UserInterface/CircularBlob.cs
+++ b/osu.Framework/Graphics/UserInterface/CircularBlob.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Shaders.Types;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/CircularProgress.cs b/osu.Framework/Graphics/UserInterface/CircularProgress.cs
index b992902b23..7b85cd716b 100644
--- a/osu.Framework/Graphics/UserInterface/CircularProgress.cs
+++ b/osu.Framework/Graphics/UserInterface/CircularProgress.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Graphics.Shaders.Types;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelector.cs b/osu.Framework/Graphics/UserInterface/DirectorySelector.cs
index d2ef6bfccf..fe71b029e9 100644
--- a/osu.Framework/Graphics/UserInterface/DirectorySelector.cs
+++ b/osu.Framework/Graphics/UserInterface/DirectorySelector.cs
@@ -13,7 +13,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelectorBreadcrumbDisplay.cs b/osu.Framework/Graphics/UserInterface/DirectorySelectorBreadcrumbDisplay.cs
index fb8d045ae6..9999cbe75a 100644
--- a/osu.Framework/Graphics/UserInterface/DirectorySelectorBreadcrumbDisplay.cs
+++ b/osu.Framework/Graphics/UserInterface/DirectorySelectorBreadcrumbDisplay.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/DirectorySelectorItem.cs b/osu.Framework/Graphics/UserInterface/DirectorySelectorItem.cs
index 9af9913f4b..56e037c339 100644
--- a/osu.Framework/Graphics/UserInterface/DirectorySelectorItem.cs
+++ b/osu.Framework/Graphics/UserInterface/DirectorySelectorItem.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/DropdownSearchBar.cs b/osu.Framework/Graphics/UserInterface/DropdownSearchBar.cs
index 0f6dbd3814..48b7972f2a 100644
--- a/osu.Framework/Graphics/UserInterface/DropdownSearchBar.cs
+++ b/osu.Framework/Graphics/UserInterface/DropdownSearchBar.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/HSVColourPicker.HueSelector.cs b/osu.Framework/Graphics/UserInterface/HSVColourPicker.HueSelector.cs
index 2805b86ad5..65a3c900b7 100644
--- a/osu.Framework/Graphics/UserInterface/HSVColourPicker.HueSelector.cs
+++ b/osu.Framework/Graphics/UserInterface/HSVColourPicker.HueSelector.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/HSVColourPicker.SaturationValueSelector.cs b/osu.Framework/Graphics/UserInterface/HSVColourPicker.SaturationValueSelector.cs
index 16feb64665..72a8aa3b0e 100644
--- a/osu.Framework/Graphics/UserInterface/HSVColourPicker.SaturationValueSelector.cs
+++ b/osu.Framework/Graphics/UserInterface/HSVColourPicker.SaturationValueSelector.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.UserInterface
diff --git a/osu.Framework/Graphics/UserInterface/Menu.cs b/osu.Framework/Graphics/UserInterface/Menu.cs
index 5c7c234600..1540043121 100644
--- a/osu.Framework/Graphics/UserInterface/Menu.cs
+++ b/osu.Framework/Graphics/UserInterface/Menu.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -18,7 +18,7 @@
 using osu.Framework.Localisation;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework/Graphics/UserInterface/Popover.cs b/osu.Framework/Graphics/UserInterface/Popover.cs
index 48e60e5ee0..6f50a705aa 100644
--- a/osu.Framework/Graphics/UserInterface/Popover.cs
+++ b/osu.Framework/Graphics/UserInterface/Popover.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -11,7 +11,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Graphics.UserInterface
diff --git a/osu.Framework/Graphics/UserInterface/SliderBar.cs b/osu.Framework/Graphics/UserInterface/SliderBar.cs
index 14c0298bbc..3ae6660a7f 100644
--- a/osu.Framework/Graphics/UserInterface/SliderBar.cs
+++ b/osu.Framework/Graphics/UserInterface/SliderBar.cs
@@ -7,7 +7,6 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osuTK.Input;
-using Vector2 = osuTK.Vector2;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/TabControl.cs b/osu.Framework/Graphics/UserInterface/TabControl.cs
index c386a16b0b..346b941ef9 100644
--- a/osu.Framework/Graphics/UserInterface/TabControl.cs
+++ b/osu.Framework/Graphics/UserInterface/TabControl.cs
@@ -14,7 +14,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.UserInterface
 {
diff --git a/osu.Framework/Graphics/UserInterface/TextBox.cs b/osu.Framework/Graphics/UserInterface/TextBox.cs
index 63e09128ea..9da82c8947 100644
--- a/osu.Framework/Graphics/UserInterface/TextBox.cs
+++ b/osu.Framework/Graphics/UserInterface/TextBox.cs
@@ -25,7 +25,7 @@
 using osu.Framework.Localisation;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Graphics.UserInterface
diff --git a/osu.Framework/Graphics/Vector2Extensions.cs b/osu.Framework/Graphics/Vector2Extensions.cs
index 69bb00d0ce..5d2818cdff 100644
--- a/osu.Framework/Graphics/Vector2Extensions.cs
+++ b/osu.Framework/Graphics/Vector2Extensions.cs
@@ -1,10 +1,12 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 using osu.Framework.Graphics.Primitives;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Graphics
 {
@@ -26,8 +28,9 @@ public static Vector2 Transform(Vector2 pos, Matrix3 mat)
         /// <param name="result">The transformed vector</param>
         public static void Transform(ref Vector2 pos, ref Matrix3 mat, out Vector2 result)
         {
-            result.X = mat.Row0.X * pos.X + mat.Row1.X * pos.Y + mat.Row2.X;
-            result.Y = mat.Row0.Y * pos.X + mat.Row1.Y * pos.Y + mat.Row2.Y;
+            result = new Vector2(
+                mat.Row0.X * pos.X + mat.Row1.X * pos.Y + mat.Row2.X,
+                mat.Row0.Y * pos.X + mat.Row1.Y * pos.Y + mat.Row2.Y);
         }
 
         /// <summary>
@@ -108,5 +111,30 @@ public static float GetOrientation(in ReadOnlySpan<Vector2> vertices)
         public static bool InRightHalfPlaneOf(this Vector2 point, in Line line)
             => (line.EndPoint.X - line.StartPoint.X) * (point.Y - line.StartPoint.Y)
                 - (line.EndPoint.Y - line.StartPoint.Y) * (point.X - line.StartPoint.X) < 0;
+
+        /// <summary>Returns a normalized (unit-length) copy of the vector.</summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector2 Normalized(this Vector2 v) => Vector2.Normalize(v);
+
+        /// <summary>Computes the perpendicular dot product (2D cross product) of two vectors.</summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static float PerpDot(Vector2 a, Vector2 b) => a.X * b.Y - a.Y * b.X;
+
+        /// <summary>Computes the perpendicular dot product (2D cross product) of two vectors.</summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void PerpDot(ref Vector2 a, ref Vector2 b, out float result) =>
+            result = a.X * b.Y - a.Y * b.X;
+
+        /// <summary>Returns a normalized (unit-length) copy of the vector (fast approximation, same as <see cref="Normalized"/>).</summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector2 NormalizeFast(Vector2 v) => Vector2.Normalize(v);
+
+        /// <summary>Returns the vector perpendicular to the right: (Y, -X).</summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector2 PerpendicularRight(this Vector2 v) => new Vector2(v.Y, -v.X);
+
+        /// <summary>Returns the vector perpendicular to the left: (-Y, X).</summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector2 PerpendicularLeft(this Vector2 v) => new Vector2(-v.Y, v.X);
     }
 }
diff --git a/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs b/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs
index fc0ea46990..642eb19cbd 100644
--- a/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs
+++ b/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Veldrid.Textures;
-using osuTK;
+using System.Numerics;
 using Veldrid;
 using Texture = Veldrid.Texture;
 
diff --git a/osu.Framework/Graphics/Veldrid/VeldridRenderer.cs b/osu.Framework/Graphics/Veldrid/VeldridRenderer.cs
index ad06e720b9..a57ce5d472 100644
--- a/osu.Framework/Graphics/Veldrid/VeldridRenderer.cs
+++ b/osu.Framework/Graphics/Veldrid/VeldridRenderer.cs
@@ -16,7 +16,7 @@
 using osu.Framework.Graphics.Veldrid.Textures;
 using osu.Framework.Graphics.Veldrid.Vertices;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework/Graphics/Video/Video.cs b/osu.Framework/Graphics/Video/Video.cs
index 30d9975c89..26b61d0fde 100644
--- a/osu.Framework/Graphics/Video/Video.cs
+++ b/osu.Framework/Graphics/Video/Video.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -14,6 +14,7 @@
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Graphics.Video
 {
diff --git a/osu.Framework/Graphics/Visualisation/Audio/AudioChannelDisplay.cs b/osu.Framework/Graphics/Visualisation/Audio/AudioChannelDisplay.cs
index f2e7a75c0f..e1d0c520e7 100644
--- a/osu.Framework/Graphics/Visualisation/Audio/AudioChannelDisplay.cs
+++ b/osu.Framework/Graphics/Visualisation/Audio/AudioChannelDisplay.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Visualisation.Audio
 {
diff --git a/osu.Framework/Graphics/Visualisation/Audio/AudioMixerVisualiser.cs b/osu.Framework/Graphics/Visualisation/Audio/AudioMixerVisualiser.cs
index ab2eb04131..7fc1efb039 100644
--- a/osu.Framework/Graphics/Visualisation/Audio/AudioMixerVisualiser.cs
+++ b/osu.Framework/Graphics/Visualisation/Audio/AudioMixerVisualiser.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Audio.Mixing;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Visualisation.Audio
 {
diff --git a/osu.Framework/Graphics/Visualisation/Audio/MixerDisplay.cs b/osu.Framework/Graphics/Visualisation/Audio/MixerDisplay.cs
index be15983b4a..bf1021a966 100644
--- a/osu.Framework/Graphics/Visualisation/Audio/MixerDisplay.cs
+++ b/osu.Framework/Graphics/Visualisation/Audio/MixerDisplay.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Visualisation.Audio
diff --git a/osu.Framework/Graphics/Visualisation/DrawVisualiser.cs b/osu.Framework/Graphics/Visualisation/DrawVisualiser.cs
index cebf614f59..3969eefb4a 100644
--- a/osu.Framework/Graphics/Visualisation/DrawVisualiser.cs
+++ b/osu.Framework/Graphics/Visualisation/DrawVisualiser.cs
@@ -17,7 +17,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Visualisation
 {
diff --git a/osu.Framework/Graphics/Visualisation/DrawableScreenshotter.cs b/osu.Framework/Graphics/Visualisation/DrawableScreenshotter.cs
index 799bedd3f1..2a4cbf2177 100644
--- a/osu.Framework/Graphics/Visualisation/DrawableScreenshotter.cs
+++ b/osu.Framework/Graphics/Visualisation/DrawableScreenshotter.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/osu.Framework/Graphics/Visualisation/DrawableTransform.cs b/osu.Framework/Graphics/Visualisation/DrawableTransform.cs
index cbe8c935d1..6b9489594a 100644
--- a/osu.Framework/Graphics/Visualisation/DrawableTransform.cs
+++ b/osu.Framework/Graphics/Visualisation/DrawableTransform.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Visualisation
diff --git a/osu.Framework/Graphics/Visualisation/InfoOverlay.cs b/osu.Framework/Graphics/Visualisation/InfoOverlay.cs
index bf7c31a28c..3bd8f1b363 100644
--- a/osu.Framework/Graphics/Visualisation/InfoOverlay.cs
+++ b/osu.Framework/Graphics/Visualisation/InfoOverlay.cs
@@ -5,7 +5,7 @@
 
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Visualisation
diff --git a/osu.Framework/Graphics/Visualisation/LogOverlay.cs b/osu.Framework/Graphics/Visualisation/LogOverlay.cs
index 9f75715b03..0a74afb34b 100644
--- a/osu.Framework/Graphics/Visualisation/LogOverlay.cs
+++ b/osu.Framework/Graphics/Visualisation/LogOverlay.cs
@@ -11,7 +11,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Framework.Timing;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework/Graphics/Visualisation/PropertyDisplay.cs b/osu.Framework/Graphics/Visualisation/PropertyDisplay.cs
index 973647eff6..2c111b9def 100644
--- a/osu.Framework/Graphics/Visualisation/PropertyDisplay.cs
+++ b/osu.Framework/Graphics/Visualisation/PropertyDisplay.cs
@@ -19,6 +19,7 @@
 using osu.Framework.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Graphics.Visualisation
 {
diff --git a/osu.Framework/Graphics/Visualisation/TextureVisualiser.cs b/osu.Framework/Graphics/Visualisation/TextureVisualiser.cs
index 4ed9d0666f..cf5060d3a8 100644
--- a/osu.Framework/Graphics/Visualisation/TextureVisualiser.cs
+++ b/osu.Framework/Graphics/Visualisation/TextureVisualiser.cs
@@ -17,7 +17,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Graphics.Visualisation
diff --git a/osu.Framework/Graphics/Visualisation/TitleBar.cs b/osu.Framework/Graphics/Visualisation/TitleBar.cs
index 4ced440d09..184234baf9 100644
--- a/osu.Framework/Graphics/Visualisation/TitleBar.cs
+++ b/osu.Framework/Graphics/Visualisation/TitleBar.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Visualisation
 {
diff --git a/osu.Framework/Graphics/Visualisation/ToolWindow.cs b/osu.Framework/Graphics/Visualisation/ToolWindow.cs
index 214de44671..0a322d8b52 100644
--- a/osu.Framework/Graphics/Visualisation/ToolWindow.cs
+++ b/osu.Framework/Graphics/Visualisation/ToolWindow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Visualisation
 {
diff --git a/osu.Framework/Graphics/Visualisation/TransformDisplay.cs b/osu.Framework/Graphics/Visualisation/TransformDisplay.cs
index 825e5e01dd..df92b4eab9 100644
--- a/osu.Framework/Graphics/Visualisation/TransformDisplay.cs
+++ b/osu.Framework/Graphics/Visualisation/TransformDisplay.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Graphics.Visualisation
 {
diff --git a/osu.Framework/Graphics/Visualisation/VisualisedDrawable.cs b/osu.Framework/Graphics/Visualisation/VisualisedDrawable.cs
index ff7b722d63..faa0826823 100644
--- a/osu.Framework/Graphics/Visualisation/VisualisedDrawable.cs
+++ b/osu.Framework/Graphics/Visualisation/VisualisedDrawable.cs
@@ -17,7 +17,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework/IO/Serialization/Vector2Converter.cs b/osu.Framework/IO/Serialization/Vector2Converter.cs
index d6ebee3133..4e503f7cd4 100644
--- a/osu.Framework/IO/Serialization/Vector2Converter.cs
+++ b/osu.Framework/IO/Serialization/Vector2Converter.cs
@@ -6,7 +6,7 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.IO.Serialization
 {
diff --git a/osu.Framework/Input/Bindings/KeyBindingContainer.cs b/osu.Framework/Input/Bindings/KeyBindingContainer.cs
index fe795cac8f..ca74667aeb 100644
--- a/osu.Framework/Input/Bindings/KeyBindingContainer.cs
+++ b/osu.Framework/Input/Bindings/KeyBindingContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -13,7 +13,7 @@
 using osu.Framework.Input.States;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Bindings
 {
diff --git a/osu.Framework/Input/Bindings/KeyCombination.cs b/osu.Framework/Input/Bindings/KeyCombination.cs
index adef2a8ebc..a2b12092c9 100644
--- a/osu.Framework/Input/Bindings/KeyCombination.cs
+++ b/osu.Framework/Input/Bindings/KeyCombination.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -9,7 +9,7 @@
 using System.Runtime.CompilerServices;
 using osu.Framework.Extensions;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.Bindings
diff --git a/osu.Framework/Input/Events/ClickEvent.cs b/osu.Framework/Input/Events/ClickEvent.cs
index 60e76d156e..952f255fe5 100644
--- a/osu.Framework/Input/Events/ClickEvent.cs
+++ b/osu.Framework/Input/Events/ClickEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.Events
diff --git a/osu.Framework/Input/Events/DoubleClickEvent.cs b/osu.Framework/Input/Events/DoubleClickEvent.cs
index 17ce9a8fa2..a59acebc47 100644
--- a/osu.Framework/Input/Events/DoubleClickEvent.cs
+++ b/osu.Framework/Input/Events/DoubleClickEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.Events
diff --git a/osu.Framework/Input/Events/DragEndEvent.cs b/osu.Framework/Input/Events/DragEndEvent.cs
index 9ea803d7d0..90424c98f7 100644
--- a/osu.Framework/Input/Events/DragEndEvent.cs
+++ b/osu.Framework/Input/Events/DragEndEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.Events
diff --git a/osu.Framework/Input/Events/DragEvent.cs b/osu.Framework/Input/Events/DragEvent.cs
index 1b451a3828..aee91d3d19 100644
--- a/osu.Framework/Input/Events/DragEvent.cs
+++ b/osu.Framework/Input/Events/DragEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.Events
diff --git a/osu.Framework/Input/Events/DragStartEvent.cs b/osu.Framework/Input/Events/DragStartEvent.cs
index 8362acd307..7a42862560 100644
--- a/osu.Framework/Input/Events/DragStartEvent.cs
+++ b/osu.Framework/Input/Events/DragStartEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.Events
diff --git a/osu.Framework/Input/Events/MouseButtonEvent.cs b/osu.Framework/Input/Events/MouseButtonEvent.cs
index 201bacd1d7..580fd1e6d3 100644
--- a/osu.Framework/Input/Events/MouseButtonEvent.cs
+++ b/osu.Framework/Input/Events/MouseButtonEvent.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.Events
diff --git a/osu.Framework/Input/Events/MouseDownEvent.cs b/osu.Framework/Input/Events/MouseDownEvent.cs
index 01b4f340a3..5b96929408 100644
--- a/osu.Framework/Input/Events/MouseDownEvent.cs
+++ b/osu.Framework/Input/Events/MouseDownEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.Events
diff --git a/osu.Framework/Input/Events/MouseMoveEvent.cs b/osu.Framework/Input/Events/MouseMoveEvent.cs
index 3118447e41..574f2a5c5a 100644
--- a/osu.Framework/Input/Events/MouseMoveEvent.cs
+++ b/osu.Framework/Input/Events/MouseMoveEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Events
 {
diff --git a/osu.Framework/Input/Events/MouseUpEvent.cs b/osu.Framework/Input/Events/MouseUpEvent.cs
index f0e9acea7b..db871f6fa3 100644
--- a/osu.Framework/Input/Events/MouseUpEvent.cs
+++ b/osu.Framework/Input/Events/MouseUpEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.Events
diff --git a/osu.Framework/Input/Events/ScrollEvent.cs b/osu.Framework/Input/Events/ScrollEvent.cs
index d5dd77a109..035f43719d 100644
--- a/osu.Framework/Input/Events/ScrollEvent.cs
+++ b/osu.Framework/Input/Events/ScrollEvent.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Events
 {
diff --git a/osu.Framework/Input/Events/TouchEvent.cs b/osu.Framework/Input/Events/TouchEvent.cs
index 524846f811..de1c7251c7 100644
--- a/osu.Framework/Input/Events/TouchEvent.cs
+++ b/osu.Framework/Input/Events/TouchEvent.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Events
 {
diff --git a/osu.Framework/Input/Events/TouchMoveEvent.cs b/osu.Framework/Input/Events/TouchMoveEvent.cs
index 552df4bf5e..70cb363109 100644
--- a/osu.Framework/Input/Events/TouchMoveEvent.cs
+++ b/osu.Framework/Input/Events/TouchMoveEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Events
 {
diff --git a/osu.Framework/Input/Events/TouchUpEvent.cs b/osu.Framework/Input/Events/TouchUpEvent.cs
index f80c0a9ee4..39d057c8ec 100644
--- a/osu.Framework/Input/Events/TouchUpEvent.cs
+++ b/osu.Framework/Input/Events/TouchUpEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Events
 {
diff --git a/osu.Framework/Input/Events/UIEvent.cs b/osu.Framework/Input/Events/UIEvent.cs
index 03a14a4061..79959da354 100644
--- a/osu.Framework/Input/Events/UIEvent.cs
+++ b/osu.Framework/Input/Events/UIEvent.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Events
 {
diff --git a/osu.Framework/Input/Handlers/INeedsMousePositionFeedback.cs b/osu.Framework/Input/Handlers/INeedsMousePositionFeedback.cs
index d98eaf1bea..06a1a630a3 100644
--- a/osu.Framework/Input/Handlers/INeedsMousePositionFeedback.cs
+++ b/osu.Framework/Input/Handlers/INeedsMousePositionFeedback.cs
@@ -1,7 +1,7 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Handlers
 {
diff --git a/osu.Framework/Input/Handlers/Mouse/MouseHandler.cs b/osu.Framework/Input/Handlers/Mouse/MouseHandler.cs
index aa480152c3..2a4f169b6c 100644
--- a/osu.Framework/Input/Handlers/Mouse/MouseHandler.cs
+++ b/osu.Framework/Input/Handlers/Mouse/MouseHandler.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.Handlers.Mouse
diff --git a/osu.Framework/Input/Handlers/Pen/PenHandler.cs b/osu.Framework/Input/Handlers/Pen/PenHandler.cs
index a2bc0f0a50..eabfafaf9d 100644
--- a/osu.Framework/Input/Handlers/Pen/PenHandler.cs
+++ b/osu.Framework/Input/Handlers/Pen/PenHandler.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Platform;
 using osu.Framework.Platform.SDL3;
 using osu.Framework.Statistics;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Handlers.Pen
 {
diff --git a/osu.Framework/Input/Handlers/Tablet/ITabletHandler.cs b/osu.Framework/Input/Handlers/Tablet/ITabletHandler.cs
index c1c106c8e8..2c5d33b006 100644
--- a/osu.Framework/Input/Handlers/Tablet/ITabletHandler.cs
+++ b/osu.Framework/Input/Handlers/Tablet/ITabletHandler.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Handlers.Tablet
 {
diff --git a/osu.Framework/Input/Handlers/Tablet/OpenTabletDriverHandler.cs b/osu.Framework/Input/Handlers/Tablet/OpenTabletDriverHandler.cs
index dcbe4c045b..43dc24e781 100644
--- a/osu.Framework/Input/Handlers/Tablet/OpenTabletDriverHandler.cs
+++ b/osu.Framework/Input/Handlers/Tablet/OpenTabletDriverHandler.cs
@@ -15,7 +15,7 @@
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Handlers.Tablet
 {
@@ -208,7 +208,7 @@ private void updateOutputArea(IWindow window)
                     {
                         Width = scaledSize.X,
                         Height = scaledSize.Y,
-                        Position = position.ToSystemNumerics()
+                        Position = position
                     };
                     break;
                 }
diff --git a/osu.Framework/Input/Handlers/Tablet/TabletInfo.cs b/osu.Framework/Input/Handlers/Tablet/TabletInfo.cs
index 56402c180b..20515d3cc9 100644
--- a/osu.Framework/Input/Handlers/Tablet/TabletInfo.cs
+++ b/osu.Framework/Input/Handlers/Tablet/TabletInfo.cs
@@ -1,7 +1,7 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.Handlers.Tablet
 {
diff --git a/osu.Framework/Input/InputManager.cs b/osu.Framework/Input/InputManager.cs
index e7d7e33377..b30a294e41 100644
--- a/osu.Framework/Input/InputManager.cs
+++ b/osu.Framework/Input/InputManager.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -22,7 +22,7 @@
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
 using osu.Framework.Threading;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 using JoystickState = osu.Framework.Input.States.JoystickState;
 using KeyboardState = osu.Framework.Input.States.KeyboardState;
diff --git a/osu.Framework/Input/InputResampler.cs b/osu.Framework/Input/InputResampler.cs
index 7440da7286..c1524dcedb 100644
--- a/osu.Framework/Input/InputResampler.cs
+++ b/osu.Framework/Input/InputResampler.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Collections.Generic;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input
 {
@@ -68,11 +68,11 @@ public List<Vector2> AddPosition(Vector2 position)
             }
 
             Vector2 diff = position - lastRelevantPosition.Value;
-            float distance = diff.Length;
+            float distance = diff.Length();
             Vector2 direction = diff / distance;
 
             Vector2 realDiff = position - lastActualPosition.Value;
-            float realMovementDistance = realDiff.Length;
+            float realMovementDistance = realDiff.Length();
             if (realMovementDistance < 1)
                 return returnedPositions;
 
diff --git a/osu.Framework/Input/MouseButtonEventManager.cs b/osu.Framework/Input/MouseButtonEventManager.cs
index 988f69e8bf..ad06386269 100644
--- a/osu.Framework/Input/MouseButtonEventManager.cs
+++ b/osu.Framework/Input/MouseButtonEventManager.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -11,7 +11,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
 using osu.Framework.Logging;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input
diff --git a/osu.Framework/Input/PassThroughInputManager.cs b/osu.Framework/Input/PassThroughInputManager.cs
index ef8574b8cc..b511f6e2cf 100644
--- a/osu.Framework/Input/PassThroughInputManager.cs
+++ b/osu.Framework/Input/PassThroughInputManager.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 using JoystickState = osu.Framework.Input.States.JoystickState;
 
diff --git a/osu.Framework/Input/StateChanges/Events/MousePositionChangeEvent.cs b/osu.Framework/Input/StateChanges/Events/MousePositionChangeEvent.cs
index 8b0958ab75..290c2739bf 100644
--- a/osu.Framework/Input/StateChanges/Events/MousePositionChangeEvent.cs
+++ b/osu.Framework/Input/StateChanges/Events/MousePositionChangeEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.StateChanges.Events
 {
diff --git a/osu.Framework/Input/StateChanges/Events/MouseScrollChangeEvent.cs b/osu.Framework/Input/StateChanges/Events/MouseScrollChangeEvent.cs
index 35dec2daf3..c528d68959 100644
--- a/osu.Framework/Input/StateChanges/Events/MouseScrollChangeEvent.cs
+++ b/osu.Framework/Input/StateChanges/Events/MouseScrollChangeEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.StateChanges.Events
 {
diff --git a/osu.Framework/Input/StateChanges/Events/TouchStateChangeEvent.cs b/osu.Framework/Input/StateChanges/Events/TouchStateChangeEvent.cs
index cf2b25ed1d..34cc240fe5 100644
--- a/osu.Framework/Input/StateChanges/Events/TouchStateChangeEvent.cs
+++ b/osu.Framework/Input/StateChanges/Events/TouchStateChangeEvent.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.StateChanges.Events
 {
diff --git a/osu.Framework/Input/StateChanges/MousePositionAbsoluteInput.cs b/osu.Framework/Input/StateChanges/MousePositionAbsoluteInput.cs
index 4bef388c47..94678d62f2 100644
--- a/osu.Framework/Input/StateChanges/MousePositionAbsoluteInput.cs
+++ b/osu.Framework/Input/StateChanges/MousePositionAbsoluteInput.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.StateChanges
 {
diff --git a/osu.Framework/Input/StateChanges/MousePositionRelativeInput.cs b/osu.Framework/Input/StateChanges/MousePositionRelativeInput.cs
index 19f384794f..e51928b561 100644
--- a/osu.Framework/Input/StateChanges/MousePositionRelativeInput.cs
+++ b/osu.Framework/Input/StateChanges/MousePositionRelativeInput.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.StateChanges
 {
diff --git a/osu.Framework/Input/StateChanges/MouseScrollRelativeInput.cs b/osu.Framework/Input/StateChanges/MouseScrollRelativeInput.cs
index cf368f483c..8ee5f918c2 100644
--- a/osu.Framework/Input/StateChanges/MouseScrollRelativeInput.cs
+++ b/osu.Framework/Input/StateChanges/MouseScrollRelativeInput.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.StateChanges
 {
diff --git a/osu.Framework/Input/States/MouseState.cs b/osu.Framework/Input/States/MouseState.cs
index d2761e2593..1ac4c4faf3 100644
--- a/osu.Framework/Input/States/MouseState.cs
+++ b/osu.Framework/Input/States/MouseState.cs
@@ -5,7 +5,7 @@
 
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Input.StateChanges;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Input.States
diff --git a/osu.Framework/Input/States/TabletState.cs b/osu.Framework/Input/States/TabletState.cs
index 557bf51d0e..39ffc0defa 100644
--- a/osu.Framework/Input/States/TabletState.cs
+++ b/osu.Framework/Input/States/TabletState.cs
@@ -1,8 +1,8 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Extensions.TypeExtensions;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.States
 {
diff --git a/osu.Framework/Input/States/TouchState.cs b/osu.Framework/Input/States/TouchState.cs
index 817c9b6f53..b292aa6498 100644
--- a/osu.Framework/Input/States/TouchState.cs
+++ b/osu.Framework/Input/States/TouchState.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input.States
 {
diff --git a/osu.Framework/Input/Touch.cs b/osu.Framework/Input/Touch.cs
index 0744cbdaa5..bca9ec64b0 100644
--- a/osu.Framework/Input/Touch.cs
+++ b/osu.Framework/Input/Touch.cs
@@ -4,7 +4,7 @@
 #nullable disable
 
 using System;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input
 {
diff --git a/osu.Framework/Input/TouchEventManager.cs b/osu.Framework/Input/TouchEventManager.cs
index 97ff95a1f7..8c02ef907b 100644
--- a/osu.Framework/Input/TouchEventManager.cs
+++ b/osu.Framework/Input/TouchEventManager.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Input
 {
diff --git a/osu.Framework/Input/UserInputManager.cs b/osu.Framework/Input/UserInputManager.cs
index 9b90f8f189..c7fa34b704 100644
--- a/osu.Framework/Input/UserInputManager.cs
+++ b/osu.Framework/Input/UserInputManager.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -10,7 +10,7 @@
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
 
diff --git a/osu.Framework/Physics/IRigidBody.cs b/osu.Framework/Physics/IRigidBody.cs
index fbd65d21e9..1b9db8c94c 100644
--- a/osu.Framework/Physics/IRigidBody.cs
+++ b/osu.Framework/Physics/IRigidBody.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using osu.Framework.Graphics;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Physics
 {
@@ -96,7 +96,7 @@ public static class RigidBodyExtensions
         public static float ImpulseDenominator(this IRigidBody body, Vector2 pos, Vector2 normal)
         {
             Vector2 diff = pos - body.Centre;
-            float perpDot = Vector2.Dot(normal, diff.PerpendicularRight);
+            float perpDot = Vector2.Dot(normal, diff.PerpendicularRight());
             return 1.0f / body.Mass + perpDot * perpDot / body.MomentOfInertia;
         }
 
@@ -123,7 +123,7 @@ public static Vector2 ComputeImpulse(this IRigidBody body, IRigidBody other, Vec
 
             // Add "friction" to the impulse. We arbitrarily reduce the planar velocity relative to the impulse magnitude.
             Vector2 vrelPlanar = vrel + vrelOrtho * normal;
-            float vrelPlanarLength = vrelPlanar.Length;
+            float vrelPlanarLength = vrelPlanar.Length();
             if (vrelPlanarLength > 0)
                 impulse -= vrelPlanar * Math.Min(impulseMagnitude * 0.05f * body.FrictionCoefficient * other.FrictionCoefficient / vrelPlanarLength, body.Mass);
 
diff --git a/osu.Framework/Physics/RigidBodyContainer.cs b/osu.Framework/Physics/RigidBodyContainer.cs
index 7c185e71ad..c34fd5c130 100644
--- a/osu.Framework/Physics/RigidBodyContainer.cs
+++ b/osu.Framework/Physics/RigidBodyContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable disable
@@ -9,6 +9,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Physics
 {
@@ -72,7 +73,7 @@ public Vector2 VelocityAt(Vector2 pos)
 
             // Add orthogonal direction to rotation, scaled by distance from centre
             // to the velocity of our centre of mass.
-            return Velocity + diff.PerpendicularLeft * AngularVelocity;
+            return Velocity + diff.PerpendicularLeft() * AngularVelocity;
         }
 
         /// <summary>
@@ -123,12 +124,12 @@ protected virtual void UpdateVertices()
                 Vector2 a = corners[i];
                 Vector2 b = corners[(i + 1) % 4];
                 Vector2 diff = b - a;
-                float length = diff.Length;
+                float length = diff.Length();
                 Vector2 dir = diff / length;
 
                 float usableLength = Math.Max(length - 2 * cornerRadius, 0);
 
-                Vector2 normal = (b - a).PerpendicularRight.Normalized();
+                Vector2 normal = (b - a).PerpendicularRight().Normalized();
 
                 for (int j = 0; j < amount_side_steps; ++j)
                 {
diff --git a/osu.Framework/Physics/RigidBodySimulation.cs b/osu.Framework/Physics/RigidBodySimulation.cs
index b006d66b77..902b6185db 100644
--- a/osu.Framework/Physics/RigidBodySimulation.cs
+++ b/osu.Framework/Physics/RigidBodySimulation.cs
@@ -1,10 +1,10 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Physics
 {
diff --git a/osu.Framework/Platform/GameHost.cs b/osu.Framework/Platform/GameHost.cs
index 951d7553ae..fec21534bb 100644
--- a/osu.Framework/Platform/GameHost.cs
+++ b/osu.Framework/Platform/GameHost.cs
@@ -43,7 +43,7 @@
 using osu.Framework.Statistics;
 using osu.Framework.Threading;
 using osu.Framework.Timing;
-using osuTK;
+using System.Numerics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 using Rectangle = System.Drawing.Rectangle;
@@ -488,7 +488,7 @@ protected virtual void UpdateFrame()
                 Root.Size = new Vector2(Window.ClientSize.Width, Window.ClientSize.Height);
 
             // Ensure we maintain a valid size for any children immediately scaling by the window size
-            Root.Size = Vector2.ComponentMax(Vector2.One, Root.Size);
+            Root.Size = Vector2.Max(Vector2.One, Root.Size);
 
             TypePerformanceMonitor.NewFrame();
 
diff --git a/osu.Framework/Platform/ISDLWindow.cs b/osu.Framework/Platform/ISDLWindow.cs
index fb9339a001..e5c6fe331c 100644
--- a/osu.Framework/Platform/ISDLWindow.cs
+++ b/osu.Framework/Platform/ISDLWindow.cs
@@ -4,7 +4,7 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Input;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
 
diff --git a/osu.Framework/Platform/MacOS/SDL2MacOSWindow.cs b/osu.Framework/Platform/MacOS/SDL2MacOSWindow.cs
index ea645b5ec3..36a75485b4 100644
--- a/osu.Framework/Platform/MacOS/SDL2MacOSWindow.cs
+++ b/osu.Framework/Platform/MacOS/SDL2MacOSWindow.cs
@@ -6,7 +6,7 @@
 using System;
 using osu.Framework.Platform.Apple.Native;
 using osu.Framework.Platform.SDL2;
-using osuTK;
+using System.Numerics;
 using Selector = osu.Framework.Platform.Apple.Native.Selector;
 
 namespace osu.Framework.Platform.MacOS
diff --git a/osu.Framework/Platform/MacOS/SDL3MacOSWindow.cs b/osu.Framework/Platform/MacOS/SDL3MacOSWindow.cs
index 92b18a4284..5675d3427f 100644
--- a/osu.Framework/Platform/MacOS/SDL3MacOSWindow.cs
+++ b/osu.Framework/Platform/MacOS/SDL3MacOSWindow.cs
@@ -6,7 +6,7 @@
 using System;
 using osu.Framework.Platform.Apple.Native;
 using osu.Framework.Platform.SDL3;
-using osuTK;
+using System.Numerics;
 using Selector = osu.Framework.Platform.Apple.Native.Selector;
 
 namespace osu.Framework.Platform.MacOS
diff --git a/osu.Framework/Platform/SDL2/SDL2Window.Input.cs b/osu.Framework/Platform/SDL2/SDL2Window.Input.cs
index c5adca3282..6c64814f37 100644
--- a/osu.Framework/Platform/SDL2/SDL2Window.Input.cs
+++ b/osu.Framework/Platform/SDL2/SDL2Window.Input.cs
@@ -12,7 +12,7 @@
 using osu.Framework.Input;
 using osu.Framework.Input.States;
 using osu.Framework.Logging;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 using static SDL2.SDL;
 using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
diff --git a/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs b/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
index 3bd62e239f..c4ea0434c5 100644
--- a/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
+++ b/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
@@ -12,7 +12,9 @@
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
+using System.Numerics;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 using static SDL2.SDL;
 
 namespace osu.Framework.Platform.SDL2
diff --git a/osu.Framework/Platform/SDL3/SDL3Window.Input.cs b/osu.Framework/Platform/SDL3/SDL3Window.Input.cs
index 80da02f19f..43befb06ff 100644
--- a/osu.Framework/Platform/SDL3/SDL3Window.Input.cs
+++ b/osu.Framework/Platform/SDL3/SDL3Window.Input.cs
@@ -14,7 +14,7 @@
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.States;
 using osu.Framework.Logging;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 using SDL;
 using static SDL.SDL3;
diff --git a/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs b/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
index b1ec3f70c1..fd79427d70 100644
--- a/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
+++ b/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
@@ -12,7 +12,9 @@
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
+using System.Numerics;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 using SDL;
 using static SDL.SDL3;
 
diff --git a/osu.Framework/Platform/Windows/IWindowsWindow.cs b/osu.Framework/Platform/Windows/IWindowsWindow.cs
index 19b0431d41..fdb836499a 100644
--- a/osu.Framework/Platform/Windows/IWindowsWindow.cs
+++ b/osu.Framework/Platform/Windows/IWindowsWindow.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Platform.Windows
 {
diff --git a/osu.Framework/Platform/Windows/SDL2WindowsWindow.cs b/osu.Framework/Platform/Windows/SDL2WindowsWindow.cs
index 9008b8871e..45feb68660 100644
--- a/osu.Framework/Platform/Windows/SDL2WindowsWindow.cs
+++ b/osu.Framework/Platform/Windows/SDL2WindowsWindow.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Platform.SDL2;
 using osu.Framework.Platform.Windows.Native;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 using static SDL2.SDL;
 using Icon = osu.Framework.Platform.Windows.Native.Icon;
diff --git a/osu.Framework/Platform/Windows/SDL3WindowsWindow.cs b/osu.Framework/Platform/Windows/SDL3WindowsWindow.cs
index 8f32041d02..97d9bce5bd 100644
--- a/osu.Framework/Platform/Windows/SDL3WindowsWindow.cs
+++ b/osu.Framework/Platform/Windows/SDL3WindowsWindow.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Platform.SDL3;
 using osu.Framework.Platform.Windows.Native;
-using osuTK;
+using System.Numerics;
 using SDL;
 using static SDL.SDL3;
 using Icon = osu.Framework.Platform.Windows.Native.Icon;
diff --git a/osu.Framework/Platform/Windows/WindowsMouseHandler.SDL2.cs b/osu.Framework/Platform/Windows/WindowsMouseHandler.SDL2.cs
index ae9cb3c7f5..b2766d6fc5 100644
--- a/osu.Framework/Platform/Windows/WindowsMouseHandler.SDL2.cs
+++ b/osu.Framework/Platform/Windows/WindowsMouseHandler.SDL2.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Platform.Windows.Native;
 using osu.Framework.Statistics;
-using osuTK;
+using System.Numerics;
 using static SDL2.SDL;
 
 namespace osu.Framework.Platform.Windows
diff --git a/osu.Framework/Platform/Windows/WindowsMouseHandler.cs b/osu.Framework/Platform/Windows/WindowsMouseHandler.cs
index 4abe150a6e..1fb625431d 100644
--- a/osu.Framework/Platform/Windows/WindowsMouseHandler.cs
+++ b/osu.Framework/Platform/Windows/WindowsMouseHandler.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.Versioning;
 using osu.Framework.Input.Handlers.Mouse;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Platform.Windows
 {
diff --git a/osu.Framework/Testing/Drawables/Sections/ToolbarRecordSection.cs b/osu.Framework/Testing/Drawables/Sections/ToolbarRecordSection.cs
index 60bc1c6a75..1b5ad0ce8f 100644
--- a/osu.Framework/Testing/Drawables/Sections/ToolbarRecordSection.cs
+++ b/osu.Framework/Testing/Drawables/Sections/ToolbarRecordSection.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Testing.Drawables.Sections
diff --git a/osu.Framework/Testing/Drawables/Sections/ToolbarRunAllStepsSection.cs b/osu.Framework/Testing/Drawables/Sections/ToolbarRunAllStepsSection.cs
index 9028294809..db0fe715c3 100644
--- a/osu.Framework/Testing/Drawables/Sections/ToolbarRunAllStepsSection.cs
+++ b/osu.Framework/Testing/Drawables/Sections/ToolbarRunAllStepsSection.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Testing.Drawables.Sections
 {
diff --git a/osu.Framework/Testing/Drawables/Steps/StepColourPicker.cs b/osu.Framework/Testing/Drawables/Steps/StepColourPicker.cs
index eef7db7fbf..11906a8189 100644
--- a/osu.Framework/Testing/Drawables/Steps/StepColourPicker.cs
+++ b/osu.Framework/Testing/Drawables/Steps/StepColourPicker.cs
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Testing.Drawables.Steps
 {
diff --git a/osu.Framework/Testing/Drawables/TestButton.cs b/osu.Framework/Testing/Drawables/TestButton.cs
index 3086dbdab1..31f7ac0f1d 100644
--- a/osu.Framework/Testing/Drawables/TestButton.cs
+++ b/osu.Framework/Testing/Drawables/TestButton.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Testing.Drawables
diff --git a/osu.Framework/Testing/Input/ManualInputManager.cs b/osu.Framework/Testing/Input/ManualInputManager.cs
index f5b9d599b3..8283a81c50 100644
--- a/osu.Framework/Testing/Input/ManualInputManager.cs
+++ b/osu.Framework/Testing/Input/ManualInputManager.cs
@@ -10,7 +10,7 @@
 using osu.Framework.Input.Handlers;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Platform;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace osu.Framework.Testing.Input
diff --git a/osu.Framework/Testing/Input/TestCursorContainer.cs b/osu.Framework/Testing/Input/TestCursorContainer.cs
index da6dd8252a..99844a0724 100644
--- a/osu.Framework/Testing/Input/TestCursorContainer.cs
+++ b/osu.Framework/Testing/Input/TestCursorContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Framework/Testing/ManualInputManagerTestScene.cs b/osu.Framework/Testing/ManualInputManagerTestScene.cs
index ecc2a5f991..bef8149814 100644
--- a/osu.Framework/Testing/ManualInputManagerTestScene.cs
+++ b/osu.Framework/Testing/ManualInputManagerTestScene.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
@@ -10,7 +10,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Testing.Input;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Testing
diff --git a/osu.Framework/Testing/TestBrowser.cs b/osu.Framework/Testing/TestBrowser.cs
index a705e63a4c..d9df3bfd64 100644
--- a/osu.Framework/Testing/TestBrowser.cs
+++ b/osu.Framework/Testing/TestBrowser.cs
@@ -37,6 +37,7 @@
 using osuTK;
 using osuTK.Graphics;
 using Logger = osu.Framework.Logging.Logger;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Testing
 {
diff --git a/osu.Framework/Testing/TestScene.cs b/osu.Framework/Testing/TestScene.cs
index 5395e80098..738301e7f3 100644
--- a/osu.Framework/Testing/TestScene.cs
+++ b/osu.Framework/Testing/TestScene.cs
@@ -31,7 +31,7 @@
 using osu.Framework.Threading;
 using osuTK.Graphics;
 using Logger = osu.Framework.Logging.Logger;
-using Vector2 = osuTK.Vector2;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Testing
 {
diff --git a/osu.Framework/Text/MultilineTextBuilder.cs b/osu.Framework/Text/MultilineTextBuilder.cs
index 0b155d2f45..7d19c210e7 100644
--- a/osu.Framework/Text/MultilineTextBuilder.cs
+++ b/osu.Framework/Text/MultilineTextBuilder.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Text
 {
diff --git a/osu.Framework/Text/TextBuilder.cs b/osu.Framework/Text/TextBuilder.cs
index 82a76def20..2fb7b9654a 100644
--- a/osu.Framework/Text/TextBuilder.cs
+++ b/osu.Framework/Text/TextBuilder.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Caching;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Text
 {
@@ -197,7 +197,7 @@ public bool AddCharacter(char character)
             currentPos.X += glyph.XAdvance;
             currentNewLine = false;
 
-            Bounds = Vector2.ComponentMax(Bounds, currentPos + new Vector2(0, currentLineHeight));
+            Bounds = Vector2.Max(Bounds, currentPos + new Vector2(0, currentLineHeight));
             return true;
         }
 
@@ -303,7 +303,7 @@ public void RemoveLastCharacter()
                 float characterBottomBound = useFontSizeAsHeight ? character.LinePosition + font.Size : character.DrawRectangle.Bottom;
 
                 // As above, the bounds are calculated through the character draw rectangles
-                Bounds = Vector2.ComponentMax(Bounds, new Vector2(characterRightBound, characterBottomBound));
+                Bounds = Vector2.Max(Bounds, new Vector2(characterRightBound, characterBottomBound));
             }
 
             // The new line is removed when the first character on the line is removed, thus the current position is never on a new line
diff --git a/osu.Framework/Text/TruncatingTextBuilder.cs b/osu.Framework/Text/TruncatingTextBuilder.cs
index 53e554ffa8..07827cacd3 100644
--- a/osu.Framework/Text/TruncatingTextBuilder.cs
+++ b/osu.Framework/Text/TruncatingTextBuilder.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Text
 {
diff --git a/osu.Framework/Threading/DrawThread.cs b/osu.Framework/Threading/DrawThread.cs
index 1328fc6a23..c4537f5f54 100644
--- a/osu.Framework/Threading/DrawThread.cs
+++ b/osu.Framework/Threading/DrawThread.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,7 +8,7 @@
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Threading
 {
diff --git a/osu.Framework/Utils/CircularArcProperties.cs b/osu.Framework/Utils/CircularArcProperties.cs
index 377e276d83..b76086752f 100644
--- a/osu.Framework/Utils/CircularArcProperties.cs
+++ b/osu.Framework/Utils/CircularArcProperties.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Utils
 {
@@ -51,9 +51,9 @@ public CircularArcProperties(ReadOnlySpan<Vector2> controlPoints)
 
             // See: https://en.wikipedia.org/wiki/Circumscribed_circle#Cartesian_coordinates_2
             float d = 2 * (a.X * (b - c).Y + b.X * (c - a).Y + c.X * (a - b).Y);
-            float aSq = a.LengthSquared;
-            float bSq = b.LengthSquared;
-            float cSq = c.LengthSquared;
+            float aSq = a.LengthSquared();
+            float bSq = b.LengthSquared();
+            float cSq = c.LengthSquared();
 
             Centre = new Vector2(
                 aSq * (b - c).Y + bSq * (c - a).Y + cSq * (a - b).Y,
@@ -62,7 +62,7 @@ public CircularArcProperties(ReadOnlySpan<Vector2> controlPoints)
             Vector2 dA = a - Centre;
             Vector2 dC = c - Centre;
 
-            Radius = dA.Length;
+            Radius = dA.Length();
 
             ThetaStart = Math.Atan2(dA.Y, dA.X);
             double thetaEnd = Math.Atan2(dC.Y, dC.X);
diff --git a/osu.Framework/Utils/ConvexPolygonClipper.cs b/osu.Framework/Utils/ConvexPolygonClipper.cs
index 8d1ed46853..37f5723b10 100644
--- a/osu.Framework/Utils/ConvexPolygonClipper.cs
+++ b/osu.Framework/Utils/ConvexPolygonClipper.cs
@@ -5,7 +5,7 @@
 using System.Runtime.CompilerServices;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Utils
 {
diff --git a/osu.Framework/Utils/IncrementalBSplineBuilder.cs b/osu.Framework/Utils/IncrementalBSplineBuilder.cs
index 198171ca38..faf867f164 100644
--- a/osu.Framework/Utils/IncrementalBSplineBuilder.cs
+++ b/osu.Framework/Utils/IncrementalBSplineBuilder.cs
@@ -1,12 +1,13 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using osu.Framework.Caching;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Utils
 {
diff --git a/osu.Framework/Utils/Interpolation.cs b/osu.Framework/Utils/Interpolation.cs
index fe9c4ce2df..f003c1fe8c 100644
--- a/osu.Framework/Utils/Interpolation.cs
+++ b/osu.Framework/Utils/Interpolation.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -8,7 +8,7 @@
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Transforms;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Utils
diff --git a/osu.Framework/Utils/PathApproximator.cs b/osu.Framework/Utils/PathApproximator.cs
index 9348d9c3a6..6ff2658e9d 100644
--- a/osu.Framework/Utils/PathApproximator.cs
+++ b/osu.Framework/Utils/PathApproximator.cs
@@ -7,6 +7,7 @@
 using System.Numerics.Tensors;
 using osu.Framework.Graphics.Primitives;
 using osuTK;
+using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Utils
 {
@@ -832,7 +833,7 @@ private static bool bezierIsFlatEnough(Vector2[] controlPoints)
         {
             for (int i = 1; i < controlPoints.Length - 1; i++)
             {
-                if ((controlPoints[i - 1] - 2 * controlPoints[i] + controlPoints[i + 1]).LengthSquared > BEZIER_TOLERANCE * BEZIER_TOLERANCE * 4)
+                if ((controlPoints[i - 1] - 2 * controlPoints[i] + controlPoints[i + 1]).LengthSquared() > BEZIER_TOLERANCE * BEZIER_TOLERANCE * 4)
                     return false;
             }
 
diff --git a/osu.Framework/Utils/Precision.cs b/osu.Framework/Utils/Precision.cs
index 77c146adf8..a888ef297a 100644
--- a/osu.Framework/Utils/Precision.cs
+++ b/osu.Framework/Utils/Precision.cs
@@ -1,9 +1,9 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Utils
 {
diff --git a/osu.Framework/Utils/Validation.cs b/osu.Framework/Utils/Validation.cs
index 6c19017378..8f2160956e 100644
--- a/osu.Framework/Utils/Validation.cs
+++ b/osu.Framework/Utils/Validation.cs
@@ -6,7 +6,7 @@
 using System.Runtime.CompilerServices;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Utils
 {

From e911baf5193db8e865d76ea0ec4f35a9a8c528b9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 17:29:53 +0000
Subject: [PATCH 08/16] Remove migration scripts

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 fix_length.py       |  83 ----------------
 migrate_numerics.py | 235 --------------------------------------------
 2 files changed, 318 deletions(-)
 delete mode 100644 fix_length.py
 delete mode 100644 migrate_numerics.py

diff --git a/fix_length.py b/fix_length.py
deleted file mode 100644
index 721a057b11..0000000000
--- a/fix_length.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python3
-"""Fix Vector2/3/4 .Length and .LengthSquared (property in osuTK) to be method calls in System.Numerics."""
-import re
-import os
-
-DIRS = [
-    '/home/runner/work/osu-framework/osu-framework/osu.Framework',
-    '/home/runner/work/osu-framework/osu-framework/osu.Framework.Tests',
-]
-
-def fix_file(path):
-    with open(path, 'r', encoding='utf-8-sig') as f:
-        content = f.read()
-    
-    # Only process files that now use System.Numerics (directly or via alias)
-    uses_sn = ('using System.Numerics;' in content or 
-               'using Vector2 = System.Numerics.Vector2;' in content or
-               'using Vector3 = System.Numerics.Vector3;' in content or
-               'using Vector4 = System.Numerics.Vector4;' in content)
-    
-    if not uses_sn:
-        return False
-    
-    original = content
-    
-    # Replace .LengthSquared (not followed by () - i.e. used as property) → .LengthSquared()
-    # Skip when followed by existing ()
-    content = re.sub(r'\.LengthSquared(?!\s*\()', '.LengthSquared()', content)
-    
-    # Replace .Length used as a float value (not for arrays)
-    # Patterns: .Length followed by ;, ), *, /, +, -, ,, whitespace-comparison operators, or = (but not ==)
-    # DON'T replace: .Length - 1, .Length ==, array context
-    # We do this carefully: only when .Length is at end of expression
-    # Simple approach: replace .Length followed by ; or ) or , or arithmetic
-    # But avoid array .Length (hard to distinguish without types)
-    # Heuristic: only replace .Length followed by ; ) , * / > < - + (but NOT .Length -)
-    # Actually .Length - 1 means subtract, could be array subtraction OR vector length minus float
-    # In vector context, .Length is always followed by ; ) , * / comparisons
-    # In array context, .Length is often followed by - ) ; 
-    # Too risky for general case. Just do the ones at end of statement:
-    # .Length; .Length) .Length,
-    # And ones in float assignment: variable = something.Length
-    
-    # Conservative: replace .Length when used as the full expression (not as part of array indexing)
-    # Skip .Length followed by space then - (array length - something)
-    # Only convert .Length in these patterns:
-    # 1. at end of statement: .Length;
-    # 2. in comparison: .Length > / .Length < / .Length == / .Length !=  
-    # 3. in assignment: = x.Length (semicolon after)
-    # 4. in parentheses: .Length)
-    # But skip .Length on arrays like controlPoints.Length
-
-    # Strategy: replace .Length followed by ; ) , whitespace then = == != > < <= >= * / + or end of line
-    # But exclude when preceded by array-like names (controlPoints, controlpoints, array, Array, etc)
-    
-    # Actually the safest approach for THIS codebase:
-    # Replace ALL .Length (not already ()) with .Length()
-    # Then fix false positives if any
-    content = re.sub(r'(?<!\w)\.Length(?!\s*\(|\s*\[|\w)', '.Length()', content)
-    
-    if content != original:
-        with open(path, 'w', encoding='utf-8') as f:
-            f.write(content)
-        return True
-    return False
-
-changed = []
-for base_dir in DIRS:
-    for root, dirs, files in os.walk(base_dir):
-        dirs[:] = [d for d in dirs if d not in ('bin', 'obj', '.git')]
-        for fname in files:
-            if not fname.endswith('.cs'):
-                continue
-            path = os.path.join(root, fname)
-            try:
-                if fix_file(path):
-                    changed.append(path)
-            except Exception as e:
-                print(f'ERROR {path}: {e}')
-
-print(f'Changed {len(changed)} files')
-for p in changed:
-    print(f'  {p.replace("/home/runner/work/osu-framework/osu-framework/", "")}')
diff --git a/migrate_numerics.py b/migrate_numerics.py
deleted file mode 100644
index e71d4b5ff1..0000000000
--- a/migrate_numerics.py
+++ /dev/null
@@ -1,235 +0,0 @@
-#!/usr/bin/env python3
-"""
-Migrate osuTK Vector2/3/4 to System.Numerics.Vector2/3/4 in C# files.
-"""
-
-import os
-import re
-import sys
-
-# Non-Vector osuTK types that require keeping `using osuTK;`
-NON_VECTOR_OSTK_TYPES = re.compile(
-    r'\b(Matrix2|Matrix3|Matrix4|Quaternion|MathHelper|Box2|Box2d|Bezier|'
-    r'BezierCurve|Half|Vector2d|Vector3d|Vector4d|Vector2h|Vector3h|Vector4h|'
-    r'Vector2i|Vector3i|Vector4i)\b'
-)
-
-# Directories to process
-DIRS = [
-    '/home/runner/work/osu-framework/osu-framework/osu.Framework',
-    '/home/runner/work/osu-framework/osu-framework/osu.Framework.Tests',
-]
-
-def uses_vector_types(content):
-    """Check which Vector types (2/3/4) are used in the content."""
-    used = set()
-    # Avoid matching inside comments/strings is imperfect but good enough
-    if re.search(r'\bVector2\b', content):
-        used.add('Vector2')
-    if re.search(r'\bVector3\b', content):
-        used.add('Vector3')
-    if re.search(r'\bVector4\b', content):
-        used.add('Vector4')
-    return used
-
-def uses_non_vector_ostk(content):
-    """Check if the file uses non-Vector osuTK types."""
-    return bool(NON_VECTOR_OSTK_TYPES.search(content))
-
-def add_numerics_using(content, vector_types_used):
-    """
-    If file only uses Vector types from osuTK: replace `using osuTK;` with `using System.Numerics;`
-    If file also uses non-Vector osuTK types: keep `using osuTK;` and add aliases.
-    """
-    has_using_ostk = bool(re.search(r'^using osuTK;', content, re.MULTILINE))
-    if not has_using_ostk:
-        return content
-
-    needs_non_vector = uses_non_vector_ostk(content)
-
-    if not needs_non_vector:
-        # Safe to replace `using osuTK;` with `using System.Numerics;`
-        # But check if System.Numerics is already there
-        if re.search(r'^using System\.Numerics;', content, re.MULTILINE):
-            # Just remove `using osuTK;`
-            content = re.sub(r'^using osuTK;\n', '', content, flags=re.MULTILINE)
-        else:
-            content = re.sub(r'^using osuTK;', 'using System.Numerics;', content, flags=re.MULTILINE)
-    else:
-        # Keep `using osuTK;`, add aliases for Vector types that are used
-        # But only if `using System.Numerics;` is not already present as an alias
-        aliases_to_add = []
-        for vt in sorted(vector_types_used):
-            alias = f'using {vt} = System.Numerics.{vt};'
-            if alias not in content:
-                aliases_to_add.append(alias)
-
-        if aliases_to_add:
-            # Insert aliases right after `using osuTK;`
-            aliases_str = '\n'.join(aliases_to_add)
-            content = re.sub(
-                r'^(using osuTK;)',
-                r'\1\n' + aliases_str,
-                content,
-                flags=re.MULTILINE
-            )
-
-    return content
-
-def fix_api_differences(content):
-    """Fix osuTK-specific Vector2 API calls to System.Numerics equivalents."""
-
-    # Vector2.Dot(ref a, ref b, out float c); → float c = Vector2.Dot(a, b);
-    # Pattern: Vector2.Dot(ref <expr>, ref <expr>, out <type> <var>);
-    def replace_dot_ref(m):
-        a = m.group(1).strip()
-        b = m.group(2).strip()
-        typ = m.group(3).strip()
-        var = m.group(4).strip()
-        return f'{typ} {var} = Vector2.Dot({a}, {b});'
-
-    content = re.sub(
-        r'Vector2\.Dot\(ref\s+(\w+),\s*ref\s+(\w+),\s*out\s+(float)\s+(\w+)\);',
-        replace_dot_ref,
-        content
-    )
-
-    # Vector2.PerpDot(ref a, ref b, out float c); → float c = Vector2Extensions.PerpDot(a, b);
-    def replace_perpdot_ref(m):
-        a = m.group(1).strip()
-        b = m.group(2).strip()
-        typ = m.group(3).strip()
-        var = m.group(4).strip()
-        return f'{typ} {var} = Vector2Extensions.PerpDot({a}, {b});'
-
-    content = re.sub(
-        r'Vector2\.PerpDot\(ref\s+(\w+),\s*ref\s+(\w+),\s*out\s+(float)\s+(\w+)\);',
-        replace_perpdot_ref,
-        content
-    )
-
-    # Vector2.PerpDot(a, b) → Vector2Extensions.PerpDot(a, b)  (non-ref version)
-    # Be careful not to replace Vector2Extensions.PerpDot
-    content = re.sub(
-        r'(?<!Extensions\.)(?<!\w)Vector2\.PerpDot\(',
-        'Vector2Extensions.PerpDot(',
-        content
-    )
-
-    # Vector2.ComponentMin(a, b) → Vector2.Min(a, b)
-    content = re.sub(r'\bVector2\.ComponentMin\b', 'Vector2.Min', content)
-    content = re.sub(r'\bVector3\.ComponentMin\b', 'Vector3.Min', content)
-    content = re.sub(r'\bVector4\.ComponentMin\b', 'Vector4.Min', content)
-
-    # Vector2.ComponentMax(a, b) → Vector2.Max(a, b)
-    content = re.sub(r'\bVector2\.ComponentMax\b', 'Vector2.Max', content)
-    content = re.sub(r'\bVector3\.ComponentMax\b', 'Vector3.Max', content)
-    content = re.sub(r'\bVector4\.ComponentMax\b', 'Vector4.Max', content)
-
-    # .PerpendicularRight (property) → .PerpendicularRight() (extension method)
-    # Only replace when not already followed by '('
-    content = re.sub(r'\.PerpendicularRight(?!\s*\()', '.PerpendicularRight()', content)
-
-    # .PerpendicularLeft (property) → .PerpendicularLeft() (extension method)
-    content = re.sub(r'\.PerpendicularLeft(?!\s*\()', '.PerpendicularLeft()', content)
-
-    # .Xy on osuTK.Vector3 → .Xy.ToSystemNumerics()
-    # This is tricky to do automatically; handle specific patterns
-    # ExtractScale().Xy → ExtractScale().Xy.ToSystemNumerics()
-    content = re.sub(
-        r'(ExtractScale\(\))\.Xy\b(?!\.ToSystemNumerics)',
-        r'\1.Xy.ToSystemNumerics()',
-        content
-    )
-    # For cases like `scale.Xy` where scale was declared as Vector3
-    # We handle these in specific files manually if needed
-
-    return content
-
-def ensure_vector2extensions_using(content):
-    """
-    If file uses Vector2Extensions.PerpDot (added by our migration) but doesn't 
-    have the using for osu.Framework.Graphics, add it.
-    """
-    if 'Vector2Extensions.' not in content:
-        return content
-    if 'using osu.Framework.Graphics;' in content:
-        return content
-
-    # Check if it's in the osu.Framework.Graphics namespace itself
-    if 'namespace osu.Framework.Graphics' in content:
-        return content
-
-    # Insert after other using directives
-    # Find the last `using` line and insert after
-    lines = content.split('\n')
-    last_using_idx = -1
-    for i, line in enumerate(lines):
-        if line.strip().startswith('using ') and not line.strip().startswith('using static'):
-            last_using_idx = i
-
-    if last_using_idx >= 0:
-        lines.insert(last_using_idx + 1, 'using osu.Framework.Graphics;')
-        return '\n'.join(lines)
-    return content
-
-def process_file(path):
-    """Process a single C# file."""
-    with open(path, 'r', encoding='utf-8-sig') as f:
-        original = f.read()
-
-    content = original
-
-    # Only process files that have `using osuTK;`
-    if not re.search(r'^using osuTK;', content, re.MULTILINE):
-        return False
-
-    # Determine what vector types are used
-    vector_types = uses_vector_types(content)
-
-    if not vector_types:
-        return False  # No Vector types, skip (shouldn't happen in practice)
-
-    # Fix API differences first (before changing using directives)
-    content = fix_api_differences(content)
-
-    # Add/replace using directives
-    content = add_numerics_using(content, vector_types)
-
-    # Ensure Vector2Extensions namespace is imported if needed
-    content = ensure_vector2extensions_using(content)
-
-    if content != original:
-        with open(path, 'w', encoding='utf-8') as f:
-            f.write(content)
-        return True
-    return False
-
-def main():
-    changed = []
-    skipped = []
-
-    for base_dir in DIRS:
-        for root, dirs, files in os.walk(base_dir):
-            # Skip bin/obj directories
-            dirs[:] = [d for d in dirs if d not in ('bin', 'obj', '.git')]
-            for fname in files:
-                if not fname.endswith('.cs'):
-                    continue
-                path = os.path.join(root, fname)
-                try:
-                    if process_file(path):
-                        changed.append(path)
-                    else:
-                        pass
-                except Exception as e:
-                    print(f'ERROR processing {path}: {e}', file=sys.stderr)
-
-    print(f'Changed {len(changed)} files:')
-    for p in changed:
-        # Print relative path
-        p_rel = p.replace('/home/runner/work/osu-framework/osu-framework/', '')
-        print(f'  {p_rel}')
-
-if __name__ == '__main__':
-    main()

From 64686b55f2e4a528995db9879fc20a92aa72452b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 17:44:27 +0000
Subject: [PATCH 09/16] perf: optimize hot paths from PR#5551+#6699 (inline GL
 uniforms, SIMD Distance, AggressiveInlining)

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/45dcee20-fae6-48b4-bfd7-393ad63e1763

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 .../Color4Extensions/Color4Extensions.cs      |  2 ++
 osu.Framework/Graphics/BlendingParameters.cs  |  2 ++
 osu.Framework/Graphics/OpenGL/GLRenderer.cs   | 18 ++++++++++-----
 osu.Framework/Graphics/Vector2Extensions.cs   | 22 +++++++++----------
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/osu.Framework/Extensions/Color4Extensions/Color4Extensions.cs b/osu.Framework/Extensions/Color4Extensions/Color4Extensions.cs
index 42d1bf6a61..e77c47da6a 100644
--- a/osu.Framework/Extensions/Color4Extensions/Color4Extensions.cs
+++ b/osu.Framework/Extensions/Color4Extensions/Color4Extensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using osuTK.Graphics;
 
 namespace osu.Framework.Extensions.Color4Extensions
@@ -104,6 +105,7 @@ public static Color4 Multiply(Color4 first, Color4 second)
         /// </summary>
         /// <param name="colour">Original colour</param>
         /// <param name="negateAlpha">Negates alpha if true</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static Color4 NegateAlphaIfTrue(this Color4 colour, bool negateAlpha) =>
             new Color4(colour.R, colour.G, colour.B, negateAlpha ? -colour.A : colour.A);
 
diff --git a/osu.Framework/Graphics/BlendingParameters.cs b/osu.Framework/Graphics/BlendingParameters.cs
index 78e9d23ab2..2af8536a7b 100644
--- a/osu.Framework/Graphics/BlendingParameters.cs
+++ b/osu.Framework/Graphics/BlendingParameters.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using osuTK.Graphics.ES30;
 
 namespace osu.Framework.Graphics
@@ -159,6 +160,7 @@ public void ApplyDefaultToInherited()
                 AlphaEquation = BlendingEquation.Add;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public readonly bool EqualsExceptForAdditive(BlendingParameters other) =>
             other.Source == Source
             && other.Destination == Destination
diff --git a/osu.Framework/Graphics/OpenGL/GLRenderer.cs b/osu.Framework/Graphics/OpenGL/GLRenderer.cs
index 606fc888d3..65a3ab86e1 100644
--- a/osu.Framework/Graphics/OpenGL/GLRenderer.cs
+++ b/osu.Framework/Graphics/OpenGL/GLRenderer.cs
@@ -171,19 +171,25 @@ protected override void SetUniformImplementation<T>(IUniformWithValue<T> uniform
                     break;
 
                 case IUniformWithValue<Vector2> v2:
-                    osuTK.Vector2 v2tk = v2.GetValue().ToOsuTK();
-                    GL.Uniform2(uniform.Location, ref v2tk);
+                {
+                    Vector2 v = v2.GetValue();
+                    GL.Uniform2(uniform.Location, v.X, v.Y);
                     break;
+                }
 
                 case IUniformWithValue<Vector3> v3:
-                    osuTK.Vector3 v3tk = v3.GetValue().ToOsuTK();
-                    GL.Uniform3(uniform.Location, ref v3tk);
+                {
+                    Vector3 v = v3.GetValue();
+                    GL.Uniform3(uniform.Location, v.X, v.Y, v.Z);
                     break;
+                }
 
                 case IUniformWithValue<Vector4> v4:
-                    osuTK.Vector4 v4tk = v4.GetValue().ToOsuTK();
-                    GL.Uniform4(uniform.Location, ref v4tk);
+                {
+                    Vector4 v = v4.GetValue();
+                    GL.Uniform4(uniform.Location, v.X, v.Y, v.Z, v.W);
                     break;
+                }
 
                 case IUniformWithValue<Matrix2> m2:
                     GL.UniformMatrix2(uniform.Location, false, ref m2.GetValueByRef());
diff --git a/osu.Framework/Graphics/Vector2Extensions.cs b/osu.Framework/Graphics/Vector2Extensions.cs
index 5d2818cdff..cdfd31f588 100644
--- a/osu.Framework/Graphics/Vector2Extensions.cs
+++ b/osu.Framework/Graphics/Vector2Extensions.cs
@@ -16,6 +16,7 @@ public static class Vector2Extensions
         /// <param name="pos">The position to transform</param>
         /// <param name="mat">The desired transformation</param>
         /// <returns>The transformed position</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static Vector2 Transform(Vector2 pos, Matrix3 mat)
         {
             Transform(ref pos, ref mat, out Vector2 result);
@@ -26,6 +27,7 @@ public static Vector2 Transform(Vector2 pos, Matrix3 mat)
         /// <param name="pos">The position to transform</param>
         /// <param name="mat">The desired transformation</param>
         /// <param name="result">The transformed vector</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void Transform(ref Vector2 pos, ref Matrix3 mat, out Vector2 result)
         {
             result = new Vector2(
@@ -39,11 +41,8 @@ public static void Transform(ref Vector2 pos, ref Matrix3 mat, out Vector2 resul
         /// <param name="vec1">The first vector</param>
         /// <param name="vec2">The second vector</param>
         /// <returns>The distance</returns>
-        public static float Distance(Vector2 vec1, Vector2 vec2)
-        {
-            Distance(ref vec1, ref vec2, out float result);
-            return result;
-        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static float Distance(Vector2 vec1, Vector2 vec2) => Vector2.Distance(vec1, vec2);
 
         /// <summary>
         /// Compute the euclidean distance between two vectors.
@@ -51,9 +50,10 @@ public static float Distance(Vector2 vec1, Vector2 vec2)
         /// <param name="vec1">The first vector</param>
         /// <param name="vec2">The second vector</param>
         /// <param name="result">The distance</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void Distance(ref Vector2 vec1, ref Vector2 vec2, out float result)
         {
-            result = MathF.Sqrt((vec2.X - vec1.X) * (vec2.X - vec1.X) + (vec2.Y - vec1.Y) * (vec2.Y - vec1.Y));
+            result = Vector2.Distance(vec1, vec2);
         }
 
         /// <summary>
@@ -62,11 +62,8 @@ public static void Distance(ref Vector2 vec1, ref Vector2 vec2, out float result
         /// <param name="vec1">The first vector</param>
         /// <param name="vec2">The second vector</param>
         /// <returns>The squared distance</returns>
-        public static float DistanceSquared(Vector2 vec1, Vector2 vec2)
-        {
-            DistanceSquared(ref vec1, ref vec2, out float result);
-            return result;
-        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static float DistanceSquared(Vector2 vec1, Vector2 vec2) => Vector2.DistanceSquared(vec1, vec2);
 
         /// <summary>
         /// Compute the squared euclidean distance between two vectors.
@@ -74,9 +71,10 @@ public static float DistanceSquared(Vector2 vec1, Vector2 vec2)
         /// <param name="vec1">The first vector</param>
         /// <param name="vec2">The second vector</param>
         /// <param name="result">The squared distance</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void DistanceSquared(ref Vector2 vec1, ref Vector2 vec2, out float result)
         {
-            result = (vec2.X - vec1.X) * (vec2.X - vec1.X) + (vec2.Y - vec1.Y) * (vec2.Y - vec1.Y);
+            result = Vector2.DistanceSquared(vec1, vec2);
         }
 
         /// <summary>

From 1884f4628afd6a66c0859617d6158622d45a741b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 18:00:10 +0000
Subject: [PATCH 10/16] fix: migrate templates/benchmarks/SampleGame from
 osuTK.Vector2 to System.Numerics (fixes CI)

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/01e6a282-c333-469b-8966-0219ab2ca87f

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 SampleGame/SampleGameGame.cs                                    | 2 +-
 osu.Framework.Benchmarks/BenchmarkBeginAbsoluteSequence.cs      | 2 +-
 osu.Framework.Benchmarks/BenchmarkDrawableLoad.cs               | 2 +-
 .../BenchmarkFillFlowContainerAllocations.cs                    | 2 +-
 .../BenchmarkInvalidationWithManyNotAlive.cs                    | 2 +-
 osu.Framework.Benchmarks/BenchmarkManySpinningBoxes.cs          | 2 +-
 osu.Framework.Benchmarks/BenchmarkPiecewiseLinearToBezier.cs    | 2 +-
 osu.Framework.Benchmarks/BenchmarkQuad.cs                       | 2 +-
 .../BenchmarkSpinningParentWithManyAlive.cs                     | 2 +-
 osu.Framework.Benchmarks/BenchmarkSpriteText.cs                 | 2 +-
 osu.Framework.Benchmarks/BenchmarkTransform.cs                  | 2 +-
 osu.Framework.Benchmarks/BenchmarkTransformUpdate.cs            | 2 +-
 .../template-empty/TemplateGame.Game/TemplateGameGameBase.cs    | 2 +-
 .../template-flappy/FlappyDon.Game/Elements/Backdrop.cs         | 2 +-
 .../template-flappy/FlappyDon.Game/Elements/BackdropSprite.cs   | 2 +-
 .../templates/template-flappy/FlappyDon.Game/Elements/Bird.cs   | 2 +-
 .../template-flappy/FlappyDon.Game/Elements/GroundSprite.cs     | 2 +-
 .../template-flappy/FlappyDon.Game/Elements/Obstacles.cs        | 2 +-
 .../templates/template-flappy/FlappyDon.Game/Elements/Pipe.cs   | 2 +-
 .../template-flappy/FlappyDon.Game/Elements/PipeObstacle.cs     | 2 +-
 .../template-flappy/FlappyDon.Game/Elements/TitleSprite.cs      | 2 +-
 .../templates/template-flappy/FlappyDon.Game/FlappyDonGame.cs   | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/SampleGame/SampleGameGame.cs b/SampleGame/SampleGameGame.cs
index 1bb65504c5..16095198b8 100644
--- a/SampleGame/SampleGameGame.cs
+++ b/SampleGame/SampleGameGame.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace SampleGame
diff --git a/osu.Framework.Benchmarks/BenchmarkBeginAbsoluteSequence.cs b/osu.Framework.Benchmarks/BenchmarkBeginAbsoluteSequence.cs
index 622679ed65..b7e3b31a59 100644
--- a/osu.Framework.Benchmarks/BenchmarkBeginAbsoluteSequence.cs
+++ b/osu.Framework.Benchmarks/BenchmarkBeginAbsoluteSequence.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Benchmarks
diff --git a/osu.Framework.Benchmarks/BenchmarkDrawableLoad.cs b/osu.Framework.Benchmarks/BenchmarkDrawableLoad.cs
index c859c4e921..ccae0f7be8 100644
--- a/osu.Framework.Benchmarks/BenchmarkDrawableLoad.cs
+++ b/osu.Framework.Benchmarks/BenchmarkDrawableLoad.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Benchmarks
diff --git a/osu.Framework.Benchmarks/BenchmarkFillFlowContainerAllocations.cs b/osu.Framework.Benchmarks/BenchmarkFillFlowContainerAllocations.cs
index 89190fcb1e..9d99d2130c 100644
--- a/osu.Framework.Benchmarks/BenchmarkFillFlowContainerAllocations.cs
+++ b/osu.Framework.Benchmarks/BenchmarkFillFlowContainerAllocations.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Benchmarks
 {
diff --git a/osu.Framework.Benchmarks/BenchmarkInvalidationWithManyNotAlive.cs b/osu.Framework.Benchmarks/BenchmarkInvalidationWithManyNotAlive.cs
index 248e3329fb..3529e0bdb4 100644
--- a/osu.Framework.Benchmarks/BenchmarkInvalidationWithManyNotAlive.cs
+++ b/osu.Framework.Benchmarks/BenchmarkInvalidationWithManyNotAlive.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Benchmarks
 {
diff --git a/osu.Framework.Benchmarks/BenchmarkManySpinningBoxes.cs b/osu.Framework.Benchmarks/BenchmarkManySpinningBoxes.cs
index 2203c16db3..fc8d4e9aff 100644
--- a/osu.Framework.Benchmarks/BenchmarkManySpinningBoxes.cs
+++ b/osu.Framework.Benchmarks/BenchmarkManySpinningBoxes.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 using osuTK.Graphics;
 
 namespace osu.Framework.Benchmarks
diff --git a/osu.Framework.Benchmarks/BenchmarkPiecewiseLinearToBezier.cs b/osu.Framework.Benchmarks/BenchmarkPiecewiseLinearToBezier.cs
index 918f537d39..a84428a013 100644
--- a/osu.Framework.Benchmarks/BenchmarkPiecewiseLinearToBezier.cs
+++ b/osu.Framework.Benchmarks/BenchmarkPiecewiseLinearToBezier.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Benchmarks
 {
diff --git a/osu.Framework.Benchmarks/BenchmarkQuad.cs b/osu.Framework.Benchmarks/BenchmarkQuad.cs
index b5446e19f0..ff15281a05 100644
--- a/osu.Framework.Benchmarks/BenchmarkQuad.cs
+++ b/osu.Framework.Benchmarks/BenchmarkQuad.cs
@@ -4,7 +4,7 @@
 using System;
 using BenchmarkDotNet.Attributes;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Benchmarks
 {
diff --git a/osu.Framework.Benchmarks/BenchmarkSpinningParentWithManyAlive.cs b/osu.Framework.Benchmarks/BenchmarkSpinningParentWithManyAlive.cs
index 26dcb74430..fe372562c9 100644
--- a/osu.Framework.Benchmarks/BenchmarkSpinningParentWithManyAlive.cs
+++ b/osu.Framework.Benchmarks/BenchmarkSpinningParentWithManyAlive.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Benchmarks
 {
diff --git a/osu.Framework.Benchmarks/BenchmarkSpriteText.cs b/osu.Framework.Benchmarks/BenchmarkSpriteText.cs
index 7f36993551..1532c9662a 100644
--- a/osu.Framework.Benchmarks/BenchmarkSpriteText.cs
+++ b/osu.Framework.Benchmarks/BenchmarkSpriteText.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Benchmarks
 {
diff --git a/osu.Framework.Benchmarks/BenchmarkTransform.cs b/osu.Framework.Benchmarks/BenchmarkTransform.cs
index 7a2ff75dc3..474cedfd5e 100644
--- a/osu.Framework.Benchmarks/BenchmarkTransform.cs
+++ b/osu.Framework.Benchmarks/BenchmarkTransform.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Timing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Benchmarks
 {
diff --git a/osu.Framework.Benchmarks/BenchmarkTransformUpdate.cs b/osu.Framework.Benchmarks/BenchmarkTransformUpdate.cs
index c242a0e6b2..fe1e2d6826 100644
--- a/osu.Framework.Benchmarks/BenchmarkTransformUpdate.cs
+++ b/osu.Framework.Benchmarks/BenchmarkTransformUpdate.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Timing;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Framework.Benchmarks
 {
diff --git a/osu.Framework.Templates/templates/template-empty/TemplateGame.Game/TemplateGameGameBase.cs b/osu.Framework.Templates/templates/template-empty/TemplateGame.Game/TemplateGameGameBase.cs
index c825aa3971..e33becafa4 100644
--- a/osu.Framework.Templates/templates/template-empty/TemplateGame.Game/TemplateGameGameBase.cs
+++ b/osu.Framework.Templates/templates/template-empty/TemplateGame.Game/TemplateGameGameBase.cs
@@ -2,7 +2,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.IO.Stores;
-using osuTK;
+using System.Numerics;
 using TemplateGame.Resources;
 
 namespace TemplateGame.Game
diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Backdrop.cs b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Backdrop.cs
index 061ccd1c0c..3633a442d8 100644
--- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Backdrop.cs
+++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Backdrop.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
+using System.Numerics;
 
 namespace FlappyDon.Game.Elements
 {
diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/BackdropSprite.cs b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/BackdropSprite.cs
index e98f412927..9546a30c2d 100644
--- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/BackdropSprite.cs
+++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/BackdropSprite.cs
@@ -3,7 +3,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace FlappyDon.Game.Elements
 {
diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Bird.cs b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Bird.cs
index 7c482d6bf3..e20858f9c6 100644
--- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Bird.cs
+++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Bird.cs
@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace FlappyDon.Game.Elements
 {
diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/GroundSprite.cs b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/GroundSprite.cs
index a233d9b320..714a797f80 100644
--- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/GroundSprite.cs
+++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/GroundSprite.cs
@@ -2,7 +2,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace FlappyDon.Game.Elements
 {
diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Obstacles.cs b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Obstacles.cs
index 377babee47..ab7e9d074d 100644
--- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Obstacles.cs
+++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Obstacles.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Utils;
-using osuTK;
+using System.Numerics;
 
 namespace FlappyDon.Game.Elements
 {
diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Pipe.cs b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Pipe.cs
index 51e6597362..e50110b5bb 100644
--- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Pipe.cs
+++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/Pipe.cs
@@ -2,7 +2,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace FlappyDon.Game.Elements
 {
diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/PipeObstacle.cs b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/PipeObstacle.cs
index 8802868bf2..c0497c4080 100644
--- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/PipeObstacle.cs
+++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/PipeObstacle.cs
@@ -3,7 +3,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
-using osuTK;
+using System.Numerics;
 
 namespace FlappyDon.Game.Elements
 {
diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/TitleSprite.cs b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/TitleSprite.cs
index a013aa6653..482b26882d 100644
--- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/TitleSprite.cs
+++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/Elements/TitleSprite.cs
@@ -2,7 +2,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK;
+using System.Numerics;
 
 namespace FlappyDon.Game.Elements
 {
diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/FlappyDonGame.cs b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/FlappyDonGame.cs
index 2c758c7c3b..a058ca109f 100644
--- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/FlappyDonGame.cs
+++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/FlappyDonGame.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
-using osuTK;
+using System.Numerics;
 using osuTK.Input;
 
 namespace FlappyDon.Game

From c92dc038b3192e7cb509b36eba41f3f0639406ab Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 18:18:28 +0000
Subject: [PATCH 11/16] fix: remove unused using directives (IDE0005) causing
 Code Quality CI failure

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/304cd6e9-8a0f-496e-8c5a-a2f5efa05468

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs        | 1 -
 .../Visual/Layout/TestSceneLayoutTransformRewinding.cs           | 1 -
 osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs         | 1 -
 osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs              | 1 -
 osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs              | 1 -
 osu.Framework/Testing/TestBrowser.cs                             | 1 -
 6 files changed, 6 deletions(-)

diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs
index 9ef9a4e2bc..b1292cb356 100644
--- a/osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs
+++ b/osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs
@@ -16,7 +16,6 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Testing;
-using osuTK;
 using osuTK.Graphics;
 using Vector2 = System.Numerics.Vector2;
 
diff --git a/osu.Framework.Tests/Visual/Layout/TestSceneLayoutTransformRewinding.cs b/osu.Framework.Tests/Visual/Layout/TestSceneLayoutTransformRewinding.cs
index 6389902274..f9ccc1e150 100644
--- a/osu.Framework.Tests/Visual/Layout/TestSceneLayoutTransformRewinding.cs
+++ b/osu.Framework.Tests/Visual/Layout/TestSceneLayoutTransformRewinding.cs
@@ -8,7 +8,6 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
-using osuTK;
 using Vector2 = System.Numerics.Vector2;
 
 namespace osu.Framework.Tests.Visual.Layout
diff --git a/osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs b/osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs
index 40a9f9ade8..bccd476e33 100644
--- a/osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs
+++ b/osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs
@@ -12,7 +12,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
-using System.Numerics;
 using osuTK;
 using Vector2 = System.Numerics.Vector2;
 using WindowState = osu.Framework.Platform.WindowState;
diff --git a/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs b/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
index c4ea0434c5..2132df8cf0 100644
--- a/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
+++ b/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
@@ -12,7 +12,6 @@
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
-using System.Numerics;
 using osuTK;
 using Vector2 = System.Numerics.Vector2;
 using static SDL2.SDL;
diff --git a/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs b/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
index fd79427d70..39528e46e5 100644
--- a/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
+++ b/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
@@ -12,7 +12,6 @@
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
-using System.Numerics;
 using osuTK;
 using Vector2 = System.Numerics.Vector2;
 using SDL;
diff --git a/osu.Framework/Testing/TestBrowser.cs b/osu.Framework/Testing/TestBrowser.cs
index d9df3bfd64..5519362672 100644
--- a/osu.Framework/Testing/TestBrowser.cs
+++ b/osu.Framework/Testing/TestBrowser.cs
@@ -34,7 +34,6 @@
 using osu.Framework.Testing.Drawables;
 using osu.Framework.Testing.Drawables.Steps;
 using osu.Framework.Timing;
-using osuTK;
 using osuTK.Graphics;
 using Logger = osu.Framework.Logging.Logger;
 using Vector2 = System.Numerics.Vector2;

From eed88639ef35c749b1928910aeab625f09fdd8e8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 18:33:50 +0000
Subject: [PATCH 12/16] fix: remove 5 more unused using directives (IDE0005)
 causing Code Quality CI failure

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/54bca50a-2296-49ab-87b3-4eb3294fb5a9

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 osu.Framework/Extensions/MatrixExtensions/MatrixExtensions.cs | 1 -
 osu.Framework/Graphics/Audio/WaveformGraph.cs                 | 1 -
 osu.Framework/Graphics/OpenGL/GLRenderer.cs                   | 1 -
 osu.Framework/Graphics/Vector2Extensions.cs                   | 1 -
 osu.Framework/Graphics/Visualisation/PropertyDisplay.cs       | 1 -
 5 files changed, 5 deletions(-)

diff --git a/osu.Framework/Extensions/MatrixExtensions/MatrixExtensions.cs b/osu.Framework/Extensions/MatrixExtensions/MatrixExtensions.cs
index fd1baadacb..2ed82a27ee 100644
--- a/osu.Framework/Extensions/MatrixExtensions/MatrixExtensions.cs
+++ b/osu.Framework/Extensions/MatrixExtensions/MatrixExtensions.cs
@@ -4,7 +4,6 @@
 using System;
 using osuTK;
 using Vector2 = System.Numerics.Vector2;
-using Vector3 = System.Numerics.Vector3;
 
 namespace osu.Framework.Extensions.MatrixExtensions
 {
diff --git a/osu.Framework/Graphics/Audio/WaveformGraph.cs b/osu.Framework/Graphics/Audio/WaveformGraph.cs
index 7b7eec4380..9a026cf2d5 100644
--- a/osu.Framework/Graphics/Audio/WaveformGraph.cs
+++ b/osu.Framework/Graphics/Audio/WaveformGraph.cs
@@ -17,7 +17,6 @@
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
 using osu.Framework.Utils;
-using osuTK;
 using osuTK.Graphics;
 using Vector2 = System.Numerics.Vector2;
 
diff --git a/osu.Framework/Graphics/OpenGL/GLRenderer.cs b/osu.Framework/Graphics/OpenGL/GLRenderer.cs
index 65a3ab86e1..72b80ce29e 100644
--- a/osu.Framework/Graphics/OpenGL/GLRenderer.cs
+++ b/osu.Framework/Graphics/OpenGL/GLRenderer.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using osu.Framework.Extensions;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics.OpenGL.Batches;
 using osu.Framework.Graphics.OpenGL.Buffers;
diff --git a/osu.Framework/Graphics/Vector2Extensions.cs b/osu.Framework/Graphics/Vector2Extensions.cs
index cdfd31f588..43d17dd144 100644
--- a/osu.Framework/Graphics/Vector2Extensions.cs
+++ b/osu.Framework/Graphics/Vector2Extensions.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Numerics;
 using System.Runtime.CompilerServices;
 using osu.Framework.Graphics.Primitives;
 using osuTK;
diff --git a/osu.Framework/Graphics/Visualisation/PropertyDisplay.cs b/osu.Framework/Graphics/Visualisation/PropertyDisplay.cs
index 2c111b9def..7baf1f719a 100644
--- a/osu.Framework/Graphics/Visualisation/PropertyDisplay.cs
+++ b/osu.Framework/Graphics/Visualisation/PropertyDisplay.cs
@@ -17,7 +17,6 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osuTK;
 using osuTK.Graphics;
 using Vector2 = System.Numerics.Vector2;
 

From ec19cfc3834d9beac2e5eec4d7543d9b9207490f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 18:59:23 +0000
Subject: [PATCH 13/16] fix: resolve all 16 InspectCode warnings (indentation,
 naming, redundant qualifiers, unused tuple component)

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/ec5e0b7a-444f-4bdc-88ed-9fd3d21214d3

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 osu-framework.sln.DotSettings                 |  1 +
 osu.Framework/Graphics/Lines/PathBBH.cs       |  2 +-
 .../Tablet/OpenTabletDriverHandler.cs         |  6 +++---
 .../Input/PassThroughInputManager.cs          |  2 +-
 osu.Framework/Input/States/TouchState.cs      | 19 +++++--------------
 .../Platform/SDL3/SDL3Window.Windowing.cs     |  6 +++---
 osu.Framework/Testing/TestBrowser.cs          |  2 +-
 .../Utils/IncrementalBSplineBuilder.cs        |  6 +++---
 8 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/osu-framework.sln.DotSettings b/osu-framework.sln.DotSettings
index bad7c7804d..a2d8d5df1a 100644
--- a/osu-framework.sln.DotSettings
+++ b/osu-framework.sln.DotSettings
@@ -342,6 +342,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ARGB/@EntryIndexedValue">ARGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BBH/@EntryIndexedValue">BBH</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CG/@EntryIndexedValue">CG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FBO/@EntryIndexedValue">FBO</s:String>
diff --git a/osu.Framework/Graphics/Lines/PathBBH.cs b/osu.Framework/Graphics/Lines/PathBBH.cs
index d08c444f8e..f3515d7f5a 100644
--- a/osu.Framework/Graphics/Lines/PathBBH.cs
+++ b/osu.Framework/Graphics/Lines/PathBBH.cs
@@ -49,7 +49,7 @@ public void SetVertices(IReadOnlyList<Vector2> vertices, float pathRadius)
             // Definition of a leaf here is a node containing a segment
             // Since we are building a binary tree, compute the max value that is bigger than segmentCount and the power of 2.
             // That would be the bottom layer of a tree.
-            int maxLeafCount = Math.Max((int)System.Numerics.BitOperations.RoundUpToPowerOf2((uint)segmentCount), 1);
+            int maxLeafCount = Math.Max((int)BitOperations.RoundUpToPowerOf2((uint)segmentCount), 1);
             treeDepth = (int)Math.Log2(maxLeafCount);
 
             // We can avoid storing empty nodes by computing amount of all the nodes within a tree,
diff --git a/osu.Framework/Input/Handlers/Tablet/OpenTabletDriverHandler.cs b/osu.Framework/Input/Handlers/Tablet/OpenTabletDriverHandler.cs
index 43dc24e781..46900c3667 100644
--- a/osu.Framework/Input/Handlers/Tablet/OpenTabletDriverHandler.cs
+++ b/osu.Framework/Input/Handlers/Tablet/OpenTabletDriverHandler.cs
@@ -108,13 +108,13 @@ public override bool Initialize(GameHost host)
 
         private TabletPenDeviceType lastTabletDeviceType = TabletPenDeviceType.Unknown;
 
-        void IAbsolutePointer.SetPosition(System.Numerics.Vector2 pos)
+        void IAbsolutePointer.SetPosition(Vector2 pos)
         {
             lastTabletDeviceType = TabletPenDeviceType.Unknown;
             enqueueInput(new MousePositionAbsoluteInputFromPen { Position = new Vector2(pos.X, pos.Y), DeviceType = lastTabletDeviceType });
         }
 
-        void IRelativePointer.SetPosition(System.Numerics.Vector2 delta)
+        void IRelativePointer.SetPosition(Vector2 delta)
         {
             lastTabletDeviceType = TabletPenDeviceType.Indirect;
             enqueueInput(new MousePositionRelativeInputFromPen { Delta = new Vector2(delta.X, delta.Y), DeviceType = lastTabletDeviceType });
@@ -248,7 +248,7 @@ private void updateTabletAndInputArea(InputDeviceTree? inputDevice)
                     {
                         Width = AreaSize.Value.X,
                         Height = AreaSize.Value.Y,
-                        Position = new System.Numerics.Vector2(AreaOffset.Value.X, AreaOffset.Value.Y),
+                        Position = new Vector2(AreaOffset.Value.X, AreaOffset.Value.Y),
                         Rotation = Rotation.Value
                     };
                     break;
diff --git a/osu.Framework/Input/PassThroughInputManager.cs b/osu.Framework/Input/PassThroughInputManager.cs
index b511f6e2cf..74451e45e6 100644
--- a/osu.Framework/Input/PassThroughInputManager.cs
+++ b/osu.Framework/Input/PassThroughInputManager.cs
@@ -235,7 +235,7 @@ private void syncReleasedInputs()
             var parentState = parentInputManager.CurrentState;
             var mouseDiff = (parentState?.Mouse?.Buttons ?? new ButtonStates<MouseButton>()).EnumerateDifference(CurrentState.Mouse.Buttons);
             var keyDiff = (parentState?.Keyboard.Keys ?? new ButtonStates<Key>()).EnumerateDifference(CurrentState.Keyboard.Keys);
-            var (touchDeactivated, _) = (parentState?.Touch ?? new TouchState()).EnumerateDifference(CurrentState.Touch);
+            var touchDeactivated = (parentState?.Touch ?? new TouchState()).EnumerateDifference(CurrentState.Touch);
             var joyButtonDiff = (parentState?.Joystick?.Buttons ?? new ButtonStates<JoystickButton>()).EnumerateDifference(CurrentState.Joystick.Buttons);
             var midiDiff = (parentState?.Midi?.Keys ?? new ButtonStates<MidiKey>()).EnumerateDifference(CurrentState.Midi.Keys);
             var tabletPenDiff = (parentState?.Tablet?.PenButtons ?? new ButtonStates<TabletPenButton>()).EnumerateDifference(CurrentState.Tablet.PenButtons);
diff --git a/osu.Framework/Input/States/TouchState.cs b/osu.Framework/Input/States/TouchState.cs
index b292aa6498..b7778d124b 100644
--- a/osu.Framework/Input/States/TouchState.cs
+++ b/osu.Framework/Input/States/TouchState.cs
@@ -46,26 +46,17 @@ public class TouchState
         public bool IsActive(TouchSource source) => ActiveSources.IsPressed(source);
 
         /// <summary>
-        /// Enumerates the difference between this state and a <param ref="previous"/> state.
+        /// Enumerates the deactivated touches between this state and a <param ref="previous"/> state.
         /// </summary>
         /// <param name="previous">The previous state.</param>
-        public (Touch[] deactivated, Touch[] activated) EnumerateDifference(TouchState previous)
+        public Touch[] EnumerateDifference(TouchState previous)
         {
             var diff = ActiveSources.EnumerateDifference(previous.ActiveSources);
 
-            int pressedCount = diff.Pressed.Length;
             int releasedCount = diff.Released.Length;
 
-            if (pressedCount == 0 && releasedCount == 0)
-                return (Array.Empty<Touch>(), Array.Empty<Touch>());
-
-            Touch[] pressedTouches = new Touch[pressedCount];
-
-            for (int i = 0; i < pressedCount; i++)
-            {
-                var s = diff.Pressed[i];
-                pressedTouches[i] = new Touch(s, TouchPositions[(int)s]);
-            }
+            if (releasedCount == 0)
+                return Array.Empty<Touch>();
 
             Touch[] releasedTouches = new Touch[releasedCount];
 
@@ -75,7 +66,7 @@ public class TouchState
                 releasedTouches[i] = new Touch(s, previous.TouchPositions[(int)s]);
             }
 
-            return (releasedTouches, pressedTouches);
+            return releasedTouches;
         }
     }
 }
diff --git a/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs b/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
index 39528e46e5..a80f057f75 100644
--- a/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
+++ b/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
@@ -348,7 +348,7 @@ private void assertDisplaysMatchSDL()
         private static ImmutableArray<Display> getSDLDisplays()
         {
             using var displays = SDL_GetDisplays()
-                ?? throw new InvalidOperationException($"Failed to get number of SDL displays. SDL Error: {SDL_GetError()}");
+                                 ?? throw new InvalidOperationException($"Failed to get number of SDL displays. SDL Error: {SDL_GetError()}");
 
             var builder = ImmutableArray.CreateBuilder<Display>(displays.Count);
 
@@ -684,7 +684,7 @@ private unsafe bool tryGetBorderSize(out MarginPadding borderSize)
         private static bool tryGetDisplayIndex(SDL_DisplayID id, out int index)
         {
             using var displays = SDL_GetDisplays()
-                ?? throw new InvalidOperationException($"Failed to get SDL displays. SDL error: {SDL_GetError()}");
+                                 ?? throw new InvalidOperationException($"Failed to get SDL displays. SDL error: {SDL_GetError()}");
 
             for (int i = 0; i < displays.Count; i++)
             {
@@ -927,7 +927,7 @@ private static bool tryGetDisplayAtIndex(int index, out SDL_DisplayID displayID)
             ArgumentOutOfRangeException.ThrowIfNegative(index);
 
             using var displays = SDL_GetDisplays()
-                ?? throw new InvalidOperationException($"Unable to get displays. SDL error: {SDL_GetError()}");
+                                 ?? throw new InvalidOperationException($"Unable to get displays. SDL error: {SDL_GetError()}");
 
             if (index >= displays.Count)
             {
diff --git a/osu.Framework/Testing/TestBrowser.cs b/osu.Framework/Testing/TestBrowser.cs
index 5519362672..9a73cd97d3 100644
--- a/osu.Framework/Testing/TestBrowser.cs
+++ b/osu.Framework/Testing/TestBrowser.cs
@@ -451,7 +451,7 @@ private void finishLoad(TestScene newTest, Action onCompletion)
                             foreach (var p in methodWrapper.GetParameters())
                             {
                                 var valueAttrib = p.GetCustomAttributes<ValuesAttribute>(false).SingleOrDefault()
-                                    ?? throw new ArgumentException($"Parameter is present on a {nameof(TestAttribute)} method without values specification.", p.ParameterInfo.Name);
+                                                  ?? throw new ArgumentException($"Parameter is present on a {nameof(TestAttribute)} method without values specification.", p.ParameterInfo.Name);
 
                                 List<object> choices = new List<object>();
 
diff --git a/osu.Framework/Utils/IncrementalBSplineBuilder.cs b/osu.Framework/Utils/IncrementalBSplineBuilder.cs
index faf867f164..bcea4c468f 100644
--- a/osu.Framework/Utils/IncrementalBSplineBuilder.cs
+++ b/osu.Framework/Utils/IncrementalBSplineBuilder.cs
@@ -102,7 +102,7 @@ public int Degree
                 outputCache.Invalidate();
                 controlPoints.Invalidate();
             }
-        } = 3;
+        }
 
         /// <summary>
         /// Gets or sets the tolerance for determining when to add a new control point. Must not be negative. Default is 1.5.
@@ -122,7 +122,7 @@ public float Tolerance
                 outputCache.Invalidate();
                 controlPoints.Invalidate();
             }
-        } = 1.5f;
+        }
 
         /// <summary>
         /// Gets or sets the corner threshold for determining when to add a new control point. Must not be negative. Default is 0.4.
@@ -142,7 +142,7 @@ public float CornerThreshold
                 outputCache.Invalidate();
                 controlPoints.Invalidate();
             }
-        } = 0.4f;
+        }
 
         /// <summary>
         /// The piecewise linear approximation of the B-spline created from the input path.

From 93ab01ab53ef528d1d018f1535f52a51e96e09db Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 19:21:42 +0000
Subject: [PATCH 14/16] fix: resolve all 22 InspectCode notes (field keyword,
 with expression, collection expression)

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/375c540e-1a56-4ebd-b76e-31fd07b1e5ad

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 osu.Framework/Graphics/Sprites/Sprite.cs      | 18 ++++-------
 osu.Framework/Graphics/Sprites/SpriteText.cs  | 26 ++++++---------
 .../Graphics/UserInterface/BasicSliderBar.cs  |  8 ++---
 .../Graphics/UserInterface/BasicTextBox.cs    | 21 ++++++------
 .../Graphics/UserInterface/Dropdown.cs        | 16 ++++------
 osu.Framework/Graphics/UserInterface/Menu.cs  | 32 +++++++------------
 .../Veldrid/Buffers/VeldridFrameBuffer.cs     | 14 ++++----
 .../Input/PassThroughInputManager.cs          | 10 +++---
 osu.Framework/Platform/GameHost.cs            |  2 +-
 .../Platform/SDL2/SDL2Window.Input.cs         |  6 ++--
 .../Platform/SDL2/SDL2Window.Windowing.cs     | 10 +++---
 .../Platform/SDL3/SDL3Window.Input.cs         |  6 ++--
 .../Platform/SDL3/SDL3Window.Windowing.cs     | 10 +++---
 13 files changed, 70 insertions(+), 109 deletions(-)

diff --git a/osu.Framework/Graphics/Sprites/Sprite.cs b/osu.Framework/Graphics/Sprites/Sprite.cs
index 7b2bd9ee6c..3b6ce04d64 100644
--- a/osu.Framework/Graphics/Sprites/Sprite.cs
+++ b/osu.Framework/Graphics/Sprites/Sprite.cs
@@ -39,8 +39,6 @@ private void load(ShaderManager shaders)
         /// If overriding, set in a <see cref="BackgroundDependencyLoaderAttribute"/> method or later.</remarks>
         public IShader TextureShader { get; protected set; }
 
-        private RectangleF textureRectangle = new RectangleF(0, 0, 1, 1);
-
         /// <summary>
         /// Sub-rectangle of the sprite in which the texture is positioned.
         /// Can be either relative coordinates (0 to 1) or absolute coordinates,
@@ -48,16 +46,16 @@ private void load(ShaderManager shaders)
         /// </summary>
         public RectangleF TextureRectangle
         {
-            get => textureRectangle;
+            get => field;
             set
             {
-                if (textureRectangle == value)
+                if (field == value)
                     return;
 
-                textureRectangle = value;
+                field = value;
                 Invalidate(Invalidation.DrawNode);
             }
-        }
+        } = new RectangleF(0, 0, 1, 1);
 
         /// <summary>
         /// Whether or not the <see cref="TextureRectangle"/> is in relative coordinates
@@ -112,8 +110,6 @@ public RectangleF DrawTextureRectangle
         /// </summary>
         public const int MAX_EDGE_SMOOTHNESS = 3; // See https://github.com/ppy/osu-framework/pull/3511#discussion_r421665156 for relevant discussion.
 
-        private Vector2 edgeSmoothness;
-
         /// <summary>
         /// Determines over how many pixels of width the border of the sprite is smoothed
         /// in X and Y direction respectively.
@@ -123,10 +119,10 @@ public RectangleF DrawTextureRectangle
         /// </summary>
         public Vector2 EdgeSmoothness
         {
-            get => edgeSmoothness;
+            get => field;
             set
             {
-                if (edgeSmoothness == value)
+                if (field == value)
                     return;
 
                 if (value.X > MAX_EDGE_SMOOTHNESS || value.Y > MAX_EDGE_SMOOTHNESS)
@@ -135,7 +131,7 @@ public Vector2 EdgeSmoothness
                         $"May not smooth more than {MAX_EDGE_SMOOTHNESS} or will leak neighboring textures in atlas. Tried to smooth by ({value.X}, {value.Y}).");
                 }
 
-                edgeSmoothness = value;
+                field = value;
 
                 Invalidate(Invalidation.DrawInfo);
             }
diff --git a/osu.Framework/Graphics/Sprites/SpriteText.cs b/osu.Framework/Graphics/Sprites/SpriteText.cs
index ae16593553..f896a6aaf4 100644
--- a/osu.Framework/Graphics/Sprites/SpriteText.cs
+++ b/osu.Framework/Graphics/Sprites/SpriteText.cs
@@ -180,24 +180,22 @@ public bool Shadow
             }
         }
 
-        private Color4 shadowColour = new Color4(0, 0, 0, 0.2f);
-
         /// <summary>
         /// The colour of the shadow displayed around the text. A shadow will only be displayed if the <see cref="Shadow"/> property is set to true.
         /// </summary>
         public Color4 ShadowColour
         {
-            get => shadowColour;
+            get => field;
             set
             {
-                if (shadowColour == value)
+                if (field == value)
                     return;
 
-                shadowColour = value;
+                field = value;
 
                 Invalidate(Invalidation.DrawNode);
             }
-        }
+        } = new Color4(0, 0, 0, 0.2f);
 
         private Vector2 shadowOffset = new Vector2(0, 0.06f);
 
@@ -371,41 +369,37 @@ public override Vector2 Size
             }
         }
 
-        private Vector2 spacing;
-
         /// <summary>
         /// Gets or sets the spacing between characters of this <see cref="SpriteText"/>.
         /// </summary>
         public Vector2 Spacing
         {
-            get => spacing;
+            get => field;
             set
             {
-                if (spacing == value)
+                if (field == value)
                     return;
 
-                spacing = value;
+                field = value;
 
                 invalidate(true, true);
             }
         }
 
-        private MarginPadding padding;
-
         /// <summary>
         /// Shrinks the space which may be occupied by characters of this <see cref="SpriteText"/> by the specified amount on each side.
         /// </summary>
         public MarginPadding Padding
         {
-            get => padding;
+            get => field;
             set
             {
-                if (padding.Equals(value))
+                if (field.Equals(value))
                     return;
 
                 if (!Validation.IsFinite(value)) throw new ArgumentException($@"{nameof(Padding)} must be finite, but is {value}.");
 
-                padding = value;
+                field = value;
 
                 invalidate(true, true);
             }
diff --git a/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs b/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs
index d6a3f48df6..dc43900863 100644
--- a/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs
@@ -23,17 +23,15 @@ public Color4 SelectionColour
             set => SelectionBox.Colour = value;
         }
 
-        private Color4 focusColour = FrameworkColour.YellowGreen;
-
         public Color4 FocusColour
         {
-            get => focusColour;
+            get => field;
             set
             {
-                focusColour = value;
+                field = value;
                 updateFocus();
             }
-        }
+        } = FrameworkColour.YellowGreen;
 
         protected readonly Box SelectionBox;
         protected readonly Box Box;
diff --git a/osu.Framework/Graphics/UserInterface/BasicTextBox.cs b/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
index 76dd90e758..74a3457eb1 100644
--- a/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
@@ -21,32 +21,29 @@ public partial class BasicTextBox : TextBox
 
         protected Color4 BackgroundCommit { get; set; } = FrameworkColour.Green;
 
-        private Color4 backgroundFocused = new Color4(100, 100, 100, 255);
-        private Color4 backgroundUnfocused = new Color4(100, 100, 100, 120);
-
-        private readonly Box background;
-
         protected Color4 BackgroundFocused
         {
-            get => backgroundFocused;
+            get => field;
             set
             {
-                backgroundFocused = value;
+                field = value;
                 if (HasFocus)
                     background.Colour = value;
             }
-        }
+        } = new Color4(100, 100, 100, 255);
 
         protected Color4 BackgroundUnfocused
         {
-            get => backgroundUnfocused;
+            get => field;
             set
             {
-                backgroundUnfocused = value;
+                field = value;
                 if (!HasFocus)
                     background.Colour = value;
             }
-        }
+        } = new Color4(100, 100, 100, 120);
+
+        private readonly Box background;
 
         protected virtual Color4 InputErrorColour => Color4.Red;
 
@@ -172,7 +169,7 @@ public override void DisplayAt(Vector2 position, float? selectionWidth)
                 }
                 else
                 {
-                    this.MoveTo(new Vector2(position.X - CaretWidth / 2, position.Y), 60, Easing.Out);
+                    this.MoveTo(position with { X = position.X - CaretWidth / 2 }, 60, Easing.Out);
                     this.ResizeWidthTo(CaretWidth, caret_move_time, Easing.Out);
                     this
                         .FadeColour(Color4.White, 200, Easing.Out)
diff --git a/osu.Framework/Graphics/UserInterface/Dropdown.cs b/osu.Framework/Graphics/UserInterface/Dropdown.cs
index e87eaad407..ecac36dbd8 100644
--- a/osu.Framework/Graphics/UserInterface/Dropdown.cs
+++ b/osu.Framework/Graphics/UserInterface/Dropdown.cs
@@ -641,29 +641,25 @@ public bool IsPreSelected
                     }
                 }
 
-                private Color4 backgroundColourSelected = Color4.SlateGray;
-
                 public Color4 BackgroundColourSelected
                 {
-                    get => backgroundColourSelected;
+                    get => field;
                     set
                     {
-                        backgroundColourSelected = value;
+                        field = value;
                         Scheduler.AddOnce(UpdateBackgroundColour);
                     }
-                }
-
-                private Color4 foregroundColourSelected = Color4.White;
+                } = Color4.SlateGray;
 
                 public Color4 ForegroundColourSelected
                 {
-                    get => foregroundColourSelected;
+                    get => field;
                     set
                     {
-                        foregroundColourSelected = value;
+                        field = value;
                         Scheduler.AddOnce(UpdateForegroundColour);
                     }
-                }
+                } = Color4.White;
 
                 protected virtual void OnSelectChange()
                 {
diff --git a/osu.Framework/Graphics/UserInterface/Menu.cs b/osu.Framework/Graphics/UserInterface/Menu.cs
index 1540043121..8e40fcf643 100644
--- a/osu.Framework/Graphics/UserInterface/Menu.cs
+++ b/osu.Framework/Graphics/UserInterface/Menu.cs
@@ -793,65 +793,57 @@ public virtual void SetFlowDirection(Direction direction)
                 AutoSizeAxes = direction == Direction.Horizontal ? Axes.X : Axes.Y;
             }
 
-            private Color4 backgroundColour = Color4.DarkSlateGray;
-
             /// <summary>
             /// Gets or sets the default background colour.
             /// </summary>
             public Color4 BackgroundColour
             {
-                get => backgroundColour;
+                get => field;
                 set
                 {
-                    backgroundColour = value;
+                    field = value;
                     Scheduler.AddOnce(UpdateBackgroundColour);
                 }
-            }
-
-            private Color4 foregroundColour = Color4.White;
+            } = Color4.DarkSlateGray;
 
             /// <summary>
             /// Gets or sets the default foreground colour.
             /// </summary>
             public Color4 ForegroundColour
             {
-                get => foregroundColour;
+                get => field;
                 set
                 {
-                    foregroundColour = value;
+                    field = value;
                     Scheduler.AddOnce(UpdateForegroundColour);
                 }
-            }
-
-            private Color4 backgroundColourHover = Color4.DarkGray;
+            } = Color4.White;
 
             /// <summary>
             /// Gets or sets the background colour when this <see cref="DrawableMenuItem"/> is hovered.
             /// </summary>
             public Color4 BackgroundColourHover
             {
-                get => backgroundColourHover;
+                get => field;
                 set
                 {
-                    backgroundColourHover = value;
+                    field = value;
                     Scheduler.AddOnce(UpdateBackgroundColour);
                 }
-            }
-
-            private Color4 foregroundColourHover = Color4.White;
+            } = Color4.DarkGray;
 
             /// <summary>
             /// Gets or sets the foreground colour when this <see cref="DrawableMenuItem"/> is hovered.
             /// </summary>
             public Color4 ForegroundColourHover
             {
-                get => foregroundColourHover;
+                get => field;
                 set
                 {
-                    foregroundColourHover = value;
+                    field = value;
                     Scheduler.AddOnce(UpdateForegroundColour);
                 }
-            }
+            } = Color4.White;
 
             public MenuItemState State
             {
diff --git a/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs b/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs
index 642eb19cbd..664c92694e 100644
--- a/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs
+++ b/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs
@@ -26,26 +26,24 @@ internal class VeldridFrameBuffer : IVeldridFrameBuffer
         private readonly int mipLevel;
         private Texture? depthTarget;
 
-        private Vector2 size = Vector2.One;
-
         public Vector2 Size
         {
-            get => size;
+            get => field;
             set
             {
-                if (value == size)
+                if (value == field)
                     return;
 
-                size = value;
+                field = value;
 
-                colourTarget.Width = (int)Math.Ceiling(size.X);
-                colourTarget.Height = (int)Math.Ceiling(size.Y);
+                colourTarget.Width = (int)Math.Ceiling(value.X);
+                colourTarget.Height = (int)Math.Ceiling(value.Y);
                 colourTarget.SetData(new TextureUpload());
                 colourTarget.Upload();
 
                 recreateResources();
             }
-        }
+        } = Vector2.One;
 
         public VeldridFrameBuffer(VeldridRenderer renderer, PixelFormat[]? formats = null, SamplerFilter filteringMode = SamplerFilter.MinLinearMagLinearMipLinear)
         {
diff --git a/osu.Framework/Input/PassThroughInputManager.cs b/osu.Framework/Input/PassThroughInputManager.cs
index 74451e45e6..b6b2bb87b8 100644
--- a/osu.Framework/Input/PassThroughInputManager.cs
+++ b/osu.Framework/Input/PassThroughInputManager.cs
@@ -28,24 +28,22 @@ namespace osu.Framework.Input
     /// </remarks>
     public partial class PassThroughInputManager : CustomInputManager, IRequireHighFrequencyMousePosition
     {
-        private bool useParentInput = true;
-
         /// <summary>
         /// If there's an InputManager above us, decide whether we should use their available state.
         /// </summary>
         public virtual bool UseParentInput
         {
-            get => useParentInput;
+            get => field;
             set
             {
-                if (useParentInput == value) return;
+                if (field == value) return;
 
-                useParentInput = value;
+                field = value;
 
                 if (UseParentInput)
                     syncWithParent();
             }
-        }
+        } = true;
 
         private InputManager? parentInputManager;
 
diff --git a/osu.Framework/Platform/GameHost.cs b/osu.Framework/Platform/GameHost.cs
index fec21534bb..117971a269 100644
--- a/osu.Framework/Platform/GameHost.cs
+++ b/osu.Framework/Platform/GameHost.cs
@@ -1167,7 +1167,7 @@ protected virtual void SetupForRun()
 
         private void populateInputHandlers()
         {
-            AvailableInputHandlers = CreateAvailableInputHandlers().ToImmutableArray();
+            AvailableInputHandlers = [.. CreateAvailableInputHandlers()];
         }
 
         private void initialiseInputHandlers()
diff --git a/osu.Framework/Platform/SDL2/SDL2Window.Input.cs b/osu.Framework/Platform/SDL2/SDL2Window.Input.cs
index 6c64814f37..a7f45b6b64 100644
--- a/osu.Framework/Platform/SDL2/SDL2Window.Input.cs
+++ b/osu.Framework/Platform/SDL2/SDL2Window.Input.cs
@@ -78,14 +78,12 @@ public CursorState CursorState
             set => CursorStateBindable.Value = value;
         }
 
-        private RectangleF? cursorConfineRect;
-
         public RectangleF? CursorConfineRect
         {
-            get => cursorConfineRect;
+            get => field;
             set
             {
-                cursorConfineRect = value;
+                field = value;
                 updateCursorConfinement();
             }
         }
diff --git a/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs b/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
index 2132df8cf0..00124d6d10 100644
--- a/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
+++ b/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
@@ -182,22 +182,20 @@ public bool Resizable
             }
         } = true;
 
-        private Size size = new Size(default_width, default_height);
-
         /// <summary>
         /// Returns or sets the window's internal size, before scaling.
         /// </summary>
         public virtual Size Size
         {
-            get => size;
+            get => field;
             protected set
             {
-                if (value.Equals(size)) return;
+                if (value.Equals(field)) return;
 
-                size = value;
+                field = value;
                 Resized?.Invoke();
             }
-        }
+        } = new Size(default_width, default_height);
 
         public Size MinSize
         {
diff --git a/osu.Framework/Platform/SDL3/SDL3Window.Input.cs b/osu.Framework/Platform/SDL3/SDL3Window.Input.cs
index 43befb06ff..2bec35b9ed 100644
--- a/osu.Framework/Platform/SDL3/SDL3Window.Input.cs
+++ b/osu.Framework/Platform/SDL3/SDL3Window.Input.cs
@@ -81,14 +81,12 @@ public CursorState CursorState
             set => CursorStateBindable.Value = value;
         }
 
-        private RectangleF? cursorConfineRect;
-
         public RectangleF? CursorConfineRect
         {
-            get => cursorConfineRect;
+            get => field;
             set
             {
-                cursorConfineRect = value;
+                field = value;
                 updateCursorConfinement();
             }
         }
diff --git a/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs b/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
index a80f057f75..b05edcacd4 100644
--- a/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
+++ b/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
@@ -196,22 +196,20 @@ public unsafe bool Resizable
             }
         } = true;
 
-        private Size size = new Size(default_width, default_height);
-
         /// <summary>
         /// Returns or sets the window's internal size, before scaling.
         /// </summary>
         public virtual Size Size
         {
-            get => size;
+            get => field;
             protected set
             {
-                if (value.Equals(size)) return;
+                if (value.Equals(field)) return;
 
-                size = value;
+                field = value;
                 Resized?.Invoke();
             }
-        }
+        } = new Size(default_width, default_height);
 
         public Size MinSize
         {

From b5211859d10b3a4585da2a09d3b01c89b725068a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 19:38:26 +0000
Subject: [PATCH 15/16] fix: replace redundant `get => field;` with `get;` in
 all field-keyword properties

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/640ffaff-331e-4619-b5d4-5abac13c6384

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 osu.Framework/Graphics/Sprites/Sprite.cs                  | 4 ++--
 osu.Framework/Graphics/Sprites/SpriteText.cs              | 6 +++---
 osu.Framework/Graphics/UserInterface/BasicSliderBar.cs    | 2 +-
 osu.Framework/Graphics/UserInterface/BasicTextBox.cs      | 4 ++--
 osu.Framework/Graphics/UserInterface/Dropdown.cs          | 4 ++--
 osu.Framework/Graphics/UserInterface/Menu.cs              | 8 ++++----
 .../Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs        | 2 +-
 osu.Framework/Input/PassThroughInputManager.cs            | 2 +-
 osu.Framework/Platform/SDL2/SDL2Window.Input.cs           | 2 +-
 osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs       | 2 +-
 osu.Framework/Platform/SDL3/SDL3Window.Input.cs           | 2 +-
 osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs       | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Framework/Graphics/Sprites/Sprite.cs b/osu.Framework/Graphics/Sprites/Sprite.cs
index 3b6ce04d64..3555de73fc 100644
--- a/osu.Framework/Graphics/Sprites/Sprite.cs
+++ b/osu.Framework/Graphics/Sprites/Sprite.cs
@@ -46,7 +46,7 @@ private void load(ShaderManager shaders)
         /// </summary>
         public RectangleF TextureRectangle
         {
-            get => field;
+            get;
             set
             {
                 if (field == value)
@@ -119,7 +119,7 @@ public RectangleF DrawTextureRectangle
         /// </summary>
         public Vector2 EdgeSmoothness
         {
-            get => field;
+            get;
             set
             {
                 if (field == value)
diff --git a/osu.Framework/Graphics/Sprites/SpriteText.cs b/osu.Framework/Graphics/Sprites/SpriteText.cs
index f896a6aaf4..781a7d19ed 100644
--- a/osu.Framework/Graphics/Sprites/SpriteText.cs
+++ b/osu.Framework/Graphics/Sprites/SpriteText.cs
@@ -185,7 +185,7 @@ public bool Shadow
         /// </summary>
         public Color4 ShadowColour
         {
-            get => field;
+            get;
             set
             {
                 if (field == value)
@@ -374,7 +374,7 @@ public override Vector2 Size
         /// </summary>
         public Vector2 Spacing
         {
-            get => field;
+            get;
             set
             {
                 if (field == value)
@@ -391,7 +391,7 @@ public Vector2 Spacing
         /// </summary>
         public MarginPadding Padding
         {
-            get => field;
+            get;
             set
             {
                 if (field.Equals(value))
diff --git a/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs b/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs
index dc43900863..f66c5eb0b6 100644
--- a/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicSliderBar.cs
@@ -25,7 +25,7 @@ public Color4 SelectionColour
 
         public Color4 FocusColour
         {
-            get => field;
+            get;
             set
             {
                 field = value;
diff --git a/osu.Framework/Graphics/UserInterface/BasicTextBox.cs b/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
index 74a3457eb1..fd3cc3434b 100644
--- a/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
@@ -23,7 +23,7 @@ public partial class BasicTextBox : TextBox
 
         protected Color4 BackgroundFocused
         {
-            get => field;
+            get;
             set
             {
                 field = value;
@@ -34,7 +34,7 @@ protected Color4 BackgroundFocused
 
         protected Color4 BackgroundUnfocused
         {
-            get => field;
+            get;
             set
             {
                 field = value;
diff --git a/osu.Framework/Graphics/UserInterface/Dropdown.cs b/osu.Framework/Graphics/UserInterface/Dropdown.cs
index ecac36dbd8..ac7a2db5f8 100644
--- a/osu.Framework/Graphics/UserInterface/Dropdown.cs
+++ b/osu.Framework/Graphics/UserInterface/Dropdown.cs
@@ -643,7 +643,7 @@ public bool IsPreSelected
 
                 public Color4 BackgroundColourSelected
                 {
-                    get => field;
+                    get;
                     set
                     {
                         field = value;
@@ -653,7 +653,7 @@ public Color4 BackgroundColourSelected
 
                 public Color4 ForegroundColourSelected
                 {
-                    get => field;
+                    get;
                     set
                     {
                         field = value;
diff --git a/osu.Framework/Graphics/UserInterface/Menu.cs b/osu.Framework/Graphics/UserInterface/Menu.cs
index 8e40fcf643..f255b0843c 100644
--- a/osu.Framework/Graphics/UserInterface/Menu.cs
+++ b/osu.Framework/Graphics/UserInterface/Menu.cs
@@ -798,7 +798,7 @@ public virtual void SetFlowDirection(Direction direction)
             /// </summary>
             public Color4 BackgroundColour
             {
-                get => field;
+                get;
                 set
                 {
                     field = value;
@@ -811,7 +811,7 @@ public Color4 BackgroundColour
             /// </summary>
             public Color4 ForegroundColour
             {
-                get => field;
+                get;
                 set
                 {
                     field = value;
@@ -824,7 +824,7 @@ public Color4 ForegroundColour
             /// </summary>
             public Color4 BackgroundColourHover
             {
-                get => field;
+                get;
                 set
                 {
                     field = value;
@@ -837,7 +837,7 @@ public Color4 BackgroundColourHover
             /// </summary>
             public Color4 ForegroundColourHover
             {
-                get => field;
+                get;
                 set
                 {
                     field = value;
diff --git a/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs b/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs
index 664c92694e..639b3b28de 100644
--- a/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs
+++ b/osu.Framework/Graphics/Veldrid/Buffers/VeldridFrameBuffer.cs
@@ -28,7 +28,7 @@ internal class VeldridFrameBuffer : IVeldridFrameBuffer
 
         public Vector2 Size
         {
-            get => field;
+            get;
             set
             {
                 if (value == field)
diff --git a/osu.Framework/Input/PassThroughInputManager.cs b/osu.Framework/Input/PassThroughInputManager.cs
index b6b2bb87b8..7e7573512d 100644
--- a/osu.Framework/Input/PassThroughInputManager.cs
+++ b/osu.Framework/Input/PassThroughInputManager.cs
@@ -33,7 +33,7 @@ public partial class PassThroughInputManager : CustomInputManager, IRequireHighF
         /// </summary>
         public virtual bool UseParentInput
         {
-            get => field;
+            get;
             set
             {
                 if (field == value) return;
diff --git a/osu.Framework/Platform/SDL2/SDL2Window.Input.cs b/osu.Framework/Platform/SDL2/SDL2Window.Input.cs
index a7f45b6b64..87b50f2107 100644
--- a/osu.Framework/Platform/SDL2/SDL2Window.Input.cs
+++ b/osu.Framework/Platform/SDL2/SDL2Window.Input.cs
@@ -80,7 +80,7 @@ public CursorState CursorState
 
         public RectangleF? CursorConfineRect
         {
-            get => field;
+            get;
             set
             {
                 field = value;
diff --git a/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs b/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
index 00124d6d10..c1e3cd8ced 100644
--- a/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
+++ b/osu.Framework/Platform/SDL2/SDL2Window.Windowing.cs
@@ -187,7 +187,7 @@ public bool Resizable
         /// </summary>
         public virtual Size Size
         {
-            get => field;
+            get;
             protected set
             {
                 if (value.Equals(field)) return;
diff --git a/osu.Framework/Platform/SDL3/SDL3Window.Input.cs b/osu.Framework/Platform/SDL3/SDL3Window.Input.cs
index 2bec35b9ed..cfb7cdcfbd 100644
--- a/osu.Framework/Platform/SDL3/SDL3Window.Input.cs
+++ b/osu.Framework/Platform/SDL3/SDL3Window.Input.cs
@@ -83,7 +83,7 @@ public CursorState CursorState
 
         public RectangleF? CursorConfineRect
         {
-            get => field;
+            get;
             set
             {
                 field = value;
diff --git a/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs b/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
index b05edcacd4..d528a83e14 100644
--- a/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
+++ b/osu.Framework/Platform/SDL3/SDL3Window.Windowing.cs
@@ -201,7 +201,7 @@ public unsafe bool Resizable
         /// </summary>
         public virtual Size Size
         {
-            get => field;
+            get;
             protected set
             {
                 if (value.Equals(field)) return;

From cfc43e33d4fcf6b72cd61e2658001d391c9c6353 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 19:49:37 +0000
Subject: [PATCH 16/16] fix: remove dead BackgroundFocused initializer
 (InspectCode member-initialized-value-ignored)

Agent-Logs-Url: https://github.com/winnerspiros/osu-framework/sessions/985363f9-ed6d-46f0-852b-6e00f0885e44

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
---
 osu.Framework/Graphics/UserInterface/BasicTextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Framework/Graphics/UserInterface/BasicTextBox.cs b/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
index fd3cc3434b..bb750e06ff 100644
--- a/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
+++ b/osu.Framework/Graphics/UserInterface/BasicTextBox.cs
@@ -30,7 +30,7 @@ protected Color4 BackgroundFocused
                 if (HasFocus)
                     background.Colour = value;
             }
-        } = new Color4(100, 100, 100, 255);
+        }
 
         protected Color4 BackgroundUnfocused
         {